gentoo resync : 15.01.2020

10 files changed, 16 insertions, 544 deletions

diff --git a/sci-libs/scipy/Manifest b/sci-libs/scipy/Manifest
index 01e6d4c771e3..33f5523b505e 100644
--- a/sci-libs/scipy/Manifest
+++ b/sci-libs/scipy/Manifest
@@ -1,25 +1,10 @@
-AUX scipy-0.12.0-blitz.patch 731 BLAKE2B 40c16b6db584f178b37a9b8ff6e15142d76f2c74b4e60543d1a8b2300ca10f4e0a9a7d27605c0bb58cecfa8bf6a1d6960956d906a04fc91ee6c3eb1d7d1147c9 SHA512 a788d08d34e13b02a0ec8127fd7918786cd26376ef5160f4acde585c6c1ac018a39652d9174b5e31173aa5c4e0c2f63101549de70806ea7ac56731abe3cb929c
-AUX scipy-0.12.0-restore-sys-argv.patch 483 BLAKE2B 14282423bcbe7838bcc5623b7e731048245207128109fad1f65ab1f3c750b324c0416149bbfe5f16935f6b5627ee82919167897def466e957092cb8e8cbf101b SHA512 7c439aa7e1e0ccc7444c2c091ef03d3d39f2999a33ef487224c78e74cd3a1b84bd18a9e92d84ab2cd3fc7578644beb3b667fdaacb20a239600cb9b1765eeb7fc
-AUX scipy-0.16.1-glibc-2.22-backport.patch 1125 BLAKE2B 912731b28945971c37b8708dbcbb9329d0a0ed310c005677f6c43ce3e64b0340bb0dd0b36e2ecd1895d385b658973caf4917d08d6590197c9316c73256337bff SHA512 50340cbea8ee6a41a1ed60650b56a3d11f450cf182ce86f3d007a4b08069b4b9a4dab7a45cd44a530b0475e6a1fadaad001c9ea32224c16540970a51ac62046a
-DIST scipy-0.16.1-html.zip 33158474 BLAKE2B dfeac8456ea328f293a28c379e3723f8a2fa2e5c47fc2771902083fb89764df9041f71c2ee656fc4c9a00017367f5e4726c798d309f8c2c50dd020c0fd93d168 SHA512 47b1ebd43b58ada7f4fd772e2a94c25d8ee2b03d808743ac386c7fbcc8a1daa3082906156ba421b1dd91ce2fb4f0114639ea124caac7522d919507029fee6c1a
-DIST scipy-0.16.1-ref.pdf 33916573 BLAKE2B 8bb2fbb592168c1233fa0e464cd8ded7ab05f4ab9b27ed54e45a71f1902ea4378ad6099cdbce633364372dfa6c0525f906cff7fab3d38d62f9d8c8b698d96fd9 SHA512 eaf7221c2dcb2cf0bcddcaf6064e52f3d1542edaf0238fa96ae62e27911b275a3bc7ee624fe655b0abd00055312f18582d49cafdccf339f7c38aa93ca5badea9
-DIST scipy-0.16.1.tar.gz 12221561 BLAKE2B 8181330d7e83c75ee3e3b88cdc7736fdedbf0eb410fc237a3aa0d45bc5919d79d2bec8876351dee9c331016371becf6a6a1a0b419e50739e717125334d5512bd SHA512 1761a943a0629179fd546fe3754b16101ca86b98eb0539b73614ea65bce24055ca898f295683eb3f3f63402ebbbb9248aa2a9f6a1d7d6cdf5e1e7486b15c1a8b
-DIST scipy-0.18.1-html.zip 32907714 BLAKE2B e1e32d4472f8bb3064e732689cdbe7055a441e7dea38a0fff37458e4530b841db969fdcad92967d9ee2bc37120ed7dae238365d566363ec6b86a188b6cb2a746 SHA512 fc61ce9a9dcc7091da29d35a42cc38074b0c4f5ff81d5ca5dea9c2d32e5e3ee1e8463fcb4e18c931c0c0e4f00410f8cd16d0f81c219fb326edc20d2286866e03
-DIST scipy-0.18.1-ref.pdf 14824115 BLAKE2B 94ecf2332925adba1f40fbf303a5ec6ecddfb5ab30d25f038945e6c2328cee2e5182f4a8214bd49e7f4cc5af2fa5d6e70b7f6248cbc7964ed38c5479914ce17f SHA512 e668420ae3668f459d15cb88765045c89df02f9c73854c8ddce8fe1611973e8c9d40ac49a1db0342282074b1d46b8156bb75430b7df079efd1c3a6ccb4bf2c37
-DIST scipy-0.18.1.tar.gz 13141689 BLAKE2B b761c2543e962eb04cc9c9651e6c95612e421393a2b3d519a52fbb3dd0f7583972004632429ddbe9ea007248908c937b26050a0579f45472978b2f3629a27c67 SHA512 f2ee21c808141d8002f69e48e7cf006e36982b1a7041323a8f4d803a1de3d191ffcc40227aac351dd876c28843de366ef89e9cf84dc106fadac86a3f40491659
-DIST scipy-0.19.1-html.zip 38201310 BLAKE2B 28ba5538ecfb1a8a6b7676a2b427a320d3fd6e76f591203d25451e4de8e2534ef3bfaee960322d427774459319da3098c70bf69b176641a75eb64e17a53d5690 SHA512 7eecef83a92aa99a726a8839e2cdac1171129ba0efcaf8e36b07d6714fde20cce9ce9f676be6b4835845930c49f740cb11ce0d93012d0b8c990e7061bb3afbcc
-DIST scipy-0.19.1-ref.pdf 17530855 BLAKE2B a0b0011ded7ee1f6bf9944b0c6d474581b64debb192277ebf142ebcc297f8e2f52412a4a8bfb7e618984c0c32233e2a6346d9795565276e08f00be5e782da04f SHA512 79718fde0aedb4c9906b37f2d75878719b614268160e645ad69ea797d6baeecaff9153884171906e6b7673b65da997ff4fd245e0f42ab766497ee9c96f4f9fd2
-DIST scipy-0.19.1.tar.gz 14083805 BLAKE2B 65369ffec2726a8e16da2d6852a71965277b8d4637316a375122e5b6cbf0e05cdcbd3304bcd14ca0b9b6677620a27c0fed6d4924eb8b1726c22ec0ec663feeac SHA512 5c124c44c672dcb53c31f8592fd9f74189f04cb0bade99476a2a6eb4844338e3e9842f27a148b007b7eed25cbfde090a697575a381ebe4ca066abdf54c214203
-DIST scipy-1.0.0-html.zip 47873725 BLAKE2B 0c6c1070e46e644c9e5700a116e700a0ce8d69c1cfaa0ae63ae34af8844db83a7b61c5d072c54bdc23ef7016440ec6d378a45965778c0e8078113bf1a54bade3 SHA512 15d5726ad527bbe3e3e1579d5d2f6031393a2eca8e27adc6f78b16697e9dd67633407a160f461d7a18a8b8bde83201ccf363cdda8f9ca3531b6d6ec1491e0f14
-DIST scipy-1.0.0-ref.pdf 31394378 BLAKE2B bc8e590509cfb4bfda9deab40bbc6ebc919e39cb03a5817040ad2e9bbdfd0acc1a1dc194a88ac890a9052b6ddb3bb7b39292d08d925e3d1eb310605ca0589450 SHA512 657ef3c643ab61a8452dd85982018eb2210cd1531edd152c9b1c3d8c722f8a45ab1efd03f5bbb3c763a75e70e6d39036a845869ec5135f2aa0445480a074f3e0
-DIST scipy-1.0.0.tar.gz 15246397 BLAKE2B 37cd50c59830c91f0516c72cf11b367670faf5c1fe3fd3cf37bc6f30a4b1f44f7b1d124ff7097c3dcb8c32c3876e166ab1caaa3991a637df5f61bb26b0f52c3f SHA512 7d55c5660ac606933d517171a229b288fd0ea8d9fdd8e30fac3d294545a26b2700c7b100b014a93231c4122dee0f1ddd741c00f5902643a6ccc287cdf581da7a
 DIST scipy-1.1.0-html.zip 49851258 BLAKE2B 528df7ed8aa8e56662f436f31ee9e1d6d72d6fe962f9f0f6f84b7a2704b53009ce333b2102ec73bb7795110f8a61b18246aab95b1e21055f2b68c0ff2225b7bb SHA512 a03894a22a67c1359ee6206e9e1c9de1f926a7f829f5039f161e78df735708da09b0e51cdad3bf36bfede701d0bc5dc44f8cc0f249b6bfb80c9d8c9fe23aed46
 DIST scipy-1.1.0-ref.pdf 34360806 BLAKE2B f82807879d5d36d91d74e8983a0f4104bcb4b69cb7787fe5190f73fbbfcb8635a9399686b3c75736d3b0b5dd877b5280ff6fba728520e3b47c13ffc7835f8cd6 SHA512 c792064c986dffafa3c5d0741f30715028e655761d099f0fdd472270cf34642b367dfa2178ddceba13043a471e3aeb1db20d65308dbb40c704dab576aaadeb3e
 DIST scipy-1.1.0.tar.gz 15583560 BLAKE2B 477753e622ee26a3bc8c2cb6829410152df84b29ce17a6d53a66348f5536f7993fedf5d32b782405b54b3af3feabf9bc91c381ed39546076849c2fdb71039404 SHA512 72fe32c6c009613cb78202598e5db14f8e630b3218839cfe18d43d40550d94cc5aa100c6f5d41f40e86ae148e9b6a13431bb91b0f9be44b0569ccd7b725fe973
