Fixed site.cfg generation for external blas/lapack

Package-Manager: portage-2.1.4_rc9

3 files changed, 32 insertions, 19 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index fb2929a19f22..4a3c541752d1 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.42 2007/12/18 04:00:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.43 2007/12/19 02:15:07 bicatali Exp $
+
+  19 Dec 2007; Sébastien Fabbro <bicatali@gentoo.org> numpy-1.0.4.ebuild:
+  Fixed site.cfg generation for external blas/lapack
 
   18 Dec 2007; Jeroen Roovers <jer@gentoo.org> numpy-1.0.4.ebuild:
   Stable for HPPA (bug #202202).
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 95de6982ef04..6f16df4da68d 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX numpy-1.0.1-f2py.patch 1403 RMD160 4a02205910231c3b08ae919a45facc21dd2818ae SHA1 148118c4ee9d8a754a0891621ece9b5774e76016 SHA256 746b437aff172764a238bb75d6a5b7b0547113c8a256721cf4bec2b1819bcf51
 MD5 69e8b3f89762b836594a61414942aa78 files/numpy-1.0.1-f2py.patch 1403
 RMD160 4a02205910231c3b08ae919a45facc21dd2818ae files/numpy-1.0.1-f2py.patch 1403
@@ -17,14 +20,14 @@ EBUILD numpy-1.0.3.ebuild 3864 RMD160 8bac52da2a0ca1fc41159971020d7a8b7cda78c6 S
 MD5 fa2e1dc1662fe40fd3e4fc539ed18d77 numpy-1.0.3.ebuild 3864
 RMD160 8bac52da2a0ca1fc41159971020d7a8b7cda78c6 numpy-1.0.3.ebuild 3864
 SHA256 48f1ec1c3ea95d1ebdc02c6d5bf8f7cdfbf9a2fa0635591623c5e83b327945f7 numpy-1.0.3.ebuild 3864
-EBUILD numpy-1.0.4.ebuild 2740 RMD160 db04255b20e7d4c050feabd82cfdc55a7ea9e250 SHA1 daf0407cc25eeeedea3a6d6dbdae9bf48172de09 SHA256 3e2a06832053f21a0164896b7aae0c54626f0d048cb096f580dbb685ffb12d69
-MD5 33bc0ac35667a4fae341ed44181632d6 numpy-1.0.4.ebuild 2740
-RMD160 db04255b20e7d4c050feabd82cfdc55a7ea9e250 numpy-1.0.4.ebuild 2740
-SHA256 3e2a06832053f21a0164896b7aae0c54626f0d048cb096f580dbb685ffb12d69 numpy-1.0.4.ebuild 2740
-MISC ChangeLog 6562 RMD160 8d496869187acfd13e6b951a2fe69553a78c05cb SHA1 16fd87d8cd7173e6b50ed205f74467e9cf19fc0b SHA256 2353173af7e0d96d0f3103f4c98bb4fb8c5682c36e1ebaf1b6ae64b89a59ac7d
-MD5 1ffb9bf49cd0e6455aa67a8a67c21236 ChangeLog 6562
-RMD160 8d496869187acfd13e6b951a2fe69553a78c05cb ChangeLog 6562
-SHA256 2353173af7e0d96d0f3103f4c98bb4fb8c5682c36e1ebaf1b6ae64b89a59ac7d ChangeLog 6562
+EBUILD numpy-1.0.4.ebuild 2758 RMD160 86b63a82538f161ceeb302bafcf04b9a22623cd5 SHA1 9d9d1e4072e5de7914c5d46a0ad585ebdc680ae1 SHA256 37d51273d23039f25a078ad36f9404f75409130034c36b663ee69af9b40c20e3
+MD5 886c3675e025edb96ee1f3a5b4fa9232 numpy-1.0.4.ebuild 2758
+RMD160 86b63a82538f161ceeb302bafcf04b9a22623cd5 numpy-1.0.4.ebuild 2758
+SHA256 37d51273d23039f25a078ad36f9404f75409130034c36b663ee69af9b40c20e3 numpy-1.0.4.ebuild 2758
+MISC ChangeLog 6696 RMD160 af4db0f49086ac1a588ba6cf6bacde2b992df566 SHA1 49e178756155d36d60e5cb60cc90629339d20f52 SHA256 6bcae85f63389f05690e2166250cf68c8c4acb3172484974e16519a4267aaa53
+MD5 5c750efb9189e194806167488fc6b2ab ChangeLog 6696
+RMD160 af4db0f49086ac1a588ba6cf6bacde2b992df566 ChangeLog 6696
+SHA256 6bcae85f63389f05690e2166250cf68c8c4acb3172484974e16519a4267aaa53 ChangeLog 6696
 MISC metadata.xml 747 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 SHA1 c2580aa1116f9f96b8d7901ab95b37a653d0fc56 SHA256 2c7d10dc62b47ddf32f41edffc9994655225654fcf8a72052c24f7d7235c5640
 MD5 d623311ce8175e55bcb5e2a9750b5cd4 metadata.xml 747
 RMD160 d150b8c4ce4abec812483d07e03b7954ea887818 metadata.xml 747
@@ -38,3 +41,10 @@ SHA256 7aa02605315e8fed189f8e433a66095c108e97e9b1c1641571f08233bea5484d files/di
 MD5 94bdbc968e36fab4985a24ef8a9c6723 files/digest-numpy-1.0.4 238
 RMD160 7d65e348625974e515caa85f69ff5aacca2730ef files/digest-numpy-1.0.4 238
 SHA256 a345b8aac2d5a6bb34019a5920b77254e00066a9a8c6e707fcebc7033a423dc6 files/digest-numpy-1.0.4 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHaH6y1ycZbhPLE2ARAqgMAJ9etQnX9qBdoL8z4j+2wF7iIt9M9QCfWdG3
+wSUi1wAAQ8efAYuZF1brE4I=
+=D6LD
+-----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.0.4.ebuild b/dev-python/numpy/numpy-1.0.4.ebuild
index 60bb42f8d082..ffe74e6deb98 100644
--- a/dev-python/numpy/numpy-1.0.4.ebuild
+++ b/dev-python/numpy/numpy-1.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.4.ebuild,v 1.4 2007/12/18 04:00:24 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.0.4.ebuild,v 1.5 2007/12/19 02:15:07 bicatali Exp $
 
 NEED_PYTHON=2.3
 
@@ -65,15 +65,15 @@ src_unpack() {
 
 	if use lapack; then
 		unset BLAS LAPACK
-		cat > setup.cfg << EOF
-[blas_opt]
-libraries = $(pkgconf_cfg --libs-only-l cblas)
-library_dirs = $(pkgconf_cfg --libs-only-L cblas)
-
-[lapack_opt]
-libraries = $(pkgconf_cfg --libs-only-l lapack)
-library_dirs = $(pkgconf_cfg --libs-only-L lapack)
-EOF
+		cat > site.cfg <<-EOF
+			[blas]
+			blas_libs = $(pkgconf_cfg --libs-only-l cblas)
+			library_dirs = $(pkgconf_cfg --libs-only-L cblas)
+
+			[lapack]
+			lapack_libs = $(pkgconf_cfg --libs-only-l lapack)
+			library_dirs = $(pkgconf_cfg --libs-only-L lapack)
+		EOF
 	fi
 }