app-office/texmaker: Version Bump, #417423; drop old

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

13 files changed, 62 insertions, 1251 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index d1ec28138bc6..0f24cf92b5eb 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,18 @@
 # 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.100 2012/05/03 20:00:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.101 2012/05/26 11:58:53 jlec Exp $
+
+*texmaker-3.3.4 (26 May 2012)
+
+  26 May 2012; Justin Lecher <jlec@gentoo.org>
+  -files/texmaker-1.91-hunspell.patch, -files/texmaker-2.30-hunspell.patch,
+  -files/texmaker-3.00-hunspell.patch, -files/texmaker-3.01-hunspell.patch,
+  -texmaker-3.2.ebuild, -texmaker-3.2.1.ebuild,
+  -files/texmaker-3.2.1-hunspell.patch, -texmaker-3.2.2.ebuild,
+  -files/texmaker-3.2.2-hunspell.patch, -files/texmaker-3.02-hunspell.patch,
+  -files/texmaker-3.2-hunspell.patch, +texmaker-3.3.4.ebuild,
+  +files/texmaker-3.3.4-hunspell.patch:
+  Version Bump, #417423; drop old
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> texmaker-3.1.ebuild,
   texmaker-3.2.ebuild, texmaker-3.2.1.ebuild, texmaker-3.2.2.ebuild,
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 8a7a9eddccd6..bc6420a189d7 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,30 +1,30 @@
-AUX texmaker-1.91-hunspell.patch 1948 RMD160 35e3b78a1e9b9b9a8a76c0d67768e11a6b790554 SHA1 4c33150af01a9f3143040bf5f781de7e322b9ac0 SHA256 b12042c07b14633972869c6ded769bed0b546eabb291e8b770ede874f474b113
-AUX texmaker-2.30-hunspell.patch 3189 RMD160 f53207455df771b1f8b42599b1755b80d604e6bb SHA1 e4c21254c621c76b2bd16306af4651df461b84c0 SHA256 ce52bc469451c58b6b458c35f5d745c061f51c388406622dc5b9a2189b84efda
-AUX texmaker-3.00-hunspell.patch 4119 RMD160 6357d2f7bc6d3099685b6b9b86974f50d3bf50b2 SHA1 8c56d23da77faef662187fc14452aca9ad5e2c1a SHA256 2925022645bd16b68adcd543dd9f5751b4b3762370a27d3b6a414d4a6352e64a
-AUX texmaker-3.01-hunspell.patch 4121 RMD160 b515e10c18a0ead767c4a3cd972c7597a478a266 SHA1 6e02b722f1ca9d49700a62371a33b6974248a519 SHA256 d5655a39383add7ac44a0b0ce6390e256ab9679f2b2ba6cbe0abe0ec217d240f
-AUX texmaker-3.02-hunspell.patch 4121 RMD160 6f6e618e6746c808fb783523b4a640d53b2cc0ec SHA1 233739743f7830f0fe6d454a13248201581b5805 SHA256 1c7a598e627ec023d32f79187de304b0254ba1e9fa697bd3210e0c3921656e30
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX texmaker-3.1-hunspell.patch 4493 RMD160 15457c250680fb905b5b14cb89ad935966fdc816 SHA1 3a338e267b7991228ca0a688fc1c8e93def1af2b SHA256 4605225c49282b2e075f3fc96dddaf98367be415a7ef195f27d9ff537a107f87
-AUX texmaker-3.2-hunspell.patch 5084 RMD160 f151f5503193ac1d3fc847bc426bd1bad5fa4827 SHA1 9fd98859561e146122fc41f5d33be0ad5b6aa0fd SHA256 865c08acd73f86b9850eccd39357b686419284e2734b8de83e7ff8b22599adf3
-AUX texmaker-3.2.1-hunspell.patch 5084 RMD160 f151f5503193ac1d3fc847bc426bd1bad5fa4827 SHA1 9fd98859561e146122fc41f5d33be0ad5b6aa0fd SHA256 865c08acd73f86b9850eccd39357b686419284e2734b8de83e7ff8b22599adf3
-AUX texmaker-3.2.2-hunspell.patch 5084 RMD160 ad42eb0e1db0b3b6918772761aca72e9b18c5ad1 SHA1 70e76b740a884949da829c3b5d29b0e3b0caf7b6 SHA256 ecc4ca5f7a76dc048ad1e9407247c06cd4c6977fca2a8fa66308e809dbf73830
 AUX texmaker-3.3.1-hunspell.patch 4478 RMD160 4f4bdf3ae984c97aa828d10a7b69c14b37b38842 SHA1 62451fec2c3e393568fcfc4f64049a72aa6ffbb7 SHA256 90d8f46567312101a5d926930046f6d17dd337dad596ffcede52087a89a2adcb
 AUX texmaker-3.3.2-hunspell.patch 4478 RMD160 bfdf512e737238b91ee7b1ad7c40a95884210e13 SHA1 c7cee2fb34981879f4fcb17d315216b1a4c571da SHA256 26d708f330ce4d6b07dbe0cb0249d9e0fdd4899e4be55ce65bf592c93b492d67
 AUX texmaker-3.3.2-qt48.patch 294 RMD160 839a8a7817dc35ce566789ee182a05cd6625d895 SHA1 ee8c0e2a0e7bd30d48748e960d660ab9b6215e16 SHA256 28da547538b5ccff6fa60e0f3b7d77749991d62174c97f9f637db12c7a3365aa
 AUX texmaker-3.3.3-hunspell.patch 4478 RMD160 27e8a3e7e32263443321388c18072c01bf909fc3 SHA1 888df8ce07a58723c6bbd85247fb8418d75e9dbe SHA256 52555036668b30d334b6caa05c5eeb3e262ec958fabdfdb856ab4e897023b0fa
 AUX texmaker-3.3.3-qt48.patch 294 RMD160 839a8a7817dc35ce566789ee182a05cd6625d895 SHA1 ee8c0e2a0e7bd30d48748e960d660ab9b6215e16 SHA256 28da547538b5ccff6fa60e0f3b7d77749991d62174c97f9f637db12c7a3365aa