-EBUILD scipy-0.16.1.ebuild 4271 BLAKE2B ef5b79005a1b1f5e113b5a17e022365106fec169406443065a415ec11ed5d9ce3acb3a18dd1c8c2a2459bbfd446dbfd1025b4e95efb6bd267ad2cff88f47689e SHA512 918c101d0cf1e48026877a2e2801650f6bf9c49e4a1a9f8fd80dde16ac2e2b19fb4fa3d2bd02146abf12d80a8f016e63cf61f8c87359af6cda5262d070fc5b4a
-EBUILD scipy-0.18.1.ebuild 4276 BLAKE2B 8e29bb1a2303220a6741c6d9b77092a367db93585e779f5148b99f3ed9f49f593beda75a4d34f0c4e39749b8be3af199c699c7b28e8e41972974f4f86a9be9db SHA512 65dff5ace5a22c49a214c2cf03971d7882eab86ccac6a3dd4431a6c54acb60d7336004f37897fa2afcc2b47d21791f883f718cef1ba25ae1d2bbc3056554ea30
-EBUILD scipy-0.19.1.ebuild 4271 BLAKE2B 32051e4653b12a7ca2080d4e9eb4c9f8a4f7d59c7f7d315ff439961387723408f8040b684e629b85cc8677000bb1a5b785ca3e2a1e0d0d7fe85a988aafb09d8c SHA512 c73bb1fc086d22b3140d6dfca7a87741fe64f7980ee22688dbe17591fb9e750ddbb5d379941736e4b34e2955b17c8f2876f759c88cb8e2878e1424242548fa2c
-EBUILD scipy-1.0.0.ebuild 4055 BLAKE2B c123e4283168cfd418a72e1e522c600f74b3edc4ae4fdbb225658e5954289e41dd81fde958350184cdeeda75885bead1ea2db43551a42f0a8a077b0bc5ed3650 SHA512 5f9fcb9617369438dc24f5f1420cf26ad22e8a6d6c726de48d19e74da7b3f25c5ecafed8ecc7737b43293ad1c8bdfbbed488ab8459c26787debcc15495a54726
-EBUILD scipy-1.1.0.ebuild 4053 BLAKE2B 26969658226408225eaccc15beb8e72d4add4843345de771f99b7bd5833f467829e84f941848c0ccc5263cc12b234b4fdd02189964e9f006fddc5a14f3737121 SHA512 bbd1cfea32986d6a82a19d936c059d6eb2fe8c36929c60eb5a1298528c12d19171b0c0539cf1ab19d58eaee40a01a2ab0108cd1639ce4dedce7de3782f0f6f8d
-EBUILD scipy-9999.ebuild 3639 BLAKE2B 2afb487266a2d0908da8e9d5e35b2dd4d1923a23eadb478ffaaa3dd29074ade54321ef08bb64c618c8e03f66f46de1be170de03a524b00b7493a20804b45154d SHA512 dfffe88f6670fde4a2a14e3002c146c07ec1fdb84a4cc5bb3317c4c221d4441281ba361b59d9888424b6980180958053796aa1ae5368864f9d45b97adea0a8d0
+DIST scipy-1.4.1-html.zip 61414053 BLAKE2B e1f0c1a7a8941958512dcc3c0f40ef4a590bab0b44b33f842bc6e1c5d103c17f223d8b0a2f4e564f57645d601d4d74005c1ec605be2dd3bf4db19d2ac1f614d1 SHA512 9eeae83cd723d63aa1dc7a610ce3118cb68a2336be24cbfeaa8e57b34de413b2efa2fdad0978eb5bdac0ebca6b15f564b9509637efbd87d1007c969ae954e3ae
+DIST scipy-1.4.1-ref.pdf 41100747 BLAKE2B 8e56af69d0bffbe6eff73bfc5bb674aed3b80bdd80d59b58a1835f996c992306a059c2992d74c411e762490c526262753d33273613ed389928845c65eb6546b2 SHA512 76946f3b506fe22a595b70e5a418982257dd59db1a2e9af508cc1cab59d47ba4fc5951388e676f2a513043a6b3391ef853242e78d7feb99a6c21d19f6dca2b58
+DIST scipy-1.4.1.tar.gz 24555206 BLAKE2B e35f6234404839cbd24d463c8cc2f1ea66aed91534e700fd54a623df40d069b14fc220f96af04c78d13b773bfc5461559e59b0bd9b836d7953f9249ccd7cae54 SHA512 79407a2cbb4ba29c0941570181df4d7835e5791e50a3abef9b63c2fc5b15308a2e4964eb71cdebbee8cd2dcb8e497cf92fe50ee21fb12cac3013ea5e0466b25d
+EBUILD scipy-1.1.0.ebuild 3988 BLAKE2B eb0714420ffe87dcd9d8704316be2feb69e24c4f8c76ada3c6d4c87c7d8617d887f18b030e9dd907ce1b5eb4684932f72a987c2449a9dbcc45270e462e1b8b87 SHA512 85823a954133330fc038e7a9b936b1454d3a2e368d709041f0f9195b9bb839a2e3aeef2f0d2a942b09df265d04cc5d4b474377e57ca4281317340272bfffce16
+EBUILD scipy-1.4.1.ebuild 4043 BLAKE2B 6ad63969c2bffb25b3023d4930b9f056e2b8f0a618f6ab9c990ef6ea8dd83db9f9259bea3f7343baf405f6ff7eaa14fd3a281142d9532d7166a0d3713db71fa6 SHA512 77ecc618cee33a99d1ae3cba3b5e854778acb2ea8c7c6545b660b5d141d49bfbee6b7a9324a684b50fad0c3cf239b9a3b70ca243fe06b782b19521dabbb97873
+EBUILD scipy-9999.ebuild 3601 BLAKE2B 3a86b12c2989b9e64ff97119fbb6cea242179287362010f7d3e82ad0298c207a6318217f81626d18549252383a04cc107861b0283420eae2c1ce990fb7252f18 SHA512 3128f47231149e78818440f2ade24d4ca5c51f8e4a89c93e3e4da2fb2303e60a50f2f65b3c5bc32b42ebd0bd25c77cbb7017f2750367eaf7a21ffd3adcef947a
 MISC metadata.xml 931 BLAKE2B 3e358fcc4354b870a4794f13ed6c840f2c55ffdf4d6306977e6db3606b73e7df9b682a18973f0aa2a1d0d9eabb2d7d40c6aa5c6026813385361700bdc227afd8 SHA512 ae95726c4c661a2e5708a98b347f8ea25708574bbaf8ec86f315069551d6a0d68a43279b214be8b54cd20e5aacea1a9abd40a2de43d51f292a830cab0955d625
