Version Bump, Cleaned old

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

10 files changed, 73 insertions, 609 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 9419ebfb7478..a8e44a04df81 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.80 2011/04/25 16:20:01 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.81 2011/04/27 06:38:17 jlec Exp $
+
+*texmaker-3.02 (27 Apr 2011)
+
+  27 Apr 2011; Justin Lecher <jlec@gentoo.org> -texmaker-2.10.ebuild,
+  -files/texmaker-2.10-hunspell.patch, -texmaker-2.20.ebuild,
+  -files/texmaker-2.20-hunspell.patch, -texmaker-2.21.ebuild,
+  -files/texmaker-2.21-hunspell.patch, -texmaker-2.22.ebuild,
+  -files/texmaker-2.22-hunspell.patch, +texmaker-3.02.ebuild,
+  +files/texmaker-3.02-hunspell.patch:
+  Version Bump, Cleaned old
 
   25 Apr 2011; Markos Chandras <hwoarang@gentoo.org> texmaker-2.30.ebuild:
   Stable on amd64 wrt bug #363937
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 5bf88cfa0473..be8bbd7a6085 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,46 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX texmaker-1.91-hunspell.patch 1948 RMD160 35e3b78a1e9b9b9a8a76c0d67768e11a6b790554 SHA1 4c33150af01a9f3143040bf5f781de7e322b9ac0 SHA256 b12042c07b14633972869c6ded769bed0b546eabb291e8b770ede874f474b113
-AUX texmaker-2.10-hunspell.patch 3482 RMD160 44b800d3db6c7ef5ed80d7093a3febdbd9a1b881 SHA1 13e060ce53b88a4391318db4c600a6f2cba2ffcb SHA256 d0e53e8c900b7e711692ad713028bd7c720083819d1498a4107a8d8b8e6f0100
-AUX texmaker-2.20-hunspell.patch 3474 RMD160 e38120716f9d5b3f60695b64fbb9042ab2d3b488 SHA1 af983cefb4101e751420740e44a22f2b237fdfb2 SHA256 3c038e52500fae3c71d739c5f43a9d800c4abbe366882bbd9c8a8f0c43dc13da
-AUX texmaker-2.21-hunspell.patch 3147 RMD160 1e984fcf311d541be6305a2cdccb0584d5cc69cd SHA1 9d65cf92384012b7ac09525513e7f7a2dbbd0bdc SHA256 0b98aa36aefc6fdf55754772af849e29e7d10fc0faa60e9ceafa156a6b94b645
-AUX texmaker-2.22-hunspell.patch 3143 RMD160 fcc3372fe99d54bc6f9f3ff26e58e10b830f4964 SHA1 29b88cfcdc017e2f0426920a88463d2227c11a62 SHA256 5ad268f74249950018b3471b2b99689777cb5c89855ee2f4b9d83ba5bedb026f
 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
 DIST texmaker-1.9.2.tar.bz2 3094044 RMD160 218f662959843d3417368195d92c16de6970ac9e SHA1 72d2dc0782eeb4da7f0c2694f72ff94ef5168f5e SHA256 6b479788cbce4b940eb78fa011d1ee52c4959c4dc01441ed9a82b045131a10c6
