Clean old

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xE9402A79B03529A2!

8 files changed, 25 insertions, 481 deletions

diff --git a/sci-libs/scipy/ChangeLog b/sci-libs/scipy/ChangeLog
index d9b1126cc7cd..e752b69a1792 100644
--- a/sci-libs/scipy/ChangeLog
+++ b/sci-libs/scipy/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-libs/scipy
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.129 2015/05/13 06:56:26 jmorgan Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/ChangeLog,v 1.130 2015/06/23 06:21:12 jlec Exp $
+
+  23 Jun 2015; Justin Lecher <jlec@gentoo.org>
+  -files/scipy-0.12.0-cephes-missing-include.patch,
+  -files/scipy-0.12.0-gerqf.patch,
+  -files/scipy-0.14.0-cython-0.22-backport.patch,
+  -files/scipy-0.14.0-lsqr-backport.patch, -scipy-0.14.0-r1.ebuild,
+  -scipy-0.15.0.ebuild:
+  Clean old
 
   13 May 2015; Jack Morgan <jmorgan@gentoo.org> scipy-0.15.1.ebuild:
   ppc64 stable wrt bug #545936
diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index a3771908cf90..7be8dccefc3a 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -2,41 +2,29 @@
 Hash: SHA512
 
 AUX scipy-0.12.0-blitz.patch 731 SHA256 4f487a746aa62a39cdab9381dd4191cef0ccb912ed2e22065a7de02b85c8a269 SHA512 a788d08d34e13b02a0ec8127fd7918786cd26376ef5160f4acde585c6c1ac018a39652d9174b5e31173aa5c4e0c2f63101549de70806ea7ac56731abe3cb929c WHIRLPOOL ec00c2778e5e31a5d0ec4bc8099b4579e4eaa34a335653155da3c47e3c69fb3a8ff67b816cbeb769b81826c27ca687fc9fc22db11b91ddfadb6268c98890b302
-AUX scipy-0.12.0-cephes-missing-include.patch 394 SHA256 0263ba4e9f13c7be0e7160ae73ce98ea37f698ea7e06c3fc090bc4ff7732bc66 SHA512 a4f9adf9b29743b6ca7f42de0695af23ddf7791330a4a58a2f47cd5599af1361aee3b141a016ea1a81a3bc5b8bfcaa3f0478370a09acd37bcd8e519765701510 WHIRLPOOL 59651015bf540ad2218dd65764d68fb5f2b907116245e3e83d14084579314af6c58c34be3f74300166c2450e00833fa4ae6d6de057392d3e947a979555add1bc
-AUX scipy-0.12.0-gerqf.patch 731 SHA256 1f3c2723f1094cb6834349f26d40d060ed4e09c722eea876e160fc9ce2b3ced2 SHA512 007bf3d85364c824c03532a07c2678e48c90858d82fa7248cb5139a6f74b853bc4a27e6932638a14bb61e72abbbfd95265e10502c4fd2eb363758f3132722a10 WHIRLPOOL c2d7de949048dcc76e1bf72f2165226b7a741212ef0c6cfc3709ddd91f11fd274ecfcdf62dd47fb11d824d73b41c57d468414b3ef9e8169f7841688f67bcf6af
 AUX scipy-0.12.0-restore-sys-argv.patch 483 SHA256 c00daf7d49c042972d2c59bf645c21f3bc437459a745da758e2548a973000170 SHA512 7c439aa7e1e0ccc7444c2c091ef03d3d39f2999a33ef487224c78e74cd3a1b84bd18a9e92d84ab2cd3fc7578644beb3b667fdaacb20a239600cb9b1765eeb7fc WHIRLPOOL f0d4a84e40ee26399b121f0d9159914d480789c83f749cf060bc65f63df315f27718359df7c13c64ae7a04eea00470ea109b110310abeba79944a90b97ebb102
