app-office/texmaker: Version Bump, #427134; use pkg-config for poppler-qt4 instead of manual hack; define PREFIX instead of using prefix.eclass to fix offset; drop old

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

9 files changed, 46 insertions, 541 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 0f24cf92b5eb..b7cc86aff1c8 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,16 @@
 # 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.101 2012/05/26 11:58:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.102 2012/07/19 09:40:02 jlec Exp $
+
+*texmaker-3.4 (19 Jul 2012)
+
+  19 Jul 2012; Justin Lecher <jlec@gentoo.org> -texmaker-3.3.1.ebuild,
+  -files/texmaker-3.3.1-hunspell.patch, -texmaker-3.3.2.ebuild,
+  -files/texmaker-3.3.2-hunspell.patch, -files/texmaker-3.3.2-qt48.patch,
+  -texmaker-3.3.3.ebuild, -files/texmaker-3.3.3-hunspell.patch,
+  +texmaker-3.4.ebuild, +files/texmaker-3.4-hunspell.patch:
+  Version Bump, #427134; use pkg-config for poppler-qt4 instead of manual hack;
+  define PREFIX instead of using prefix.eclass to fix offset; drop old
 
 *texmaker-3.3.4 (26 May 2012)
 
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 1a961f28512d..c68ac021e62f 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,19 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX texmaker-3.1-hunspell.patch 4493 SHA256 4605225c49282b2e075f3fc96dddaf98367be415a7ef195f27d9ff537a107f87 SHA512 212cb763cdca5e4b3ba8f0893927df7e6dfeb11be8a52861b323fa415827e6d8d91402f7ce5a90ffe49d8681a78ea84abf4c339a4c2973b8bf38d5f14fba7780 WHIRLPOOL 4034fd261ace8d1cbbcfba376b8d576f16d13181e2aef39a294fa2e44517a24137a7b806a6167ffe0520f7aa7d028e2d545bdf7f127e36b4a1dac2e183397f0e
-AUX texmaker-3.3.1-hunspell.patch 4478 SHA256 90d8f46567312101a5d926930046f6d17dd337dad596ffcede52087a89a2adcb SHA512 5adc440492f511a71ebfd7ebdf6048465e9bffdedb2e8076f452a24efea13c6003765ffb1bb1fad084eac1f0a51d0ca19b13dec231940dc73fcef79fb1da004e WHIRLPOOL 951cb3e2268003f423a10d3976a3e739951689ee56e059918a3714330650232ca45c44a322ac2f48a21f90f56ed833b5024c16f2e1781737fe0eafe6f4362956
-AUX texmaker-3.3.2-hunspell.patch 4478 SHA256 26d708f330ce4d6b07dbe0cb0249d9e0fdd4899e4be55ce65bf592c93b492d67 SHA512 786d53bbe6d0cc6b1c8f2d7638d98e43b507e8056495039e498fce7f60d40b46a53584deb54a42a674445310a18521b1ff2a0bc60b3776ed6aa46565675b6f0a WHIRLPOOL 762ba5194c1b1f9998225abd244a09ae1f92b5df1dfd486bac1244a5260f804ee03e1bf42bd0274c835a7ac7a821f6f89912175f0670c0c5495657284d913e3a
-AUX texmaker-3.3.2-qt48.patch 294 SHA256 28da547538b5ccff6fa60e0f3b7d77749991d62174c97f9f637db12c7a3365aa SHA512 28d85b799b81150748b4483b6cc514472aabf646da9ef88eedad6f4347b85e848b8e1c36608ccfdd667f7fca32cfffc619343af31f1364e0f2b134cf84ced80c WHIRLPOOL bd42204ac3e6c09d5f660cd07d595cc6f51878c2fd523ffbf5d1ac13256fbbdb4f1f8ec3b519f2d186e0a7e7d1d6f6c346114c58b67e3742880ba3a7219810bc
-AUX texmaker-3.3.3-hunspell.patch 4478 SHA256 52555036668b30d334b6caa05c5eeb3e262ec958fabdfdb856ab4e897023b0fa SHA512 ee85b1b2eceb8cd35536b42eccf505cd32d036b68f07b7e134c0edf3866db0766837ab19ea9c7483bfc9f58a2905e105748d4e4724ae60a49fa8194b28294ae0 WHIRLPOOL 1ff4177da49b4efe5b41640ae958091cf390234693ddc216887342b0c698f603ea763b4e4ba813fe0420d1c51d4544f868732492a133935c4850700a8938eef3
 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
 DIST texmaker-3.1.tar.bz2 6018840 SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78 SHA512 5fa2ad28198f712a73b41b1bc296ad8267182a59e1d5631336c20f527c8f88178e6fbd9fc8a40ef8559283c0b6e548c9d29c9e038c0b382cf60ad28a4057d811 WHIRLPOOL 94e80c3d345e478ace202f9c3b8af17b2966681f5dd94361704d48d1c2617f72596f75b769a8baed4bf06692dae8ca651da34e75751e03316077b178d16e864b
