Add rpath on prefix

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

4 files changed, 35 insertions, 9 deletions

diff --git a/app-text/poppler/ChangeLog b/app-text/poppler/ChangeLog
index c17749375880..75bb7e0e73b1 100644
--- a/app-text/poppler/ChangeLog
+++ b/app-text/poppler/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/poppler
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.320 2012/05/21 21:12:14 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/ChangeLog,v 1.321 2012/06/01 08:54:26 jlec Exp $
+
+  01 Jun 2012; Justin Lecher <jlec@gentoo.org> poppler-0.18.4-r1.ebuild,
+  +files/rpath.cmake:
+  Add rpath on prefix
 
   21 May 2012; Maciej Mrozowski <reavertm@gentoo.org> metadata.xml,
   poppler-0.20.0.ebuild:
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index bb51ead3c9ef..468c51a4838b 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,21 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX poppler-0.18.4-newline.patch 529 RMD160 4de62a1cc3108da9d69c06c11c280895f5aba0fe SHA1 f9fa6dbce03efeaa95694bc4498a9d33f4320a7b SHA256 9bcd45cb6f13caedc01a2c95faccea750a8fc80718fbd2a7c0f991e389c0d40c
 AUX poppler-0.20.0-lcms-automagic.patch 4161 RMD160 28cbb0a4307e7f6025fafd7ddc2bcb29a037ab48 SHA1 b4a4f74d8e0cf95345611ac376c077a31e9adce1 SHA256 7f1316bdaa4f6c4c2f6dc96b720fc068f10ec5f53e1c6d544109930e4d8d04e5
+AUX rpath.cmake 393 RMD160 51a6cf4a7f8d6c55f2debcf28cb23129ec6a785b SHA1 31f4a5c481724abdd620a37d87103a38dcab4c39 SHA256 b89f3698d321e30afef0f7c32be009d5d926f92ba310ad44b384cdbc1a6a104d
 DIST poppler-0.16.7.tar.gz 1952179 RMD160 279330e6feaf97a207f3396eab1af836d3d1f16c SHA1 26c735f863688f62b57d5159863fdad4272be89f SHA256 fab4e8af2d34d4142a718819fd747d40930b71ef520ee0e6bcc94e2c44f22bcd
 DIST poppler-0.18.4.tar.gz 1992993 RMD160 1553017e9b260cbd624d43d77fcf410afaa57e4a SHA1 3753caecba71afaf29f097e0b9c52e0f83a10a59 SHA256 33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e
 DIST poppler-0.20.0.tar.gz 2140152 RMD160 d02773cc010cc13cd9ef49a3ba65e04b79456232 SHA1 236d342e8fd931cbce9b79872053ba12b6a5b316 SHA256 b2e3253c2f4af248a2ffaac29161de6e462c587031e7875287b9956b45a0570d
 EBUILD poppler-0.16.7.ebuild 2841 RMD160 7618158e3744e5788c6177a5713a9fdea92cd6e1 SHA1 c0b7f5f7c7be084bede4bd083218ba626d07c858 SHA256 0295e086d652bc68348629a04d32d1094fbb454e95a6661177158c375dc374eb
-EBUILD poppler-0.18.4-r1.ebuild 2707 RMD160 9832beed439d837a9463348e702cdba57e049141 SHA1 760d44bcb0df4991da7419435083a856a386cf23 SHA256 4d729de3506c9bc68284b9256b90499c7febbe84f665f97b5e3d8dacd1fafa7b
+EBUILD poppler-0.18.4-r1.ebuild 2878 RMD160 279b20c89d003caf1dcef227794b75c26228d55f SHA1 9fc0ca3e0234ab0823f68b7481fe5bf66ebb6be4 SHA256 cc0d13feb2711e7c39dd441187ce6218bbb2456e950c90c89e98e145f90fae67
 EBUILD poppler-0.18.4.ebuild 2652 RMD160 0d1f7923b4be6c3ce702b1acc47d043eb4e0c8f1 SHA1 3684867ee89f04f1a2790b3bba3058a52daba95d SHA256 fd377588b92963be82a9c97a3f9bdaf6a59e44b215d6e23857bbb3c63aae3b4c
 EBUILD poppler-0.20.0.ebuild 2744 RMD160 bd1a0b672f9943e60308d69dffaaee363f177694 SHA1 bc5f9537c535fe655df0f63b903f9e660761c7e3 SHA256 a6662de50e96661d030736db14689d17fd955eca85b7bde6be5d2c2223acb3f1
-MISC ChangeLog 45163 RMD160 0b690c44b2565129b7cc1fb45d569afd953e7c8b SHA1 88c42379068c6348f50fb5d3b8e274b873420c76 SHA256 6ae73640a487281ef77fcf5db5264c5bb4cb6089d2874e97dde54cff1dc8ed16
+MISC ChangeLog 45277 RMD160 60428aa45e508b4b724a3514b74a4a32b2cf4741 SHA1 fd1074f0c79bf05a840d88ebd21b4105baedb21a SHA256 35ad5cfd5cf2f1a8955ec4c0a0747177f0080035943092292d3367f0cfb03f10
 MISC metadata.xml 531 RMD160 bdae255e3871cac7966787a198b50d0f77180747 SHA1 8d191a0d9acc9c4494dd4b80ba72e420cf5489a4 SHA256 afef403de543eb24d44ec80c5353f932dffd16c5cd805f311a82089cdb4f4a99
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
 
-iEYEARECAAYFAk+6r5cACgkQFuHa/bHpVdtzpQCgvz5CWhak7uJBxYUiJl8O+WcX
-x9oAn2ZyLTHni1HttsrUvrC02QNnGKhA
-=Y1Z9
+iEYEAREKAAYFAk/Ig0cACgkQgAnW8HDreRY0vwCePhUQXrJJlttzGvrJNGKD6MJR
+wB0AnRAhjL1x4HWTqGME1frDDiLKc6WM
+=MIaO
 -----END PGP SIGNATURE-----
diff --git a/app-text/poppler/files/rpath.cmake b/app-text/poppler/files/rpath.cmake
new file mode 100644
index 000000000000..b896c8789185
--- /dev/null
+++ b/app-text/poppler/files/rpath.cmake
@@ -0,0 +1,10 @@
+# use, i.e. don't skip the full RPATH for the build tree
+SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+
+# when building, don't use the install RPATH already
+# (but later on when installing)
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
diff --git a/app-text/poppler/poppler-0.18.4-r1.ebuild b/app-text/poppler/poppler-0.18.4-r1.ebuild
index f75b149d7cf4..834abb294179 100644
--- a/app-text/poppler/poppler-0.18.4-r1.ebuild
+++ b/app-text/poppler/poppler-0.18.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.4-r1.ebuild,v 1.9 2012/05/06 20:34:59 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.18.4-r1.ebuild,v 1.10 2012/06/01 08:54:26 jlec Exp $
 
 EAPI="4"
 
@@ -54,6 +54,16 @@ PATCHES=( "${FILESDIR}/${P}-newline.patch" )
 
 DOCS=(AUTHORS ChangeLog NEWS README README-XPDF TODO)
 
+src_prepare() {
+	if use prefix && use qt4; then
+		cp "${FILESDIR}"/rpath.cmake .
+		sed \
+			-i '1iinclude(rpath.cmake)' \
+			CMakeLists.txt || die
+	fi
+	base_src_prepare
+}
+
 src_configure() {
 	mycmakeargs=(
 		-DBUILD_GTK_TESTS=OFF