+AUX texmaker-3.3.4-hunspell.patch 4478 RMD160 889b46b5f691debee842dbc377b6501df1ef9817 SHA1 30812d773ed89bd13a2a261302ea1fc353fa19d1 SHA256 4d3b6dbbe829140e224bfa0cdceefef29c3ff012aa86d68b248d93bee564cd84
 DIST texmaker-3.1.tar.bz2 6018840 RMD160 cf7c457319d6f1ed55ec09fc1d06a9d05f848b9f SHA1 3fe9d72ebad63ef68dcf34248f4a46cec388da3c SHA256 f8d0f4a5b70bd352b328376d7946ceb67e9af325d48ee027d0f4e7b7416bbb78
-DIST texmaker-3.2.1.tar.bz2 6712701 RMD160 c5f7d0c9c2341880b6bbcb1976ab63c4468518cb SHA1 73d520c945ac1bb8e79c40dc423ae20f16dd02eb SHA256 48d0ce105e5ec4dc2e58edf18c5d9c53e592d1c396bce30366e3a103f01497f6
-DIST texmaker-3.2.2.tar.bz2 6721777 RMD160 931e30ff53ca92edd13ff3f367fd0e786d8a2496 SHA1 d8d0fd35c699c543a52c875e4c9e15551917a966 SHA256 7d6bb234c6b7df42d672970fceec44e8f662ac265ca9a3bb8e61cdcb323c145a
-DIST texmaker-3.2.tar.bz2 6706557 RMD160 ddd476ae3342ddef70138c87a2269434933c0022 SHA1 9022ed0f3e1881036eaad93cfa5bb630f6e5f290 SHA256 40c7d2a9bf0f8d0a987c1a250369f9dcb0b7a1978b83c7f08e8325f8f9ab3675
 DIST texmaker-3.3.1.tar.bz2 7689820 RMD160 77584dd5d0ede71fc05e6b1c69d1bc7e439b8b2b SHA1 dc6b86321b9d66015036463175c3246184f08637 SHA256 fad20df029c00bcf627eefecdde95720d9bf1611f4168b2a977ddd1f8c7a7c38
 DIST texmaker-3.3.2.tar.bz2 7781249 RMD160 8ebecba262b802e9c6619eb72d0a72fd7e728d3b SHA1 73cd62a8377e7c68c0e521fd2805a012178a3c35 SHA256 a3e16c820ef16782a7331c1550f97cab7b29111f77664340239fc448540a05fb
 DIST texmaker-3.3.3.tar.bz2 8023823 RMD160 355b5953d6e714c09df4afc5bd7f53a95d48460b SHA1 d3602897a47f2e3ccd0a395bb04b1d189241d2ea SHA256 5bb4c6e74e70d5d8f231f67a3d6895fa482f602720491d75d4b8813ecd49e92d
