version bump, bug #271539, ebuild and patch by Dustin Polke

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 160 insertions, 5 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 53992c3365d3..b09e69295a25 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.58 2009/04/30 18:03:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.59 2009/06/08 07:46:21 aballier Exp $
+
+*texmaker-1.91 (08 Jun 2009)
+
+  08 Jun 2009; Alexis Ballier <aballier@gentoo.org> +texmaker-1.91.ebuild,
+  +files/texmaker-1.91-hunspell.patch:
+  version bump, bug #271539, ebuild and patch by Dustin Polke
 
   30 Apr 2009; Alexis Ballier <aballier@gentoo.org>
   -texmaker-1.71-r1.ebuild, -files/texmaker-1.71-hunspell.patch:
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index dffc1a0f5dd5..e340c3cdba11 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA1
 
 AUX texmaker-1.80-hunspell.patch 1942 RMD160 1f216bad188d8bafca6cbc7aaa2c31e987833006 SHA1 49be4ba143f40919fe9509cafa77d02abfc381ae SHA256 cdf839246c4af288acbed132ea1f0c4ad1bd3d69b4ce575e51459143c359852c
+AUX texmaker-1.91-hunspell.patch 1948 RMD160 35e3b78a1e9b9b9a8a76c0d67768e11a6b790554 SHA1 4c33150af01a9f3143040bf5f781de7e322b9ac0 SHA256 b12042c07b14633972869c6ded769bed0b546eabb291e8b770ede874f474b113
 DIST texmaker-1.8.tar.bz2 1767680 RMD160 b3bdfa7838f486f0969da472ff08c2d30825421e SHA1 d5f188c0d207c637a445cec984d79ee017de6e1a SHA256 1268f43a548c6c194ea848d5c70c429386b962f5685f16eb427267921f7ad944
+DIST texmaker-1.9.1.tar.bz2 3090445 RMD160 37b34ea22708e22829867dd80756896f4373ff58 SHA1 31267f9ce7bf1aba7bab8605a7608a135e897ae8 SHA256 baf5a82131b2a592cc558cb2604945d5340cb28d88677d463190ac1f282c4999
 EBUILD texmaker-1.80.ebuild 1851 RMD160 93c86a9ca0f442ee7b826e7bc9c3ba1b5c0dd46e SHA1 5e6efbaf2a8d6450c226c1d7f4d26c206f672c2c SHA256 d38637f3b9f5f198a368d4f3f10e7a6fa16e96231e12ca9a522ac62635b3f956
