Fix cctbx version

Package-Manager: portage-2.2_rc84/cvs/Linux x86_64

5 files changed, 20 insertions, 16 deletions

diff --git a/sci-chemistry/pointless/ChangeLog b/sci-chemistry/pointless/ChangeLog
index 6b6a58167eed..dad9df00f340 100644
--- a/sci-chemistry/pointless/ChangeLog
+++ b/sci-chemistry/pointless/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/pointless
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/ChangeLog,v 1.8 2010/09/12 08:17:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/ChangeLog,v 1.9 2010/09/20 07:07:31 jlec Exp $
+
+  20 Sep 2010; Justin Lecher <jlec@gentoo.org> pointless-1.4.9.ebuild,
+  pointless-1.5.7.ebuild, pointless-1.5.9.ebuild:
+  Fix cctbx version
 
 *pointless-1.5.9 (12 Sep 2010)
 
diff --git a/sci-chemistry/pointless/Manifest b/sci-chemistry/pointless/Manifest
index 63b2f6369775..08e73cad7c06 100644
--- a/sci-chemistry/pointless/Manifest
+++ b/sci-chemistry/pointless/Manifest
@@ -5,15 +5,15 @@ AUX 1.5.1-gcc4.4.patch 290 RMD160 02088f424953afbc8ceddb87f47d801cfddc919a SHA1
 DIST pointless-1.4.9.tar.gz 335796 RMD160 219c8af240bbaa04ae090eb2e40ce6cbf702d3b0 SHA1 025885fc9609bd9fffdcffafe52594a402469594 SHA256 ea93fb4fe9ea0e9de0c896e9289aa50e5c1bb5af59b18435675f8529f61caad8
 DIST pointless-1.5.7.tar.gz 360257 RMD160 27d0f452589b0d06f4ac16fb975302982b6707dd SHA1 72ba8e7dcb46be19c71bb8feb97fd461f9bfb65f SHA256 8f93bb47195788345c10e7904db1a01751a2cab705cdff02a3c50fd9b8b1d3d7
 DIST pointless-1.5.9.tar.gz 361721 RMD160 59fea4a468cfb21621ed22fa049164d6a1d68485 SHA1 f449f07c69c6c9165f3dd4b3996da9b52d7254f6 SHA256 476b4fcb5218a28bc0469bb57ca8c541ce399b0428ba7cdf58a13f5473d74c01
-EBUILD pointless-1.4.9.ebuild 1420 RMD160 1d41feefb5503fbb3029fa58add7dc1ff37c1bbb SHA1 2023f52890cecbe734c2aaf00fec6179129e4862 SHA256 8263bfd3b3a3dbac4023b553852a2406a6eafd9fd300c29efe0e14b7e5cd29ff
-EBUILD pointless-1.5.7.ebuild 1476 RMD160 1ac5cbbfcfc1a6667b1996c23ff430a247d751c1 SHA1 60445db651b0554644ef62450f22cf9fddaf7506 SHA256 4ec4d373ed07c5704b12732304eb109fe1d5b6ed15d2332bbd7395651351c152
-EBUILD pointless-1.5.9.ebuild 1476 RMD160 d635339549b58e3183448fae17a0827af7f90032 SHA1 a021841b4b847c204b8db86613027126e4c8e4d5 SHA256 70853b71de537e4b2e50ce8d0df272c491e01bfa401e7f4f30213ccb13dd3b5c
-MISC ChangeLog 1338 RMD160 6cc02ca5a8906fd4f53a5ace5ec78eafe302af3f SHA1 04ee336dfaf4a80a36b1617e5d3cbd33102c1dad SHA256 0808c38dbf0c17814dd0e19bff119671bf8f5be207785ca4a40b1fa9dc34970f
+EBUILD pointless-1.4.9.ebuild 1440 RMD160 a218e4c1b0f1560d164eedd87d98f5968207d6e4 SHA1 253ba9d8280748b1931cf4602b1443a502afd587 SHA256 90b971ace3ba1b1b87738ea1ac21630f58e61a6b634bc73ce3caaabf056d26fb
+EBUILD pointless-1.5.7.ebuild 1496 RMD160 857f813eb64cb2142068f0214eac92d2a40035cd SHA1 b9fb0983e69c27018ec817d5b6fcda3eba485383 SHA256 c1a1598aaedd39bfc2bcfe57cc754e9c80722199e9d89d90ce1f035b546df24b
+EBUILD pointless-1.5.9.ebuild 1369 RMD160 159b67f4bc476e802d7fcc76600c05897832bc37 SHA1 8c3099f2e25077b38b05d190f43c44727f7e4af4 SHA256 35c3a58bdafedbbe4bccca5921fefb12cf57d3c41167a3f5ab0b2cc3bd056021
+MISC ChangeLog 1480 RMD160 dbd89b24838973c2f7e5bf7faec96432331a4247 SHA1 46baefb24f14af4f3753727476aa30b730269b2a SHA256 c65e5e554a06be3bc4b35c2e34a9eef38a542ba0bf056e0e4fa23505418198bc
 MISC metadata.xml 216 RMD160 04a6fc4e2160b439296b52aa97d5b7d83af75508 SHA1 9561c9e6eada6aac9b503407917900529ce703e9 SHA256 24f5c205c2655ef27138c8aa087701626f5b4c666229c9ef7fe814e63ea2e776
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyMjIIACgkQgAnW8HDreRZnNwCgsydKvuqxIQNiovcMXbq+HFug
-R4gAnjrJmBhF/YKZF6nAVrCf/1o+cYn3
-=Gltx
+iEYEARECAAYFAkyXCDwACgkQgAnW8HDreRbyVQCgk7BJkRvFI9WT17YTGy9pBCgf
+NokAnjAOZ/TjsdGDhHlx9obs1b86nCp9
+=sj5i
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/pointless/pointless-1.4.9.ebuild b/sci-chemistry/pointless/pointless-1.4.9.ebuild
index 261210e32b09..6151ffe9d506 100644
--- a/sci-chemistry/pointless/pointless-1.4.9.ebuild
+++ b/sci-chemistry/pointless/pointless-1.4.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.4.9.ebuild,v 1.2 2010/06/16 06:56:45 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.4.9.ebuild,v 1.3 2010/09/20 07:07:31 jlec Exp $
 
 inherit toolchain-funcs multilib
 