+DIST texmaker-3.3.4.tar.bz2 13028203 RMD160 e6ed999e1b9cea0a9907539d9522c94bf852865c SHA1 eb18d9d6c5421c373c926b07ba1b7df1fe64984c SHA256 db9aa4d2633e6ad96ff4b0d893205d42c2220928f021c210146a41ecf87525f5
 EBUILD texmaker-3.1.ebuild 1810 RMD160 7dc945d5d48bea1a3afc41c026812a65f38675be SHA1 9bd322bed36cd7ba658e6332acdd34a252f78e63 SHA256 672e277761adda20332412f361d6bffffbc783ef92ac9b8ab40db01683d5e21a
-EBUILD texmaker-3.2.1.ebuild 1816 RMD160 e8fb938b5ef68132899ec894130568901e6c78ed SHA1 f51b7ab733b2e6b4dd392caa083ee48d2a7f503e SHA256 a2441103c326b54d40185fc82b5d610452641bed611adad2eac4c4db1b409e6b
-EBUILD texmaker-3.2.2.ebuild 1816 RMD160 29634308353fec7156894a9fc0d7714201edaeb0 SHA1 f2a4c30a253fb994f409ff8de6a67f1191e7d885 SHA256 d5786b22b04639e9cdc059f97a7bf288d8ff12d7c72564e6f2eb434e51409709
-EBUILD texmaker-3.2.ebuild 1814 RMD160 e5e4971c30cc40ece3bc76c5bdd0d02cc9a28624 SHA1 946ef861a9b7f93ff410fb952b106dd675260999 SHA256 91a9f59ecaf5032de4ad6942f82f992c4c393591adaddefe02f3e5b978230285
 EBUILD texmaker-3.3.1.ebuild 1816 RMD160 bcd7b020e8bda4e9ee1158ab40f5ee7c7c16af17 SHA1 d9871acd00e4f4de1a1bd84125368f0d9750fa3a SHA256 cd01f48948bcda50ee2681a133edbd50a72f8b5ab41ff8ea0acbb9ababc590a6
 EBUILD texmaker-3.3.2.ebuild 1849 RMD160 872287a6319c54bfb63b774cd1c82ab98cbcc203 SHA1 a0204eb6fcac8ac139c6dd61aa0c19e67a38a4a7 SHA256 291dfb42c453e92517b2221db6b8564ef1a8ba400d0b19f358b8bff5d7c357b7
 EBUILD texmaker-3.3.3.ebuild 1726 RMD160 0f988e1e89263897d900a4f0dc89c860d579476b SHA1 9431f1f549382915f1aaf9114aa72145960d95a3 SHA256 c40019c7cee56932b0f80e7a53790c8fa95a639e2c7ebc007484a8992640da04
