Updating liguros repo

79 files changed, 450 insertions, 760 deletions

diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index e9b5bf518d7e..6fd86ef812c5 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 1b153ed2dd96..0c05f2ecee52 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,6 +3,7 @@ DIST boto3-1.12.48.tar.gz 292124 BLAKE2B 0baf8fb4cfa040ba05b296d15a523a5de326776
 DIST boto3-1.13.26.tar.gz 296782 BLAKE2B 117bb18679fe3ae8c4feee1a5fb2d1df1923764bba3dce72040ccc802d10bb88263744a0491195f414761b6755353775a8a413a121a5a0fc42373a4e9b8aac1a SHA512 513ea4b39a5af4ae8e45f6b8b315a19d5184998fa881782bf2e6074aee36a709b51813fc9fe403bb8dbfb9b51ead50367af18f0918a1c88a37eab263ccddd11a
 DIST boto3-1.14.0.tar.gz 297008 BLAKE2B 7f5eaf4958395b47e936596b385b5a4daa20dbed6b777a407b6c2f70d3004d89fb963f479a1a3c8be22a3cbbfdb21f59a1f3c3ea4b967fce4799fc965899bcf1 SHA512 12ce4765f22e848aac0c29d1f95ed7b63964868f18c14073f93c74e442babf8708aa69cb6c17bd7c3aa5dacda6beb67bb4a4afe86fcd298308c70abfb77802d4
 DIST boto3-1.14.11.tar.gz 298578 BLAKE2B c78ba0957c4252adeaefb7ac3e335e3db6044752cd06731b6f7367bbfdbbb2db25d717ddf8954eabce745bca07d2980445a725977d3f12a5914e8620502e7f88 SHA512 069e21ca8aa5b7d30ff7ea9f94bb4d939495f0ce30a831e985687eafe4cd22ce830af2427b645df16ddcd51126c366ff61243bb7251a2aecbef46b8573d2e124
+DIST boto3-1.14.15.tar.gz 298869 BLAKE2B 24e55039ac4a7ecb97eb2e5f61a7991422df30e089bdf1d716a5daab81df0cfec5b8fd4c543a22d4bf208351cc77c88dff2e50949d006d93a523e8287c000d40 SHA512 8f082ee1062caa38dbf4dca28a7b48125d5938f7fd1d09bb01f31bef129fcd346e99f2f18d11a67e9733d674c3c263c809800bb8e58bbe70750dcfbcaec6c731
 DIST boto3-1.14.2.tar.gz 297730 BLAKE2B 174bc2435247db4421ffbf1ca0ef2cb772a9b6f357cbb438996ad635fca8ae5cd1005df3f8fdc6c63607797115c2379bb10c43edcfaf8393394f241b1e7a1ca1 SHA512 6ad539e568fe90c2f7408f37d28f194ac7094f6393858e487bf2afa73b8b53c90c8ab489bbe56f7c594351b24aaa82bfc9f81c9d68fadaecaec5acc3352fad5e
 DIST boto3-1.14.5.tar.gz 297919 BLAKE2B 9428ddfa1a5549bfb8319cc91292dace9245a9db94eec373f571342808cdda7c1bf2b683ccddbcae532aca79666971b5cff7646756dff7baa24e291b348ff0f0 SHA512 7c65b1a1b6070b8954b7a705b1473543be6a4939c8594327cdaf8c91ff557bfdb49611e18f2bc6b0213fc13ef4cdbf57da7e632ac93dacf6d887f7a18889ff59
 DIST boto3-1.14.8.tar.gz 297922 BLAKE2B e71a74155a6e32b310063c6c80ceb960db816898271f01066099d9ef162e90c5c446ea29b7164d957cc4d02e546eec59eb62f9168aa7e5f6e149c2d97fa14928 SHA512 a5c1c63664c406dc6b923ee565d30572173084b43a4539605cfc36a959d5d8fbcf0864720732128f26ba84fe8e4aabb31842d656e6e189860a41b365955e63ae
diff --git a/dev-python/boto3/boto3-1.14.15.ebuild b/dev-python/boto3/boto3-1.14.15.ebuild
new file mode 100644
index 000000000000..bbe6631e26ee
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.15.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/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 6abb3c4291d9..3f4616ecd932 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -9,6 +9,7 @@ DIST botocore-1.16.6.tar.gz 6386032 BLAKE2B e909e2fa021d5b1be333a31758af408cdc6e
 DIST botocore-1.16.7.tar.gz 6391893 BLAKE2B 19a8770ef1058e5601a1c292e2e17e1625e4d5d0d1845b59bbd403a2c285da1a774935e9d1e1fa7ca26a1e3c4703b29fcbb2f021a7251aa3ca756c80b2ba0461 SHA512 0ab2b4ff4096049cd92b96c710a38867a53b2dba0f07a319ec1a2f9b3cbce60776026c62e3eaaebe571b6ad26eb5c1c258b2dd350a444d30e54b342bcd675768
 DIST botocore-1.17.0.tar.gz 6478558 BLAKE2B 761ff2d57079a52ce38a6d56639fb0771d1fc4fb6a3494badecaacd4cea1ef74a69fe23d9fe62827993a3b6c33b963a2a199300f37fa3e7dc42433135c00f035 SHA512 a43b2f99e44ef9de3cf740b8fc1d74976d9ff6831639229a704f9300011405861789c9af26ea657f64244f5d67cff19aa94f95e5d2df73ee4f2dc10ccdeabae3
 DIST botocore-1.17.11.tar.gz 6508848 BLAKE2B 91e38db3868fb2cba9ffa6a1dfc95bd6557bb5ed8844a148b99603fb8557dc269fd652bfac3132d0b0b07fbb9063ed2762ad461cb75280cef7570bd251268029 SHA512 7ae6129985b58d1f24d0892a4506681af23d45d68be217aa5ddd06cdc2e8440edab3983f3f7dd0bb1993275d2ae0cfdd5406aaa7643f807dca4ed3ed71bf9eee
