fixed conflict with cdf (bug #191593), removed old versions

(Portage version: 2.1.2.12)
 (Signed Manifest commit)

1 files changed, 16 insertions, 24 deletions

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index b49d0c14eefe..6ac67eb37b30 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -9,18 +9,14 @@ AUX scipy-0.5.2-bspline.patch 698 RMD160 6ff37711eb52f0ec03d11c2f5627b1ac1b01b7c
 MD5 3b1cb851da530f138576d5ff78a0d2b5 files/scipy-0.5.2-bspline.patch 698
 RMD160 6ff37711eb52f0ec03d11c2f5627b1ac1b01b7ce files/scipy-0.5.2-bspline.patch 698
 SHA256 d47e91cceca2d0fb92869f9b8bbed62c7f6a94d31db358919da07d5ed8eb448b files/scipy-0.5.2-bspline.patch 698
-AUX scipy-0.5.2-getpath.patch 4604 RMD160 b7338ca1b88286387545420db5711aa3419d2e16 SHA1 5b63bdfc4c4bdcdf519e624be30f88c55a2387b4 SHA256 d2cca10b9df1372d024249520e757010b27e6abe46e9d00be336f7fa7d883ef1
-MD5 e2ec5ae9fde88a6d60ea009902845049 files/scipy-0.5.2-getpath.patch 4604
-RMD160 b7338ca1b88286387545420db5711aa3419d2e16 files/scipy-0.5.2-getpath.patch 4604
-SHA256 d2cca10b9df1372d024249520e757010b27e6abe46e9d00be336f7fa7d883ef1 files/scipy-0.5.2-getpath.patch 4604
+AUX scipy-0.5.2-cdf.patch 1196 RMD160 f229ff4613143eb32bb93b157fdccae5be2e986a SHA1 84aaf5a3f8fe31c86a84663d3c5425dafc9a43ab SHA256 0a7324c65c5cf4d25984f0c1b0814b66cfdd7a3f80d6e6c3670f78ef204c2342
+MD5 0a52eba11f23487b70025cc4476e9ffb files/scipy-0.5.2-cdf.patch 1196
+RMD160 f229ff4613143eb32bb93b157fdccae5be2e986a files/scipy-0.5.2-cdf.patch 1196
+SHA256 0a7324c65c5cf4d25984f0c1b0814b66cfdd7a3f80d6e6c3670f78ef204c2342 files/scipy-0.5.2-cdf.patch 1196
 AUX scipy-0.5.2-minpack.patch 348 RMD160 b0922386d3d888cb012afff3811a5248ab73bcc7 SHA1 d25b8aaf30bc01c44c23f674dc5fc73dd2388dce SHA256 fe1d9297b57062f27e21df450c1b9ed2ddcb9e1e5030b04ee8a860d265450fc6
 MD5 d72e80a7712eb70829e485f74d390c2d files/scipy-0.5.2-minpack.patch 348
 RMD160 b0922386d3d888cb012afff3811a5248ab73bcc7 files/scipy-0.5.2-minpack.patch 348
 SHA256 fe1d9297b57062f27e21df450c1b9ed2ddcb9e1e5030b04ee8a860d265450fc6 files/scipy-0.5.2-minpack.patch 348
-AUX scipy-0.5.2-mio.patch 19474 RMD160 7224a4073767ad911fcaaa2fb21af3265bfa9951 SHA1 412ed7b8a77df50f0ee497feb3739a11759784e8 SHA256 b5825dfb108a757e10f4ac579af9e89b6a2f11615c8fc7dfd5e0481643f3e3f6
-MD5 126123f9a51bc2052eef5e3ba595a565 files/scipy-0.5.2-mio.patch 19474
-RMD160 7224a4073767ad911fcaaa2fb21af3265bfa9951 files/scipy-0.5.2-mio.patch 19474
-SHA256 b5825dfb108a757e10f4ac579af9e89b6a2f11615c8fc7dfd5e0481643f3e3f6 files/scipy-0.5.2-mio.patch 19474
 AUX scipy-0.5.2-montecarlo-test.patch 457 RMD160 bbe5b0bf3c997a6fa1fe50e1ff0c15ddfe846107 SHA1 73064a43b95ea783ea528657c41d94157cf119bd SHA256 35e1c50a1fbe9e1c3c6cba52f457f6b8f058c37234963b9fe2bb7c5316f2fa82
 MD5 8673ad54b40cdf9e0f9393a6be010a36 files/scipy-0.5.2-montecarlo-test.patch 457
 RMD160 bbe5b0bf3c997a6fa1fe50e1ff0c15ddfe846107 files/scipy-0.5.2-montecarlo-test.patch 457
@@ -37,10 +33,6 @@ AUX scipy-0.5.2-signals.patch 771 RMD160 df127aa59f8f6fa26037f7b3848388b6282e64d
 MD5 1656f03cf849790b15eb9570f6f50137 files/scipy-0.5.2-signals.patch 771
 RMD160 df127aa59f8f6fa26037f7b3848388b6282e64d2 files/scipy-0.5.2-signals.patch 771
 SHA256 acb3b45b77c10e15885451bdca2bf3754f961443a016297ce3cab60f3540c050 files/scipy-0.5.2-signals.patch 771
-AUX scipy-0.5.2-umfpack.patch 846 RMD160 b2331df676061e586c07910cd5b0d90d6f34420c SHA1 a670e1c6987a0806ce66f46082029dbaae4521dc SHA256 bd00b3c327434ab65c555f288093b76c01dfb371ecc5b72dabc8c330d2d8bb53
-MD5 8b702e4285632068149b8b04081df9f4 files/scipy-0.5.2-umfpack.patch 846
-RMD160 b2331df676061e586c07910cd5b0d90d6f34420c files/scipy-0.5.2-umfpack.patch 846
-SHA256 bd00b3c327434ab65c555f288093b76c01dfb371ecc5b72dabc8c330d2d8bb53 files/scipy-0.5.2-umfpack.patch 846
 AUX scipy-0.5.2-viewer.patch 1273 RMD160 7401d0ef5668f51ed83b62fa6a01a9e9b88397ae SHA1 fbc7b09b55f9b28436f31c45b70f71814d207bf3 SHA256 c02d4101693ea9f8ddd7f7aeae0e5d7aa6ad14f407617dc5e5ec14448c3155cc
 MD5 9b6e6fab17b7ebe5dbd27d10479302a4 files/scipy-0.5.2-viewer.patch 1273
 RMD160 7401d0ef5668f51ed83b62fa6a01a9e9b88397ae files/scipy-0.5.2-viewer.patch 1273
@@ -55,18 +47,18 @@ EBUILD scipy-0.5.2-r2.ebuild 3927 RMD160 016098b67750187d71964c17e403db7266a4a00
 MD5 948a1fd21c80299f351baa096825b312 scipy-0.5.2-r2.ebuild 3927
 RMD160 016098b67750187d71964c17e403db7266a4a009 scipy-0.5.2-r2.ebuild 3927
 SHA256 ef4124e2d0f148bcf5a9d5fbf5d9d977ee1c0a753c24180be03e7475c791740e scipy-0.5.2-r2.ebuild 3927
-EBUILD scipy-0.5.2.1.ebuild 3367 RMD160 fe64e1bc478e822ac5fbca9eb1e87b860bf72c47 SHA1 45597c35b0f376f793bec002070b8ef6d2b41384 SHA256 c4d249414e55df385a847fcd95e9577887796c1338088313056e170932eae5e6
-MD5 d13f8176ced8c167bf6baded288b366e scipy-0.5.2.1.ebuild 3367
-RMD160 fe64e1bc478e822ac5fbca9eb1e87b860bf72c47 scipy-0.5.2.1.ebuild 3367
-SHA256 c4d249414e55df385a847fcd95e9577887796c1338088313056e170932eae5e6 scipy-0.5.2.1.ebuild 3367
+EBUILD scipy-0.5.2.1.ebuild 3408 RMD160 742074691c9b0b43878fda973eac2180d3144d3a SHA1 502d01c9ca92c321c9a76c55f9f9273da59a84b1 SHA256 bb46eb1f4309ba44647da699d96ada846ed2979ffcfa442db31260b51a0afc5e
+MD5 b18ee8bdc0d79d958da5036fef8dce59 scipy-0.5.2.1.ebuild 3408
+RMD160 742074691c9b0b43878fda973eac2180d3144d3a scipy-0.5.2.1.ebuild 3408
+SHA256 bb46eb1f4309ba44647da699d96ada846ed2979ffcfa442db31260b51a0afc5e scipy-0.5.2.1.ebuild 3408
 EBUILD scipy-0.5.2.ebuild 2290 RMD160 195b7e4a0a7012b2abdf5dd41d850fa017a22d09 SHA1 134f2fb73fbdac7059ded08833c980a38de3c5d0 SHA256 2da67d20e5c0b6bbd05df9d5c6fb267b4d070ff91fd9ab421444ca9b0626d953
 MD5 bd429029b1626be0f4d7d811779ace89 scipy-0.5.2.ebuild 2290
 RMD160 195b7e4a0a7012b2abdf5dd41d850fa017a22d09 scipy-0.5.2.ebuild 2290
 SHA256 2da67d20e5c0b6bbd05df9d5c6fb267b4d070ff91fd9ab421444ca9b0626d953 scipy-0.5.2.ebuild 2290
-MISC ChangeLog 4476 RMD160 8da35f03b39523ad5909ae1b6c9c514900908e80 SHA1 79d2f427995096df8eaebe8cadfd75607106dcb6 SHA256 5063b9c470b5a7a51a6a2bec54c6f75777b1a4303ecbade7f8242b0be1831f27
-MD5 c8aad5723f8d1f53830414c4358a0745 ChangeLog 4476
-RMD160 8da35f03b39523ad5909ae1b6c9c514900908e80 ChangeLog 4476
-SHA256 5063b9c470b5a7a51a6a2bec54c6f75777b1a4303ecbade7f8242b0be1831f27 ChangeLog 4476
+MISC ChangeLog 4752 RMD160 b45632220c79dcb4c99adf7561709f10ca0dafa5 SHA1 9d4679a37492e6dfb1f420c3a688180367ba48d9 SHA256 ac0136fd77ba2435cf926bd5f80b58f391d0b2f47bc5cc890a6e3e719b217401
+MD5 e3ac19282832923a4d55d9e315f9973c ChangeLog 4752
+RMD160 b45632220c79dcb4c99adf7561709f10ca0dafa5 ChangeLog 4752
+SHA256 ac0136fd77ba2435cf926bd5f80b58f391d0b2f47bc5cc890a6e3e719b217401 ChangeLog 4752
 MISC metadata.xml 577 RMD160 c9ddccf05c22b5460372ef1c47a91e3441ec6480 SHA1 fb55340f9fbf7877f5874cabcfbac9ea19f849bd SHA256 768246bd968275941fcf6cb3b9d084fdc45a2ab10d257709f644fe87c69c3b88
 MD5 27ccaa063e4ff212f9a4f5e84e1d7386 metadata.xml 577
 RMD160 c9ddccf05c22b5460372ef1c47a91e3441ec6480 metadata.xml 577
@@ -84,9 +76,9 @@ MD5 ea284458c08772d093548188b69ba94c files/digest-scipy-0.5.2.1 244
 RMD160 7f2cf763397248e22894f770b8b0c5673deb969d files/digest-scipy-0.5.2.1 244
 SHA256 f75d6ba46639ce4d9755422b5144922d34d4b345bcee364465cab12a8f390171 files/digest-scipy-0.5.2.1 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.6 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFG5AMncsIHjyDViGQRAlIDAJ9UtL5k8Zd+gct1dXdNzk/bdzbHEwCeLdoE
-B17APwlCm14lqng3mctootU=
-=RGC0
+iD8DBQFG5tE+1ycZbhPLE2ARAsM0AJ9WbSNIj2qol6e4r74U33QAJh2TmgCgtHva
+NDM7NfXPJ2veRqMfQSa6t8c=
+=6UWj
 -----END PGP SIGNATURE-----