-MISC ChangeLog 14673 RMD160 b0fda17cafd539f4c2d28a566248ae71f62c97b0 SHA1 5d6d85d3c3264f72841536638e67a9fcf3c4b8e4 SHA256 1a21dfb2efdf33e15e288b7ec0b686505de2adcb76187a6fe2410a99d71ff327
+EBUILD texmaker-3.3.4.ebuild 1723 RMD160 baf5d55f42f406d0af23385d0855f24933a05c39 SHA1 210c042aa1af65dc2aa18269736969b746644bff SHA256 d95a9d40ce15c38243bd57adf2eeb482eee961c694d9bc0b8414bcddf6e0b788
+MISC ChangeLog 15227 RMD160 e27b5b8aa8f169f33d1aaf9417ce65cceec1b56f SHA1 546a4a032091fd88628316ec62404b76190038b5 SHA256 420c48a894d6a311e749fece2b8c060eda99b7769a6c144d708c9693202af73e
 MISC metadata.xml 274 RMD160 e2fb5cd41e542fe16d8cc8204d04110bf23bce3e SHA1 a957d8f40e49b70695325e66693bf622b42f6a39 SHA256 1c59f208af91e0b13109901b6ceed3fcc2f64f47280631ce6552b083256555b1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/AxYcACgkQgAnW8HDreRbFpACgmJNnAeQoeBS0OMYRq04P3Gjc