-AUX scipy-0.14.0-cython-0.22-backport.patch 1272 SHA256 4a09eb0743d95e0215baacb95b18e0a1038bed16eb33a5240181eba35f1b7c73 SHA512 49b3c79a4487a7a3f4cac0a9c50078150bc78e1e4a7656d627e6ed1fdec6c7815b16b193a86cde9d95e9c41e46cb226d678aa47d69bc8656ea7d8f1460ebc3b0 WHIRLPOOL a7c66395e0ba5519eb5457249db514036b213c9fface6377ce7838fb8cf046db95a4367976e4bc2588bd7881b7a74f543c5450c76d2d9541b287af1ee0e64aaf
-AUX scipy-0.14.0-lsqr-backport.patch 3764 SHA256 e5db9922b84a51452afebd22d6783eef982f3c7160dcf543388daef4bacfa7e2 SHA512 7fbf7c257c6f68045b14dd1dfc3518c47aaeff9c027441acec9399b3c02bd0c473512cbd9f5c1eed2ac54ed8c53d4416759ebd946516fa776324e5fa88d182cf WHIRLPOOL f2e57e4743ac3d0623057aed4ab225988613d95d09cf38a0db26ecc6e1cb3e7769006a45539d5e8fb1728b910766c0620b09973b609aef5967bf66bd9cff8d95
-DIST scipy-0.13.0-html.zip 18283054 SHA256 3010783ebdc18988440cd0047f061bbfcac98677782cd10e8b4f09e20bbbc23d SHA512 082cb1e0915f6095f80522a76fed4e106ed82889df613c1bcada9a4faded8917fd7e686448f585a5bee5478280ae21f6adf9bd4add125b9082f93eb93e61feef WHIRLPOOL 48b5e2ee9274f324969c413986110a87422b5f3667b617884dd01c660cdabeb05c5e17ca33e861b2fa2cc5caf89e1233aba9f2855386fe211255c5ceee437ac7
-DIST scipy-0.13.0-ref.pdf 14748179 SHA256 52caa5fd7e74f2e5a78f26296d2150808eee9e153ca3cee62d05892bbd1bac8c SHA512 9e2d40b154c73e9ad3405038e2c71e01650b9a05781355d499b09d647ae6a73d65d542c36b60a87ac530f9b7509bf1c023624952c2f4f2b2f9fb56394456ec91 WHIRLPOOL 5071c593b999db1a57057731e995153fead4155f04b69b770fd1b2203cc5eb13f6f9395a179c4a06e1d8fc5dfa559f51c494f52a27d524b2794d9683e487e273
-DIST scipy-0.14.0.tar.gz 10212944 SHA256 4b41a3e6bf178df1c7f0ef3bfeabf1f56610329aca5dbd7b6d64da8ac9af6b14 SHA512 ad1278740c1dc44c5e1b15335d61c4552b66c0439325ed6eeebc5872a1c0ba3fce1dd8509116b318d01e2d41da2ee49ec168da330a7fafd22511138b29f7235d WHIRLPOOL b15322cef988bbc910794f3b34ee8741edd227f223da4384b3a6471b7a37c1cb3efbacb3f6dde7b6e9929c93e683de5f5898a43d26fadaa2317c433cb3bbec72
-DIST scipy-0.15.0-html.zip 24922467 SHA256 6b7e898ed909d9c3078ccfdf8fcb83cda01979d811d7cac7683f0473a268d3a7 SHA512 bdfe7624ba6a997a7e1f97cbbe860798a135c7d2c603260a1887992a6f64801b1fb505d461a1e101fa3d7d85366380ccf730185609ee10296e957b5407300963 WHIRLPOOL 83f1ea2790319627c7bb8c94e64a6e387505a7d2d3985024b75b0ced09f8bd55ed6995a8fba5342252aec9aa0e2e23aacd65e93fc6ec54c387801a1f98d7097d
-DIST scipy-0.15.0-ref.pdf 18304330 SHA256 baf6475a65abe8da5691b92bcd667c02558951f14cf2985ee29b027a37435605 SHA512 ce32702fe733699db93e00acdcd4adbce7f3ea47bab7538dc11a52fca2df615d3c677f96e2d2043f1808b0724a5d877b250cbf9fa3eb76ea7efcae543f3ca552 WHIRLPOOL 6db972c996d2a166d9ef6585cee2aecb5d977b4b35d301f10b038e01a62abd175a205d591f4347b57f0028961cfe709404eb74499fd88e9baa8bba9b5bbe5929
-DIST scipy-0.15.0.tar.gz 11398495 SHA256 0c74e31e08acc8bf9b6ceb9bced73df2ae0cc76003e0366350bc7b26292bf8b1 SHA512 ca5a9af177d598ca4328a5de9d029858e8e10bc160f88f715bfe351a5747b6c86f9351b9f51a2d8e33f40fc93930c93e2baddec89cd2f4830811bb2f5a04b55a WHIRLPOOL aeea567bf05d1c217e4ce558780f591be9422f0b1df592ac28f1012907bbb3432f4c85fd987944ea89bb334e22a21209f1a6bd54f9a09b215ce79a0f896df47d
 DIST scipy-0.15.1-html.zip 24956050 SHA256 c27d3656ffed1b988890cf192c692f646b00d02a0716122dcf447eff5f186cf2 SHA512 ec8c25d1a8da23a6794315a97177bf3bc1fbac331d562eb2ae6300575eafe040f3ff8d5a884dfe79d7e623313b7b474c095ddb090ce07007cba8fe9bf0fbab27 WHIRLPOOL f4a0a55c209ab3806cf97af74d2948c3f4461d3bdccb36ab1a219a1bcba11c95e1c90f216b36680d161ad24966cbda22356340195f0c13ce23bcafc60a72a279
 DIST scipy-0.15.1-ref.pdf 18313446 SHA256 d96046ddbc91383fb37e3ae2bbdc6945e0c2fc70fa230e0bcda0789e6025ca7e SHA512 9ca6a656e454058273f5153d84acbca42f4ea9b99d0dbfde4a019cbb3ef7e87c4068660bc787506ca749024d45efaea7254614486d56b114c762fc8a69c3b496 WHIRLPOOL b907a6011671b0e0919d48b3e4587fd09cad3f2b463a302e1c9be22facec5f2d599b1eb9497a0cf1e3a0125b3beda0b1e00e7ca2cd40453c49a2df368b9c794e
 DIST scipy-0.15.1.tar.gz 11401878 SHA256 a212cbc3b79e9a563aa45fc5c517b3499198bd7eb7e7be1e047568a5f48c259a SHA512 fff4412d850c431a1b4e6ee3b17958ee5ab3beb81e6cb8a8e7d56d368751eaa8781d7c3e69d932dc002d718fddc66a72098acfe74cfe29ec80b24e6736317275 WHIRLPOOL 31f2f6ca33be1945bedf41f84cf62831c9b22f4d7079d2b0b7b21706b17eb4ab5f3a948be645bcb86a35f3a714e4f277bd66261d02d20d8aeb5077b2095c952f
