Prefix boost detection fix

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

5 files changed, 31 insertions, 21 deletions

diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
index 6328b847d5a7..d02f78bba108 100644
--- a/sci-libs/cctbx/ChangeLog
+++ b/sci-libs/cctbx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/cctbx
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.10 2010/12/29 15:16:29 jlec Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.11 2011/01/15 14:44:16 jlec Exp $
+
+  15 Jan 2011; Justin Lecher <jlec@gentoo.org>
+  files/2010.03.29.2334-boost.patch, cctbx-2010.03.29.2334-r2.ebuild,
+  cctbx-2010.03.29.2334-r3.ebuild:
+  Prefix boost detection fix
 
   29 Dec 2010; Justin Lecher <jlec@gentoo.org> cctbx-2009.11.01.0123-r1.ebuild,
   cctbx-2010.03.29.2334-r1.ebuild, cctbx-2010.03.29.2334-r2.ebuild,
diff --git a/sci-libs/cctbx/Manifest b/sci-libs/cctbx/Manifest
index 8c46ed5f4d7f..24227a21a5d4 100644
--- a/sci-libs/cctbx/Manifest
+++ b/sci-libs/cctbx/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX 2010.03.29.2334-boost.patch 18151 RMD160 cb99a020f33a20a3297ea5873d11f4b081bd22de SHA1 282054bf323c1057b2c99af105d84e03c12a67bb SHA256 afb97c9c3ebb71e7ba0eb46b99c1f007d8e9ddcfdb216c978e84f42caa1b1c2b
+AUX 2010.03.29.2334-boost.patch 18175 RMD160 cf972e6d792d98d152eb18453f0349c87efbbb97 SHA1 f9dac88aea0e898259537a343650cbcd53b6f01f SHA256 f6a8a246dfd42e7981687802a0e00d933759d3c749c0344bfbfbfde12814f4d7
 AUX 2010.03.29.2334-clipper.patch 2209 RMD160 1bfc13f0834e837a55f0e41554649acd1e45b80c SHA1 a81ee2cc94805b6ef1e609c2ea402a1c9f429d62 SHA256 e7c8bf813bedd3b67de5ce727d5f75e9635568769373f237e7b624ed143351b1
 AUX 2010.03.29.2334-flags.patch 3336 RMD160 fdbb0b71499e00c666629e1ff04b5bdcbe376b13 SHA1 ef97099dbd93727bd356015f22e82480a48e1a0c SHA256 769edb3e5dcb608b54ab4d33c5933b523f73ff62c6cb627c4eb4b1a2086e40b1
 AUX 2010.03.29.2334-soname.patch 5177 RMD160 c6cad498c4edb7046696428008408b126efa954c SHA1 7c5d78110c4270c9ca113ae5ea77c7c2451e2b21 SHA256 dd4ea6dbf34c1b2d9572adec5a33fe6a73b1a99e8c4364123e69382bb161ce74
@@ -10,14 +10,14 @@ DIST cctbx-2009.11.01.0123.tar.gz 14604079 RMD160 77cc84d4b9e35e7a87f807d8669efb
 DIST cctbx-2010.03.29.2334.tar.gz 15570372 RMD160 e543578dbe6568f5f8f80b3ce7a20b10e01193bc SHA1 1442dbd5d1ef3b91e718dce039a24fc1637104d3 SHA256 e1fae804caaf8593c7a3f32e4544046f4c00293063d9099721578cc8fbd17213
 EBUILD cctbx-2009.11.01.0123-r1.ebuild 5746 RMD160 ea65055c3ecb4f90fea5850349e8d48a6062e792 SHA1 fbb89c8b722375504ae455dbf1511871f09f2df5 SHA256 7f15213ea692197e2b5f6e7a8d350a76d5456ad9b498b5569f510d6e1c1ce604
 EBUILD cctbx-2010.03.29.2334-r1.ebuild 5881 RMD160 deee9422031d740e93c4448d9b192d4a413fccc3 SHA1 3ce9443b9a3756dc090666cd947df0f6bc831b42 SHA256 a879efce871c0d3c1f4771df98e7e0a4835e0e0637605176920dcc50fde8d19c