+IeMAn2hWDa5XGxBJ4dy9sGJRvz8XsLis
+=lpg6
+-----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
deleted file mode 100644
index b7659d0939de..000000000000
--- a/app-office/texmaker/files/texmaker-1.91-hunspell.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-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/files/texmaker-2.30-hunspell.patch b/app-office/texmaker/files/texmaker-2.30-hunspell.patch
deleted file mode 100644
index b938064655f8..000000000000
--- a/app-office/texmaker/files/texmaker-2.30-hunspell.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/latexeditor.h b/latexeditor.h
-index ce36a27..d768977 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -26,7 +26,7 @@
- #include <QTimer>
- 
- #include "latexhighlighter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 5635464..8fb37cb 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -18,7 +18,7 @@
- #include "latexeditor.h"
- #include "linenumberwidget.h"
- #include "findwidget.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class LatexEditorView : public QWidget  {
-    Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 83ca79c..a1e437a 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 d07d1fb..74ba873 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -44,7 +44,7 @@
- #include "logeditor.h"
- #include "gotolinedialog.h"
- #include "replacedialog.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewer.h"
- #include "encodingprober/qencodingprober.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 3b3f666..ddd91b3 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.3
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -53,25 +54,6 @@ HEADERS	+= texmaker.h \
- 	encodingdialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.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 \
-@@ -144,18 +126,6 @@ SOURCES	+= main.cpp \
- 	encodingdialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	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/files/texmaker-3.00-hunspell.patch b/app-office/texmaker/files/texmaker-3.00-hunspell.patch
deleted file mode 100644
index fde04a1c2075..000000000000
--- a/app-office/texmaker/files/texmaker-3.00-hunspell.patch
+++ /dev/null
@@ -1,155 +0,0 @@
- configdialog.cpp   |    2 +-
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   36 +++---------------------------------
- 7 files changed, 9 insertions(+), 39 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index ef30bd4..1acc9d1 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -122,7 +122,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/latexeditor.h b/latexeditor.h
-index b79df23..b482a9a 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -26,7 +26,7 @@
- #include <QTimer>
- 
- #include "latexhighlighter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 0471d6f..f663fdf 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -19,7 +19,7 @@
- #include "linenumberwidget.h"
- #include "findwidget.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 83ca79c..a1e437a 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 66d7967..f8e4b57 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "logeditor.h"
- #include "gotolinedialog.h"
- #include "replacedialog.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 9078988..fb42191 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.0
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -56,25 +57,6 @@ HEADERS	+= texmaker.h \
- 	usercompletiondialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.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 \
-@@ -150,18 +132,6 @@ SOURCES	+= main.cpp \
- 	usercompletiondialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	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 \
-@@ -253,7 +223,7 @@ LIBS         += -L/usr/lib -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- INSTALLS = target
- HEADERS	+= x11fontdialog.h 
diff --git a/app-office/texmaker/files/texmaker-3.01-hunspell.patch b/app-office/texmaker/files/texmaker-3.01-hunspell.patch
deleted file mode 100644
index d8d69d11413a..000000000000
--- a/app-office/texmaker/files/texmaker-3.01-hunspell.patch
+++ /dev/null
@@ -1,155 +0,0 @@
- configdialog.cpp   |    2 +-
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   36 +++---------------------------------
- 7 files changed, 9 insertions(+), 39 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index ef30bd4..1acc9d1 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -122,7 +122,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/latexeditor.h b/latexeditor.h
-index b18ff9b..4fe11a0 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -26,7 +26,7 @@
- #include <QTimer>
- 
- #include "latexhighlighter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 0471d6f..f663fdf 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -19,7 +19,7 @@
- #include "linenumberwidget.h"
- #include "findwidget.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 83ca79c..a1e437a 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 8c98526..f9bbb1a 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "logeditor.h"
- #include "gotolinedialog.h"
- #include "replacedialog.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 5647c49..08eeaf5 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.0.1
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -56,25 +57,6 @@ HEADERS	+= texmaker.h \
- 	usercompletiondialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.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 \
-@@ -150,18 +132,6 @@ SOURCES	+= main.cpp \
- 	usercompletiondialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	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 \
-@@ -253,7 +223,7 @@ LIBS         += -L/usr/lib -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- INSTALLS = target
- HEADERS	+= x11fontdialog.h 
diff --git a/app-office/texmaker/files/texmaker-3.02-hunspell.patch b/app-office/texmaker/files/texmaker-3.02-hunspell.patch
deleted file mode 100644
index 79d3d8e4c70b..000000000000
--- a/app-office/texmaker/files/texmaker-3.02-hunspell.patch
+++ /dev/null
@@ -1,155 +0,0 @@
- configdialog.cpp   |    2 +-
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   36 +++---------------------------------
- 7 files changed, 9 insertions(+), 39 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index ef30bd4..1acc9d1 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -122,7 +122,7 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
- #else
- QDir spelldir(PREFIX"/share/texmaker");
- #endif
-diff --git a/latexeditor.h b/latexeditor.h
-index b18ff9b..4fe11a0 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -26,7 +26,7 @@
- #include <QTimer>
- 
- #include "latexhighlighter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index 0471d6f..f663fdf 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -19,7 +19,7 @@
- #include "linenumberwidget.h"
- #include "findwidget.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 83ca79c..a1e437a 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 8c98526..f9bbb1a 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "logeditor.h"
- #include "gotolinedialog.h"
- #include "replacedialog.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 86e46ac..9938814 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.0.2
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -56,25 +57,6 @@ HEADERS	+= texmaker.h \
- 	usercompletiondialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.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 \
-@@ -150,18 +132,6 @@ SOURCES	+= main.cpp \
- 	usercompletiondialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	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 \
-@@ -253,7 +223,7 @@ LIBS         += -L/usr/lib -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- INSTALLS = target
- HEADERS	+= x11fontdialog.h 
diff --git a/app-office/texmaker/files/texmaker-3.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.2-hunspell.patch
deleted file mode 100644
index 76613c60ab59..000000000000
--- a/app-office/texmaker/files/texmaker-3.2-hunspell.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
-Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
-From: Justin Lecher <jlec@gentoo.org>
-Date: Thu, 22 Dec 2011 12:09:32 +0100
-Subject: [PATCH] 3.1-hunspell.patch
-
-Conflicts:
-
-	latexeditor.h
-	texmaker.pro
----
- configdialog.cpp   |    4 ++--
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   44 +++++++-------------------------------------
- 7 files changed, 14 insertions(+), 44 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 144bddc..89e4059 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -187,9 +187,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 40cc2f6..d46150f 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -28,7 +28,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 283fd8a..1ba39cc 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 029c7ad..9fbb532 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 b1a2c65..0806731 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "symbollistwidget.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 5d017ad..87fac99 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.2.1
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -65,25 +66,6 @@ HEADERS	+= texmaker.h \
- 	scandialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.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 \
-@@ -110,7 +92,7 @@ HEADERS	+= texmaker.h \
- 	encodingprober/nsSJISProber.h \
- 	encodingprober/nsUniversalDetector.h \
- 	encodingprober/qencodingprober.h \
--	encodingprober/UnicodeGroupProber.h
-+	encodingprober/UnicodeGroupProber.h 
- SOURCES	+= main.cpp \
- 	texmakerapp.cpp \
- 	texmaker.cpp \
-@@ -167,18 +149,6 @@ SOURCES	+= main.cpp \
- 	scandialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	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 \
-@@ -271,13 +241,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
--- 
-1.7.8.1
-
diff --git a/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch
deleted file mode 100644
index b680f30d1aa4..000000000000
--- a/app-office/texmaker/files/texmaker-3.2.2-hunspell.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
-Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
-From: Justin Lecher <jlec@gentoo.org>
-Date: Thu, 22 Dec 2011 12:09:32 +0100
-Subject: [PATCH] 3.1-hunspell.patch
-
-Conflicts:
-
-	latexeditor.h
-	texmaker.pro
----
- configdialog.cpp   |    4 ++--
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   44 +++++++-------------------------------------
- 7 files changed, 14 insertions(+), 44 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 144bddc..89e4059 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -187,9 +187,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 40cc2f6..d46150f 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -28,7 +28,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 283fd8a..1ba39cc 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 029c7ad..9fbb532 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 b1a2c65..0806731 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "symbollistwidget.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 5d017ad..87fac99 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.2.2
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -65,25 +66,6 @@ HEADERS	+= texmaker.h \
- 	scandialog.h \
- 	synctex_parser.h \
- 	synctex_parser_utils.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 \
-@@ -110,7 +92,7 @@ HEADERS	+= texmaker.h \
- 	encodingprober/nsSJISProber.h \
- 	encodingprober/nsUniversalDetector.h \
- 	encodingprober/qencodingprober.h \
--	encodingprober/UnicodeGroupProber.h
-+	encodingprober/UnicodeGroupProber.h 
- SOURCES	+= main.cpp \
- 	texmakerapp.cpp \
- 	texmaker.cpp \
-@@ -167,18 +149,6 @@ SOURCES	+= main.cpp \
- 	scandialog.cpp \
- 	synctex_parser.c \
- 	synctex_parser_utils.c \
--	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 \
-@@ -271,13 +241,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
--- 
-1.7.8.1
-
diff --git a/app-office/texmaker/files/texmaker-3.2.1-hunspell.patch b/app-office/texmaker/files/texmaker-3.3.4-hunspell.patch
index 76613c60ab59..cb41050faf49 100644
--- a/app-office/texmaker/files/texmaker-3.2.1-hunspell.patch
+++ b/app-office/texmaker/files/texmaker-3.3.4-hunspell.patch
@@ -1,28 +1,17 @@
-From 3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f Mon Sep 17 00:00:00 2001
-Message-Id: <3ecb1391c92f1ba314c8ea2013b1b1136fb90f8f.1324552714.git.jlec@gentoo.org>
-From: Justin Lecher <jlec@gentoo.org>
-Date: Thu, 22 Dec 2011 12:09:32 +0100
-Subject: [PATCH] 3.1-hunspell.patch
-
-Conflicts:
-
-	latexeditor.h
-	texmaker.pro
----
  configdialog.cpp   |    4 ++--
  latexeditor.h      |    2 +-
  latexeditorview.h  |    2 +-
  latexhighlighter.h |    2 +-
  spellerdialog.h    |    2 +-
  texmaker.h         |    2 +-