-DIST texmaker-3.3.1.tar.bz2 7689820 SHA256 fad20df029c00bcf627eefecdde95720d9bf1611f4168b2a977ddd1f8c7a7c38 SHA512 a9446b3dbdc3374223953927b1b6a28b33a0c434f0a912bcb694a687b247bf4dd121a69e342120150602a50634997590247a482b5c8a5f3a3d3086920a2ef0d1 WHIRLPOOL cc73504527c0d9f7d43a12ca4a760566a9fc9ea83d93a303878c3838e30f217cbeb5ee11f1a1e665d7ec48084d4a976078d60e3a477ff7a032292ea2770809ab
-DIST texmaker-3.3.2.tar.bz2 7781249 SHA256 a3e16c820ef16782a7331c1550f97cab7b29111f77664340239fc448540a05fb SHA512 f02e8d206a4a5ce8c6691248f678318298ea35d5c39c0c179eb13ce28d5826dc5e77674cc69633a791d126daee6615854ae6a1cb9107095c5c75bd195c434f99 WHIRLPOOL 5c8ccc1afa02d8191bd9be507e40748005911162196d64af1e21bcacdce9e1e35d0cc1857d092460982f0d71f1a86b96b47a961f6cc3bc4ea9e323b72e68667b
-DIST texmaker-3.3.3.tar.bz2 8023823 SHA256 5bb4c6e74e70d5d8f231f67a3d6895fa482f602720491d75d4b8813ecd49e92d SHA512 ef85b81ea4c9c5e259feaadf566f725213c9913c142e320da33d2c9e64264af53e9a25435413a2351679ca2f3d2e005c1ae80d9a7f4dbc50a5f2b84414790d43 WHIRLPOOL 7789aef78fea1d2f27acccd6d5d3498e62a0357af7fafe40d602fdbd9bdae8e6c8147e6dbcc2f06d825b92e24934c1eecb256809863c0a90c77c3f2e1abc59b2
 DIST texmaker-3.3.4.tar.bz2 13028203 SHA256 db9aa4d2633e6ad96ff4b0d893205d42c2220928f021c210146a41ecf87525f5 SHA512 014bfbe2a72aa2aef8d71972526959116a8dc39852475ea8e9da0d0fbbc4e8441c04b124be93911a0b637436f94ecab730150064f2bb3842e6566cd26116c28e WHIRLPOOL fb0a5d150ac463905b0c243e4402858e0142c42f1278f185e678e48a690369830a75848b342f0f22c3db6495580ee03eb65cbcf989bad52b63f87371d660970d
