Updating liguros repo

author: Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net> 2020-09-18 13:33:43 +0000
committer: Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net> 2020-09-18 13:33:43 +0000
commit: 87d914a08f6691238dcbaa533591a2528ac1fb74 (patch)
tree: 7ad9d88448a94a0099109d973e4ce65e03e51635 /dev-python
parent: 1f4c7ae255b08da068ccd254024f1850e8c577cf (diff)
download: baldeagleos-repo-87d914a08f6691238dcbaa533591a2528ac1fb74.tar.gz
baldeagleos-repo-87d914a08f6691238dcbaa533591a2528ac1fb74.tar.xz
baldeagleos-repo-87d914a08f6691238dcbaa533591a2528ac1fb74.zip
90 files changed, 1022 insertions, 219 deletions
diff --git a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
index 1e6fe2b251f8..c77ffd75bee9 100644
--- a/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
+++ b/dev-python/GridDataFormats/GridDataFormats-0.4.0-r1.ebuild
@@ -19,4 +19,4 @@ IUSE=""
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="
 	>=dev-python/numpy-1.0.3[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	dev-python/scipy[${PYTHON_USEDEP}]"
diff --git a/dev-python/bcrypt/bcrypt-3.2.0.ebuild b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
index 654dd52b6c59..cc7c5e178ede 100644
--- a/dev-python/bcrypt/bcrypt-3.2.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2046bf9a0358..37c2bdadc6b6 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,3 +8,4 @@ DIST boto3-1.14.57.tar.gz 334506 BLAKE2B ba422426f36c55eb78e057d886abdb9a435839b
 DIST boto3-1.14.59.tar.gz 334641 BLAKE2B 96cd0750521715f030c2668cf21b7d6e5f53ffb9bcb84bc9fc540b1bea911591880385a3bd31447f924aa24cbdce873d17241d921b87e57d109173062dd27678 SHA512 9dddad6c71bac90803402b35a316f7177c26629e7e1b3cdadc6222e890d89dce4c2941174501705da85209220fe741f788654f5db164b2d9eac26cbba7cfb0d5
 DIST boto3-1.14.61.tar.gz 334755 BLAKE2B f0c5b5e9f74abaab03789deae1bbf9c5957d5d54af5cdc0c3a21deaed4945e104abeb59305ec1c692f2bcd2e99f7806ea4bd7fb9ae6194f194d74c9eeac4bf0a SHA512 6bec490d4d976585c5a8522998a4b3538dfdfc53416844779dbede2faa7d0d45bb10a6a566a777eaccd5d630202f6217178a386fbf3de5ef3c6395cda583f413
 DIST boto3-1.14.63.tar.gz 334965 BLAKE2B 370a1d5bcc32ba6fd8f187fa56fbb3afa4aafa0692245efe024efdefb3d0a314b24873f641b3789430d6a64df70e55743a73760b8282ecaeb64116d9c27b82bc SHA512 668ec7a40d7be74268005d342b568e2d0efe0a3aafca7123c27e966fd89334dbdab04bca0a7ab216eae1f26f0506ef4ccacead49b1714a94a84c7a315e71e505
+DIST boto3-1.15.0.tar.gz 335099 BLAKE2B 0cdf8cc0007a90671d4d3c66482d834e24860990bf46634bf542e2e2a025a661d7a45d6be33932581e2697daf5829ca7f47021f863b4219cd3287650bb1ebaa4 SHA512 ed0ddbd4372d591062ef0ce102e6c913842c70921486b09ba1c2901a28d02cf0c41917e246a3654c43382254be32aa5242667199f8a0c2bb9293d7e2cc3827a5
diff --git a/dev-python/boto3/boto3-1.15.0.ebuild b/dev-python/boto3/boto3-1.15.0.ebuild
new file mode 100644
index 000000000000..12584b2fba42
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index e0316f816cef..9fba0db04f4e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,3 +8,4 @@ DIST botocore-1.17.57.tar.gz 6815839 BLAKE2B e135e4d0b889add8417d8a6ce97c4758658
 DIST botocore-1.17.59.tar.gz 6829639 BLAKE2B efacd4c875e17f187abd5c4602a82229ed2a9fd78e1987f1b540eb882d1a3ce7c23768f7f4b9dc26a678ff4ce48264f3893c0aa2a68511823f79686c21ecf82f SHA512 609eb24774384b95dd9b5bcf5931d263341fbbba90b84159c6833296c22d95c6cf8d304d6908713d9ba826858d8d226e0b5c700bb1410c3a9f7b2d679f535c40
 DIST botocore-1.17.61.tar.gz 6832886 BLAKE2B 1c63507dea98f4f4275effe190e7af1e3325ee03376676bdbab6eeca364540bd86c7253b1ab64a70d28cf2f5ae8182927c2f18ac86e0bac813d4ef11c37193c6 SHA512 606076103594fb6efee1fa79181449c0ffa37eb71b5f5c187f8046375ddf982f72741ba00a1d2311be893094b86dd9196ee33410a693727ea9502cf87332dcc0
 DIST botocore-1.17.63.tar.gz 6841028 BLAKE2B 89b2d5d520e733deaf3c4b68faa103e4227107cebd3803d1cb6e47ec0df9f7a07d72eb24836a45762ead2ce1aa381d5b1dfcc33eb9a80c5f8d021c0dbfb631c3 SHA512 e4cf3fbb4c8a5c05dc8265b67fbba0bf03dcf12d28bcd0e1dd304392614d86f061a5115f8129eefa2fa44efab17a8720b7c39c082c2908bf4e29bbefb57e92fb
+DIST botocore-1.18.0.tar.gz 6838497 BLAKE2B efc0930b8ffafdf8d7f24d4f30cbf12e0dd81aa4ae405beee7663271fe8ffe680df91d40f8629b75635fae87ad29f0186e42f11e4bfebc64cc58979edd74e64b SHA512 43b5992d1ffb8d10f32f532c3085825e3775e3da4d6c25c2e300dfcd6e24967bdd318a7be37889a9d7802eb74bd9085b9642cda099b0064cbd9ffd65a56b7de5
diff --git a/dev-python/botocore/botocore-1.18.0.ebuild b/dev-python/botocore/botocore-1.18.0.ebuild
new file mode 100644
index 000000000000..12940d28a2af
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
index 4dc077d582de..8fc811c15fde 100644
--- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
@@ -18,7 +18,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/cheroot-8.4.2.ebuild b/dev-python/cheroot/cheroot-8.4.2.ebuild
index 7535b75cfbe8..dd41cad46d2d 100644
--- a/dev-python/cheroot/cheroot-8.4.2.ebuild
+++ b/dev-python/cheroot/cheroot-8.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cheroot/cheroot-8.4.4.ebuild b/dev-python/cheroot/cheroot-8.4.4.ebuild
index 233a4ba09ff3..dd41cad46d2d 100644
--- a/dev-python/cheroot/cheroot-8.4.4.ebuild
+++ b/dev-python/cheroot/cheroot-8.4.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index 6dedb189957a..d834048e6933 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/coverage/coverage-5.2.1.ebuild b/dev-python/coverage/coverage-5.2.1.ebuild
index 7592d4f9adc6..44b7c17141ba 100644
--- a/dev-python/coverage/coverage-5.2.1.ebuild
+++ b/dev-python/coverage/coverage-5.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 #IUSE="test"
 # The tests are impossible to appease.  Please run them externally
 # via tox.  Or fix the ebuild if you have hours of time to spend
diff --git a/dev-python/cryptography/cryptography-3.0.ebuild b/dev-python/cryptography/cryptography-3.0.ebuild
index 677302919331..3f300b10c9e2 100644
--- a/dev-python/cryptography/cryptography-3.0.ebuild
+++ b/dev-python/cryptography/cryptography-3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
index bcecd2c034f7..02a297bcb01e 100644
--- a/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
+++ b/dev-python/ctypesgen/ctypesgen-1.0.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/davidjamesca/ctypesgen/archive/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-python/dask/dask-1.2.0.ebuild b/dev-python/dask/dask-1.2.0.ebuild
index b6fdcd714f54..29c8078a965e 100644
--- a/dev-python/dask/dask-1.2.0.ebuild
+++ b/dev-python/dask/dask-1.2.0.ebuild
@@ -36,7 +36,7 @@ DEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/pyyaml[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/dask/dask-2.22.0.ebuild b/dev-python/dask/dask-2.22.0.ebuild
index 4b245487d2dc..bff87c8542d0 100644
--- a/dev-python/dask/dask-2.22.0.ebuild
+++ b/dev-python/dask/dask-2.22.0.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/dask/dask-2.23.0.ebuild b/dev-python/dask/dask-2.23.0.ebuild
index 0f1fbaa361c9..e793b1c9b450 100644
--- a/dev-python/dask/dask-2.23.0.ebuild
+++ b/dev-python/dask/dask-2.23.0.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/dask/dask-2.24.0.ebuild b/dev-python/dask/dask-2.24.0.ebuild
index 6532172bba6f..4d6e733f4d5e 100644
--- a/dev-python/dask/dask-2.24.0.ebuild
+++ b/dev-python/dask/dask-2.24.0.ebuild
@@ -34,7 +34,7 @@ BDEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/dask/dask-2.25.0.ebuild b/dev-python/dask/dask-2.25.0.ebuild
index 3ae5fd93e483..ce2731364bfb 100644
--- a/dev-python/dask/dask-2.25.0.ebuild
+++ b/dev-python/dask/dask-2.25.0.ebuild
@@ -30,7 +30,7 @@ BDEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/dask/dask-2.26.0.ebuild b/dev-python/dask/dask-2.26.0.ebuild
index 1253005cebfd..9d6b154fc0d5 100644
--- a/dev-python/dask/dask-2.26.0.ebuild
+++ b/dev-python/dask/dask-2.26.0.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 		dev-python/numexpr[${PYTHON_USEDEP}]
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/eventlet/eventlet-0.26.1.ebuild b/dev-python/eventlet/eventlet-0.26.1.ebuild
index ef25441c6899..888bbee1f73b 100644
--- a/dev-python/eventlet/eventlet-0.26.1.ebuild
+++ b/dev-python/eventlet/eventlet-0.26.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 ~sparc x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild b/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
index ef221b8560b8..cf1f2b1e2caa 100644
--- a/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.0_beta1.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/graph-tool/graph-tool-2.29.ebuild b/dev-python/graph-tool/graph-tool-2.29.ebuild
index 39174ab82dee..88ebd5616678 100644
--- a/dev-python/graph-tool/graph-tool-2.29.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.29.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
 	dev-libs/expat:=
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	sci-mathematics/cgal:=
 	cairo? (
 		dev-cpp/cairomm
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 39174ab82dee..88ebd5616678 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	>=dev-libs/boost-1.70:=[context,python,${PYTHON_USEDEP}]
 	dev-libs/expat:=
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	sci-mathematics/cgal:=
 	cairo? (
 		dev-cpp/cairomm
diff --git a/dev-python/helpdev/helpdev-0.7.1.ebuild b/dev-python/helpdev/helpdev-0.7.1.ebuild
index 9620664d30b2..38e1a70e2eb2 100644
--- a/dev-python/helpdev/helpdev-0.7.1.ebuild
+++ b/dev-python/helpdev/helpdev-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_{6,7,8} )
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 8bc98bd01ab7..11855509c0ae 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,6 +1,4 @@
 DIST hypothesis-python-4.57.1.tar.gz 9005030 BLAKE2B 3d318896cbe2d24fa6847e764a109791d3acf3821852f8e170991b0be5b069f166e16bdacf7a82fbe49bd9db5188315cdec7cdb4592647571233949ec5732991 SHA512 28622ce8a1d89d09df65f3fbf7e92a1ad98dac140ab646fe11fcb15e6aa9a9672eb51d459f984384d92b819f902de911b06cec2542582d529dd556d2f99ed952
 DIST hypothesis-python-5.24.4.tar.gz 9054743 BLAKE2B 5c64c86ed58d8f0e4a07390b1b1b5e405878b9632bf14233e0515ad9d98ec6ddcc57bf39be6b61f53739d34e393b3af64c0d362880019d29a649a9523a0204e3 SHA512 147f4fa47b54bf3ec4dfcebf2a6c98cee26ea6780244ef99e181bada65978375ca7731ed05cb98f1b92f7a44a357faae374d97d489ec6e2318ff94e526cd9a40
 DIST hypothesis-python-5.29.4.tar.gz 9071060 BLAKE2B 0668f3c7859fae7024c15f693b1f56ce8d02d6f3b8187d24b2d84e38e7bdb73c0824d2b02cfecc6b40bdfbbb1c91c0aa83d40848c499a97ab7e9223aaa6c78d4 SHA512 9da4b487fd3c56540a20e2fbff635704f0720f422d8a398d0accd24a1fb9517476b0d29135b9113a96e8dc98fcfc31cc53215ad82cb727be54e4e77b44d4c8e4
-DIST hypothesis-python-5.35.0.tar.gz 9081292 BLAKE2B 8f1d50d76f589103f7b734cea6008b3533d3c0d62f45ab95a71f079833cb20b766d398a1b9492d592a93156d097d58c14041caf609f035b547f2234cbef2d602 SHA512 e99ce4c2801341fc43c4290afb551bcae69e0747a6b98a633b284bce009cc18d978b75a23bf22dafb39c5020595159806d5627128577770be3aad72a022549a3
-DIST hypothesis-python-5.35.2.tar.gz 9082095 BLAKE2B 6d2d2f74519975455a6d73f5d006837f7f71d162c5fe84c33afe81c7a110ecd93d2643db5b1ed8b00aec212c5c311254dcfbd66ae5bd08b077335a3754c9e9b4 SHA512 f17b7783d689986703bc6755a7dc30e8bfd4977a128954481067780d14b1b3f4bbfb21751a607a215357b5d300ad4e06ce951b81059ac8638c84005d682e2398
 DIST hypothesis-python-5.35.3.tar.gz 9084707 BLAKE2B ff0638194067a1c52a0297254be572ba66d67afa49c1f2fbcc42bff694ab4fe545d408d9144118314a6decfdffdbe950e2b72e89b689ae99b82ad3d3321e72fd SHA512 d862cba17444b36fa05877419495b5e49e8686980e0203da388e2dc4e528ace928f0bcb244afc8512f97bf466f2e5a2a421a2c873053849af61de71421d5c61a
diff --git a/dev-python/hypothesis/hypothesis-5.35.0.ebuild b/dev-python/hypothesis/hypothesis-5.35.0.ebuild
deleted file mode 100644
index f7a7e61736bf..000000000000
--- a/dev-python/hypothesis/hypothesis-5.35.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{6..9})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-5.35.2.ebuild b/dev-python/hypothesis/hypothesis-5.35.2.ebuild
deleted file mode 100644
index f7a7e61736bf..000000000000
--- a/dev-python/hypothesis/hypothesis-5.35.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{5,6,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+),sqlite"
-
-inherit distutils-r1 eutils multiprocessing optfeature
-
-DESCRIPTION="A library for property based testing"
-HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
-SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="cli test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
-	cli? (
-		$(python_gen_cond_dep '
-			dev-python/black[${PYTHON_USEDEP}]
-			dev-python/click[${PYTHON_USEDEP}]
-		' python3_{6..9})
-	)
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/intervaltree/intervaltree-3.0.2.ebuild b/dev-python/intervaltree/intervaltree-3.0.2.ebuild
index 49e79f982811..04596dcbd0dc 100644
--- a/dev-python/intervaltree/intervaltree-3.0.2.ebuild
+++ b/dev-python/intervaltree/intervaltree-3.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/sortedcontainers[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild b/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
index a092f3959161..24a471a2af8f 100644
--- a/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
+++ b/dev-python/jaraco-context/jaraco-context-3.0.0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
diff --git a/dev-python/llvmlite/llvmlite-0.34.0.ebuild b/dev-python/llvmlite/llvmlite-0.34.0.ebuild
index dee76c4cdcc7..7c7212f71def 100644
--- a/dev-python/llvmlite/llvmlite-0.34.0.ebuild
+++ b/dev-python/llvmlite/llvmlite-0.34.0.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/${P/_/}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 LLVM_MAX_SLOT=10
diff --git a/dev-python/lmfit/lmfit-1.0.1.ebuild b/dev-python/lmfit/lmfit-1.0.1.ebuild
index 0cbd84d84fbc..157f2c53a827 100644
--- a/dev-python/lmfit/lmfit-1.0.1.ebuild
+++ b/dev-python/lmfit/lmfit-1.0.1.ebuild
@@ -18,7 +18,7 @@ BDEPEND="
 	>=dev-python/asteval-0.9.16[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
 	>=dev-python/uncertainties-3.0.1[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.2[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.2[${PYTHON_USEDEP}]
 "
 RDEPEND="${DEPEND}"
 
diff --git a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
index eea2abbc7115..85310bdc97d6 100644
--- a/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.2.2-r2.ebuild
@@ -81,7 +81,7 @@ BDEPEND="
 		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
 		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
index 49171fc094c8..cd1feb7a4db2 100644
--- a/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.0-r1.ebuild
@@ -81,7 +81,7 @@ BDEPEND="
 		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
 		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild b/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
index ac48ec5d07ed..7182a59a1215 100644
--- a/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.1-r2.ebuild
@@ -82,7 +82,7 @@ BDEPEND="
 		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
 		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/matplotlib/matplotlib-3.3.2.ebuild b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
index d61638774dab..29933816c356 100644
--- a/dev-python/matplotlib/matplotlib-3.3.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.3.2.ebuild
@@ -82,7 +82,7 @@ BDEPEND="
 		>=dev-python/colorspacious-1.1.2[${PYTHON_USEDEP}]
 		>=dev-python/ipython-1.18.2[${PYTHON_USEDEP}]
 		>=dev-python/numpydoc-0.9.2[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.3.1[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-gallery-0.3.1-r1[${PYTHON_USEDEP}]
 		>=dev-python/xlwt-1.3.0-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/moviepy/moviepy-1.0.1-r1.ebuild b/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
index dc6c79f6a875..ff8c890345a9 100644
--- a/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
+++ b/dev-python/moviepy/moviepy-1.0.1-r1.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
 	dev-python/pygame[${PYTHON_USEDEP}]
 	dev-python/tqdm[${PYTHON_USEDEP}]
 	dev-python/urllib3[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	media-video/ffmpeg
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/networkx/networkx-2.4-r1.ebuild b/dev-python/networkx/networkx-2.4-r1.ebuild
index 0bf08d330e6e..76600402dd01 100644
--- a/dev-python/networkx/networkx-2.4-r1.ebuild
+++ b/dev-python/networkx/networkx-2.4-r1.ebuild
@@ -29,11 +29,11 @@ RDEPEND="
 	pandas? (
 		>=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
 	)
-	scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
+	scipy? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )
 	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
 	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
 BDEPEND="
-	test? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )"
+	test? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/networkx/networkx-2.5.ebuild b/dev-python/networkx/networkx-2.5.ebuild
index 8598f8979aeb..80723c9a2a6d 100644
--- a/dev-python/networkx/networkx-2.5.ebuild
+++ b/dev-python/networkx/networkx-2.5.ebuild
@@ -29,12 +29,12 @@ RDEPEND="
 	pandas? (
 		>=dev-python/pandas-0.23.3[${PYTHON_USEDEP}]
 	)
-	scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
+	scipy? ( >=dev-python/scipy-1.1.0[${PYTHON_USEDEP}] )
 	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
 	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
 BDEPEND="
 	test? (
-		>=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.1.0[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5.ebuild
index c66c4b3f2d44..ea9d5cd08718 100644
--- a/dev-python/nltk/nltk-3.5.ebuild
+++ b/dev-python/nltk/nltk-3.5.ebuild
@@ -32,7 +32,7 @@ BDEPEND="
 		dev-python/pyparsing[${PYTHON_USEDEP}]
 		dev-python/twython[${PYTHON_USEDEP}]
 		sci-libs/scikits_learn[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 	)"
 PDEPEND="dev-python/nltk-data"
 
diff --git a/dev-python/nose/nose-1.3.7-r5.ebuild b/dev-python/nose/nose-1.3.7-r6.ebuild
index 271fddfa4149..0bdd1c4916c4 100644
--- a/dev-python/nose/nose-1.3.7-r5.ebuild
+++ b/dev-python/nose/nose-1.3.7-r6.ebuild
@@ -61,6 +61,9 @@ python_prepare_all() {
 	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
 		-i setup.py || die "sed2 failed"
 
+	# fix manpage install path
+	sed -i -e 's:man/:share/&:' setup.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pandas/pandas-1.0.5.ebuild b/dev-python/pandas/pandas-1.0.5.ebuild
index f878cdd063a4..1edb18b47d0b 100644
--- a/dev-python/pandas/pandas-1.0.5.ebuild
+++ b/dev-python/pandas/pandas-1.0.5.ebuild
@@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
@@ -84,7 +84,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
 	test? (
@@ -170,6 +170,6 @@ pkg_postinst() {
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "miscellaneous statistical functions" dev-python/scipy
 	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
 }
diff --git a/dev-python/pandas/pandas-1.1.0.ebuild b/dev-python/pandas/pandas-1.1.0.ebuild
index 18ea29c3c49f..44bf86f5b8b5 100644
--- a/dev-python/pandas/pandas-1.1.0.ebuild
+++ b/dev-python/pandas/pandas-1.1.0.ebuild
@@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
@@ -83,7 +83,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
 	test? (
@@ -172,6 +172,6 @@ pkg_postinst() {
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "miscellaneous statistical functions" dev-python/scipy
 	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
 }
diff --git a/dev-python/pandas/pandas-1.1.1.ebuild b/dev-python/pandas/pandas-1.1.1.ebuild
index 91ad11b9ec63..4582a543d5f4 100644
--- a/dev-python/pandas/pandas-1.1.1.ebuild
+++ b/dev-python/pandas/pandas-1.1.1.ebuild
@@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
@@ -83,7 +83,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
 	test? (
@@ -176,6 +176,6 @@ pkg_postinst() {
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "miscellaneous statistical functions" dev-python/scipy
 	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
 }
diff --git a/dev-python/pandas/pandas-1.1.2.ebuild b/dev-python/pandas/pandas-1.1.2.ebuild
index 91ad11b9ec63..4582a543d5f4 100644
--- a/dev-python/pandas/pandas-1.1.2.ebuild
+++ b/dev-python/pandas/pandas-1.1.2.ebuild
@@ -50,7 +50,7 @@ OPTIONAL_DEPEND="
 	>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
 	>=dev-python/xlrd-1.0.0[${PYTHON_USEDEP}]
 	dev-python/xlwt[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	X? (
 		|| (
 			dev-python/PyQt5[${PYTHON_USEDEP}]
@@ -83,7 +83,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		dev-python/xlrd[${PYTHON_USEDEP}]
 		dev-python/xlwt[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
 		x11-misc/xclip
 	)
 	test? (
@@ -176,6 +176,6 @@ pkg_postinst() {
 	optfeature "R I/O support" dev-python/rpy
 	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
 	optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
-	optfeature "miscellaneous statistical functions" sci-libs/scipy
+	optfeature "miscellaneous statistical functions" dev-python/scipy
 	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
 }
diff --git a/dev-python/patsy/patsy-0.5.1.ebuild b/dev-python/patsy/patsy-0.5.1.ebuild
index b73e70bdbbc5..490490d30976 100644
--- a/dev-python/patsy/patsy-0.5.1.ebuild
+++ b/dev-python/patsy/patsy-0.5.1.ebuild
@@ -18,7 +18,7 @@ IUSE="doc"
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	"
 BDEPEND="
 	doc? (
diff --git a/dev-python/pip/pip-20.2.2.ebuild b/dev-python/pip/pip-20.2.2.ebuild
index 68fc06fc2a54..fa3cc2f66cb6 100644
--- a/dev-python/pip/pip-20.2.2.ebuild
+++ b/dev-python/pip/pip-20.2.2.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/progressbar/progressbar-2.5.ebuild b/dev-python/progressbar/progressbar-2.5.ebuild
index 32ef4e869c55..9f1653bde78b 100644
--- a/dev-python/progressbar/progressbar-2.5.ebuild
+++ b/dev-python/progressbar/progressbar-2.5.ebuild
@@ -14,7 +14,3 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="|| ( LGPL-2.1 BSD )"
 SLOT="0"
 KEYWORDS="amd64 ~arm ppc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${BDEPEND}"
diff --git a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
index a066ef684979..7daa475b88f4 100644
--- a/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
+++ b/dev-python/pslab-python/pslab-python-1.0.1-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="amd64"
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pyqtgraph[${PYTHON_USEDEP}]
 	dev-python/pyserial[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]"
+	dev-python/scipy[${PYTHON_USEDEP}]"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.1-sys_version.patch
diff --git a/dev-python/pweave/pweave-0.30.3-r1.ebuild b/dev-python/pweave/pweave-0.30.3-r1.ebuild
index 034cf84ea847..a30467d236a5 100644
--- a/dev-python/pweave/pweave-0.30.3-r1.ebuild
+++ b/dev-python/pweave/pweave-0.30.3-r1.ebuild
@@ -40,7 +40,7 @@ DEPEND="test? (
 	dev-python/matplotlib[${PYTHON_USEDEP}]
 	dev-python/nose[${PYTHON_USEDEP}]
 	dev-python/notebook[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}] )"
+	dev-python/scipy[${PYTHON_USEDEP}] )"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
index b873e30db9b6..7b9f55a81de3 100644
--- a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
+++ b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )
diff --git a/dev-python/pymongo/pymongo-3.11.0.ebuild b/dev-python/pymongo/pymongo-3.11.0.ebuild
index 6da198b622bf..8b9626192f5e 100644
--- a/dev-python/pymongo/pymongo-3.11.0.ebuild
+++ b/dev-python/pymongo/pymongo-3.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~hppa ~x86"
+KEYWORDS="amd64 ~arm64 ~hppa x86"
 IUSE="doc kerberos test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pypam/pypam-0.5.0-r5.ebuild b/dev-python/pypam/pypam-0.5.0-r5.ebuild
index 90cecef6ec4e..2ab45d1b266a 100644
--- a/dev-python/pypam/pypam-0.5.0-r5.ebuild
+++ b/dev-python/pypam/pypam-0.5.0-r5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.pangalactic.org/PyPAM/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 DEPEND=">=sys-libs/pam-0.64"
diff --git a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
index d8e1ad680127..dddaf2a72307 100644
--- a/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
+++ b/dev-python/pyqtgraph/pyqtgraph-0.11.0_rc0.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 x86"
 IUSE="examples opengl svg"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/PyQt5[gui,widgets,opengl=,svg=,${PYTHON_USEDEP}]
 	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
index a3652a64bcd8..9fec121462ec 100644
--- a/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
+++ b/dev-python/pytest-lazy-fixture/pytest-lazy-fixture-0.6.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/flake8[${PYTHON_USEDEP}]
diff --git a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
index bbc94077655f..10f9fb4bd562 100644
--- a/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
+++ b/dev-python/python-jsonrpc-server/python-jsonrpc-server-0.3.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/quex/quex-0.71.0-r1.ebuild b/dev-python/quex/quex-0.71.0-r1.ebuild
index a745803ff725..8f242d5ec38b 100644
--- a/dev-python/quex/quex-0.71.0-r1.ebuild
+++ b/dev-python/quex/quex-0.71.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/responses/responses-0.12.0.ebuild b/dev-python/responses/responses-0.12.0.ebuild
index 46d19bc61ab9..f3294ea09b6a 100644
--- a/dev-python/responses/responses-0.12.0.ebuild
+++ b/dev-python/responses/responses-0.12.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/rope/rope-0.17.0.ebuild b/dev-python/rope/rope-0.17.0.ebuild
index 5667d33f73f1..fb62f39955ee 100644
--- a/dev-python/rope/rope-0.17.0.ebuild
+++ b/dev-python/rope/rope-0.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 IUSE="doc"
 
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
new file mode 100644
index 000000000000..9ed4593e3fc8
--- /dev/null
+++ b/dev-python/scipy/Manifest
@@ -0,0 +1,15 @@
+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
+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
+DIST scipy-1.5.0-html.zip 23579592 BLAKE2B 6e35a881967d38db67278d6990fbb1912238bca05c7064585aaaf849861371680c2cd5d3e9a150301c29984aa12db0eeebf5f23cb7d2a438edb28fed9654ac79 SHA512 a1dcf9c2d003b1f722a216c8bf0fda7022765c01505343e86da64ec9a4dbda4eb7da74ad09147e5b79e610f090740d19bda6017d6f894f2566547a42e8aa97b3
+DIST scipy-1.5.0-ref.pdf 33694300 BLAKE2B a7701cdfd8f6da71b59efcefca5c080426b175976429cb64d47f05f42795fea3abb6764c2e2d1807f215c9e00ccd5b2de254f1c68269b266492dfaf76f887972 SHA512 3208ab84421fbec0597931c6050666e9da7d21c6e73a685f084e9570a39539e9c2e5f7fbdfe27951b2ba8e51a1bc42b06ddd6c906a6a13c81a34a16dc0672dda
+DIST scipy-1.5.0.tar.gz 25573194 BLAKE2B f505e5f0627687aeefe0af0886b03eead9f6426f17bca21a3f73cc0d4957ac574e0123b86424ccf0d5f8f4a963b707a1443ddcd6e149f2a4e747daa55b1be95c SHA512 4c981a3125a88593cbc5a17417022a5db8f6ccb4c1c24e78afeb9bb26428b81d2d0fe9965caa418753b1bbbda2fa30533fa1307aac6ab168458d68f7b46049be
+DIST scipy-1.5.1-html.zip 23582280 BLAKE2B 97b256bc7367836f35ce7e0ac47436dd72c1afe249dea1a2f437ea883e74ecb8f5bbe22e20bb804aac66b86fb35e8b4f0e329c44d9d601318ef1accc82e8e850 SHA512 eb0c7736d2bdc9f45926d19f4a22e1168d0f06e21b338cd7e7884af79c7634885350c510251d4cd1629b2a294003e93f8e71bafd8ec64c1aea4d4174c3946597
+DIST scipy-1.5.1-ref.pdf 33698325 BLAKE2B 6ff0d13474acf2960352580765c86ef54faa9bb616b4b8097665fa3b8a3a6033acb524d5bb76757b23d0ea9550b556293509a91e5cbeb7b0a388ea75d1bec29b SHA512 c0fbebb5dec19aebe7783507ccebf28134227096caad915e1f28f963386a07b1246fa624e4680691809c5ba31a09d3dd6e4f27f9e86f5985f8a7eecb1eea82d3
+DIST scipy-1.5.1.tar.gz 25575560 BLAKE2B e431a54f1810590b75d0f115bdbcd3c561d0d918664d91654fa4f2583d4d2807deae36b3293be0a5add650fb5d99f744e1d893d369f6053741d863e2826dcc3c SHA512 d46abaaa52e5521d8f3f6d79f58c8473a8649faa01e93d250d2ee19d5778e31c13aaa855bd8f059ddc1424ae13001f15a41f240fa6b0acf3ffd911ea30da1040
+DIST scipy-1.5.2-html.zip 23166876 BLAKE2B a90d6a2eb25c56147c0c1cccb58cddd230c20cd70dcc5c39b7307acaeac5320ff1c6ed46e3027ec40f604db503a90620cf87212e45f3158c667ec20d95bac649 SHA512 35c675821675844b163eacdaf448173edb78adb5e9f3e438a70809b8b59425a987fd3ed7d6f7863612111ece4a6a36504279ef4492166f5e24a9b2c7ea9d21e7
+DIST scipy-1.5.2-ref.pdf 33462200 BLAKE2B 5784612eb41221a02520778d72341702a7dd4ee8c0147592e170054107219b03af4ccebe1f5e2a57f90f3b892455f95ec45d8eac8e4a7155e21e9ae0526b302f SHA512 15961b7280eb903d2db7a05915b94b3c298cabf68a6694da217680e23fe621885dd169dc88a033ee001a89bc6e6b13ef787ec61009f6ffe38aeaa2dfb84f8a47
+DIST scipy-1.5.2.tar.gz 25423944 BLAKE2B 0a4987da0cde4f33bbb0e2be571b59e9064b1c6554c61c1655100abdecfde54d64845cd30c5b3fcac3ae7426572757aa9a66065dd3b48e6e4cdd4d0ea847868e SHA512 45463df30a0f6270d9f4cf52235f31607904a6ae1375e12600e7f1ab2d27b1dc25a6211b49dceb71506be22c756890adaf9f81d9e6be7455def86c9caf0dc923
diff --git a/dev-python/scipy/metadata.xml b/dev-python/scipy/metadata.xml
new file mode 100644
index 000000000000..87a8d1a47674
--- /dev/null
+++ b/dev-python/scipy/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
+  <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.
+  SciPy includes modules for graphics and plotting, optimization,
+  integration, special functions, signal and image processing, genetic
+  algorithms, ODE solvers, and others.
+</longdescription>
+  <use>
+    <flag name="sparse">Adds support for sparse solving with <pkg>sci-libs/umfpack</pkg></flag>
+  </use>
+  <upstream>
+    <remote-id type="pypi">scipy</remote-id>
+    <remote-id type="sourceforge">scipy</remote-id>
+  </upstream>
+	<origin>gentoo-staging</origin>
+</pkgmetadata>
diff --git a/dev-python/scipy/scipy-1.1.0.ebuild b/dev-python/scipy/scipy-1.1.0.ebuild
new file mode 100644
index 000000000000..ce7d9ae79a96
--- /dev/null
+++ b/dev-python/scipy/scipy-1.1.0.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+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 ~arm64 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}]
+		dev-python/pytest[${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_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	${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
+	"${EPYTHON}" -c \
+		"import scipy, sys; r = scipy.test('fast', verbose=2); sys.exit(r)" \
+		|| 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/dev-python/scipy/scipy-1.4.1.ebuild b/dev-python/scipy/scipy-1.4.1.ebuild
new file mode 100644
index 000000000000..4cf2cb60dde9
--- /dev/null
+++ b/dev-python/scipy/scipy-1.4.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+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.29.13[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${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
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${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}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r 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}
+	python_optimize
+}
+
+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/dev-python/scipy/scipy-1.5.0.ebuild b/dev-python/scipy/scipy-1.5.0.ebuild
new file mode 100644
index 000000000000..b88573ce3ea6
--- /dev/null
+++ b/dev-python/scipy/scipy-1.5.0.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+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.29.13[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${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
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${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}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r 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}
+	python_optimize
+}
+
+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/dev-python/scipy/scipy-1.5.1.ebuild b/dev-python/scipy/scipy-1.5.1.ebuild
new file mode 100644
index 000000000000..b88573ce3ea6
--- /dev/null
+++ b/dev-python/scipy/scipy-1.5.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+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"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+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.29.13[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${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
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${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}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r 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}
+	python_optimize
+}
+
+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/dev-python/scipy/scipy-1.5.2.ebuild b/dev-python/scipy/scipy-1.5.2.ebuild
new file mode 100644
index 000000000000..938135e1d2be
--- /dev/null
+++ b/dev-python/scipy/scipy-1.5.2.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+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"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+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.29.13[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-36[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${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
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	# TODO
+	sed -e 's:test_magic_square_sparse_no_presolve:_&:' \
+		-i scipy/optimize/tests/test_linprog.py || die
+	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
+		-i scipy/stats/tests/test_continuous_basic.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${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}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r 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}
+	python_optimize
+}
+
+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/dev-python/seaborn/seaborn-0.10.0.ebuild b/dev-python/seaborn/seaborn-0.10.0.ebuild
index e00d3ab0cda1..b46d7b72ec52 100644
--- a/dev-python/seaborn/seaborn-0.10.0.ebuild
+++ b/dev-python/seaborn/seaborn-0.10.0.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/pandas-0.22.0[${PYTHON_USEDEP}]
 	dev-python/patsy[${PYTHON_USEDEP}]
 	dev-python/statsmodels[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.0.1[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-python/seaborn/seaborn-0.10.1.ebuild b/dev-python/seaborn/seaborn-0.10.1.ebuild
index 0bd7d6b751fd..ce965a6ede21 100644
--- a/dev-python/seaborn/seaborn-0.10.1.ebuild
+++ b/dev-python/seaborn/seaborn-0.10.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 	>=dev-python/pandas-0.22.0[${PYTHON_USEDEP}]
 	dev-python/patsy[${PYTHON_USEDEP}]
 	dev-python/statsmodels[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.0.1[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}
 	test? (
diff --git a/dev-python/setuptools-git/setuptools-git-1.2.ebuild b/dev-python/setuptools-git/setuptools-git-1.2-r1.ebuild
index 21bd11ae70e0..9d9c2edf3e22 100644
--- a/dev-python/setuptools-git/setuptools-git-1.2.ebuild
+++ b/dev-python/setuptools-git/setuptools-git-1.2-r1.ebuild
@@ -1,7 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{5,6,7,8,9} )
 
 inherit distutils-r1
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
index 593ed889879d..d071343d1ff7 100644
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-python/simplespectral/metadata.xml b/dev-python/simplespectral/metadata.xml
index 0d2e2d326688..3c369d7a6fe0 100644
--- a/dev-python/simplespectral/metadata.xml
+++ b/dev-python/simplespectral/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Radio</name>
 	</maintainer>
 	<use>
-		<flag name="faster">Use <pkg>sci-libs/scipy</pkg> to speed up drawing</flag>
+		<flag name="faster">Use <pkg>dev-python/scipy</pkg> to speed up drawing</flag>
 		<flag name="fastest">Use <pkg>dev-python/pyFFTW</pkg> to speed up drawing to the max</flag>
 	</use>
 	<upstream>
diff --git a/dev-python/simplespectral/simplespectral-1.0.0.ebuild b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
index 56f3d08e2321..f02ee5bd98ae 100644
--- a/dev-python/simplespectral/simplespectral-1.0.0.ebuild
+++ b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
@@ -24,7 +24,7 @@ fi
 IUSE="faster +fastest"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-		faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
+		faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
 		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/simplespectral/simplespectral-9999.ebuild b/dev-python/simplespectral/simplespectral-9999.ebuild
index 56f3d08e2321..f02ee5bd98ae 100644
--- a/dev-python/simplespectral/simplespectral-9999.ebuild
+++ b/dev-python/simplespectral/simplespectral-9999.ebuild
@@ -24,7 +24,7 @@ fi
 IUSE="faster +fastest"
 
 RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-		faster? ( sci-libs/scipy[${PYTHON_USEDEP}] )
+		faster? ( dev-python/scipy[${PYTHON_USEDEP}] )
 		fastest? ( dev-python/pyFFTW[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild
index 8028cc961b5a..595b628bb78b 100644
--- a/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-1.9.2.ebuild
@@ -30,7 +30,7 @@ DEPEND="test? (
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pandas[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/xarray[${PYTHON_USEDEP}]
 )"
 
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild
index 852cf50b9c8b..de0d5ab997b3 100644
--- a/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-1.9.4.ebuild
@@ -30,7 +30,7 @@ DEPEND="test? (
 	dev-python/mock[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pandas[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/xarray[${PYTHON_USEDEP}]
 )"
 
diff --git a/dev-python/spyder/spyder-4.1.4.ebuild b/dev-python/spyder/spyder-4.1.4.ebuild
index 820f352dcbbb..fb8219cf4e56 100644
--- a/dev-python/spyder/spyder-4.1.4.ebuild
+++ b/dev-python/spyder/spyder-4.1.4.ebuild
@@ -67,7 +67,7 @@ DEPEND="test? (
 	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
 	dev-python/pytest-mock[${PYTHON_USEDEP}]
 	dev-python/pytest-qt[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/sympy[${PYTHON_USEDEP}]
 	dev-python/xarray[${PYTHON_USEDEP}]
 )"
@@ -137,7 +137,7 @@ pkg_postinst() {
 		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
 		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
 		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-		optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy
+		optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
 		optfeature "Run Cython files in the IPython console" dev-python/cython
 		optfeature "The hdf5/h5py plugin" dev-python/h5py
 		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
diff --git a/dev-python/spyder/spyder-4.1.5.ebuild b/dev-python/spyder/spyder-4.1.5.ebuild
index a860c02a7abb..ee0fc7503bee 100644
--- a/dev-python/spyder/spyder-4.1.5.ebuild
+++ b/dev-python/spyder/spyder-4.1.5.ebuild
@@ -90,7 +90,7 @@ BDEPEND="test? (
 	dev-python/pytest-qt[${PYTHON_USEDEP}]
 	dev-python/pytest-xvfb[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 	dev-python/sympy[${PYTHON_USEDEP}]
 )"
 
@@ -190,7 +190,7 @@ pkg_postinst() {
 		optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
 		optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
 		optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-		optfeature "Import Matlab workspace files in the Variable Explorer" sci-libs/scipy
+		optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
 		optfeature "Run Cython files in the IPython console" dev-python/cython
 		optfeature "The hdf5/h5py plugin" dev-python/h5py
 		optfeature "The line profiler plugin" dev-python/spyder-line-profiler
diff --git a/dev-python/statsmodels/statsmodels-0.11.1.ebuild b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
index 8b5aafd0bf32..ac95c554abfc 100644
--- a/dev-python/statsmodels/statsmodels-0.11.1.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.11.1.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
 	dev-python/patsy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 "
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/statsmodels/statsmodels-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
index f9e40818da08..c6f5eab38b31 100644
--- a/dev-python/statsmodels/statsmodels-0.12.0.ebuild
+++ b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
@@ -20,12 +20,12 @@ RDEPEND="
 	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
 	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
 	dev-python/patsy[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-xdist[${PYTHON_USEDEP}]
 	)
diff --git a/dev-python/statsmodels/statsmodels-9999.ebuild b/dev-python/statsmodels/statsmodels-9999.ebuild
index d50118e9610a..977791d7622b 100644
--- a/dev-python/statsmodels/statsmodels-9999.ebuild
+++ b/dev-python/statsmodels/statsmodels-9999.ebuild
@@ -21,7 +21,7 @@ CDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pandas[${PYTHON_USEDEP}]
 	dev-python/patsy[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 "
 RDEPEND="${CDEPEND}
 	examples? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
diff --git a/dev-python/theano/theano-1.0.5.ebuild b/dev-python/theano/theano-1.0.5.ebuild
index 93a587b80f74..a2db2d61eaa9 100644
--- a/dev-python/theano/theano-1.0.5.ebuild
+++ b/dev-python/theano/theano-1.0.5.ebuild
@@ -23,7 +23,7 @@ BDEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )"
 RDEPEND="
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests nose
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
index 4ae878fb0229..3383fa10bdef 100644
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.1.ebuild
@@ -23,7 +23,7 @@ RDEPEND="
 
 DEPEND="test? (
 		dev-python/pandas[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}] )"
+		dev-python/scipy[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx doc dev-python/mock
diff --git a/dev-python/ujson/ujson-1.35-r1.ebuild b/dev-python/ujson/ujson-1.35-r1.ebuild
index 36abfed96810..30dcf6b7ec35 100644
--- a/dev-python/ujson/ujson-1.35-r1.ebuild
+++ b/dev-python/ujson/ujson-1.35-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ujson/ujson-3.1.0.ebuild b/dev-python/ujson/ujson-3.1.0.ebuild
index 7e53812859f6..6f18869947ba 100644
--- a/dev-python/ujson/ujson-3.1.0.ebuild
+++ b/dev-python/ujson/ujson-3.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uranium/uranium-4.6.1.ebuild b/dev-python/uranium/uranium-4.6.1.ebuild
index 983e86175838..5c9eae059726 100644
--- a/dev-python/uranium/uranium-4.6.1.ebuild
+++ b/dev-python/uranium/uranium-4.6.1.ebuild
@@ -35,7 +35,7 @@ DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/PyQt5[${PYTHON_MULTI_USEDEP},declarative,network,svg]
 		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		>=sci-libs/scipy-1.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/scipy-1.1[${PYTHON_MULTI_USEDEP}]
 		sci-libs/Shapely[${PYTHON_MULTI_USEDEP}]
 	')"
 
diff --git a/dev-python/uranium/uranium-4.7.0.ebuild b/dev-python/uranium/uranium-4.7.0.ebuild
index 56fcfd1ecf5e..9abbd3daa4e7 100644
--- a/dev-python/uranium/uranium-4.7.0.ebuild
+++ b/dev-python/uranium/uranium-4.7.0.ebuild
@@ -34,7 +34,7 @@ DEPEND="${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/PyQt5[${PYTHON_USEDEP},declarative,network,svg]
 		dev-python/numpy[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 		sci-libs/Shapely[${PYTHON_USEDEP}]
 	')"
 
diff --git a/dev-python/urwid/urwid-2.1.1.ebuild b/dev-python/urwid/urwid-2.1.1.ebuild
index 729454d0cd5f..fe10c1a3c94a 100644
--- a/dev-python/urwid/urwid-2.1.1.ebuild
+++ b/dev-python/urwid/urwid-2.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 PATCHES=(
diff --git a/dev-python/wtforms/wtforms-2.3.3.ebuild b/dev-python/wtforms/wtforms-2.3.3.ebuild
index a791e0905888..0f1e3be279d9 100644
--- a/dev-python/wtforms/wtforms-2.3.3.ebuild
+++ b/dev-python/wtforms/wtforms-2.3.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/markupsafe[${PYTHON_USEDEP}]"
diff --git a/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild b/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
index 5a056f7faebf..b639486f7a03 100644
--- a/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
+++ b/dev-python/wurlitzer/wurlitzer-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
diff --git a/dev-python/xarray/xarray-0.12.1.ebuild b/dev-python/xarray/xarray-0.12.1.ebuild
index 9e8c3f5b901f..c857fe11bf06 100644
--- a/dev-python/xarray/xarray-0.12.1.ebuild
+++ b/dev-python/xarray/xarray-0.12.1.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 	test? (
 		>=dev-python/dask-0.18.2[${PYTHON_USEDEP}]
 		dev-python/pytest[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	)"
 
 PATCHES=(
diff --git a/dev-python/xarray/xarray-0.16.0.ebuild b/dev-python/xarray/xarray-0.16.0.ebuild
index 9c1cca5f541d..2d083c9fca7d 100644
--- a/dev-python/xarray/xarray-0.16.0.ebuild
+++ b/dev-python/xarray/xarray-0.16.0.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		dev-python/toolz[${PYTHON_USEDEP}]
-		>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
 	)"
 
 distutils_enable_tests pytest
author	Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net>	2020-09-18 13:33:43 +0000
committer	Liguros - Gitlab CI/CD [feature/flatten] <gitlab@liguros.net>	2020-09-18 13:33:43 +0000
commit	87d914a08f6691238dcbaa533591a2528ac1fb74 (patch)
tree	7ad9d88448a94a0099109d973e4ce65e03e51635 /dev-python
parent	1f4c7ae255b08da068ccd254024f1850e8c577cf (diff)
download	baldeagleos-repo-87d914a08f6691238dcbaa533591a2528ac1fb74.tar.gz baldeagleos-repo-87d914a08f6691238dcbaa533591a2528ac1fb74.tar.xz baldeagleos-repo-87d914a08f6691238dcbaa533591a2528ac1fb74.zip