- texmaker.pro       |   44 +++++++-------------------------------------
- 7 files changed, 14 insertions(+), 44 deletions(-)
+ texmaker.pro       |   42 ++++++------------------------------------
+ 7 files changed, 13 insertions(+), 43 deletions(-)
 
 diff --git a/configdialog.cpp b/configdialog.cpp
-index 144bddc..89e4059 100644
+index 3b91fd0..338b166 100644
 --- a/configdialog.cpp
 +++ b/configdialog.cpp
-@@ -187,9 +187,9 @@ void ConfigDialog::browseAspell()
+@@ -210,9 +210,9 @@ void ConfigDialog::browseAspell()
  QDir spelldir(QCoreApplication::applicationDirPath());
  #else
  #ifdef DEBIAN_SPELLDIR
@@ -35,10 +24,10 @@ index 144bddc..89e4059 100644
  #endif
  
 diff --git a/latexeditor.h b/latexeditor.h
-index 40cc2f6..d46150f 100644
+index e053390..0e82f08 100644
 --- a/latexeditor.h
 +++ b/latexeditor.h
-@@ -28,7 +28,7 @@
+@@ -33,7 +33,7 @@
  
  #include "latexhighlighter.h"
  #include "textblockselection.h"
@@ -48,7 +37,7 @@ index 40cc2f6..d46150f 100644
  typedef  int UserBookmarkList[3];
  
 diff --git a/latexeditorview.h b/latexeditorview.h
