Move to generic pkg-config, removed old

Package-Manager: portage-2.2.01.21688-prefix/cvs/Linux x86_64
Manifest-Sign-Key: 0x13CB1360

7 files changed, 25 insertions, 303 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index 7e4f35f004e4..3d97477dbddd 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.85 2013/02/10 14:27:47 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.86 2013/02/21 00:37:29 bicatali Exp $
+
+  21 Feb 2013; Sébastien Fabbro <bicatali@gentoo.org>
+  -files/scipy-0.9.0-superlu-4.3.patch, -scipy-0.10.1.ebuild,
+  -scipy-0.11.0.ebuild, metadata.xml, scipy-0.11.0-r1.ebuild:
+  Move to generic pkg-config, removed old
 
   10 Feb 2013; Michał Górny <mgorny@gentoo.org> scipy-0.11.0-r1.ebuild:
   Use distutils_install_for_testing().
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 30ec6edef53e..ac0a4a8354dd 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -3,29 +3,21 @@ Hash: SHA256
 
 AUX scipy-0.11.0-test_basic.patch 1574 SHA256 90b330b9768183b4fe67a92bdd096bada63524163b8812a45e1a21b897a4eecd SHA512 07750651ad123e3e0410a2fb42262f7a6a824926c13429c59ba4e6a60c74ab39d506214b0e149d17fcbd2af40ab970d281db689702bb38096f9e4d9277085770 WHIRLPOOL 9bfd97a2d2e22cfd428781a6696752a01fb6a61fa0fc45bb5bd1c1b27c875c21ba276c75a367f39cb29cbbd3d62415764f1617ff2dddaf9b73bd126e8e5e04c2
 AUX scipy-0.9.0-qhull.patch 1672 SHA256 adbcb54b569c48838df8500a416febbc1f704643874780e4dcf30a635efe6027 SHA512 225392bbce5bb222330955bd12c2c0ae3d12f2dc49d83c11bf8d347490bae0d459fc5e6c858146ebff1fdd767794726fd47ff98426af23fd96f00959d4133293 WHIRLPOOL 9fc2c876207336099d27ef51bcf3638dfe75ddc4c2a95989ae1a1e76f07cdc1b74bc3d24000db5c11590a227063acdba77557dd767c8d49a590d32e87391d69a
-AUX scipy-0.9.0-superlu-4.3.patch 712 SHA256 3078e9b60534571a5765824cb1d5ae1f42497f5a4382f9ae201d59f1cf4dd8d2 SHA512 607c07ab84789aead1060fcd0ccc0d70610cb320f301fa79dab04cfe96e6087914e66282200a435bd9fd9b3be9d1e5025649f553c52af17b91e738f70f78fa07 WHIRLPOOL 696be54c93fdb7ac5addfca188c335cb63721e08cadff267c7f4a41d26d49427e24ab74bfba6cafd77490dd18dec39c5cbda25319f2f89b5ccf04e16a6622cbb
 AUX scipy-0.9.0-superlu.patch 1526 SHA256 10b58353b0cdd6a8a6713ca7186cdb37c33c0ae4e42014322c5ad94465359e8f SHA512 1326cf779bffb9e2046106fd771309a93c3b0d7b15f8200f9a6652b425e7b0b642776feda488d10b2b69f6d16fb9fc1beeae4a1ff57b5e7181b9473c4de07232 WHIRLPOOL ceb430b6cca1036e8c07836b1f6ed71a75a9921bda787973ceb6f46673963d70a0bf07f46fed68d85587208aab51065fdebfce8bcd85d35dfa760fae012098e8