-EBUILD cctbx-2010.03.29.2334-r2.ebuild 5622 RMD160 2793116950a385c1899b665df7e270ee58303b54 SHA1 50de204b286ab210564a42514219552145f8ac1c SHA256 2131ae063768da652593de599a5c96c9701fa33e01d38cd8c22e3598733aef1c
-EBUILD cctbx-2010.03.29.2334-r3.ebuild 5880 RMD160 ac657825c46a1e3660692ed1c11159ba6ec2c267 SHA1 06c08441ef64fdaa5b327b59912e7a185853766f SHA256 64757c2e28eaba50b7014fb76dbbe32d899f71d52a1627d895a1fa43e511f976
-MISC ChangeLog 2464 RMD160 cb3205e58f6ec27167ef7a0e409d42c671f20fe2 SHA1 783b3e4c3b689aa8cc2a288d7627fd791f93b1bf SHA256 6d4646d58fd1f06dc3932a3746627916b8eb187aba86b292d47b1ff6b6377609
+EBUILD cctbx-2010.03.29.2334-r2.ebuild 5665 RMD160 7f4866e6bf4fa2e7b2ffa57244b1c4e52ce969d7 SHA1 28b0855d693f323332ca1e922ae7afe5d740eba0 SHA256 f4b691c564fe6017da12002a15274ace64f6ec873b6792b55da73f9cd4041d0b
+EBUILD cctbx-2010.03.29.2334-r3.ebuild 5935 RMD160 e09e5fa8ff0f93bb28df2bbde41fc3a566823ba7 SHA1 0d192b580152f75907c2658cfe789aef18793f56 SHA256 7ee32c30316a692c2917aadc483e6ecc2a216ca339740e26aba4f48fc349d5ea
+MISC ChangeLog 2646 RMD160 2acc4328c920823bafb1be1bb1420bef290ebdb1 SHA1 2bad5692d3cd6f5d84a2a003120cacb92f4ea17d SHA256 303c8284008660d9370b375e6291f284544958609d45308ab651e3384598842a
 MISC metadata.xml 767 RMD160 c2fc3bcc534e407e6066ee98beb6878d78a0f6e9 SHA1 a653677e160cf0726e1747b06b5d0cd95e51ac5f SHA256 ef36fc1a1d5d657ba67f88b303f08eef5a1a814d22a2091c07616dc16928e3fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk0bUNkACgkQgAnW8HDreRZorQCeMbd7aqSpWdQxQZVWFNuzC4op
-rlYAn0loPVzN+UBbpQ0m5OylMkQ1rklH
-=pLvY
+iEYEARECAAYFAk0xssYACgkQgAnW8HDreRa3cgCgoqsGCCXReb7REi4tK75fmJt6
+8AIAoK9hccWlpnuXANhC+SyNSol+uC61
+=D8C8
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild
index 7f39e39dfa23..5dbdc622d98d 100644
--- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild
+++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild,v 1.3 2010/12/29 15:16:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r2.ebuild,v 1.4 2011/01/15 14:44:16 jlec Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
 
-inherit eutils python toolchain-funcs
+inherit eutils prefix python toolchain-funcs
 
 MY_PV="${PV//./_}"
 
@@ -46,11 +46,14 @@ src_prepare() {
 	local opts
 	local optsld
 
-	epatch "${FILESDIR}"/${PV}-tst_server.py.patch
-	epatch "${FILESDIR}"/${PV}-boost.patch
-	epatch "${FILESDIR}"/${PV}-clipper.patch
-	epatch "${FILESDIR}"/${PV}-flags.patch
-	epatch "${FILESDIR}"/${PV}-soname.patch
+	epatch \
+		"${FILESDIR}"/${PV}-tst_server.py.patch \
+		"${FILESDIR}"/${PV}-boost.patch \
+		"${FILESDIR}"/${PV}-clipper.patch \
+		"${FILESDIR}"/${PV}-flags.patch \
+		"${FILESDIR}"/${PV}-soname.patch
+
+	eprefixify "${MY_S}"/scitbx/libtbx_refresh.py
 
 	rm -rf "${MY_S}/scons" "${MY_S}/boost" "${MY_S}/PyCifRW"
 	find "${MY_S}/clipper" -name "*.h" -delete
diff --git a/sci-libs/cctbx/cctbx-2010.03.29.2334-r3.ebuild b/sci-libs/cctbx/cctbx-2010.03.29.2334-r3.ebuild
index f7ce39ba57b9..4ced507fa714 100644
--- a/sci-libs/cctbx/cctbx-2010.03.29.2334-r3.ebuild
+++ b/sci-libs/cctbx/cctbx-2010.03.29.2334-r3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r3.ebuild,v 1.2 2010/12/29 15:16:29 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2010.03.29.2334-r3.ebuild,v 1.3 2011/01/15 14:44:16 jlec Exp $
 
 EAPI="3"
 
 PYTHON_DEPEND="2"
 
-inherit eutils python toolchain-funcs
+inherit eutils prefix python toolchain-funcs
 
 MY_PV="${PV//./_}"
 
@@ -53,6 +53,8 @@ src_prepare() {
 		"${FILESDIR}"/${PV}-flags.patch \
 		"${FILESDIR}"/${PV}-soname.patch
 
+	eprefixify "${MY_S}"/scitbx/libtbx_refresh.py
+
 	rm -rf "${MY_S}/scons" "${MY_S}/boost" "${MY_S}/PyCifRW" || die
 	find "${MY_S}/clipper" -name "*.h" -delete || die
 
diff --git a/sci-libs/cctbx/files/2010.03.29.2334-boost.patch b/sci-libs/cctbx/files/2010.03.29.2334-boost.patch
index 8676476266c2..5b4439ee6780 100644
--- a/sci-libs/cctbx/files/2010.03.29.2334-boost.patch
+++ b/sci-libs/cctbx/files/2010.03.29.2334-boost.patch
@@ -472,7 +472,7 @@ index 10d4ee0..c8374b2 100644
    warn_if_unexpected_md5_hexdigest(
 -    path=self.env.under_dist(
 -      module_name="boost", path="boost/random/mersenne_twister.hpp"),
-+    path="/usr/include/boost/random/mersenne_twister.hpp",
++    path="@GENTOO_PORTAGE_EPREFIX@/usr/include/boost/random/mersenne_twister.hpp",
      expected_md5_hexdigests=[
        "a2533c79a21f0f773f2e0d29a37371b0", # CVS revision 1.21
        "378432b5b280c9c0c894f7c80f0dad92", # CVS revision 1.20