Depend on virtual/python-imaging.

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 17 insertions, 13 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index dd84b6258835..6d7d16f37ee8 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,10 @@
 # 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.92 2013/05/19 07:00:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.93 2013/06/09 17:58:01 floppym Exp $
+
+  09 Jun 2013; Mike Gilbert <floppym@gentoo.org> scipy-0.11.0-r1.ebuild,
+  scipy-0.12.0.ebuild:
+  Depend on virtual/python-imaging.
 
   19 May 2013; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add missing local use description, #469532
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 2d075c4ebbda..d0ea6b9d79e6 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX scipy-0.11.0-test_basic.patch 1574 SHA256 90b330b9768183b4fe67a92bdd096bada63524163b8812a45e1a21b897a4eecd SHA512 07750651ad123e3e0410a2fb42262f7a6a824926c13429c59ba4e6a60c74ab39d506214b0e149d17fcbd2af40ab970d281db689702bb38096f9e4d9277085770 WHIRLPOOL 9bfd97a2d2e22cfd428781a6696752a01fb6a61fa0fc45bb5bd1c1b27c875c21ba276c75a367f39cb29cbbd3d62415764f1617ff2dddaf9b73bd126e8e5e04c2
 AUX scipy-0.12.0-blitz.patch 731 SHA256 4f487a746aa62a39cdab9381dd4191cef0ccb912ed2e22065a7de02b85c8a269 SHA512 a788d08d34e13b02a0ec8127fd7918786cd26376ef5160f4acde585c6c1ac018a39652d9174b5e31173aa5c4e0c2f63101549de70806ea7ac56731abe3cb929c WHIRLPOOL ec00c2778e5e31a5d0ec4bc8099b4579e4eaa34a335653155da3c47e3c69fb3a8ff67b816cbeb769b81826c27ca687fc9fc22db11b91ddfadb6268c98890b302
@@ -17,15 +17,15 @@ DIST scipy-0.12.0.tar.gz 9095801 SHA256 b967e802dafe2db043cfbdf0043e1312f9ce9c13
 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.11.0-r1.ebuild 3364 SHA256 3d080cb8005ed85b930967b5d00efed57f42ca69d9c69ea35cc24daffb582413 SHA512 aa3262005084ffea6a625068555a869fdf82a12655b87e5230ca6caacc0bafa03f58ed3a1b30306a64f3f78dc10f6cb014e7aca3baf1113dae401dc9818dd998 WHIRLPOOL 7668e38afba971e725379c11b888203d154675e3c927969a13248d1d10fd8969b0ffcdf8e7b301ede1246dab5ec7b6c2ec177d7f98d192d7ffff30d7e83795f0
-EBUILD scipy-0.12.0.ebuild 3742 SHA256 c8b7395a3631eebe8d2d436f50a4c0d84c317dfae2c14477d813e5b68045a978 SHA512 80019ebb9aedd98d8af0e7b0d968582bcca4fa374b3ccf1e910098340c24101bcc8caaa3ed2293dea5ad4a30b52121958e2425af12f142c7543600b0caf8d254 WHIRLPOOL 50fdbf28b104497b35d5cb500bb87b788bb1dbcd54a782702ffa8ae92481eacb09062ecbd8cb7ba6e0a44baf78679f525de5da160985be905d66578c6da07902
+EBUILD scipy-0.11.0-r1.ebuild 3353 SHA256 8b1b590ba3550fa6c81637a29be53403059d214b425e0d4ba065528db8cf611c SHA512 772d4dbbc457f36affe8b712684a6049c8c75898d7da0c9723d880cbe8e45d025a851c3681b3885bb28877ff378e16bc25484627a3ed2fba0c2104b92be677a1 WHIRLPOOL 1b44ca4ceb6690a09bfcb5749a8450ee7a5afb7288306b4258bb08aae3d1f7f8007affc1874ea8f95108dba305158e7de27e00d40739b120373c585fdbaa1c0e
+EBUILD scipy-0.12.0.ebuild 3730 SHA256 6c1992f618bf2556fdcc5267be62bae100bf21a7192115fa5a448f2462fa2900 SHA512 b7615d99ff0b556b02fff5f4b84fb37ae7e9914b7478ea87584dfbab7e687dcb700ea131c6514e1ad30040be05c259bfe3915673d9a0a006c5daf973a891f058 WHIRLPOOL 68106fd1986278c540f38d686c311f84b88efe64b8643f02bb355dfb79f30e1c28a1f18aeaff977509d084fb4a832397e2c191681a11387cd7a3c875949a2b42
 EBUILD scipy-0.9.0-r1.ebuild 4357 SHA256 11a7abe549534189fb92363d77dcd17716cc278d42f0a4b742c6b5a8fdd0e3ca SHA512 a0f540f4c07356ea90ccbbca02531c127c6e70cebe40979bc066c3403242dd81fda009eebc36058fb82e4f70fe4ab79c6a48721dab16a29332106145e287504e WHIRLPOOL 44f5c8a9a9ea573335ccf836d125ffdab7eb212b0102315e02baf6d42a63bfacb7fb493e4b99c2c49b60c1069a7050b47cda456d04cf44549e40102ec760f984