-DIST texmaker-2.1.tar.bz2 3270064 RMD160 1b247a7dabaab5d5f03a384aade83438179f9c28 SHA1 4338bf1ccd24c1644ad65c1a8a40b6741a4e68ed SHA256 e90457448409f2b091bfd28b4be2315048e6a99d5668998be4d08fccfb0904e4
-DIST texmaker-2.2.1.tar.bz2 4060455 RMD160 d69dbd17f63d0877f45fc7408043e1a6b7e8696e SHA1 ba38a1303dc62c90a184c6d36ee96b8d80ee4871 SHA256 79c9efcb4236172f00be3ad776659d541eec9363935a6a99bf06f87ba36b648f
-DIST texmaker-2.2.2.tar.bz2 4061747 RMD160 6a76e65da7c8d54c37cb017adf42249423057138 SHA1 fd2ed495e7d8080d578c0e121ce77b99dec68004 SHA256 7e6378e750e1ab4a3d087415edaf4ae007bfb54935687dbb0fa66468d3475277
-DIST texmaker-2.2.tar.bz2 4061558 RMD160 35c7366fc1ee0794f02ef748bd8f5036e8bb518c SHA1 422f0942dd1eed861e62debadd7e7620ba220fa8 SHA256 56f0569639a2083cb52b0bd08970340063d6b199283dbf3d76a28ae231af8eaa
 DIST texmaker-2.3.tar.bz2 4364743 RMD160 a4db04cb6135d393671a916edb3c272420a98ca3 SHA1 bcd21a3a16ed0a4c38ac4deece29f03d0964431e SHA256 75934ad2fd03f000e65306e336d88e5166284a9222312f88780a492555cc8fd8
 DIST texmaker-3.0.1.tar.bz2 5180509 RMD160 18b26895ab46c6f9781e806c1b79335d626e3e70 SHA1 a160eda2e56fd9dba9f68499e4d5dd62f8b66a69 SHA256 badde87708a95bd54e65d3d17595f790486053000052926f860ad5b7e03cf6e7
+DIST texmaker-3.0.2.tar.bz2 5207700 RMD160 795deca96ffba36d9b744c915310cac21885b20d SHA1 24aa9e6cdbb8b33c38979fddab4ff5598f1467f1 SHA256 612ed98ddc6a889a10624a111ea99f6ed5aed9eb813e4b55eabb3c2a711d7026
 DIST texmaker-3.0.tar.bz2 5158725 RMD160 a2458b095b92d1ecc4b463009c5903089c8e3db3 SHA1 d187b826d520390d9164a2e435bc37127a6dd59a SHA256 4957d1e5f84bf928fa2a16bd094247a55f4fe405457b0738fc7bfbae84b85db2
 EBUILD texmaker-1.92.ebuild 1753 RMD160 d11d85d185e9d3f6cefa58759e3be8d0a2c0a3ee SHA1 a5fd127b284b16e28e5d4d1c1147eaa15c3a398b SHA256 e09d891802ebe1aa034f0a4d5e34dfcb33637c98e07613d9580c84424292b6a9
-EBUILD texmaker-2.10.ebuild 1670 RMD160 65dda95c59e6234cddd69554410a4e7a56bc9aff SHA1 f683b3a044614485fbbfda2cdb53c4a50f0e58b6 SHA256 8f38a5401aa3a2e2f3364eab37d08fb917600f76f657307c18d33f56847115fb
-EBUILD texmaker-2.20.ebuild 1670 RMD160 3ce628ab0ba4b80e9d28c033120987b5a718b001 SHA1 d0e83f0114927b2931094e9cb9d984e2058a500c SHA256 45aa5e4f4e1babcc4d9a8a2ba512267cf12762f49e3e48d47c482e8cabc17bd0
-EBUILD texmaker-2.21.ebuild 1666 RMD160 7cfc8eb5a48a7b6c83a95c0a77b69308c8bcb38b SHA1 05ca7e11d76b163a3b43a3efecad8d536cb2e82c SHA256 eb46c0c9a2ad5f3fbb72262563484f0df601187f185a9092bd5440591ad8cc99
-EBUILD texmaker-2.22.ebuild 1666 RMD160 61f4448bb69c2adbc6e3d7e1931248e0f10c4248 SHA1 dcbe4b51ce0c09e364414f8fc746bdeeacd7dc69 SHA256 75a9bcfe613f8e7d412998be203bdd2f7c6d6392bcd832ce1899de8d94315879
 EBUILD texmaker-2.30.ebuild 1669 RMD160 34a8006b4e0f49a60ac287ea13054dacc6784e26 SHA1 01de73fbb3cf2a8ea0bc2ab16ee4d24733857ea4 SHA256 913372e5725511c3b809bce0a962dc4f4076a60813c6968dc005333ecb2912f8
 EBUILD texmaker-3.00.ebuild 1666 RMD160 774a05034e7db63edb1a6ccc8a5d24f96593443c SHA1 dbb8891ebb0e0ce1e930f6de2103b7fc859f2f8c SHA256 80793ae348e579a2941c141a0e989e7408f0f48889d5cb939d17f72ee11982d7
 EBUILD texmaker-3.01.ebuild 1666 RMD160 868dc0aea06657e7c39524e455c224fa9564349b SHA1 2d1d78d68312c9e6414673c806db44257a77b3a3 SHA256 033b0c64332e300fa04e0827faaaa0d11824dcd5d58d6c7d68b97c7423529533
