Cleaned up a bit the pkg-config mangling for blas/lapack. Hack to strip -lm because it would not link with system blas/lapack on prefix

Package-Manager: portage-2.2.01.20430-prefix/cvs/Linux x86_64

3 files changed, 35 insertions, 19 deletions

diff --git a/dev-python/numpy/ChangeLog b/dev-python/numpy/ChangeLog
index 7dca8a68b6cd..3026864ec043 100644
--- a/dev-python/numpy/ChangeLog
+++ b/dev-python/numpy/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/numpy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.165 2012/06/28 15:48:33 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/ChangeLog,v 1.166 2012/06/28 21:16:40 bicatali Exp $
+
+  28 Jun 2012; Sebastien Fabbro <fabbros@gentoo.org> numpy-1.6.2.ebuild:
+  Cleaned up a bit the pkg-config mangling for blas/lapack. Hack to strip -lm
+  because it would not link with system blas/lapack on prefix
 
   28 Jun 2012; Jeroen Roovers <jer@gentoo.org> numpy-1.6.1-r1.ebuild:
   Stable for HPPA (bug #418419).
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index f4c3be3b2048..2acfaab0f3d9 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -21,13 +21,13 @@ EBUILD numpy-1.5.1.ebuild 5120 RMD160 176aac4d5e54b5f5f82ad088f1caf861d6db61a2 S
 EBUILD numpy-1.6.0.ebuild 4808 RMD160 ae7899121b545b97d139afb2c365f9ca4c3e135d SHA1 81dcc2ccf959d143dd306255554a1168894614c9 SHA256 924553aaea1ebbdfe4ebea358c11023885ba67d4a97c8886e02bdf26622c0655
 EBUILD numpy-1.6.1-r1.ebuild 4209 RMD160 bd1890374776ce706d974d0476adac366a68119b SHA1 cf49d31769cf82f7a727bf9cf552dd07701fccde SHA256 0538598e6ef502a0cf80b50853dd6c51d1b98f2b71e705591b9861082112efc0
 EBUILD numpy-1.6.1.ebuild 4829 RMD160 79ef6ec8df7b089268e263969a850d59dcb160f5 SHA1 01e70316e8f3be6b3403b9b035d6dddc52bdb978 SHA256 90a2e8954594f0071c40c105da6482fd98e3035e88179a424d15c44ef6768643
-EBUILD numpy-1.6.2.ebuild 4177 RMD160 3032bbb4b8a65b1cee967c119169f2189b9daf7f SHA1 a6c83f224fe3d39e2f8b4c132e20ae82e9c50952 SHA256 73ffc2076f9390de8c6961c188011b9acfa572c0ab3b60c3324a80c44d85c028
-MISC ChangeLog 23292 RMD160 cc00215fc72f542a2db1ca85601d47fb46beec23 SHA1 92bca0f792a5479ab40fd8cef283d44d3f446385 SHA256 eeebbe659e412c841792a9f31b9cf4c2d7532b206b8d96b29b2a47fadd877ebd
+EBUILD numpy-1.6.2.ebuild 4173 RMD160 c046fedc34e7e141d8aac44f804297520a99102c SHA1 2ca815469b858b5930b8acbfa1fb578aee999481 SHA256 50ccaa75cd8e65a2306257653b5433e36a79f60c36007d78e5544018adfd1359
+MISC ChangeLog 23511 RMD160 6d2c8ed7a28253b97f0f61492e5447834bafb59a SHA1 52dec51829fae5547e55fa228b14147d8ac6005f SHA256 d01551a332a6ff9f92f6d2656acce0042df096e3a35aad3bc1de55ef7bb913d7
 MISC metadata.xml 615 RMD160 2f09f0eca557ef9bdc4c672c8d2172b66e25ad69 SHA1 189dc5a2f5d3cb26680e81987501a4266c4972d1 SHA256 f50bbda17ece7ce10e62c739225822877af67a95b3fb9b6a861ee31db489cab3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk/sfNYACgkQVWmRsqeSphMuUgCdFPFItQXNivMItZ3sVGeXpeNi
-djYAnjYdlUGL7XScFn7d7TXiEUMygbup
-=/xHP
+iEYEARECAAYFAk/sycMACgkQ1ycZbhPLE2DL6QCeMto7T4dcJ3KNimZ5KoIoTk/k
+XWUAmgIgRid3Nu5oR/og3Ra07Xfomt/p
+=9GyV
 -----END PGP SIGNATURE-----
diff --git a/dev-python/numpy/numpy-1.6.2.ebuild b/dev-python/numpy/numpy-1.6.2.ebuild
index aacd7ffe97aa..f2b0c586f604 100644
--- a/dev-python/numpy/numpy-1.6.2.ebuild
+++ b/dev-python/numpy/numpy-1.6.2.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/dev-python/numpy/numpy-1.6.2.ebuild,v 1.1 2012/05/22 16:34:49 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/numpy/numpy-1.6.2.ebuild,v 1.2 2012/06/28 21:16:40 bicatali Exp $
 
 EAPI=4
 
@@ -59,7 +59,7 @@ pkg_setup() {
 		append-fflags -fPIC
 		NUMPY_FCONFIG="config_fc --noopt --noarch"
 		# workaround bug 335908
-		[[ ${FC} == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
 	fi
 }
 
@@ -70,26 +70,38 @@ src_unpack() {
 	fi
 }
 
+pc_incdir() {
+	pkg-config --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g'
+}
+
+pc_libdir() {
+	pkg-config --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g'
+}
+
+pc_libs() {
+	pkg-config --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g'
+}
+
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.6.1-atlas.patch
 
 	if use lapack; then
 		append-ldflags "$(pkg-config --libs-only-other cblas lapack)"
-		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
 		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		# make sure _dotblas.so gets built
+		sed -i -e '/NO_ATLAS_INFO/,+1d' numpy/core/setup.py || die
 		cat >> site.cfg <<-EOF
 			[blas]
-			include_dirs = $(pkg-config --cflags-only-I \
-				cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-			library_dirs = $(pkg-config --libs-only-L \
-				cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
-			blas_libs = $(pkg-config --libs-only-l \
-				cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+			include_dirs = $(pc_incdir cblas)
+			library_dirs = $(pc_libdir cblas blas):${libdir}
+			blas_libs = $(pc_libs cblas blas)
 			[lapack]
-			library_dirs = $(pkg-config --libs-only-L \
-				lapack | sed -e 's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
-			lapack_libs = $(pkg-config --libs-only-l \
-				lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
+			library_dirs = $(pc_libdir lapack):${libdir}
+			lapack_libs = $(pc_libs lapack)
 		EOF
 	else
 		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None