-MISC ChangeLog 7874 RMD160 0858bac4a26e3fea0845d29e0140e57665e4105b SHA1 81a9816e9f60d4af0a594597719094dd8ae2dc59 SHA256 c8e1cc25002848e5b20d77fb1979000ab8436578209d5d50def034ad496522f8
+EBUILD texmaker-1.91.ebuild 1754 RMD160 3e2548282ec2098812e631c66798142afaebed7e SHA1 9d800615f3831f73f6e0cc5c7fd9e2beab9163ec SHA256 bc21a929275d95a2c48ab8f9a86e05007230f534ce50877990b490fca96885d8
+MISC ChangeLog 8081 RMD160 d2255cc03a21344a6599043764e4ce086930b5c2 SHA1 a117aa6300a2127dbed3a262cda86986deb628b7 SHA256 3303c86ecb45e536006e2f29a831946f062db310457996dad46023eb7f65d37c
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkn56BMACgkQvFcC4BYPU0r1YgCguqdTliiW7JCIQhO0Yy6cWoRP
-U4sAn1T9evuYa/s54elbdy4DtgpDzb1F
-=GjLN
+iEYEARECAAYFAkoswdIACgkQvFcC4BYPU0rrLwCgjKw9brtIKnkYvbatyOOQRwqA
+ercAoJJjgD9upHIiCxQ13dULBYa/x5xA
+=VsJh
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-1.91-hunspell.patch b/app-office/texmaker/files/texmaker-1.91-hunspell.patch
new file mode 100644
index 000000000000..b7659d0939de
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-1.91-hunspell.patch
@@ -0,0 +1,72 @@
+Index: texmaker-1.9/spellerdialog.h
+===================================================================
+--- texmaker-1.9.orig/spellerdialog.h
++++ texmaker-1.9/spellerdialog.h
+@@ -13,7 +13,7 @@
+ 
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ #include <QTextCursor>
+ 
+Index: texmaker-1.9/texmaker.pro
+===================================================================
+--- texmaker-1.9.orig/texmaker.pro
++++ texmaker-1.9/texmaker.pro
+@@ -3,7 +3,8 @@ TEMPLATE	= app
+ TARGET	 = texmaker
+ QT += network \
+       xml
+-CONFIG	+= qt warn_off release
++CONFIG	+= qt warn_off release link_pkgconfig
++PKGCONFIG = hunspell
+ ###############################
+ HEADERS	+= texmaker.h \
+ 	texmakerapp.h \
+@@ -39,25 +40,6 @@ HEADERS	+= texmaker.h \
+ 	manhattanstyle.h \
+ 	stylehelper.h \
+ 	styleanimator.h \
+-	hunspell/affentry.hxx \
+-	hunspell/affixmgr.hxx \
+-	hunspell/atypes.hxx \
+-	hunspell/baseaffix.hxx \
+-	hunspell/csutil.hxx \
+-	hunspell/dictmgr.hxx \
+-	hunspell/hashmgr.hxx \
+-	hunspell/htypes.hxx \
+-	hunspell/hunspell.hxx \
+-	hunspell/hunspell.h \
+-	hunspell/langnum.hxx \
+-	hunspell/license.hunspell \
+-	hunspell/phonet.hxx \
+-	hunspell/suggestmgr.hxx \
+-	hunspell/license.myspell \
+-	hunspell/filemgr.hxx \
+-	hunspell/hunzip.hxx \
+-	hunspell/replist.hxx \
+-	hunspell/w_char.hxx \
+ 	singleapp/qtlocalpeer.h \
+ 	singleapp/qtlockedfile.h \
+ 	singleapp/qtsingleapplication.h \
+@@ -96,18 +78,6 @@ SOURCES	+= main.cpp \
+ 	manhattanstyle.cpp \
+ 	stylehelper.cpp \
+ 	styleanimator.cpp \
+-	hunspell/affentry.cxx \
+-	hunspell/affixmgr.cxx \
+-	hunspell/csutil.cxx \
+-	hunspell/dictmgr.cxx \
+-	hunspell/hashmgr.cxx \
+-	hunspell/hunspell.cxx \
+-	hunspell/phonet.cxx \
+-	hunspell/suggestmgr.cxx \
+-	hunspell/utf_info.cxx \
+-	hunspell/filemgr.cxx \
+-	hunspell/replist.cxx \
+-	hunspell/hunzip.cxx \
+ 	singleapp/qtlocalpeer.cpp \
+ 	singleapp/qtlockedfile.cpp \
+ 	singleapp/qtsingleapplication.cpp \
diff --git a/app-office/texmaker/texmaker-1.91.ebuild b/app-office/texmaker/texmaker-1.91.ebuild
new file mode 100644
index 000000000000..b27ed448641d
--- /dev/null
+++ b/app-office/texmaker/texmaker-1.91.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-1.91.ebuild,v 1.1 2009/06/08 07:46:21 aballier Exp $
+
+EAPI=1
+
+inherit eutils versionator qt4
+
+DESCRIPTION="A nice LaTeX-IDE"
+
+# The upstream version numbering is bad, so we have to remove a dot in the
+# minor version number
+MAJOR="$(get_major_version)"
+MINOR_1="$(($(get_version_component_range 2)/10))"
+MINOR_2="$(($(get_version_component_range 2)%10))"
+if [ ${MINOR_2} -eq "0" ] ; then
+	MY_P="${PN}-${MAJOR}.${MINOR_1}"
+else
+	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
+fi
+
+S="${WORKDIR}/${MY_P}"
+HOMEPAGE="http://www.xm1math.net/texmaker/"
+SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+IUSE=""
+
+COMMON_DEPEND="x11-libs/libX11
+	x11-libs/libXext
+	>=x11-libs/qt-gui-4.5.1:4
+	>=x11-libs/qt-core-4.5.1:4
+	>=app-text/hunspell-1.2.4"
+
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	virtual/ghostscript
+	media-libs/netpbm"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-hunspell.patch"
+}
+
+src_compile() {
+	eqmake4 texmaker.pro || die "qmake failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install || die "make install failed"
+
+	insinto /usr/share/pixmaps/texmaker
+	doins utilities/texmaker*.png || die "doins failed."
+	doins utilities/texmaker.svg || die "doins failed."
+
+	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "/usr/share/${PN}/usermanual_en.html"
+	elog
+}