Respect EPREFIX in all places, fixes poppler-qt4.h: No such file or directory

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

4 files changed, 38 insertions, 27 deletions

diff --git a/app-office/texmaker/ChangeLog b/app-office/texmaker/ChangeLog
index bbf830e07f62..c8d6cb1b5e34 100644
--- a/app-office/texmaker/ChangeLog
+++ b/app-office/texmaker/ChangeLog
@@ -1,6 +1,10 @@
 # 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.86 2011/11/28 10:31:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/ChangeLog,v 1.87 2011/12/04 10:10:03 jlec Exp $
+
+  04 Dec 2011; Justin Lecher <jlec@gentoo.org> texmaker-3.1.ebuild,
+  files/texmaker-3.1-hunspell.patch:
+  Respect EPREFIX in all places, fixes poppler-qt4.h: No such file or directory
 
   28 Nov 2011; Justin Lecher <jlec@gentoo.org> texmaker-3.1.ebuild:
   Keyworded for prefix, tested by me
diff --git a/app-office/texmaker/Manifest b/app-office/texmaker/Manifest
index 4088346a41a8..7c025d6e45ed 100644
--- a/app-office/texmaker/Manifest
+++ b/app-office/texmaker/Manifest
@@ -1,12 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 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
-AUX texmaker-3.1-hunspell.patch 4126 RMD160 6d7006c3d119f9f14edc2b395173d1ecd6865d72 SHA1 3683b9b08ec74942470d230e3a4453bc3945f5e1 SHA256 c8c68784b52ac1bfdcb6ac4637281c6cbf0daefaf3bc98b40c42cb418f721a36
+AUX texmaker-3.1-hunspell.patch 4493 RMD160 15457c250680fb905b5b14cb89ad935966fdc816 SHA1 3a338e267b7991228ca0a688fc1c8e93def1af2b SHA256 4605225c49282b2e075f3fc96dddaf98367be415a7ef195f27d9ff537a107f87
 DIST texmaker-1.9.2.tar.bz2 3094044 RMD160 218f662959843d3417368195d92c16de6970ac9e SHA1 72d2dc0782eeb4da7f0c2694f72ff94ef5168f5e SHA256 6b479788cbce4b940eb78fa011d1ee52c4959c4dc01441ed9a82b045131a10c6
 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
@@ -18,13 +15,6 @@ EBUILD texmaker-2.30.ebuild 1668 RMD160 6878937cbfa64570f592d3b884b29b1e0a38a813
 EBUILD texmaker-3.00.ebuild 1666 RMD160 774a05034e7db63edb1a6ccc8a5d24f96593443c SHA1 dbb8891ebb0e0ce1e930f6de2103b7fc859f2f8c SHA256 80793ae348e579a2941c141a0e989e7408f0f48889d5cb939d17f72ee11982d7
 EBUILD texmaker-3.01.ebuild 1666 RMD160 868dc0aea06657e7c39524e455c224fa9564349b SHA1 2d1d78d68312c9e6414673c806db44257a77b3a3 SHA256 033b0c64332e300fa04e0827faaaa0d11824dcd5d58d6c7d68b97c7423529533
 EBUILD texmaker-3.02.ebuild 1666 RMD160 88b0971e52c76086bf980641748fad1b54edf816 SHA1 25b0549d0eb6ea1bdd49f56e43bfb0cbff6ec4fb SHA256 2b4d1ab43a7f90ce553c70b78ff87aa3d76d22a2553e875e4b0d56afe9b00bbe
-EBUILD texmaker-3.1.ebuild 1702 RMD160 8088c38d70a6701d8c29ab0864a9f6af8315068c SHA1 07e33e3e2dfbdcf8c1edf21b727487d5a70ffc5e SHA256 b7b07d8cf1a8f2963af8f70e569cdb326c752c8b8e1976d94455bf6063e2a71b
-MISC ChangeLog 12393 RMD160 833efac4ae7d1be8394ae9696b43f6f2797195d0 SHA1 70c88a3b263abc72cecac5726d4aaa8df0252521 SHA256 dc324d937771757e277776ff21c893fb387780bd3843340b999d13d6056a3d16
+EBUILD texmaker-3.1.ebuild 1798 RMD160 815f526e8649c6265584b7037d1e5e066fa2000f SHA1 bbf0efb7aaaf4220ecda12e16c6b97570d10eb2e SHA256 5b4ca05ae316c05064b4c19de7f9c55d67025bdf4f907d37d730e3730d060272
+MISC ChangeLog 12579 RMD160 bd097d691b91d9bb13b2281ee57c8da37dfc2e2b SHA1 71943090ac8edd19ecb773b1dfa79b41e8f04558 SHA256 7175ff701c9773925b746e6557ec7e2ba7deb37bf305a0531a6e3f855229dc93
 MISC metadata.xml 274 RMD160 e2fb5cd41e542fe16d8cc8204d04110bf23bce3e SHA1 a957d8f40e49b70695325e66693bf622b42f6a39 SHA256 1c59f208af91e0b13109901b6ceed3fcc2f64f47280631ce6552b083256555b1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iEYEAREKAAYFAk7TYyQACgkQgAnW8HDreRYSWwCgjmBURDpmGUwZPMPAfuXTMXIz
