Version bump, move to qt4-r2.eclass

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

4 files changed, 156 insertions, 2 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 2a45cbad80b7..430f4f632cf5 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.68 2010/05/20 10:34:59 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.69 2010/08/10 06:56:52 jlec Exp $
+
+*texmaker-2.0 (10 Aug 2010)
+
+  10 Aug 2010; Justin Lecher <jlec@gentoo.org> +texmaker-2.0.ebuild,
+  +files/texmaker-2.0-hunspell.patch:
+  Version bump, move to qt4-r2.eclass
 
   20 May 2010; Peter Volkov <pva@gentoo.org> texmaker-1.92.ebuild:
   amd64 stable, bug 299590, thank Roland Ramthun for help.
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index a2f9fb05415d..320b2cdfb13b 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,13 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+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
 AUX texmaker-1.99-hunspell.patch 2003 RMD160 d55780ceb6bcf3eb42ea298212ccc1334adacfd4 SHA1 8d109522237e16d5139979a7b044cb95d4e37ce7 SHA256 33ab95d13cf9d390b7c7d9fd465fd2c55163c3541228dfaa7eb33861c69977d0
+AUX texmaker-2.0-hunspell.patch 1886 RMD160 e5e99324b5a7f4c04b35b3a3fc78a3ea477a8be3 SHA1 b1ff9dcfd474104bc601b3476dbbddf5eb3ed5b5 SHA256 6aeca44554c71227fc56475de544a72968540d6c3b7cf527caf8d9296ebac42e
 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
 DIST texmaker-1.9.2.tar.bz2 3094044 RMD160 218f662959843d3417368195d92c16de6970ac9e SHA1 72d2dc0782eeb4da7f0c2694f72ff94ef5168f5e SHA256 6b479788cbce4b940eb78fa011d1ee52c4959c4dc01441ed9a82b045131a10c6
 DIST texmaker-1.9.9.tar.bz2 3171903 RMD160 4b3bae8b91b65b7b1a16a7e316c901d474451cdf SHA1 947811ff7ba6385c24f51188c65492949ef76731 SHA256 4896ef933b06d0518e281bb46654a028fd2a1db14e7bc16964b9e6a3bc47ea4d
+DIST texmaker-2.0.tar.bz2 3235821 RMD160 843d3447ddc86c1ef359df42815100269741dfe5 SHA1 810687fa1a7ec80ce0ee9ffccafe91ba7284cabc SHA256 638d48909ffe0b3b23d6502c3b85e7e311af707cc9344f6b33eff0ea31f599ab
 EBUILD texmaker-1.80.ebuild 1827 RMD160 7cc299745387c5479482d53c3f485b7a37d3eb8f SHA1 89bdbcb9561197000014dc6ea0fc97d41b6f7c10 SHA256 38c21a79b170d417b37e51c694763a2a842305d6c542a69b5c3fa3f15fe30465
 EBUILD texmaker-1.91.ebuild 1754 RMD160 ff5dc52a17ef2693926f3778eee0b6bea41acabf SHA1 100f4fc4217b412b69e2f94428718187dc8a572c SHA256 f790685b0452cb37a72b493e7dd24264a24745e702007007b40a8cdb1e5ec207
 EBUILD texmaker-1.92.ebuild 1755 RMD160 d311e149e989a0e60f93d4de51c405afb575d9de SHA1 bbe657c95529d64cdfcd36eb736949114bcad033 SHA256 6e2c584f4069049fd60e84b963d09bd4b41a9f0735bc18ae038114eb3ef3cbe0
 EBUILD texmaker-1.99.ebuild 1720 RMD160 6b1285bc1596c9bcf14228cdff14cbf417eeed67 SHA1 21d90525fac49853b1c95197ac12bf8838b6ea5f SHA256 0a6f604f60906475527fc8f1b258767a20e4a587c90ee8de25a76b227c66cc52
