Workaround for broken python.eclass

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

3 files changed, 22 insertions, 11 deletions

diff --git a/sci-libs/cctbx/ChangeLog b/sci-libs/cctbx/ChangeLog
index 29e98d81c5a8..ef5c47df8534 100644
--- a/sci-libs/cctbx/ChangeLog
+++ b/sci-libs/cctbx/ChangeLog
@@ -1,6 +1,16 @@
 # 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.1 2010/02/04 22:56:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/ChangeLog,v 1.2 2010/02/14 18:14:34 jlec Exp $
+
+  14 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  -cctbx-2009.11.01.0123.ebuild, +cctbx-2009.11.01.0123-r1.ebuild:
+  Workaround for broken python.eclass
+
+*cctbx-2009.11.01.0123-r1 (13 Feb 2010)
+
+  13 Feb 2010; Justin Lecher (jlec) <jlec@gentoo.org>
+  +cctbx-2009.11.01.0123-r1.ebuild:
+  Correct usage of new python.eclass
 
 *cctbx-2009.11.01.0123 (04 Feb 2010)
 
diff --git a/sci-libs/cctbx/Manifest b/sci-libs/cctbx/Manifest
index fffa4885a3ef..eebf33ebb026 100644
--- a/sci-libs/cctbx/Manifest
+++ b/sci-libs/cctbx/Manifest
@@ -2,13 +2,13 @@
 Hash: SHA1
 
 DIST cctbx-2009.11.01.0123.tar.gz 14604079 RMD160 77cc84d4b9e35e7a87f807d8669efb939b2e82ce SHA1 7db71a62786b82f47999919a9411938b123d5b4d SHA256 31e7f79424360f963c6eae528a9d289db4b53c1f7fe4aa9de71201e9d14bc5af
-EBUILD cctbx-2009.11.01.0123.ebuild 5809 RMD160 dce578bd21bd49bcc205df65457d97066ac44955 SHA1 83245e05e828c408ef15172827d364a647569541 SHA256 96c81826c7aa8bf7f487d913d1c8414be1cfe7451f40e6ab60df72cb7764a980
-MISC ChangeLog 384 RMD160 82e9d22ad375d5b56b443cfeec31e13bbb1515e4 SHA1 e55ed476ec8a367a63e2ffb26caba23783858317 SHA256 e2ae75dc41f77c6981f1e7de985417079430ea58011d8cd40626854254e3c56e
+EBUILD cctbx-2009.11.01.0123-r1.ebuild 5821 RMD160 7f746930f9d1787bf60256a0a89ae94839ab39fb SHA1 06ea73ab33b80fb18771cff61d606374c3a06c8f SHA256 b5c0813befd29b851a671b2eb82cc1934012be8b30ae3c7a8fb926cb1343e320
+MISC ChangeLog 713 RMD160 17f8cbbc777b3867a1c534111ab62e4da655da93 SHA1 07e611b531e1cf400bbaf2b3c256e9547e7a4481 SHA256 104d54be699d6ec9ffc23b52cee50bf5ec503cdeeba3e9512933e376aa4f7d14
 MISC metadata.xml 767 RMD160 c2fc3bcc534e407e6066ee98beb6878d78a0f6e9 SHA1 a653677e160cf0726e1747b06b5d0cd95e51ac5f SHA256 ef36fc1a1d5d657ba67f88b303f08eef5a1a814d22a2091c07616dc16928e3fa
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAktrUJ8ACgkQgAnW8HDreRZx2ACdHHz3K5nzCqL9AXYvHhP/CL3L
-V3IAoMZHC2D7uox21cqaWPcvNd8Oz8nq
-=YvGu
+iEYEARECAAYFAkt4PY8ACgkQgAnW8HDreRYPlQCgqPYy1ObK2tMvUf5YgO0TutcW
+gzkAn0JUfw/HQld5QmtUAcd+NXI5N2gI
+=8rkp
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/cctbx/cctbx-2009.11.01.0123.ebuild b/sci-libs/cctbx/cctbx-2009.11.01.0123-r1.ebuild
index 096c0892f755..5e3de3cde1a1 100644
--- a/sci-libs/cctbx/cctbx-2009.11.01.0123.ebuild
+++ b/sci-libs/cctbx/cctbx-2009.11.01.0123-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2009.11.01.0123.ebuild,v 1.1 2010/02/04 22:56:26 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/cctbx/cctbx-2009.11.01.0123-r1.ebuild,v 1.1 2010/02/14 18:14:34 jlec Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
 
-inherit toolchain-funcs python eutils
+inherit eutils python toolchain-funcs
 
 MY_PV="${PV//./_}"
 
@@ -15,7 +15,7 @@ SRC_URI="http://cci.lbl.gov/cctbx_build/results/${MY_PV}/${PN}_bundle.tar.gz ->
 
 LICENSE="cctbx-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="+minimal openmp threads"
 
 RDEPEND="
@@ -41,6 +41,7 @@ pkg_setup() {
 		ewarn "If you want to build ${PN} with OpenMP, abort now,"
 		ewarn "and switch CC to an OpenMP capable compiler"
 	fi
+	python_set_active_version 2
 }
 
 src_prepare() {
@@ -91,7 +92,7 @@ src_configure() {
 
 	# Precompiling python scripts. It is done in upstreams install script.
 	# Perhaps use python_mod_compile, but as this script works we should stick to it.
-	${EPREFIX}/usr/bin/python "${MY_S}/libtbx/command_line/py_compile_all.py"
+	$(PYTHON -a -A) "${MY_S}/libtbx/command_line/py_compile_all.py"
 
 	# Additional USE flag usage
 	check_use openmp
@@ -108,7 +109,7 @@ src_configure() {
 	myconf="${myconf} --build=release fftw3tbx rstbx smtbx mmtbx clipper"
 	einfo "configuring with ${python} ${myconf}"
 
-	${EPREFIX}/usr/bin/python ${myconf} \
+	$(PYTHON -a -A) ${myconf} \
 		|| die "configure failed"
 }