-EBUILD scipy-0.14.0-r1.ebuild 4020 SHA256 ad524c27ee9345f4baf64aefb7a521b9ea91d9981ac8596c796b4866ba98eae6 SHA512 96983be45932e16a98e03c743ed8543a3f0802abc65b552fa4fb5b7aa03dea645eb01957e4bb5ba9266630754364182f21b4e409d928989e593c5674ba8a550b WHIRLPOOL 77b4a4124b6822f85edca43273c6e9355b833c5e9b8bf3b7b676b6aa449e265989879ca363c9511573f53b6f5b4e48c12524b4f3baf4311008a5192d503b01b3
-EBUILD scipy-0.15.0.ebuild 3888 SHA256 a7ff5593b74412f546f8a75f7d01b2b7c10a95be8757c1b6c2ec0cbdb5ec5488 SHA512 781b3288f5bcf847bcd48ef73f904ac832c6388f35a9be3811a5bbd3027421e4abcb08a79b8fd251481506c870f0d8d12a8b8e9dffe9c1569b5a3997bd2a53aa WHIRLPOOL 03bf867a3eaa436e2c75c09d20ffe1c2d6dd32eb28f9726af0cafeac45dc6abb22c97e4167619b9524f2d7ff04f168e03a41d4eddf97d22950273d88670098ae
 EBUILD scipy-0.15.1.ebuild 3887 SHA256 f5433b5b0bfffebd0ad990b37951dd4ab8869c3523fc6f6d3b7b77e65437adb2 SHA512 8f07b5172dd5b6acd17ca6244cbd83d7a55195831d1a081fa519434f5b172af8d6819079107cbcd7fc3db6d49ba11313df345059f5f8b49b309702dbafb90aa8 WHIRLPOOL 4f95e57b38c3b1eaf2f4f59f6720c103fadc99a028d2ff1dccd15e4caac4aee808461de54dc5b8ffcc8111e4817869e5ded4a243b4c1427223ac70b35bad072d