+DIST botocore-1.17.15.tar.gz 6530455 BLAKE2B d402845e3c0f434e39b1c1ab80378eb2d5f113b99be83471b89cc7264a2c696cfb38b25960f8c0eb3d721147c706f43c1db02287c8ef4ae4ae33394f2fc82473 SHA512 7a8ff75e83fa8df17d79cb3ede9faf2a7eb4c2bfa338411f0186d6c30946aaa247c14ddfc91c9d7ee6d1639696ca5e808bf4131ad2182608ecd99ef0e97175c1
 DIST botocore-1.17.2.tar.gz 6481390 BLAKE2B 009f8857be93c2fccb52e83176614401ae89835ea32fd0043248f7f66765d06e44df72ed31b5370cc1ed106cf45b531f4e4e7e7cbc3dc1d6e1524cb7914654d4 SHA512 ff19b1708686cbb574b01c9924a6acb7eaf7607b5f19a759d5c1dc1f7a7efae960e0c81d26d384101da5aaddc3bf0d8b4800d8908af34392d23779d4b9064487
 DIST botocore-1.17.5.tar.gz 6491397 BLAKE2B e6d45050e0f9d9919edff7dcea0866c9360fc8b8a09a82bcb6636621b49d7c9d06025639d8acf8740bf6d272371cabc9afff51e48214d240f1e81cd76abcab65 SHA512 2cf87d79a50f10d386907a0ef5b0e427b299b342d3661dfa64860828a0854dcd7f2ef3e0febdc30772aabf93efb39f4f35d52d3f28aec641e886fb5c05e30a3a
 DIST botocore-1.17.8.tar.gz 6499259 BLAKE2B bbec0755ac5c96f8b86d9391db36b58c28a2eff61b69ddccbbfcf0d7b349e1b5c99a2ab3619e50c6eda6a781e5361dd11f674126a596e23f505fde81a9b77949 SHA512 3f0c06e5fb335cc33ed589205ca378d4270d26dfb7f4b6196953205d24de4f71bf09c47b722449e51325d7643be6767f7a542d79765649ea3581247bc219f88d