+DIST texmaker-3.4.tar.bz2 13059853 SHA256 0075128ab2e3342722900b3ee2b2870638ea333837d3beb2fadb9ebd0fdf6310 SHA512 22ea3a7ee8692cbcdf301a072aa532838a780e74cfea15e42dff222f882ad4f4f10f05f7638d0d6f581f805a6583662e427d38c4a17e74408d684cb6b64a887e WHIRLPOOL ea5e79d01f694b0f70cbb6e3bddc51f8403218b16b23ceea83146e96d87791a5f6a7ba3bb3a60824b8f6aa8cc78e764c4d7d14171b1c4b5b6fb505eff722221f
 EBUILD texmaker-3.1.ebuild 1810 SHA256 672e277761adda20332412f361d6bffffbc783ef92ac9b8ab40db01683d5e21a SHA512 72cdca137cb59be9d4774d6cd4a12cc72ae0a4b87e7713c0c442daa999e6a63fda2c1e179db431caa6629d226cfe67dfb7c8573f849e6da56d7af8f602c99766 WHIRLPOOL dae2c4fa5afa6f272ab5ecfe690d210879593e5376cbcfda053d15ce9cc5537043ad873b6c0cf82950c44b26c02400abb245b792b4425047cb200baedddc37dd
-EBUILD texmaker-3.3.1.ebuild 1816 SHA256 cd01f48948bcda50ee2681a133edbd50a72f8b5ab41ff8ea0acbb9ababc590a6 SHA512 22858ddba7e677d9b207dadad784e28572e8ff226e70d64e3e5e1de44cf607251311384cab9d234b2973f126ab4eecec88b91147ebc6c09d89484988f562ed23 WHIRLPOOL a414f92aed2a89c4a12b5fd3af1c20130560d19984bbcf74eb386fa4f16987313ce952eb4286b8cbd5b6ed0155b9bb10d4f679f29b9df1472b6c3f97e1a2e35b
-EBUILD texmaker-3.3.2.ebuild 1849 SHA256 291dfb42c453e92517b2221db6b8564ef1a8ba400d0b19f358b8bff5d7c357b7 SHA512 72dbf8c47b7ee680eb0df5678bb940585c10bc07156f258ed42efff3d870ece9d039d344137ca7cbe2f8e66428d1484f8e9c8eb687ecceef15564feb756c6656 WHIRLPOOL 6573be2fb47c33eec4cd0647a72577ad3060c762a0ebfed723775d7047af3dbe410e24fa9b9de0f634af11fd157cb51d213528b94c7005569e311cbf22bd42a1
-EBUILD texmaker-3.3.3.ebuild 1726 SHA256 c40019c7cee56932b0f80e7a53790c8fa95a639e2c7ebc007484a8992640da04 SHA512 6a1c8edcd30bc0d7b5bd9347b245e681a85aade732bff751cc3f667845c1feac8d54fd117d4c50e8084b1a4741ee04bbfd5515bf1066a14f7217c71960d0cbc3 WHIRLPOOL ad986e39f94c0fa2d345784437ad3b9943ab8b7afd565824cae5f434513f789b8b2c28208819ee7fb2c5adb0fa11cbbef19281c818cb9ace3083f80f34d73e16
 EBUILD texmaker-3.3.4.ebuild 1723 SHA256 d95a9d40ce15c38243bd57adf2eeb482eee961c694d9bc0b8414bcddf6e0b788 SHA512 efcb318e5d0d625f6088898f8b762bf93ecc18b4994a1fce48f4886f6a776dd07847d1d885b9af7036dc360f10e77b62c35d085e8404e17507faecb1043f66c6 WHIRLPOOL 93353ae03e899fc89f2f5b0554f919fa474db493e7dbbdae13b9a7eaebfeb92eed669d7bb8b07c5c28c1423117754e3e47611043a34e391d7d405f50a3c15573