-MISC ChangeLog 11376 RMD160 878fe925c3bb472f51248370295f7ccbfe585579 SHA1 edec57f97b719ad74514acbde5d5000e7419f429 SHA256 eeffd3ccdf6a8f540727c5b67c6591d0c162c640fd692b7c08c0cbd191c5a924
+EBUILD texmaker-3.02.ebuild 1666 RMD160 88b0971e52c76086bf980641748fad1b54edf816 SHA1 25b0549d0eb6ea1bdd49f56e43bfb0cbff6ec4fb SHA256 2b4d1ab43a7f90ce553c70b78ff87aa3d76d22a2553e875e4b0d56afe9b00bbe
+MISC ChangeLog 11788 RMD160 bd4c054d5bd7164e552bd12c1a45c1d4998deaef SHA1 a26e236b129d88bf71593c2ca9123b1d150b1364 SHA256 05717fa709cc8784ec1945c9ab31eebd0f95c119de73432bcd3c7e0bfcb7698a
 MISC metadata.xml 269 RMD160 091f8a96eb5b10bfbfa5cc228d368beefacff1ba SHA1 89accee7b2497109885896a42b08fb6308d7e8e7 SHA256 646ca835907609b6f754d6b2127767f3e53700e6f5aa56b7aebfa33cfc7437ab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJNtZ8RAAoJEPqDWhW0r/LCwRoQAI/Xm7DV7UlyyKTbOOCNC8Yw
-WPrenofyiXIkwaR+9XvpmYfJOuHokKjH3Gta2q+Z16CndE8jsQ2iEzGJ6+HDH8kq
-KwAbHmO6rTID99V2X+81NfJhYSjSMOB6/fakaEafWY7Q70JGauz761o0nxfIK4kH
-bdLXt83GaGBg14YFqOfhhAkFP2jcRpNWxFVomZ+jjTpLqoYTGxvWYHc+1d1cUm09
-R5pGwFxmUKMxfrpTnPX0z4jEnhNctd6vTFoDMlJWrMloj94O5S0gGsfu86QMlzS8
-SN0ZDbneEMb5QJ0pNF3CCRVUIMU4BUHuMW68q9ZvfztjNCwdfheWv3TRoZ38auLY
-fs7XcSUL8Q01ioobqRs2m2NWvk3X0HmUdU3j6YvxCXBcKtuG1NxBla03x4ZUHEYY
-1EAZLV1rv2LT0xs3ubP92Hu9XeQAFNSCr66hm/biKEYNiuH7KSWEPon3WRBfY9JP
-DnKY965wVFRfjW01QNTZ0r1aYYyx8pAEF00Fl7YkYjq4Masd2IzH4T4OlrXtm7W4
-m632nSg5qXXgvaRyzRPL56c+CZKZVIsAE5Td+v5v0YoPhYELsEX2WWWOOI7BcuUa
-DahvM8f/FFq2sp+ImTREjF+I6DVzD0LmoDloS/sKjQ0HQEQzrPXeJOlgBReYvyda
-cCgCxe1ePy4qaf5qR5HD
-=ePO2
+iEYEARECAAYFAk23ud4ACgkQgAnW8HDreRaSqQCgp1yUo5Z/Mxzl6zBkAP3oQ3S5
+KWsAn0ezbKa6kfpb5Ylv7eevDHdDsS9B
+=TGK+
 -----END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-2.10-hunspell.patch b/app-office/texmaker/files/texmaker-2.10-hunspell.patch