diff --git a/dev-python/botocore/botocore-1.17.15.ebuild b/dev-python/botocore/botocore-1.17.15.ebuild
new file mode 100644
index 000000000000..c08c6f6ff899
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.15.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${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"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || 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/click-default-group/click-default-group-1.2.2.ebuild b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
index bb2111cb949d..edf62155eec3 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/click/click-7.0-r1.ebuild b/dev-python/click/click-7.0-r1.ebuild
index 4703f5476147..6f2551df5b41 100644
--- a/dev-python/click/click-7.0-r1.ebuild
+++ b/dev-python/click/click-7.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 901f28b7d29d..742951e6f06d 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,2 +1,3 @@
 DIST cloudpickle-1.3.0.tar.gz 46220 BLAKE2B a7ff773a38aae3b4a404ba7e931de06756ce95d5e45e4c204ac7ed93a3d2e7171667aa1995434f249971b2774658d1766935a7d7d3675cd4c727180221adb299 SHA512 b128a9088b36460bf3cf4edf4876ea768291de3c10c9cb6919507c4493a808136edcb819a98eb69de610e7162a96f859bae2f5c5616b558d9fea102835df611f
 DIST cloudpickle-1.4.1.tar.gz 47459 BLAKE2B 642cac2244060ccde18c31f0047d5d957d69d396901ea31e04d28c5d7d55cd8f58fcf199054752f1a644667a5fd73a1ccc2e33b20bdfcbc4e71450aeeb832ce3 SHA512 3232dfdf91141179be510282a1fc60fa5891fffd1f012998c6a622957eabdf9deecc7431196ae70de01b2e498c97981c83ed22ac1ed6f3db8ba68ee0a9a26bd9
+DIST cloudpickle-1.5.0.tar.gz 50992 BLAKE2B 8536362d455c5688134ce22d0bb2c5786da17336c8a907e8cf9e39833df03a6061ac901e45e85907a54e8d9b404f21132d4d944adf925a9056f0334eaca50904 SHA512 75356e3e5ade2ee5941b4cea576f1ffbab5d9b1a86eff23dc9275974f592c947d0b3b29d335b4dc38be16e36c89c8fc65b2883ae90923960e605502c777d9816
diff --git a/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild
new file mode 100644
index 000000000000..7d44be58f1b3
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="
+	https://pypi.org/project/cloudpickle/
+	https://github.com/cloudpipe/cloudpickle/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
+	# -s unbreaks some tests
+	# https://github.com/cloudpipe/cloudpickle/issues/252
+	pytest -svv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/editobj/Manifest b/dev-python/editobj/Manifest
deleted file mode 100644
index b2ea4be0d00d..000000000000
--- a/dev-python/editobj/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST EditObj-0.5.7.tar.gz 39802 BLAKE2B ab1ddf8b393007fdf08fe379001d2a5ff5978e6269d020ac433880920457d9988f1d456a1cd936e2c1516d89034f4c43e8e2593bcd4224f840a8d8c843d94f77 SHA512 0b7603b00a09942d1ebd2b50203b698598b54a2334d5b69b638d5f4b0ff7273afeab5f4e0dbccc3eecc3349fc08dead1a6e056b858f419faecc7837a5af2df03
diff --git a/dev-python/editobj/editobj-0.5.7-r2.ebuild b/dev-python/editobj/editobj-0.5.7-r2.ebuild
deleted file mode 100644
index 2141bf611af6..000000000000
--- a/dev-python/editobj/editobj-0.5.7-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1
-
-MY_P="${P/editobj/EditObj}"
-
-DESCRIPTION="EditObj can create a dialog box to edit ANY Python object"
-SRC_URI="http://download.gna.org/songwrite/${MY_P}.tar.gz"
-HOMEPAGE="https://home.gna.org/oomadness/en/editobj/index.html"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ia64 ppc x86"
-SLOT="0"
-IUSE="+examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/editobj/metadata.xml b/dev-python/editobj/metadata.xml
deleted file mode 100644
index 924a52901a86..000000000000
--- a/dev-python/editobj/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-<longdescription>
-EditObj can create a dialog box to edit ANY Python object. It also
-includes a Tk tree widget, an event and a multiple undo-redo
-frameworks.
-</longdescription>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/fastparquet/Manifest b/dev-python/fastparquet/Manifest
deleted file mode 100644
index cf1a03224ab5..000000000000
--- a/dev-python/fastparquet/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST fastparquet-0.1.1.tar.gz 119573 BLAKE2B 16bd05061b64768278201acbf08fe13228d058b223d2050208b73e6af6ad3bb800a6d7edc1a15abdf02d8b508a75ed52962fb4b0c44a073b80451cfbf30915b5 SHA512 f8f052202ca095596870e6a10e2ab05e3c55289cd0ef3dab0502dff26052c9970f65f6b826d4d073c6c221827f6b18ddc83c47c04e84e08491f5237358f5860a
-DIST fastparquet-0.1.5.tar.gz 136350 BLAKE2B 2719a5da55c99ff6aa71792045f6622b7a1de81b6ec33804cfd36b0907cb44e68a7a5dcdec467c2e8c45790c062ca1d130fe3dc5c95e286bc437d449fa5211b0 SHA512 2d8f5375072125f68f086f316af87acf41e65479324828f7eeea244796311604425bbe53b9e2e67cc68b1eb89e390d9fbd5e201e5165aa22dd43604ac5441f27
diff --git a/dev-python/fastparquet/fastparquet-0.1.1.ebuild b/dev-python/fastparquet/fastparquet-0.1.1.ebuild
deleted file mode 100644
index f5fed712ef60..000000000000
--- a/dev-python/fastparquet/fastparquet-0.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the parquet columnar file format"
-HOMEPAGE="https://github.com/dask/fastparquet"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="brotli lzo +snappy"
-
-RDEPEND="
-	dev-python/numba[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/thriftpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( app-arch/brotli[python,${PYTHON_USEDEP}] )
-	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
-	snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/fastparquet/fastparquet-0.1.5.ebuild b/dev-python/fastparquet/fastparquet-0.1.5.ebuild
deleted file mode 100644
index 460571dba349..000000000000
--- a/dev-python/fastparquet/fastparquet-0.1.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the parquet columnar file format"
-HOMEPAGE="https://github.com/dask/fastparquet"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-IUSE="brotli lz4 lzo +snappy zstd"
-
-RDEPEND="
-	dev-python/numba[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/thrift[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( app-arch/brotli[python,${PYTHON_USEDEP}] )
-	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
-	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-	snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )
-	zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# this causes setuptool's sandbox violations, Portage should have
-	# taken care of this, so disable it
-	sed -i -e 's/setup_requires/disabled_setup_requires/' setup.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/fastparquet/metadata.xml b/dev-python/fastparquet/metadata.xml
deleted file mode 100644
index 3031298f4645..000000000000
--- a/dev-python/fastparquet/metadata.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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>
-  <longdescription lang="en">
-    fastparquet is a python implementation of the parquet format,
-    aiming integrate into python-based big data work-flows. Not all
-    parts of the parquet-format have been implemented yet or tested
-    e.g. see the Todos linked below. With that said, fastparquet is
-    capable of reading all the data files from the
-    parquet-compatability project.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">fastparquet</remote-id>
-    <remote-id type="github">dask/fastparquet</remote-id>
-  </upstream>
-  <use>
-    <flag name="brotli">Enable support for brotli compression</flag>    
-  </use>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
index 5b30acc0b557..389630af6bfe 100644
--- a/dev-python/flask-mongoengine/Manifest
+++ b/dev-python/flask-mongoengine/Manifest
@@ -1 +1,2 @@
 DIST flask-mongoengine-0.9.3.tar.gz 111690 BLAKE2B f94f057bb416715d877154bb2816308324d3f0bb41dfe2002b80ed2f078ab2bffeb62fc7bd53344b7d995111122d0b59a09dfe7700975e151e61fe60f2bdad45 SHA512 15b8031e4f8a9275fa6a602aed8466533fc9e6eb408d8f3316fc8814cc785feeee59dae25f40c1c30371e7e33bcc8727bb866bd99dbee0dc75cf15049576fb3d
+DIST flask-mongoengine-0.9.5.gh.tar.gz 120281 BLAKE2B 454602e7e7f26db731379b01492c6cb1adf01369fd268236407c57753aeb68f17ce62d4c2e665e493d3c7c632e4f263af02b59e6580893afcc7b8659247fb42f SHA512 3588ae25e2f3643f5e240990f424b4f3754cea2f880b7b454c98afb3ea98fd81b783d74a45cf685fe59cfa8159b1ac39e840071f364ce98fb1a25cc9a09e0d5f
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild
new file mode 100644
index 000000000000..118819863c52
--- /dev/null
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Flask support for MongoDB and with WTF model forms"
+HOMEPAGE="https://pypi.org/project/flask-mongoengine/"
+SRC_URI="
+	https://github.com/MongoEngine/flask-mongoengine/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: make it spawn a local mongodb instance
+#RESTRICT="test"
+
+RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/mongoengine-0.7.10[${PYTHON_USEDEP}]
+	dev-python/flask-wtf[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -i -e '/test_requirements/d' setup.py || die
+	sed -i -e '/rednose/d' setup.cfg || die
+
+	# TODO: investigate; new pymongo, wtforms?
+	sed -e 's:test_connection_default:_&:' \
+		-i tests/test_basic_app.py || die
+	sed -e 's:test_unique_with:_&:' \
+		-i tests/test_forms.py || die
+	sed -e 's:test_mongomock:_&:' \
+		-i tests/test_connection.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/flup/flup-1.0.2-r1.ebuild b/dev-python/flup/flup-1.0.2-r1.ebuild
index 91a82030c391..858d8de998e9 100644
--- a/dev-python/flup/flup-1.0.2-r1.ebuild
+++ b/dev-python/flup/flup-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.saddi.com/software/${PN}/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/gql/Manifest b/dev-python/gql/Manifest
deleted file mode 100644
index 64cef1456340..000000000000
--- a/dev-python/gql/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gql-0.1.0.tar.gz 3925 BLAKE2B b463235b5c9b6af8be77340d219a60e5886389fc18e066995a56d1ae80079a8de80336ae56d068c403d62f994d17cdddcf4191b0884ae971cecd23c5d17dc66d SHA512 23e35587a61e982a017260525ba9bd5d78a006eb35aae3d1cf48ba92fe954eaf14194e8f19e99813f44386b2440cda7701c85618043514a0f75101654c9145d2
diff --git a/dev-python/gql/gql-0.1.0.ebuild b/dev-python/gql/gql-0.1.0.ebuild
deleted file mode 100644
index 95b959caa927..000000000000
--- a/dev-python/gql/gql-0.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="GraphQL client for Python."
-HOMEPAGE="https://pypi.org/project/gql/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/graphql-core-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/promises-2.1[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.7.2[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-python/gql/metadata.xml b/dev-python/gql/metadata.xml
deleted file mode 100644
index 22058da025cd..000000000000
--- a/dev-python/gql/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">gql</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest
deleted file mode 100644
index 0f5c9562b00c..000000000000
--- a/dev-python/graphql-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST graphql-core-2.0.0.tar.gz 156989 BLAKE2B 8ff0d64322966dd5fadfeff586a73db770f02337f899c7326ea6e584c093ecc237624f116d31983960ed4683dd53b6813ad99ab1173857e828de98f35eaf1f74 SHA512 caaf1a32550a671048224f37f75ed2a374290d763f9594a5f0bcd102b54f4cbc491005bae102d648c6dfaa052b5bd06f939f8638d6c895d5c133710dc2b0ce67
diff --git a/dev-python/graphql-core/graphql-core-2.0.0.ebuild b/dev-python/graphql-core/graphql-core-2.0.0.ebuild
deleted file mode 100644
index 5cb4a2d3cf14..000000000000
--- a/dev-python/graphql-core/graphql-core-2.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="GraphQL for Python"
-HOMEPAGE="https://github.com/graphql-python/graphql-core"
-SRC_URI="https://github.com/graphql-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/promises-2.1[${PYTHON_USEDEP}]
-	>=dev-python/Rx-1.6.0[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-RESTRICT="test"
-# Add these to test when we have them in the tree
-#	test? (
-#		=dev-python/pytest-3.0.2
-#		=dev-python/pytest-django-2.9.1
-#		=dev-python/pytest-cov-2.3.1
-#		dev-python/coveralls
-#		=dev-python/gevent-1.1-rc1
-#		=dev-python/pytest-benchmark-3.0.0
-#		=dev-python/pytest-mock-1.2
-#	)
diff --git a/dev-python/graphql-core/metadata.xml b/dev-python/graphql-core/metadata.xml
deleted file mode 100644
index 46d9761834b8..000000000000
--- a/dev-python/graphql-core/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">graphql-core</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 974f16529551..bcaca744dab1 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,2 +1,3 @@
 DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20571805501972d162d4b076c1fe144a9790b8132821f0acd439c8859873038813c7bdd4163d0535eca36a1a8fa SHA512 079eb4321ed95c8f05399abca2a1c46ecb7c28fe9a3a50b6eb106a2bd2f3566fb25bca59022fafbfcee5069f078921421d799eeb29a796f8f98881491cf9be08
 DIST joblib-0.15.1.tar.gz 342550 BLAKE2B c8ccf0b6d2e229a780939d9c4f39265bd18b5a452d014056001072b7daf7e46a5961c6d80f768c30ba7463aa36c5ec09959bb1e891028bf6f7862a9a265079aa SHA512 a0b0bde5b034af3eee0bce2875199fc9ac232a34a49c14daf6fbddd9bf3ad8fa0d77192827b7531704b81db7bdfbaf76c4755b8fc1035eaf73b2e08f9e6d8828
+DIST joblib-0.16.0.tar.gz 345002 BLAKE2B 0336fcbe95204141a0b04dfbf8949ba509792402eefbb86b3dc02375e7e3eb5c76d548d4ad01238307c0334ce4299fd9e763765d92722819894ea26ab6144032 SHA512 9f1f2e7f2e293e1c53e9752907f4ba25d52a5c4895eebfa423c8e3bc64146ab20a490e1db0cfa39596c9bbc47ea1cc491b0576bf8da9a1f68b58e91ba09ead34
diff --git a/dev-python/joblib/joblib-0.16.0.ebuild b/dev-python/joblib/joblib-0.16.0.ebuild
new file mode 100644
index 000000000000..392bb96fc6a8
--- /dev/null
+++ b/dev-python/joblib/joblib-0.16.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="https://joblib.readthedocs.io/en/latest/
+	https://github.com/joblib/joblib"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/loky[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/threadpoolctl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc \
+	'dev-python/numpy' \
+	'dev-python/matplotlib' \
+	'dev-python/pillow' \
+	'dev-python/sphinx-gallery' \
+	'dev-python/numpydoc' \
+	'dev-python/pandas' \
+	'dev-python/lz4' \
+	'dev-python/distributed'
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unbundle
+	rm -r joblib/externals || die
+	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
+	find -name '*.py' -exec \
+		sed -e 's:\(joblib\)\?\.externals\.::' \
+			-e 's:from \.externals ::' \
+			-i {} + || die
+
+	sed -e "s:'_static/joblib_logo_examples.png':'doc/_static/joblib_logo_examples.png':" \
+		-i doc/conf.py || die
+
+	# tries to fetch from the internet
+	rm examples/compressors_comparison.py \
+		examples/parallel/distributed_backend_simple.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch b/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch
new file mode 100644
index 000000000000..05fb70455f0a
--- /dev/null
+++ b/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch
@@ -0,0 +1,39 @@
+From 0e930389f4785f9d311b090f92057563e22b9768 Mon Sep 17 00:00:00 2001
+From: tomMoral <thomas.moreau.2010@gmail.com>
+Date: Thu, 2 Jul 2020 13:37:14 +0200
+Subject: [PATCH] FIX cloudpickle customization mechanism
+
+---
+ loky/backend/reduction.py | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/loky/backend/reduction.py b/loky/backend/reduction.py
+index 0bad5f63..d87fbdff 100644
+--- a/loky/backend/reduction.py
++++ b/loky/backend/reduction.py
+@@ -189,6 +189,10 @@ def __init__(self, writer, reducers=None, protocol=HIGHEST_PROTOCOL):
+                 self.dispatch = self._dispatch.copy()
+             else:
+                 if getattr(self, "dispatch_table", None) is not None:
++                    # Make sure dispatch table is an instance level field
++                    # as it is not the case for isntance for cloudpickle1.5+
++                    # see joblib/loky#259
++                    self.dispatch_table = self.dispatch_table.copy()
+                     self.dispatch_table.update(self._dispatch_table.copy())
+                 else:
+                     self.dispatch_table = self._dispatch_table.copy()
+@@ -202,10 +206,10 @@ def register(self, type, reduce_func):
+             if sys.version_info < (3,):
+                 # Python 2 pickler dispatching is not explicitly customizable.
+                 # Let us use a closure to workaround this limitation.
+-                    def dispatcher(self, obj):
+-                        reduced = reduce_func(obj)
+-                        self.save_reduce(obj=obj, *reduced)
+-                    self.dispatch[type] = dispatcher
++                def dispatcher(self, obj):
++                    reduced = reduce_func(obj)
++                    self.save_reduce(obj=obj, *reduced)
++                self.dispatch[type] = dispatcher
+             else:
+                 self.dispatch_table[type] = reduce_func
+ 
diff --git a/dev-python/loky/loky-2.8.0.ebuild b/dev-python/loky/loky-2.8.0-r1.ebuild
index 19d795ff7893..ba05e5dcaaab 100644
--- a/dev-python/loky/loky-2.8.0.ebuild
+++ b/dev-python/loky/loky-2.8.0-r1.ebuild
@@ -25,6 +25,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cloudpickle-1.5.patch
+)
+
 src_prepare() {
 	# docker, seriously?
 	sed -e 's:test_cpu_count_cfs_limit:_&:' \
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index 7690049b285d..0faede28dada 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1 +1,2 @@
 DIST mongoengine-0.10.6.tar.gz 469469 BLAKE2B 3930126d64e1b43d579412069da33a96e6c525d459905d05f677a406a262a15e16d8f6460637c253ace4addbe07655d194fede19fe050f4628aa17dbb6115038 SHA512 a8d16739892c64ed408afab49c6d33a4b438af83e003844caa101cd51366038ba75121d12b4385a546cf4d946a506bc11f173355f6855e740cef9fddfd6437e7
+DIST mongoengine-0.20.0.tar.gz 311698 BLAKE2B 11bae8d342a77bcc241884beb92d67a6d4f7112d0af3a467196eb94233b003aa27d019ab346140ce7430b4019879c8c86e01f3067677254559243b6d1f0ddc80 SHA512 ef973af9893f6e53811e1a47a131989f5a057af04ab9d512059f968af89fcd23f05d910c7de03330b5f4771db8e11ea2e48060f95ed790f8d238df6c6f7b9306
diff --git a/dev-python/mongoengine/mongoengine-0.20.0.ebuild b/dev-python/mongoengine/mongoengine-0.20.0.ebuild
new file mode 100644
index 000000000000..30844f5c2a35
--- /dev/null
+++ b/dev-python/mongoengine/mongoengine-0.20.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
+HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
+SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: make it run a local database server
+RESTRICT="test"
+
+RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/mongomock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: investigate
+	sed -e 's:test_covered_index:_&:' \
+		-i tests/document/test_indexes.py || die
+	# incompatible pillow?
+	sed -e 's:test_image_field_resize:_&:' \
+		-e 's:test_image_field_thumbnail:_&:' \
+		-i tests/fields/test_file_field.py || die
+	# no $eval
+	sed -e 's:test_exec_js_field_sub:_&:' \
+		-e 's:test_exec_js_query:_&:' \
+		-e 's:test_item_frequencies_normalize:_&:' \
+		-e 's:test_item_frequencies_with_0_values:_&:' \
+		-e 's:test_item_frequencies_with_False_values:_&:' \
+		-e 's:test_item_frequencies_with_null_embedded:_&:' \
+		-i tests/queryset/test_queryset.py || die
+	# TODO: investigate (wrong order? bad comparison?)
+	sed -e 's:test_distinct_ListField_EmbeddedDocumentField:_&:' \
+		-i tests/queryset/test_queryset.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/mongomock/metadata.xml b/dev-python/mongomock/metadata.xml
index f767a572fb4b..72d422e5daaa 100644
--- a/dev-python/mongomock/metadata.xml
+++ b/dev-python/mongomock/metadata.xml
@@ -9,6 +9,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">mongomock</remote-id>
 		<remote-id type="github">mongomock/mongomock</remote-id>
diff --git a/dev-python/mongomock/mongomock-3.19.0.ebuild b/dev-python/mongomock/mongomock-3.19.0.ebuild
index 9dec418ea7d6..fe73bdcae26a 100644
--- a/dev-python/mongomock/mongomock-3.19.0.ebuild
+++ b/dev-python/mongomock/mongomock-3.19.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
deleted file mode 100644
index 6cc4b9cbb0cd..000000000000
--- a/dev-python/numba/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST numba-0.37.0.tar.gz 1734667 BLAKE2B 20fd765d226e6e71a0e94bbf8c6a605ef7b4cf8ba6e39667001051c642fb9b872540482e710e020c0fca6653d9ca4518ce82e48681613f28ac5b9e2346bece4f SHA512 83a4e5a28a43ed1cd6584ccd63aac38a928af48c424ed119bc86487f0a2bfb9875c34f6fe0a03446d8c8e9179be81f831200c12ff31edc22bc4741789095f861
-DIST numba-0.39.0.tar.gz 1782489 BLAKE2B 77a6afe587ce3ae0ccd782e329e626d63ab58b84a2aeb836710fc0c13dcc88e16ab36e7426c6d9ff88c6d5be854915128dc2868d7fa71511ec9c8eea9debffe7 SHA512 f9cabf39fea543495425ba326aad34a52d317ebef61e5b298588764214bb396ea43871d32875f0882a36909bb12fc2e3807c38b5fc60ff5d9e6dc9ccdd36bf6e
diff --git a/dev-python/numba/files/numba-skip-tests.patch b/dev-python/numba/files/numba-skip-tests.patch
deleted file mode 100644
index 2c177c07034c..000000000000
--- a/dev-python/numba/files/numba-skip-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/659804
-
-diff --git a/numba/tests/test_linalg.py b/numba/tests/test_linalg.py
-index 46bff63e8..53056ab23 100644
---- a/numba/tests/test_linalg.py
-+++ b/numba/tests/test_linalg.py
-@@ -1282,6 +1282,7 @@ class TestLinalgLstsq(TestLinalgSystems):
-     # Suggestions for improvements are welcomed!
- 
-     @needs_lapack
-+    @unittest.skipIf(sys.maxsize < 2 ** 31, "errors with 32-bit address space")
-     def test_linalg_lstsq(self):
-         """
-         Test np.linalg.lstsq
diff --git a/dev-python/numba/metadata.xml b/dev-python/numba/metadata.xml
deleted file mode 100644
index 7b5d00b8a859..000000000000
--- a/dev-python/numba/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <longdescription lang="en">
-  Numba is a NumPy-aware optimizing compiler for Python. It uses the LLVM
-  compiler infrastructure to compile Python syntax to machine code.
-  It is aware of NumPy arrays as typed memory regions and so can
-  speed-up code using NumPy arrays. Other, less well-typed code will be
-  translated to Python C-API calls effectively removing the
-  "interpreter" but not removing the dynamic indirection.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">numba</remote-id>
-    <remote-id type="github">numba/numba</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/numba/numba-0.37.0.ebuild b/dev-python/numba/numba-0.37.0.ebuild
deleted file mode 100644
index e2bc5d7891d4..000000000000
--- a/dev-python/numba/numba-0.37.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
-HOMEPAGE="https://numba.pydata.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/llvmlite-0.22.0[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/numba-skip-tests.patch
-)
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	${EPYTHON} -m numba.runtests -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/numba/numba-0.39.0.ebuild b/dev-python/numba/numba-0.39.0.ebuild
deleted file mode 100644
index a322c20dbf9b..000000000000
--- a/dev-python/numba/numba-0.39.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
-HOMEPAGE="https://numba.pydata.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/llvmlite-0.22.0[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/numba-skip-tests.patch
-)
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	${EPYTHON} -m numba.runtests -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
index 95c6d0072683..b73ac55fce4b 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 09f043e27b5c..c9462e442f79 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1,4 @@
 DIST pikepdf-1.13.0.tar.gz 2140229 BLAKE2B 886bb9395e8fa1105385908a06d076f78bb1712186a8cb0eafbe54d22a0c95fa2bc8eba8f2e3d60ec3b1392d550cd38c6486c601eba2ef167c718fa26b472f9e SHA512 48304f85e73148dbcfae50ecc5767686b46ce9d44b13eb3f991ab3b358b99208383627abdb5ef3c17cf31a422872ea0bae7560e9c7c36130c6009563b6169f4d
 DIST pikepdf-1.14.0.tar.gz 2140844 BLAKE2B 75a408ded51e82cd7970eb94214d2e4f40ea0fa0a4915d83caace9b1fcad75fe2d7f7f1917e307d5ba8f2107dc1ae4fd46125b05d7ea175444c479945293d5a7 SHA512 bbd6a024324812f2ecee7c424fe53a2e32a6534c909cef60661faea40e58bfc067017f26d8676fb336e618e6cd7b008729cb6753202a18ed6fd86bbfbb36662b
+DIST pikepdf-1.16.1.tar.gz 2227178 BLAKE2B b872c3ecfb6ea2b26dd5a1a3135aa1ca4ce5fd373a89f48fc6fa281144d1eb98256175ed2518ce33c703bc7b14ac960a27d7f1debb8e0ca5942a5ac236de2c53 SHA512 8560153eb70e426d70c57e0980f989fd2ddf3756bbd4b10a810f47081dd69cbb34941a29ea95f332390a25f2e4a66ff716f4ee933d3a538101154f5d7bdc506d
 DIST pikepdf-1.8.3.tar.gz 1649370 BLAKE2B c655eb2a9304eb624b5f3dd3ea68ff3194f5a508b4249ef0643689945c28bbe9eaad015df481516d6cfce6768a70a34377725a7995b448f22a2eb025b4967e71 SHA512 5cb674042dca6850df7cf9476743956967d0ad168ac6bdadda03895a604f6c3670849e33ab863e7686eaa46922489d6dd1da9883d19a721c8021323d768086a9
diff --git a/dev-python/pikepdf/pikepdf-1.16.1.ebuild b/dev-python/pikepdf/pikepdf-1.16.1.ebuild
new file mode 100644
index 000000000000..ea2da43b0439
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-1.16.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/qpdf:0=
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? ( >=dev-python/attrs-19.1.0
+		>=dev-python/hypothesis-4.24
+		<dev-python/hypothesis-6.0
+		>=dev-python/pillow-5.0.0
+		>=dev-python/pytest-4.4.0
+		<dev-python/pytest-5.3.5
+		>=dev-python/pytest-xdist-1.28
+		<dev-python/pytest-xdist-2.0
+		>=dev-python/pytest-helpers-namespace-2019.1.8
+		>=dev-python/pytest-timeout-1.3.3
+		>=dev-python/python-xmp-toolkit-2.0.1 )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.3-test.patch )
+
+python_test() {
+	pytest
+}
+
+# When ipython and matplotlib will get python3_8 support, we'll be able to add
+#
+#IUSE="doc"
+#DEPEND="doc? ( dev-python/ipython
+#		dev-python/matplotlib
+#		dev-python/sphinx-1.4
+#		dev-python/sphinx_rtd_theme )"
+#python_compile_all() {
+#	use doc && emake -C docs html
+#}
+#python_install_all() {
+#	use doc && local HTML_DOCS=( docs/_build/html/. )
+#	distutils-r1_python_install_all
+#}
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
index 056ef7dd0558..d53afeb7c882 100644
--- a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 distutils_enable_tests nose
diff --git a/dev-python/py2play/Manifest b/dev-python/py2play/Manifest
deleted file mode 100644
index bc7099f07f36..000000000000
--- a/dev-python/py2play/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST Py2Play-0.1.10.tar.gz 21436 BLAKE2B e38af47e4090de6cf7aa621ce58a2086608a71539d6239f13f66e893b2ea1eb50149a8a2b11fb4739ced9f482534cad1e037783ddc481b74e2fe7ce96e6eff0a SHA512 d600c62d20274e71678fc41c3f77fc89d71514032f5b4e98d0bda0119b4c9190c82b84a33240f498a926a6947f8bcd928493f6cbe061004eeddbd7eaef5bebee
diff --git a/dev-python/py2play/metadata.xml b/dev-python/py2play/metadata.xml
deleted file mode 100644
index d5f7579ea1cb..000000000000
--- a/dev-python/py2play/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/py2play/py2play-0.1.10-r1.ebuild b/dev-python/py2play/py2play-0.1.10-r1.ebuild
deleted file mode 100644
index 3f05417f9e29..000000000000
--- a/dev-python/py2play/py2play-0.1.10-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="${P/py2play/Py2Play}"
-
-DESCRIPTION="A Peer To Peer network game engine"
-HOMEPAGE="https://home.gna.org/oomadness/en/slune"
-SRC_URI="http://download.gna.org/slune/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyopenal/Manifest b/dev-python/pyopenal/Manifest
deleted file mode 100644
index d04c7173dd1d..000000000000
--- a/dev-python/pyopenal/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST PyOpenAL-0.1.6.tar.gz 27698 BLAKE2B 4c74f76fd8eb3c3bda8e30a69d75c327df206c545d7e58d833e2dbb3bdcaa1b1800d7b0f5f8ecfc6d098a093111b409b161bdee305acbb8f4e5d7097899ca41a SHA512 b617781d8253e4ec81fb806709fa5cb0ca3815d11c2fe1b9a74043909bbc3fa57eb8cb0375ad5999c1a7105c5468a75cb7893e186f48e2c440d8b56bb6a87f7b
diff --git a/dev-python/pyopenal/files/pyopenal-0.1.6-setup.patch b/dev-python/pyopenal/files/pyopenal-0.1.6-setup.patch
deleted file mode 100644
index f9ef9f3c0330..000000000000
--- a/dev-python/pyopenal/files/pyopenal-0.1.6-setup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN PyOpenAL-0.1.6.orig/setup.py PyOpenAL-0.1.6/setup.py
---- PyOpenAL-0.1.6.orig/setup.py	2006-04-30 11:23:44.000000000 -0400
-+++ PyOpenAL-0.1.6/setup.py	2006-06-13 12:15:46.000000000 -0400
-@@ -4,16 +4,6 @@
- LIBDIRS = ["/usr/lib", "/usr/local/lib"]
- LIBS    = ["openal", "alut"]
- 
--try:
--  openal_version = os.popen("openal-config --version").read()
--  if openal_version[0] == "0":
--    LIBDIRS = ["/usr/lib", "/usr/local/lib"]
--    LIBS    = ["openal"]
--    
--except:
--  print "Warning: error while running 'openal-config --version', using default values..."
--
--
- setup(
-   name         = "PyOpenAL",
-   version      = "0.1.6",
diff --git a/dev-python/pyopenal/metadata.xml b/dev-python/pyopenal/metadata.xml
deleted file mode 100644
index ad7081983829..000000000000
--- a/dev-python/pyopenal/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild b/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild
deleted file mode 100644
index 118cb68614ae..000000000000
--- a/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_P="${P/pyopenal/PyOpenAL}"
-
-DESCRIPTION="OpenAL library port for Python"
-HOMEPAGE="https://home.gna.org/oomadness/en/pyopenal/"
-SRC_URI="http://download.gna.org/pyopenal/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=dev-python/pyogg-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyvorbis-1.1[${PYTHON_USEDEP}]
-	media-libs/freealut
-	media-libs/openal"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS CHANGES )
-PATCHES=( "${FILESDIR}/${P}-setup.patch" )
-
-python_compile() {
-	local CFLAGS=${CFLAGS}
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_compile
-}
diff --git a/dev-python/pypy3/pypy3-7.3.1-r1.ebuild b/dev-python/pypy3/pypy3-7.3.1-r1.ebuild
index 693635092afb..023f8e46c876 100644
--- a/dev-python/pypy3/pypy3-7.3.1-r1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1
+inherit pax-utils python-any-r1 toolchain-funcs
 
 MY_P=pypy3.6-v${PV/_/}
 
@@ -105,6 +105,10 @@ src_prepare() {
 	eapply_user
 }
 
+src_configure() {
+	tc-export CC
+}
+
 src_compile() {
 	# copy over to make sys.prefix happy
 	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
diff --git a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
index adc9c3894e40..8e7fb742bda8 100644
--- a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index 2f652f05515c..25e11c83f598 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
index b6b94240e1c8..130e2d5c1e04 100644
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 IUSE="examples mysql postgres sqlite test"
 
 RDEPEND="mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/raven/Manifest b/dev-python/raven/Manifest
deleted file mode 100644
index 71eabb9724c3..000000000000
--- a/dev-python/raven/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST raven-5.33.0.tar.gz 284367 BLAKE2B a66471ed09bb2afca4afe78f662fdc21464e89bb1317fdc5481f87bdca626ad2a0064e9b9681d63e6439ebecd3f25d38a0000666a0c55ace90ca51efb2ccd1c8 SHA512 b6924c36f1cf4e957e8399e757dd1f3fc8152c14af06b700d139cc93bc3dbde4186690fc6934afeda03c13a3b59e739ab3627759580b3adb890f0c1f1ddbe8fd
diff --git a/dev-python/raven/metadata.xml b/dev-python/raven/metadata.xml
deleted file mode 100644
index 7277fedf1e68..000000000000
--- a/dev-python/raven/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">raven</remote-id>
-    <remote-id type="github">getsentry/raven-python</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/raven/raven-5.33.0.ebuild b/dev-python/raven/raven-5.33.0.ebuild
deleted file mode 100644
index 20fe41df46ae..000000000000
--- a/dev-python/raven/raven-5.33.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Raven is a client for Sentry"
-HOMEPAGE="https://github.com/getsentry/raven-python"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/contextlib2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/readme_renderer/readme_renderer-25.0.ebuild b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
index eb4d283197bf..2513f39528f9 100644
--- a/dev-python/readme_renderer/readme_renderer-25.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~sparc x86"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index 0c24676e2815..811fe75444f0 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
index 9dc427d23a37..d4759a77931c 100644
--- a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/wiki/Home/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="libressl"
 
diff --git a/dev-python/sentinels/metadata.xml b/dev-python/sentinels/metadata.xml
index d9bf34eaabc1..3a0fe0d48ff1 100644
--- a/dev-python/sentinels/metadata.xml
+++ b/dev-python/sentinels/metadata.xml
@@ -9,6 +9,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		Sentinels are objects with special meanings. They can be thought of as singletons, but they service the need of having 'special' values in your code, that have special meanings.
 	</longdescription>
diff --git a/dev-python/sentinels/sentinels-1.0.0.ebuild b/dev-python/sentinels/sentinels-1.0.0.ebuild
index 664a217c9ed5..8d4b43fed50c 100644
--- a/dev-python/sentinels/sentinels-1.0.0.ebuild
+++ b/dev-python/sentinels/sentinels-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/soya/Manifest b/dev-python/soya/Manifest
deleted file mode 100644
index 3bd7e48fb25d..000000000000
--- a/dev-python/soya/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST Soya-0.15rc1.tar.bz2 910576 BLAKE2B 2ec129869cdabcdb974dbfea24a3eebda1b55f4696f978335dd7e34a813c361eec9d27aa5b395a3ced0693335b34eb8f533f049e0240f443a8f1859fff5686cb SHA512 698ad3ebb446b49dc6fb70f53cfa6b1d9f35fc854d6f5fd1dafcb1478fce01c8de694a86af02580bb2b149f086122450f1bd6fe002f87d45a5c7555911c23fc6
-DIST SoyaTutorial-0.14.tar.bz2 5223674 BLAKE2B 2cc3927a058936aa497846a300e9093f169898cf1bb13f3df88c6f75d344b689d95ea386ce50a3d93c6b14b3675211855d4515b3bcc3e297411b081007eb6784 SHA512 484bc93c2561aa1f2c8bd7101b75c8ea5d42a2bae7c0431ef1e7719bd86da2f47fb68129d60ce1923b26cce1b7915ab6576d0c5f6c8ee889736971be166b4623
diff --git a/dev-python/soya/files/soya-0.15_rc1-glu.patch b/dev-python/soya/files/soya-0.15_rc1-glu.patch
deleted file mode 100644
index 39463e725a5e..000000000000
--- a/dev-python/soya/files/soya-0.15_rc1-glu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/setup.py b/setup.py
---- a/setup.py	2010-01-18 15:39:57.000000000 -0600
-+++ b/setup.py	2012-07-19 21:19:48.054609136 -0500
-@@ -109,7 +109,7 @@ if endian == "big":
- if sys.platform[:3] == "win":
- 	LIBS = ["m", "glew32", "SDL", "SDL_mixer", "freetype", "cal3d", "stdc++", "ode"]
- else:
--	LIBS = ["m", "GLEW", "SDL", "freetype", "cal3d", "stdc++","ode"]
-+	LIBS = ["m", "GLEW", "GLU", "SDL", "freetype", "cal3d", "stdc++","ode"]
- 	FRAMEWORKS=[]
- 
- SOYA_PYREX_SOURCES  = ["_soya.pyx", "matrix.c", "chunk.c"]
diff --git a/dev-python/soya/metadata.xml b/dev-python/soya/metadata.xml
deleted file mode 100644
index 3d4429370ed8..000000000000
--- a/dev-python/soya/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/soya/soya-0.15_rc1-r1.ebuild b/dev-python/soya/soya-0.15_rc1-r1.ebuild
deleted file mode 100644
index d386e503afbc..000000000000
--- a/dev-python/soya/soya-0.15_rc1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python2_7)
-
-inherit distutils-r1 eutils
-
-MY_PN="Soya"
-MY_PV="${PV/_}"
-MY_P="Soya-${MY_PV}"
-TUT_P="SoyaTutorial-0.14"
-
-DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
-HOMEPAGE="https://home.gna.org/oomadness/en/soya3d/index.html"
-SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2
-	doc? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )
-	examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-games/ode-0.14[-double-precision]
-	dev-python/editobj
-	dev-python/pillow
-	>=dev-python/pyopenal-0.1.6
-	media-fonts/freefonts
-	>=media-libs/cal3d-0.10
-	media-libs/freeglut
-	>=media-libs/freetype-2.1.5:2
-	>=media-libs/glew-1.3.3:0
-	>=media-libs/libsdl-1.2.8[opengl]
-	media-libs/openal
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glu.patch"
-)
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}/${MY_P}" "${WORKDIR}/${MY_PN}"
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto /usr/share/${PF}
-	if use doc; then
-		cd "${WORKDIR}/${TUT_P}/doc"
-		doins soya_guide.pdf pudding/pudding.pdf
-	fi
-	if use examples; then
-		cd "${WORKDIR}/${TUT_P}"
-		doins -r tutorial
-	fi
-}
diff --git a/dev-python/sphinxcontrib-documentedlist/Manifest b/dev-python/sphinxcontrib-documentedlist/Manifest
deleted file mode 100644
index e62cb494c3d4..000000000000
--- a/dev-python/sphinxcontrib-documentedlist/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST sphinxcontrib-documentedlist-0.6.tar.gz 4983 BLAKE2B be38fadb91bb6763894de1c1f5e768926979bcf3b4d0e87e6032289222c82682bb98b61ebc0eb585e80c12abf9396fd529866ba074daa3be55007d1195110ab7 SHA512 9d7f14400b2a3e9b96f01ac003f70c0f7112d9286b2a978495f3089fe94137b034835bd91944e5709fb22553c30c9c324558c9a38ae82b932e1f2ba7f6927dd9
diff --git a/dev-python/sphinxcontrib-documentedlist/metadata.xml b/dev-python/sphinxcontrib-documentedlist/metadata.xml
deleted file mode 100644
index bf6d25a16108..000000000000
--- a/dev-python/sphinxcontrib-documentedlist/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <upstream>
-    <remote-id type="pypi">sphinxcontrib-documentedlist</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.ebuild b/dev-python/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.ebuild
deleted file mode 100644
index d3065debd0c5..000000000000
--- a/dev-python/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to convert a Python list into a generated table"
-HOMEPAGE="https://github.com/chintal/sphinxcontrib-documentedlist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index f6f9348b4134..f9569de5dd16 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1 +1,2 @@
 DIST threadpoolctl-2.0.0.tar.gz 23349 BLAKE2B d7752d862f8de5d61a95dd2e0db9a9cf5b3fde4c13cad9f654c0af4e2277b8bcc36b79028fbdf0e14af35daacee4b01a8778462364e070eaa194af65f4274739 SHA512 8ce823a6aef9f6d6af73e848c7a3bb1c7eee3f94bf480ca056ed5f435655756b9ad26cb71e392689cd8e6a34ee1ddfcf0d8510e424ac9c05bb1eda679d0f7a93
+DIST threadpoolctl-2.1.0.tar.gz 25255 BLAKE2B 3afa8e8c44567d3833dee89e761b2f384129c386c5c5b9d8084c1b301f007be7f461f1ef99738e06551f793feefa5c312dce1d608e7012215fd759866a52e2d4 SHA512 09b745b0d164bf3fc4f293bd92f1fd2e02180ec538bf3da1cdb986e31d9336ba3e1301aede72f53700d00298bae7b91b4ec8fa3212accb4cde6c3f5f88ff5c62
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
new file mode 100644
index 000000000000..1d26d7c49723
--- /dev/null
+++ b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Limit the number of threads used in native libs that have their own threadpool"
+HOMEPAGE="https://github.com/joblib/threadpoolctl"
+SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+# tests require openmp python bindings...
+RESTRICT=test
+
+distutils_enable_tests pytest
diff --git a/dev-python/thriftpy/Manifest b/dev-python/thriftpy/Manifest
deleted file mode 100644
index 9e88123484b2..000000000000
--- a/dev-python/thriftpy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST thriftpy-0.3.9.tar.gz 208164 BLAKE2B 5ceb0479468cf7ee88f244163a247c878decdcf54844992b839259fd5be3fc8f0453bc861336ab4f21f4dc6c218eb2dc0a0fb2efa956675885bf710b8c32a86e SHA512 ad2b7f568db47f7f26235fc5fb6180c974eb6738f154461860c7329d263252ee627b979098c3e9ffe8ed42a0fb08a9110a6842a923ac800166d80a23d4e6a3cb
diff --git a/dev-python/thriftpy/metadata.xml b/dev-python/thriftpy/metadata.xml
deleted file mode 100644
index a4c2a1587b1a..000000000000
--- a/dev-python/thriftpy/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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>
-  <longdescription lang="en">
-    Thrift is a software framework for the development of reliable and
-    performant communication and data serialization. It combines a software
-    stack with a code generation to build services that operate seamlessly
-    across a number of different development languages.
-    This is a pure Python implementation of Apache Thrift.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">thriftpy</remote-id>
-    <remote-id type="github">eleme/thriftpy</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/thriftpy/thriftpy-0.3.9.ebuild b/dev-python/thriftpy/thriftpy-0.3.9.ebuild
deleted file mode 100644
index da8d82fd4c48..000000000000
--- a/dev-python/thriftpy/thriftpy-0.3.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of Apache Thrift"
-HOMEPAGE="https://thriftpy.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/toro[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/toro/Manifest b/dev-python/toro/Manifest
deleted file mode 100644
index c04c51318e42..000000000000
--- a/dev-python/toro/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST toro-1.0.1.tar.gz 57343 BLAKE2B 2269aa9d99eda60013c695c9acbf4f808562c0d7f4a79ee7d7402255af2ff600ad292949ac789b7a7c9429009cec41587052440e64f99edb7f88646dabd3b814 SHA512 a8a498868ff32dbd8ba9a0adf62b1fa2e9dea4f34be4e2701c08c7b58ef28b8daf4eab93916855a711a557049e587e886d6ba362487c151c5db34f6135f4f3e5
diff --git a/dev-python/toro/files/toro-1.0.1-no-test-install.patch b/dev-python/toro/files/toro-1.0.1-no-test-install.patch
deleted file mode 100644
index 637f9091ac42..000000000000
--- a/dev-python/toro/files/toro-1.0.1-no-test-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py.orig	2017-06-27 18:38:37.256325950 +0000
-+++ b/setup.py	2017-06-27 18:38:48.896243950 +0000
-@@ -45,8 +45,6 @@
-     kwargs['use_2to3'] = True
- 
- packages = ['toro']
--if "test" in sys.argv:
--    packages.append('test')
- 
- setup(name='toro',
-       version='1.0.1',
diff --git a/dev-python/toro/metadata.xml b/dev-python/toro/metadata.xml
deleted file mode 100644
index 4c2e3c639608..000000000000
--- a/dev-python/toro/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <!--maintainer-needed-->
-  <longdescription>
-    A set of locking and synchronizing primitives analogous to those in Python’s
-    threading module or Gevent’s coros, for use with Tornado’s gen.engine.
-  </longdescription>    
-  <upstream>
-    <remote-id type="pypi">toro</remote-id>
-  </upstream>
-	<origin>gentoo-staging</origin>
-</pkgmetadata>
diff --git a/dev-python/toro/toro-1.0.1.ebuild b/dev-python/toro/toro-1.0.1.ebuild
deleted file mode 100644
index 63cca62f741e..000000000000
--- a/dev-python/toro/toro-1.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Synchronization primitives for Tornado coroutines"
-HOMEPAGE="https://github.com/ajdavis/toro/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-no-test-install.patch
-)
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index 5a541b16fd50..c907a6f75042 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hawkowl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
index bf9661e38d1c..a50edc6e731b 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"