diff --git a/sci-libs/scipy/files/scipy-0.12.0-blitz.patch b/sci-libs/scipy/files/scipy-0.12.0-blitz.patch
deleted file mode 100644
index 2817aa39b871..000000000000
--- a/sci-libs/scipy/files/scipy-0.12.0-blitz.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Fixes scipy.weave.inline compalition with g++ 4.3 and upwards
-Author: Sameer Morar <smorar@gmail.com>
-Forwarded: http://projects.scipy.org/scipy/scipy/ticket/739
-Bug-Debian: http://bugs.debian.org/598520
-Bug-Ubuntu: https://launchpad.net/bugs/302649
-
---- a/scipy/weave/blitz/blitz/blitz.h
-+++ b/scipy/weave/blitz/blitz/blitz.h
-@@ -65,6 +65,8 @@
- 
- #define BZ_THROW                     // Needed in <blitz/numinquire.h>
- 
-+#include <cstdlib>
-+
- BZ_NAMESPACE(blitz)
- 
- #ifdef BZ_HAVE_STD
---- a/scipy/weave/blitz/blitz/prettyprint.h
-+++ b/scipy/weave/blitz/blitz/prettyprint.h
-@@ -22,6 +22,8 @@
- #ifndef BZ_PRETTYPRINT_H
- #define BZ_PRETTYPRINT_H
- 
-+#include <cstdlib>
-+
- BZ_NAMESPACE(blitz)
- 
- class prettyPrintFormat {
diff --git a/sci-libs/scipy/files/scipy-0.12.0-restore-sys-argv.patch b/sci-libs/scipy/files/scipy-0.12.0-restore-sys-argv.patch
deleted file mode 100644
index 3eef739f93a8..000000000000
--- a/sci-libs/scipy/files/scipy-0.12.0-restore-sys-argv.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: restore sys.argv in case of exception
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=500814
-
---- a/scipy/weave/build_tools.py
-+++ b/scipy/weave/build_tools.py
-@@ -283,6 +283,9 @@ def build_extension(module_path,compiler
-         configure_python_path(build_dir)
-     except SyntaxError: #TypeError:
-         success = 0
-+    except Exception, e:
-+        restore_sys_argv()
-+        raise e
- 
-     # restore argv after our trick...
-     restore_sys_argv()
diff --git a/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch b/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch
deleted file mode 100644
index 791d67f32531..000000000000
--- a/sci-libs/scipy/files/scipy-0.16.1-glibc-2.22-backport.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1f5ccd5447ed2796bb8e9506cfbfdb4a82cccfc0 Mon Sep 17 00:00:00 2001
-From: Ralf Gommers <ralf.gommers@gmail.com>
-Date: Sat, 24 Oct 2015 18:17:04 +0200
-Subject: [PATCH] TST: fix issue with a ctypes test for integrate on Fedora. 
- Closes gh-5370
-
----
- scipy/integrate/tests/test_quadpack.py | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/scipy/integrate/tests/test_quadpack.py b/scipy/integrate/tests/test_quadpack.py
-index c3a417c..f384c77 100644
---- a/scipy/integrate/tests/test_quadpack.py
-+++ b/scipy/integrate/tests/test_quadpack.py
-@@ -42,7 +42,14 @@ def setUp(self):
-             file = 'libm.dylib'
-         else:
-             file = 'libm.so'
--        self.lib = ctypes.CDLL(file)
-+
-+        try:
-+            self.lib = ctypes.CDLL(file)
-+        except OSError:
-+            # This test doesn't work on some Linux platforms (Fedora for
-+            # example) that put an ld script in libm.so - see gh-5370
-+            self.skipTest("Ctypes can't import libm.so")
-+
-         restype = ctypes.c_double
-         argtypes = (ctypes.c_double,)
-         for name in ['sin', 'cos', 'tan']:
diff --git a/sci-libs/scipy/scipy-0.16.1.ebuild b/sci-libs/scipy/scipy-0.16.1.ebuild
deleted file mode 100644
index f105dde30c6c..000000000000
--- a/sci-libs/scipy/scipy-0.16.1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit eutils fortran-2 distutils-r1 flag-o-matic multilib toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		https://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"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	>=dev-python/numpy-1.6.2[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.22[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )
-	"
-
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${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}"/${P}-glibc-2.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"
-	"${PYTHON}" -c \
-		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
-		|| die
-	# https://github.com/scipy/scipy/issues/5426
-	"${EPYTHON}" -c \
-		"import scipy, sys; r = scipy.test('fast', verbose=2, raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \
-		|| die "Tests fail with ${EPYTHON}"
-#	"${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}-${DOC_PV}-ref.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.18.1.ebuild b/sci-libs/scipy/scipy-0.18.1.ebuild
deleted file mode 100644
index 13d5afa657e8..000000000000
--- a/sci-libs/scipy/scipy-0.18.1.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		https://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"
-RESTRICT="!test? ( test )"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	>=dev-python/numpy-1.10[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.22[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12.0-blitz.patch
-	"${FILESDIR}"/${PN}-0.12.0-restore-sys-argv.patch
-)
-
-src_unpack() {
-	default
-	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 || die
-		[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
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	${EPYTHON} tools/cythonize.py || die
-	distutils-r1_python_compile \
-		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
-		${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"
-	"${PYTHON}" -c \
-		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
-		|| die
-	# https://github.com/scipy/scipy/issues/5426
-	"${EPYTHON}" -c \
-		"import scipy, sys; r = scipy.test('fast', verbose=2, raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \
-		|| die "Tests fail with ${EPYTHON}"
-#	"${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() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	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.19.1.ebuild b/sci-libs/scipy/scipy-0.19.1.ebuild
deleted file mode 100644
index a17473acc3d5..000000000000
--- a/sci-libs/scipy/scipy-0.19.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-DOC_PV=${PV}
-
-inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
-
-DESCRIPTION="Scientific algorithms library for Python"
-HOMEPAGE="https://www.scipy.org/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	doc? (
-		https://docs.scipy.org/doc/${PN}-${DOC_PV}/${PN}-html-${PV}.zip -> ${PN}-${DOC_PV}-html.zip
-		https://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"
-RESTRICT="!test? ( test )"
-KEYWORDS="amd64 ~arm ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-
-CDEPEND="
-	>=dev-python/numpy-1.10[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.22[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
-	virtual/pkgconfig
-	doc? ( app-arch/unzip )
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
-RDEPEND="${CDEPEND}
-	dev-python/pillow[${PYTHON_USEDEP}]"
-
-DOCS=( HACKING.rst.txt THANKS.txt )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_unpack() {
-	default
-	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 || die
-		[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
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	# FIXME: parallel python building fails, bug #614464
-	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
-	${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"
-	"${PYTHON}" -c \
-		'import numpy as np; print("relaxed strides checking:", np.ones((10,1),order="C").flags.f_contiguous)' \
-		|| die
-	# https://github.com/scipy/scipy/issues/5426
-	"${EPYTHON}" -c \
-		"import scipy, sys; r = scipy.test('fast', verbose=2, raise_warnings='release'); sys.exit(0 if r.wasSuccessful() else 1)" \
-		|| die "Tests fail with ${EPYTHON}"
-#	"${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() {
-	use doc && \
-		local DOCS=( "${DISTDIR}"/${PN}-${DOC_PV}-ref.pdf ) \
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-	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-1.1.0.ebuild b/sci-libs/scipy/scipy-1.1.0.ebuild
index acbf180275f3..a676281fbac9 100644
--- a/sci-libs/scipy/scipy-1.1.0.ebuild
+++ b/sci-libs/scipy/scipy-1.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
@@ -107,7 +107,6 @@ python_prepare_all() {
 
 python_compile() {
 	# FIXME: parallel python building fails, bug #614464
-	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
 		${SCIPY_FCONFIG}
diff --git a/sci-libs/scipy/scipy-1.0.0.ebuild b/sci-libs/scipy/scipy-1.4.1.ebuild
index 830587f79c37..a9e7e584875f 100644
--- a/sci-libs/scipy/scipy-1.0.0.ebuild
+++ b/sci-libs/scipy/scipy-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
@@ -33,8 +33,9 @@ CDEPEND="
 	sparse? ( sci-libs/umfpack:0= )"
 DEPEND="${CDEPEND}
 	dev-lang/swig
-	>=dev-python/cython-0.22[${PYTHON_USEDEP}]
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
 	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
 	virtual/pkgconfig
 	doc? ( app-arch/unzip )
 	test? (
@@ -107,7 +108,6 @@ python_prepare_all() {
 
 python_compile() {
 	# FIXME: parallel python building fails, bug #614464
-	# $(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
 		${SCIPY_FCONFIG}
@@ -134,6 +134,7 @@ python_install_all() {
 
 python_install() {
 	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
 }
 
 pkg_postinst() {
diff --git a/sci-libs/scipy/scipy-9999.ebuild b/sci-libs/scipy/scipy-9999.ebuild
index 0e528a35be0e..574e02209628 100644
--- a/sci-libs/scipy/scipy-9999.ebuild
+++ b/sci-libs/scipy/scipy-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 DOC_PV=${PV}
@@ -93,7 +93,7 @@ python_prepare_all() {
 python_compile() {
 	${EPYTHON} tools/cythonize.py || die
 	distutils-r1_python_compile \
-		$(usex python_targets_python3_5 "" "-j $(makeopts_jobs)") \
+		"-j $(makeopts_jobs)" \
 		${SCIPY_FCONFIG}
 }