sci-libs/scipy: Verbose testing; be more bin packages friendly and use src_prepare instead of pkg_setup

(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

3 files changed, 29 insertions, 22 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/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