Fix cctbx version

(Portage version: 2.2_rc84/cvs/Linux x86_64)

4 files changed, 13 insertions, 9 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/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