-DIST scipy-0.10.1-html.zip 14134494 SHA256 ae7b19aec1fd5039875b4f493f8ad0258e7cd710c129a126c24cf9a4a8b153b5
-DIST scipy-0.10.1-ref.pdf 8255552 SHA256 910c2db682d53418ebbd83164401df7e6d8ac23ec2e1be6b82fd39f61ba96271
-DIST scipy-0.10.1.tar.gz 6231117 SHA256 77cc5c48e3f0c07b8137135538cdb99d596d3cc5c498bb0031fb5ff22eae4aa7 SHA512 eec653fa3d973cf72528c474d00ab16d6b31412125cb15a59354f94959cbe86fee07381693935a40207f91242d43e03dc92942b5f637a3b278ce5ada68623220 WHIRLPOOL 7ef65050d53a84fd0cf317d09c3269b23ef68afab39e6659f1d822f767ee2f41f36f00ff4516b6aa1065571478bde2fb39c8a5ec6e3ec13d32bfc7886dfa5c5d
 DIST scipy-0.11.0-html.zip 10831664 SHA256 d7a1dba159d13781a31bf88bcca3aec802ad7d0817c585140e05221722e17689 SHA512 dba923b632a063a1e437b77fc4b034df4b9d0936c17a48136857db14719de2ca88336500b663b781b443521cb71fd6bc3e7ff51779ed80ae2b34b7e655cba7ed WHIRLPOOL b25324c06b23e32797701485491696835d1b2878e025cd5f2cc38e3a998fb6bf62980c449f8fcf035035aa899754daf2e0985e872d918a1c7cc7ae2188a9c9b8
 DIST scipy-0.11.0-ref.pdf 7382958 SHA256 04587215578188396723cea2eb7387460fd957706eec61ea1b67326822fdcb68 SHA512 520a75aed2e4b87296e864fde3387ea35978e96af86c3c3f92c0509db7ee0f8253c3c75f3e8de273e534aa400ff3dcca051fc8c83f9406af941da422f88fed70 WHIRLPOOL eae4c8b9fbffcd277b077175eaf9a1e136ec02cbec16c6d389735be5cbbc4300765bd9ce34427932dc1f9b58a0b16971235d89b60c02313d8902a82079bb9317
 DIST scipy-0.11.0.tar.gz 6776998 SHA256 b2b74d56a2d58a4f032f91e8b91b1c2272d5eb0b5010082dd1e492e452f862ee SHA512 d4fdd62f2db5285cd133649bd1bfa5175cb9da8304323abd74e0ef1207d55e6152f0f944da1da75f73e9dafb0f3bb14efba3c0526c732c348a653e0bd223ccfa WHIRLPOOL 5ccdc68f968e58c43f56d7f1b8a281ab40a6b5077267c867bc371b0280d06512d9a726259cb2af0b89bae32ca2c636e7db0594624b3c8241d2887c42c4590765
 DIST scipy-0.9-html.zip 8516420 SHA256 6f3148881502ca2cd2964fef7baf9bfec6fe2329ec3f1832e1e6d864aed0f889
 DIST scipy-0.9-ref.pdf 5299022 SHA256 ed2641c180eef2f842536a611982fbd91c33c95a7e7e3c279d7ae6f10071be47
 DIST scipy-0.9.0.tar.gz 6084552 SHA256 913089de94721be864e0a57fdab52603f3150250a2e0ce4ed6928ca1125f6b23 SHA512 2c9be17d4f9daea23dab7449282f522641a7bfc0bdb0005631f2a89da44681c4b4e98bdff8b76ee451c1ee36cf3dd2eaf45f670cfaff86c10d49bf5478ac3c43 WHIRLPOOL 0b58a0e0bc03f4759e5bbc3b24b36c6b53092a92c595ca65a79bf307332564b3204fc1d6244bb0a970bdb63f0092591b846cc14e8b4b6c73d9b09ffeb16815b4
