Fixed again blas/lapack configuration to be compatible with the available gentoo implementations

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

3 files changed, 34 insertions, 17 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 1a3a5ed1bcbe..ce596dd57570 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.33 2008/09/26 20:09:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.34 2008/09/28 21:39:43 bicatali Exp $
+
+  28 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org>
+  scipy-0.6.0-r4.ebuild:
+  Fixed again blas/lapack configuration to be compatible with the available
+  gentoo implementations
 
   26 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> metadata.xml,
   scipy-0.6.0-r4.ebuild:
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 8375d60f880d..45e3d84ebb3b 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -7,13 +7,13 @@ AUX scipy-0.6.0-implicit.patch 1261 RMD160 e5fb3c7be1b8d298fccc3bfd588b106fdb259
 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 3790 RMD160 45344c4d4997d1fdfac935184775843087463c8a SHA1 d6d37b1ac3d91fbc2bad92e2f662158996027aa7 SHA256 256901b0b7fe618b8de66fd67079e47c595b279f2f8ec9c298c317d46cbd3b8b
-MISC ChangeLog 7533 RMD160 70126cabef513a515004bcb5a41e6c88c2b5db94 SHA1 4ca908d1131af117027e1ea469e530258bc8af75 SHA256 117af6aa4f4d63dc7e3a7f5cae6347a89bc22981df16fb284877e5507a457183
+EBUILD scipy-0.6.0-r4.ebuild 4324 RMD160 a94fc349dcd2516411da69350ac94a717d72ed7d SHA1 0d479cd77b6fb1c5dc5b70bde1995f82212eafb8 SHA256 67c6c0b9d3c616b1558b6991f1eca2a54c88a6342ee5182e168ee87b4faf35b0
+MISC ChangeLog 7715 RMD160 21adbc6fa1def39b2e133c0a808f333470c8044a SHA1 4451d7d0a359959ac1bb4b95e3df208965165d90 SHA256 a29575aed6439a14220bc6690c842d457f5d03c096a8f5c0169befc036ee11e2
 MISC metadata.xml 767 RMD160 40e85dc710adf535bdb947cf53cc0b733af047b2 SHA1 6541b0ddce3e394dbf79e86eea36a01bf4f6de55 SHA256 51cab078f50df6606d960384d9e66ccc13a3ba2c3a828c4a83e2c1beaf3116bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjdQZ8ACgkQ1ycZbhPLE2CXfQCgrcznkq93ObD4e+ueKTLP1i06
-fRgAniNQ4EYKz7SYcofrGVfzEX36X7Pm
-=qNtj
+iEYEARECAAYFAkjf+akACgkQ1ycZbhPLE2AKmQCgiIIX1PHZGbUOW9q3hgj7Uf1w
+gikAoJeoARVtLG8zVzOPeB8fU94Tzbc1
+=DbCC
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.6.0-r4.ebuild b/sci-libs/scipy/scipy-0.6.0-r4.ebuild
index 58e25b60ae4a..7b18fee7efa4 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.6 2008/09/26 20:09:59 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.6.0-r4.ebuild,v 1.7 2008/09/28 21:39:43 bicatali Exp $
 
 EAPI=1
 NEED_PYTHON=2.3
@@ -89,18 +89,30 @@ src_unpack() {
 		[DEFAULT]
 		library_dirs = /usr/$(get_libdir)
 		include_dirs = /usr/include
+		[atlas]
+		include_dirs = $(pkg-config --cflags-only-I \
+			cblas lapack | sed -e 's/^-I//' -e 's/ -I/:/g')
+		library_dirs = $(pkg-config --libs-only-L \
+			cblas lapack | sed -e \
+			's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):/usr/$(get_libdir)
+		atlas_libs = $(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 | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 		[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 cblas \
-			| sed -e 's/^-L//' -e 's/ -L/:/g')
-		libraries = $(pkg-config --libs-only-l cblas \
-			| sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+		include_dirs = $(pkg-config --cflags-only-I \
+			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
+		library_dirs = $(pkg-config --libs-only-L \
+			cblas | sed -e 's/^-L//' -e 's/ -L/:/g' \
+			-e 's/ //g'):/usr/$(get_libdir)
+		libraries = $(pkg-config --libs-only-l \
+			cblas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 		[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')
+		library_dirs = $(pkg-config --libs-only-L \
+			lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \
+			-e 's/ //g'):/usr/$(get_libdir)
+		libraries = $(pkg-config --libs-only-l \
+			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 	EOF
 	if use sandbox; then
 		cd scipy/sandbox