-MISC ChangeLog 15227 SHA256 420c48a894d6a311e749fece2b8c060eda99b7769a6c144d708c9693202af73e SHA512 b3c8368bc5e93b4193c0ebd977af192d1cec331e98d15c5a1d49146d35400772a9776eaa9da402d17087fb02ede1ea8bb2d979f8dd2e944893b2262284152144 WHIRLPOOL 44f5f8397022b6272e10347663fa2d788d670e0cb6f1b5137cd7f9a7729bd7f88ceaca4edec938fb3335aa11de4a6ee10b3d1f2bea6521b87b058fd098b3be21
+EBUILD texmaker-3.4.ebuild 1801 SHA256 449a21ac6455d0ae2826aee986bc108296912b0c1564edd05f3b53339a3bf1e9 SHA512 a7ee452df4c0385014cd80a9fc7f4491b5120e8be71768b0ace3ffd7e7e71269455b74827cf6161b90a384875822423eb5e7fe0da01846050b51c6483fe5f7c5 WHIRLPOOL bb47f63209f88f815577a73dbced5c4aaf6325fc6450498ce95e0884cfac9abc85a22c6c8594f46b105a3a34dbd7a84e2a913b1da3475ce0c24578a4b995f5a9
+MISC ChangeLog 15741 SHA256 161eee00bcbf4f6e69ffb81aa2feec671d3faa9bb67ea5d47ed48ea2f6a442be SHA512 9b0b4ba82c89501e04331721d72a52ac10d626f3200af0194a64c6ed559c107ed22078611e645affa5109d3eda61301e864329412c3b334bbb037dc5118e2fec WHIRLPOOL a1dc0f83e7c79f317ae7d2c087269decd7c7d2249bcded67cfd8fe13f10c7d604cce38cf3255dd25b13b09759b2a48912009edab5d8a9462c8ccef4665da7660
 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
+
+iEYEAREIAAYFAlAH1fgACgkQgAnW8HDreRbKlwCfasgnnQB5ghUnREHyHKs6AAYF
+EdgAn12+NuVA0FjnF/HO+WdfOmOJs1cC
+=LZFd
+-----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-3.3.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.3.2-hunspell.patch
deleted file mode 100644
index 9b811cd01443..000000000000
--- a/app-office/texmaker/files/texmaker-3.3.2-hunspell.patch
+++ /dev/null
@@ -1,167 +0,0 @@
- configdialog.cpp   |    4 ++--
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   42 ++++++------------------------------------
- 7 files changed, 13 insertions(+), 43 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 3b91fd0..338b166 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -210,9 +210,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
- 
-diff --git a/latexeditor.h b/latexeditor.h
-index e053390..0e82f08 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 fb8d7d4..716b466 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 584be7f..b0069a4 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 17d0a24..28ad193 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=3.3.2
- 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 \
-@@ -276,13 +246,13 @@ isEmpty( ICONDIR ) {
-     ICONDIR=/usr/share/pixmaps
- }
- 
--INCLUDEPATH  += /usr/include/poppler/qt4
--LIBS         += -L/usr/lib -lpoppler-qt4
--LIBS         += -L/usr/lib -lz
-+INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS         += -lpoppler-qt4
-+LIBS         += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- 
- INSTALLS = target
diff --git a/app-office/texmaker/files/texmaker-3.3.2-qt48.patch b/app-office/texmaker/files/texmaker-3.3.2-qt48.patch
deleted file mode 100644
index 139502f12aae..000000000000
--- a/app-office/texmaker/files/texmaker-3.3.2-qt48.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- main.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/main.cpp b/main.cpp
-index e979c1b..da2831a 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -14,6 +14,7 @@
- 
- #include "texmakerapp.h"
- #include <QStringList>
-+#include <GL/glu.h>
- 
- 
- int main( int argc, char ** argv )
diff --git a/app-office/texmaker/files/texmaker-3.3.3-hunspell.patch b/app-office/texmaker/files/texmaker-3.3.3-hunspell.patch
deleted file mode 100644
index 92776c078725..000000000000
--- a/app-office/texmaker/files/texmaker-3.3.3-hunspell.patch
+++ /dev/null
@@ -1,167 +0,0 @@
- configdialog.cpp   |    4 ++--
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   42 ++++++------------------------------------
- 7 files changed, 13 insertions(+), 43 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 3b91fd0..338b166 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -210,9 +210,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
- 
-diff --git a/latexeditor.h b/latexeditor.h
-index e053390..0e82f08 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 fb8d7d4..716b466 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 584be7f..b0069a4 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 17d0a24..28ad193 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=3.3.3
- 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 \
-@@ -276,13 +246,13 @@ isEmpty( ICONDIR ) {
-     ICONDIR=/usr/share/pixmaps
- }
- 
--INCLUDEPATH  += /usr/include/poppler/qt4
--LIBS         += -L/usr/lib -lpoppler-qt4
--LIBS         += -L/usr/lib -lz
-+INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS         += -lpoppler-qt4
-+LIBS         += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- 
- INSTALLS = target
diff --git a/app-office/texmaker/files/texmaker-3.3.1-hunspell.patch b/app-office/texmaker/files/texmaker-3.4-hunspell.patch
index e32786ea599c..18ee79ab1924 100644
--- a/app-office/texmaker/files/texmaker-3.3.1-hunspell.patch
+++ b/app-office/texmaker/files/texmaker-3.4-hunspell.patch
@@ -1,30 +1,13 @@
- configdialog.cpp   |    4 ++--
  latexeditor.h      |    2 +-
  latexeditorview.h  |    2 +-
  latexhighlighter.h |    2 +-
  spellerdialog.h    |    2 +-
  texmaker.h         |    2 +-
