Set SUPPORT_PYTHON_ABIS. Tests are restricted so remove "test" USE flag.

Package-Manager: portage-14182-svn/cvs/Linux x86_64

3 files changed, 29 insertions, 28 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 24080ade952f..c615d984e654 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.42 2009/07/21 21:40:03 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.43 2009/09/04 21:31:22 arfrever Exp $
+
+  04 Sep 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  scipy-0.7.1.ebuild:
+  Set SUPPORT_PYTHON_ABIS. Tests are restricted so remove "test" USE flag.
 
 *scipy-0.7.1 (21 Jul 2009)
 
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 6cb7b19f3793..fb9e6b347bbc 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX scipy-0.6.0-cdf.patch 1200 RMD160 1656a3836925c869c06ecdd93e7e861fe2c4781d SHA1 13ca2f1e25ff6a32210b5399998c96da339e70df SHA256 0c45106a3b20d63af992630a7959c7bca772ccdff48d8caef98b76377420a9ca
 AUX scipy-0.6.0-fftw-fix.patch 535 RMD160 3a42973062b6b5834596ffd16ffccedb4ddc0818 SHA1 f472a8b4461b60b23226044d0096143b67c765e1 SHA256 2af135be8c16538d59e5e65743dc2a0d6408d7ea18affc5be2b3c766a1afd752
 AUX scipy-0.6.0-implicit.patch 833 RMD160 2338b23ac4e1acd53ebaf1160bf75b46566a83f5 SHA1 136476f1346f609d114779c0d68fea6c01c2f0ea SHA256 6f5ac0f8ba22cfed71013331a76f251bf165e371b978957a9ce0863a684bf2d9
@@ -14,13 +11,6 @@ DIST scipy-0.7.0.tar.gz 4636167 RMD160 3583901f679cbc7f91560626f437d7edcd2bf6cf
 DIST scipy-0.7.1.tar.gz 4538765 RMD160 b3cb0b40a739cd8b61182f123581d57443b9401a SHA1 ab637e29743cc0c42903a8815043f85d13fb9e42 SHA256 08830d6363a8753ca1376dd22da86d164902711c5feaf0f768b5ee086b3ecd5f
 EBUILD scipy-0.6.0-r6.ebuild 4218 RMD160 04d4f4fd46c0ce2ceb33f6e838c421cf902c7318 SHA1 7a633ba12f69f25cecbb3acbf1a1f8c98c54ba4e SHA256 4226fbd68fa3311aa6f1cfb51b1c18c85559405f2eb1c487711d5040d3c92bd4
 EBUILD scipy-0.7.0.ebuild 3495 RMD160 78385941029724181ada0f03a81320056d633178 SHA1 1e071c89ee0a41ad0069a537557f384edc256590 SHA256 bf13a122f21b64427843afb97180b390657d6e0ca7badafa15d493147cec67db
-EBUILD scipy-0.7.1.ebuild 3177 RMD160 98ae7858d2b5b4fa12e35b4501e414178fe46a62 SHA1 ee30e499fb93c54b06609e648bd2a47973ecd920 SHA256 1f68db65d2e5b27e7ef461c8bbc4022e91a35f923b5c2acdceb1800ddd4202d7
-MISC ChangeLog 9402 RMD160 ab40b0c4f18e98dcf30db5c6838ef2bf2e1557e7 SHA1 01a727eab3f3cf7d60b0504a57158cf8ff95aa0f SHA256 47b6ad244610e09636f30eeedc0d6f1aee758ae90b34c4e0869d2bf86e197fb0
+EBUILD scipy-0.7.1.ebuild 3420 RMD160 6dfcaff15f3c11371db7bdba79991ccee35da61e SHA1 c63ea3949589a34bf3b3ffb71f6e194ef9262757 SHA256 ab6a48214f050cdd2424366880b06e62b82053daae5534bcc3efa75c8334b886
+MISC ChangeLog 9573 RMD160 affb1b91d4082bf23c3f2658eaf7810590da51ff SHA1 d30dde5e575fae1ee7d9f3446d8a47ec20414944 SHA256 bde74f34ca92f056cb0ae0460fc05dc453399178ce7f1590240a6dcc8f34c394
 MISC metadata.xml 767 RMD160 40e85dc710adf535bdb947cf53cc0b733af047b2 SHA1 6541b0ddce3e394dbf79e86eea36a01bf4f6de55 SHA256 51cab078f50df6606d960384d9e66ccc13a3ba2c3a828c4a83e2c1beaf3116bf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkpnky0ACgkQ1ycZbhPLE2CmMQCgsR4li8TsNaD/rnXis9Qv0ocd
-3P8An0A2CEmL0GABPqXYQMxcgI4m3oky
-=Z+i+
------END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.7.1.ebuild b/sci-libs/scipy/scipy-0.7.1.ebuild
index 1a4e02b9e596..5b9bd85ae771 100644
--- a/sci-libs/scipy/scipy-0.7.1.ebuild
+++ b/sci-libs/scipy/scipy-0.7.1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.2 2009/07/22 22:30:54 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.7.1.ebuild,v 1.3 2009/09/04 21:31:22 arfrever Exp $
 
-EAPI=2
-NEED_PYTHON=2.4
+EAPI="2"
+NEED_PYTHON="2.4"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit eutils distutils toolchain-funcs flag-o-matic
+inherit eutils distutils flag-o-matic toolchain-funcs
 
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 DESCRIPTION="Scientific algorithms library for Python"
@@ -13,7 +14,8 @@ HOMEPAGE="http://www.scipy.org/"
 LICENSE="BSD"
 
 SLOT="0"
-IUSE="test umfpack"
+IUSE="umfpack"
+#IUSE="test umfpack"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 
 CDEPEND=">=dev-python/numpy-1.2
@@ -23,12 +25,14 @@ CDEPEND=">=dev-python/numpy-1.2
 
 DEPEND="${CDEPEND}
 	dev-util/pkgconfig
-	test? ( dev-python/nose )
 	umfpack? ( dev-lang/swig )"
+#	test? ( dev-python/nose )
 
 RDEPEND="${CDEPEND}
 	dev-python/imaging"
 
+RESTRICT_PYTHON_ABIS="3.*"
+
 # buggy tests
 RESTRICT="test"
 
@@ -85,15 +89,16 @@ src_compile() {
 }
 
 src_test() {
-	"${python}" setup.py install \
-		--home="${S}"/test \
-		--no-compile \
-		${SCIPY_FCONFIG} || die "install test failed"
-	pushd "${S}"/test/lib*/python
-	PYTHONPATH=. "${python}" -c "import scipy; scipy.test('full')" 2>&1 | tee test.log
-	grep -q ^ERROR test.log && die "test failed"
-	popd
-	rm -rf test
+	testing() {
+		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install \
+			--home="${S}/test-${PYTHON_ABI}" --no-compile ${SCIPY_FCONFIG} || die "install test failed"
+		pushd "${S}/test-${PYTHON_ABI}/"lib*/python > /dev/null
+		PYTHONPATH=. "${python}" -c "import scipy; scipy.test('full')" 2>&1 | tee test.log
+		grep -q ^ERROR test.log && die "test failed"
+		popd > /dev/null
+		rm -fr test-${PYTHON_ABI}
+	}
+	python_execute_function testing
 }
 
 src_install() {
@@ -101,6 +106,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	distutils_pkg_postinst
+
 	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
 	elog "to your prefered image viewer if you don't like the default one. Ex:"
 	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"