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

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

8 files changed, 31 insertions, 530 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index 0f24cf92b5eb..b7cc86aff1c8 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/texmaker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.101 2012/05/26 11:58:53 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.102 2012/07/19 09:40:02 jlec Exp $
+
+*texmaker-3.4 (19 Jul 2012)
+
+  19 Jul 2012; Justin Lecher <jlec@gentoo.org> -texmaker-3.3.1.ebuild,
+  -files/texmaker-3.3.1-hunspell.patch, -texmaker-3.3.2.ebuild,
+  -files/texmaker-3.3.2-hunspell.patch, -files/texmaker-3.3.2-qt48.patch,
+  -texmaker-3.3.3.ebuild, -files/texmaker-3.3.3-hunspell.patch,
+  +texmaker-3.4.ebuild, +files/texmaker-3.4-hunspell.patch:
+  Version Bump, #427134; use pkg-config for poppler-qt4 instead of manual hack;
+  define PREFIX instead of using prefix.eclass to fix offset; drop old
 
 *texmaker-3.3.4 (26 May 2012)
 
diff --git a/app-office/texmaker/files/texmaker-3.3.2-hunspell.patch b/app-office/texmaker/files/texmaker-3.3.2-hunspell.patch
deleted file mode 100644
index 9b811cd01443..000000000000
--- a/app-office/texmaker/files/texmaker-3.3.2-hunspell.patch
+++ /dev/null
@@ -1,167 +0,0 @@
- configdialog.cpp   |    4 ++--
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   42 ++++++------------------------------------
- 7 files changed, 13 insertions(+), 43 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 3b91fd0..338b166 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -210,9 +210,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
- 
-diff --git a/latexeditor.h b/latexeditor.h
-index e053390..0e82f08 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -33,7 +33,7 @@
- 
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index fb8d7d4..716b466 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class LatexEditorView : public QWidget  {
-    Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index e0b91b1..74ec42a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-diff --git a/texmaker.h b/texmaker.h
-index 584be7f..b0069a4 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -48,7 +48,7 @@
- #include "usertagslistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 17d0a24..28ad193 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET	 = texmaker
- QT += network \
-       xml \
-       webkit
--CONFIG	+= qt warn_off release
-+CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.3.2
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -67,25 +68,6 @@ HEADERS	+= texmaker.h \
- 	synctex_parser_utils.h \
- 	usertagslistwidget.h \
- 	addtagdialog.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
- 	singleapp/qtlocalpeer.h \
- 	singleapp/qtlockedfile.h \
- 	singleapp/qtsingleapplication.h \
-@@ -171,18 +153,6 @@ SOURCES	+= main.cpp \
- 	synctex_parser_utils.c \
- 	usertagslistwidget.cpp \
- 	addtagdialog.cpp \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
- 	singleapp/qtlocalpeer.cpp \
- 	singleapp/qtlockedfile.cpp \
- 	singleapp/qtsingleapplication.cpp \
-@@ -276,13 +246,13 @@ isEmpty( ICONDIR ) {
-     ICONDIR=/usr/share/pixmaps
- }
- 
--INCLUDEPATH  += /usr/include/poppler/qt4
--LIBS         += -L/usr/lib -lpoppler-qt4
--LIBS         += -L/usr/lib -lz
-+INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS         += -lpoppler-qt4
-+LIBS         += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- 
- INSTALLS = target
diff --git a/app-office/texmaker/files/texmaker-3.3.2-qt48.patch b/app-office/texmaker/files/texmaker-3.3.2-qt48.patch
deleted file mode 100644
index 139502f12aae..000000000000
--- a/app-office/texmaker/files/texmaker-3.3.2-qt48.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- main.cpp |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/main.cpp b/main.cpp
-index e979c1b..da2831a 100644
---- a/main.cpp
-+++ b/main.cpp
-@@ -14,6 +14,7 @@
- 
- #include "texmakerapp.h"
- #include <QStringList>
-+#include <GL/glu.h>
- 
- 
- int main( int argc, char ** argv )
diff --git a/app-office/texmaker/files/texmaker-3.3.3-hunspell.patch b/app-office/texmaker/files/texmaker-3.3.3-hunspell.patch
deleted file mode 100644
index 92776c078725..000000000000
--- a/app-office/texmaker/files/texmaker-3.3.3-hunspell.patch
+++ /dev/null
@@ -1,167 +0,0 @@
- configdialog.cpp   |    4 ++--
- latexeditor.h      |    2 +-
- latexeditorview.h  |    2 +-
- latexhighlighter.h |    2 +-
- spellerdialog.h    |    2 +-
- texmaker.h         |    2 +-
- texmaker.pro       |   42 ++++++------------------------------------
- 7 files changed, 13 insertions(+), 43 deletions(-)
-
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 3b91fd0..338b166 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -210,9 +210,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
- 
-diff --git a/latexeditor.h b/latexeditor.h
-index e053390..0e82f08 100644
---- a/latexeditor.h
-+++ b/latexeditor.h
-@@ -33,7 +33,7 @@
- 
- #include "latexhighlighter.h"
- #include "textblockselection.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- typedef  int UserBookmarkList[3];
- 
-diff --git a/latexeditorview.h b/latexeditorview.h
-index fb8d7d4..716b466 100644
---- a/latexeditorview.h
-+++ b/latexeditorview.h
-@@ -22,7 +22,7 @@
- #include "gotolinewidget.h"
- #include "replacewidget.h"
- #include "minisplitter.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class LatexEditorView : public QWidget  {
-    Q_OBJECT
-diff --git a/latexhighlighter.h b/latexhighlighter.h
-index e0b91b1..74ec42a 100644
---- a/latexhighlighter.h
-+++ b/latexhighlighter.h
-@@ -20,7 +20,7 @@
- #include <QColor>
- #include <QTextBlockUserData>
- //#include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- class QTextDocument;
- class LatexEditor;
-diff --git a/spellerdialog.h b/spellerdialog.h
-index 83248ae..cd16dad 100644
---- a/spellerdialog.h
-+++ b/spellerdialog.h
-@@ -13,7 +13,7 @@
- 
- #include "ui_spellerdialog.h"
- #include "latexeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- 
- #include <QTextCursor>
- 
-diff --git a/texmaker.h b/texmaker.h
-index 584be7f..b0069a4 100644
---- a/texmaker.h
-+++ b/texmaker.h
-@@ -48,7 +48,7 @@
- #include "usertagslistwidget.h"
- #include "xmltagslistwidget.h"
- #include "logeditor.h"
--#include "hunspell/hunspell.hxx"
-+#include <hunspell.hxx>
- #include "browser.h"
- #include "pdfviewerwidget.h"
- #include "pdfviewer.h"
-diff --git a/texmaker.pro b/texmaker.pro
-index 17d0a24..28ad193 100644
---- a/texmaker.pro
-+++ b/texmaker.pro
-@@ -4,7 +4,8 @@ TARGET	 = texmaker
- QT += network \
-       xml \
-       webkit
--CONFIG	+= qt warn_off release
-+CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.3.3
- DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
- DEFINES += HAVE_SPLASH
-@@ -67,25 +68,6 @@ HEADERS	+= texmaker.h \
- 	synctex_parser_utils.h \
- 	usertagslistwidget.h \
- 	addtagdialog.h \
--	hunspell/affentry.hxx \
--	hunspell/affixmgr.hxx \
--	hunspell/atypes.hxx \
--	hunspell/baseaffix.hxx \
--	hunspell/csutil.hxx \
--	hunspell/dictmgr.hxx \
--	hunspell/hashmgr.hxx \
--	hunspell/htypes.hxx \
--	hunspell/hunspell.hxx \
--	hunspell/hunspell.h \
--	hunspell/langnum.hxx \
--	hunspell/license.hunspell \
--	hunspell/phonet.hxx \
--	hunspell/suggestmgr.hxx \
--	hunspell/license.myspell \
--	hunspell/filemgr.hxx \
--	hunspell/hunzip.hxx \
--	hunspell/replist.hxx \
--	hunspell/w_char.hxx \
- 	singleapp/qtlocalpeer.h \
- 	singleapp/qtlockedfile.h \
- 	singleapp/qtsingleapplication.h \
-@@ -171,18 +153,6 @@ SOURCES	+= main.cpp \
- 	synctex_parser_utils.c \
- 	usertagslistwidget.cpp \
- 	addtagdialog.cpp \
--	hunspell/affentry.cxx \
--	hunspell/affixmgr.cxx \
--	hunspell/csutil.cxx \
--	hunspell/dictmgr.cxx \
--	hunspell/hashmgr.cxx \
--	hunspell/hunspell.cxx \
--	hunspell/phonet.cxx \
--	hunspell/suggestmgr.cxx \
--	hunspell/utf_info.cxx \
--	hunspell/filemgr.cxx \
--	hunspell/replist.cxx \
--	hunspell/hunzip.cxx \
- 	singleapp/qtlocalpeer.cpp \
- 	singleapp/qtlockedfile.cpp \
- 	singleapp/qtsingleapplication.cpp \
-@@ -276,13 +246,13 @@ isEmpty( ICONDIR ) {
-     ICONDIR=/usr/share/pixmaps
- }
- 
--INCLUDEPATH  += /usr/include/poppler/qt4
--LIBS         += -L/usr/lib -lpoppler-qt4
--LIBS         += -L/usr/lib -lz
-+INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS         += -lpoppler-qt4
-+LIBS         += -lz
- DEFINES += PREFIX=\\\"$${PREFIX}\\\"
- target.path = $${PREFIX}/bin
- 
--#DEFINES += DEBIAN_SPELLDIR
-+DEFINES += DEBIAN_SPELLDIR
- 
- 
- INSTALLS = target
diff --git a/app-office/texmaker/files/texmaker-3.3.1-hunspell.patch b/app-office/texmaker/files/texmaker-3.4-hunspell.patch
index e32786ea599c..18ee79ab1924 100644
--- a/app-office/texmaker/files/texmaker-3.3.1-hunspell.patch
+++ b/app-office/texmaker/files/texmaker-3.4-hunspell.patch
@@ -1,30 +1,13 @@
- configdialog.cpp   |    4 ++--
  latexeditor.h      |    2 +-
  latexeditorview.h  |    2 +-
  latexhighlighter.h |    2 +-
  spellerdialog.h    |    2 +-
  texmaker.h         |    2 +-
- texmaker.pro       |   42 ++++++------------------------------------
- 7 files changed, 13 insertions(+), 43 deletions(-)
+ texmaker.pro       |   40 ++++------------------------------------
+ 6 files changed, 9 insertions(+), 41 deletions(-)
 
-diff --git a/configdialog.cpp b/configdialog.cpp
-index 3b91fd0..338b166 100644
---- a/configdialog.cpp
-+++ b/configdialog.cpp
-@@ -210,9 +210,9 @@ void ConfigDialog::browseAspell()
- QDir spelldir(QCoreApplication::applicationDirPath());
- #else
- #ifdef DEBIAN_SPELLDIR
--QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
- #else
--QDir spelldir(PREFIX"/share/texmaker");
-+QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
- #endif
- #endif
- 
 diff --git a/latexeditor.h b/latexeditor.h
-index e053390..0e82f08 100644
+index c12bbe3..94b9a3c 100644
 --- a/latexeditor.h
 +++ b/latexeditor.h
 @@ -33,7 +33,7 @@
@@ -37,7 +20,7 @@ index e053390..0e82f08 100644
  typedef  int UserBookmarkList[3];
  
 diff --git a/latexeditorview.h b/latexeditorview.h
-index fb8d7d4..716b466 100644
+index 5951656..796eb28 100644
 --- a/latexeditorview.h
 +++ b/latexeditorview.h
 @@ -22,7 +22,7 @@
@@ -76,7 +59,7 @@ index 83248ae..cd16dad 100644
  #include <QTextCursor>
  
 diff --git a/texmaker.h b/texmaker.h
-index 584be7f..b0069a4 100644
+index 045ffc8..bf2705a 100644
 --- a/texmaker.h
 +++ b/texmaker.h
 @@ -48,7 +48,7 @@
@@ -89,7 +72,7 @@ index 584be7f..b0069a4 100644
  #include "pdfviewerwidget.h"
  #include "pdfviewer.h"
 diff --git a/texmaker.pro b/texmaker.pro
-index 17d0a24..28ad193 100644
+index 4e11282..9625bd5 100644
 --- a/texmaker.pro
 +++ b/texmaker.pro
 @@ -4,7 +4,8 @@ TARGET	 = texmaker
@@ -98,8 +81,8 @@ index 17d0a24..28ad193 100644
        webkit
 -CONFIG	+= qt warn_off release
 +CONFIG	+= qt warn_off release link_pkgconfig
-+PKGCONFIG = hunspell
- TEXMAKERVERSION=3.3.1
++PKGCONFIG = hunspell poppler-qt4
+ TEXMAKERVERSION=3.4
  DEFINES += TEXMAKERVERSION=\\\"$${TEXMAKERVERSION}\\\"
  DEFINES += HAVE_SPLASH
 @@ -67,25 +68,6 @@ HEADERS	+= texmaker.h \
@@ -147,15 +130,13 @@ index 17d0a24..28ad193 100644
  	singleapp/qtlocalpeer.cpp \
  	singleapp/qtlockedfile.cpp \
  	singleapp/qtsingleapplication.cpp \
-@@ -276,13 +246,13 @@ isEmpty( ICONDIR ) {
+@@ -278,13 +248,11 @@ isEmpty( ICONDIR ) {
      ICONDIR=/usr/share/pixmaps
  }
  
 -INCLUDEPATH  += /usr/include/poppler/qt4
 -LIBS         += -L/usr/lib -lpoppler-qt4
 -LIBS         += -L/usr/lib -lz
-+INCLUDEPATH  += @GENTOO_PORTAGE_EPREFIX@/usr/include/poppler/qt4
-+LIBS         += -lpoppler-qt4
 +LIBS         += -lz
  DEFINES += PREFIX=\\\"$${PREFIX}\\\"
  target.path = $${PREFIX}/bin
diff --git a/app-office/texmaker/texmaker-3.3.1.ebuild b/app-office/texmaker/texmaker-3.3.1.ebuild
deleted file mode 100644
index 796367a0851a..000000000000
--- a/app-office/texmaker/texmaker-3.3.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.3.1.ebuild,v 1.2 2012/05/03 20:00:38 jdhore Exp $
-
-EAPI="3"
-
-inherit base prefix qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
-	MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
-	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	app-text/poppler[qt4]
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/qt-gui-4.6.1:4
-	>=x11-libs/qt-core-4.6.1:4
-	>=x11-libs/qt-webkit-4.6.1:4
-	>=app-text/hunspell-1.2.4"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
-	app-text/ghostscript-gpl
-	media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
-
-src_prepare() {
-	qt4-r2_src_prepare
-	eprefixify ${PN}.pro configdialog.cpp
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install || die "make install failed"
-
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-	doins utilities/texmaker.svg || die "doins failed."
-
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog "A user manual with many screenshots is available at:"
-	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
diff --git a/app-office/texmaker/texmaker-3.3.2.ebuild b/app-office/texmaker/texmaker-3.3.2.ebuild
deleted file mode 100644
index 466bddae8ebd..000000000000
--- a/app-office/texmaker/texmaker-3.3.2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.3.2.ebuild,v 1.3 2012/05/03 20:00:38 jdhore Exp $
-
-EAPI="3"
-
-inherit base prefix qt4-r2 versionator
-
-# The upstream version numbering is bad, so we have to remove a dot in the
-# minor version number
-MAJOR="$(get_major_version)"
-MINOR_1="$(($(get_version_component_range 2)/10))"
-MINOR_2="$(($(get_version_component_range 2)%10))"
-if [ ${MINOR_2} -eq "0" ] ; then
-	MY_P="${PN}-${MAJOR}.${MINOR_1}"
-else
-	MY_P="${PN}-${MAJOR}.${MINOR_1}.${MINOR_2}"
-fi
-
-MY_P="${P}"
-
-DESCRIPTION="A nice LaTeX-IDE"
-HOMEPAGE="http://www.xm1math.net/texmaker/"
-SRC_URI="http://www.xm1math.net/texmaker/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON_DEPEND="
-	app-text/poppler[qt4]
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXext
-	>=x11-libs/qt-gui-4.6.1:4
-	>=x11-libs/qt-core-4.6.1:4
-	>=x11-libs/qt-webkit-4.6.1:4
-	>=app-text/hunspell-1.2.4"
-RDEPEND="${COMMON_DEPEND}
-	virtual/latex-base
-	app-text/psutils
-	app-text/ghostscript-gpl
-	media-libs/netpbm"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}-hunspell.patch"
-	"${FILESDIR}/${P}-qt48.patch"
-	)
-
-src_prepare() {
-	qt4-r2_src_prepare
-	eprefixify ${PN}.pro configdialog.cpp
-}
-
-src_install() {
-	emake INSTALL_ROOT="${ED}" install || die "make install failed"
-
-	insinto /usr/share/pixmaps/texmaker
-	doins utilities/texmaker*.png || die "doins failed."
-	doins utilities/texmaker.svg || die "doins failed."
-
-	dodoc utilities/AUTHORS utilities/CHANGELOG.txt || die "dodoc failed"
-}
-
-pkg_postinst() {
-	elog "A user manual with many screenshots is available at:"
-	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
-}
diff --git a/app-office/texmaker/texmaker-3.3.3.ebuild b/app-office/texmaker/texmaker-3.4.ebuild
index 550009ae6931..3f0ed66bd7e7 100644
--- a/app-office/texmaker/texmaker-3.3.3.ebuild
+++ b/app-office/texmaker/texmaker-3.4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.3.3.ebuild,v 1.2 2012/05/03 20:00:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.4.ebuild,v 1.1 2012/07/19 09:40:02 jlec Exp $
 
 EAPI=4
 
-inherit base prefix qt4-r2 versionator
+inherit base qt4-r2 versionator
 
 # The upstream version numbering is bad, so we have to remove a dot in the
 # minor version number
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	x11-libs/qt-gui:4
 	x11-libs/qt-core:4
 	x11-libs/qt-webkit:4
-	>=app-text/hunspell-1.2.4"
+	app-text/hunspell"
 RDEPEND="${COMMON_DEPEND}
 	virtual/latex-base
 	app-text/psutils
@@ -48,13 +48,15 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}/${P}-hunspell.patch"
-	"${FILESDIR}/${P}-qt48.patch"
+	"${FILESDIR}"/${P}-hunspell.patch
+	"${FILESDIR}"/${PN}-3.3.3-qt48.patch
 	)
-
-src_prepare() {
-	qt4-r2_src_prepare
-	eprefixify ${PN}.pro configdialog.cpp
+src_configure() {
+	eqmake4 \
+		${PN}.pro \
+		PREFIX="${EPREFIX}/usr" \
+		DESKTOPDIR="${EPREFIX}/usr/share/applications" \
+		ICONDIR="${EPREFIX}/usr/share/pixmaps"
 }
 
 src_install() {