@@ -16,7 +16,7 @@ IUSE="test"
 RDEPEND="
 	sci-chemistry/ccp4-apps
 	>=sci-libs/ccp4-libs-6.1.3
-	sci-libs/cctbx"
+	<sci-libs/cctbx-2010.03.29.2334-r2"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"
diff --git a/sci-chemistry/pointless/pointless-1.5.7.ebuild b/sci-chemistry/pointless/pointless-1.5.7.ebuild
index b77ca062d39d..a79778fc5d9c 100644
--- a/sci-chemistry/pointless/pointless-1.5.7.ebuild
+++ b/sci-chemistry/pointless/pointless-1.5.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.5.7.ebuild,v 1.1 2010/07/08 06:53:49 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.5.7.ebuild,v 1.2 2010/09/20 07:07:31 jlec Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ IUSE="test"
 RDEPEND="
 	sci-chemistry/ccp4-apps
 	>=sci-libs/ccp4-libs-6.1.3
-	sci-libs/cctbx"
+	<sci-libs/cctbx-2010.03.29.2334-r2"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"
diff --git a/sci-chemistry/pointless/pointless-1.5.9.ebuild b/sci-chemistry/pointless/pointless-1.5.9.ebuild
index 7d9f26177372..bb0c53e1aa0d 100644
--- a/sci-chemistry/pointless/pointless-1.5.9.ebuild
+++ b/sci-chemistry/pointless/pointless-1.5.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.5.9.ebuild,v 1.1 2010/09/12 08:17:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pointless/pointless-1.5.9.ebuild,v 1.2 2010/09/20 07:07:31 jlec Exp $
 
 EAPI="3"
 
@@ -18,7 +18,7 @@ IUSE="test"
 RDEPEND="
 	sci-chemistry/ccp4-apps
 	>=sci-libs/ccp4-libs-6.1.3
-	sci-libs/cctbx"
+	<sci-libs/cctbx-2010.03.29.2334-r2"
 DEPEND="${RDEPEND}"
 
 S="${WORKDIR}"
@@ -36,10 +36,10 @@ src_compile() {
 		CXXFLAGS="${CXXFLAGS}" \
 		LFLAGS="${LDFLAGS}" \
 		CLIB="${EPREFIX}/usr/$(get_libdir)" \
-		CCTBX_sources="${EPREFIX}"/usr/$(get_libdir)/cctbx/cctbx_sources \
+		CCTBX_sources="${EPREFIX}"/usr/$(get_libdir)/ \
 		CCTBX_VERSION=2009 \
 		ICCP4=-I"${EPREFIX}"/usr/include/ccp4 \
-		ICLPR="-I${EPREFIX}/usr/include -I${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_sources -I${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/include" \
+		ICLPR="-I${EPREFIX}/usr/include" \
 		LTBX="-L${EPREFIX}/usr/$(get_libdir)/cctbx/cctbx_build/lib -lcctbx" \
 		SLIB="$(gcc-config -L | awk -F: '{for(i=1; i<=NF; i++) printf " -L%s", $i}') -L${EPREFIX}/usr/$(get_libdir) -lgfortran -lgfortranbegin" \
 		|| die