-Wf4AnRkgZmq7tRS+fKfdUC5+jjXB/Eyf
-=7S6c
------END PGP SIGNATURE-----
diff --git a/app-office/texmaker/files/texmaker-3.1-hunspell.patch b/app-office/texmaker/files/texmaker-3.1-hunspell.patch
index 40d58e0d94ed..3b8935d0c237 100644
--- a/app-office/texmaker/files/texmaker-3.1-hunspell.patch
+++ b/app-office/texmaker/files/texmaker-3.1-hunspell.patch
@@ -1,25 +1,28 @@
- configdialog.cpp   |    2 +-
+ configdialog.cpp   |    4 ++--
  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(-)
+ texmaker.pro       |   42 ++++++------------------------------------
+ 7 files changed, 13 insertions(+), 43 deletions(-)
 
 diff --git a/configdialog.cpp b/configdialog.cpp
-index 136072d..1ead573 100644
+index 136072d..550db58 100644
 --- a/configdialog.cpp
 +++ b/configdialog.cpp
-@@ -122,7 +122,7 @@ void ConfigDialog::browseAspell()
+@@ -122,9 +122,9 @@ void ConfigDialog::browseAspell()
  QDir spelldir(QCoreApplication::applicationDirPath());
  #else
  #ifdef DEBIAN_SPELLDIR
 -QDir spelldir(PREFIX"/share/myspell/dicts");
-+QDir spelldir(PREFIX"/share/myspell");
++QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/myspell");
  #else
- QDir spelldir(PREFIX"/share/texmaker");
+-QDir spelldir(PREFIX"/share/texmaker");
++QDir spelldir("@GENTOO_PORTAGE_EPREFIX@/usr/share/texmaker");
  #endif
+ #endif
+ 
 diff --git a/latexeditor.h b/latexeditor.h
 index b9b8d75..a9ec1ef 100644
 --- a/latexeditor.h
@@ -86,7 +89,7 @@ index fa56129..4b1367e 100644
  #include "pdfviewerwidget.h"
  #include "pdfviewer.h"
 diff --git a/texmaker.pro b/texmaker.pro
-index 5c90e44..9ed3123 100644
+index 5c90e44..4513937 100644
 --- a/texmaker.pro
 +++ b/texmaker.pro
 @@ -4,7 +4,8 @@ TARGET	 = texmaker
@@ -144,7 +147,16 @@ index 5c90e44..9ed3123 100644
  	singleapp/qtlocalpeer.cpp \
  	singleapp/qtlockedfile.cpp \
  	singleapp/qtsingleapplication.cpp \
-@@ -268,7 +238,7 @@ LIBS         += -L/usr/lib -lz
+@@ -262,13 +232,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
  
diff --git a/app-office/texmaker/texmaker-3.1.ebuild b/app-office/texmaker/texmaker-3.1.ebuild
index f96666059532..bb1ab3deea92 100644
--- a/app-office/texmaker/texmaker-3.1.ebuild
+++ b/app-office/texmaker/texmaker-3.1.ebuild
@@ -1,10 +1,10 @@
 # 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-3.1.ebuild,v 1.2 2011/11/28 10:31:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/texmaker/texmaker-3.1.ebuild,v 1.3 2011/12/04 10:10:03 jlec Exp $
 
 EAPI="3"
 
-inherit base qt4-r2 versionator
+inherit base prefix qt4-r2 versionator
 
 # The upstream version numbering is bad, so we have to remove a dot in the
 # minor version number
@@ -48,8 +48,13 @@ DEPEND="${COMMON_DEPEND}
 
 PATCHES=( "${FILESDIR}/${P}-hunspell.patch" )
 
+src_prepare() {
+	qt4-r2_src_prepare
+	eprefixify ${PN}.pro configdialog.cpp
+}
+
 src_install() {
-	emake INSTALL_ROOT="${D}" install || die "make install failed"
+	emake INSTALL_ROOT="${ED}" install || die "make install failed"
 
 	insinto /usr/share/pixmaps/texmaker
 	doins utilities/texmaker*.png || die "doins failed."
@@ -60,5 +65,5 @@ src_install() {
 
 pkg_postinst() {
 	elog "A user manual with many screenshots is available at:"
-	elog "/usr/share/${PN}/usermanual_en.html"
+	elog "${EPREFIX}/usr/share/${PN}/usermanual_en.html"
 }