4 files changed, 36 insertions, 29 deletions
diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 8a7e83484513..29c9c30c55cc 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.81 2012/10/29 14:35:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.82 2012/12/13 16:07:11 jlec Exp $
+
+  13 Dec 2012; Justin Lecher <jlec@gentoo.org> scipy-0.11.0.ebuild,
+  metadata.xml:
+  Verbose testing; be more bin packages friendly and use src_prepare instead of
+  pkg_setup
 
 *scipy-0.11.0 (29 Oct 2012)
 
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 3a6453565623..228aaf6d391b 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -12,16 +12,16 @@ DIST scipy-0.11.0-ref.pdf 7382958 SHA256 04587215578188396723cea2eb7387460fd9577
 DIST scipy-0.11.0.tar.gz 6776998 SHA256 b2b74d56a2d58a4f032f91e8b91b1c2272d5eb0b5010082dd1e492e452f862ee SHA512 d4fdd62f2db5285cd133649bd1bfa5175cb9da8304323abd74e0ef1207d55e6152f0f944da1da75f73e9dafb0f3bb14efba3c0526c732c348a653e0bd223ccfa WHIRLPOOL 5ccdc68f968e58c43f56d7f1b8a281ab40a6b5077267c867bc371b0280d06512d9a726259cb2af0b89bae32ca2c636e7db0594624b3c8241d2887c42c4590765
 DIST scipy-0.9-html.zip 8516420 SHA256 6f3148881502ca2cd2964fef7baf9bfec6fe2329ec3f1832e1e6d864aed0f889
 DIST scipy-0.9-ref.pdf 5299022 SHA256 ed2641c180eef2f842536a611982fbd91c33c95a7e7e3c279d7ae6f10071be47
-DIST scipy-0.9.0.tar.gz 6084552 SHA256 913089de94721be864e0a57fdab52603f3150250a2e0ce4ed6928ca1125f6b23
+DIST scipy-0.9.0.tar.gz 6084552 SHA256 913089de94721be864e0a57fdab52603f3150250a2e0ce4ed6928ca1125f6b23 SHA512 2c9be17d4f9daea23dab7449282f522641a7bfc0bdb0005631f2a89da44681c4b4e98bdff8b76ee451c1ee36cf3dd2eaf45f670cfaff86c10d49bf5478ac3c43 WHIRLPOOL 0b58a0e0bc03f4759e5bbc3b24b36c6b53092a92c595ca65a79bf307332564b3204fc1d6244bb0a970bdb63f0092591b846cc14e8b4b6c73d9b09ffeb16815b4
 EBUILD scipy-0.10.1.ebuild 3453 SHA256 5d198a8383ef3ae35f68861ef741a9166b4174452bc0a701faea96ec189939b0 SHA512 19e27f4953fc0cebb26c535dab61b1820b01aef6bfc7548f27c07a65f58e9ea40f7083a90a23094da9887118d7c9fe254ca968dcdfc11499d416734c8a88c33d WHIRLPOOL 75c76570585ad81d2c85e0ac27b3a7912cd238470a52c230486a3a00e240140e390378d5d7727584c2cc20c51ac06de8df4223841461d5affe5450afeb7fba34
-EBUILD scipy-0.11.0.ebuild 3457 SHA256 26b0ad45060af52311652d075719ab4bc15cc86a8291d100a1f7271e06458f0b SHA512 f8b70646fe0d4071157bd09e627e981bff66ff882b6ca2c0d1bca10457bf77f0563516349d7fa34a6520440aca14e5930dceb2d70d967276bc9a5bdd9a3bff24 WHIRLPOOL 6b2babce55d7117feef9c49cc398a9976082de230eef127571ac27a0fbd1b23259179c1b41985d4758f08ba892fb3900387d3b50a3af14bc8bf75e22273b710b
+EBUILD scipy-0.11.0.ebuild 3466 SHA256 5fd72350fbb8f9ef46495071bd0ec350eca5378a47d29c1ebd5b271307949ee6 SHA512 62af91ce719dfb8ac5f67ce9dc9b549882ff9c4c771310ba2f2975b7f227d7c5b7b212b0dbf5c005bdba9460b2cb1fb84519395b5aca1b10e1213b2fb4450566 WHIRLPOOL 8df4594e11ab7ba4919244efb2f2352bc7a78874ab44a2bf64941606781ca9f93c88ecd96f5887006a60f7e29b1d08491bd80be4e72ff31d8177f8d7892e6438
 EBUILD scipy-0.9.0-r1.ebuild 4264 SHA256 2c138cb89cb4f2a467a5fadc1adff2f53614034af4251df048031719058b6fb2 SHA512 bda5d14b38f85ca4cf9da89e02d339139efdd159fb00ed81aa1255edc531bb142c9c1ee9fa58c14edf41e687239613f63a4b31535b3f88bb5fee720227cdd4d3 WHIRLPOOL 205b1be078cb77c5d6ae116ef145e747e24f8e811317290e734782688bcf6203bdc03ff417a11b4edc7ce3c7b68b14b53b926f9ab3f53182b0db095e84f573e0
