sci-libs/scipy: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config; fix numpy USE-dep

(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

4 files changed, 27 insertions, 22 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 3d97477dbddd..fe1523c57661 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.86 2013/02/21 00:37:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.87 2013/02/21 22:08:08 jlec Exp $
+
+  21 Feb 2013; Justin Lecher <jlec@gentoo.org> scipy-0.9.0-r1.ebuild,
+  scipy-0.11.0-r1.ebuild, metadata.xml:
+  Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config;
+  fix numpy USE-dep
 
   21 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>
   -files/scipy-0.9.0-superlu-4.3.patch, -scipy-0.10.1.ebuild,
diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml
index 50532c00c267..1020ae39f436 100644
--- a/sci-libs/scipy/metadata.xml
+++ b/sci-libs/scipy/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+  <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.
@@ -10,10 +10,10 @@
   special functions, signal and image processing, genetic algorithms, ODE
   solvers, and others.
 </longdescription>
-<use>
-  <flag name="umfpack">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
-</use>
-<upstream>
-  <remote-id type="pypi">scipy</remote-id>
-</upstream>
+  <use>
+    <flag name="umfpack">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">scipy</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/sci-libs/scipy/scipy-0.11.0-r1.ebuild b/sci-libs/scipy/scipy-0.11.0-r1.ebuild
index c707ee438301..be73232ef987 100644
--- a/sci-libs/scipy/scipy-0.11.0-r1.ebuild
+++ b/sci-libs/scipy/scipy-0.11.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.11.0-r1.ebuild,v 1.4 2013/02/21 00:37:29 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.11.0-r1.ebuild,v 1.5 2013/02/21 22:08:08 jlec Exp $
 
 EAPI=5
 
@@ -23,7 +23,7 @@ IUSE="doc test umfpack"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 CDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/numpy[lapack,${PYTHON_USEDEP}]
 	sci-libs/arpack
 	virtual/cblas
 	virtual/lapack
diff --git a/sci-libs/scipy/scipy-0.9.0-r1.ebuild b/sci-libs/scipy/scipy-0.9.0-r1.ebuild
index 39a42b8a26e3..67931d2509a1 100644
--- a/sci-libs/scipy/scipy-0.9.0-r1.ebuild
+++ b/sci-libs/scipy/scipy-0.9.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.9.0-r1.ebuild,v 1.11 2012/10/16 19:47:58 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.9.0-r1.ebuild,v 1.12 2013/02/21 22:08:08 jlec Exp $
 
 EAPI="3"
 
@@ -78,28 +78,28 @@ src_prepare() {
 	local libdir="${EPREFIX}"/usr/$(get_libdir)
 	cat > site.cfg <<-EOF
 		[atlas]
-		include_dirs = $(pkg-config --cflags-only-I \
+		include_dirs = $($(tc-getPKG_CONFIG) --cflags-only-I \
 			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
+		library_dirs = $($(tc-getPKG_CONFIG) --libs-only-L \
 			cblas blas lapack| sed -e \
 			's/^-L//' -e 's/ -L/:/g' -e 's/ //g'):${libdir}
-		atlas_libs = $(pkg-config --libs-only-l \
+		atlas_libs = $($(tc-getPKG_CONFIG) --libs-only-l \
 			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
-		lapack_libs = $(pkg-config --libs-only-l \
+		lapack_libs = $($(tc-getPKG_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 \
+		include_dirs = $($(tc-getPKG_CONFIG) --cflags-only-I \
 			cblas | sed -e 's/^-I//' -e 's/ -I/:/g')
-		library_dirs = $(pkg-config --libs-only-L \
+		library_dirs = $($(tc-getPKG_CONFIG) --libs-only-L \
 			cblas blas | sed -e 's/^-L//' -e 's/ -L/:/g' \
 			-e 's/ //g'):${libdir}
-		libraries = $(pkg-config --libs-only-l \
+		libraries = $($(tc-getPKG_CONFIG) --libs-only-l \
 			cblas blas | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 		[lapack_opt]
-		library_dirs = $(pkg-config --libs-only-L \
+		library_dirs = $($(tc-getPKG_CONFIG) --libs-only-L \
 			lapack | sed -e 's/^-L//' -e 's/ -L/:/g' \
 			-e 's/ //g'):${libdir}
-		libraries = $(pkg-config --libs-only-l \
+		libraries = $($(tc-getPKG_CONFIG) --libs-only-l \
 			lapack | sed -e 's/^-l//' -e 's/ -l/, /g' -e 's/,.pthread//g')
 	EOF
 }