app-office/texmaker: Version BUmp; #432476

Package-Manager: portage-2.2.0_alpha122/cvs/Linux x86_64

4 files changed, 245 insertions, 2 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index bd20aab7d172..900ad9a09833 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.106 2012/08/08 20:20:22 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.107 2012/08/26 09:48:24 jlec Exp $
+
+*texmaker-3.5 (26 Aug 2012)
+
+  26 Aug 2012; Justin Lecher <jlec@gentoo.org> +texmaker-3.5.ebuild,
+  +files/texmaker-3.5-hunspell.patch:
+  Version BUmp; #432476
 
   08 Aug 2012; Brent Baude <ranger@gentoo.org> texmaker-3.3.4.ebuild:
   Marking texmaker-3.3.4 ppc for bug 427198
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 3f4e980744ad..e429cd62800e 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,15 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX texmaker-3.1-hunspell.patch 4493 SHA256 4605225c49282b2e075f3fc96dddaf98367be415a7ef195f27d9ff537a107f87 SHA512 212cb763cdca5e4b3ba8f0893927df7e6dfeb11be8a52861b323fa415827e6d8d91402f7ce5a90ffe49d8681a78ea84abf4c339a4c2973b8bf38d5f14fba7780 WHIRLPOOL 4034fd261ace8d1cbbcfba376b8d576f16d13181e2aef39a294fa2e44517a24137a7b806a6167ffe0520f7aa7d028e2d545bdf7f127e36b4a1dac2e183397f0e
 AUX texmaker-3.3.3-qt48.patch 294 SHA256 28da547538b5ccff6fa60e0f3b7d77749991d62174c97f9f637db12c7a3365aa SHA512 28d85b799b81150748b4483b6cc514472aabf646da9ef88eedad6f4347b85e848b8e1c36608ccfdd667f7fca32cfffc619343af31f1364e0f2b134cf84ced80c WHIRLPOOL bd42204ac3e6c09d5f660cd07d595cc6f51878c2fd523ffbf5d1ac13256fbbdb4f1f8ec3b519f2d186e0a7e7d1d6f6c346114c58b67e3742880ba3a7219810bc
 AUX texmaker-3.3.4-hunspell.patch 4478 SHA256 4d3b6dbbe829140e224bfa0cdceefef29c3ff012aa86d68b248d93bee564cd84 SHA512 4d9fc23fef2e6497f25a32cfcb3c1832527a684fedd70005fe990f234bfb90e68e752e06ba887acd84c4856d3c9f34f0aca631117a1537e49cba817e890b7f11 WHIRLPOOL 6deb23a437628c9cf69c0a7361497035b6bd923379cd4975cedcbe0222127f8f2e20b4244ace79d8d52f670aaea37b8dd2290d969f7090610edcb7fbaeaf0f09
 AUX texmaker-3.4-hunspell.patch 3853 SHA256 1dcc8521e2b97a72809044c199b7e84a1ee3c1415f376bc6a18267b2031b9cfe SHA512 be4b553cfb0fa2ed53cadabc5dcd493e5eaa3031c82f63a5e4935da98ff2b73b487e85a7e9831d3336e30b22913e092914e87f7a612a315aa91334cd6f264608 WHIRLPOOL 5ff936e6a2dd5e4f8a35049ca51b887b28482885d97a7487eee96332bdaa4e01730ed7443490624f1d8de97ce7e45d6cce733791b5ea9eec988f1d731abb0a54
 AUX texmaker-3.4.1-hunspell.patch 3855 SHA256 4855d608f4800a750b747f6a5cd5fafe0fe7110ec35d68e2ff64f1cd9b1573e0 SHA512 60c6181e4f6f83e654b49139ea03a041ed15aaddc2bcb1735f2fec7e5db5ec36e51d16a112ad71fb523ede7844fd986f6e7097f6177218e9db70b5f97152785b WHIRLPOOL 5f8b377f1c5ee2b005a00b415f0d3c35a9f3d18e7d11d913603243c9a53207aac494bb81cc4af18df56409f9316ba03de5bbc92f8aa2497538f2825bb99e5ddb