-MISC ChangeLog 17727 SHA256 907e8992ee63d810fc9c7cb94ab3b15d6a5aabcd10921143790e9ca9a643c17a SHA512 7a87c6bd6fe65c7b30b7138f391e76d8b3d2c536eecc5201f841b5841624f73fd1dce78e4a1de7b7012fff9d70fcda21b9ff9492fc9a1ec51bb8338bcef9d404 WHIRLPOOL 75578ac440487e3e6f21bd28397b5e8c644ba43450b5f048145638fc39e3dc85997a5e4b9675987e7964919ab4f78b9faae243eb42f3b1e21172175b591e28fb
+MISC ChangeLog 17863 SHA256 91f9363dad1ecd4f05726394403600af913d7a612981d53463e5e47d30c446fa SHA512 884131af7fcfed258aeeada34a05cd1a8e2104e4c09f77e2fe62b65bc42c5ffd0d0d0696f378204575903cd3875a6b8c1703b6ef4998bdaa83c44a0310c2a604 WHIRLPOOL 508dd64853e94d97be29b6328655c464703df746ef159200d2bf9a8c6c8c32adfa53eedfd102e665c9178240d18627164fc253e17bed0dd5135277878c235b09
 MISC metadata.xml 875 SHA256 dcf10852c387309e5cf9eb038eeeb9436ab2f25cd6d1319ba63eab8ba89b2902 SHA512 1bc9a6d8ee5d70296ab0e7e6e4ef4fb91d47b4a1abbd0819a876726f61e8b3d75c0cdf729fe77d8ae2906596e61e2a38fe39a847523dedc55b0b553998614e57 WHIRLPOOL 45414d390eb26088a3ba1f77b970e98e31edb1909a04cbab22e43c6945d75c077c9a16f9eae3d2cb5d30d1b6a2cfd0be524594e834a7df334c97ea9de1945609
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREKAAYFAlGYeKYACgkQgAnW8HDreRYirwCfbL2KiyDaGM8DGvvaVhrNNoBs
-RV8AoM7g87CevVf3BpG/pNAAjT2icOnG
-=T82W
+iF4EAREIAAYFAlG0wisACgkQC77qH+pIQ6RlygEAk2SUnlFJoQlAA56APhlCrufn
+266rywzjD1EmphNwoyUA/0hNc+GoBZOCao8g/+/oe24n04sU4F1fHH/KhNS+M/dW
+=dUSi
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/scipy-0.11.0-r1.ebuild b/sci-libs/scipy/scipy-0.11.0-r1.ebuild
index b73cfb80b737..e3d0df2d4eb4 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.6 2013/03/30 13:07:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.11.0-r1.ebuild,v 1.7 2013/06/09 17:58:01 floppym Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ DEPEND="${CDEPEND}
 	umfpack? ( dev-lang/swig )"
 
 RDEPEND="${CDEPEND}
-	dev-python/imaging[$(python_gen_usedep 'python2*')]"
+	virtual/python-imaging[${PYTHON_USEDEP}]"
 
 DOCS=( HACKING.rst.txt README.txt THANKS.txt LATEST.txt TOCHANGE.txt )
 
diff --git a/sci-libs/scipy/scipy-0.12.0.ebuild b/sci-libs/scipy/scipy-0.12.0.ebuild
index 6067052702c9..64ab238edd36 100644
--- a/sci-libs/scipy/scipy-0.12.0.ebuild
+++ b/sci-libs/scipy/scipy-0.12.0.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.12.0.ebuild,v 1.2 2013/04/29 18:00:33 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.12.0.ebuild,v 1.3 2013/06/09 17:58:01 floppym Exp $
 
 EAPI=5
 
@@ -35,7 +35,7 @@ DEPEND="${CDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
 RDEPEND="${CDEPEND}
-	dev-python/imaging[$(python_gen_usedep 'python2*')]"
+	virtual/python-imaging[${PYTHON_USEDEP}]"
 
 DOCS=( HACKING.rst.txt README.txt THANKS.txt LATEST.txt TOCHANGE.txt )