deleted file mode 100644
index cd15fe914018..000000000000
--- a/app-office/texmaker/files/texmaker-2.10-hunspell.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Index: texmaker-2.1/latexeditor.h
-===================================================================
---- texmaker-2.1.orig/latexeditor.h
-+++ texmaker-2.1/latexeditor.h
-@@ -22,7 +22,7 @@
- 
- #include "latexhighlighter.h"
- #include "parenmatcher.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- //class QCompleter;
- //class ParenMatcher;
-Index: texmaker-2.1/latexeditorview.h
-===================================================================
---- texmaker-2.1.orig/latexeditorview.h
-+++ texmaker-2.1/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
-Index: texmaker-2.1/latexhighlighter.h
-===================================================================
---- texmaker-2.1.orig/latexhighlighter.h
-+++ texmaker-2.1/latexhighlighter.h
-@@ -19,7 +19,7 @@
- #include <QTextCharFormat>
- #include <QColor>
- #include <QTextBlockUserData>
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- 
-Index: texmaker-2.1/spellerdialog.h
-===================================================================
---- texmaker-2.1.orig/spellerdialog.h
-+++ texmaker-2.1/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-Index: texmaker-2.1/texmaker.h
-===================================================================
---- texmaker-2.1.orig/texmaker.h
-+++ texmaker-2.1/texmaker.h
-@@ -43,7 +43,7 @@
- #include "logeditor.h"
- #include "gotolinedialog.h"
- #include "replacedialog.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewer.h"
- 
-Index: texmaker-2.1/texmaker.pro
-===================================================================
---- texmaker-2.1.orig/texmaker.pro
-+++ texmaker-2.1/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.1
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- ###############################
-@@ -50,25 +51,6 @@ HEADERS	+= texmaker.h \
- 	userquickdialog.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 \
-@@ -115,18 +97,6 @@ SOURCES	+= main.cpp \
- 	userquickdialog.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-2.20-hunspell.patch b/app-office/texmaker/files/texmaker-2.20-hunspell.patch
deleted file mode 100644
index bdab17fddd86..000000000000
--- a/app-office/texmaker/files/texmaker-2.20-hunspell.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-Index: texmaker-2.2/latexeditor.h
-===================================================================
---- texmaker-2.2.orig/latexeditor.h
-+++ texmaker-2.2/latexeditor.h
-@@ -22,7 +22,7 @@
- 
- #include "latexhighlighter.h"
- #include "parenmatcher.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- //class QCompleter;
- //class ParenMatcher;
-Index: texmaker-2.2/latexeditorview.h
-===================================================================
---- texmaker-2.2.orig/latexeditorview.h
-+++ texmaker-2.2/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
-Index: texmaker-2.2/latexhighlighter.h
-===================================================================
---- texmaker-2.2.orig/latexhighlighter.h
-+++ texmaker-2.2/latexhighlighter.h
-@@ -19,7 +19,7 @@
- #include <QTextCharFormat>
- #include <QColor>
- #include <QTextBlockUserData>
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- 
-Index: texmaker-2.2/spellerdialog.h
-===================================================================
---- texmaker-2.2.orig/spellerdialog.h
-+++ texmaker-2.2/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-Index: texmaker-2.2/texmaker.h
-===================================================================
---- texmaker-2.2.orig/texmaker.h
-+++ texmaker-2.2/texmaker.h
-@@ -43,7 +43,7 @@
- #include "logeditor.h"
- #include "gotolinedialog.h"
- #include "replacedialog.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewer.h"
- 
-Index: texmaker-2.2/texmaker.pro
-===================================================================
---- texmaker-2.2.orig/texmaker.pro
-+++ texmaker-2.2/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.2
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -54,25 +55,6 @@ HEADERS	+= texmaker.h \
- 	userquickdialog.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 \
-@@ -121,18 +103,6 @@ SOURCES	+= main.cpp \
- 	userquickdialog.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-2.22-hunspell.patch b/app-office/texmaker/files/texmaker-2.22-hunspell.patch
deleted file mode 100644
index 780bacb0437d..000000000000
--- a/app-office/texmaker/files/texmaker-2.22-hunspell.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-diff --git a/latexeditor.h b/latexeditor.h
-index a34b846..e3fa3d8 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -23,7 +23,7 @@
- #include <QCompleter>
- 
- #include "latexhighlighter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- //class QCompleter;
- //class ParenMatcher;
-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 453bab7..c0b9fde 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -19,7 +19,7 @@
- #include <QTextCharFormat>
- #include <QColor>
- #include <QTextBlockUserData>
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- 
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 88e1c93..2622834 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-diff --git a/texmaker.h b/texmaker.h
-index e2a71b1..3975cdc 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -43,7 +43,7 @@
- #include "logeditor.h"
- #include "gotolinedialog.h"
- #include "replacedialog.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewer.h"
- 
-diff --git a/texmaker.pro b/texmaker.pro
-index 09704f7..e632306 100755
---- 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.2.2
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -53,25 +54,6 @@ HEADERS	+= texmaker.h \
- 	userquickdialog.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 \
-@@ -120,18 +102,6 @@ SOURCES	+= main.cpp \
- 	userquickdialog.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-2.21-hunspell.patch b/app-office/texmaker/files/texmaker-3.02-hunspell.patch
index 0e115e4890e4..79d3d8e4c70b 100644
--- a/app-office/texmaker/files/texmaker-2.21-hunspell.patch
+++ b/app-office/texmaker/files/texmaker-3.02-hunspell.patch
@@ -1,44 +1,66 @@
+ 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 d339f7b..32a7f0e 100644
+index b18ff9b..4fe11a0 100644
 --- a/latexeditor.h
 +++ b/latexeditor.h