-EBUILD scipy-0.10.1.ebuild 3453 SHA256 5d198a8383ef3ae35f68861ef741a9166b4174452bc0a701faea96ec189939b0 SHA512 19e27f4953fc0cebb26c535dab61b1820b01aef6bfc7548f27c07a65f58e9ea40f7083a90a23094da9887118d7c9fe254ca968dcdfc11499d416734c8a88c33d WHIRLPOOL 75c76570585ad81d2c85e0ac27b3a7912cd238470a52c230486a3a00e240140e390378d5d7727584c2cc20c51ac06de8df4223841461d5affe5450afeb7fba34
-EBUILD scipy-0.11.0-r1.ebuild 3361 SHA256 f2af2621c1dc9cb81f1e9702ee5dee12e222cda3120ff70d99e6d800d5715671 SHA512 9fec0fff9aaebe8e4184eaaff4378e22e34f4e2ba3cbf02cc6d3713b0b4a41ecbbdcdee21dc213f9309f31177bddb7ef4f1848aa6257ea8df544d2716428377c WHIRLPOOL b79cf7f13b6eb21e4e2fcfe3360158c26f724c190af8ca58891a73317763de28c6e9db89b0fdb66eb9648b0cfd51ba69b2e52c8eb6b5a6a2182d38a112a74c39
-EBUILD scipy-0.11.0.ebuild 3466 SHA256 5fd72350fbb8f9ef46495071bd0ec350eca5378a47d29c1ebd5b271307949ee6 SHA512 62af91ce719dfb8ac5f67ce9dc9b549882ff9c4c771310ba2f2975b7f227d7c5b7b212b0dbf5c005bdba9460b2cb1fb84519395b5aca1b10e1213b2fb4450566 WHIRLPOOL 8df4594e11ab7ba4919244efb2f2352bc7a78874ab44a2bf64941606781ca9f93c88ecd96f5887006a60f7e29b1d08491bd80be4e72ff31d8177f8d7892e6438
+EBUILD scipy-0.11.0-r1.ebuild 3356 SHA256 516b13d4c5e50e4a84cba3ea641f48070b5ad9b833ebf1c2e202ae4902929c64 SHA512 87cf0bfc7c40deaaf953c142a5b33e63c6cb70491eebe69370d318b973a8f49bb5e416a96e84de436ffe502df5bb11094f1355c3435e7bc4ed457173ed0e1430 WHIRLPOOL c14d47afede36e2ab80553dc62bd517531f3415a382f11bfac1e7a5d79c2dbbf57399635bd6d276ebea4cb06a98604867dc4872eeb9fb875c3211c749083a2e7
 EBUILD scipy-0.9.0-r1.ebuild 4264 SHA256 2c138cb89cb4f2a467a5fadc1adff2f53614034af4251df048031719058b6fb2 SHA512 bda5d14b38f85ca4cf9da89e02d339139efdd159fb00ed81aa1255edc531bb142c9c1ee9fa58c14edf41e687239613f63a4b31535b3f88bb5fee720227cdd4d3 WHIRLPOOL 205b1be078cb77c5d6ae116ef145e747e24f8e811317290e734782688bcf6203bdc03ff417a11b4edc7ce3c7b68b14b53b926f9ab3f53182b0db095e84f573e0
