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, 33 insertions, 17 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index fb4cf5faaea0..c4a017c54646 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.64 2008/09/26 20:05:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.65 2008/09/28 21:31:59 bicatali Exp $
+
+  28 Sep 2008; Sébastien Fabbro <bicatali@gentoo.org> numpy-1.2.0.ebuild:
+  Fixed again blas/lapack configuration to be compatible with the available
+  gentoo implementations
 
 *numpy-1.2.0 (26 Sep 2008)
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 7c443968f1b6..bcf73bb4cc58 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -10,13 +10,13 @@ DIST numpy-1.1.1.tar.gz 1611021 RMD160 745e9fbbd064272199f4c7b49d4a26797405dd17
 DIST numpy-1.2.0.tar.gz 1425633 RMD160 614a0cb92eed89698e2cc94447d0514ad07976b5 SHA1 70c0432ad9a6bb1006158f9aac2d1cfe5ac885c2 SHA256 13cfa68706a698dd8497755fe2154f406399a6a6d9828a253b3c767c04806d55
 EBUILD numpy-1.0.4-r2.ebuild 3513 RMD160 5c08ca6bc74d5e23d4371e30397b07e8edf4bb7b SHA1 2e6762776bbd748eded9be93066f1db6dfe9d0d3 SHA256 f5ac672a2275d826bc5c2e117c79cc739299e65023955aa9a8b04e8a7368c45a
 EBUILD numpy-1.1.1.ebuild 3354 RMD160 f85bbed92966a39bac53c17af1401d1375d92727 SHA1 ed3cca163f989afa90cd619bc11fb2c118f5a04a SHA256 374eee70f651b6ee2714493b12d8581f85766b654d1b333f52be5e8755e0ac48
-EBUILD numpy-1.2.0.ebuild 3658 RMD160 4e84a0fa1a3ee2f968fcec2c1dc9fce38ec9caf5 SHA1 0bc8c883ed88d6e43ea932cc9003fd1586620f07 SHA256 16fda828f99d50b88dab1e9eccbd9c6d766f561a7c3f12ab803843a20e29c53d
-MISC ChangeLog 9879 RMD160 4b14be0245264fdadd6106cea1812f16f342c470 SHA1 aa229ae22a7c55635cc135febc432ee8c799d989 SHA256 0186014950e085cda7227c8c56f32748a72e98f2e8256bb833ed68119242df11
+EBUILD numpy-1.2.0.ebuild 4204 RMD160 494a352710fe031d87fb6b2453e2c2b9fe025f33 SHA1 4df1000a0ee9be08960c14a4ce5a07edc6f7ea90 SHA256 5a5ccbe1e48e754df871ccac70afa3bf5120f6a5e15c61fbc42d0c0fa26be2b7
+MISC ChangeLog 10056 RMD160 49ac54f684a4ffb6a4c8b8879c0a47feed7b3cff SHA1 ee5c3c8805f329958068e59962297e383b9466f0 SHA256 0eb5599a3465a878a2717d1c25698743c3ba60dbacd75abaa9b119e9637ce22a
 MISC metadata.xml 612 RMD160 efd564f99da25694c47f63432d18f5a847a65cd8 SHA1 e765c10b67fe1d43fe5bc79e56b72d2ae2b133ad SHA256 272f018a6889de8fcded00da2ced5b11549d4e455aaf8107d20e74f13bf98ce1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkjdQKgACgkQ1ycZbhPLE2BcPwCeIGqCQFEfA+WZTEohdvThWkF2
-EewAoI3qY5o2IAK6fmTqQ507UL9IxpDK
-=o7Gi
+iEYEARECAAYFAkjf99kACgkQ1ycZbhPLE2BsgQCgg6nvvbhzWeeD8zqlwAQrXVLS
+fj0AoJnii+F0dxo974QcRIHj8Eld/yM0
+=qVX+
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.2.0.ebuild b/dev-python/numpy/numpy-1.2.0.ebuild
index 782688d9136e..56959b148add 100644
--- a/dev-python/numpy/numpy-1.2.0.ebuild
+++ b/dev-python/numpy/numpy-1.2.0.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/dev-python/numpy/numpy-1.2.0.ebuild,v 1.1 2008/09/26 20:05:51 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.2.0.ebuild,v 1.2 2008/09/28 21:31:59 bicatali Exp $
 
 NEED_PYTHON=2.4
 
@@ -79,18 +79,30 @@ src_unpack() {
 		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
 		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
 		cat >> site.cfg <<-EOF
+			[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
 	else
 		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None