-MISC ChangeLog 9358 RMD160 5b58eb31710afab2c91c61d03ccd02f51900ae26 SHA1 b6758b85de32fa24d0c19cb35878971763543ba3 SHA256 167c50256ec9c648a67b99a3c490c02f02bed496ca15ad771d78ac2abf4e5466
+EBUILD texmaker-2.0.ebuild 1656 RMD160 eb8d703c1e77aead0d6cbf1e7cb6046fd98b403d SHA1 5880c0fcdaf831b3d15e22fe225d0f8536593652 SHA256 fe34590a1f0c9091c52fe29a684eea97f5d6bca54cb9fc8574adea0d35f1d52a
+MISC ChangeLog 9534 RMD160 62c776f6c4f0659e0bd6ea31ce2b3841d4dc4c71 SHA1 42573ca9c1f5bd17a34b45d15756173a27fe60a9 SHA256 48eb1489c412bb6ba3b410cb1785d2457db81dd3e33720a46a306370c4a843f2
 MISC metadata.xml 156 RMD160 2bf6b2ed9ff0fcef1e902cf093ccf4ae2dcc70a0 SHA1 e9260cd53905d8569cf3327ded4c6d01653fc389 SHA256 b4971b8472ab3fe4fbfe41b331a79193ca19e86c08d055ad1c20eaf9e04b79b6
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iEYEARECAAYFAkxg+DkACgkQgAnW8HDreRbCFACgtjT/dQXMwGVYHY1hME+XkfQ/
+fQUAn2TOAdwszBpsiv+zkAmiyG87jwBK
+=c4wS
+-----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-2.0-hunspell.patch b/app-office/texmaker/files/texmaker-2.0-hunspell.patch
new file mode 100644
index 000000000000..ff83c5767612
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-2.0-hunspell.patch
@@ -0,0 +1,72 @@
+diff --git a/spellerdialog.h b/spellerdialog.h
+index 88e1c93..2622834 100644
+--- a/spellerdialog.h
++++ b/spellerdialog.h
+@@ -13,7 +13,7 @@
+ 
+ #include "ui_spellerdialog.h"
+ #include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ #include <QTextCursor>
+ 
+diff --git a/texmaker.pro b/texmaker.pro
+index 9887896..d873982 100644
+--- a/texmaker.pro
++++ b/texmaker.pro
+@@ -4,7 +4,8 @@ TARGET	 = texmaker
+ QT += network \
+       xml \
+       webkit
+-CONFIG	+= qt warn_off release
++CONFIG	+= qt warn_off release link_pkgconfig
++PKGCONFIG = hunspell
+ TEXMAKERVERSION=2.0
+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
+ ###############################
+@@ -48,25 +49,6 @@ HEADERS	+= texmaker.h \
+ 	pdfdocumentwidget.h \
+ 	pdfscrollarea.h \
+ 	userquickdialog.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 \
+@@ -111,18 +93,6 @@ SOURCES	+= main.cpp \
+ 	pdfdocumentwidget.cpp \
+ 	pdfscrollarea.cpp \
+ 	userquickdialog.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-2.0.ebuild b/app-office/texmaker/texmaker-2.0.ebuild
new file mode 100644
index 000000000000..b1a0ff443cca
--- /dev/null
+++ b/app-office/texmaker/texmaker-2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-2.0.ebuild,v 1.1 2010/08/10 06:56:52 jlec Exp $
+
+EAPI="3"
+
+inherit base qt4-r2 versionator
+
+# 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
+
+DESCRIPTION="A nice LaTeX-IDE"
+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=""
+
+S="${WORKDIR}/${MY_P}"
+
+
+COMMON_DEPEND="
+	app-text/poppler[qt4]
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/qt-gui:4
+	x11-libs/qt-webkit:4
+	x11-libs/qt-xmlpatterns:4
+	>=app-text/hunspell-1.2.4"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
+
+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"
+}