-MISC ChangeLog 22713 SHA256 908b84555be949c928abb1ab499e3a41bbbcd1495cdad0ccd663cad0bd894c93 SHA512 890f9958140e35853d37aa4f60e3a9df0253626e162475f9eb341194fddb8ec3fa4ac086760690fbaac96939219922b1dcf2701c9da40f624f017a8f163c6633 WHIRLPOOL 2c06215dc60e2fa11825338039d736eec88dc4caa845df63de3595c2a56ea6f3847b01f41464c29bcdcebb5cc2a020b5a556d657f6f0900cc540a01dc9412ee3
+MISC ChangeLog 22999 SHA256 f0106701319d602d2b73fe06303fec82f18016171e88fc26a3d1d3379f0129b5 SHA512 f16c6e9be36419ff8b7ed5d67f396cf55a497b8a42d5d7c8f85fff495dcfa9d02d2ff6278145c34c043c19b400cab1fb8d8ac757df4fb93caa4617d5bc4b38ea WHIRLPOOL a0df272137d650fe4351b96943f07d2b25b7876a4ece85f15b965bc3e325856440533c2443dba12a0b6b39161d6c866f59ecd921440f0bcc2e0205b7927c2651
 MISC metadata.xml 830 SHA256 5df444cebcfa9cf7b27e22f15f8ab7ec772a3f23ed8197da4e3f9f5fac2ecdc2 SHA512 5a4a62650eac8f5b43756c4c149e3c53440dc611b4f485903c8722878e0fdfe5b58da7c7ae587bca772a8392e880d512391813c6dd4176f59e403cea414515cb WHIRLPOOL 8c521f144d90d04b71e8efbd5c6551f25383d7fc08e61223a85ea97e607a5b784d3fffa24d5b1595f964fe7d37ae7835895ef0a20293f823a2583bb268d13ca3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVfyDCXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCgBmBQJViPrZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiwD0QALjyEMRSwg0eo5mOPWU9QBlJ
