From 9779664bcd17fe85e323a003115dbe4b998a055c Mon Sep 17 00:00:00 2001 From: Andrew Savchenko Date: Wed, 3 Aug 2011 02:30:00 +0400 Subject: Use rpath if prefix is enabled. (Portage version: 2.2.0_alpha50/git/Linux i686, unsigned Manifest commit) --- sci-physics/root/ChangeLog | 3 +++ sci-physics/root/Manifest | 4 ++-- sci-physics/root/root-5.30.00.ebuild | 8 ++++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/sci-physics/root/ChangeLog b/sci-physics/root/ChangeLog index cda314e4a..91b9580c0 100644 --- a/sci-physics/root/ChangeLog +++ b/sci-physics/root/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 02 Aug 2011; Andrew Savchenko root-5.30.00.ebuild: + Enable rpath if prefix is used, see bug 346933. + *root-5.30.00 (02 Aug 2011) 02 Aug 2011; Andrew Savchenko diff --git a/sci-physics/root/Manifest b/sci-physics/root/Manifest index 5de6be9b2..3ea74a2ad 100644 --- a/sci-physics/root/Manifest +++ b/sci-physics/root/Manifest @@ -17,6 +17,6 @@ DIST RooFit_Users_Manual_2.91-33.pdf 1330062 RMD160 650b616018a5493d5fd7da1dc06c DIST TMVAUsersGuide-v4.03.pdf 3913533 RMD160 fbd62b90e7ad47ad69ec62d584417463ec13bf9c SHA1 84a63140cc3e01267d2cc7ffa374a7c24fbed37e SHA256 0cdbb4a2d19eb7a86e2911cfa73a905932e862d6c94be10b7662a9355b0241af DIST Users_Guide_5_26.pdf 9914765 RMD160 9e67a407d5a4d4f7019ab7b9b29bc696b7974987 SHA1 c2ecb87226e2fa38e6214aaf76dd789663d260dd SHA256 d0887800de7ffe7d6c0957891d44a4b34bf9d0eeb3da7e34b735ef998770bf39 DIST root_v5.30.00.source.tar.gz 40828616 RMD160 027558ac9b0d294fd26437ff31cb4e149f4dd7e7 SHA1 9549bd357e85bb3855abd78c7183c26dbd247fbb SHA256 9be4a4f01dde85d69d4746d5ee750f31abd6e73eff8738e67b4c50f7b52ec647 -EBUILD root-5.30.00.ebuild 10131 RMD160 788508a56b984029f32a5d31de4e87ee0f5de06d SHA1 58163708011595c82ffb1a4918abe5e3e74771a9 SHA256 c160667e68e2428f961eb285ce03ac1e6a46fc2c5228d6244f803343db2dfc32 -MISC ChangeLog 1098 RMD160 ebbf2bfdc67368a5970b08f16a13f9add022fe89 SHA1 cc82748b45c55b87dcd712dbf8f0883e23ff6a71 SHA256 47c0bd86d8fa8e8e8d54326b9660a31e7b09b07f8d45d80476a2be9d3d650952 +EBUILD root-5.30.00.ebuild 10162 RMD160 edb830c2b607211a310b576bab4525a6457f994d SHA1 9bba32d10a6c6f53cc64336a05efe770fdff2df2 SHA256 7e3e78e4d2ee6693890676411fa17a90ba229cfaa9054faafaf133ad0ac0688d +MISC ChangeLog 1222 RMD160 6a8dfb806c3986d97e6321749580254f260feb75 SHA1 2a981ac628882066c11b9e03cf148131cefee4e1 SHA256 26945676fd5b6ebbd9f37884ea1260ba54f120d59550b93ebf5f3e9d3c336f07 MISC metadata.xml 1491 RMD160 65724809b563fa497bc739148758b89f4a14d52b SHA1 8c8078d0383141d06ca0467aad45d461fa3229ba SHA256 3ae2d0f5bd3c567a41c98be907e8ecdcd58175d64202d17623ffdf34371051f8 diff --git a/sci-physics/root/root-5.30.00.ebuild b/sci-physics/root/root-5.30.00.ebuild index a4c4bf8ec..f802d1338 100644 --- a/sci-physics/root/root-5.30.00.ebuild +++ b/sci-physics/root/root-5.30.00.ebuild @@ -22,10 +22,10 @@ SRC_URI="ftp://root.cern.ch/${PN}/${PN}_v${PV}.source.tar.gz SLOT="0" LICENSE="LGPL-2.1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~x86 ~amd64-linux" IUSE="+X afs avahi clarens doc emacs examples fits fftw graphviz kerberos ldap - llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres pythia6 - pythia8 python +reflex ruby qt4 ssl xft xml xinetd xrootd" + llvm +math mpi mysql ncurses odbc +opengl openmp oracle postgres prefix + pythia6 pythia8 python +reflex ruby qt4 ssl xft xml xinetd xrootd" CDEPEND="app-arch/xz-utils >=dev-lang/cfortran-4.4-r2 @@ -182,7 +182,6 @@ src_configure() { --disable-builtin-pcre \ --disable-builtin-zlib \ --disable-builtin-lzma \ - --disable-rpath \ --enable-astiff \ --enable-exceptions \ --enable-explicitlink \ @@ -218,6 +217,7 @@ src_configure() { $(use_enable odbc) \ $(use_enable opengl) \ $(use_enable postgres pgsql) \ + $(use_enable prefix rpath) \ $(use_enable pythia6) \ $(use_enable pythia8) \ $(use_enable python) \ -- cgit v1.2.3-18-g5258