-MISC ChangeLog 16508 SHA256 be5c78d16a3a7dd81929133311906904782af90b5981cbe19d1b468ac1b9290d SHA512 a91f2a5f820c163540a4b428b2e3b38db1f6f3d37739c571137235632f0e09b69e0f8374430fc92ff06ca687ab6c72865dd271f3ed9c36d34aa599d0d7aeadb9 WHIRLPOOL 4fd67de684b09227ee8f5efd29fe1f74ea9779172049ecf6cbd52e8bdae3048700440182a06b2c60fa029c72e994ce723182cafcc29bb175231ed3863f0362dd
-MISC metadata.xml 707 SHA256 7106425fa4d62f2eb36033ca19ec466162b9b748be85571281d5c5d87f2abeb6 SHA512 fc8e90cd7fec46564a1f75c6ba1a8032f24a93e6909b888c62d73a6aad1a10ef140e24fb406ca298271cbcadd7ce2d6ab8977ab9acde98599900e5d6f1d5e644 WHIRLPOOL 4b717b3493e6f3efdfce9f58aef3ad6719590c2ed150f36696086b38ff948e1c32d2bd7f2bd34e77b4e08a1d04182dea12ca90b8627b7cfd55f773ee412e07e6
+MISC ChangeLog 16732 SHA256 ef23874ff4db76c6ced599f7c602d91bddcd1402f4ed4f276d963f784b303960 SHA512 1c09a4cfe0a43fda429bcabf8c050b458bb87818591dd2f7d372dd3f6d1f502d2d75335e24f95801527b1134c8e075600a3f7ea3197178275080400e13dafb3f WHIRLPOOL 2f86d85e649a1806ba457082aa71e7646d4c30fccda4a5c4c6f42d14dfc6e4bd266d021f7a9aecd764dc27d96df2eb954e6c90b8a63bd6a5b912d0cac4719f83
+MISC metadata.xml 763 SHA256 28ca0b6d5ee18b1e9eb2c3f576805388a2efa2e622ecd35047dbcd324852fc44 SHA512 219462d587a4623d69fbf2604242d7ad91bab29d4e455028c831e8b7b180893827c95b61ca1b683314a3bce61a6a0e0208f91af44a773cc9267f77d70c364f8a WHIRLPOOL cfacfc3d0fbfbe2423e3396dfb1d6352b1b1dd864002a982c042cbbfab278482adc4d9cdee89770068e437c749aff0e4c9fa2103cc930b6ce7b3810616ab79ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iJwEAQEIAAYFAlEXrmwACgkQfXuS5UK5QB2htgQAqZ0b0+DPt3LMqLzOhS5TlCyt
-yDPJWcOv38kIZIAPA5bH2mpVDvobj6NGaviTItn9U8mggXlgctjuX5yV5w19c0MO
-xoMbFA5auYzF7D/cyjp5gLLyOjIhon/XPJiiqix0NxXNfj8mF20RlruYlDN4obC2
-AfzHvh1CxiT974EHlj4=
-=SVJx
+iEYEAREIAAYFAlElbFQACgkQ1ycZbhPLE2DznwCfaPbbMqWEI+MPg2tgc/7kQQCh
+8VkAn1LJhgVfRwx7rEhOkcQn2SntbuF0
+=crE+
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/files/scipy-0.9.0-superlu-4.3.patch b/sci-libs/scipy/files/scipy-0.9.0-superlu-4.3.patch
deleted file mode 100644
index c5b7176572e6..000000000000
--- a/sci-libs/scipy/files/scipy-0.9.0-superlu-4.3.patch
+++ /dev/null
@@ -1,20 +0,0 @@
- scipy/sparse/linalg/dsolve/_superluobject.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/scipy/sparse/linalg/dsolve/_superluobject.c b/scipy/sparse/linalg/dsolve/_superluobject.c
-index e9ec0bd..2fde6cc 100644
---- a/scipy/sparse/linalg/dsolve/_superluobject.c
-+++ b/scipy/sparse/linalg/dsolve/_superluobject.c
-@@ -589,9 +589,9 @@ static int iterrefine_cvt(PyObject *input, IterRefine_t *value)
- {
-     ENUM_CHECK_INIT;
-     ENUM_CHECK(NOREFINE);
--    ENUM_CHECK(SINGLE);
--    ENUM_CHECK(DOUBLE);
--    ENUM_CHECK(EXTRA);
-+    ENUM_CHECK(SLU_SINGLE);
-+    ENUM_CHECK(SLU_DOUBLE);
-+    ENUM_CHECK(SLU_EXTRA);
-     ENUM_CHECK_FINISH("invalid value for 'IterRefine' parameter");
- }
- 
diff --git a/sci-libs/scipy/metadata.xml b/sci-libs/scipy/metadata.xml
index cae437e54ae0..50532c00c267 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,7 +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>
+<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.10.1.ebuild b/sci-libs/scipy/scipy-0.10.1.ebuild
deleted file mode 100644
index 7c186691d743..000000000000
--- a/sci-libs/scipy/scipy-0.10.1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.10.1.ebuild,v 1.6 2012/10/16 19:47:58 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*::3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.3 *-jython *-pypy-*"
-
-inherit eutils fortran-2 distutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/ http://pypi.python.org/pypi/scipy"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${P}/${PN}-html.zip -> ${P}-html.zip
-		http://docs.scipy.org/doc/${P}/${PN}-ref.pdf -> ${P}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc test umfpack"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	dev-python/numpy
-	sci-libs/arpack
-	virtual/cblas
-	virtual/lapack
-	umfpack? ( sci-libs/umfpack )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? ( dev-python/nose )
-	umfpack? ( dev-lang/swig )"
-
-RDEPEND="${CDEPEND}
-	dev-python/imaging"
-
-DOCS="THANKS.txt LATEST.txt TOCHANGE.txt"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use umfpack && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-	python_pkg_setup
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${P}-html.zip -d html || die
-	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() {
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-	cat >> site.cfg <<-EOF
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-}
-
-src_compile() {
-	distutils_src_compile ${SCIPY_FCONFIG}
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install \
-			--home="${S}/test-${PYTHON_ABI}" --no-compile ${SCIPY_FCONFIG} \
-			|| die "install test failed"
-		pushd "${S}/test-${PYTHON_ABI}/"lib*/python > /dev/null
-		PYTHONPATH=. "$(PYTHON)" -c "import scipy; scipy.test('full')" \
-			2>&1 | tee test.log
-		grep -q ^ERROR test.log && die "test failed"
-		popd > /dev/null
-		rm -fr test-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install ${SCIPY_FCONFIG}
-	use doc && dohtml -r "${WORKDIR}"/html/* && dodoc "${DISTDIR}"/${P}*pdf
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer if you don't like the default one. Ex:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-0.11.0-r1.ebuild b/sci-libs/scipy/scipy-0.11.0-r1.ebuild
index 3417401b981f..c707ee438301 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.3 2013/02/10 14:27:47 mgorny Exp $
+# $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 $
 
 EAPI=5
 
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_5,2_6,2_7} )
 inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
 
 DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/ http://pypi.python.org/pypi/scipy"
+HOMEPAGE="http://www.scipy.org/"
 SRC_URI="
 	mirror://sourceforge/${PN}/${P}.tar.gz
 	doc? (
@@ -49,17 +49,17 @@ src_unpack() {
 }
 
 pc_incdir() {
-	pkg-config --cflags-only-I $@ | \
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
 		sed -e 's/^-I//' -e 's/[ ]*-I/:/g'
 }
 
 pc_libdir() {
-	pkg-config --libs-only-L $@ | \
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
 		sed -e 's/^-L//' -e 's/[ ]*-L/:/g'
 }
 
 pc_libs() {
-	pkg-config --libs-only-l $@ | \
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
 		sed -e 's/[ ]-l*\(pthread\|m\)[ ]*//g' \
 		-e 's/^-l//' -e 's/[ ]*-l/,/g'
 }