+AUX texmaker-3.5-hunspell.patch 3841 SHA256 c886be8ca7c624ee0b61f57e4d23404882a4b142e6b7b3b02262c42829aef069 SHA512 fed81729a3e0a61caa4417aa28d39ffced6e5a728715760725d7bec8c9a8848bf56c0f82c160cfa20ccf10294d88e91c4a60589b695c549273620b419ee13960 WHIRLPOOL 5a048ea581184a84af1cf31858590940e5f799ae136578376e4ceb74e82d12b4238c62b0bada4ed1a42d56b9fcee0435c2a617c70bb47fa2f54f4d151f238501
 DIST texmaker-3.1.tar.bz2 6018840 SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78 SHA512 5fa2ad28198f712a73b41b1bc296ad8267182a59e1d5631336c20f527c8f88178e6fbd9fc8a40ef8559283c0b6e548c9d29c9e038c0b382cf60ad28a4057d811 WHIRLPOOL 94e80c3d345e478ace202f9c3b8af17b2966681f5dd94361704d48d1c2617f72596f75b769a8baed4bf06692dae8ca651da34e75751e03316077b178d16e864b
 DIST texmaker-3.3.4.tar.bz2 13028203 SHA256 db9aa4d2633e6ad96ff4b0d893205d42c2220928f021c210146a41ecf87525f5 SHA512 014bfbe2a72aa2aef8d71972526959116a8dc39852475ea8e9da0d0fbbc4e8441c04b124be93911a0b637436f94ecab730150064f2bb3842e6566cd26116c28e WHIRLPOOL fb0a5d150ac463905b0c243e4402858e0142c42f1278f185e678e48a690369830a75848b342f0f22c3db6495580ee03eb65cbcf989bad52b63f87371d660970d
 DIST texmaker-3.4.1.tar.bz2 13060400 SHA256 bc11eb6d72c69919fc63bc3e44dcfc920cb03be64acbd7301b7bbce2ae12f265 SHA512 ea4b1712808520f9ab3a189da54a61aa9c85e5ca37d2d2722a08796bf91aa1641b10eddeeb157ff1dde0b825cdbb71455e78efe82f8ed63796207828958f8b59 WHIRLPOOL ba90a702471e76e539e202c1736ed446bf53957c5bccf41028b4cf0811266bbc09911b05e9d03775c02c81189b64618ac6d9eab668aaeb96f01c3c7ab874a8fc
 DIST texmaker-3.4.tar.bz2 13059853 SHA256 0075128ab2e3342722900b3ee2b2870638ea333837d3beb2fadb9ebd0fdf6310 SHA512 22ea3a7ee8692cbcdf301a072aa532838a780e74cfea15e42dff222f882ad4f4f10f05f7638d0d6f581f805a6583662e427d38c4a17e74408d684cb6b64a887e WHIRLPOOL ea5e79d01f694b0f70cbb6e3bddc51f8403218b16b23ceea83146e96d87791a5f6a7ba3bb3a60824b8f6aa8cc78e764c4d7d14171b1c4b5b6fb505eff722221f
+DIST texmaker-3.5.tar.bz2 13144036 SHA256 eddc8a60afc5f53d1f31154a2f0b6a60b8a1c3bd09dad1e8eaf5868231dfbcf0 SHA512 ae1c6491ed91863a7ecf2bcdcdf19832fb53a0c82e66e79825ef0d3e21300b3239550117aba75373303ca0eea448487434afce311c3a37d57a5ccb3f892d232a WHIRLPOOL 174c8ff38f643216b1367d60c6f48dcc684e3b409e37bcba534dbc5c84cfc52c75978f68652d6743c644ec8764409946ef9e7fd0e555cec0aadd5e84a1318d3f
 EBUILD texmaker-3.1.ebuild 1810 SHA256 672e277761adda20332412f361d6bffffbc783ef92ac9b8ab40db01683d5e21a SHA512 72cdca137cb59be9d4774d6cd4a12cc72ae0a4b87e7713c0c442daa999e6a63fda2c1e179db431caa6629d226cfe67dfb7c8573f849e6da56d7af8f602c99766 WHIRLPOOL dae2c4fa5afa6f272ab5ecfe690d210879593e5376cbcfda053d15ce9cc5537043ad873b6c0cf82950c44b26c02400abb245b792b4425047cb200baedddc37dd
 EBUILD texmaker-3.3.4.ebuild 1722 SHA256 87d921d7c2955a8039b89023ceda36a659ed4de690d94e442bc5063580646cad SHA512 99f45b18a47e9877b89106bca518c92eee59bfd872cb2a840de02ec2105b52613746702bc09710660b56fd83331935f66e035a08219922baaeb728b4330e65ef WHIRLPOOL 15df355a69440a4f08b250bd71185f689c8586e50d12b1ded2cb7a8188b332e259d40b9e5b6bf441d043c7c57d617036026afed78c449ef8950785f67017c049
 EBUILD texmaker-3.4.1.ebuild 1803 SHA256 f96636e66db6d5cdf247916f91f338938bef8d86c771dc5c715c344de3bc34a7 SHA512 9cac49d813ac76be7d63e3177fccd58580fbbce0b63d48c98ec00634545732064c9932f3dd488c4ced6bbcfc5cbf55444b34a121bad17c6715e8ab3ae266a76d WHIRLPOOL 3d7ecca193b23522bdb64aced2bd098830a8e7c0f01613442fa0105ef67612fa66d0fd5d1e9f0c85c72c55e25a77f3f52f2b1ee21cfc2f764c25a4112524a3ec
 EBUILD texmaker-3.4.ebuild 1801 SHA256 449a21ac6455d0ae2826aee986bc108296912b0c1564edd05f3b53339a3bf1e9 SHA512 a7ee452df4c0385014cd80a9fc7f4491b5120e8be71768b0ace3ffd7e7e71269455b74827cf6161b90a384875822423eb5e7fe0da01846050b51c6483fe5f7c5 WHIRLPOOL bb47f63209f88f815577a73dbced5c4aaf6325fc6450498ce95e0884cfac9abc85a22c6c8594f46b105a3a34dbd7a84e2a913b1da3475ce0c24578a4b995f5a9
