Changed blas/atlas configuration to match newer numpy (should be still compatible with numpy-1.0.4 too. Disabled magic fortran flags detection

Package-Manager: portage-2.2_rc9/cvs/Linux 2.6.25-gentoo-r7 x86_64

4 files changed, 41 insertions, 23 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index aeb409f77bea..1a3a5ed1bcbe 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.32 2008/07/03 12:13:23 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.33 2008/09/26 20:09:59 bicatali Exp $
+
+  26 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
+  scipy-0.6.0-r4.ebuild:
+  Changed blas/atlas configuration to match newer numpy (should be still
+  compatible with numpy-1.0.4 too. Disabled magic fortran flags detection
 
   03 Jul 2008; Thomas Anderson <gentoofan23@gentoo.org>
   +files/scipy-0.6.0-implicit.patch, scipy-0.6.0-r4.ebuild:
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index ccfcaf631262..8375d60f880d 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,9 +1,19 @@
+-----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 1261 RMD160 e5fb3c7be1b8d298fccc3bfd588b106fdb259ffc SHA1 710777e2aa8a482c153cd6cb0951dede4e22df9d SHA256 7780527117219468e146ee02feee10b8df5eb814fbf0c6f6839ea9f6bd2f3ea2
 AUX scipy-0.6.0-ndimage.patch 782 RMD160 6f8fe88b8229d56340d8ff24d90e311ab1a934ea SHA1 7ccf18c48bad2a6489c8c5ae03bdb2667af19a0f SHA256 ec98e4ca10f1fe569833aa1f87ea05c71d7c43ea19563626f010c113fd24b30f
 AUX scipy-0.6.0-randomkit.patch 15283 RMD160 d59f0cfc56aa80c516ee48c82392c0e3db4b03f0 SHA1 90b4b64a4ecf28dfc418ad318c175221aa9aa8ab SHA256 6bf246b9393acf1183a0702dc0e752cbc8905ac1b94d5823cc4c76d6ae4b9a85
 DIST scipy-0.6.0.tar.gz 6572954 RMD160 391f2067f7dcc133e7e8622df93a2a0cd5ebbe5b SHA1 65eff3e245f59b2af9adc70fad11daa40f0ba3e0 SHA256 5f70390963fb4e3ae8cf5effa301c160ef68c791098e2ea95b99380e298eac4f
-EBUILD scipy-0.6.0-r4.ebuild 3671 RMD160 497c5a52dc7a148bfbb44c7288e4d852843f4f56 SHA1 476ddf186ea1aa982056caded4437985f6beeb3c SHA256 31498d16acc0c5f1a61707fc10a037318cf72af45d6eed98b5f9c5af0d543473
-MISC ChangeLog 7294 RMD160 69fd70cc7d5e7385ea5f8053be32d367ac93f3ac SHA1 26792986637e0ed05d3b31211dc4f97a776f8ab2 SHA256 2acd67dd8d9eb7d3303bca785da1dfddbf54553f0759a12b1b8b4602d22e2943
-MISC metadata.xml 774 RMD160 f9b7a6146eec0db222ed17391f659436aa37c9fa SHA1 466408f2ec7b339ce6f2d14604f5cd2c63378031 SHA256 8f06a798a0f803dde6c5a92d9b2cdc643b122bf1436ec3f7f12e4d1aa8f083cf
+EBUILD scipy-0.6.0-r4.ebuild 3790 RMD160 45344c4d4997d1fdfac935184775843087463c8a SHA1 d6d37b1ac3d91fbc2bad92e2f662158996027aa7 SHA256 256901b0b7fe618b8de66fd67079e47c595b279f2f8ec9c298c317d46cbd3b8b
+MISC ChangeLog 7533 RMD160 70126cabef513a515004bcb5a41e6c88c2b5db94 SHA1 4ca908d1131af117027e1ea469e530258bc8af75 SHA256 117af6aa4f4d63dc7e3a7f5cae6347a89bc22981df16fb284877e5507a457183
+MISC metadata.xml 767 RMD160 40e85dc710adf535bdb947cf53cc0b733af047b2 SHA1 6541b0ddce3e394dbf79e86eea36a01bf4f6de55 SHA256 51cab078f50df6606d960384d9e66ccc13a3ba2c3a828c4a83e2c1beaf3116bf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjdQZ8ACgkQ1ycZbhPLE2CXfQCgrcznkq93ObD4e+ueKTLP1i06
+fRgAniNQ4EYKz7SYcofrGVfzEX36X7Pm
+=qNtj
+-----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml
index b07b17ec5277..3727426ef61d 100644
--- a/sci-libs/scipy/metadata.xml
+++ b/sci-libs/scipy/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <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.
-SciPy includes modules for graphics and plotting, optimization, integration,
-special functions, signal and image processing, genetic algorithms, ODE
-solvers, and others.
+<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.
+  SciPy includes modules for graphics and plotting, optimization, integration,
+  special functions, signal and image processing, genetic algorithms, ODE
+  solvers, and others.
 </longdescription>
-  <use>
-    <flag name="sandbox">Installs experimental scipy sandbox modules (pull some dependencies)</flag>
-    <flag name="umfpack">Add support for sparse solving via UMFPACK</flag>
-  </use>
+<use>
+  <flag name="sandbox">Adds experimental scipy sandbox modules</flag>
+  <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.6.0-r4.ebuild b/sci-libs/scipy/scipy-0.6.0-r4.ebuild
index 00440da2aeb0..58e25b60ae4a 100644
--- a/sci-libs/scipy/scipy-0.6.0-r4.ebuild
+++ b/sci-libs/scipy/scipy-0.6.0-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.6.0-r4.ebuild,v 1.5 2008/07/03 12:13:23 gentoofan23 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.6.0-r4.ebuild,v 1.6 2008/09/26 20:09:59 bicatali Exp $
 
 EAPI=1
 NEED_PYTHON=2.3
@@ -59,7 +59,7 @@ scipy_fortran_setup() {
 
 	# when fortran flags are set, pic is removed.
 	use amd64 && [[ -n ${FFLAGS} ]] && FFLAGS="${FFLAGS} -fPIC"
-	export SCIPY_FCONFIG="config_fc --fcompiler=${fc}"
+	export SCIPY_FCONFIG="config_fc --fcompiler=${fc} --noopt --noarch"
 }
 
 pkg_setup() {
@@ -89,14 +89,17 @@ src_unpack() {
 		[DEFAULT]
 		library_dirs = /usr/$(get_libdir)
 		include_dirs = /usr/include
-		[atlas]
-		include_dirs = $(pkg-config --cflags-only-I lapack \
+		[blas_opt]
+		include_dirs = $(pkg-config --cflags-only-I cblas \
 			| sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L lapack \
+		library_dirs = $(pkg-config --libs-only-L cblas \
 			| sed -e 's/^-L//' -e 's/ -L/:/g')
-		atlas_libs = $(pkg-config --libs-only-l blas \
+		libraries = $(pkg-config --libs-only-l cblas \
 			| sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		lapack_libs = $(pkg-config --libs-only-l lapack \
+		[lapack_opt]
+		library_dirs = $(pkg-config --libs-only-L lapack \
+			| sed -e 's/^-L//' -e 's/ -L/:/g')
+		libraries = $(pkg-config --libs-only-l lapack \
 			| sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 	EOF
 	if use sandbox; then