diff --git a/sci-libs/scipy/scipy-0.11.0.ebuild b/sci-libs/scipy/scipy-0.11.0.ebuild
deleted file mode 100644
index a2ec94159de2..000000000000
--- a/sci-libs/scipy/scipy-0.11.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2012 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.ebuild,v 1.2 2012/12/13 16:07:11 jlec Exp $
-
-EAPI=4
-
-PYTHON_DEPEND="*::3.2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.3 *-jython *-pypy-*"
-
-inherit eutils fortran-2 distutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/ http://pypi.python.org/pypi/scipy"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${P}/${PN}-html.zip -> ${P}-html.zip
-		http://docs.scipy.org/doc/${P}/${PN}-ref.pdf -> ${P}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc test umfpack"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	dev-python/numpy
-	sci-libs/arpack
-	virtual/cblas
-	virtual/lapack
-	umfpack? ( sci-libs/umfpack )"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? ( dev-python/nose )
-	umfpack? ( dev-lang/swig )"
-
-RDEPEND="${CDEPEND}
-	dev-python/imaging"
-
-DOCS="THANKS.txt LATEST.txt TOCHANGE.txt"
-
-pkg_setup() {
-	fortran-2_pkg_setup
-	python_pkg_setup
-}
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${P}-html.zip -d html || die
-	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() {
-	local libdir="${EPREFIX}"/usr/$(get_libdir)
-
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use umfpack && unset UMFPACK
-	# the missing symbols are in -lpythonX.Y, but since the version can
-	# differ, we just introduce the same scaryness as on Linux/ELF
-	[[ ${CHOST} == *-darwin* ]] \
-		&& append-ldflags -bundle "-undefined dynamic_lookup" \
-		|| append-ldflags -shared
-	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
-	# hack to force F77 to be FC until bug #278772 is fixed
-	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
-	export F90="${FC}"
-	export SCIPY_FCONFIG="config_fc --noopt --noarch"
-	append-fflags -fPIC
-
-	cat >> site.cfg <<-EOF
-		[blas]
-		include_dirs = $(pc_incdir cblas)
-		library_dirs = $(pc_libdir cblas blas):${libdir}
-		blas_libs = $(pc_libs cblas blas)
-		[lapack]
-		library_dirs = $(pc_libdir lapack):${libdir}
-		lapack_libs = $(pc_libs lapack)
-	EOF
-}
-
-src_compile() {
-	distutils_src_compile ${SCIPY_FCONFIG}
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" setup.py build -b "build-${PYTHON_ABI}" install \
-			--home="${S}/test-${PYTHON_ABI}" --no-compile ${SCIPY_FCONFIG} \
-			|| die "install test failed"
-		pushd "${S}/test-${PYTHON_ABI}/"lib*/python > /dev/null
-		PYTHONPATH=. "$(PYTHON)" -c "import scipy; scipy.test('full',verbose=10)" \
-			2>&1 | tee test.log
-		grep -q ^ERROR test.log && die "test failed"
-		popd > /dev/null
-		rm -fr test-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install ${SCIPY_FCONFIG}
-	use doc && dohtml -r "${WORKDIR}"/html/* && dodoc "${DISTDIR}"/${P}*pdf
-}
-
-pkg_postinst() {
-	distutils_pkg_postinst
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer if you don't like the default one. Ex:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}