-MISC ChangeLog 16235 SHA256 6397d459a2106ecec7f47e5ff3956e2447c66b93e0d984e1c8fdf9f81ae6d756 SHA512 2e0f0ae42b45b4c6ea697aa5d6eccf2dd58e026bb2890927718db43fe98d8ca498b3e1d4b74222e34b87a3b17190eee74f0acff5641468c3b78919a87d3bb906 WHIRLPOOL 2e8d7b266e738080f7154e1c85580cc5d127806167d58fd2be1e1e39d070d28c04f275652118898fd49d3da7a3b154a0b66798d7564098806df4f1f789866d7a
+EBUILD texmaker-3.5.ebuild 1801 SHA256 d98709d9036544611d7c6ef68f303afc7b2a134f6f89a27da8444947c8f6ef98 SHA512 2421ef4cd4b908fd6051647535bf2a0a16c40418258ffb7e9bd1a3ee72fd309e89b80db2eb37d08e2c0bbd8d0d5044e860c54361c136aa47f9a5be502e08806a WHIRLPOOL bde69ef1748aba96403b7acfd4ea8f1e103c8788a8d6d6df81475bc8aa50d0b300663d62e47ecb113a6dc33c46e081dab983ea198c35918b7ebc6936fa60b2e7
+MISC ChangeLog 16394 SHA256 915f033b253a3a282ee01b4daa2a8e9bf5622c2a260e763964b6d09f34dbd2d2 SHA512 ce2dc2c77521fde6008a0333d04fefe362027d695a5e072e3004f12d28604661abd16b7a5648d16e4bb16f34d1f9d52cd6e40e1ba2bf9b2213161cb3d09c2ec7 WHIRLPOOL c33cc93db7709043067c88f4d3e3b4b4e340b82ba25434c23517a9ae82fd5bbea012ff4c6dcdb40ff59271142995ea07ae7bf7107336734e75adade97fdbd929
 MISC metadata.xml 274 SHA256 1c59f208af91e0b13109901b6ceed3fcc2f64f47280631ce6552b083256555b1 SHA512 fc5a21876a0480a25b45900f0be1e9fa883db1c401af7039644b80fa634f50d4430f31dd82b240f397b543ba755e8cafdf06c60d8f884a6c86a271b4d15e8c3d WHIRLPOOL aaf6fcf7b0291f7c7a1a5ef674c171eb20eeeac04184b5a21055ecd5f4bab492c5f0c6d7fd7dd126254688e892075195430780c18e2b9638154ae42700067029
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREIAAYFAlA58P4ACgkQgAnW8HDreRamZwCdGscifQOkw5Nqd19+db0fVbtY
+/DUAoJgxuWgD/Fm4rC+78Q6qNQ5nMJuh
+=ZfxJ
+-----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-3.5-hunspell.patch b/app-office/texmaker/files/texmaker-3.5-hunspell.patch
new file mode 100644
index 000000000000..1b747e390517
--- /dev/null
+++ b/app-office/texmaker/files/texmaker-3.5-hunspell.patch
@@ -0,0 +1,148 @@
+ latexeditor.h      |  2 +-
+ latexeditorview.h  |  2 +-
+ latexhighlighter.h |  2 +-
+ spellerdialog.h    |  2 +-
+ texmaker.h         |  2 +-
+ texmaker.pro       | 40 ++++------------------------------------
+ 6 files changed, 9 insertions(+), 41 deletions(-)
+
+diff --git a/latexeditor.h b/latexeditor.h
+index 1ad4195..8f43b61 100644
+--- a/latexeditor.h
++++ b/latexeditor.h
+@@ -33,7 +33,7 @@
+ 
+ #include "latexhighlighter.h"
+ #include "textblockselection.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ typedef  int UserBookmarkList[3];
+ 
+diff --git a/latexeditorview.h b/latexeditorview.h
+index 5951656..796eb28 100644
+--- a/latexeditorview.h
++++ b/latexeditorview.h
+@@ -22,7 +22,7 @@
+ #include "gotolinewidget.h"
+ #include "replacewidget.h"
+ #include "minisplitter.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ class LatexEditorView : public QWidget  {
+    Q_OBJECT
+diff --git a/latexhighlighter.h b/latexhighlighter.h
+index e0b91b1..74ec42a 100644
+--- a/latexhighlighter.h
++++ b/latexhighlighter.h
+@@ -20,7 +20,7 @@
+ #include <QColor>
+ #include <QTextBlockUserData>
+ //#include "latexeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ 
+ class QTextDocument;
+ class LatexEditor;
+diff --git a/spellerdialog.h b/spellerdialog.h
+index 83248ae..cd16dad 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.h b/texmaker.h
+index 83093d7..7f44645 100644
+--- a/texmaker.h
++++ b/texmaker.h
+@@ -48,7 +48,7 @@
+ #include "usertagslistwidget.h"
+ #include "xmltagslistwidget.h"
+ #include "logeditor.h"
+-#include "hunspell/hunspell.hxx"
++#include <hunspell.hxx>
+ #include "browser.h"
+ #include "pdfviewerwidget.h"
+ #include "pdfviewer.h"
+diff --git a/texmaker.pro b/texmaker.pro
+index 3c0986a..a26295a 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 poppler-qt4
+ TEXMAKERVERSION=3.5
+ DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
+ DEFINES += HAVE_SPLASH
+@@ -67,25 +68,6 @@ HEADERS	+= texmaker.h \
+ 	synctex_parser_utils.h \
+ 	usertagslistwidget.h \
+ 	addtagdialog.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 \
+@@ -171,18 +153,6 @@ SOURCES	+= main.cpp \
+ 	synctex_parser_utils.c \
+ 	usertagslistwidget.cpp \
+ 	addtagdialog.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 \
+@@ -277,13 +247,11 @@ isEmpty( ICONDIR ) {
+     ICONDIR=/usr/share/pixmaps
+ }
+ 
+-INCLUDEPATH  += /usr/include/poppler/qt4
+-LIBS         += -L/usr/lib -lpoppler-qt4
+-LIBS         += -L/usr/lib -lz
++LIBS         += -lz
+ DEFINES += PREFIX=\\\"$${PREFIX}\\\"
+ target.path = $${PREFIX}/bin
+ 
+-#DEFINES += DEBIAN_SPELLDIR
++DEFINES += DEBIAN_SPELLDIR
+ 
+ 
+ INSTALLS = target
diff --git a/app-office/texmaker/texmaker-3.5.ebuild b/app-office/texmaker/texmaker-3.5.ebuild
new file mode 100644
index 000000000000..d41c238e8f24
--- /dev/null
+++ b/app-office/texmaker/texmaker-3.5.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.5.ebuild,v 1.1 2012/08/26 09:48:24 jlec Exp $
+
+EAPI=4
+
+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
+
+MY_P="${P}"
+
+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 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+COMMON_DEPEND="
+	app-text/poppler[qt4]
+	sys-libs/zlib
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/qt-gui:4
+	x11-libs/qt-core:4
+	x11-libs/qt-webkit:4
+	app-text/hunspell"
+RDEPEND="${COMMON_DEPEND}
+	virtual/latex-base
+	app-text/psutils
+	app-text/ghostscript-gpl
+	media-libs/netpbm"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-hunspell.patch
+	"${FILESDIR}"/${PN}-3.3.3-qt48.patch
+	)
+src_configure() {
+	eqmake4 \
+		${PN}.pro \
+		PREFIX="${EPREFIX}/usr" \
+		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${ED}" install
+
+	insinto /usr/share/pixmaps/texmaker
+	doins utilities/texmaker*.png
+	doins utilities/texmaker.svg
+
+	dodoc utilities/AUTHORS utilities/CHANGELOG.txt
+}
+
+pkg_postinst() {
+	elog "A user manual with many screenshots is available at:"
+	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
+}