-@@ -22,7 +22,7 @@
+@@ -26,7 +26,7 @@
+ #include <QTimer>
  
  #include "latexhighlighter.h"
- #include "parenmatcher.h"
 -#include "hunspell/hunspell.hxx"
 +#include <hunspell.hxx>
  
- //class QCompleter;
- //class ParenMatcher;
+ typedef  int UserBookmarkList[3];
+ 
 diff --git a/latexeditorview.h b/latexeditorview.h
-index 5635464..8fb37cb 100644
+index 0471d6f..f663fdf 100644
 --- a/latexeditorview.h
 +++ b/latexeditorview.h
-@@ -18,7 +18,7 @@
- #include "latexeditor.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 453bab7..c0b9fde 100644
+index 83ca79c..a1e437a 100644
 --- a/latexhighlighter.h
 +++ b/latexhighlighter.h
-@@ -19,7 +19,7 @@
- #include <QTextCharFormat>
+@@ -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 88e1c93..2622834 100644
+index 83248ae..cd16dad 100644
 --- a/spellerdialog.h
 +++ b/spellerdialog.h
 @@ -13,7 +13,7 @@
@@ -51,20 +73,20 @@ index 88e1c93..2622834 100644
  #include <QTextCursor>
  
 diff --git a/texmaker.h b/texmaker.h
-index a959fe8..551fe20 100644
+index 8c98526..f9bbb1a 100644
 --- a/texmaker.h
 +++ b/texmaker.h
-@@ -43,7 +43,7 @@
+@@ -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 f36cf16..dbd73b8 100755
+index 86e46ac..9938814 100644
 --- a/texmaker.pro
 +++ b/texmaker.pro
 @@ -4,7 +4,8 @@ TARGET	 = texmaker