-oKvOEQjiH6i9KqvaBfrMhdi9/H/DXfw14dl9G3YyCNRH/5xQWujVhPuAiMXSGDVS
-DqgGcraIgrpUe5bDo6QlRpE54jEczqxk2B52RK7dTVkHK7i8G/VjcE1gTxt1id2o
-Jr2JHxvsPnDmbQ5Lb+bo6t1TqbMAipfiHsUaF9F8S+uCIJ3xlQC0lnuWCs9QnkWf
-x3f6OhrngqBLDyGYfK1jGInXVnwTZJokt/FZCLCltRuzPYiVoxFdJY4BXbT6kvQv
-l64pZlRHIb4dA8mOhyIhxBWteG7Olchd/FKpLuem8BKbyPH8BZSbfi0Iy0rNRJrr
-YCK6QiyfCWz/OYKY4p5B9a91FDoj5z+Iagxv2QRjn5/aryvkqZ23ehrSOYiJpHzd
-yv1p8PHwYQvHgNNLnpTOuNnog+p0d3vs51mIUcGS5gCGHeZaWUM2082T+d8jQhA5
-qq8h/UTlGNHUjTP00k6o13IY381V0PL24M+rtDLB2PPSO1H6VvVTivqVxQKyHppO
-WVlSkQ/s4bI4pCYmbZk0pXq6hDEENzuEK5cSv1zjvc716c6cDLGdF0si23XiJOhI
-ZMAcYiNJm+ZaAVZx9lTvdL92mW4NokA8QjKjjKlDzOEML4rDEQtutqXCxpvQMKzb
-g9WGFnDEIQgr/raCcQXF
-=Xc/X
+OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiDOwP/2vHc7yfBPSSC8zRg+r6igPO
+zIYVj5SebLpMZi8MqeFSJTEdQCuKO9pp1uL5L0GTZ1cMYMzhUE616TVGFoIqIcq+
+C0f3qmH9s05/kEvx/ToizZr1mAJljjfpsqw17jGniOA0EgS4WwNtNcgyUnt7owa7
+UoH7vlhlKPl1703j+r5q2eJFkFS4jiWf/x0rEwznVo9DB/wcJdzOWUt9/Lp8WZva
+xngXdNH9PeDJGie98joBctI/GHEwVg0kpzl7EILt4Px5k0SsyZRqtb5PF+g+r365
+x9aWWSb1NJLL0jcL2U9nnMwT2lRPo1UBrQCq/Rg6yVsNCP8GwHQXwjWcSOjjbSGo
+e0/EoBpS27f3Tw+VHMxihEzMx5oOe7L9luCvSISxRWZyccP6khk5UisacayvJIP5
+lCJ1YAx016RcDxStwo3v7Y5c5pi1JeUnHW14CuGapQWvxmGmi6fUqTBSBPgaQmre
+fI39NpuLsy0QEcY0/se1VcpfQdwJ1UQsC879VH1ALomjYCFG3euxONjXGerN8cwi
+bT3eII9fQQfQfdrxxsRCSdrum0Z8EWdF6GbxKxGjUWC6nU+iaMIR4XZ817RhkMPG
+wBnMDC3fYhB+2U926OEa2GXslDWf7aeMM6kTydKwJQTj5/UJtIq5WMB/m/OoNMXJ
+OrSOYcNork3nDgTacEXF
+=Mj2I
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/scipy/files/scipy-0.12.0-cephes-missing-include.patch b/sci-libs/scipy/files/scipy-0.12.0-cephes-missing-include.patch
deleted file mode 100644
index 3bd93ad2bc41..000000000000
--- a/sci-libs/scipy/files/scipy-0.12.0-cephes-missing-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Missing declarations resulting in insecure code
-bicatali - gentoo - 04/2013
---- scipy/special/cephes/gels.c.orig	2013-04-25 09:17:00.578809719 -0700
-+++ scipy/special/cephes/gels.c	2013-04-25 09:17:18.048916759 -0700
-@@ -63,6 +63,7 @@
-  * C     ..................................................................
-  * C
-  */
-+#include <math.h>
- #include "protos.h"
- 
- int gels(A, R, M, EPS, AUX)
diff --git a/sci-libs/scipy/files/scipy-0.12.0-gerqf.patch b/sci-libs/scipy/files/scipy-0.12.0-gerqf.patch
deleted file mode 100644
index cf93c0ec53f0..000000000000
--- a/sci-libs/scipy/files/scipy-0.12.0-gerqf.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up scipy-0.12.0/scipy/linalg/flapack.pyf.src.gerqf scipy-0.12.0/scipy/linalg/flapack.pyf.src
---- scipy-0.12.0/scipy/linalg/flapack.pyf.src.gerqf	2013-04-06 10:10:35.000000000 -0600
-+++ scipy-0.12.0/scipy/linalg/flapack.pyf.src	2013-04-15 17:03:37.290059000 -0600
-@@ -650,7 +650,7 @@ interface
-      <ftype> dimension(m,n),intent(in,out,copy,out=qr,aligned8) :: a
-      <ftype> dimension(MIN(m,n)),intent(out) :: tau
- 
--     integer optional,intent(in),depend(n),check(lwork>=m||lwork==-1) :: lwork=3*m
-+     integer optional,intent(in),depend(m),check(lwork>=m||lwork==-1) :: lwork=3*m
-      <ftype> dimension(MAX(lwork,1)),intent(out),depend(lwork) :: work
-      integer intent(out) :: info
-    end subroutine <prefix>gerqf
diff --git a/sci-libs/scipy/files/scipy-0.14.0-cython-0.22-backport.patch b/sci-libs/scipy/files/scipy-0.14.0-cython-0.22-backport.patch
deleted file mode 100644
index a53f3cd10957..000000000000
--- a/sci-libs/scipy/files/scipy-0.14.0-cython-0.22-backport.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 55ad71112d3dda1656a724118b32afaba73d6dae Mon Sep 17 00:00:00 2001
-From: Ian Henriksen <insertinterestingnamehere@gmail.com>
-Date: Sat, 18 Oct 2014 23:03:34 -0600
-Subject: [PATCH] BUG: Match exception declarations between
- scipy/io/matlab/streams.pyx and scipy/io/matlab/streams.pxd to prevent an
- error in recent versions of cython.
-
----
- scipy/io/matlab/streams.pyx | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/scipy/io/matlab/streams.pyx b/scipy/io/matlab/streams.pyx
-index d74e424..0ca3fc5 100644
---- a/scipy/io/matlab/streams.pyx
-+++ b/scipy/io/matlab/streams.pyx
-@@ -201,7 +201,7 @@ cdef class ZlibInputStream(GenericStream):
-         return (self._max_length == self._read_bytes) and \
-                (self._buffer_size == self._buffer_position)
- 
--    cpdef long int tell(self):
-+    cpdef long int tell(self) except -1:
-         return self._total_position
- 
-     cpdef int seek(self, long int offset, int whence=0) except -1:
-@@ -304,7 +304,7 @@ cdef class FileStream(GenericStream):
-             raise IOError('Failed seek')
-         return ret
- 
--    cpdef long int tell(self):
-+    cpdef long int tell(self) except -1:
-         return ftell(self.file)
- 
-     cdef int read_into(self, void *buf, size_t n) except -1:
--- 
-2.3.1
-
diff --git a/sci-libs/scipy/files/scipy-0.14.0-lsqr-backport.patch b/sci-libs/scipy/files/scipy-0.14.0-lsqr-backport.patch
deleted file mode 100644
index a754e36ab2cf..000000000000
--- a/sci-libs/scipy/files/scipy-0.14.0-lsqr-backport.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 785e3961a685a351bd9d1e8eec0a62035cc4c6aa Mon Sep 17 00:00:00 2001
-From: Olivier Grisel <olivier.grisel@ensta.org>
-Date: Thu, 13 Nov 2014 13:39:35 +0100
-Subject: [PATCH] BUG: ZeroDivisionError in scipy.sparse.linalg.lsqr
-
----
- scipy/sparse/linalg/isolve/lsqr.py            |  6 ++--
- scipy/sparse/linalg/isolve/tests/test_lsqr.py | 51 +++++++++++++++++++++------
- 2 files changed, 45 insertions(+), 12 deletions(-)
-
-diff --git a/scipy/sparse/linalg/isolve/lsqr.py b/scipy/sparse/linalg/isolve/lsqr.py
-index c4a6c02..de5a6b9 100644
---- a/scipy/sparse/linalg/isolve/lsqr.py
-+++ b/scipy/sparse/linalg/isolve/lsqr.py
-@@ -57,6 +57,8 @@
- from math import sqrt
- from scipy.sparse.linalg.interface import aslinearoperator
- 
-+eps = np.finfo(np.float64).eps
-+
- 
- def _sym_ortho(a, b):
-     """
-@@ -432,8 +434,8 @@ def lsqr(A, b, damp=0.0, atol=1e-8, btol=1e-8, conlim=1e8,
-         # Now use these norms to estimate certain other quantities,
-         # some of which will be small near a solution.
-         test1 = rnorm / bnorm
--        test2 = arnorm / (anorm * rnorm)
--        test3 = 1 / acond
-+        test2 = arnorm / (anorm * rnorm + eps)
-+        test3 = 1 / (acond + eps)
-         t1 = test1 / (1 + anorm * xnorm / bnorm)
-         rtol = btol + atol * anorm * xnorm / bnorm
- 
-diff --git a/scipy/sparse/linalg/isolve/tests/test_lsqr.py b/scipy/sparse/linalg/isolve/tests/test_lsqr.py
-index f378cca..626288b 100644
---- a/scipy/sparse/linalg/isolve/tests/test_lsqr.py
-+++ b/scipy/sparse/linalg/isolve/tests/test_lsqr.py
-@@ -1,7 +1,7 @@
- from __future__ import division, print_function, absolute_import
- 
- import numpy as np
--from numpy.testing import assert_
-+from numpy.testing import assert_, assert_equal, assert_array_almost_equal
- from scipy.lib.six import xrange
- 
- import scipy.sparse
-@@ -34,6 +34,46 @@ def test_basic():
-     xo = X[0]
-     assert_(norm(svx - xo) < 1e-5)
- 
-+
-+def test_gh_2466():
-+    row = np.array([0, 0])
-+    col = np.array([0, 1])
-+    val = np.array([1, -1])
-+    A = scipy.sparse.coo_matrix((val, (row, col)), shape=(1, 2))
-+    b = np.asarray([4])
-+    lsqr(A, b)
-+
-+
-+def test_well_conditioned_problems():
-+    # Test that sparse the lsqr solver returns the right solution
-+    # on various problems with different random seeds.
-+    # This is a non-regression test for a potential ZeroDivisionError
-+    # raised when computing the `test2` & `test3` convergence conditions.
-+    n = 10
-+    A_sparse = scipy.sparse.eye(n, n)
-+    A_dense = A_sparse.toarray()
-+
-+    with np.errstate(invalid='raise'):
-+        for seed in range(30):
-+            rng = np.random.RandomState(seed + 10)
-+            beta = rng.rand(n)
-+            beta[beta == 0] = 0.00001  # ensure that all the betas are not null
-+            b = A_sparse * beta[:, np.newaxis]
-+            output = lsqr(A_sparse, b, show=show)
-+
-+            # Check that the termination condition corresponds to an approximate
-+            # solution to Ax = b
-+            assert_equal(output[1], 1)
-+            solution = output[0]
-+
-+            # Check that we recover the ground truth solution
-+            assert_array_almost_equal(solution, beta)
-+
-+            # Sanity check: compare to the dense array solver
-+            reference_solution = np.linalg.solve(A_dense, b).ravel()
-+            assert_array_almost_equal(solution, reference_solution)
-+
-+
- if __name__ == "__main__":
-     svx = np.linalg.solve(G, b)
- 
-@@ -64,12 +104,3 @@ def test_basic():
-     print("")
-     print(" || x_{direct} - x_{LSQR}|| %9.4e " % norm(svx-xo))
-     print("")
--
--
--def test_gh_2466():
--    row = np.array([0, 0])
--    col = np.array([0, 1])
--    val = np.array([1, -1])
--    A = scipy.sparse.coo_matrix((val, (row, col)), shape=(1, 2))
--    b = np.asarray([4])
--    lsqr(A, b)
diff --git a/sci-libs/scipy/scipy-0.14.0-r1.ebuild b/sci-libs/scipy/scipy-0.14.0-r1.ebuild
deleted file mode 100644
index 346dcb176b78..000000000000
--- a/sci-libs/scipy/scipy-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.14.0-r1.ebuild,v 1.4 2015/04/08 18:49:15 mgorny Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_3,3_4} )
-
-DOC_PV=0.13.0
-
-inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html.zip -> ${PN}-${DOC_PV}-html.zip
-		http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref.pdf -> ${PN}-${DOC_PV}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc sparse test"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && 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
-
-	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
-
-	# Drop hashes to force rebuild of cython based .c code
-	rm cythonize.dat || die
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
-		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-		"${FILESDIR}"/${PN}-0.12.0-cephes-missing-include.patch
-		"${FILESDIR}"/${P}-lsqr-backport.patch
-		"${FILESDIR}"/${P}-cython-0.22-backport.patch
-	)
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	"${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast',verbose=2)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc "${DISTDIR}"/${PN}*pdf
-		docinto html
-		dodoc -r "${WORKDIR}"/html/.
-	fi
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}
diff --git a/sci-libs/scipy/scipy-0.15.0.ebuild b/sci-libs/scipy/scipy-0.15.0.ebuild
deleted file mode 100644
index f60d6738d870..000000000000
--- a/sci-libs/scipy/scipy-0.15.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/scipy/scipy-0.15.0.ebuild,v 1.2 2015/03/03 15:18:59 jlec Exp $
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{3,4} )
-
-DOC_PV=0.15.0
-
-inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="http://www.scipy.org/"
-SRC_URI="
-	mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		http://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-ref-${PV}.pdf -> ${PN}-${DOC_PV}-ref.pdf
-	)"
-
-LICENSE="BSD LGPL-2"
-SLOT="0"
-IUSE="doc sparse test"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	dev-python/numpy[lapack,${PYTHON_USEDEP}]
-	sci-libs/arpack:0=
-	virtual/cblas
-	virtual/lapack
-	sparse? ( sci-libs/umfpack:0= )"
-DEPEND="${CDEPEND}
-	dev-lang/swig
-	>=dev-python/cython-0.19.1[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-RDEPEND="${CDEPEND}
-	virtual/python-imaging[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-${DOC_PV}-html.zip -d html || die
-	fi
-}
-
-pc_incdir() {
-	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
-		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libdir() {
-	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
-		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
-}
-
-pc_libs() {
-	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
-		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
-		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
-		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
-}
-
-python_prepare_all() {
-	# scipy automatically detects libraries by default
-	export {FFTW,FFTW3,UMFPACK}=None
-	use sparse && 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
-
-	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
-
-	# Drop hashes to force rebuild of cython based .c code
-	rm cythonize.dat || die
-
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-0.12.0-blitz.patch
-		"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-	)
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile ${SCIPY_FCONFIG}
-}
-
-python_test() {
-	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
-	distutils_install_for_testing ${SCIPY_FCONFIG}
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	"${EPYTHON}" -c "
-import scipy, sys
-r = scipy.test('fast',verbose=2)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		dodoc "${DISTDIR}"/${PN}*pdf
-		docinto html
-		dodoc -r "${WORKDIR}"/html/.
-	fi
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	distutils-r1_python_install ${SCIPY_FCONFIG}
-}
-
-pkg_postinst() {
-	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
-	elog "to your prefered image viewer. Example:"
-	elog "\t echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
-}