- texmaker.pro       |   42 ++++++------------------------------------
- 7 files changed, 13 insertions(+), 43 deletions(-)
+ texmaker.pro       |   40 ++++------------------------------------
+ 6 files changed, 9 insertions(+), 41 deletions(-)
 
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 3b91fd0..338b166 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -210,9 +210,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
- 
 diff --git a/latexeditor.h b/latexeditor.h
-index e053390..0e82f08 100644
+index c12bbe3..94b9a3c 100644
 --- a/latexeditor.h
 +++ b/latexeditor.h
 @@ -33,7 +33,7 @@
@@ -37,7 +20,7 @@ index e053390..0e82f08 100644
  typedef  int UserBookmarkList[3];
  
 diff --git a/latexeditorview.h b/latexeditorview.h
-index fb8d7d4..716b466 100644
+index 5951656..796eb28 100644
 --- a/latexeditorview.h
 +++ b/latexeditorview.h
 @@ -22,7 +22,7 @@
@@ -76,7 +59,7 @@ index 83248ae..cd16dad 100644
  #include <QTextCursor>
  
 diff --git a/texmaker.h b/texmaker.h
-index 584be7f..b0069a4 100644
+index 045ffc8..bf2705a 100644
 --- a/texmaker.h
 +++ b/texmaker.h
 @@ -48,7 +48,7 @@
@@ -89,7 +72,7 @@ index 584be7f..b0069a4 100644
  #include "pdfviewerwidget.h"
  #include "pdfviewer.h"
 diff --git a/texmaker.pro b/texmaker.pro
-index 17d0a24..28ad193 100644
+index 4e11282..9625bd5 100644
 --- a/texmaker.pro
 +++ b/texmaker.pro
 @@ -4,7 +4,8 @@ TARGET	 = texmaker
@@ -98,8 +81,8 @@ index 17d0a24..28ad193 100644
        webkit
 -CONFIG	+= qt warn_off release
 +CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.3.1
++PKGCONFIG = hunspell poppler-qt4
+ TEXMAKERVERSION=3.4
  DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
  DEFINES += HAVE_SPLASH
 @@ -67,25 +68,6 @@ HEADERS	+= texmaker.h \