@@ -74,11 +96,11 @@ index f36cf16..dbd73b8 100755
 -CONFIG	+= qt warn_off release
 +CONFIG	+= qt warn_off release link_pkgconfig
 +PKGCONFIG = hunspell
- TEXMAKERVERSION=2.2.1
+ TEXMAKERVERSION=3.0.2
  DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
  DEFINES += HAVE_SPLASH
-@@ -54,25 +55,6 @@ HEADERS	+= texmaker.h \
- 	userquickdialog.h \
+@@ -56,25 +57,6 @@ HEADERS	+= texmaker.h \
+ 	usercompletiondialog.h \
  	synctex_parser.h \
  	synctex_parser_utils.h \
 -	hunspell/affentry.hxx \
@@ -103,8 +125,8 @@ index f36cf16..dbd73b8 100755
  	singleapp/qtlocalpeer.h \
  	singleapp/qtlockedfile.h \
  	singleapp/qtsingleapplication.h \
-@@ -121,18 +103,6 @@ SOURCES	+= main.cpp \
- 	userquickdialog.cpp \
+@@ -150,18 +132,6 @@ SOURCES	+= main.cpp \
+ 	usercompletiondialog.cpp \
  	synctex_parser.c \
  	synctex_parser_utils.c \
 -	hunspell/affentry.cxx \
@@ -122,3 +144,12 @@ index f36cf16..dbd73b8 100755
  	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/texmaker-2.10.ebuild b/app-office/texmaker/texmaker-2.10.ebuild
deleted file mode 100644
index 1a6588cdb124..000000000000
--- a/app-office/texmaker/texmaker-2.10.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-2.10.ebuild,v 1.1 2010/10/30 21:36:24 aballier Exp $
-
-EAPI="3"
-
-inherit base qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
-	MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
-	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	app-text/poppler[qt4]
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/qt-gui-4.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}
-	dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
-
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-	doins utilities/texmaker.svg || die "doins failed."
-
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog "A user manual with many screenshots is available at:"
-	elog "/usr/share/${PN}/usermanual_en.html"
-}
diff --git a/app-office/texmaker/texmaker-2.20.ebuild b/app-office/texmaker/texmaker-2.20.ebuild
deleted file mode 100644
index 651cb166e320..000000000000
--- a/app-office/texmaker/texmaker-2.20.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-2.20.ebuild,v 1.1 2011/01/26 11:18:28 aballier Exp $
-
-EAPI="3"
-
-inherit base qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
-	MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
-	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	app-text/poppler[qt4]
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/qt-gui-4.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}
-	dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
-
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-	doins utilities/texmaker.svg || die "doins failed."
-
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog "A user manual with many screenshots is available at:"
-	elog "/usr/share/${PN}/usermanual_en.html"
-}
diff --git a/app-office/texmaker/texmaker-2.22.ebuild b/app-office/texmaker/texmaker-2.22.ebuild
deleted file mode 100644
index d59a6829e6e8..000000000000
--- a/app-office/texmaker/texmaker-2.22.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-2.22.ebuild,v 1.1 2011/02/15 11:20:30 jlec Exp $
-
-EAPI="3"
-
-inherit base qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
-	MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
-	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	app-text/poppler[qt4]
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/qt-gui-4.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}
-	dev-util/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
-
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-	doins utilities/texmaker.svg || die "doins failed."
-
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog "A user manual with many screenshots is available at:"
-	elog "/usr/share/${PN}/usermanual_en.html"
-}
diff --git a/app-office/texmaker/texmaker-2.21.ebuild b/app-office/texmaker/texmaker-3.02.ebuild
index ced36c9a33c0..ea0d0c4da51b 100644
--- a/app-office/texmaker/texmaker-2.21.ebuild
+++ b/app-office/texmaker/texmaker-3.02.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-2.21.ebuild,v 1.1 2011/01/31 07:44:30 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.02.ebuild,v 1.1 2011/04/27 06:38:17 jlec Exp $
 
 EAPI="3"