-MISC ChangeLog 15891 SHA256 31a937b8543288876cdb9f753a71709a17f31cd8561660c9119fed9b22f68c10 SHA512 4e87e4b42558931933ec45565c532de78affdaa9ae2dae7d158d67b64e57028887c736e404dbf5aea541d6130af170b869505741c9e583b40793b814b1f5ac73 WHIRLPOOL a3bf00d06814141f85fd9e10fe345cb620a0c19208108591cc1c772730cba2028d7495dcd8717705514c86a948c4c36cf1e4dc0627115a1751e1971ac2fc40d8
-MISC metadata.xml 701 SHA256 8f4674ae9fc4197903a15da51e7e4e3674edae1acf06a2db6644a3ae0ce332e6 SHA512 e598b8f7edaac2a1cfda78c109b380726394281224165b66661521e28491880a95e0baddee067bf99a9407529e7aa56f0455a7792f1c0ac08375ebe767961c51 WHIRLPOOL ca30632882d89b4fdae3429e11c239032e637a81af5fc6d7466cc01f26b57678d7bf669d3a229e788f605b81e3a2fc8a4696fd9b52035374354189fd8f5a1b51
+MISC ChangeLog 16064 SHA256 6f03855ea3e0a8a526622b8d979de78dfdca0ded9dbd055a56be9ca63f9e88ed SHA512 e5f9f7d1f246cdd84267786655651159f6c306bfabc74669874d23d59ff438c28533bee856d53f29ee30fdfa76f62f27a14693c9effa966e3affdcedc0f85c98 WHIRLPOOL 66243352f0430707795cb24b450279f687ab76a6a2f6663907eb7388955e90fcdb657394b32fbbace237041c4fa28befa988cda97211c5bfd3837b12eeccdee3
+MISC metadata.xml 707 SHA256 7106425fa4d62f2eb36033ca19ec466162b9b748be85571281d5c5d87f2abeb6 SHA512 fc8e90cd7fec46564a1f75c6ba1a8032f24a93e6909b888c62d73a6aad1a10ef140e24fb406ca298271cbcadd7ce2d6ab8977ab9acde98599900e5d6f1d5e644 WHIRLPOOL 4b717b3493e6f3efdfce9f58aef3ad6719590c2ed150f36696086b38ff948e1c32d2bd7f2bd34e77b4e08a1d04182dea12ca90b8627b7cfd55f773ee412e07e6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCOlCwACgkQ1ycZbhPLE2Bi2QCeM0SUquS3j6z7RoTydOIB1gHu
-+5MAniSw+OXXSyHxvgvR5un78dtDcObM
-=He/q
+iEYEAREIAAYFAlDJ/TAACgkQgAnW8HDreRajtACdGjRFsp5me5RfEEyt9klf03kY
+lBMAnR0JvLZCy2IjGBvLnrhrmzUwnlUU
+=HLAa
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml
index 6642c43f1ad8..cae437e54ae0 100644
--- a/sci-libs/scipy/metadata.xml
+++ b/sci-libs/scipy/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription lang="en">
+  <herd>sci</herd>
+  <longdescription lang="en">
   SciPy is an open source library of scientific tools for Python. SciPy
   supplements the popular numpy module, gathering a variety of high level
   science and engineering modules together as a single package.
@@ -10,7 +10,7 @@
   special functions, signal and image processing, genetic algorithms, ODE
   solvers, and others.
 </longdescription>
-	<use>
-		<flag name="umfpack">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
-	</use>
+  <use>
+    <flag name="umfpack">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
+  </use>
 </pkgmetadata>
diff --git a/sci-libs/scipy/scipy-0.11.0.ebuild b/sci-libs/scipy/scipy-0.11.0.ebuild
index 20308dd47459..a2ec94159de2 100644
--- a/sci-libs/scipy/scipy-0.11.0.ebuild
+++ b/sci-libs/scipy/scipy-0.11.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.11.0.ebuild,v 1.1 2012/10/29 14:35:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.11.0.ebuild,v 1.2 2012/12/13 16:07:11 jlec Exp $
 
 EAPI=4
 
@@ -43,20 +43,6 @@ DOCS="THANKS.txt LATEST.txt TOCHANGE.txt"
 
 pkg_setup() {
 	fortran-2_pkg_setup
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use umfpack && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
 	python_pkg_setup
 }
 
@@ -85,6 +71,22 @@ pc_libs() {
 
 src_prepare() {
 	local libdir="${EPREFIX}"/usr/$(get_libdir)
+
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use umfpack && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
 	cat >> site.cfg <<-EOF
 		[blas]
 		include_dirs = $(pc_incdir cblas)
@@ -106,7 +108,7 @@ src_test() {
 			--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')" \
+		PYTHONPATH=. "$(PYTHON)" -c "import scipy; scipy.test('full',verbose=10)" \
 			2>&1 | tee test.log
 		grep -q ^ERROR test.log && die "test failed"
 		popd > /dev/null