@@ -147,15 +130,13 @@ index 17d0a24..28ad193 100644
  	singleapp/qtlocalpeer.cpp \
  	singleapp/qtlockedfile.cpp \
  	singleapp/qtsingleapplication.cpp \
-@@ -276,13 +246,13 @@ isEmpty( ICONDIR ) {
+@@ -278,13 +248,11 @@ isEmpty( ICONDIR ) {
      ICONDIR=/usr/share/pixmaps
  }
  
 -INCLUDEPATH  += /usr/include/poppler/qt4
 -LIBS         += -L/usr/lib -lpoppler-qt4
 -LIBS         += -L/usr/lib -lz
-+INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS         += -lpoppler-qt4
 +LIBS         += -lz
  DEFINES += PREFIX=\\\"$${PREFIX}\\\"
  target.path = $${PREFIX}/bin
diff --git a/app-office/texmaker/texmaker-3.3.1.ebuild b/app-office/texmaker/texmaker-3.3.1.ebuild
deleted file mode 100644
index 796367a0851a..000000000000
--- a/app-office/texmaker/texmaker-3.3.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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.3.1.ebuild,v 1.2 2012/05/03 20:00:38 jdhore Exp $
-
-EAPI="3"
-
-inherit base prefix 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.6.1:4
-	>=x11-libs/qt-core-4.6.1:4
-	>=x11-libs/qt-webkit-4.6.1: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}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
-
-src_prepare() {
-	qt4-r2_src_prepare
-	eprefixify ${PN}.pro configdialog.cpp
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" 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 "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
diff --git a/app-office/texmaker/texmaker-3.3.2.ebuild b/app-office/texmaker/texmaker-3.3.2.ebuild
deleted file mode 100644
index 466bddae8ebd..000000000000
--- a/app-office/texmaker/texmaker-3.3.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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.3.2.ebuild,v 1.3 2012/05/03 20:00:38 jdhore Exp $
-
-EAPI="3"
-
-inherit base prefix 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.6.1:4
-	>=x11-libs/qt-core-4.6.1:4
-	>=x11-libs/qt-webkit-4.6.1: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}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-hunspell.patch"
-	"${FILESDIR}/${P}-qt48.patch"
-	)
-
-src_prepare() {
-	qt4-r2_src_prepare
-	eprefixify ${PN}.pro configdialog.cpp
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" 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 "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
diff --git a/app-office/texmaker/texmaker-3.3.3.ebuild b/app-office/texmaker/texmaker-3.4.ebuild
index 550009ae6931..3f0ed66bd7e7 100644
--- a/app-office/texmaker/texmaker-3.3.3.ebuild
+++ b/app-office/texmaker/texmaker-3.4.ebuild
@@ -1,10 +1,10 @@
 # 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.3.3.ebuild,v 1.2 2012/05/03 20:00:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.4.ebuild,v 1.1 2012/07/19 09:40:02 jlec Exp $
 
 EAPI=4
 
-inherit base prefix qt4-r2 versionator
+inherit base qt4-r2 versionator
 
 # The upstream version numbering is bad, so we have to remove a dot in the
 # minor version number
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	x11-libs/qt-gui:4
 	x11-libs/qt-core:4
 	x11-libs/qt-webkit:4
-	>=app-text/hunspell-1.2.4"
+	app-text/hunspell"
 RDEPEND="${COMMON_DEPEND}
 	virtual/latex-base
 	app-text/psutils
@@ -48,13 +48,15 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-hunspell.patch"
-	"${FILESDIR}/${P}-qt48.patch"
+	"${FILESDIR}"/${P}-hunspell.patch
+	"${FILESDIR}"/${PN}-3.3.3-qt48.patch
 	)
-
-src_prepare() {
-	qt4-r2_src_prepare
-	eprefixify ${PN}.pro configdialog.cpp
+src_configure() {
+	eqmake4 \
+		${PN}.pro \
+		PREFIX="${EPREFIX}/usr" \
+		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
 }
 
 src_install() {