-index 283fd8a..1ba39cc 100644
+index fb8d7d4..716b466 100644
 --- a/latexeditorview.h
 +++ b/latexeditorview.h
 @@ -22,7 +22,7 @@
@@ -61,7 +50,7 @@ index 283fd8a..1ba39cc 100644
  class LatexEditorView : public QWidget  {
     Q_OBJECT
 diff --git a/latexhighlighter.h b/latexhighlighter.h
-index 029c7ad..9fbb532 100644
+index e0b91b1..74ec42a 100644
 --- a/latexhighlighter.h
 +++ b/latexhighlighter.h
 @@ -20,7 +20,7 @@
@@ -87,11 +76,11 @@ index 83248ae..cd16dad 100644
  #include <QTextCursor>
  
 diff --git a/texmaker.h b/texmaker.h
-index b1a2c65..0806731 100644
+index 584be7f..b0069a4 100644
 --- a/texmaker.h
 +++ b/texmaker.h
-@@ -47,7 +47,7 @@
- #include "symbollistwidget.h"
+@@ -48,7 +48,7 @@
+ #include "usertagslistwidget.h"
  #include "xmltagslistwidget.h"
  #include "logeditor.h"
 -#include "hunspell/hunspell.hxx"
@@ -100,7 +89,7 @@ index b1a2c65..0806731 100644
  #include "pdfviewerwidget.h"
  #include "pdfviewer.h"
 diff --git a/texmaker.pro b/texmaker.pro
-index 5d017ad..87fac99 100644
+index 17d0a24..28ad193 100644
 --- a/texmaker.pro
 +++ b/texmaker.pro
 @@ -4,7 +4,8 @@ TARGET	 = texmaker
@@ -110,13 +99,13 @@ index 5d017ad..87fac99 100644
 -CONFIG	+= qt warn_off release
 +CONFIG	+= qt warn_off release link_pkgconfig
 +PKGCONFIG = hunspell
- TEXMAKERVERSION=3.2.1
+ TEXMAKERVERSION=3.3.4
  DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
  DEFINES += HAVE_SPLASH
-@@ -65,25 +66,6 @@ HEADERS	+= texmaker.h \
- 	scandialog.h \
- 	synctex_parser.h \
+@@ -67,25 +68,6 @@ HEADERS	+= texmaker.h \
  	synctex_parser_utils.h \
+ 	usertagslistwidget.h \
+ 	addtagdialog.h \
 -	hunspell/affentry.hxx \
 -	hunspell/affixmgr.hxx \
 -	hunspell/atypes.hxx \
@@ -139,19 +128,10 @@ index 5d017ad..87fac99 100644
  	singleapp/qtlocalpeer.h \
  	singleapp/qtlockedfile.h \
  	singleapp/qtsingleapplication.h \
-@@ -110,7 +92,7 @@ HEADERS	+= texmaker.h \
- 	encodingprober/nsSJISProber.h \
- 	encodingprober/nsUniversalDetector.h \
- 	encodingprober/qencodingprober.h \
--	encodingprober/UnicodeGroupProber.h
-+	encodingprober/UnicodeGroupProber.h 
- SOURCES	+= main.cpp \
- 	texmakerapp.cpp \
- 	texmaker.cpp \
-@@ -167,18 +149,6 @@ SOURCES	+= main.cpp \
- 	scandialog.cpp \
- 	synctex_parser.c \
+@@ -171,18 +153,6 @@ SOURCES	+= main.cpp \
  	synctex_parser_utils.c \
+ 	usertagslistwidget.cpp \
+ 	addtagdialog.cpp \
 -	hunspell/affentry.cxx \
 -	hunspell/affixmgr.cxx \
 -	hunspell/csutil.cxx \
@@ -167,7 +147,7 @@ index 5d017ad..87fac99 100644
  	singleapp/qtlocalpeer.cpp \
  	singleapp/qtlockedfile.cpp \
  	singleapp/qtsingleapplication.cpp \
-@@ -271,13 +241,13 @@ isEmpty( ICONDIR ) {
+@@ -276,13 +246,13 @@ isEmpty( ICONDIR ) {
      ICONDIR=/usr/share/pixmaps
  }
  
@@ -185,6 +165,3 @@ index 5d017ad..87fac99 100644
  
  
  INSTALLS = target
--- 
-1.7.8.1
-
diff --git a/app-office/texmaker/texmaker-3.2.1.ebuild b/app-office/texmaker/texmaker-3.2.1.ebuild
deleted file mode 100644
index 8a1a1c688900..000000000000
--- a/app-office/texmaker/texmaker-3.2.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.2.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.2.2.ebuild b/app-office/texmaker/texmaker-3.2.2.ebuild
deleted file mode 100644
index ca9955e143bf..000000000000
--- a/app-office/texmaker/texmaker-3.2.2.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.2.2.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.2.ebuild b/app-office/texmaker/texmaker-3.3.4.ebuild
index 8bdf52ffb734..df86836a28ad 100644
--- a/app-office/texmaker/texmaker-3.2.ebuild
+++ b/app-office/texmaker/texmaker-3.3.4.ebuild
@@ -1,8 +1,8 @@
 # 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.2.ebuild,v 1.2 2012/05/03 20:00:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.3.4.ebuild,v 1.1 2012/05/26 11:58:53 jlec Exp $
 
-EAPI="3"
+EAPI=4
 
 inherit base prefix qt4-r2 versionator
 
@@ -35,10 +35,10 @@ COMMON_DEPEND="
 	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"
+	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
@@ -47,7 +47,10 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-hunspell.patch
+	"${FILESDIR}"/${PN}-3.3.3-qt48.patch
+	)
 
 src_prepare() {
 	qt4-r2_src_prepare
@@ -55,13 +58,13 @@ src_prepare() {
 }
 
 src_install() {
-	emake INSTALL_ROOT="${ED}" install || die "make install failed"
+	emake INSTALL_ROOT="${ED}" install
 
 	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-	doins utilities/texmaker.svg || die "doins failed."
+	doins utilities/texmaker*.png
+	doins utilities/texmaker.svg
 
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
+	dodoc utilities/AUTHORS utilities/CHANGELOG.txt
 }
 
 pkg_postinst() {