Version Bump, Cleaned old

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

9 files changed, 65 insertions, 582 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/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"