gentoo (leap year) resync : 29.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-29 18:01:47 +0000
commit: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree: 9f47ee47c31a0f13f9496879cd88a1042550aa81 /dev-python
parent: 53cba99042fa967e2a93da9f8db806fe2d035543 (diff)
682 files changed, 3165 insertions, 9922 deletions
diff --git a/dev-python/BitVector/BitVector-3.4.9.ebuild b/dev-python/BitVector/BitVector-3.4.9.ebuild
new file mode 100644
index 000000000000..d996f372ccd0
--- /dev/null
+++ b/dev-python/BitVector/BitVector-3.4.9.ebuild
@@ -0,0 +1,21 @@
+# 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="A pure-Python memory-efficient packed representation for bit arrays"
+HOMEPAGE="https://engineering.purdue.edu/kak/dist/ https://pypi.org/project/BitVector/"
+SRC_URI="https://engineering.purdue.edu/kak/dist/${P}.tar.gz"
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+python_test() {
+	"${PYTHON}" TestBitVector/Test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/BitVector/Manifest b/dev-python/BitVector/Manifest
index 0357233e686c..5b2b13e96ea0 100644
--- a/dev-python/BitVector/Manifest
+++ b/dev-python/BitVector/Manifest
@@ -1,5 +1,7 @@
 DIST BitVector-3.4.7.tar.gz 125013 BLAKE2B 8bd058c485d630755c0c06d4fee0e23c00a32a341d86f92aa22a48aaedf6ececb10bdae22e60a5bdb83f54c013fde8a914266deb64948ded0b2b95f5a4e4168c SHA512 5f9c9d13de6bec4b982a98564561b250152ba0ebdc119c75ddaf3822451dabe417d023fa529fd0ab8f583f86209369937b803d3ed0809ebeb312886504d96dfe
 DIST BitVector-3.4.8.tar.gz 126947 BLAKE2B 5033564af4b69b1191ff8317523067b739839e83ed6d9c2c7e3f0910f67635d9d6e8712fabd722971a4652afb6466ae08c7aebe711711e4503a08284f11eb28c SHA512 22d76c33d407b7ff2b0493ed4949189d7fc9ea8fd7497610014ede5f27756b5f91678a5f2da5db5e04f9e85e98378001d0edb5a8c2e3053083d18e547799f3f1
+DIST BitVector-3.4.9.tar.gz 128306 BLAKE2B c9559596dee2d9315e9a906e24d4d67ff74c56e2a0f94ccf7dafd360a5554b46f61a7e7e5bc30fa6a4175c97f6d42022468966ab123250319d36f65b23624079 SHA512 be2144a35990b46aa2cbd71d65db51baac5fec65d4c91a1e2222857b307c96f5551adf1c5a86f145f01fa895465b99bc02a485d5d7a43495dd1e05b9a0d9d513
 EBUILD BitVector-3.4.7.ebuild 641 BLAKE2B 90ca4ad961e592bf355d206def4c9d61c373120a5e3f17596f6054ae84d014bf3280065a32a97467408dfb21168e90c9f6ca938ac41248ce836955e81f76d98a SHA512 051ef92c1b51014ea5fbc8d89f58fb347b4ee00bbbfb99e8396decc240ce01ce3791a120568a37d5a014f1544fd85dc92dbddc5d9986a3f6b929c400c65666f0
 EBUILD BitVector-3.4.8.ebuild 644 BLAKE2B 8582318b5e2747fd0f65b34f2fb15bd75ed07e9a405a82b6ad06d1c866398f5ab89d36edd1e2343d6d8059fb8f13b79d1603041a0adb85c4656838448eb7f75b SHA512 fce0070a5bd96ec7bfafc8d4dbd1e91ffe1ce0f57337ef0d561d65a541a87553d82e4371caf5356c421d1261b33e54c9bc1721d36a15ac026a370118e60b81f5
+EBUILD BitVector-3.4.9.ebuild 637 BLAKE2B 4cd635c313e023dcaf02944c627e4df3ad1db6502eb6138d2e516860ba50223bfdb5180ee99c2b3c40b7399b49581242e41380829a87bb979f93ff22d1117deb SHA512 ee51fa16eae8aee26e8f098c76c2784b6f08b09ded7ea6712e0189079e89ea4c25b5fe36be5f6c35a06c1e53cb5d548c313134298e3483dd880679d80a2c49e3
 MISC metadata.xml 456 BLAKE2B 28bb633e8da03c0f1ecc36ea797b9a29c579c226ea6a2c66f87d9639fb508c71b779cebcd5d6fd748ad2dcd28eb1ad6c39579888bac6fd682c1fc19069a8abe8 SHA512 e1f71284088a9a68ca91f5f55e286090ed8e836f67caede5a7f875ee27ba93f435a73e5f6b0c33c0bdfa670a1a006e8583f6fa3aabaf80b9a8ba82c3c72ff72e
diff --git a/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild b/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild
deleted file mode 100644
index 8ae32e018a2e..000000000000
--- a/dev-python/Flask-KVSession/Flask-KVSession-0.6.1.ebuild
+++ /dev/null
@@ -1,27 +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
-
-DESCRIPTION="Transparent server-side session support for flask"
-HOMEPAGE="https://pypi.org/project/Flask-KVSession/ https://github.com/mbr/flask-kvsession"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/simplekv-0.9.1[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.20[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild b/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild
deleted file mode 100644
index 74f6577d1821..000000000000
--- a/dev-python/Flask-KVSession/Flask-KVSession-0.6.2.ebuild
+++ /dev/null
@@ -1,27 +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
-
-DESCRIPTION="Transparent server-side session support for flask"
-HOMEPAGE="https://pypi.org/project/Flask-KVSession/ https://github.com/mbr/flask-kvsession"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
-	>=dev-python/simplekv-0.9.1[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	>=dev-python/itsdangerous-0.20[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/Flask-KVSession/Manifest b/dev-python/Flask-KVSession/Manifest
deleted file mode 100644
index 9964a2c09d22..000000000000
--- a/dev-python/Flask-KVSession/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Flask-KVSession-0.6.1.tar.gz 37725 BLAKE2B 5969bceb28896f150e8ae54922d43b7ac820f6e4c25ff542f7b8a86026bbf6325eae9e7782c9aec0a9b12a960f932d6a153c5ba5cf010b03f7079977ab2ed918 SHA512 a0de01d546996c0f09d1cfa2c537fb3868717bcfcdbd3f3f93c2102349bdd1e9fd00d1efcf1c3a80f9cddf173ed43781774e75c7cf1114a1aff549c1f98160da
-DIST Flask-KVSession-0.6.2.tar.gz 38037 BLAKE2B 78c4e888f3b2840fa18c6a704279d5661574e6f63c6db9396d467639546a52bfa0ebcf34c2dbe334ff3acef0afd70efe19ab72dc7c745f53330f793cbc76c67f SHA512 11cbb4ee74dc2a1b44dd1f91729dfb65fc9beb9d93c86ce06a861eba8bd87139897a9f6dca0b5f7f8249034b5eeb3c93327e956b4ea34cd409adfc889b75e33b
-EBUILD Flask-KVSession-0.6.1.ebuild 712 BLAKE2B 1b8965d212715a3a9892e4b14052d98e4c1ec2f5bc22c4853bb13c709ed0b4c2f0ca352fa40dff7feacd25e9dc17bf67ad6061bfd9aab34816f027da0973c7ed SHA512 9be87daf368ade17ee4a73a0a9cdd8ec1257f08e28ea0907f16427fbd48ab26bc3178c1ed5e2958fad6ea486b957f255c24679427cacbd080722f453d34c5ec6
-EBUILD Flask-KVSession-0.6.2.ebuild 713 BLAKE2B 0243d512a09c6c0e7ec03bc270e5eefed7930a781073293bb00bd2e6e4994419daea09b6639cb8006f964d4fe59ddb7f737a783a7873938a2c4e77047e59f4a5 SHA512 ae5916875c558edfbdbf0741b49350c5b7f425cc3d9dfb766f78c47cfef9657cb2d0f35cc2db7d2bdfefea260c78356f016cd3c0fa44a469978b76188c2829a6
-MISC metadata.xml 583 BLAKE2B 88be751f2e21bf4abd547af81bdcb454eda881ccf68eef4ca03f65c76b2e24e0676eb2e0bc63717cd393c7d40e662a128b804608f5f90ba78d4de3e5731e113d SHA512 e1fabb6bb89099468f692683e24d314afaed946913f76f62c22c951cd21c237c9f1353151329bc871634dc8b70c43b9efbc296f16b20b3a34d919deed57fe052
diff --git a/dev-python/Flask-KVSession/metadata.xml b/dev-python/Flask-KVSession/metadata.xml
deleted file mode 100644
index babcc32e8924..000000000000
--- a/dev-python/Flask-KVSession/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>aballier@gentoo.org</email>
-    <name>Alexis Ballier</name>
-    <description>Python team can take the package if they wish.</description>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">Flask-KVSession</remote-id>
-    <remote-id type="github">mbr/flask-kvsession</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 3f238f8136fb..ead79a409967 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index d896b52c7319..92d6599198db 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -2,6 +2,6 @@ DIST PyGithub-1.44.1.gh.tar.gz 2866013 BLAKE2B 90ca7f21fe0031c6cc6d50f54facd7c08
 DIST PyGithub-1.45.gh.tar.gz 2881912 BLAKE2B 0117608298f6b5d522f451382ea058a9dc507dbf15b31542f4039da8105cf0cb002ac17b5c5c321e465f97dce20699de0d319010c478a5c9d30529e885516e42 SHA512 24ff3c75f5578f5e0df59fa1a02511747857984d7bd4ae1b3d0a3b41a0eee79df9732d39ee5026978b70a71746826e92f27cc44b8362b6bd3e7dd4edb1654acd
 DIST PyGithub-1.46.gh.tar.gz 2882667 BLAKE2B a65a359750c146947b69ff72a4775f6f1532420c3d15e0d7df34c69c3c552aa201740c1ea2cff2dd40daddf7cdc7743b4354698e1bc701f175a5f7dcfc83dd97 SHA512 1c03920434491b279e1709550a658ff125c0d91390160b1de5e5fadf5cf5eeb722477fd913f47ec686cce052a8c34d916de753ea36fecb227d955e60d064a0b6
 EBUILD PyGithub-1.44.1.ebuild 1192 BLAKE2B 96919c9ddda54d07fb81d7ceb47dc9890bf72dbaf0d8cfe55b7b3d83f7f0220e3e3b7b4d2115e75d2aa6a9fc81a0c829e4258359dc2021adb4a8838c45d93409 SHA512 4f6084e373bdd01b89fca3ee9dd98231a19a639d01112ae693199e360c21058421ee883b9808745697e8459b2cdef20e599b7fff0bc5a349029ae61c1eabad85
-EBUILD PyGithub-1.45.ebuild 1040 BLAKE2B 45cf3b2dab3bf1eb76b8e80c2fcf30032baa63ef60c91c10c6e129297591f94371c20bdaa5f991ddbc87edca7a50f97480d99151f27ade47e3e0faa7d2b9dda4 SHA512 721fb4583305d5f62deb8f743f858d25dd96508a05e9b8b87cf02c707912cc53fc51b64adfa2b5c61302861fb7bfdf7bbd5130f422a8fbe87be8c5a4cb401869
+EBUILD PyGithub-1.45.ebuild 1039 BLAKE2B 66fe6052c858e10e05c75b93b3b793a314fac3ae48f0363a05938461d64ee9b6a78191e61a9742930318a15ac75e1f17f461d851dee9580feb6678611d494dde SHA512 972c255f60675728c4e25cec35a5f3e0ac5986e98e774e7359d54bbed4b3c1eafe1dca1f7f9d9d58ea1ab4c024d7fb89c40e99d1aa4742decc69ec0785c3b210
 EBUILD PyGithub-1.46.ebuild 973 BLAKE2B a59d973368390e5e0320fba7b077fc7e63b94bba59540a0062a118f7a50e6de43492e90ec93c439ee341c4841172ad195a3ef682588f61650b577b86a91fe17c SHA512 dcd59da914da809ae7a01b3cc106dd434575d85499dcf8eb8e6dbf653abf7694244d38e2226324509a0289648fe862e1e3a536a64cbac7247391db8d2b36325b
 MISC metadata.xml 446 BLAKE2B e5a5f28e076db18ae39b757db4c480cc7d77314361c050df12276a8770c117140670067c4d1785d7a21fadd1d3435f7245a85f2bb251c57539315bcd97faadb8 SHA512 e29338330c42ccefee0ebeef682c8877a37c01c10ab9976988f846fb8c6d0a02114d0447a682499ff306810d2c12535a3cb031c9728eea016907382cca8ee1b1
diff --git a/dev-python/PyGithub/PyGithub-1.45.ebuild b/dev-python/PyGithub/PyGithub-1.45.ebuild
index 743af1343397..542c7f4c60dc 100644
--- a/dev-python/PyGithub/PyGithub-1.45.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.45.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/PythonQt/Manifest b/dev-python/PythonQt/Manifest
index 6b842b2cd81e..914dd6acb0a8 100644
--- a/dev-python/PythonQt/Manifest
+++ b/dev-python/PythonQt/Manifest
@@ -1,4 +1,5 @@
 DIST PythonQt3.2.zip 4539058 BLAKE2B c50b8333b71b6cbce6f372a0292a0ccfe791dc7eae5c660d4e6d1f5f2b3355644e3fd8cce9a514f0500e935f96c46976d0046ddd716465adb35d225e3c4cfeca SHA512 1ee0f50f5035568b38e945108f5496ba64355c6357c1ea8dfc17ad90fa360540769f94e0b3e0e398176e8a21c8afe139607f0b5a2e82c63f1cbd40201a25e0f0
+EBUILD PythonQt-3.2-r1.ebuild 2224 BLAKE2B 0b590d63fcb92ca4e548f28fbd37f275152b9c6c331c05de7953f74a5d71771992b808313eade75aa79c05b85c0dc60b92610aae046a82bc46d292c14756c9ab SHA512 9bb755b617465bab02aa08e93345c5f33bff4767a56d4ab377ef7302518e1b8adaeaf1ec5e2072db93e30781f386a694248f81c4dd7e9ce38c5122908e4ac113
 EBUILD PythonQt-3.2.ebuild 1830 BLAKE2B 60fddae8406ff05b2133d6b7828ac1159203af906f4f10adf0ae7541ef21271be9874384e3b400f3d8973e8597833eeffd6d6f64f1067ccc51f1b4591f9150fc SHA512 6081de0ba1fc3f5584406133138e079644f741b3f43faa5ee61a2ac056ad6ef72936a1580bae0f4294659cb853a376d650d647c02b870da306615278086b34c7
-EBUILD PythonQt-9999.ebuild 1851 BLAKE2B ca5b5040a0948ebd8709eac0b520eed10458c35e9d40b8e7cbf376eb099dba42d6a94a710d0308ce5a74540700e6ef7b5c5a027132e3ce3092c216aa2cd3c9f8 SHA512 5a27f443daa1e773aac1a2805c35369b9fe8a27b956a31da449daa67a2ed876b22bf8fe458ba0e79f85e063f0fef98bf050e21667fb85d97d4351d1e9c090f2c
-MISC metadata.xml 971 BLAKE2B 4a9f0fd3832f83eb46ef65a18774c998daeb9544b1ac6a23a189b909c7e4168031a68d56952d9ed2b7b76fb8fc3a912e77d162cb94e73405f285bd834644fb98 SHA512 565d8517faba162fa855acef4dc659af22954796a25da9479d7ec530afee16606904b6bfba9a568e6caa8c47f3195401eefc3a9048077e73582cf7357cafce5e
+EBUILD PythonQt-9999.ebuild 2194 BLAKE2B 7f941f9c401c4a5df689ea5e3145d64ecae92a46df48f5a9332e5e2eea5613360924fd96ad9ab7cbda4aa490f0a51cdb8804de23a6be16531802c485d1b121b4 SHA512 79fb1ca958f29ad8ec9a43d8fa14e50291cc7a153a585e9b95e88f4baa689bfb88ee4d17313d3b23e70402f54b2d77e330e97621caa8bafe2bd7483784aac2e3
+MISC metadata.xml 921 BLAKE2B a9b1a1daef268107c78f143e9ffeaace6c6305575eaf5fe4894cdaaa2fd0f6551d16a3ae8a0e70fc5b19ca1817e71ab56ec2134259703e28df9d1b6e0f004f30 SHA512 237e70d7b8535adbbcf1a2e5f44e1b6053ef930ec2122ee56ae2e9f702d741e5630862d2143562e8a8562e0f9af38f4fac47981d9be79b689f3b515c63a634ac
diff --git a/dev-python/PythonQt/PythonQt-3.2-r1.ebuild b/dev-python/PythonQt/PythonQt-3.2-r1.ebuild
new file mode 100644
index 000000000000..39deaa6db272
--- /dev/null
+++ b/dev-python/PythonQt/PythonQt-3.2-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+MY_P=${PN}${PV}
+
+inherit qmake-utils python-single-r1 virtualx
+
+DESCRIPTION="A dynamic Python binding for the Qt framework"
+HOMEPAGE="https://mevislab.github.io/pythonqt"
+SRC_URI="mirror://sourceforge/pythonqt/pythonqt/${P}/${MY_P}.zip"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc examples +extensions test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	extensions? (
+		dev-qt/designer:5
+		dev-qt/qtdeclarative:5[widgets]
+		dev-qt/qtmultimedia:5[widgets]
+		dev-qt/qtnetwork:5
+		dev-qt/qtopengl:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtsql:5
+		dev-qt/qtsvg:5
+		dev-qt/qtxml:5
+		dev-qt/qtxmlpatterns:5
+	)"
+DEPEND="${RDEPEND}
+	dev-qt/qtxml:5
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="app-arch/unzip
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+
+	if ! use examples ; then
+		sed -i '/SUBDIRS/s/examples//' PythonQt.pro || die "sed for examples"
+	fi
+	if ! use extensions ; then
+		sed -i '/SUBDIRS/s/extensions//' PythonQt.pro || die "sed for extensions"
+	fi
+	if ! use test ; then
+		sed -i '/SUBDIRS/s/tests//' PythonQt.pro || die "sed for test"
+	fi
+
+	# Remove webkit support
+	sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
+		extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
+		|| die "sed for webkit"
+
+	# Unset python version to use python-config
+	sed -i "/unix:PYTHON_VERSION=/s/2.7//" build/python.prf \
+		|| die "sed for python version"
+}
+
+src_configure() {
+	eqmake5 CONFIG+="$(usex debug debug release '' '')" PREFIX="${ED}"/usr
+}
+
+src_test() {
+	LD_PRELOAD="${S}"/lib/libPythonQt-Qt5-Python"$(usex debug _d '' '' '')".so.3 \
+		virtx ./lib/PythonQtTest"$(usex debug _d '' '' '')"
+}
+
+src_install() {
+	einstalldocs
+
+	# Includes
+	insinto /usr/include/PythonQt
+	doins -r src/*.h
+	insinto /usr/include/PythonQt/gui
+	doins -r src/gui/*.h
+
+	if use extensions ; then
+		insinto /usr/include/PythonQt/extensions/PythonQt_QtAll
+		doins -r extensions/PythonQt_QtAll/*.h
+	fi
+
+	# Libraries
+	dolib.so lib/libPythonQt*
+}
diff --git a/dev-python/PythonQt/PythonQt-9999.ebuild b/dev-python/PythonQt/PythonQt-9999.ebuild
index e142455bfc08..01939249e831 100644
--- a/dev-python/PythonQt/PythonQt-9999.ebuild
+++ b/dev-python/PythonQt/PythonQt-9999.ebuild
@@ -1,23 +1,24 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
+EGIT_REPO_URI="https://github.com/MeVisLab/pythonqt.git"
 
-MY_P=${PN}${PV}
-
-inherit qmake-utils python-single-r1 subversion
+inherit git-r3 qmake-utils python-single-r1 virtualx
 
 DESCRIPTION="A dynamic Python binding for the Qt framework"
-HOMEPAGE="http://pythonqt.sourceforge.net/"
+HOMEPAGE="https://mevislab.github.io/pythonqt"
 SRC_URI=""
-ESVN_REPO_URI="https://pythonqt.svn.sourceforge.net/svnroot/pythonqt/trunk"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS=""
-IUSE="doc +extensions webkit"
+IUSE="debug doc examples +extensions test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-qt/qtcore:5
@@ -34,37 +35,44 @@ RDEPEND="${PYTHON_DEPS}
 		dev-qt/qtsvg:5
 		dev-qt/qtxml:5
 		dev-qt/qtxmlpatterns:5
-		webkit? ( dev-qt/qtwebkit:5 )
 	)"
 DEPEND="${RDEPEND}
 	dev-qt/qtxml:5
+	test? ( dev-qt/qttest:5 )"
+BDEPEND="app-arch/unzip
 	virtual/pkgconfig
 	doc? ( app-doc/doxygen )"
 
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="webkit? ( extensions ) ${PYTHON_REQUIRED_USE}"
-
 src_prepare() {
 	default
 
+	if ! use examples ; then
+		sed -i '/SUBDIRS/s/examples//' PythonQt.pro || die "sed for examples"
+	fi
 	if ! use extensions ; then
 		sed -i '/SUBDIRS/s/extensions//' PythonQt.pro || die "sed for extensions"
 	fi
-	if ! use webkit ; then
-		# Remove webkit support if not used
-		sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
-			extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
-			|| die "sed for webkit"
+	if ! use test ; then
+		sed -i '/SUBDIRS/s/tests//' PythonQt.pro || die "sed for test"
 	fi
 
+	# Remove webkit support if not used
+	sed -i '/qtHaveModule(webkit):CONFIG += PythonQtWebKit/d' \
+		extensions/PythonQt_QtAll/PythonQt_QtAll.pro \
+		|| die "sed for webkit"
+
 	# Unset python version to use python-config
 	sed -i "/unix:PYTHON_VERSION=/s/2.7//" build/python.prf \
 		|| die "sed for python version"
 }
 
 src_configure() {
-	eqmake5 PREFIX="${ED%/}"/usr
+	eqmake5 CONFIG+="$(usex debug debug release '' '')" PREFIX="${ED}"/usr
+}
+
+src_test() {
+	LD_PRELOAD="${S}"/lib/libPythonQt-Qt5-Python"$(usex debug _d '' '' '')".so.3 \
+		virtx ./lib/PythonQtTest"$(usex debug _d '' '' '')"
 }
 
 src_install() {
diff --git a/dev-python/PythonQt/metadata.xml b/dev-python/PythonQt/metadata.xml
index 1b4473ec0080..32c82921dccc 100644
--- a/dev-python/PythonQt/metadata.xml
+++ b/dev-python/PythonQt/metadata.xml
@@ -9,18 +9,18 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-	<longdescription>
-PythonQt is a dynamic Python binding for the Qt framework.
-It offers an easy way to embed the Python scripting language into your C++ Qt applications.
-The focus of PythonQt is on embedding Python into an existing C++ application,
-not on writing the whole application completely in Python.
+	<longdescription lang="en">
+	PythonQt is a dynamic Python binding for the Qt framework.
+	It offers an easy way to embed the Python scripting language into
+	your C++ Qt applications. The focus of PythonQt is on embedding Python
+	into an existing C++ application, not on writing the whole application
+	completely in Python.
 	</longdescription>
 	<use>
 		<flag name="extensions">Install extensions</flag>
 	</use>
 	<upstream>
-		<changelog>https://sourceforge.net/p/pythonqt/news/</changelog>
-		<doc>http://pythonqt.sourceforge.net/index.html</doc>
+		<remote-id type="github">MeVisLab/pythonqt</remote-id>
 		<remote-id type="sourceforge">pythonqt</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 4a242c457878..1107f5d29c65 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,5 +1,3 @@
-DIST QtPy-1.4.2.tar.gz 27471 BLAKE2B d70de67944a4019031b52cd3f6c588261537a74ce8b968d9577b016d18767e3e2b6981dae983573bd1644949b13ee271a10beaef9a371ac41b3cd1b9cb506cb2 SHA512 eb8a059f110f3262ab62f8198019b9826a5b834da62e59791fb3a6c235eb797291e4f180b31704d7d61811791e5b245a05b57fc385de358480561508e3b29a4d
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
-EBUILD QtPy-1.4.2.ebuild 1051 BLAKE2B b5f4cc6c05fc89e9a66202a00d0f75637e3baf86604d0a176534f41d277469e403a92723f091c4f9ae42016e70be9c74db72e379e0a36cb005de55951629ffd4 SHA512 28a5622fb126357ffdd7dde0fe8d2815fd93f1e10bd980148ae6f6c4253bc0209abb75401abd803ec126f4d50266e45d92943771647f3af249c36dfb30ef4043
-EBUILD QtPy-1.9.0.ebuild 939 BLAKE2B 8004d11a8cb8cb73d6f0e1da6e5918437feb12365c38624f1653c58a49fd357dfb2eb78ab83123e576159ccb78abbf4551aec1410ae96a3c0717c619b593140a SHA512 686a66ffa14d2f26b63c421249b29ff1ecac6338a69db702ce43251bfe652eb615ee01e400abf9d2373e419bb6f3409a04f5cf16a6889dc919e95da8c507fe23
-MISC metadata.xml 1338 BLAKE2B 7eee8e39324b18bd84a076882dc539fe2e18f38ec68a539ab40968a3a6023ac0cdfc6899305df0ef0c7561409ca81526d474a1154fb645dccdffdb0779282b12 SHA512 08a2e0b2d0aaecaf91bffb82dbba9d24d4b4753801610102db08c3e29b3ff51f1bd6d46f9c2a706f4b9a887be781a97ead1c753631717f82cd44080d44b67c4c
+EBUILD QtPy-1.9.0-r1.ebuild 922 BLAKE2B 7dfdf4e60ad786103de6dfc0973d820b28b9478e8be38f9fd2c592d7b3f4ffda593c8e28478a804ede8ecbbc8e545c734b0d2b9aad7894f8a322c22b0f1f85ef SHA512 b2341cfa6dc8e65c2d54624547ddccb6df96fab065184b054ed14d389de958e6c8ac63fbf153d7b7af5190e044f817e4c65966ca739fd667fa4849db6e53e073
+MISC metadata.xml 1268 BLAKE2B 6efd4418ad56825334d01ac1a8fdc56697dbc80f8d5e915b73b366b3bb7f8d9d1f8ae664e666d19f0088ab05de8454335ee940fbc9e58a32e65a025378744602 SHA512 968f8cd0f4dfcb3217d100f88d41ec3f3301dc70c1f2648698967783161d2f7cfa816edb6dcc5f83aceda6693fb92bdf0d4a2acde7ad00c3ebc5bd8146b51b42
diff --git a/dev-python/QtPy/QtPy-1.4.2.ebuild b/dev-python/QtPy/QtPy-1.4.2.ebuild
deleted file mode 100644
index 6eb7616e6d79..000000000000
--- a/dev-python/QtPy/QtPy-1.4.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1
-
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="designer gui opengl svg testlib webkit webengine"
-
-RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
-	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
-	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
-	webengine? ( || (
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		dev-python/PyQt5[webengine?]
-	) )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
-	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
-}
diff --git a/dev-python/QtPy/QtPy-1.9.0.ebuild b/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
index 85c3f572b63e..3317738568c8 100644
--- a/dev-python/QtPy/QtPy-1.9.0.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,11 +13,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="designer gui opengl svg testlib webkit webengine"
+KEYWORDS="amd64 x86"
+IUSE="designer gui opengl svg testlib webengine"
 
 RDEPEND="
-	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?,webkit?]
+	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,svg?]
 	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
 	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
 	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index e1b8d6e3aa72..076f782a9d63 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -21,7 +21,6 @@
     <flag name="svg">Build bindings for the QtSvg module</flag>
     <flag name="testlib">Build bindings for the QtTest module</flag>
     <flag name="webengine">Build bindings for the QtWebEngine module</flag>
-    <flag name="webkit">Build bindings for the QtWebKit module</flag>
   </use>
   <upstream>
     <remote-id type="github">spyder-ide/qtpy</remote-id>
diff --git a/dev-python/aldryn-boilerplates/Manifest b/dev-python/aldryn-boilerplates/Manifest
deleted file mode 100644
index 59399c8d35c4..000000000000
--- a/dev-python/aldryn-boilerplates/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aldryn-boilerplates-0.7.5.tar.gz 8550 BLAKE2B 11be4c7bce5fde173ba553995a41ae597b9c396892c88320ffce64da5299506683f31a96175f214dc20361b83e1c9f4b37f2b283e7d843604a8aaadfe37c2dca SHA512 63aabe996bb89433bfd649890c0bfddd39d7a65efe4e6a5d1141caad2a87df8b0078c72a48d2fec02794d976cf92804fc5ddc549b31ad83184c93f8d24e0c936
-EBUILD aldryn-boilerplates-0.7.5.ebuild 618 BLAKE2B 7cc449bb2c22e5c494d67a4da1c2430057dbf5dfb626bd7e1c37a84754fc81891bf14c11496302e7b6224078c3577f11998000207b9a994ac09e627eddbe2bb3 SHA512 958831f2f357507f27e371e94339490f3a1d9afb355439ba6cfdb40ec0b574c769736ed79b4ede0caa88c18a6712eef14b1e19aba4595df09287130ec7d86994
-MISC metadata.xml 254 BLAKE2B 4a61e0cce74e3bb62268b545faa16fca60f30a7edf81bb41f23dd6c4db17da23b63e2145162b8ca402087e4b1bdbd07610c01e67c6e19178aeb1ef08950e5f79 SHA512 164c0aa149539308315815690a804353b48f57c1066b5024aab69460712e0909628165ed048ed81bbe4cee6f179b4d999eb3cf28d7960e1765f6eabc841147df
diff --git a/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild b/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild
deleted file mode 100644
index 1a12bcfeea8d..000000000000
--- a/dev-python/aldryn-boilerplates/aldryn-boilerplates-0.7.5.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Allows re-usable apps to provide sets of templates and staticfiles"
-HOMEPAGE="https://pypi.org/project/aldryn-boilerplates/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.5[${PYTHON_USEDEP}]
-	dev-python/django-appconf[${PYTHON_USEDEP}]
-	>=dev-python/YURL-0.13[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/aldryn-boilerplates/metadata.xml b/dev-python/aldryn-boilerplates/metadata.xml
deleted file mode 100644
index 55e7e1cbbb40..000000000000
--- a/dev-python/aldryn-boilerplates/metadata.xml
+++ /dev/null
@@ -1,8 +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">aldryn-boilerplates</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/aldryn-common/Manifest b/dev-python/aldryn-common/Manifest
deleted file mode 100644
index dd1ab5e16694..000000000000
--- a/dev-python/aldryn-common/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aldryn-common-1.0.4.tar.gz 13789 BLAKE2B 1b24bef79caca8b93badf54263d3c35991bcbc95a588a572047b31b02421168dbdd40e852f4252f6ac7aa12f88692f83b9529e7da94a1eda620dbee27c74496e SHA512 6c95cd0ec4ab19e2802fbb5d40a1644eb5c87c0aeae40eed5645cdedb3bde130201067b8c116d86bb68e24a3c6b4c321d7a7d99f3a312493b4c9d2fb4c3eddbb
-EBUILD aldryn-common-1.0.4.ebuild 710 BLAKE2B 62b7718f2060ab84e6a7d429cf212316f4c8a09110b1198d0220d9450904e3ed14319901ec797f1623583fe2ec1973987d9d36e05f1f67f2fde43b27eb7d2b40 SHA512 2db901635d562f391490f0767200ce75743e00a4e6db6ec78ec50ad7c6c7d73ad6c63af757698df517d0b55419bd1b4ad5491f3545e63e0b20981e725daa1df4
-MISC metadata.xml 248 BLAKE2B 40d2448a2149cb029c3f5fc389792c92a978e8c1a9e4f410aac4ae8c21e708063e4c8a98766e7770afb354b0000259498debd7aa122ccb86b71e7c8bfd62caec SHA512 dd31153d683122724800bb3baf7893a1064eabefda3d85b22ce073f26c9093b58ad85cec79e2f5b3e75fac76c3b815f6b0cd13152dc1a9d425489a29f7af73d5
diff --git a/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild b/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
deleted file mode 100644
index 42b399f6bb32..000000000000
--- a/dev-python/aldryn-common/aldryn-common-1.0.4.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="django CMS plugins with common utilities"
-HOMEPAGE="https://pypi.org/project/aldryn-common/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-python/aldryn-boilerplates[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/django-sortedm2m-1.2.2[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	sed -i 's/find_packages()/find_packages(exclude=["tests"])/g' "${S}/setup.py"
-	eapply_user
-}
diff --git a/dev-python/aldryn-common/metadata.xml b/dev-python/aldryn-common/metadata.xml
deleted file mode 100644
index b4b8c0bfa3c1..000000000000
--- a/dev-python/aldryn-common/metadata.xml
+++ /dev/null
@@ -1,8 +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">aldryn-common</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/ansicolor/Manifest b/dev-python/ansicolor/Manifest
index 12e0fd910c5f..b3564c968c16 100644
--- a/dev-python/ansicolor/Manifest
+++ b/dev-python/ansicolor/Manifest
@@ -1,4 +1,5 @@
 DIST ansicolor-0.2.6.tar.gz 6224 BLAKE2B 38ffd0e9a88c886ebad25c4f0072f2f8f833e028c3bc14eb89252c1c0b501f973c9b3e371b4c605a3b98df33eb7203a963797d3ee56cf87b0afb927b19096fd5 SHA512 44c7dc6f621fc3044d4a52acb96e7e497578e025090633bfc8cbf686d7461da018f64502b477a6090e60747481f320cebaad00ee0776c9f4c52d4abbb1812121
+EBUILD ansicolor-0.2.6-r1.ebuild 709 BLAKE2B 6ccde11f2ca1d56d12bfa9a4b648de65ae157f8b6200faee202d46309a9e4e264b65bcd5433d30d0612e878b846559360468e1d89c1e4f8d99d9bcccf23e241c SHA512 79d39303212563c35305ff73df8d751b88c4bc8550ef2380ec3873dd958adb0a623af8ef96aa836b6487464bf74da79f60228c8a039b615a83b8e43b3ffd6b62
 EBUILD ansicolor-0.2.6.ebuild 513 BLAKE2B 88bdf9a046248d159810ed78eb64bb6a84e3370a217dc37af207a0fd6820c47563f270c3b43ed28b02261902966ead2fff41679228c5a132880d6f3d68190fef SHA512 d5baba68ba67c30b249321616e6e5d4bc46bacac367c3d8fb3f3d17acbb69685c3d3e94185772886b73e3b9f21b6bf11340b29251b26f4320d8ae60c5ff6f398
-EBUILD ansicolor-9999.ebuild 649 BLAKE2B 5fe5fc92f67d6b04966ef498abe68d54414067797174fd2f1d5c4023f7b37fb0cf4bfb982d6b5085ab5bfc16a61347830335f9a1b045b894b9a5895974cf53f6 SHA512 9de36447f2948c90246f6347e79f2a461a389b598d74b82d4c937ab66d8f3152b57a0427c355428c7b13716ff9ed1a4b42c0e1a66d63b57175508e7cce9a516f
-MISC metadata.xml 298 BLAKE2B 4ca5c54a9b47e20ee8ed4520c011034049088aaa0bcb1ae7d37eb590c3f3b3d8296e71958dcb1b6342f69cb4e8edb443823bce0381f97cf80544bbe66473c122 SHA512 debf13987936d64adf35fcc48d08f306f13d2d719afb478e8c78a89eec873c17a0323a6cc7ce473c67077c5ec9ed97e8983dedd63e986e74702166c592d4a193
+EBUILD ansicolor-9999.ebuild 709 BLAKE2B 6ccde11f2ca1d56d12bfa9a4b648de65ae157f8b6200faee202d46309a9e4e264b65bcd5433d30d0612e878b846559360468e1d89c1e4f8d99d9bcccf23e241c SHA512 79d39303212563c35305ff73df8d751b88c4bc8550ef2380ec3873dd958adb0a623af8ef96aa836b6487464bf74da79f60228c8a039b615a83b8e43b3ffd6b62
+MISC metadata.xml 495 BLAKE2B 4abde6382c00405991e92ff16adaad5840999eb0d47d426991fed3528ad79d26973459c926c412bed73c402810000f4213e280a60f9720ee42e3dcfaaae1bd68 SHA512 22215a33ff2270d816624404e2f44e4553d8d03cfc1627f4475f61be0912d7b25fe740fda0317ea2ea8e85891f4e4f089b46275fec9d49672f129a16f5a076e8
diff --git a/dev-python/ansicolor/ansicolor-0.2.6-r1.ebuild b/dev-python/ansicolor/ansicolor-0.2.6-r1.ebuild
new file mode 100644
index 000000000000..25c10321fe62
--- /dev/null
+++ b/dev-python/ansicolor/ansicolor-0.2.6-r1.ebuild
@@ -0,0 +1,25 @@
+# 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
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/numerodix/ansicolor.git"
+	# pypi tars don't include tests and github repo is missing release tags,
+	# so only enabling tests for 9999 at this time
+	distutils_enable_tests pytest
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
+HOMEPAGE="https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
diff --git a/dev-python/ansicolor/ansicolor-9999.ebuild b/dev-python/ansicolor/ansicolor-9999.ebuild
index e5f2a4f1961f..25c10321fe62 100644
--- a/dev-python/ansicolor/ansicolor-9999.ebuild
+++ b/dev-python/ansicolor/ansicolor-9999.ebuild
@@ -1,27 +1,25 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
-inherit distutils-r1 git-r3
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/numerodix/ansicolor.git"
+	# pypi tars don't include tests and github repo is missing release tags,
+	# so only enabling tests for 9999 at this time
+	distutils_enable_tests pytest
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
 
 DESCRIPTION="Produce ansi color output and colored highlighting and diffing"
 HOMEPAGE="https://github.com/numerodix/ansicolor https://pypi.org/project/ansicolor/"
-EGIT_REPO_URI="https://github.com/numerodix/ansicolor.git"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	py.test -v || die "Test suite failed with ${EPYTHON}"
-}
diff --git a/dev-python/ansicolor/metadata.xml b/dev-python/ansicolor/metadata.xml
index 17e74d02f0c8..50b2ecb53677 100644
--- a/dev-python/ansicolor/metadata.xml
+++ b/dev-python/ansicolor/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>lucianposton@pm.me</email>
+		<name>Lucian Poston</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">numerodix/ansicolor</remote-id>
 		<remote-id type="pypi">ansicolor</remote-id>
diff --git a/dev-python/ansimarkup/Manifest b/dev-python/ansimarkup/Manifest
index a3f5d40c6d01..71216eb42c5c 100644
--- a/dev-python/ansimarkup/Manifest
+++ b/dev-python/ansimarkup/Manifest
@@ -1,3 +1,3 @@
 DIST ansimarkup-1.4.0.tar.gz 12533 BLAKE2B b43b1dd0d8fb950866a313b7f8bb0fe44f983aae1c8e5cbca95aad7b77ff7563e04e019622a3531228a891c6c8c16bc8d9ddbb55e9d418d8055f3eda41ce0866 SHA512 c397201f7789cbdec0d4e32ac5a4e1f130deb329535303538b48136381e7217ed7e80fe4eb586c6e2a30dc9848813c7d43bb01c0a2a6a4a29e14842bf4540c4e
 EBUILD ansimarkup-1.4.0.ebuild 733 BLAKE2B 1ffbf342966e729765a79f0f641b5001b923977e8f6111311e656e44d7939dd575beb0cfb8ddb3feeac92e675515a7745397158555b98e5e2becb53ca6601632 SHA512 2412130cc1802cb399a8638f72d6461875cc7d96fc0ca395402ab5320338e9011940ae23980d9283a6b95c8bd910357c568a206d252ee858cf7735252401a936
-MISC metadata.xml 493 BLAKE2B e57eaec5f0bda792267ee5cce190f2b1f7f1017bf5e28e28051f947143cfb9f9173311e57e9f6d490f3a59908bf0af11378f394f4c8edf2cc78466758753db57 SHA512 3c9c292a3e84dfa535eb062e3f71b0d3a8b374dae7810129473abc3f801937c2e09b489ac2f0fc66103ed4da110df661570ab8f0d9f8857f938d97d443af6793
+MISC metadata.xml 390 BLAKE2B 81e245c27b9b526a79ff54794e417c7d281b81fdcf8b9f99a0c2f9361738327aa15ed27900c013f64d66003276454d67e3193555630f0e9847a4b94164ad481d SHA512 46417e80339244c10b32a79adc68f296f846f269e12e76140bb2bfe69dea0a5d0d0639ee99b2832fe455f2754e4fa5ba3199a0596e743fd03e1f4866cb8f17e0
diff --git a/dev-python/ansimarkup/metadata.xml b/dev-python/ansimarkup/metadata.xml
index 921967b4c0a0..869dff47df12 100644
--- a/dev-python/ansimarkup/metadata.xml
+++ b/dev-python/ansimarkup/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
-		XML-like markup for producing colored terminal text
-	</longdescription>
 	<upstream>
 		<remote-id type="github">gvalkov/python-ansimarkup/</remote-id>
 		<remote-id type="pypi">ansimarkup</remote-id>
diff --git a/dev-python/aquarium/Manifest b/dev-python/aquarium/Manifest
deleted file mode 100644
index b8fb39337658..000000000000
--- a/dev-python/aquarium/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST aquarium-2.3.tar.gz 200341 BLAKE2B de75f47672e5b46e9d6601f829a9111db37d1742333bcfcd1365210e3482e8a670c658f0970af8171dea10760a689c1069c8a1f00d2617aa619ee81efc63e75a SHA512 d4d31d390a9f121c869dfb893ceea57130f3d51bccd61506a5b9e8f749388bc4834e6399eb1576948ac7d105572982c9d02f633fee2c16a7891c5845fb15b35d
-EBUILD aquarium-2.3-r1.ebuild 466 BLAKE2B 8a704f476d75945e8d854df1d0605b56b0471ebdff5251a7328ac02ba3061f48a1b46ef161bd2ce84b90834650e92f3b05b2835f6574a7d8943ccf4fcd9ca7eb SHA512 f123f4a9f4649fc601d4b540b2f692aa7c02e7125db5996d222f4841879f6af9a4ccd56017da25f014ba8f3aeb56e0a502ef6f15996487a7227f33463e1a6753
-MISC metadata.xml 318 BLAKE2B a8f81e4fb7127093c94e72d1cf5d1ca34cc14f93a92e5b5a82513753f5eecba3fbcab5412b0600ce64109f7c2b8afbb4aeccb88434443fd1e18ae9d2a5dba7ee SHA512 38690bb9c0014ee2808f475d2d50afb41a96edffdc599ec8eef268e980e23ee518a5785b4118ca8c90ce29c88b18ac03e6a0c44520a25af82265db7dcfd1df0d
diff --git a/dev-python/aquarium/aquarium-2.3-r1.ebuild b/dev-python/aquarium/aquarium-2.3-r1.ebuild
deleted file mode 100644
index 199103e4047e..000000000000
--- a/dev-python/aquarium/aquarium-2.3-r1.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="Aquarium web application framework"
-HOMEPAGE="http://aquarium.sourceforge.net/ https://pypi.org/project/aquarium/"
-SRC_URI="mirror://sourceforge/aquarium/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/cheetah[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/aquarium/metadata.xml b/dev-python/aquarium/metadata.xml
deleted file mode 100644
index d02e6b2a4ba6..000000000000
--- a/dev-python/aquarium/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="sourceforge">aquarium</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index edd1b80b52d4..bea4ce4626dd 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,11 +1,9 @@
 AUX astroid-2.1.0-no-pytest-runner.patch 474 BLAKE2B fde7f34aa9e1feefb29bf0a993bdd451523ccfa30bcd8726d36c4b159d849536445599f8f794e6cac71e71ff6b68e8cd3af4d3d5ad1ecdf9936977ec92e29536 SHA512 9c8ff2d8b2ae67620fe38d9f454c77216c2291a7f2aa59d9c78abd5a76f72aabd8154b12055aacbbabdc10fc466f57e09ed5527f796df8e6a5a15bfefaa4f0f0
 AUX astroid-2.3.3-no-pytest-runner.patch 405 BLAKE2B dc496ac27938fa316f59f3058a8f2f17ca397225ae09a1adde80c8da50cd68572052a733ff08d5fcc602d3c38722a16f3f8395608955d9b56c8f1c122541c4fb SHA512 be925b49c4ef04f9b554e446410904dca1529a8aa61a8fe9ca869e1c1a177ca86e7632c62c0f1025caa69e58ce23ff7f342198ba9fb85ec1bde164fb63e285d0
 DIST astroid-1.4.8.tar.gz 184091 BLAKE2B 7180b98c757c8681dd0abaed1e79d2c58ce676aff07b539af8776d589ff23770335d0ba4ce5c9b3940b0428dd10174e7c6eff66aeb500e6ac561734e27975be0 SHA512 54bb20edf5518b417470a2d63210802b267fe727f9d30e1ac5000db00a7894739b1c4249468fb55df81b55d382f3a5bbe019876141f7ee4d94040fd699dc0c2c
-DIST astroid-1.6.5.tar.gz 255688 BLAKE2B 7547e4c537f73ef77b61fba1ab8640c7cd50014ae52e4e4b8f8209a000c55bbdbb1ddcd3fb90d078f99a34d4a4779adabc8ad71af40c3a4547fe3e0d814b328c SHA512 f51f275c9f04809c8993d187cb62fadc84003ddc954d371356474dbe6b719868406fd9188c560f5b658b8b44bb6a4d3ee0785e809e789ca117e2bcbdb58aec53
 DIST astroid-2.2.5.tar.gz 281829 BLAKE2B 2cc341caac381fb44b0302e8057a6e2105a6a82dbf807f8a59598e15c5658cc30d4c32e3b58ebbc94c4559f2b2274373f5ed6c4b86b4e8eff86dd91a5520e7ce SHA512 71c8c26314f666e2b9519a83dd9476fbfe0ad7d72f5308f6a94b83c5442dc695bc3e51155df45586ff2ff0eec522a02286d00ac566d542f0b82e5e0d0d7d9c65
 DIST astroid-2.3.3.tar.gz 297350 BLAKE2B 7ac5cf028fa0263998271d23128b1bfd127fedafab2f6b3cc465867b9668942e1edc79bed62eb34bcce31b6892e4c5a31dbdd68d20fb92a1f134dc9e78a76920 SHA512 72011f3eb312ea7ce7dd55f7615972f6bfc152d8f16f9052b405f44fe17e594d5da22e0502b4c3034881b9783be9e808509d4ded3d679182ddf6d34eb90748f1
 EBUILD astroid-1.4.8.ebuild 1080 BLAKE2B c1303883d70844547493b689ce6dac72f4234875b6cc22a628f328bf292c675e6d6e171fcb52be7b7ccba22148edc91e9285e02a5e95fd0eedc28007ccde3c04 SHA512 9aea729dcb9babbed9a912b4512940f863e27115b9ede4b63b4744279106450581c0b00eacaec1fb691d5d7ad7e8fe155b80e0bf6058fc6f4d138e5a9a83c12d
-EBUILD astroid-1.6.5.ebuild 2036 BLAKE2B cbb4a4aa0aa92014bd5206a51ebd845c2f7b9c7fb3c4a9358f50de4bff3cb730e64d16a67707f6820efc0834cc27bcf4944d5e9b33e22dcbbf25c5a2f9cfd84a SHA512 49c1b2832593d175a54819b026fcfdb481428a089c980deaf7048d53413263be682bf81da3a646e156a5f58ad2a478b1ef2d42b3d9119e582570237f19563e7f
 EBUILD astroid-2.2.5.ebuild 1312 BLAKE2B 56ff2f3fed59bba1f55c28e6ef15fedb9412e7f982762e502875afc7c1ed37ae87a911e2b58641f4fa3271b6cc8a9798c6125926beb4b577d15331b955bd7d76 SHA512 58d7fad12ee4e3ab48dfded72c5c8128ee934b6a49ce636fd75c7e0e3b6e8bc29bfc6664a0d334c9aeb167ea307c568a6e4d0b671b72dc75cab15adbee40cc8e
 EBUILD astroid-2.3.3.ebuild 1338 BLAKE2B 0f63a6c7a7e6e92215103e313da96cc539531d800afe85f179b8ca9aec01507fabc5a0608d158aad7b26d77b7a0535e3fa77ae6a047bf4c8fb0de16932538532 SHA512 3d9d9df54402be3d1be8b38dd2abb676c689ad32b5fbdec02258918548308b572e88f1d1effebb1ebe68fb9a8a06f5e6a68865b22ee09920a966dc5d25143f0e
 MISC metadata.xml 1122 BLAKE2B 29f5f5eb980aa5e9035316854d7b69a803bf8507cd8f2b97880ef3a0be3e200936ddc3679e480741cf82203b704cd6c7b1610d31e9173dc3f8b97ebec6a6c844 SHA512 34a45382d84c03057ba59b40905138c2e048da4d602e5a26dab4b156c1a3697369e11ef66f451f3f823ec827f3771eb58c077c056f9609e5b55a27841fd5bf9d
diff --git a/dev-python/astroid/astroid-1.6.5.ebuild b/dev-python/astroid/astroid-1.6.5.ebuild
deleted file mode 100644
index 9ddd3f86523b..000000000000
--- a/dev-python/astroid/astroid-1.6.5.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/wrapt[${PYTHON_USEDEP}]
-	virtual/python-enum34[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' -2)"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' 'python*')
-		>=dev-python/pylint-1.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	# Disable failing tests
-	# TODO: investigate if it's our fault and how can we fix it
-	sed -i -e "s/test_from_imports/_&/" \
-		astroid/tests/unittest_brain.py || die
-	sed -i -e "s/test_namespace_package_pth_support/_&/" \
-		astroid/tests/unittest_manager.py || die
-	# we hack xml module, so it does not match what they expect...
-	sed -i -e "s/test_module_model/_&/" \
-		astroid/tests/unittest_object_model.py || die
-
-	# no idea why this test fails
-	sed -i -e "s/test_namespace_and_file_mismatch/_&/" \
-		astroid/tests/unittest_manager.py || die
-
-	# and this test works yet it shouldn't
-	sed -i -e "s#test_object_dunder_new_is_inferred_if_decorator#_&#" \
-		astroid/tests/unittest_inference.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	${EPYTHON} -m unittest discover -p "unittest*.py" --verbose || die
-}
diff --git a/dev-python/attrs/Manifest b/dev-python/attrs/Manifest
index d60d7e7a1b58..d7c8d39721ba 100644
--- a/dev-python/attrs/Manifest
+++ b/dev-python/attrs/Manifest
@@ -1,7 +1,3 @@
-DIST attrs-18.2.0.tar.gz 116817 BLAKE2B 79d50c9b49956bbc1e04084eed36a5f65f2dda8e954b23f15650cb881d6f77a8325e042c6d1a77dcad43661d4524a4d253d96bd0053464ef03091779636e6d0b SHA512 58c26579d6dfcacbe9e3f770a125861e0625d435f1293eebe0d62efc9b8aa9572be2b312d73037a647163bffb0a13b240fb157aff7ed35196f637ae945d61d22
-DIST attrs-19.1.0.tar.gz 124220 BLAKE2B a7a8321857c2723398db3b7943f221cc141f2d365b84d3f77ccd16c9180fb1d73402c7a1018d70b666bf76b6021bd90df14d792886c1345752b8fc810ac54a35 SHA512 22ee45e8b10a7abe10e720788c5cfab424d0bfe70e595dfb116928b8ebea497a747e8234d96549da00f0967de750fb943db0cd3669354253a27be2ca30fe413a
 DIST attrs-19.3.0.tar.gz 132477 BLAKE2B 6577f39fc15c9e70f0f76ba358099e83c57e226574cb11dbe83747f12e285a284e9d1a218fc1670e0d08be550d42c67cde132604b2cf385d1ee25bda7e57e79a SHA512 b5b641e6732156d1454ed6c49e3a6b29200a8d3f1515fb59aeb85fcb5e9ab6a1d760904de45083cae5250e7bf1a7aa2c1f3ede217240a63f989ae4bb484f2511
-EBUILD attrs-18.2.0.ebuild 941 BLAKE2B a820c2260b7f438f6f3d6936350510e42aa6d325695885ed8312e07e8a5e4ecd9699908976160251b08a163ec0cb06d13bc9334d728aceb6f481362f902c64f6 SHA512 95a5c8c92722f470a0a50570849d49c9caa99180bd25873f571b8b8f647bba1de82be9423221becd6fd56844c42f9c93124b8d1ccaa1fa95f417bf4e30c77509
-EBUILD attrs-19.1.0.ebuild 951 BLAKE2B c0d012689b6c0195d004b5a791a92f66a07aada3849901bc2b75613b85d2721379c24ab96da8aae0e0bbb8180244266f66450eca897197bf9590fd4b9064a41f SHA512 5e3984dfaa07a419fed2101cc410c73fbff34c0a3a84fb405b7bc2c1b93bc960d53e0559d2796582db367c328415af94ac8dec80cffcc8bad2a4ec44dbcc755e
-EBUILD attrs-19.3.0.ebuild 863 BLAKE2B dd880c98ed7f48fa71e346a39d4a0e3e2936f752e2443a5fed5a142e4044cd7bc743f30e98dd0ed50a617e64394b6a5682c45d3458392a44b7ce0a889144aedb SHA512 1f67ecad39e537ebe2fafb53971b5312dcbd081b754a2961f4e3b274474d6cf5bd95fced45014daa0fefc56374da3ff0f24bac6ab50605e5f3544e84c4ca155c
+EBUILD attrs-19.3.0.ebuild 862 BLAKE2B b13c0952b6094de0ce0fd64a97f948eae502222b9425037ae886e6670847d01ba0e3897190d66dc3e12372ccac7b39176e6d96291991944a61c558a8fec69067 SHA512 62f59b90cde626ef106c507b947f4ac63997d2d15a24e97eff1f053e6cf6b21a028a5eb1d3b089cada3ffcb078cc7a116b565e507d5e0a64b849120cf257be9c
 MISC metadata.xml 488 BLAKE2B 808447388863096af88f90f97c58025508d5b4cd1ecd760c59dd8af1fa664e16756029e3d5d6b233578b9c0d7be9c8469761c9a89f222ae9f47556b6ee983fc0 SHA512 d8336a60cb0b2b8d51a9833c0ba3d47acb29ec4942b2f03b750d407bcbb65461d867470226bee962a8e585cfd4ff11bfff67b66ed2270f9efbf35d3c46bbdda1
diff --git a/dev-python/attrs/attrs-18.2.0.ebuild b/dev-python/attrs/attrs-18.2.0.ebuild
deleted file mode 100644
index f2b0d108dfd4..000000000000
--- a/dev-python/attrs/attrs-18.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/hynek/attrs
-	https://attrs.readthedocs.org/
-	https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/attrs-19.1.0.ebuild b/dev-python/attrs/attrs-19.1.0.ebuild
deleted file mode 100644
index cb1c61df86aa..000000000000
--- a/dev-python/attrs/attrs-19.1.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Attributes without boilerplate"
-HOMEPAGE="
-	https://github.com/hynek/attrs
-	https://attrs.readthedocs.org/
-	https://pypi.org/project/attrs/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/zope-interface[${PYTHON_USEDEP}]"
-
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_impl_dep sqlite)
-		>=dev-python/hypothesis-3.6.0[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	py.test -v || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/attrs/attrs-19.3.0.ebuild b/dev-python/attrs/attrs-19.3.0.ebuild
index 19f7b1550de8..eaf8d70d48fa 100644
--- a/dev-python/attrs/attrs-19.3.0.ebuild
+++ b/dev-python/attrs/attrs-19.3.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/zope-interface[${PYTHON_USEDEP}]"
diff --git a/dev-python/authheaders/Manifest b/dev-python/authheaders/Manifest
index a6fa15f420e4..9db345bea74f 100644
--- a/dev-python/authheaders/Manifest
+++ b/dev-python/authheaders/Manifest
@@ -1,5 +1,3 @@
-DIST authheaders-0.11.0.tar.gz 88501 BLAKE2B a4ef01d206c470c4d97443af2b770d301de59aaed709ab72f439c43e0fa11e20a4a0b7f4122cf3c3212781750a1505af7a8143be9277a7989819948c1c18274a SHA512 7d0d8750eb606f3e52e85159e6b5da2fe377816e7572ee01b6bc90dffa996717c0f2837e52b170ecbd97b7617461a0b96d0736084590673a516e7d3ae7e8f999
 DIST authheaders-0.12.1.tar.gz 93106 BLAKE2B 2799422b4e792a4734f0e0922cd99b62fd0e33014dc67ef74694e134ef0417ad2a0a3f4e832b50e36b32c8941940c7d3445a248d1bd32c611b954324f54d5233 SHA512 68ac36227d0ef602ed89fcd5852c0984b0875bd4a3e1465d87791178a0e42072bca79335054c82bbbe6e06f6484598cabfa83676bd3338114f82bf9dbd23ccc3
-EBUILD authheaders-0.11.0.ebuild 734 BLAKE2B f4700ad87ad5f73ff82b3fed1691f9307880dc0e87ad33db8230c8d9d22529cbc900180fa8c622378672f5f49e188ce10eed07cd47750406825fe8be5cb8138c SHA512 89dd49322ef0febd04964388d63cb90ac274e5019fc33ff3810e8978226e567e827a88a90c0996a0580e4516d1fb0352d78e178d24f53fa318cb239fc7e19468
 EBUILD authheaders-0.12.1.ebuild 699 BLAKE2B 1b8020b993d29a634692ba4e832ff69e3192e949eaf2280602d058397bafeaf7da670d59db3f33042f35dfe450987e0ee0d781a46596211526ef03ad06bc5108 SHA512 84794f956f8eaa0aeb56942d08ad3d636c4a8ede1b16195dd9c7e0294dc19c704d1647905e98575697fbf4294a4c4d591af9029a996de56badfa1c4982303d94
 MISC metadata.xml 462 BLAKE2B 136929c00b3dc09352eafe4819eb1aa20ca5e6f9742036cc9bbf2dcefaf9e2c9173d39450ac27d5900573e78b3bc5e95de90e06b319ab2ccffb352d96aaf48af SHA512 a748fce55630560f5ad5315361c1cb23db3b74d416fc24bfd61c0aea6f722f363db521efd898f9495838c618ae109f3490fb047d8eba515304304ce7468c2a76
diff --git a/dev-python/authheaders/authheaders-0.11.0.ebuild b/dev-python/authheaders/authheaders-0.11.0.ebuild
deleted file mode 100644
index a3320424a3b9..000000000000
--- a/dev-python/authheaders/authheaders-0.11.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="A library wrapping email authentication header verification and generation."
-HOMEPAGE="https://github.com/ValiMail/authentication-headers"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/dkimpy[${PYTHON_USEDEP}]
-	>=dev-python/authres-1.0.1[${PYTHON_USEDEP}]
-	>=dev-python/publicsuffix-2.20190205[${PYTHON_USEDEP}]
-	dev-python/ipaddress[${PYTHON_USEDEP}]
-	dev-python/dnspython[${PYTHON_USEDEP}]"
-BDEPEND=""
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index cfda2b6443be..0244f34b29f4 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,10 +1,4 @@
 AUX automat-0.8.0-no-setup-py-m2r-import.patch 826 BLAKE2B 835956b8e3ab657d09d683a173c43626f0af59056ccd25e3a7bc9167da4d5d081e095e91e96ee943e7329d28c3a70b9e001e8977d64bb85581ef19f73a9ecf93 SHA512 b89fd865e8b95283efdc96614b1230d3e8e6d70cdb0ba07842cdf07e1a546a5a89b7c88a0cd774ec47148579981d41cd7261cdd7069e2736807b64422b3ca56f
-DIST Automat-0.5.0.tar.gz 32599 BLAKE2B 951da8840c2334fe3cd86804b39beedaad0d344d66742e8bb72e2d2ace2029b037acac8ffccc5643fd37f81020a567374a25ed42f7bc386770a30956464f52eb SHA512 7b4fc64e1b3cc514e3513c4be7387309a9e0c6d59ef091131404642b517a324b4a0eb677bee99da038664bd6713f2d2078c621f056e98b35966caf324741eeeb
-DIST Automat-0.6.0.tar.gz 31767 BLAKE2B 28baa9d6cc7497f9c0a4b7f4050b197d3dff871b91f5f3e29bdc47ace443af8de0fbeacf1657dc6565b3ab824365362a42204d6d89a8dfc82eaa6cd92d4e2308 SHA512 94f2fa06b0e0e1c0538bcf4bd9046ea40600a018bdd1da2d5bed479877807ad56e448c4f1d7ec87341f80013ae6c35b01201cbe3c4ecae1105419038ed43024d
-DIST Automat-0.7.0.tar.gz 61461 BLAKE2B dd09ce090c7333ee17b701bde2c78e01dacf40cefee847061a2019bb27f0982091e7628737211421ada351937caf9c6734cb445ee6462ce84b381030b013bd05 SHA512 a6f307d312a3ceb721071b5212297c73d2306894b5fafd39265578041a2859bd6f041ac43a654bdda4175a70a4e90e0db1ee35cd43fa620cd5c594b5d1988a74
 DIST Automat-0.8.0.tar.gz 59687 BLAKE2B 56e4ec76564d321ca9a709c484077a4003eea2842160e226728aaaa4ec6ebc2486482f79cd919bef7bbec8baeee7a34ca2a11d48665bb36c79c5a45a3c97e992 SHA512 2dbd4e784f65b02a8c93fc5f15236df3649d667a9792f6cac929dbac5d971495bdab4825df0fcd6817b9a9f79b7a5d8cfbdf8e4d18605f0761546b31b3091ad7
-EBUILD automat-0.5.0.ebuild 1236 BLAKE2B 5392bd176fa9f27c5aed60b35b120ee0e49871256f85dc91016ee47511098b3fb59d3bd54a66bd9c93b633f0f21e6b012c9a17d0d969752c7733feee966795aa SHA512 85ceb7753f23ba41e4d342d39a8435c2db778dc64018f150f4f60d5f5ef3e9381e82a64ac41d308bbf773fa5652abdd217baf80e639a4be5c6db706d8c6813be
-EBUILD automat-0.6.0.ebuild 1242 BLAKE2B 2f949d1a3af97d7517f632b6d70cdee2e8c9e0dc92264d684fcd787acf2d1f6fc941c369c03c389e4e83f52a301a7ac419769ab9050f4a6e12c54832198161f1 SHA512 96627427bace08d20ed87e5a83e7cfc6162c5d9214446ef6c24ba20bb5f8d78c89b210f3d57306a7c613f30d1695a44a4fe58301c280af21602d6f380b4cb2b0
-EBUILD automat-0.7.0.ebuild 1477 BLAKE2B b5f7b3e0e265e6384970633e068afefbea5fa3315dad83bfbdcfe5d412e84bf3756b12c1aa4532f458ce20c656fb30a853ca15d38a06ba3f27345d4cee4607d8 SHA512 43b1d626d09ceaf844990c67a4468c12b55ba365de8c1dc92adbbd5022eb7ce7cd2769141239407c096db5792ef4d3cd478b9c04daa3dc05e733936eae9ec512
-EBUILD automat-0.8.0.ebuild 1526 BLAKE2B 29d32d7c1b34d2e5be1f7859bdf5f1d57e8bc1527b1e478857785b751ea90c6d0b4acf0d0fcc340f291b76d61dcf2005d2b82552071cbbf3d721e9d172e0b9c4 SHA512 bf9b0675b6f6da80b9adc6fef0212147aff299131cb270d5f360071267bd1bd71dc78ecab72156188907923ad99915321a0c652d9f110a2002c2eea4120d9ccd
+EBUILD automat-0.8.0.ebuild 1524 BLAKE2B 2d50503ccc4a01affad268ac75a1aef918b3a09e0b4deabe28e374b9775a4d3adb11f99a96121c6438f03e7767986ec554fd04678defde9d0652c19d6f94e3c7 SHA512 e3ee0951cf6ed462f170f418560f7f595bda977871f4d0d80571079832f70c0449027883c81962a620564a36168209ef95d431db70ba2cda01333088c00412f6
 MISC metadata.xml 572 BLAKE2B 26d7ccc6325a7ff3f051d90ffd36a50485575cd78a2bb35e2f471b2ae5c0f2a579269633db2fa98be1682b5a53271acfd97f079d8c040e30188dd07ef886d509 SHA512 6514fa4351ceffc03f98fbafff044548b350b69d78b0926e598e230fbf6ba52e8a2e0346e89b14d8c4fee914d0a846e457bebe62354ea10186dcd24c1daef590
diff --git a/dev-python/automat/automat-0.5.0.ebuild b/dev-python/automat/automat-0.5.0.ebuild
deleted file mode 100644
index da69ebd7e7fb..000000000000
--- a/dev-python/automat/automat-0.5.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
-
-inherit distutils-r1
-
-MYPN="Automat"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/m2r[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-S=${WORKDIR}/${MYP}
-
-python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc docs/examples/*.py
-	fi
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	einfo "For additional visualization functionality install these optional dependencies"
-	einfo "    >=dev-python/twisted-16.1.1"
-	einfo "    media-gfx/graphviz[python]"
-}
diff --git a/dev-python/automat/automat-0.6.0.ebuild b/dev-python/automat/automat-0.6.0.ebuild
deleted file mode 100644
index 9e702ebbb8f8..000000000000
--- a/dev-python/automat/automat-0.6.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
-
-inherit distutils-r1
-
-MYPN="Automat"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/m2r[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-S=${WORKDIR}/${MYP}
-
-python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc docs/examples/*.py
-	fi
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	einfo "For additional visualization functionality install these optional dependencies"
-	einfo "    >=dev-python/twisted-16.1.1"
-	einfo "    media-gfx/graphviz[python]"
-}
diff --git a/dev-python/automat/automat-0.7.0.ebuild b/dev-python/automat/automat-0.7.0.ebuild
deleted file mode 100644
index 7fda0cb8d2e3..000000000000
--- a/dev-python/automat/automat-0.7.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7})
-
-inherit distutils-r1
-
-MYPN="Automat"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Self-service finite-state machines for the programmer on the go"
-HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/attrs[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/m2r[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-S=${WORKDIR}/${MYP}
-
-python_prepare_all() {
-	if use test ; then
-		# Remove since this is upstream benchmarking tests
-		rm -r benchmark || die "FAILED to remove benchmark tests"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" py.test -v || die "Tests failed under ${EPYTHON}"
-}
-
-src_install() {
-	if use examples; then
-		docinto examples
-		dodoc docs/examples/*.py
-	fi
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	einfo "For additional visualization functionality install these optional dependencies"
-	einfo "    >=dev-python/twisted-16.1.1"
-	einfo "    media-gfx/graphviz[python]"
-}
diff --git a/dev-python/automat/automat-0.8.0.ebuild b/dev-python/automat/automat-0.8.0.ebuild
index 81c36630d9a4..570fbb8132d0 100644
--- a/dev-python/automat/automat-0.8.0.ebuild
+++ b/dev-python/automat/automat-0.8.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index 7046d844a252..5fc39fece876 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -2,8 +2,10 @@ DIST awscli-1.16.310.tar.gz 1615978 BLAKE2B ca5d4f6d7cc12b7346eedda837eb4c9c4704
 DIST awscli-1.16.314.tar.gz 1645286 BLAKE2B 085bab3971ed037a23fbd336f367becf2cc4aded04def176fbe6e073b5e010af4aeb0c0e6b43212837a2544ff6734f73e4a2165f61744263649c4a0b21a43424 SHA512 6268ba5a7332c8a7ba36602cd1ee55dfc4dbbf14124c20b5ec1e524a88db11e2f57e7a553882b774a25376c5c2b280c2863c4253ff4a994b72049c361ffddc58
 DIST awscli-1.17.17.tar.gz 1695067 BLAKE2B 5b3db22f3c4f2ad2ed993db76313e4fc5ebba7ae8f43b29d6d8ffb9b1b13bbf4b82e8bbe972db709f319dbd6150046fd51afb7338efedb4f021509ecb4422914 SHA512 72b3d8147b5c08685bb851bbba5d27fe0de55124acf0163868e98bf0bb9000309f00ff646e4b38f2bce291edfdfeeb72f449dbde77ea8ba5aa3b853d82c1393b
 DIST awscli-1.17.7.tar.gz 1661103 BLAKE2B c88e119672284e60a6de54bd60f9096640e6115e45df3cecb61d8dc037b5880caf2d3aeb192b6fd06fd8667d7dcb948c1d6aaf3d0942796c3eb886e96534a627 SHA512 6cbe4458fcda6e4afd3cd14b654bf0eecaa611210430edc9c9b6edf18b2f4ecfa042c495a6bba9a7a46732e68bbe87ac111566c0f5786d7482e4d150cf7e59f7
+DIST awscli-1.18.5.tar.gz 1695943 BLAKE2B e4ca700d35a918b61ca82cf7468f54c68de6cbc76ed01319e1c4aa073fde5c6678766ae43ff6f92920391a6adb1e844292e5575eefe48d9c1478b90f42372b91 SHA512 48e2b74d4cbee54eeba2cc09fcea5ea90f222def136a9bc71cb60d6ec4247f1f6b3f38b3360721dfe62f84aac363e9319c1252b73ab58faa93ea971fbf79474f
 EBUILD awscli-1.16.310.ebuild 1293 BLAKE2B ec617f2ef8ce286df0d4bd64d5f8fbfb9c6fe0f0b90905b65f7ec74da86f0c01afa5cf117c88b9b9799e67c44bf019500db4dfe1fc7385fb0b3d87c6c2f1b4c4 SHA512 07de2cae0c6944ed62568dd5b737e9b80b3fe8844aad1ad535e075163fa8940d59417760fa4a4b14a26cf461a8a2fd3b2f57a5a130ac2ebaaf73774bba8bd3c3
 EBUILD awscli-1.16.314.ebuild 1293 BLAKE2B 128d1cc777d03d90fcacfd0f9ade433de910e75a3406580360105fcdfc34470ee1327e8a2c17b6b80aac2ae63a78e32bd07a38df5c6aa52c17d43e9e9a914ea8 SHA512 a0daa78995998fb68ca44a24a73d00e8458641a2c43a7ed2c59053bed504a8653fe9a2b135b99caf81be8c61c2dfd351840a2035ea1c8d09cbc179eb762b6897
 EBUILD awscli-1.17.17.ebuild 1293 BLAKE2B e8f5bb5069d3ecdabf90af29375ff59b5c642132219f6b7b151389f263443529467716e5fd69eab3bb0128e11ba1adaa7163b17c085f0cb4f118347a66ace207 SHA512 450a1d0de056034df4af842e548fb1e0879c51465d3423a21dc1a70880b6ab24ccf71b482b10f3ab0c2327e945757a051bebd5ed792de0f711bda66312ddf97d
 EBUILD awscli-1.17.7.ebuild 1292 BLAKE2B 7be3175f57e5cfee30cbc3127e9db9c88864dca32634290e1eb8ff1e43d7709de4be08d4ee21baa5a6a716e81b2d08b8156ea073b18dae4f42a9bc5fb75fe9ef SHA512 b32b014ea525b57af5e4518e9d11571f20b1f8be8c06970cefb22b5bd7c9d8ef49b070ba3f44c684d9d0f8bea3cee141b9f25b0ed9ad13eab83dcb20f6d320f3
+EBUILD awscli-1.18.5.ebuild 1292 BLAKE2B 24e5250eee20e803638379d47b998bdca079c0565fc8903ebc637438100f9a024b78c01f4e4342b2d9c58dd4365ea14637cc4183265fd03aded5b94abc872c30 SHA512 6cee18198442c88be49530bcae67b94cdacb379ca510d1609d2609c8f98064c045ea762d907b41c693417a827eaa897794e25296e2ff6a2b68da3d0e490070bf
 MISC metadata.xml 316 BLAKE2B 29c8ad67f4e7c5db4439aeae00deda8b57bb36bea7bd6490ae60efaa30cd2db1f7b2cff5b21558cdadea05f9caa8a9f4ee580fe2ea80959fe6ef7ef6f740c550 SHA512 86b3359e64e41ac4f2216e5bbcee6468100df3cd6e9c25595527d6819a2c27ce327797163a3a43bab11516a4826cff47825449cb797d7fe845794700a3a2bed0
diff --git a/dev-python/awscli/awscli-1.18.5.ebuild b/dev-python/awscli/awscli-1.18.5.ebuild
new file mode 100644
index 000000000000..5b5b042ebcbf
--- /dev/null
+++ b/dev-python/awscli/awscli-1.18.5.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_{6,7,8} )
+
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# requires network access
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/botocore-1.15.5[${PYTHON_USEDEP}]
+	<dev-python/colorama-0.4.2[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	<dev-python/rsa-3.5.0.0[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/pyyaml-5.3.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/aws-cli-${PV}"
+
+python_test() {
+	nosetests -vv || die
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/dev-python/axiom/Manifest b/dev-python/axiom/Manifest
deleted file mode 100644
index 5419803c302b..000000000000
--- a/dev-python/axiom/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX axiom-0.5.30-sqlite3_3.6.4.patch 1526 BLAKE2B b076af4f955c33ef0666320da8c079c60595d951b8bd69e0ac7b5237f9f4dc2bc731dfb0e0e443dbc55d9b36ea694eb693d5f259e4951e4fdf041e10dfffedcc SHA512 a147cc8a221f05bdfc7bca0f84a273d6fda94404c16e8d6bccf89bb7762ccf4dcbe7e84b4c459843900ebb7a9f82c82b564222b570774fcf0fdf57f468eaa999
-DIST Axiom-0.7.2.tar.gz 201850 BLAKE2B 210c0905f462fbd7dba81347575e151d2ced648fb429a2527ff3f2076f30703398f9f22077df3fd7af418323249553967480c440b0dee5c23488a4cd3bb1db70 SHA512 b8aba9b1b69141ad93759255f8eb169d815565d4b5b5f813b9afadb1158960ead859c896c2f26797fa1953c5cc35729dfbbb942077530402372030f85e85f3a5
-DIST Axiom-0.7.5.tar.gz 203526 BLAKE2B 4cd6c5749a780376e514906e2c54570a986ecc4d9aa7893fad9d488b5fcba16ae5315eb2601c37d8766ea7ec3cdfc8bfcaf8be1583dbfb8cd66f921896fa8d38 SHA512 6a868fce245c64f791b8340e5f04a87e18ee1b528ff248b0b3f54f5ddf8a3b68903946dfa7291c4d902b76e7240abd864166463949cfd913a9d38b1439fa2f9f
-EBUILD axiom-0.7.2.ebuild 815 BLAKE2B 47b5f532dc5f3871f8b44f5f437c48783e87baba8644c609e72f1f1a0bfd28844849bf988066004022584cab6014fea0f78a1c153f1859d106b935f2f6dbeb01 SHA512 7cc3b9f59ca058995f3c0d2f2f53c7773cff9c28fcfd8217fac3ae19bf0672c9066ae80891773d5f0403c1d13803ac1df4bdf36404e082a00875e3ee77602740
-EBUILD axiom-0.7.5.ebuild 869 BLAKE2B 1a8748d8f995c32ec1167520e31d934a3262fcab30ebfe751b05f6d9ac5e140b714cd677243e4e245a228949b64bf239e6c18276338dae82bc6b3a0f164a6108 SHA512 be04b53a959fe1cf9e36f0a085720efd75f058ac6d3e081e03ea11100f44a5363d193088fcf90a63cf006b4ee619f3aaf781762bf154bd667e48613b0e85a9ac
-MISC metadata.xml 789 BLAKE2B 8693c1a58155d9cbaac9232738d3064ccdf51a1989499e5a53b9e30bf5f76dbbb8777d7786f66162b224a3f2932424971780c804af04f4cf064ddb85645818ec SHA512 f96f0c754b752a1a298385b8d6b1238eb3ae9c22fb36a53ab8dcebdc8da84f1a9a61c0e18e6ce66e39d8ca0a7c1c78d581a7f86c2660dca95d2718cacef497ed
diff --git a/dev-python/axiom/axiom-0.7.2.ebuild b/dev-python/axiom/axiom-0.7.2.ebuild
deleted file mode 100644
index be028747221f..000000000000
--- a/dev-python/axiom/axiom-0.7.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit twisted-r1
-
-DESCRIPTION="Object database implemented on top of SQLite"
-HOMEPAGE="https://github.com/twisted/axiom https://pypi.org/project/Axiom/"
-SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-python/epsilon-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-core-13.2.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.30-sqlite3_3.6.4.patch" )
-
-TWISTED_PLUGINS+=( axiom.plugins )
-
-python_install() {
-	distutils-r1_python_install
-
-	touch "${D}$(python_get_sitedir)"/axiom/plugins/dropin.cache || die
-}
diff --git a/dev-python/axiom/axiom-0.7.5.ebuild b/dev-python/axiom/axiom-0.7.5.ebuild
deleted file mode 100644
index 163466a47772..000000000000
--- a/dev-python/axiom/axiom-0.7.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit twisted-r1
-
-DESCRIPTION="Object database implemented on top of SQLite"
-HOMEPAGE="https://github.com/twisted/axiom https://pypi.org/project/Axiom/"
-SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/epsilon-0.7.0[${PYTHON_USEDEP}]
-	|| (
-		dev-python/twisted[${PYTHON_USEDEP}]
-		>=dev-python/twisted-core-13.2.0[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.30-sqlite3_3.6.4.patch" )
-
-TWISTED_PLUGINS+=( axiom.plugins )
-
-python_install() {
-	distutils-r1_python_install
-
-	touch "${D}$(python_get_sitedir)"/axiom/plugins/dropin.cache || die
-}
diff --git a/dev-python/axiom/files/axiom-0.5.30-sqlite3_3.6.4.patch b/dev-python/axiom/files/axiom-0.5.30-sqlite3_3.6.4.patch
deleted file mode 100644
index cfa465ce656c..000000000000
--- a/dev-python/axiom/files/axiom-0.5.30-sqlite3_3.6.4.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- axiom/_schema.py	(revision 17031)
-+++ axiom/_schema.py	(working copy)
-@@ -28,7 +28,7 @@
- CREATE TABLE *DATABASE*.axiom_attributes (
-     type_id INTEGER,
-     row_offset INTEGER,
--    indexed BOOLEAN,
-+    "indexed" BOOLEAN,
-     sqltype VARCHAR,
-     allow_none BOOLEAN,
-     pythontype VARCHAR,
-@@ -47,13 +47,13 @@
- HAS_SCHEMA_FEATURE = ("SELECT COUNT(oid) FROM *DATABASE*.sqlite_master "
-                       "WHERE type = ? AND name = ?")
- 
--IDENTIFYING_SCHEMA = ('SELECT indexed, sqltype, allow_none, attribute '
-+IDENTIFYING_SCHEMA = ('SELECT "indexed", sqltype, allow_none, attribute '
-                       'FROM *DATABASE*.axiom_attributes WHERE type_id = ? '
-                       'ORDER BY row_offset')
- 
- ADD_SCHEMA_ATTRIBUTE = (
-     'INSERT INTO *DATABASE*.axiom_attributes '
--    '(type_id, row_offset, indexed, sqltype, allow_none, attribute, docstring, pythontype) '
-+    '(type_id, row_offset, "indexed", sqltype, allow_none, attribute, docstring, pythontype) '
-     'VALUES (?, ?, ?, ?, ?, ?, ?, ?)')
- 
- ALL_TYPES = 'SELECT oid, module, typename, version FROM *DATABASE*.axiom_types'
-@@ -61,7 +61,7 @@
- GET_GREATER_VERSIONS_OF_TYPE = ('SELECT version FROM *DATABASE*.axiom_types '
-                                 'WHERE typename = ? AND version > ?')
- 
--SCHEMA_FOR_TYPE = ('SELECT indexed, pythontype, attribute, docstring '
-+SCHEMA_FOR_TYPE = ('SELECT "indexed", pythontype, attribute, docstring '
-                    'FROM *DATABASE*.axiom_attributes '
-                    'WHERE type_id = ?')
- 
diff --git a/dev-python/axiom/metadata.xml b/dev-python/axiom/metadata.xml
deleted file mode 100644
index b01dd3db29a6..000000000000
--- a/dev-python/axiom/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 type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">Axiom is an object database, or alternatively, an object-relational
-		mapper. Its primary goal is to provide an object-oriented layer with
-		what we consider to be the key aspects of OO, i.e. polymorphism and
-		message dispatch, without hindering the power of an RDBMS. It is
-		designed to "feel pythonic", without encouraging the typical ORM
-		behavior such as potato programming.</longdescription>
-	<upstream>
-		<remote-id type="pypi">Axiom</remote-id>
-		<remote-id type="github">twisted/axiom</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index bbb12746f658..a16927bcbba4 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -1,3 +1,5 @@
 DIST bandit-1.5.1.tar.gz 480856 BLAKE2B f8a1a7dc1d93a1b6c8d3eb5bcbecda895b29dfebe055ac358b9437bd0c9ab5562e6d25a658bc2092cff6bddfd0245e71bf39ee88b2718e3a0c7376fa50293ae1 SHA512 e6f596e73af45ca2ff4d200fad63d37adf44efd5de52f8061f5a349b66457a39eb442ad442d5fb57b2e0e98c8bae0eb0879b958ff619b4e26c0183bc8b928e36
+DIST bandit-1.6.2.tar.gz 498567 BLAKE2B ab7885df634ff8258fc7620523b56995cb2f262f4290193a9063e216f66ba8ecb31ec17f09d0b72a0472923266953c46e47e74fcdfb39784873738c033e00c6c SHA512 9facce98411ceb9e33e5a978ca4aad2dab541ffe215e480806ac921b7f7067572445d8e32e8d473ef30bb57155b72b2ffd4e06d458a3da82e2a9fb1b1d8a4b9f
 EBUILD bandit-1.5.1-r1.ebuild 1307 BLAKE2B f2b7b0b9a0de146487bd4358d52d627af24cc58edcdb196dd4c9f40b185b999dce54241fae007d41a08415323ff3244ba38f0e54d184998c94466d2467c69808 SHA512 7e7c563cdf27c80b370c2bbfdadb96a25b3bfb3c2928ddc5318e9870edb0f3c987f72cd6ef6b4520ea67e8000d1e87c1ae4c36fddaebc176f33bc8299de35db6
-MISC metadata.xml 437 BLAKE2B e9d2b3bbc3f4795ca95af1113008d33a635efed8ab7b6da63fc1b73f426b37b7fda1dfba1f0737e8dc116447b873515d37c628d00876f480fc654a78eef9c2ef SHA512 3e34e842afdbdf7c90b6a9ed8f11d4b4955c03f7f3b3a9cde02b2fa33bcba39a00556e62c5c29b721e3d25d33de8396b5dd9737037f9000b1fc3e707ab9fd9bd
+EBUILD bandit-1.6.2.ebuild 1319 BLAKE2B 4f56cab706377bed33276d7dc1248091293d412c5c027a6ae46c6d83be3562d68a2aefa5cef4263d77525ed3a975ae88b16a4ce4b870bc26b693e54a6f4a2b07 SHA512 0edba14561d46779f4f252fcad29e2078a7e0978210585cecfa6f15c835c9e037a2381948eece197bcb306df41c9faa53a9a76b9239e3004f638061a6306dba4
+MISC metadata.xml 632 BLAKE2B d36f7c8fa4f8bb896f1eb1ddcdafa2705aeec74ae61c75f2bcebee5b8060442721448afa709099cf2f5d0c6f4dcd9d622c44f94258eb846be36f7d9b82c0ccd6 SHA512 cd90a77633abd61030fe7412b929c129b2e8bb8fe3b265277e8fdbe7b6a9ada8503c5bc97dc6754ba6f4137cfc96bd508b1750bc7b9baa58d823892febb5e955
diff --git a/dev-python/bandit/bandit-1.6.2.ebuild b/dev-python/bandit/bandit-1.6.2.ebuild
new file mode 100644
index 000000000000..3f077f18a76b
--- /dev/null
+++ b/dev-python/bandit/bandit-1.6.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A security linter from OpenStack Security"
+HOMEPAGE="https://github.com/PyCQA/bandit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~s390 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/hacking-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-1.0.0
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.6.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-1.4.5[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/git-python-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.13.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
+
+python_test() {
+	stestr init
+	stestr run || die
+}
diff --git a/dev-python/bandit/metadata.xml b/dev-python/bandit/metadata.xml
index 8ee1f52b6c10..40f27867ff32 100644
--- a/dev-python/bandit/metadata.xml
+++ b/dev-python/bandit/metadata.xml
@@ -6,7 +6,7 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<longdescription lang="en">
-		A tool designed to find common security issues in Python code.
+		Bandit is a tool designed to find common security issues in Python code. To do this Bandit processes each file, builds an AST from it, and runs appropriate plugins against the AST nodes. Once Bandit has finished scanning all the files it generates a report.
 	</longdescription>
 	<upstream>
 		<remote-id type="pypi">bandit</remote-id>
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 359a2d5ae112..4ee96c2826e0 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,3 +1,5 @@
 DIST bitstring-3.1.5.tar.gz 761527 BLAKE2B 2e0c9ade6cd946bb777ee666d12c777191add1fdbb2c47fca097a0ee48cd8caa6eefb5dc1a4d69d9fbf986342759956bd2ed078043b1df7c482af54e25afc0fe SHA512 2c98768c98fc5ab99eeb4ac089ec66f091949e5e4f326563b1b480981ac2aa40258fe0065809eed9c08a71fae3cf09254a8a2465e86635db5287c0d2f241d75f
+DIST bitstring-3.1.6.tar.gz 751557 BLAKE2B e35735fac2f99832585e909b48faecec2c03f0bf41cb73d1eb1361269811c32a921c8f61762e107b2065adba38bbb40103e53909ed14dd84814eb323b73bc911 SHA512 d78d91f92f60044948199e4fa5ec48c8007268f725e5230d6c8be44a6ced578e61a2c2f8751822f191a909057f38d358a8c944f357a5f9ea98adb6baae3a0da2
 EBUILD bitstring-3.1.5.ebuild 636 BLAKE2B e5ea04847caba8654db0702673fe1ed56a125da209fee7250ef98fc9e207c54db209c2fdc8a71661b287f797cb8691249c21b0d877f4fce2e9b415b0411658e3 SHA512 95c8e7ed470750ef12cbec6a406a962fc5c4769f866a87f3d4b93c349af0850b72c8954df001e0a58a9156328e90b60fce6e75077af2ab24def5604dfec45a17
+EBUILD bitstring-3.1.6.ebuild 734 BLAKE2B 2f2517f7865cec7c4494be59912edf83863bb4032a108a98eb5fbb245e6fcb9889b7454b51c7146a1d9106abb0628f71da1b49c16f5829dae38b44972719023c SHA512 d882b6b8a4815740a03b8a06105ef141bf131e0cdd6ca6670e0fc0734a2d27900348fa7f6c2d5ae0aac7a4ebb9a5a1fb7c381c73fa4d474f6676c1a2b6444ab8
 MISC metadata.xml 661 BLAKE2B c6adcf300502376851157d3fb869c9327f49f4ae61f820ff59379816fddae11ec5c2952eb708d817facc9899ab347517a41c1307ac0bab4dcf34a4ff877bd704 SHA512 666cfe84898096825c292dd1e37af3b8d962f199199b8a73813b366fa4c14cc3a5373c4ed4fb8153b8e1c05321f4dae87204e1bf5a53e6fe07ab0117704b7f2d
diff --git a/dev-python/bitstring/bitstring-3.1.6.ebuild b/dev-python/bitstring/bitstring-3.1.6.ebuild
new file mode 100644
index 000000000000..48cce385feb9
--- /dev/null
+++ b/dev-python/bitstring/bitstring-3.1.6.ebuild
@@ -0,0 +1,27 @@
+# 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="A pure Python module for creation and analysis of binary data"
+HOMEPAGE="https://github.com/scott-griffiths/bitstring"
+SRC_URI="https://github.com/scott-griffiths/${PN}/archive/${P}.tar.gz"
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+S=${WORKDIR}/${PN}-${P}
+
+DOCS=( README.rst release_notes.txt )
+
+python_test() {
+	pushd test >/dev/null || die
+	"${PYTHON}" -m unittest discover || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index fd4aa93a979b..20e9dcaac79c 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -4,10 +4,12 @@ DIST botocore-1.13.46.tar.gz 6069713 BLAKE2B 9d10fc46314f379ed384f2803d4bf43b10e
 DIST botocore-1.13.50.tar.gz 6076129 BLAKE2B c969ba8635970eb7613124cafa3f7d1efaeec22699857405450a5e669f19733cf3328839d8dc568b7b46d0e2c05a3a649d97805dcb50e047c455bfbb9fc32901 SHA512 8c7fb409f9d1cd47f2711cc5cd34e7459087b50cd257d4f943b475d195ac141e01c3be53194cdb045d6ccf4ea59fdb2e485899275bb3185e6e562318615ec14b
 DIST botocore-1.14.17.tar.gz 6117447 BLAKE2B 7b0e357c8b88c45f320a41cca602bec509ef0c9958b47448a8470aed81cde1cceaec975028c3793f53e9580ff34ce8df19e9d3914674eff5225b0578afe9edb5 SHA512 e3211bd27ad595c4c85144267333520bc365cfa2c7329da3ef431efacaa1e5d94777700ec248188497ef5782c00632872cbacc920c02eec2c143cecbd7154e17
 DIST botocore-1.14.7.tar.gz 6092020 BLAKE2B 925b78a9414154838b4997da90a7916036a520725a99d187139250db7de70f0ac91437d8231e2880519090fc5143efb9ac7432c78303a5d7ce04f8e91ad78cfd SHA512 743cac75b1fa9f257f7b79c32211b061b29f359a97cf256ba8c3693eedbc186a43805d507d0e5726c49ef74f9777c68b3a204347d79058a0cc4f3891fce2fcc4
+DIST botocore-1.15.5.tar.gz 6146598 BLAKE2B 09b5b8dfd776bc13c0d1f52a61f80ae24a41daf1a14531e256273b1eab2cf824a42e60028eb42aabd19ab990369a9692172820b6a37cb0a9ee1275fe060466eb SHA512 34375b8585f4fa97c3a5672f03cdeb1961b6729d82f9706c04fd9f5ff1cc7bb33170ac147033bbc751c3c73ef558ba185b7e6526de0063190c14ec102901b56e
 EBUILD botocore-1.12.122.ebuild 1496 BLAKE2B 99db83ccdf13386f7c3745508682fd6b3e996070917b770e23cdb5b977183c822d763355dc9dffa467fd8c45faa06a7794bd22df2a32ca3db4642d0d45630750 SHA512 b3f6629a2987d1be0f99adb92608bd58054d5556e68e5082efed002aa0a3f4b679bb1a51bcf2dbbadbadb10b0bfd7c6803ebfadc9ea792a944ffb04e425fa895
 EBUILD botocore-1.13.46.ebuild 1498 BLAKE2B 1cdbb4aa1a4f20c6ccddf79c9f298d8d91d197c66bdbcb9c7b6702a590c54662aa3ca19d46f4d7b0487759f7844090cb214aab96c56403973174c66dfead6ae9 SHA512 d00e76828e605c20b2f038046f9eed713cfd760de25a006e392e4548d73995c91e43851396500a739db21f67f6bb706d6a5ad2e985856ae0322611679e042e17
 EBUILD botocore-1.13.50.ebuild 1498 BLAKE2B 1cdbb4aa1a4f20c6ccddf79c9f298d8d91d197c66bdbcb9c7b6702a590c54662aa3ca19d46f4d7b0487759f7844090cb214aab96c56403973174c66dfead6ae9 SHA512 d00e76828e605c20b2f038046f9eed713cfd760de25a006e392e4548d73995c91e43851396500a739db21f67f6bb706d6a5ad2e985856ae0322611679e042e17
 EBUILD botocore-1.14.17.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 EBUILD botocore-1.14.7.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
+EBUILD botocore-1.15.5.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 EBUILD botocore-9999.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e607e03dd0b05ddbd04b7bae7ab7e6bfd90636b05ff451b2b8673d457a1a48fa6f94d822849a2e44d4fe36a5a5e8 SHA512 c2f0b19ebaa0288ff55e8554c07ff021d1c716a9d2a267c7d39289af6a2a9ca58166d901a90e1d737decaa3dd41ac82d86309291108844dffddc7e4647667466
 MISC metadata.xml 487 BLAKE2B 4da33579cf14e968e507d4115e361aca7f13f618853758ae8cabd3ae7cc3adffdf374c091fe8086382728be8a59a8ee289408e53865807e0e0f93546d3eeadf8 SHA512 9df7187812d396f69b5a3499c20fa062a703c6a0385e63c812a2e1b7dd10a2c16343ff49d2585b17256623fe1b465f0e73d0fa39b07827338ed7fcfa38e45e90
diff --git a/dev-python/botocore/botocore-1.15.5.ebuild b/dev-python/botocore/botocore-1.15.5.ebuild
new file mode 100644
index 000000000000..f9ce3c85acf8
--- /dev/null
+++ b/dev-python/botocore/botocore-1.15.5.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_6 python3_7 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3."
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+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/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/guzzle_sphinx_theme[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch" )
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/unit || die "unit tests failed under ${EPYTHON}"
+	PYTHONPATH="${BUILD_DIR}/lib" nosetests -v tests/functional || die "functional tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/celementtree/Manifest b/dev-python/celementtree/Manifest
deleted file mode 100644
index c029279fcca4..000000000000
--- a/dev-python/celementtree/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX celementtree-1.0.5-setuptools.patch 322 BLAKE2B 5da2f11073e8f52505bb6c9ed8be446164624ca6b2032343cf5e064534db68804d04848413c2676d4bd50f3a07528cfcc6329bf2c6c31219eef11da8d01379a6 SHA512 d72e17afb23f9070797a0d8a88cb48df8c59de8c4f8db04cfcff7499e68d97f37e79569c1a763aa1670af8a99c9efe3013396a458a33ac8a338079fa25d4d792
-AUX celementtree-1.0.5-use_system_expat.patch 1069 BLAKE2B 2655c03b2e7faf0528091138de58a4bffcd2074b3f9979860a234d8b8ca474bf0f0071b891f3292eb0173859e831a6c78a8d763b7762c21ba783cff848f9bf8c SHA512 2b343a2aa5f30c1aa63acdc47cc89417f3622d837e846e2756098123f8491d140660c123d4dfabb4947e82b9561fbc424e31d3685e223db337a1b451bf2008c1
-DIST cElementTree-1.0.5-20051216.tar.gz 93766 BLAKE2B b3d70fdec8361b003915215e0007460bcc5947f96c293941849ff0c000eb689dc33f0d32a5f473370341f0e0749183717a326e79ae23a7e4c15f4e4ec9970366 SHA512 2cb99e4980580f186eb9b8740bc5a3e6e85e714a5d1f613850a8f12f7dbc125c8aa7770f7fe70480fb96999212c11181ab681822c74429882c1dfe91c20e2af9
-EBUILD celementtree-1.0.5-r2.ebuild 1111 BLAKE2B 744d1f1795f8d720c0d407b2b7e93613adc249ab860088f9cc1884ed59c2066be6e79ae6135bb5e7532c290cbecb0e2ba37ec3571f0488e6bf16965bc5b6368a SHA512 437f542e7132c5d2d32e94a80ab9cc4eda205ce695ce0b0f166714ccd721e9896ab18a583a9be47a02888e37a7fe36fac598916e95d675fa8a42642d31f2398a
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/celementtree/celementtree-1.0.5-r2.ebuild b/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
deleted file mode 100644
index 3821f5e3d91c..000000000000
--- a/dev-python/celementtree/celementtree-1.0.5-r2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="cElementTree-${PV}-20051216"
-
-DESCRIPTION="The cElementTree module is a C implementation of the ElementTree API"
-HOMEPAGE="http://effbot.org/zone/celementtree.htm https://pypi.org/project/cElementTree/"
-SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
-
-LICENSE="ElementTree"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="examples"
-
-RDEPEND=">=dev-python/elementtree-1.2[${PYTHON_USEDEP}]
-	>=dev-libs/expat-1.95.8"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-use_system_expat.patch"
-		"${FILESDIR}/${P}-setuptools.patch"
-	)
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( samples/. selftest.py )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/celementtree/files/celementtree-1.0.5-setuptools.patch b/dev-python/celementtree/files/celementtree-1.0.5-setuptools.patch
deleted file mode 100644
index d70dfab1a519..000000000000
--- a/dev-python/celementtree/files/celementtree-1.0.5-setuptools.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- setup.py.orig	2007-07-04 23:05:19.000000000 -0700
-+++ setup.py	2007-07-04 23:05:58.000000000 -0700
-@@ -6,7 +6,8 @@
- # Usage: python setup.py install
- #
- 
--from distutils.core import setup, Extension
-+from setuptools import setup
-+from distutils.core import Extension
- from distutils import sysconfig
- import sys, os
- 
diff --git a/dev-python/celementtree/files/celementtree-1.0.5-use_system_expat.patch b/dev-python/celementtree/files/celementtree-1.0.5-use_system_expat.patch
deleted file mode 100644
index fb90e59a4492..000000000000
--- a/dev-python/celementtree/files/celementtree-1.0.5-use_system_expat.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -u a/selftest.py b/selftest.py
---- a/selftest.py	2005-12-16 23:57:47.000000000 +0200
-+++ b/selftest.py	2007-07-03 08:07:45.000000000 +0300
-@@ -176,8 +176,6 @@
-     </ns0:root>
- 
-     >>> parser = ElementTree.XMLParser()
--    >>> parser.version
--    'Expat 1.95.8'
-     >>> parser.feed(open("samples/simple.xml").read())
-     >>> print serialize(parser.close())
-     <root>
-diff -u a/setup.py b/setup.py
---- a/setup.py	2005-12-16 23:57:47.000000000 +0200
-+++ b/setup.py	2007-07-03 08:00:57.000000000 +0300
-@@ -23,16 +23,6 @@
- # --------------------------------------------------------------------
- # expat library
- 
--sources = [
--    "expat/xmlparse.c",
--    "expat/xmlrole.c",
--    "expat/xmltok.c",
--    ]
--
--includes = [
--    "expat",
--    ]
--
- defines = [
-     ("XML_STATIC", None),
-     ]
-@@ -63,9 +53,9 @@
- 
- ext_modules.append(
-     Extension(
--        "cElementTree", ["cElementTree.c"] + sources,
-+        "cElementTree", ["cElementTree.c"],
-         define_macros=defines,
--        include_dirs=includes,
-+        libraries=['expat'],
-         )
-     )
- 
diff --git a/dev-python/celementtree/metadata.xml b/dev-python/celementtree/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/celementtree/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/cffi/Manifest b/dev-python/cffi/Manifest
index 09fcc6156767..7e8e0ad445d8 100644
--- a/dev-python/cffi/Manifest
+++ b/dev-python/cffi/Manifest
@@ -1,15 +1,9 @@
-DIST cffi-1.11.2.tar.gz 435142 BLAKE2B ba90cc377261a75557cef626f1c6b8c0c625c67212b546d42ca56c3360496d01c59984f72d5ce61b1160aa6117b869e567b17df8458de2c88a42dc5e653f6129 SHA512 8ccd8988bb6b4beb760abe5d8cac7cbf65a7dcfad5a535343e5961912751f426fdf6e602a983430e6aa9f56f2f623855b0cfb5ed8e5294a95d122866a4533eda
 DIST cffi-1.11.4.tar.gz 436857 BLAKE2B 46b5d1adf4aca2a75ea02ba01ae934821d0e864accd9c355745a681d11a08ed34c33c473204c78ecb2113b2d59fbc762ca0607ff92f6cd2dc411907844bbdaf3 SHA512 184572ab8c1f7a72f00084c23894efe1691aa20f9e822a3f7184ebbed16e757586ac47e7f1d12dd7b14b4322bf5b88e35465dc3bc8b0caf0dc8e2b626a52615e
 DIST cffi-1.11.5.tar.gz 438498 BLAKE2B 2e22cf3c2d50d76f8f25b7ac31a77fac8a49e2b2f4952e3b1a1da79c0ad2ca5c6e450000cadd1efa06df53d14f711e0acd73a075bea45ebd61e667fb650a10ab SHA512 6770d5293cfd7405e733d60c96655641b5bcc5878fc66a737f4a8308f465d459ee0e3fcaa47893d8f57fb195e5534dd7e4728c868f33d7e657688f45e1fb1880
-DIST cffi-1.12.1.tar.gz 453584 BLAKE2B fb0fee63f5cc4dacd1055036ed6e7882452e848dfece99adadad7ebb1f0cc4171d1be5370fda5552da45127e374382b29cdc8e1f5122081d2551604630774cac SHA512 1863ad26d730d629e1397ba155bebd3f9edc881d661fda5301a5acb080c8e006925317c1b092f054c46834d693c437d6e91a687f379c9ab029223a9a159eaf48
-DIST cffi-1.12.3.tar.gz 456340 BLAKE2B bac7265ed9b0858d791443572f39316fdf809c8e40b5a2557ccd667858d994cb44368b4b74655813833d3c5cd5c266fbb5227d777db8fcedc599917f31dab7ad SHA512 9070f5cfe543c9261a79f995548899c3e7539ee20f562ba91a4a909887745bd28448b0e38241031d6b2ab87286fd0ec91768b8bf6577716427612d41b0ed3b93
 DIST cffi-1.13.2.tar.gz 460243 BLAKE2B 74603f2b1bde068a955e94912488fd7d8914267ec2d0cbd8574f62376fc24ef16d85d59e9fee7f6015e6d242726ea25235788faddedc68deb56ae71e627d6322 SHA512 2c57d9c06c39e95498a54408dc39940427190f3c03e1b8f1a3584140db08a5775dd12e6e67b03093429c130af579d01519b0fc868b99ba7a530068ed22d38522
-DIST cffi-1.9.1.tar.gz 407108 BLAKE2B f95e99cbb7a10aacb714d6ddbe85755e24d4fbdebb9ada0ab87c95b58aa56b364df612fbdfbf6fcc3a9dfff6e96fe5e979ee37b1c6c9b62b6ba8d3a9565def2f SHA512 6e76f181b6b7b760a14ad70338edd104a8b8e2eac5680e336d3868e0bd031a1665608e29a65dc0c56806afb8a8c03811586f151f3acef11e54e60c1bfcf902e3
-EBUILD cffi-1.11.2.ebuild 1487 BLAKE2B 200c098a677558ccc64dad4aa6e18a4b9e4bab053739bcec60f755fcc762e118cf5013663c426df5772b8bcbdd88714bc2d730fc2a4563c6947765186bafaa58 SHA512 3213245482b1ef824d885024e13cd30fafe9821bd56dea28b61b62d8dcd8b31773754cc33652a80ac4e5dfa3f21a83c40c524453a793d5d1a7e1ef57c58e9a23
+DIST cffi-1.14.0.tar.gz 463065 BLAKE2B 4d1e8a92241db801848ef8bd05ea15a31c7f61ea426ce4da184aff00df786348d2c76de9dc48898c814478aed9750b665868df24ad39435062cd7e1c84163e52 SHA512 4c5451eeede1d48a8f4b40e25b845ad1863b8bf3bd39624e6c693c2800d89a13efedc4c43b37e317a035613bffc2e3fd5f7e583c46cb283cb5cb930356f86253
 EBUILD cffi-1.11.4.ebuild 1477 BLAKE2B c97f04a96b3ba6f33030535449bb658f3fcb30faebeb627d66d5b5b1b2e6c6a5ca39886c2223dd7fa02c01b398b43227e14b90f30cbfd55c85050a471e68276e SHA512 9ac1eb070b26bad39e3c2278811fa866a3e86dea8efbda3a525b2a7743474b4cee7e4478e8b5dbdb2020fa919c5d642d17a72acbc497e7fda9174d4529fed0bd
 EBUILD cffi-1.11.5.ebuild 1580 BLAKE2B 73d83e2026ecfcd32a0e24a8e0130d71f63f37802dbebd746063f7dd76b3f2c2426e23f8bbb22319eb801d4c978b33bd73ccce41106383ef74999db32e3416b4 SHA512 393f1e481bbc9354447b9d968b93096d39bf49cbe986214dae320b867660b94999f07f272cd88af89644b9c59da406260b676cdd006ed4d92889deeb7ab12eeb
-EBUILD cffi-1.12.1.ebuild 1580 BLAKE2B 73d83e2026ecfcd32a0e24a8e0130d71f63f37802dbebd746063f7dd76b3f2c2426e23f8bbb22319eb801d4c978b33bd73ccce41106383ef74999db32e3416b4 SHA512 393f1e481bbc9354447b9d968b93096d39bf49cbe986214dae320b867660b94999f07f272cd88af89644b9c59da406260b676cdd006ed4d92889deeb7ab12eeb
-EBUILD cffi-1.12.3.ebuild 1517 BLAKE2B 0e6221f43acbea90657bffc060fbe383f6df28d2c46bcb2fa4330c841edee9c66eefa69f03dd73704a7bd44b2ca3bebb6e3e7858743d0fd0eab5850262ebf9bd SHA512 1d2721232a0c15327231f20ca04e61acb2058835ba83e8545423faa3ec6e8bbddc9431b55b6b38a1e5713ee260f0329e6ae76a4811247bfe1c87a8395305a54c
-EBUILD cffi-1.13.2.ebuild 1264 BLAKE2B 1b37473e1b200092e8879f1b308342d2edf694ad796373be4da4cf6092886b1a2c2c53fc6ce3d193f1c26c4a0eb715c744db3e34d2a698cf6fcf9b6d3e0afc97 SHA512 8548618f09fd67af4f1f017ee7a0572eeea349c5727052b89414fb33fdc92bcd1a179327cad0aaba3c3f37bb937e362bc6506647f637ebcafa81fa1389369e6f
-EBUILD cffi-1.9.1.ebuild 1478 BLAKE2B e7a810a4897f87d7d77d60de89a2fd818d704d2546313cf3720ebfc5dac0a23bb38a384b4c971624e15af3467ac8169468004899e2571bc7703dc98da96b0b41 SHA512 3596c53d847d0033b5721ac7de0ba7faf674691dca6f8f5e7a92682e06e8f03f2806455926f19523fb2779dbd871794db9548388735b654f0e673afec5e5a79d
+EBUILD cffi-1.13.2.ebuild 1290 BLAKE2B 096323a89f10eb567015ae6dd87fdbbdb9b97ae937e9fe3eda3a9428cc4cf036e3fcace947b52b40657e7a6df1af7319ed61debb18716b4226b805ef2560a125 SHA512 e50a7c2bb9fc20bed61e3ccd66e3a367750dea438a91c64077300685d6578d629b45bee620b17fd4978da024b9c199ef5e0a33ed17b62dc2a1355d0bdf90db99
+EBUILD cffi-1.14.0.ebuild 1299 BLAKE2B 4a2cfcd6a592abc651043c3821b8410ab8f6c25d73885ddfa534ed2f28a293d1428adfb60abdf2ec505de9f8af95b48169fa47c2e78ddd23e9e93780a0f6aa0a SHA512 24a778f50ce08e7b47489f503e39780933832388bb2fefa82cf03f98f3da1593e6ea3f3ebbb2aa763703eec2717f222fd52c79ee6596bfa442a028db686e01c8
 MISC metadata.xml 317 BLAKE2B b6416209bd2358c42c2be3bd228238b401bf126919b6e7371d83d7cec8cb55a40f89db562701cc8f3dfa904e225426881b22ff1d3b72085365b5caf9b8c6a403 SHA512 0744ca7b98b2ebe2985bf2a81a337d09be62cfaa51f8380bac52f8d30941e997f09be20e28caf6967226a71369003cf35977790aba56ed0d469cc490cfa089b6
diff --git a/dev-python/cffi/cffi-1.11.2.ebuild b/dev-python/cffi/cffi-1.11.2.ebuild
deleted file mode 100644
index b5cf9755e76d..000000000000
--- a/dev-python/cffi/cffi-1.11.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/libffi:=
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cffi/cffi-1.12.1.ebuild b/dev-python/cffi/cffi-1.12.1.ebuild
deleted file mode 100644
index 18166d476691..000000000000
--- a/dev-python/cffi/cffi-1.12.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/libffi:=
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-src_configure() {
-	tc-export PKG_CONFIG
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cffi/cffi-1.13.2.ebuild b/dev-python/cffi/cffi-1.13.2.ebuild
index d4b10421eed0..6321fbae8736 100644
--- a/dev-python/cffi/cffi-1.13.2.ebuild
+++ b/dev-python/cffi/cffi-1.13.2.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1 toolchain-funcs
@@ -15,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cffi/cffi-1.12.3.ebuild b/dev-python/cffi/cffi-1.14.0.ebuild
index 297c0da19387..feadc3e9d35c 100644
--- a/dev-python/cffi/cffi-1.12.3.ebuild
+++ b/dev-python/cffi/cffi-1.14.0.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 # DO NOT ADD pypy to PYTHON_COMPAT
 # pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1 toolchain-funcs
@@ -16,38 +17,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0/${PV}"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	virtual/libffi:=
+DEPEND="virtual/libffi:="
+RDEPEND="${DEPEND}
 	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+BDEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
+distutils_enable_sphinx doc/source
 
 src_configure() {
 	tc-export PKG_CONFIG
 }
 
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
 python_test() {
-	"${PYTHON}" -c "import _cffi_backend as backend" || die
+	"${EPYTHON}" -c "import _cffi_backend as backend" || die
 	pytest -x -vv \
 		--ignore testing/test_zintegration.py \
 		--ignore testing/embedding \
 		c/ testing/ \
 		|| die "Testing failed with ${EPYTHON}"
 }
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cffi/cffi-1.9.1.ebuild b/dev-python/cffi/cffi-1.9.1.ebuild
deleted file mode 100644
index 31c62e6cba41..000000000000
--- a/dev-python/cffi/cffi-1.9.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# DO NOT ADD pypy to PYTHON_COMPAT
-# pypy bundles a modified version of cffi. Use python_gen_cond_dep instead.
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Foreign Function Interface for Python calling C code"
-HOMEPAGE="https://cffi.readthedocs.io/ https://pypi.org/project/cffi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	virtual/libffi:=
-	dev-python/pycparser[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )"
-
-# Avoid race on _configtest.c (distutils/command/config.py:_gen_temp_sourcefile)
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	einfo "$PYTHONPATH"
-	$PYTHON -c "import _cffi_backend as backend" || die
-	PYTHONPATH="${PYTHONPATH}" \
-	py.test -x -v \
-		--ignore testing/test_zintegration.py \
-		--ignore testing/embedding \
-		c/ testing/ \
-		|| die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 36dee88ba549..06c29e1a8961 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,4 +1,4 @@
 AUX chardet-3.0.4-pytest-4.patch 802 BLAKE2B 64992866c2f101b41f525a0f8cf642774850211f434b471dcfa5aaadcabd5ceb573d5b902f6cdecc2f651a71dc8955204f13beb8a5261d4d0ff3aa6703a4266d SHA512 ca99abb30e8e221b43b7467cfa385c0abb16addd4befd149e35208278a25faf07dd99edd20595be4d0d0d0afdf81602b47e0110f4e9335ef90f5b4c41b54b0ab
 DIST chardet-3.0.4.tar.gz 1872214 BLAKE2B b93e2d3e0b5a5c35affa5e3ee661323029f79837a1222d8f69db72911301d9490c9788d2effc577eeeb2a50334cc855afc4bdf4b8dbafb143fcc411d93b824a9 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357
-EBUILD chardet-3.0.4.ebuild 909 BLAKE2B e25ec5c6536ac4c70721a3bebccdc861df737fb69e96aca489b9be30dc34d04da6b9ba04b52895dfd2d258f6fa5d76eff93338fc54fa406ff9b02ce0db3b0f4a SHA512 26af120115675f63442f6dd1c26e55dc956ff7a036ce14d4377f2c27f9c24a726eecb571d9fd68cd87070d793f58ec9f71a725e2e0c2f69f2f5ed72496fc817e
+EBUILD chardet-3.0.4.ebuild 942 BLAKE2B 001c8a85a68b357894eb366c50b50cc0b10efa3db679b68da6d435df7a0d0f36f65c5323fdd0dda6386508730620ea70b7ce4e8afe4bf4826551ae664fdefabd SHA512 670f50c339e4e072e69e680f75958adeab3efc8fbd8dc33cc427f57bab4687c3c1d90ac7ba5c0b14dcd88d68ea955bd3f5da64ddc868aed8e64204b0b0165b3c
 MISC metadata.xml 377 BLAKE2B 8aa19a889e96303024d469c969a9e47613cabd1456b0e21888a02a091049e09a53c6faa3d0e128b5ea21b68f521cede9cf09b570f2fba7a4299187a44e40b018 SHA512 c48c3874a248049fc2845d0a64ee5b94c705ef58158f882f30bbdc561f311a7203cd8979e067a5b0f3f034c95cc4b6da373cea6efc9616f3dabc574772874650
diff --git a/dev-python/chardet/chardet-3.0.4.ebuild b/dev-python/chardet/chardet-3.0.4.ebuild
index 0c4e3713a49b..84c2311225aa 100644
--- a/dev-python/chardet/chardet-3.0.4.ebuild
+++ b/dev-python/chardet/chardet-3.0.4.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index cae13b0b4bbb..9e3c8e48cf94 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,8 +1,10 @@
+DIST cmd2-0.10.1.tar.gz 574301 BLAKE2B f97a60cfeb6f3ba411e64f1f8bc7d51cbefbdc7821764b3a0d65e83d1ec7158f8e585f0585ec6798472b35cb3533f3a35b9113d531d657fc6abd116fe905f75b SHA512 b7cb5b6c191ead56af3b83b19400440f0313b70568a1c838ca3f7d96c9312c36660dee42ae6e59db460afef99366498931f379d75d8a5d0860aff300c0a53380
 DIST cmd2-0.7.9.tar.gz 71298 BLAKE2B d1623e2d6a7ac66058b5a43a9688ba850962fa7b5659c3287a9aef9a7deb16338d71a2c07ef15ec72ee5e62aae0ce3cdf2f202d0d423040b734dee059f1d4876 SHA512 39086794ea57cdfdc7388aaa485770f1a76457bf2b2f58cd4703dc0c082f58a8343aa777304e833133040fdab8ef8451d85bc3c19721432514bb380330823abd
 DIST cmd2-0.8.9.tar.gz 112543 BLAKE2B b55edd450abcff863a34252b724919ace9f65b62b8175f28a1bb4fb64692a67723339a887dac45e87f37db71773689cfa213038740a4b3d165bf95f9cdad1d0e SHA512 80c80b67f8a1709156450fa476215a5466cca2853102f6012f1d83867a311d86a68d441dcea9895b62add731b3d00a7c3ecefde939b4f2ccd61d058ef9386a84
 DIST cmd2-0.9.22.tar.gz 565214 BLAKE2B e0f950c1bc994bbc3d1ddf2a526a97d61c1aa59c6089574518d2222c385ecf91f53fcc0e6dcaa84460cc4a6647bc5baf37f12c6c9bf16fdb3db14cf15a05bd18 SHA512 1ff5cbea130ef3729c021144ca27a31c0e9cb8b2977eca454a0f528c468180e822fa8d23e7b07846a5109ad38bf12565b613b8295751f94852d9251c4e8d6edf
 DIST cmd2-0.9.23.tar.gz 568514 BLAKE2B 02070a72ec42cd04f3f647eb6344b48a5149e21a8a87be713dec837d48295c6b919f55229fb09d013f1722ee111f8a75958e884c18b2eaa339097ff81554d8c3 SHA512 ea00a17b206d6312b0c2ae6b982f3fe4634f7717286a475438972780a1510b37120f007907f632338eafd093d03cb0e928c705e54a3aa8295f7aced73630a2f2
 DIST cmd2-0.9.25.tar.gz 576329 BLAKE2B e3608df62ed47d04b039a71bf876556ac7c6f9dc0355d1593c63ca365fd7baf207a2b4169525911e85c98ffd38c1a603023a9851a2ffc556a99970d57fd393fb SHA512 7361c81ca0dc0276ade2e0de471d86865801b193db8c1fc4064cc8d7311083f95d6e20c67c5540b9e162d37976976d82bc609a0be6524be113fe4b7d3b6d627e
+EBUILD cmd2-0.10.1.ebuild 846 BLAKE2B 4970c9d5f97d1fe7606968e2b56a72e5ab136d96d95fefadde8c1196ada644292d711a933ee08a3209e8fc51e8c27168db2ef60bd47c5703cef3fa3f5fe036d5 SHA512 a33251d3adc79d3b584aa08de493684f2c05775b4bec00101e25416eb196aa0982d4156b927c05a775fa0849e8a6363fd1ce87ad802b91f69539073ecd718369
 EBUILD cmd2-0.7.9.ebuild 890 BLAKE2B 487bcb215e12de6e29fcffce6b7d3d6284fb762e5a8f16722c7ab16696415d0ce615f9ce03d34f2e8dfef5b7abf8d5c1d2572055acff8d38be1b69707baaa912 SHA512 7864c9455ee3b068026832e29371d8cb844b7a43e0e826dbe88fc42ff9b12a6a23259705c3e321ce8637e4d0dade5226f678de4564329d8dae416203801900dd
 EBUILD cmd2-0.8.9.ebuild 977 BLAKE2B bbf9af55c9193292961166d278515b5ea0977ca77101e80f7a4d121f0678b512f3e2b67dcde76081b26d736294581a239f5033878c8d6b800d2027659ee53f04 SHA512 b2c39ffe37743f0cead927ca0b120a1ac6cf842fe7235168be60a8fbff030905c02bad38db316ac92a5d30eae018677473a4acae2b2a48fe07dcf10755b898b5
 EBUILD cmd2-0.9.22.ebuild 984 BLAKE2B 0972dd77534ff95c19354c2befd9b278422a5316b937c65faa1f12d268ff209034dce75f655a77975c8c166c9fc049640083cd4e92b543b0ed73904e980506da SHA512 54b39773b49af3479f43932affa8257c9313387309d735223718e2ebaaa3c66acfb30e418d35d042aac0f839e3557f4f497dec2b25b18df4c5a305740cac8165
diff --git a/dev-python/cmd2/cmd2-0.10.1.ebuild b/dev-python/cmd2/cmd2-0.10.1.ebuild
new file mode 100644
index 000000000000..dd0714d43c10
--- /dev/null
+++ b/dev-python/cmd2/cmd2-0.10.1.ebuild
@@ -0,0 +1,34 @@
+# 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 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/collectd-rabbitmq/Manifest b/dev-python/collectd-rabbitmq/Manifest
deleted file mode 100644
index 7d64f2b48693..000000000000
--- a/dev-python/collectd-rabbitmq/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST collectd-rabbitmq-1.19.0.tar.gz 24966 BLAKE2B cdbfc8849a5060a01779493aa7a7347a70b0cd763dafc89e267d5bcf1e58a85b9da49031df56c738169063594937d87505684237f35b92175f7a8b0f4d0e3a9a SHA512 bc5f1b9ca9fd8c79ff290bd3583fdac57e72940f10b453e54721dfb51627a4c78400cb60cd953530b4d11abbcff78717d9c04ad235e55d78e390ef1accc3e4cc
-EBUILD collectd-rabbitmq-1.19.0-r1.ebuild 512 BLAKE2B 9be2b9897493f7f641b9d44b1e2b17ba45491fd3ffe220dfe19c7f27409e916a067b2507280f9ec945b62900ab99a2a8e8da734241c6b75bfb7eda8ba8667873 SHA512 3e4ca9bb2d95e944ba67bd2fbf91386d80375422297a217c34b4f407d179634b6cbf4eff980f0464baafab66442233f4b2707b530b04ed23a59aa2509eb1765c
-MISC metadata.xml 298 BLAKE2B 7c1d7369e5359601ff4f262e26dd136e357b211a629e1a39279219a1705d85d9e0b6b6835cefe95767b614aea1467a05f7024818abd2718c23fc6d7cf5f9953a SHA512 6d662091640921c162d7350fc727878097520c2967a7988815d1df09acfeeb90c1e385ce3533413267b1f1056eb903bc4ffe8a03cb2b26e37662090b17476969
diff --git a/dev-python/collectd-rabbitmq/collectd-rabbitmq-1.19.0-r1.ebuild b/dev-python/collectd-rabbitmq/collectd-rabbitmq-1.19.0-r1.ebuild
deleted file mode 100644
index 400fc6f928bd..000000000000
--- a/dev-python/collectd-rabbitmq/collectd-rabbitmq-1.19.0-r1.ebuild
+++ /dev/null
@@ -1,21 +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
-
-DESCRIPTION="Collectd plugin to gather statistics from RabbitMQ"
-HOMEPAGE="https://pypi.org/project/collectd-rabbitmq/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-KEYWORDS="amd64"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-DEPEND="
-	net-misc/rabbitmq-server
-	app-metrics/collectd[collectd_plugins_python]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/collectd-rabbitmq/metadata.xml b/dev-python/collectd-rabbitmq/metadata.xml
deleted file mode 100644
index 7b7ed535508f..000000000000
--- a/dev-python/collectd-rabbitmq/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 type="project">
-		<email>python@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">collectd-rabbitmq</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/colorspacious/Manifest b/dev-python/colorspacious/Manifest
index 8516b27ef334..ca1a6a5ef367 100644
--- a/dev-python/colorspacious/Manifest
+++ b/dev-python/colorspacious/Manifest
@@ -1,3 +1,3 @@
 DIST colorspacious-1.1.0.zip 698745 BLAKE2B 3d6ebf9b76b727a982829fb0e3012507e30524662110628d8bc164bad4581baf147cdf4d6c8d54a52420d3e72497ac547f98f1d162b178ac20e8e9c926d41bd3 SHA512 b4267cab679d581f2072f5a315aeccd78cc68e325e16f14675cb17133cd411a28f376f150aee7822e1568b84571d5d149adff10e9c5a7fd9f41927153967e2ef
-EBUILD colorspacious-1.1.0.ebuild 685 BLAKE2B 4d055b7e7cfbba60623b6ce67263723f069ef68a884cb6fde70d3bdc3785b60908ea88eb206f931a2decb73135c3d4327087486cd22f82aaa295d02b0b523b15 SHA512 57b49770d3375969f2685878daa939a3cbe6e0fa3eec8cdd1cc59fc78c88729ab8b55a8d2c70b9779303b9cdfbf5771d941020ad9d74fe9cb1ef641a96af42c1
+EBUILD colorspacious-1.1.0.ebuild 684 BLAKE2B f0ea88ef88b3b3b32108ddd6f67604b68475d7c47191b9b1190d920852c866bcc1544528d0b6958ec167658153a9344aa3184c2007807400226c33b794a24878 SHA512 8fc33e5ab9f1821491cc6f32fd41df006e8a78e36169e71e4eaa348fbb0f3a5800c31a5a09800e89c934c1f2d916de1b5e6796465e39a9f0246646a6896cf199
 MISC metadata.xml 377 BLAKE2B cb7c86d4c3ae646535ea9bd34ab9b1102227fb900472740734d9e35d18115d4f255cdfa146e9c74c5d1907c0ec3682b01cf72e2a5b6428e2a4eac94ad6854f3e SHA512 5dc4640a370df69368d6d731b54693c4a7f1b2d7b155dbbef2bcc0e8ac4a153d05b4b2a43e6410750a3dfedd15752b3470b023d7b9106eb78ca64bd3a73059e1
diff --git a/dev-python/colorspacious/colorspacious-1.1.0.ebuild b/dev-python/colorspacious/colorspacious-1.1.0.ebuild
index 33083edf02fa..f0be0abb64fe 100644
--- a/dev-python/colorspacious/colorspacious-1.1.0.ebuild
+++ b/dev-python/colorspacious/colorspacious-1.1.0.ebuild
@@ -22,6 +22,6 @@ DEPEND="${RDEPEND}
 	app-arch/unzip
 	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
 
-python_test () {
+python_test() {
 	nosetests --all-modules || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/configshell/Manifest b/dev-python/configshell/Manifest
deleted file mode 100644
index 93efef38a5e2..000000000000
--- a/dev-python/configshell/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST configshell-1.6.tar.gz 37246 BLAKE2B f46be92f945d06583a02ac2aa4dba7bc1a91b888faf2235222b4c3975eaffee26a487f809c94e232540266ed78bf55c44e7e364d719c8ab08e11ac52d4674afe SHA512 04eeabfbe36f8845eb21cfe2b41a6a82d029ca23fe821ecfbf94d321fb8c9cc20f3d374b385cb20e00fd34a59feb364400d724e973174d9be90dad35813da0e0
-EBUILD configshell-1.6.ebuild 688 BLAKE2B 6c2286416e57a97b68a09ec653dd94f8ffc0b52e8822b5624ec6f036c186fab77bddbcf273f2aa1bc176020a5b656c9daf291929e8eac4481637a64230776a0c SHA512 9c2075738ce0edeac353a1e6ca02b7dd8762ae6b8c17e9c4f3c99691789a5d0fec7ad218581044ff86127cb20fc6d68a0dc6ab02751991464dc791df3c2557e5
-EBUILD configshell-9999.ebuild 688 BLAKE2B 6c2286416e57a97b68a09ec653dd94f8ffc0b52e8822b5624ec6f036c186fab77bddbcf273f2aa1bc176020a5b656c9daf291929e8eac4481637a64230776a0c SHA512 9c2075738ce0edeac353a1e6ca02b7dd8762ae6b8c17e9c4f3c99691789a5d0fec7ad218581044ff86127cb20fc6d68a0dc6ab02751991464dc791df3c2557e5
-MISC metadata.xml 340 BLAKE2B 921080fe3fd820019e2dc3c9f75dca364670952781570f838b96d66dc74992d6446629e3d1601595d69b721881464cac2dff6a2e662c984bc6b60fe431522dde SHA512 cd22fb2356a647fbb63189446497d03dc3f39c6d657bb91ee9c74d3c3c5db97136e280460a9dd8b8694489514e66585a01cfea73984aa24dd66bd1139cdb3f27
diff --git a/dev-python/configshell/configshell-1.6.ebuild b/dev-python/configshell/configshell-1.6.ebuild
deleted file mode 100644
index 01c369dd1a66..000000000000
--- a/dev-python/configshell/configshell-1.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="ConfigShell Community Edition for target_core_mod/ConfigFS"
-HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Datera/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/Datera/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="dev-python/epydoc[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/urwid[${PYTHON_USEDEP}]"
diff --git a/dev-python/configshell/configshell-9999.ebuild b/dev-python/configshell/configshell-9999.ebuild
deleted file mode 100644
index 01c369dd1a66..000000000000
--- a/dev-python/configshell/configshell-9999.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="ConfigShell Community Edition for target_core_mod/ConfigFS"
-HOMEPAGE="http://linux-iscsi.org/wiki/targetcli"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/Datera/${PN}.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/Datera/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="dev-python/epydoc[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	dev-python/urwid[${PYTHON_USEDEP}]"
diff --git a/dev-python/configshell/metadata.xml b/dev-python/configshell/metadata.xml
deleted file mode 100644
index c6e531475cdd..000000000000
--- a/dev-python/configshell/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cluster@gentoo.org</email>
-		<name>Gentoo Cluster Project</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">Datera/configshell</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/cosmolopy/Manifest b/dev-python/cosmolopy/Manifest
deleted file mode 100644
index f81945e36f45..000000000000
--- a/dev-python/cosmolopy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST CosmoloPy-0.1.104.tar.gz 65162 BLAKE2B 5cddcd9aaf923fbd48871e28b11b2a480a58409a686df942d158383a3f3f46bb5a9f687cba05058ac716f63ac9eff30948854a2e465710d803ed17de94b53d13 SHA512 b79b5b264a6bdd68082fc3f62f40957421d9a6914d1623cc89bac9b64598e5fca5d52290632ab55878c893223aeb3283c9b088987a0927d2c22160bc521359fa
-EBUILD cosmolopy-0.1.104-r2.ebuild 1084 BLAKE2B 7a70eb31684b4f1e3d5ebdcee2af6e7b33c91ed05182debacba0f5934f3abc38c9bc0c829110ceec26781bbfe3c0b9555204de0c8d98d30ef62c7371db86d11f SHA512 ef1b6aaf42e6fca3b44572e430b1d735a592ae60772ca4962a29b38310e879437d84c743678da26c7501b148dbe89974361916009203ac47dd5f0af4748fe7ad
-MISC metadata.xml 551 BLAKE2B ac51efa3b41437dbfe1f3f9559ebe3d19b9e39588a79adea2a5746c50a1d845096b44e96f3a581286fc2619df2a52deac03a915bff47e5e9f6011ddc4c44f9c2 SHA512 0f6da8ea89687a2ad518e19a53e6814cc26d96c4451e7d968ee103c66f2a4515b80cecb698ebea0c7e9fbcf00e571fb45b72311cef9e1e0dea18b94a025d18b0
diff --git a/dev-python/cosmolopy/cosmolopy-0.1.104-r2.ebuild b/dev-python/cosmolopy/cosmolopy-0.1.104-r2.ebuild
deleted file mode 100644
index 42224b91b0f3..000000000000
--- a/dev-python/cosmolopy/cosmolopy-0.1.104-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7)
-
-inherit distutils-r1
-
-MY_PN=CosmoloPy
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Cosmology routines built on NumPy/SciPy"
-HOMEPAGE="https://roban.github.io/CosmoloPy/ https://pypi.org/project/CosmoloPy/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-python/nose[${PYTHON_USEDEP}]
-	dev-lang/swig
-	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )"
-RDEPEND="
-	|| (
-		sci-libs/scipy-python2[${PYTHON_USEDEP}]
-		sci-libs/scipy[${PYTHON_USEDEP}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-
-python_compile_all() {
-	if use doc; then
-		epydoc -n "CosmoloPy - Cosmology routines built on NumPy/SciPy" \
-			--exclude='cosmolopy.EH._power' --exclude='cosmolopy.EH.power' \
-			--no-private --no-frames --html --docformat restructuredtext \
-			cosmolopy/ -o docAPI/ || die
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docAPI/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/cosmolopy/metadata.xml b/dev-python/cosmolopy/metadata.xml
deleted file mode 100644
index 27c8bab416bc..000000000000
--- a/dev-python/cosmolopy/metadata.xml
+++ /dev/null
@@ -1,16 +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>sci-astronomy@gentoo.org</email>
-		<name>Gentoo Astronomy Project</name>
-	</maintainer>
-	<longdescription lang="en">CosmoloPy is a package of cosmology routines built on NumPy/SciPy.</longdescription>
-	<upstream>
-		<remote-id type="pypi">CosmoloPy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/cssutils/Manifest b/dev-python/cssutils/Manifest
index f8a39591e9cd..11f46f8a3fcc 100644
--- a/dev-python/cssutils/Manifest
+++ b/dev-python/cssutils/Manifest
@@ -3,5 +3,5 @@ DIST cssutils-1.0.1.tar.gz 353621 BLAKE2B 142320e2358acb1b5b95400f42fb5eb4084060
 DIST cssutils-1.0.2.tar.gz 367038 BLAKE2B e19edce100dbc05d6e469eb6b0ad234d7d4c9458aca1b2a3e72bdeff1a35dec64427353936a339e2071d8ba2e8804c5754f55a391955a61ef61ae56381269125 SHA512 4988893875a03923d3127e334654799e5c2ebcdc0a7f5b3fb5c9ab27d1b331caa5bf197161312a298531e0757843aa3259ceba5fa19947353eea24a5da53ceda
 EBUILD cssutils-1.0.1.ebuild 1311 BLAKE2B 70a1606ac3db1370fc5160ec421d89ec4639653834e4ae683e087c9dc8fa648614d7744a2aa44963301c50723f9619880afcf00464d1191b1b416854ccddd0cd SHA512 d8c818491c267f59bf95c9a458915e39257f683453f74d5cb9dbe1a72850980e93a1bfea8ff3e4f38263a281be1ef4d4dca737f5baada4202665b3675ec68adc
 EBUILD cssutils-1.0.2-r1.ebuild 1507 BLAKE2B 617dd1fb973ebd1640767324c07592460d400b1c3dc8b187d85721f7e523e2d8179d5408fd33250751bb305e72d8b1256c3e1bb672f05bae38a14a004d0c6695 SHA512 a54bf52cdc82bd8a5bf231bb490cd349033a5123eb38439123554a6ae08b3d96d52d7b738d10d42ee1d6a4a1a0e3ad36f85d041b16d177213ad7d0aaf50cdc3e
-EBUILD cssutils-1.0.2-r2.ebuild 1511 BLAKE2B 5b2d03de1278cb3a03d67c9ab6f0597d0e320c0c33d51a6d332456f4dee24303c981a5fed040b9e705df12a4eb86865a79cd7db2a05f9c0861ab67aeef7df409 SHA512 fe576f07af73fce5b1d1a7f41a678b38dc4d75210ad1eaefb63c5ea4c2e3632566b68ab0a0e6196dedb1a1fbb2a3b9bc2a392ac233c7d39284f6eca037966ba8
-MISC metadata.xml 669 BLAKE2B 1d3cf25cab5d7a828451da5ec24ccae08e31141e6ec2ffe3efaead8284a4a7763a1c5d053138bbbc2f3846a45dcb6bb353efaffdf0a83fc110f13a6af13ed1ac SHA512 3fe0661179833d29c8a5e5ae2b7d872ad860354c58bff8e18935f5876fd95cf8fdfbb4ebda9719198dfce891647d04f263d213b74eca635005098a89a0402294
+EBUILD cssutils-1.0.2-r2.ebuild 1540 BLAKE2B 7e6116b5fd91101d367c8e5101e372e737b4872465a51acc42781aa609df033171e642c854674c82a3709797d38609927eaeff125f1981c3193ec839a30d58a7 SHA512 0824d32068a39cce0f6ad3ce534298d526acccafc4d39e9cb0775a362f26f802a3190bc00af7ec940390a25821848d0e3e3bf03e10354870d12a3918aedbd8f4
+MISC metadata.xml 556 BLAKE2B c7ecbc812459a9f52c8931f9bff561d5d21a3b8282bfa299320fcc456a33e3a87811db58ef62ccf5ee359062d3095c6cdc60574eec518516a099cd51242d8c91 SHA512 1797d4788446c3ac72abd12c722e81325f032bab8e19ab89d83883ceae354bd1e38669673c1daf3ecb522988481546884c6960d28536b55a9168bb6edf6f22a0
diff --git a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
index b1dbd02b135b..3385328393b0 100644
--- a/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
+++ b/dev-python/cssutils/cssutils-1.0.2-r2.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
@@ -13,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 arm ~arm64 ppc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cssutils/metadata.xml b/dev-python/cssutils/metadata.xml
index fbd9010455e4..f9762173523d 100644
--- a/dev-python/cssutils/metadata.xml
+++ b/dev-python/cssutils/metadata.xml
@@ -9,9 +9,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
-A Python package to parse and build CSS Cascading Style Sheets.
-</longdescription>
   <upstream>
     <remote-id type="google-code">cssutils</remote-id>
     <remote-id type="pypi">cssutils</remote-id>
diff --git a/dev-python/cvxopt/Manifest b/dev-python/cvxopt/Manifest
index 5e2572f73a73..b57ddf278a67 100644
--- a/dev-python/cvxopt/Manifest
+++ b/dev-python/cvxopt/Manifest
@@ -1,3 +1,3 @@
 DIST cvxopt-1.1.9.tar.gz 1872932 BLAKE2B 50990b8432d32db68580243a5f547a4be2fd36f23196b1505e90eccef9fab5526ea485bf9f81539842229eb276345edce12b064065a1e13125d5adca0de07e8c SHA512 bb0982cd1489157df4c7cd0dd92bf83b1692dc3a27d6b9a7a465dda9f9daea4ea5ef69e48642a879d036679bd0b0fe0dfd782433ce4cc570e90e11823733e58b
-EBUILD cvxopt-1.1.9.ebuild 2870 BLAKE2B 06a83d282ebcbbfac993413cf904aa192db8bdd32984c831f1ebdf1d45af67f3c7878f7e4026170c6fb39da4f5be506daa9e6ecbe9adead474f1fdaf2fe5d0a6 SHA512 9fb34e722fd1535e94e67d2ac436e893594fd4a9ce9e5e2b8b4923f48ae3ed013af213b8b9f41b567b35e377fa76a093dbe89942faf85040e3ff3b4496520839
+EBUILD cvxopt-1.1.9.ebuild 2871 BLAKE2B 0dac227cc2abde1b4a493bbed7a52f51bcee1e7b6dc65cb289117d6fe42ea5a1e0c045343ebe2390413f9d62bba5211191094a6cdea713e366cbe5285b6f4b17 SHA512 befc873b5995e374565b9793b6b9077720ec667c961c6a0dd6160c2c3280131afcb2c1279b0cc7abd74f5bcb614a3c25486ce3f59a969157d89a99e47b2123a6
 MISC metadata.xml 805 BLAKE2B cfeb4a97635e28a1fe93b26897950dfe13268aef349647c5ca7455597e679ab7e79d21daf1b54f4c8855624abb8286676aff2da381782dd3b42b0a587f9396b2 SHA512 52bdd0bdc12807d7a3d2d820af3167b0768225167377bdf42e5f7218d5154deab2bee8bbcfdd173301e4b1d87f268bfb4bf6c1f884113c2d1f3fbf7fa1dc2ab6
diff --git a/dev-python/cvxopt/cvxopt-1.1.9.ebuild b/dev-python/cvxopt/cvxopt-1.1.9.ebuild
index 8846374a525c..992320c342b4 100644
--- a/dev-python/cvxopt/cvxopt-1.1.9.ebuild
+++ b/dev-python/cvxopt/cvxopt-1.1.9.ebuild
@@ -32,7 +32,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	doc? ( dev-python/sphinx )"
 
-python_prepare_all(){
+python_prepare_all() {
 	pkg_libs() {
 		$(tc-getPKG_CONFIG) --libs-only-l $* | \
 			sed -e 's:[ ]-l*\(pthread\|m\)\([ ]\|$\)::g' -e 's:[ ]*$::' | \
diff --git a/dev-python/dbus-python/Manifest b/dev-python/dbus-python/Manifest
index d3d013cd36b9..58821da21bc4 100644
--- a/dev-python/dbus-python/Manifest
+++ b/dev-python/dbus-python/Manifest
@@ -1,7 +1,9 @@
 DIST dbus-python-1.2.12.tar.gz 574727 BLAKE2B e5516e7109fad089af51d3e5db3921d056f327c27f9b74a870b1b31b04ba952ad3c9ba5916a18d674ab1179b94cf516b24e046feded8f2e542b196d162038944 SHA512 6f90eaeeb74ea71a026a331d4c611911eda6dfb6c9086a0a80352f9963a9ae126db6f3e32d183916b8517f177fc947f1ddb15df83ff0b5c886532116868383b4
 DIST dbus-python-1.2.14.tar.gz 576181 BLAKE2B 4e36c3d0ed07ce6c7514e2699b6cf5d0a75332c8dab3ca90e2d451d6649c26f61b2173b4b7f230c54df2b9f4214d0f3c54a45c233d6e8fd38bf39a6312f480fc SHA512 773d66e40ab514639f1c5c619362659f290ddd5ae944eb8e09b5752624f3c86305b6c1d5562e290b36f1e6cf43f6d39cd4a227e18ff41499877546982ceebb51
+DIST dbus-python-1.2.16.tar.gz 576701 BLAKE2B 58d9f9ea092cd3a6b872c084a6159baf03f1aab615282e161a0e3da1d01ff5f4940862e693d21907b0c146d285b9067386759a1306ae2e6907f5e2ff4ef9944d SHA512 e76c00c5fd3fe6884e4c24f258987fd3b80d21bd4e0f96aa8fda152078a860b62321324f6efcbfe7226d5ab2521a14b5bda7cf2468d2cae5f376c124a71aa05c
 DIST dbus-python-1.2.4.tar.gz 612112 BLAKE2B cccd3e2f5d700c0d228e7d21fd85e2307357778371742a7fe26a0e419af41886efebb27a73f642d2ecd4603c79f4afe6e7002af95c831180e0e7844c079b2c8c SHA512 efdd9d96a8b56e813c93208d34777f1ca2db96c076d31f13afbcaec3c7770a16a623d5531fe23443130c555240949802503f171f2064d45eee97546d6251304b
 EBUILD dbus-python-1.2.12.ebuild 1742 BLAKE2B b1ae50267ddca708cf171d1362646f5facb48a2afe18ac6030a84d26ad3bb4b342e2576ddf87340bd14b1ecd0127264b2a7b6e5fb0039f60f369d22c3b1007ab SHA512 61a435a9bfcb14c17f8bbe6cb964ec6f7c2f58782412eebb79a14379ad8f8eae175c49120b9fe5cb590ee51a1d38fd3814533dc3f9aa36ddff481db14101716b
 EBUILD dbus-python-1.2.14.ebuild 1703 BLAKE2B e4cc001c8b1fb3d7cac2b1c356aebd98b5c660c3c1685affd2c717794ea4577a51392c1a9a97f9ac63c02dd241fd9d4520c27dc5ed7e398f6150e1ac7e0a3abb SHA512 b7f3db6e3788aaad85be6a4476d649480ff4ee3889b47ddf2765f795d0b4cf0a1fe65e597b3713a347fac72fd7d95de7e762ee5743fb3cec1baec6401ffe6bb4
-EBUILD dbus-python-1.2.4.ebuild 2232 BLAKE2B 5f4d92dd627ae0788a7bd799dbdcbc335f29b4b856d194547bf86fc1abbbfbf2ab3bea95773a76178d99cfb1f1f8b207de78224ff79227fd345fa7b4842e8402 SHA512 b2852d67d6876f6807fd165d99c6f37f561bc93a3eb5bc3cabd2f72bbf5086242f70c25d0a7e788959f6ee11014912a0ce3bb0c17f44f1971ad500dbf84492ac
+EBUILD dbus-python-1.2.16.ebuild 1703 BLAKE2B e4cc001c8b1fb3d7cac2b1c356aebd98b5c660c3c1685affd2c717794ea4577a51392c1a9a97f9ac63c02dd241fd9d4520c27dc5ed7e398f6150e1ac7e0a3abb SHA512 b7f3db6e3788aaad85be6a4476d649480ff4ee3889b47ddf2765f795d0b4cf0a1fe65e597b3713a347fac72fd7d95de7e762ee5743fb3cec1baec6401ffe6bb4
+EBUILD dbus-python-1.2.4.ebuild 2185 BLAKE2B a8d6e6e31414e537feeb5c4d2b88353a94746256b999cdff524030b5a6fa815d4809786aa122c2384ab52b87b09c555df3d26be8f824e68ba3386c69f8752834 SHA512 3d4ddae05cf7a404bbb846b50c0aee7f8f14d5cf5905a16b9596d32850ae608bf4fab8c9269ec78f61336269a43223c239ff723d2385a733b936200577e6a29e
 MISC metadata.xml 337 BLAKE2B 96d3f5d7c37edb1a63791e013c39cf5b10c94d621ad851f9975d9d5e36519da135bf963f2a0e38c2c098fa48c2056bf210bdfcebc12bb10a88c9e9f85c55eb2a SHA512 633761250e946af99fcbcbf813b70fa0b1e03a0d89102faa3f324c418f0e749371aa931d253dc5a6f69369c25acc2d50a0f5e2155bd727766bc70f4bc3933d65
diff --git a/dev-python/dbus-python/dbus-python-1.2.16.ebuild b/dev-python/dbus-python/dbus-python-1.2.16.ebuild
new file mode 100644
index 000000000000..7c3a124a8e92
--- /dev/null
+++ b/dev-python/dbus-python/dbus-python-1.2.16.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit autotools python-r1
+
+DESCRIPTION="Python bindings for the D-Bus messagebus"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/DBusBindings https://dbus.freedesktop.org/doc/dbus-python/"
+SRC_URI="https://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+IUSE="doc examples test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}
+	>=sys-apps/dbus-1.8:=
+	>=dev-libs/glib-2.40
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') )
+	test? ( dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/tappy[${PYTHON_USEDEP}] )
+"
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+src_prepare() {
+	default
+	# Update py-compile, bug 529502.
+	eautoreconf
+	python_copy_sources
+}
+
+src_configure() {
+	use doc && python_setup
+	local SPHINX_IMPL=${EPYTHON}
+
+	configuring() {
+		local myconf=(
+			--disable-documentation
+		)
+		[[ ${EPYTHON} == ${SPHINX_IMPL} ]] &&
+			myconf+=( --enable-documentation )
+
+		econf "${myconf[@]}"
+	}
+	python_foreach_impl run_in_build_dir configuring
+}
+
+src_compile() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir default
+	find "${D}" -name '*.la' -type f -delete || die
+
+	use examples && dodoc -r examples
+}
diff --git a/dev-python/dbus-python/dbus-python-1.2.4.ebuild b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
index 686197251968..22592fd9a38a 100644
--- a/dev-python/dbus-python/dbus-python-1.2.4.ebuild
+++ b/dev-python/dbus-python/dbus-python-1.2.4.ebuild
@@ -50,7 +50,6 @@ src_configure() {
 		[[ ${EPYTHON/.*} = "python2" ]] && apidocs=$(use_enable doc api-docs)
 
 		econf \
-			--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 			--disable-html-docs \
 			${apidocs} \
 			PYTHON_INCLUDES="$(${PYTHON_CONFIG} --includes)" \
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index f0a014e044fc..58d7afa50403 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,5 @@
 DIST denonavr-0.7.10.tar.gz 62877 BLAKE2B 0b011f187f8952af81669d3568d5c6ae5584ce6b106ca769609711883bf62f7d4b7a605bc12e8cfac8f1a1e9622e7b37cc17be0545bbd24898b0a6f882f7adac SHA512 62b8a1f61f0fcf5c7d13b473d990a562e3fddf777b077bf5f9a0d7c24f9bc76810917421653dbbedd292b659e6c0ef7e1c303a5f152cf9d7aee2039d47702314
-DIST denonavr-0.7.9.tar.gz 62838 BLAKE2B 59a036a1b2fdd48731741180b143f69d0fc78e30cfafb88c675eb4a30b079eb3955b1e2f76306809d183d10a9583dbb500962cbae352203c570861687c58b539 SHA512 2c9cd25bd38d9128602b0bf009d3d147059d712a3ead99514a257e71ea2a1c97d94c151d42840dcff55ababffce53a23fab33759cf7bbc8bb786fefb91dbe362
+DIST denonavr-0.7.12.tar.gz 63381 BLAKE2B 524dbc322c962f167474eb11651920fc587651ef49004f89172fd22ab9dd35db5743cec89c88d0703179187eb6fe5894fe04759cc4e5214571a27c4d0aabf4fd SHA512 2449e688bbb1e7dc0c1c805ef6353b17e202290e6675b92a8d8e5a60b7f2d9ab3b90d314decf30cc75f76fcc008186b326c294f30ba040e6e66eb0b3bedb067b
 EBUILD denonavr-0.7.10.ebuild 766 BLAKE2B ef73989120429123e111242eaf9ec91f21f7b3d9d5a0642655f3d53f03ffa7c64acf3b4414de0c812555ce106b560065f28b93f54746a739e16fab20086172e2 SHA512 c82090f5c7ce83cebad8ffdf194bf7b25c8fa5226a0c178ebd071d796ac8ad229ee0e92a2a6eede01063140f329f16bcf1e34783624377f6153b8860edb3d552
-EBUILD denonavr-0.7.9.ebuild 766 BLAKE2B ef73989120429123e111242eaf9ec91f21f7b3d9d5a0642655f3d53f03ffa7c64acf3b4414de0c812555ce106b560065f28b93f54746a739e16fab20086172e2 SHA512 c82090f5c7ce83cebad8ffdf194bf7b25c8fa5226a0c178ebd071d796ac8ad229ee0e92a2a6eede01063140f329f16bcf1e34783624377f6153b8860edb3d552
+EBUILD denonavr-0.7.12.ebuild 599 BLAKE2B dc1142d9854116bc6aaeae4c62012abc3a271a56520696d7f0ac353ef2fbf1ec2b6a853c018080f95e7ece25f2623993ad4a9429cf28eb0cf27ba459b8f6444d SHA512 38fa0577ee3076a8d99a3af61e8343268e627ee27987fc4e1aa70ae23537f878d0243c2ce9f021c611e75107eef91b4ab64554865c09606a8ff1210141b6d13d
 MISC metadata.xml 448 BLAKE2B abf1f391011c497830fd97efbefd1bf3ee9a92967b962859f9b557427b3dde2fb9da76a5c14c8f33b28ebb0e57a0d4511c4403c6a13270f500389d2dc0aff487 SHA512 017d0cc05c8dd263292a080f39a86b415955081f2c2d06a58ef59f21703748b8e15b54a88a4592f9e378e256d6f5ce60d5317aecd373777fb1e686a8cfcd8031
diff --git a/dev-python/denonavr/denonavr-0.7.9.ebuild b/dev-python/denonavr/denonavr-0.7.12.ebuild
index c181baaf4bb2..bf2e9a92067a 100644
--- a/dev-python/denonavr/denonavr-0.7.9.ebuild
+++ b/dev-python/denonavr/denonavr-0.7.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -15,20 +15,13 @@ 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/requests[${PYTHON_USEDEP}]"
 BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/requests-mock[${PYTHON_USEDEP}]
 		dev-python/testtools[${PYTHON_USEDEP}]
 	)
 "
 
-python_test() {
-	pytest -vv || die "tests failed with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/django-annoying/Manifest b/dev-python/django-annoying/Manifest
deleted file mode 100644
index 3d6178566f74..000000000000
--- a/dev-python/django-annoying/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST django-annoying-0.7.7.tar.gz 7277 BLAKE2B 6388a6b56ae5692e48021fa7c917c5732e34d62eb3f27d5d237d6df1fc2536683e48937bf7380916092630cb3292b0c5d06edfd53a806cdef4ef1fc66d3e87f7 SHA512 37435fb08110bc0e06a2a8b35d4f45d96d7fed3c03b87a541fcd96a76ed2e36281f1f7632654f3f5f64597203097ac7b5def1e8dc32e500e973fd81686a208ab
-DIST django-annoying-0.8.7.tar.gz 10170 BLAKE2B dc5588ca4fd506b4cb25d566864a42e4aa00ccaa7074b83817ba4b947fe9f154d4888824b551f5ab4ac4805cbf403112a010982babc15525a6803cf5eac79c5e SHA512 4654083ef0076837bc2cacec82c51faa3746cfb2f27002692c7552079e0f0e8d59e064ec4119366e0c452c102309513ff8bf12ec5d9785485e580b989c96517a
-EBUILD django-annoying-0.7.7.ebuild 533 BLAKE2B 826b92cec14c14bf6a3ea87d6e1895626ddd23f886fee33933cf6459d19f87c3c5c4bd8affe692c32e0bf1be7067bfd42c199c1d6b20208b7eacbb23491cca4d SHA512 915deae29cb39d2f3c987b32eb305c56cc6c535c764ffcd7b506e751af00746822f46ddd3dbe31bf4198c604ed86cf0192c72b8933eb7d7594753ec758741552
-EBUILD django-annoying-0.8.7.ebuild 535 BLAKE2B 8caaa20c7128617caf06eedeabe6a49641400a0055e9e9d488fb35c604d86b4ec1731c2fa4825c3201f9ccbe1597a3754942785da1567b7d07c3d0ad0dd643c0 SHA512 fc04c8cda1672b88701773bf5362fc49ff16d505ff93f6ed0a14b5603d61a86ef8c11533da2c5f85105b1ac3574675564478846cedc3b7d04ba98dec2fe13a89
-MISC metadata.xml 396 BLAKE2B 69062885c964630466c0985f99a2327bdf5cab7815bc3ee63cb1801a490607f0527871f87cb7c95a53e3d5240abcb1b54564f2f419b7d0e793e8ed584c6a9cb5 SHA512 55f423f46170c6f1ba1f3c611be68d643f5b4edb516f48c6e4be714a36fcb02beae3500d668074ecf6ee948109fc739c05ba5f2ea4600e96d6e52bf099747dff
diff --git a/dev-python/django-annoying/django-annoying-0.7.7.ebuild b/dev-python/django-annoying/django-annoying-0.7.7.ebuild
deleted file mode 100644
index 3113dc08480c..000000000000
--- a/dev-python/django-annoying/django-annoying-0.7.7.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="This is django application that try to eliminate annoying things in Django framework"
-HOMEPAGE="https://bitbucket.org/offline/django-annoying/wiki/Home"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-annoying/django-annoying-0.8.7.ebuild b/dev-python/django-annoying/django-annoying-0.8.7.ebuild
deleted file mode 100644
index dc41a21b36e0..000000000000
--- a/dev-python/django-annoying/django-annoying-0.8.7.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="This is django application that try to eliminate annoying things in Django framework"
-HOMEPAGE="https://bitbucket.org/offline/django-annoying/wiki/Home"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-annoying/metadata.xml b/dev-python/django-annoying/metadata.xml
deleted file mode 100644
index 7895a89f5bed..000000000000
--- a/dev-python/django-annoying/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="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-annoying</remote-id>
-    <remote-id type="bitbucket">offline/django-annoying</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-endless-pagination/Manifest b/dev-python/django-endless-pagination/Manifest
deleted file mode 100644
index fda915278f7e..000000000000
--- a/dev-python/django-endless-pagination/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-endless-pagination-2.0.tar.gz 61514 BLAKE2B aba5ce2959825fd0fab6fc18521555eede74c1686f9f03a0c40d0c97bc84c726b70ddee0fce4ffec547ce118624d9d6637947650fdc64a8e84eef976a1b445fa SHA512 d413c3e4f46c73c47e98eeb073bdbedaea3c03931c7147190594bc170489ae09325b43edae9c1eabe56f606b62bf93777f7444b0b174ff6303a5e30453578ac3
-EBUILD django-endless-pagination-2.0.ebuild 1275 BLAKE2B 8c847fa98c291241a050c2a3068858aaac51674333bd955a0ec10d5336ea93c47c32c96bb54122a448f6ddc4ac7c819d28f2eb96a363b09e0d18ee835aab48d2 SHA512 1f7592ee88ac867793a0638c7cb414f7f96735610721248fd94c0eae8b84391e86a8a807f340788857c4c43a12b55824d76ac9e89a02bcea369342ede680e0c7
-MISC metadata.xml 349 BLAKE2B 6daab4ccc506a54a891a7a7121be63ae3d71ef6d8a9401d8ac67e57bb2aa6b611d2b7ff41ca850f23392f72e16c1bfc9e46a96b1d61f30613a2864cb97bc4b42 SHA512 5aebc133700f4f4122b98ab3f547df221ab1c60fd0d78f88e52312dbef5c1b33783a5eee50b12e4c77ab8bfc74ea97218548393fb851df589b86183fb9e0ae02
diff --git a/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild b/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild
deleted file mode 100644
index d3b7633ef19e..000000000000
--- a/dev-python/django-endless-pagination/django-endless-pagination-2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Tools supporting ajax, multiple and lazy pagination, Twitter-style and Digg-style pagination"
-HOMEPAGE="https://github.com/frankban/django-endless-pagination"
-SRC_URI="https://github.com/frankban/django-endless-pagination/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/django-1.3[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/django-nose[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/selenium[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/xvfbwrapper[${PYTHON_USEDEP}]
-	)
-"
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	unset PYTHONPATH
-	"${PYTHON}" tests/manage.py test || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( "${S}"/doc/_build/html/. )
-
-	#rm all OSX fork files, Bug #450842
-	pushd "${ED}" > /dev/null
-	rm -f $(find . -name "._*")
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/django-endless-pagination/metadata.xml b/dev-python/django-endless-pagination/metadata.xml
deleted file mode 100644
index 8ad15e74927e..000000000000
--- a/dev-python/django-endless-pagination/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-  <upstream>
-    <remote-id type="github">frankban/django-endless-pagination</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-international/Manifest b/dev-python/django-international/Manifest
deleted file mode 100644
index 95a66df250aa..000000000000
--- a/dev-python/django-international/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-international-0.0.6.tar.gz 17104 BLAKE2B ce8b57f9b8c9c361531361e31b2219c55ae9dfa8e8c863a980dad7cd7db8f8a55e1a849e6b1a92d1c6f0c5af4432d495f2c1c4df9a61dadd6446ef93d911fc7a SHA512 a7ef5881467b88bd1d611476a8bc43ba54731f7bea8abd8790ca7b6912480c4b87ebc4d37a41859f60738d961b4a6c0221fabce5bc2d90c4fc83c8991567990c
-EBUILD django-international-0.0.6.ebuild 547 BLAKE2B 40c71527a4e17effb74c828b579c0041c7dbf4b5c1b903c43fdab2ee0e27db730bcd790f53ee0e2aea0e9029c8a592c7cdeeea192f65a47a20207f1a9f4a3201 SHA512 59c7e19e481401f4f0f8a0f85afe10d1748261ad26c98ffd4f7d33cd186a0a9594ed8e33fb2d011bade586656a2438435dd617b8aa5010e527fd06f7ec224d36
-MISC metadata.xml 406 BLAKE2B 6a82a64778d1290ab9a7b2ee4463fca2530b013c7f185bb7258fe36302d24831a67dac406502ab729d12a1caba3c36f393a70745d2750135476c89db5abd04b4 SHA512 9471858b805b4152c538ea1e615c0a7ddb08c967afa1b3a3dfcc268bf0defe66a3584f5245b436903a9aa7075fedeaf09e720902d264a9e42fa8c0eaa112c339
diff --git a/dev-python/django-international/django-international-0.0.6.ebuild b/dev-python/django-international/django-international-0.0.6.ebuild
deleted file mode 100644
index 7db3f68cd50d..000000000000
--- a/dev-python/django-international/django-international-0.0.6.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="Country and currency data for Django projects"
-HOMEPAGE="https://pypi.org/project/django-international/ https://bitbucket.org/monwara/django-international"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-international/metadata.xml b/dev-python/django-international/metadata.xml
deleted file mode 100644
index eea49876508f..000000000000
--- a/dev-python/django-international/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="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-international</remote-id>
-    <remote-id type="bitbucket">monwara/django-international</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-ldap-groups/Manifest b/dev-python/django-ldap-groups/Manifest
deleted file mode 100644
index 8cb3cffafd60..000000000000
--- a/dev-python/django-ldap-groups/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-ldap-groups-0.1.3.tar.gz 8886 BLAKE2B 364f5e11a303f011892b45d481fc521379ff2340898f8bef30e372a3627e2bf0460b6ad2f9ec42ff458cdf5fc4c3b6b765d62ce01efaba33de74f69a3540b859 SHA512 0e9c5a1f1f38042f0a0dc9301c667a00b144ad0cbf15afd69cc44e241933626e0536752354ead4ae937ff3625c5ded86edaf0592a8e2c7b9f39ab86336e7d876
-EBUILD django-ldap-groups-0.1.3-r1.ebuild 531 BLAKE2B 1cd7b08985df16d2e99757be80ad4832c590cb4c124f26a0457dd7534b1cf81f13ff502796b57ea1cd9acd3e8074d02bb35fae37d735b89a267cf9b69c74eca2 SHA512 b668fc6b95ba0e49131aeb00bcfb7a52ef4e861e6b9cd7339b1cb6f738e861e843ab40c8755e52565b9f2f44c8fb1a83060643689f75698f4a761640fc8ada2d
-MISC metadata.xml 321 BLAKE2B 44e7c84320cc30b24b52b9e1dffc2f6b11f19e5c85ce3ea94af0fed0fe91965c4d31bd432b907d94696d83fba60850e3213c179dd764e00c3a729240cc802b05 SHA512 e368492c1eaa49b914072c7069dd3a05226bdd6851fe43a099cc744330c3dc90d49cd94025ac229ff362f7564388ea9474f09df3658c1953c67ee21b62b2bc4e
diff --git a/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild b/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
deleted file mode 100644
index 6e591f9a74c3..000000000000
--- a/dev-python/django-ldap-groups/django-ldap-groups-0.1.3-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A reusable application for the Django web framework"
-HOMEPAGE="https://pypi.org/project/django-ldap-groups/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="${RDEPEND} dev-python/django[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=( ldap_groups/README )
diff --git a/dev-python/django-ldap-groups/metadata.xml b/dev-python/django-ldap-groups/metadata.xml
deleted file mode 100644
index c6206f119801..000000000000
--- a/dev-python/django-ldap-groups/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">django-ldap-groups</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-ldapdb/Manifest b/dev-python/django-ldapdb/Manifest
deleted file mode 100644
index 236c0243e222..000000000000
--- a/dev-python/django-ldapdb/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST django-ldapdb-0.3.2.tar.gz 11029 BLAKE2B d163431693b663cd53bfa71b592b13203c7bc5829ca40e5172d9636ede67c2c2ac22736aec7e9934690967bb511ebc5565c21da9fd8dd4844a70b5e090524961 SHA512 d1f88f754bebda53b5f51c5120b070ce93e229a1c31d59bcdb5cbffdfdc1d590479ae5a2024805705d8bcf51bad8787d578a348ec78ffc5565bdeedb9ffa7b96
-DIST django-ldapdb-0.4.0.tar.gz 12068 BLAKE2B affd0b3f4b845fc88e7c157e2d1340a7db490e4fb0842baf466520db52f41f62f93eb30694b10050745413361fe7bd3cc6e1b7b7e5bb82438ab9121264cfa305 SHA512 4527bf443bd72ad3adfbd4ac7333160ba80e8ec525787b01bc6e0cd9ad007e6d7742222d60cab65a3e3cfb70307e575f096f1f244bbfc350796890c23f10338a
-EBUILD django-ldapdb-0.3.2.ebuild 544 BLAKE2B c248ba798a6a660433daef2bfc926321a0eb84c1dbef30e2ea47ea9e44f72d5dc9c3c4ea70e2bb6a55fb18ebf35ddb27554e3bc10350d9b379d2b7a4245aaaf1 SHA512 3b221df71d918a5577f19b4999e404800a11b9948ad73629f0b7b6c4687da93a0bb21aa0343ec7b1ce9acbe74fbd0d44733ebf42a4e614c286bfdf630c530808
-EBUILD django-ldapdb-0.4.0.ebuild 546 BLAKE2B 97c6eaa60b7905cda6dded31fe3680a96fc9b28b2eec24593457165e7993ee366b70681b11fbe016c7206aa0799d5ef72c8ea407fdbca72ce269a86f7c3c38ac SHA512 4e8c2912622e88c2aafcc022f140e8062b7c71f6ee8962243a39a1e827ffa1c28e0d0e27a641d32ecaf0fdcdd132d529ff4710de36d815299d96741e71cb64fd
-MISC metadata.xml 388 BLAKE2B 9ce69543f355b38b5c025087f347953982d38f37ecf22befee37245fbd52ca2b7be3df3dbcd7a67231221eddc43168202b7aac22fd649ca8a6c68fce7829f0d7 SHA512 81ae290bb8b9f8ccd3ff8a5982f7829e5ec8c3fa3926cc786796f03461e77e4485a50c6ce9a88a65864a76976403eacfd6017510a6e9c9f637ef001d97c44027
diff --git a/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild b/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild
deleted file mode 100644
index c7f43bc9cd5b..000000000000
--- a/dev-python/django-ldapdb/django-ldapdb-0.3.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="An LDAP database backend for Django"
-HOMEPAGE="https://github.com/jlaine/django-ldapdb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]
-	>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-ldapdb/django-ldapdb-0.4.0.ebuild b/dev-python/django-ldapdb/django-ldapdb-0.4.0.ebuild
deleted file mode 100644
index 03d59bb1444e..000000000000
--- a/dev-python/django-ldapdb/django-ldapdb-0.4.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="An LDAP database backend for Django"
-HOMEPAGE="https://github.com/jlaine/django-ldapdb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]
-	>=dev-python/python-ldap-2.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-ldapdb/metadata.xml b/dev-python/django-ldapdb/metadata.xml
deleted file mode 100644
index 43d019398ba6..000000000000
--- a/dev-python/django-ldapdb/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="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-ldapdb</remote-id>
-    <remote-id type="github">jlaine/django-ldapdb</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-oauth-plus/Manifest b/dev-python/django-oauth-plus/Manifest
deleted file mode 100644
index 5ebe3aea9acb..000000000000
--- a/dev-python/django-oauth-plus/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-oauth-plus-2.2.8.tar.gz 25911 BLAKE2B 5356257f2d95fafe40ae8d65e7baf5ca8b3b7269151acb81dc5eac74fd1bdb97100a916fd406a4116ba2df0b6c0f44f561abefcfb059cc1520291d04eab5a66b SHA512 9237a2e2e52923b2fdfd3b7feff63e11f2c06c871faca3455189edba233e2a6513169481092f413c3ddea1c919f4b995fb465a505935388f1d803d094942ee07
-EBUILD django-oauth-plus-2.2.8.ebuild 941 BLAKE2B 89b994fa3269ac019a872ea14aab6d9d6a0f038daf68c4bfe92fa2d291d96566ed1ad32d3dee45eb3e666652c981c0678c63636e6bf110fe09f5291b08bff1d5 SHA512 0147fee851228d6e52f2faa1791fb119f83de1f54b62bdf2dc7f2c4b562a7ab24da936f8777426db074c62749ace794f61de5512c7d70829b296b82a530424f9
-MISC metadata.xml 320 BLAKE2B 5b0abaaa21ff82ce24003879834e0b77cdd6701e3665d79f06d2a21594c5f50cab033628ad7ef8fcbb2eb6aa387b96f569b4eaf2b3785aa7482da4d064bcbeff SHA512 c5ca167dfd305e47ddff6d68b5d473ec4c98cd869eba30148fd3cb82dd7d105717a70d5e50f519263c8fbac5e41108041df1ce972406262b170aeb2414406eb8
diff --git a/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild b/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
deleted file mode 100644
index a26ac9639ab4..000000000000
--- a/dev-python/django-oauth-plus/django-oauth-plus-2.2.8.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-# Testsuite written for py2 only, no indication given in source
-
-inherit distutils-r1
-
-DESCRIPTION="Support of OAuth 1.0a in Django using python-oauth2"
-HOMEPAGE="https://pypi.org/project/django-oauth-plus/	http://code.welldev.org/django-oauth-plus/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/django-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oauth2-1.5.170[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/mock[${PYTHON_USEDEP}] )"
-
-python_test() {
-	PYTHONPATH=.:oauth_provider
-	if "${PYTHON}" oauth_provider/runtests/runtests.py; then
-		einfo "Testsuite passed under ${EPYTHON}"
-	else
-		die "Testsuite failed under ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/django-oauth-plus/metadata.xml b/dev-python/django-oauth-plus/metadata.xml
deleted file mode 100644
index 5d603775593c..000000000000
--- a/dev-python/django-oauth-plus/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">django-oauth-plus</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-openid-auth/Manifest b/dev-python/django-openid-auth/Manifest
deleted file mode 100644
index 536147e38f4a..000000000000
--- a/dev-python/django-openid-auth/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-openid-auth-0.5.tar.gz 32722 BLAKE2B 292caed8ac9eb68ecced7935cc199b5cf1d92711e79df0e975fd2c6d64a05675567cb64014acde91c0727b264cb59891b6fb33e30cbc481e2cce1a402698edc4 SHA512 9d1444aa15d450acc6ffc1ddc8359253828b2cceeee57e98268c1ae25bbcb1e2facd1e065c9e29fa3b167efb86923d72408cc43442b18d6dbed4dca05c33548b
-EBUILD django-openid-auth-0.5.ebuild 598 BLAKE2B af5be95901e1a4ddc762587875e3dec994941d4e3da0c6a9d97e9c2639ddf6c1fd6639c2a1c9896aa153c7a86890823488f5828a4377650bf90fc7a4c76f0cda SHA512 a2df2b453f38c4a561d86f5cccbcfc07d5774124bbcde87c44ae8caa8545b880b9d362e8e149d8c7daa78f5ee1bdd66eb91bea6cb94e1bb3bb0045713432633c
-MISC metadata.xml 385 BLAKE2B 6974bfa5522e3e35bbf539c2feda7ce3c1fe8b8ec1c9aa515866fb33cb7145438fb065dc90dbe4ffad807fe767db5259ac3a09a09f2c5974a1acbf33d19f4ab9 SHA512 58521d10396e1ad5eecd8840c35b3f082bf83ddd4bf03477fbd56749de54a84741314cccc76cfdc19ecbf891c47a19eb3b49146a329d363a5fe0ab24706e5279
diff --git a/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild b/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild
deleted file mode 100644
index 4e41ee22118b..000000000000
--- a/dev-python/django-openid-auth/django-openid-auth-0.5.ebuild
+++ /dev/null
@@ -1,24 +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
-
-DESCRIPTION="A library that can be used to add OpenID support to Django applications"
-HOMEPAGE="https://launchpad.net/django-openid-auth"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${PN}-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/django-1.3[${PYTHON_USEDEP}]
-	>=dev-python/python-openid-2.2.0[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-EXAMPLES=( example_consumer/ )
diff --git a/dev-python/django-openid-auth/metadata.xml b/dev-python/django-openid-auth/metadata.xml
deleted file mode 100644
index 53e9f1e77234..000000000000
--- a/dev-python/django-openid-auth/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="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ryanmcgrath/twython</remote-id>
-		<remote-id type="launchpad">django-openid-auth</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-piston/Manifest b/dev-python/django-piston/Manifest
deleted file mode 100644
index 1fea8b46576b..000000000000
--- a/dev-python/django-piston/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST django-piston-0.2.3.tar.gz 34319 BLAKE2B 36d0f724fee72c0dece8b91b55a8aac5140db8f319b16221c0982caec72bfcae734b74165bd267073b2be59e1907f6936e640c4c60e5768934cfaae91f02b1f8 SHA512 205cb15b4e59e7cb4d744525e149480ce9f54afa6b514c038ecf20df9221b4193d5041963b7217f40454c34d77125a1e52f0e7bfed5a471b27b1694a3af2ef6a
-EBUILD django-piston-0.2.3-r1.ebuild 502 BLAKE2B 57fb9441aab123122a6961e38865616671ba71a63d8754062a7be64ccdd1e39089e8f81e4208a8483ef77b47de6410770f590eb2114b15839f91ea0714411db4 SHA512 63e745aaf7ce5e1df9c4a8cb81b9a2b0994399a2a8524eac8a42be3d8b6ccec5b68a3fc4c38d3e32f24b4d9da92194325ce2a386227524ee844fe0f4fb2c383c
-EBUILD django-piston-9999.ebuild 534 BLAKE2B d672e1cafd5e75a4360e84dcbe8f4ba4809d8714947c3ca2d6d4bbcee9c0e3c5da33f0111502480c616bd05aa44ccd15a60f74c2f02d62b03ae453295203f6d2 SHA512 ceb34dea8d18d53ef80b1bc7140e951290fe9d984d2f2685d14f3e3a7d6165bf54d0f2ebe23dc04e6a2f2ee4e2823fba549a0879d96fa7e2f51a6ec365872854
-MISC metadata.xml 392 BLAKE2B 2653f1621deadd71fee58b4867a498171ea4114e26c883233bce6a74a9f64c3ceab498a0193cd5755d2101dd4dd1326f7cec5767cadcf2447d4dff76ae2bd4fe SHA512 8b9985dacfb2d2df1bccc90fd83bc0afbb12fcc8c1e5ac76276b2860233055df232eec10bbbeec4c314ed5e2a78773a34333e16c17be251b3aaae92e28a5ed78
diff --git a/dev-python/django-piston/django-piston-0.2.3-r1.ebuild b/dev-python/django-piston/django-piston-0.2.3-r1.ebuild
deleted file mode 100644
index 740a98826961..000000000000
--- a/dev-python/django-piston/django-piston-0.2.3-r1.ebuild
+++ /dev/null
@@ -1,21 +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
-
-DESCRIPTION="A mini-framework for Django for creating RESTful APIs"
-HOMEPAGE="https://bitbucket.org/jespern/django-piston/wiki/Home"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/django-piston/django-piston-9999.ebuild b/dev-python/django-piston/django-piston-9999.ebuild
deleted file mode 100644
index dfbb04644206..000000000000
--- a/dev-python/django-piston/django-piston-9999.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 mercurial
-
-DESCRIPTION="A mini-framework for Django for creating RESTful APIs"
-HOMEPAGE="https://bitbucket.org/jespern/django-piston/wiki/Home"
-EHG_REPO_URI="https://bitbucket.org/jespern/django-piston/"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="dev-python/django[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${PN}"
diff --git a/dev-python/django-piston/metadata.xml b/dev-python/django-piston/metadata.xml
deleted file mode 100644
index 31132fbfe196..000000000000
--- a/dev-python/django-piston/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="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">django-piston</remote-id>
-    <remote-id type="bitbucket">jespern/django-piston</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/django-registration/Manifest b/dev-python/django-registration/Manifest
deleted file mode 100644
index 359a5978b58b..000000000000
--- a/dev-python/django-registration/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST django-registration-1.0.tar.gz 276715 BLAKE2B b9937f0d4eb7a6411c492c7b434d084758e1e53d0134132fce8aa00c634d34c05b2ce0c3fab4953f08a53f4b33b9e588b2ec763bb8be2caff4704fb11c443f45 SHA512 53b191e4c75629d3ce93e4817a843bc1b056a14558be892aa95dc060b8b0542ddcae79f7cb0b37c4e758e8d9da093e59a57591294539acfed39b998b7087e0e6
-EBUILD django-registration-1.0.ebuild 524 BLAKE2B a5357c636b18c794993685c96151dce29ea647e48d0cfe5cc1e3ead08bd31b26f3a478a3aa3d6385786b44ee61ba45ac74ccbdacff4765dc9d0982563b10738d SHA512 082e43c8eb7280d3f43242fa09d151aab2b0a27ee9e87a7b56cf41fbfd6aaa00a2193b911ca05fbde542a333be47695733984d37b4982bf0973d83ec7f153693
-MISC metadata.xml 447 BLAKE2B c961bbc70a2b8d0c87335d29d8225f952629c626cbfa806823aae699feed1db9fa44e0cdfbce73e2e76696cc81b7aea1e7f8c361dda323ef91ef531f472f67cd SHA512 7cb148c092d0b5216321842041406d4191d1ab45fb0fc655ffdd2b02c3f50553b4561b45db8fd81549e4c567ba7ae0ffe7efc91cb73a250dd35ac2fe32928417
diff --git a/dev-python/django-registration/django-registration-1.0.ebuild b/dev-python/django-registration/django-registration-1.0.ebuild
deleted file mode 100644
index 38ad16b2c8e8..000000000000
--- a/dev-python/django-registration/django-registration-1.0.ebuild
+++ /dev/null
@@ -1,20 +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
-
-DESCRIPTION="An extensible user-registration application for Django"
-HOMEPAGE="https://www.bitbucket.org/ubernostrum/django-registration/wiki/ https://pypi.org/project/django-registration/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="dev-python/django[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/django-registration/metadata.xml b/dev-python/django-registration/metadata.xml
deleted file mode 100644
index 9f505df3e948..000000000000
--- a/dev-python/django-registration/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>jmbsvicetto@gentoo.org</email>
-		<name>Jorge Manuel B. S. Vicetto</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">django-registration</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/django-xslt/Manifest b/dev-python/django-xslt/Manifest
deleted file mode 100644
index 125e24d5c735..000000000000
--- a/dev-python/django-xslt/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST django-xslt-0.4.5.tar.gz 15717 BLAKE2B d150d105acc0834cda4f512f27a1a9cbdf7833585661e49d66761eee0fd5d00e45b292e04f602ed891a0ff0d7f1df303748194ca17cbc0e9bdd441671dc29a03 SHA512 25f3268d5eae29326ee93b5c4189389577bbf282e9f9007798de2ce96c6420d240c07e6a2abbbc57ce0bb4abb3aef557b545948a02b36a118afaefb30ca5a2b4
-DIST django-xslt-demoapp-0.4.5_p20120427.tar.bz2 5506 BLAKE2B 9a5d166fbe942747e48764d47ddce0c3b4a0efb3bc4220a1cca9f009da46356287ac03b719d5457ddf06e541212ef78bf99302b26a3c7b1adc26eb06100388d7 SHA512 200832172eac9c2729816c800fc32376ae62be2d832a398538054dca875fbedc41a300618f37f4d2b1cc36f36be20a6cbd86cc7f66e5ada476309e734c3f578d
-EBUILD django-xslt-0.4.5-r1.ebuild 948 BLAKE2B 804c412a006d29109cbb6fa8c376c0258d286f208c358019ea07d0577d6835f04ca1a35f6c5014a57d9fa6eaa761a225f1a52d7936e29791873d9eddc0010f34 SHA512 d04f95cb91fa450f9cf4317d603a16a68395245528b3bfc0bdc5925b817ba83a319b85d6a85eed172b1285058605dfb9f86863050ba007e4d65319edb53541d4
-MISC metadata.xml 324 BLAKE2B b6a558c019141968dfe52806211bf865f57e1bc3234da1e6a1af51f0fa6b99ca23e4cc8c16b0e486b322b4f1ea7ba25fba9993439e68308d2faa54b79dda6aa6 SHA512 aa9db49e681665d1d2ef3b1f2681985e0d12f7df1a8e731f966e7a426fe92a7901adbf3cc761d7885c553af8629d524a83a8dc2afea1bd24f55fe21e6601d047
diff --git a/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild b/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild
deleted file mode 100644
index a1a966891376..000000000000
--- a/dev-python/django-xslt/django-xslt-0.4.5-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? ( https://dev.gentoo.org/~tampakrap/tarballs/${PN}-demoapp-0.4.5_p20120427.tar.bz2 )"
-
-DESCRIPTION="an XSLT template system for Django"
-HOMEPAGE="https://pypi.org/project/django-xslt/"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-LICENSE="BSD"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/django[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
-
-python_test() {
-	export SECRET_KEY="green"
-	pushd "${WORKDIR}/demoapp" > /dev/null
-	if ! "${PYTHON}" -c "from django.conf import global_settings;global_settings.SECRET_KEY='$SECRET_KEY'" \
-		manage.py test; then
-		die "tests failed under ${EPYTHON}"
-	else
-		einfo "tests passed under ${EPYTHON}"
-	fi
-}
diff --git a/dev-python/django-xslt/metadata.xml b/dev-python/django-xslt/metadata.xml
deleted file mode 100644
index cd110bc1bcda..000000000000
--- a/dev-python/django-xslt/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-  <upstream>
-    <remote-id type="pypi">django-xslt</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/egg-python/Manifest b/dev-python/egg-python/Manifest
deleted file mode 100644
index 9348348f2773..000000000000
--- a/dev-python/egg-python/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX egg-python-2.25.3-python-libs.patch 2243 BLAKE2B 05e6d4383c91237fe248afbbe3e04f111b60f3119bcddb99c72adeb671c973379c6c241bdf184dc9dc81b67e347582f631dad175ca39036a3fe2a3f415a659fa SHA512 f9ddacdcffaaf6933e3ab28f843892a4754677a29987d512ebc3810245fb793f8a242b479e47fd63dc7756c817a510e04cda2548aa6bb4d88ce4649c2b1759ed
-DIST gnome-python-extras-2.25.3.tar.bz2 370489 BLAKE2B 9ca41f953ed75009f732c811372a560a1fcaf8e81bf4187117c40e61009296df62ed413cfc47194329bb92053762748cd14c3849d0f4a0fe7ccfff8ad72c3529 SHA512 6994b8b5d6ccc009edc7ddfad373b9164d8162f1007972652f6086dca30cac6941ab68ef467d15c972ab05c4ae0e19ec72edc2643636d22a01a3f5a719251467
-EBUILD egg-python-2.25.3-r1.ebuild 1012 BLAKE2B 53d847c7bbc5823ed947b8a2aac0e4837f88f4a2f49d620ec1ffd41e02d52ecb74f9fed203c567ced1ea9114640998bf4c6149e9bd5cd7a02c8fd9c6e6bf5726 SHA512 f9e8035b73d07bde28a1989d01ad3eb3b94288904442c21eeda65c60c60bf09d607b0ebbe57a3dd47a28d2580712b7777f76edbd57b2cecba72e6988c72f3ec2
-MISC metadata.xml 364 BLAKE2B 3e552b7268e94c998b77887abc52fc4e40d3d00a58631b8369c63d47d0b0d5a7248738d7149fbba2023752efb6407280afc49b3876fafc686086110d4a106e4f SHA512 6047332255074115daadcfdfe865fc811c09463a5f4e9f85ae36c52f705b413ac51d4281c18d09652115551603f8c5b1e28bb41cb8db3174d6cb4d9a0c368adf
diff --git a/dev-python/egg-python/egg-python-2.25.3-r1.ebuild b/dev-python/egg-python/egg-python-2.25.3-r1.ebuild
deleted file mode 100644
index 8bb48ccbfbc3..000000000000
--- a/dev-python/egg-python/egg-python-2.25.3-r1.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"
-
-# We don't support the egg.recent bindings that are also provided - they are
-# deprecated, have deps we don't really want and there are no users in-tree.
-GNOME_ORG_MODULE="gnome-python-extras"
-G_PY_BINDINGS="eggtray"
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome-python-common-r1
-
-DESCRIPTION="EggTrayIcon bindings for Python"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 sparc x86"
-IUSE="examples"
-
-RDEPEND=">=dev-python/libbonobo-python-2.22.1[${PYTHON_USEDEP}]
-	>=dev-python/libgnome-python-2.22.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	gnome-base/gnome-common"
-# eautoreconf needs gnome-base/gnome-common
-
-EXAMPLES=( examples/egg/trayicon.py )
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-python-libs.patch" #344231
-	sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
-	eautoreconf
-	gnome-python-common-r1_src_prepare
-}
diff --git a/dev-python/egg-python/files/egg-python-2.25.3-python-libs.patch b/dev-python/egg-python/files/egg-python-2.25.3-python-libs.patch
deleted file mode 100644
index ab691272cbb6..000000000000
--- a/dev-python/egg-python/files/egg-python-2.25.3-python-libs.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 7824fd5291f570de3c2c64185035d1a6a0a3445a Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Mon, 13 Aug 2012 04:42:47 -0400
-Subject: [PATCH] Replace horrible slow python libs search
-
----
- acinclude.m4 |   36 ++----------------------------------
- 1 files changed, 2 insertions(+), 34 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 8694a65..f5373eb 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -59,40 +59,8 @@ $1],dnl
- [AC_MSG_RESULT(not found)
- $2])
- CPPFLAGS="$save_CPPFLAGS"
--
--	# This bit is copied from Planner. murrayc.
--	# Check for Python library path
--        AC_MSG_CHECKING([for Python library path])
--
--	# Win32 has libpython25.a instead of libpython2.5.a, so we look
--	# for both. TODO: Only look for libpython25.a on Windows, and for
--	# libpython2.5.a on unix.
--	WIN32_PYTHON_VERSION=`echo $PYTHON_VERSION | sed "s,\.,,"`
--
--        python_path=`dirname $PYTHON | sed "s,/bin.*$,,"`
--        for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do
--		if test -e "$i"; then
--	                python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"`
--        	        if test -n "$python_path" ; then
--				python_lib="python$PYTHON_VERSION"
--                	        break
--	                fi
--
--			# Additionally test WIN32_PYTHON_VERSION
--	                python_path=`find $i -type f -name libpython$WIN32_PYTHON_VERSION.* -print | sed "1q"`
--        	        if test -n "$python_path" ; then
--				python_lib="python$WIN32_PYTHON_VERSION"
--                	        break
--	                fi
--		fi
--        done
--
--        python_path=`echo $python_path | sed "s,/libpython.*$,,"`
--        AC_MSG_RESULT([$python_path])
--        if test -z "$python_path" ; then
--                AC_MSG_ERROR([cannot find Python library path])
--        fi
--        AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -l$python_lib"])
-+PYTHON_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; print('-L%s -lpython${PYTHON_VERSION}' % distutils.sysconfig.get_config_var('LIBDIR'))"`
-+AC_SUBST([PYTHON_LDFLAGS],["$PYTHON_LDFLAGS"])
- ])
- 
- dnl
--- 
-1.7.8.6
-
diff --git a/dev-python/egg-python/metadata.xml b/dev-python/egg-python/metadata.xml
deleted file mode 100644
index 431bd550cb73..000000000000
--- a/dev-python/egg-python/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="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-<maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-</pkgmetadata>
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 1aab9ca58b53..b1d42b70bd91 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,5 @@
 DIST elementpath-1.3.1.tar.gz 100631 BLAKE2B fb3238006afb5100ad03314bddb16e77ea2fc7a91acf95e479ad67308456f761c53c64920266aa251a3f1b9bb6c6bebe39faa6413dd840a19ca1e9b3293f5253 SHA512 3beea19fe431514630f3957d2005d5883fb496a7192a47ea593d4b0df7a0050a19756275af7f85c7807c929482ddaacaba76ec0f3a715b6779d4aec125ee5550
 DIST elementpath-1.4.1.tar.gz 106008 BLAKE2B 9613949e65d61425d8ca04a2af95e162b603202f521cd96a3e40da4834149890f5767841bc9c7eac45d27902fdd79bac933013aed27767a840f48e889bfe174a SHA512 b83ec52549c6221b4d4d0912100df700f7a36e1eadb5491cc61106fc98ce36370217dae133c6ff0b11d1522b5ad5b9765aa135b0ac7310a9c922148e3d92acfd
 EBUILD elementpath-1.3.1.ebuild 879 BLAKE2B bf537c0862027768825a05d58edec7607ec3ea1626fa75308e5ef91edd40b28e22645b6390d4614f50b930cad833cc71be37ccb6a08acc8fa4e9143b1c3dbbc8 SHA512 70d68b99032b87ecac19c982144f53e3bce73a54f0e6edae3e31e0c1e8fdd6ab3a2756964eb4ff9bbe9f0a0c74fe1ab2888c8a81ae97198e62d5ebbcb4c08402
-EBUILD elementpath-1.4.1.ebuild 887 BLAKE2B e37b499ec23e874f091d83c948c6a7bd52d5a14afe59dad4e948a30f959d8229f12d716368bf08842209595505d916b5da65916c8ec6bf78025d8ff3bd8ec7f3 SHA512 92d53a2488895e7c604cf2ec40969266c8d35f40a7030670f9e5a0b38ba330128178ebdb678d0f7a2e22a51a1c4917fbbf483658a5aa4283efbf730deec98bb9
+EBUILD elementpath-1.4.1.ebuild 900 BLAKE2B 2d0a852145e8c0d7c8713412b89cee4da115d6f36836aff6989313388f64caafe14f2f109a2ef6996f4909348448068e65abfeee7b79679776d993f1f5a61024 SHA512 852ba111aaf2033a26d27975d39d2548b6edfab8da1f9793b053485c2d19aa0c91bbfd977aba24c5127de1d9637e8fb12825e488e0ac094ae9b7c85590039579
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/elementpath/elementpath-1.4.1.ebuild b/dev-python/elementpath/elementpath-1.4.1.ebuild
index 5ab8daaf3003..4245483b3d49 100644
--- a/dev-python/elementpath/elementpath-1.4.1.ebuild
+++ b/dev-python/elementpath/elementpath-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/epsilon/Manifest b/dev-python/epsilon/Manifest
deleted file mode 100644
index dd473cc32ed2..000000000000
--- a/dev-python/epsilon/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX epsilon_plugincache_portagesandbox.patch 537 BLAKE2B 44b8dbdb5069734f5cf12ed93518c332469fdab2c9793149effcab37b300eda9f2391f330fb5d7d1865a8bda80e488d1dfc17d7b81fefaa85b7d5fdbe1d50f21 SHA512 44aa8441d22951e573ddb6771f452c400bd971ae8cd17994959717c6d543d519bc9f2e0721e38815210048f553ca60fcc09260cd1fac1a4fc78c51055c7a6acc
-DIST Epsilon-0.7.0.tar.gz 81218 BLAKE2B c4cb4290087bb7d929dc793c190c26a0e90c1de89dc6c990dc3b53bd42499bc1979e7541bd8c416e15b10ff7478ff57b79896b88f6d1e72642dcfd20e1a9e488 SHA512 d1927ca431df3233a94296ca9e1f5dd70d6d61091d23f77df2222c6472d9a5f7b55c5c8dd2a75d0fead41af862c9e3a6a0ea9a31e21447459d5182f0d677d9b2
-DIST Epsilon-0.7.1.tar.gz 96820 BLAKE2B c856492f58e7e5ee35fdde51e876f7b4a93992e9cea556f5775d0017fc086fb7934ce9f892672331b8e363e9247bf8576a839d20fb7f5dea8f99b8c51bd5042d SHA512 ecf34a402208e514c430b4b3785df9b29f3708026ceba1301a2db8760b55111f59e7c40f868f4b642e4c7dd6c78735edbc32b2ef96ec3582e90aa2d978f06842
-EBUILD epsilon-0.7.0.ebuild 1731 BLAKE2B 6154dc9f52ca6614bc117f796807191aff299e8d171188549d67129e83185e4edba7eb816b2cf2091aea5e7bf3c6848f4f39e06a702d7e5f76e1b58042f37532 SHA512 b83585077258f7c4239a0804f149a28f73dc59c827cd172710509e02646179591398f82b9a8a2b14d2056a4dec0ff46b6d8b1f6a5b6490e0fb99344a481cd4d6
-EBUILD epsilon-0.7.1.ebuild 1777 BLAKE2B 90a935f4118af440265c926c17f7febf5d5eff829379998828b76b617a43c3fd397f15b712c4b07fbc39903bfe693a28fc444ddfd06cb182f9551483beac455d SHA512 c622f8a8205de82354f6dd327484d95925e213d48f84961c54a8792acad8fc3acd86a5c3fcc588d0fd00cf4d1c6c578b37c1b7c191d41fa572c7d0bb013abac4
-MISC metadata.xml 652 BLAKE2B 595ad28125c6f7b0fb2ce56aea39a546e70f68a506b8a0e9708d930ac7fcba36ae15979c2e1745318655a755e3505c318043680cd3ca8f52f12fd2d9d5d063b2 SHA512 aad17bdfe9501dda95cf69d3b8069ec9dfe624a07c5f0ce4160cca62928217a16140a7188d87ffe46f0626624e25ae764db892170fad6f9f0bafff7dbb413d30
diff --git a/dev-python/epsilon/epsilon-0.7.0.ebuild b/dev-python/epsilon/epsilon-0.7.0.ebuild
deleted file mode 100644
index b8ce29ccc22b..000000000000
--- a/dev-python/epsilon/epsilon-0.7.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1 eutils
-
-DESCRIPTION="Epsilon is a Python utilities package, most famous for its Time class"
-HOMEPAGE="https://github.com/twisted/epsilon https://pypi.org/project/Epsilon/"
-SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
-
-KEYWORDS="amd64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/twisted-core-13.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/nose[${PYTHON_USEDEP}] )
-		${DEPEND}"
-
-PATCHES=( "${FILESDIR}/epsilon_plugincache_portagesandbox.patch" )
-
-# epsilon doesn't install any plugins, so override the default
-TWISTED_PLUGINS=()
-
-python_prepare_all() {
-	# Rename to avoid file-collisions
-	mv bin/benchmark bin/epsilon-benchmark
-	sed -i \
-		-e "s#bin/benchmark#bin/epsilon-benchmark#" \
-		setup.py || die "sed failed"
-
-	#These test are removed upstream
-	rm -f epsilon/test/test_sslverify.py epsilon/sslverify.py || die
-	#See bug 357157 comment 5 for Ian Delaney's explanation of this fix
-	sed -e 's:month) 2004 9:month) 2004 14:' \
-		-i epsilon/test/test_extime.py || die
-	# Release tests need DivmodCombinator.
-	rm -f epsilon/test/test_release.py* epsilon/release.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	dodoc NAME.txt NEWS.txt
-
-	distutils-r1_python_install_all
-}
-
-#Lets run some tests, having prepped them
-python_test() {
-	# No testrunner seems stipulated within the source; pytest and nosetests both work
-	nosetests ${PN}/test || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/epsilon/epsilon-0.7.1.ebuild b/dev-python/epsilon/epsilon-0.7.1.ebuild
deleted file mode 100644
index 9960fd9f5824..000000000000
--- a/dev-python/epsilon/epsilon-0.7.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Epsilon is a Python utilities package, most famous for its Time class"
-HOMEPAGE="https://github.com/twisted/epsilon https://pypi.org/project/Epsilon/"
-SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	|| (
-		dev-python/twisted[${PYTHON_USEDEP}]
-		>=dev-python/twisted-core-13.2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-	${DEPEND}"
-
-PATCHES=( "${FILESDIR}/epsilon_plugincache_portagesandbox.patch" )
-
-# epsilon doesn't install any plugins, so override the default
-TWISTED_PLUGINS=()
-
-python_prepare_all() {
-	# Rename to avoid file-collisions
-	mv bin/benchmark bin/epsilon-benchmark
-	sed -i \
-		-e "s#bin/benchmark#bin/epsilon-benchmark#" \
-		setup.py || die "sed failed"
-
-	#These test are removed upstream
-	rm -f epsilon/test/test_sslverify.py epsilon/sslverify.py || die
-	#See bug 357157 comment 5 for Ian Delaney's explanation of this fix
-	sed -e 's:month) 2004 9:month) 2004 14:' \
-		-i epsilon/test/test_extime.py || die
-	# Release tests need DivmodCombinator.
-	rm -f epsilon/test/test_release.py* epsilon/release.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	dodoc NAME.txt NEWS.txt
-
-	distutils-r1_python_install_all
-}
-
-#Lets run some tests, having prepped them
-python_test() {
-	# No testrunner seems stipulated within the source; pytest and nosetests both work
-	nosetests ${PN}/test || die "testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/epsilon/files/epsilon_plugincache_portagesandbox.patch b/dev-python/epsilon/files/epsilon_plugincache_portagesandbox.patch
deleted file mode 100644
index 06bd55732011..000000000000
--- a/dev-python/epsilon/files/epsilon_plugincache_portagesandbox.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- epsilon/setuphelper.py.orig	2009-02-11 08:15:39.000000000 +0100
-+++ epsilon/setuphelper.py	2009-02-11 08:18:56.000000000 +0100
-@@ -21,6 +21,9 @@
- def _regeneratePluginCache(pluginPackages):
-     print 'Regenerating cache with path: ',
-     pprint.pprint(sys.path)
-+    if os.getenv("PORTAGE_PLUGINCACHE_NOOP") != None:
-+        print 'Not regenerating plugin cache for portage sandbox usage.'
-+        return
-     from twisted import plugin
-     for pluginModule in pluginModules([
-         p + ".plugins" for p in pluginPackages]):
diff --git a/dev-python/epsilon/metadata.xml b/dev-python/epsilon/metadata.xml
deleted file mode 100644
index 223df38b1fda..000000000000
--- a/dev-python/epsilon/metadata.xml
+++ /dev/null
@@ -1,16 +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 lang="en">A small utility package that depends on tools too recent for Twisted
-		(like datetime in python2.4) but performs generic enough functions
-		that it can be used in projects that don't want to share Divmod's
-		other projects' large footprint.</longdescription>
-	<upstream>
-		<remote-id type="pypi">Epsilon</remote-id>
-		<remote-id type="github">twisted/epsilon</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/epydoc/Manifest b/dev-python/epydoc/Manifest
deleted file mode 100644
index 72fd2c6f6999..000000000000
--- a/dev-python/epydoc/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX epydoc-docutils-0.6.patch 1190 BLAKE2B ad424efe439798076d99e3eb5c516277eaf05fbc73a24bb07ac32d4199d537d1a93af15660543ba8a038edb2b8539ce2392c7f8d008a13d5ff8abbbae870c901 SHA512 d1366440fb3942d307508e2a629453dee1ba53dc01dccb6a424bc5486a34dd714cc5d502262ee4fa9d8191faabae61176592a950d0d7cfc0d037ca0fbd5abfac
-AUX epydoc-python-2.6.patch 2425 BLAKE2B 9eb7426637243073fc0ed93975e2ad77631f11243c5d22b5fe8bb79c7379ed0771ab3af244b10d88333394e4f9690fe117e60e2777646eed9e40d436af49ee48 SHA512 b1dbc9053125c770acb75a236a32475e98be41d77dc9c1816cc194297cbbb6334e3e4cdfb1b50e37ec37a18285be6675be50f8a029ffac96705c776c0768d173
-DIST epydoc-3.0.1.tar.gz 1785792 BLAKE2B 405e58132f4d0f9c40bfe58ada11618865e29c3b7a1eb41954f4769287ff780b4f17e57b50214fdc0f38a269093e35d11c83629e22c8ba854ed78ce299825826 SHA512 5c4011f0018ab956c0e1fe5fe0c1608fa2416439a60b5836a9d2d95e359428086ba403bcb5ed53e64d9d4979441ca6d537d9e5b8d6224d2202e7df3332d9ea83
-EBUILD epydoc-3.0.1-r2.ebuild 1104 BLAKE2B e3092f29bef6ff5ff1054fdbf3fb522e6f87a4088c1874d2b8881436ec8cdac85029f0b39819d7e2ad74dca9145e3c600a505073d68a304e35e0b8fffed09f3d SHA512 32c6dc6b5396f2fd49a86d9d2677fa52bab65071a2f4960860cb9d9d5448702bc137b585649512343b0f2806fae16ccee6ad3aa4d5431c95a30628893f980890
-MISC metadata.xml 1217 BLAKE2B 89ec592e9bf635d08b60cede28d77fc2efc5674eb409120a51f107676c3f87dffb7ce57269ef936b723a55e32cff2287affeca88faedd7fb90264f52ada262b8 SHA512 3a8b0a2194a7899b9e7fedf2136a587e38947d395fda15d17b9ce6aabc65adae91783f8e4ab37acdc5b2ded8281615dd9831f5dafaf7e6c0d22ef771ce253c39
diff --git a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild b/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
deleted file mode 100644
index 617e727ccf0e..000000000000
--- a/dev-python/epydoc/epydoc-3.0.1-r2.ebuild
+++ /dev/null
@@ -1,46 +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
-
-DESCRIPTION="Tool for generating API documentation for Python modules from docstrings"
-HOMEPAGE="http://epydoc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc latex tk"
-
-DEPEND=""
-RDEPEND="dev-python/docutils[${PYTHON_USEDEP}]
-	latex? ( virtual/latex-base
-			 dev-texlive/texlive-latexextra
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-docutils-0.6.patch
-	"${FILESDIR}"/${PN}-python-2.6.patch
-)
-
-python_install() {
-	distutils-r1_python_install
-
-	use tk || rm "${D}$(python_get_sitedir)"/epydoc/gui.py*
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-
-	doman man/epydoc.1
-	if use tk; then
-		doman man/epydocgui.1
-	else
-		rm -f "${ED}"usr/bin/epydocgui*
-	fi
-}
diff --git a/dev-python/epydoc/files/epydoc-docutils-0.6.patch b/dev-python/epydoc/files/epydoc-docutils-0.6.patch
deleted file mode 100644
index efb6baa121b7..000000000000
--- a/dev-python/epydoc/files/epydoc-docutils-0.6.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Make epydoc work with docutils-0.6.
-
-Patch created by Engelbert Gruber (grubert) and adjusted by Martin von Gagern.
-
-References:
-https://sourceforge.net/tracker/?func=detail&aid=2895197&group_id=32455&atid=405618
-http://thread.gmane.org/gmane.text.docutils.devel/4888/focus=4924
-http://bugs.gentoo.org/287546
-
-Index: epydoc-3.0.1/epydoc/markup/restructuredtext.py
-===================================================================
---- epydoc-3.0.1.orig/epydoc/markup/restructuredtext.py
-+++ epydoc-3.0.1/epydoc/markup/restructuredtext.py
-@@ -304,10 +304,11 @@ class _SummaryExtractor(NodeVisitor):
-         # Extract the first sentence.
-         for child in node:
-             if isinstance(child, docutils.nodes.Text):
--                m = self._SUMMARY_RE.match(child.data)
-+                data = child.astext()
-+                m = self._SUMMARY_RE.match(data)
-                 if m:
-                     summary_pieces.append(docutils.nodes.Text(m.group(1)))
--                    other = child.data[m.end():]
-+                    other = data[m.end():]
-                     if other and not other.isspace():
-                         self.other_docs = True
-                     break
diff --git a/dev-python/epydoc/files/epydoc-python-2.6.patch b/dev-python/epydoc/files/epydoc-python-2.6.patch
deleted file mode 100644
index 84bb22d879c5..000000000000
--- a/dev-python/epydoc/files/epydoc-python-2.6.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -Nur epydoc-3.0.1/epydoc/docparser.py epydoc-3.0.1/epydoc/docparser.py
---- epydoc-3.0.1/epydoc/docparser.py
-+++ epydoc-3.0.1/epydoc/docparser.py
-@@ -72,6 +72,26 @@
- from epydoc.compat import *
- 
- ######################################################################
-+## Tokenizer change in 2.6
-+######################################################################
-+
-+def comment_includes_nl():
-+    """ Determine whether comments are parsed as one or two tokens... """
-+    readline = iter(u'\n#\n\n'.splitlines(True)).next
-+    tokens = [
-+        token.tok_name[tup[0]] for tup in tokenize.generate_tokens(readline)
-+    ]
-+    if tokens == ['NL', 'COMMENT', 'NL', 'ENDMARKER']:
-+        return True
-+    elif tokens == ['NL', 'COMMENT', 'NL', 'NL', 'ENDMARKER']:
-+        return False
-+    raise AssertionError(
-+        "Tokenizer returns unexexpected tokens: %r" % tokens
-+    )
-+
-+comment_includes_nl = comment_includes_nl()
-+
-+######################################################################
- ## Doc Parser
- ######################################################################
- 
-@@ -520,6 +540,10 @@
-     # inside that block, not outside it.
-     start_group = None
- 
-+    # If the comment tokens do not include the NL, every comment token
-+    # sets this to True in order to swallow the next NL token unprocessed.
-+    comment_nl_waiting = False
-+
-     # Check if the source file declares an encoding.
-     encoding = get_module_encoding(module_doc.filename)
- 
-@@ -570,7 +594,9 @@
-         # then discard them: blank lines are not allowed between a
-         # comment block and the thing it describes.
-         elif toktype == tokenize.NL:
--            if comments and not line_toks:
-+            if comment_nl_waiting:
-+                comment_nl_waiting = False
-+            elif comments and not line_toks:
-                 log.warning('Ignoring docstring comment block followed by '
-                             'a blank line in %r on line %r' %
-                             (module_doc.filename, srow-1))
-@@ -578,6 +604,7 @@
-                 
-         # Comment token: add to comments if appropriate.
-         elif toktype == tokenize.COMMENT:
-+            comment_nl_waiting = not comment_includes_nl
-             if toktext.startswith(COMMENT_DOCSTRING_MARKER):
-                 comment_line = toktext[len(COMMENT_DOCSTRING_MARKER):].rstrip()
-                 if comment_line.startswith(" "):
diff --git a/dev-python/epydoc/metadata.xml b/dev-python/epydoc/metadata.xml
deleted file mode 100644
index 1f008fb50214..000000000000
--- a/dev-python/epydoc/metadata.xml
+++ /dev/null
@@ -1,26 +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>
-		Epydoc is a python documentation system without output similar to javadoc.
-		Epydoc uses python doc-strings, importing modules, and introsepction in
-		order to do its thing -- if your modules are not safe to import, you
-		should look for another tool. Documentation mark-up is done with restructed
-		text (reST).
-	</longdescription>
-	<longdescription lang="ja">
-		Epydocは、Javadocに似た出力をする以外はPython言語のための
-		ドキュメンテーションシステムです。Epydocはdoc-stringsを使い、
-		モジュールをインポートし、それらが自己分析したものを使います。
-		-- もしあなたが指定したモジュールがインポートするには安
-		全でないのだとしたら、他のツールを使うべきです。ドキュメンテーション
-		の書式は再構造的文章(reST)です。
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">epydoc</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index 6e1b2a6249d0..706ce0aa7be2 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,5 +1,5 @@
 DIST eyeD3-0.7.5.tgz 221685 BLAKE2B c296f61036cd0e43f1820c830e9fa9630d8bb56770c36c922ec0bbbd2ed9566c4a0330677dc1c7fd6cc6fa30f9b415abef2867d93a55ba337b520ed52e330c39 SHA512 9f57e05e4db78618e73ec15ca6ac7b983e13c24ae926bfb9194ee4fc1d735f80308dfc5bdac6016f5491bdb06d46b645d7ac54247d581467a8a22129fae85ba5
 DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
 EBUILD eyeD3-0.7.5.ebuild 987 BLAKE2B 965969b4ff8062791a942c2b6cd3efaf2bfe9f2c9e28e8a17675973d7ab2473334b224bdc6013d705c742d9560fe8bb7d9d1b27817dfa338f62678a21735401c SHA512 09eba7fb1059c7b9b8ea10bf1a26fb48247dfb4f1e75574715aef9199e17e1f7c6d30f1bb57b8f20666754f6828cd73883e010cc056e15e399f98d9e0ebff2ef
-EBUILD eyeD3-0.8.11.ebuild 576 BLAKE2B 0ca94c5cb93c66cff21a1dcde0baf173df34c1d85d5d2482deaad75d28caaa790acab111a17dbc5ba016269d6fe65fab6cf400246e624c11311a97a220e01a24 SHA512 716b9f2ab422925568d77508a289f5d8acbc4bc67e9c081b53925fa9ca2a9ffa59f3e81091a2f58d53d612dc2b07cafc31acf6a49a7d83d3713e6a596f203170
+EBUILD eyeD3-0.8.11.ebuild 574 BLAKE2B 5010595092cf25d6250528b684deb1e011521f7f4781662734ab6da4425e0485272ebc5cf35573a373c492da1c04dd55c20b61e2c620d02ba8058bbd2018ac70 SHA512 baa7f29add7ff093b721ec9736b91d5857f8eda3574ad832819c938505e207f94d71e5b3ad424c9d413f4b7feb67446598c6422fdf967f389fcc3f07a6a0a569
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/eyeD3/eyeD3-0.8.11.ebuild b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
index 092cbee17440..1fc73b400ae4 100644
--- a/dev-python/eyeD3/eyeD3-0.8.11.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.8.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="amd64 arm ~hppa ia64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm hppa ia64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/paver[${PYTHON_USEDEP}]
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 41b3c3e818fb..dac9f091336a 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,5 +1,5 @@
 DIST flake8-3.5.0.tar.gz 140608 BLAKE2B 938ad4406370da27155512355432edd23a824db1d6ee635591628fefad43ee1116256ae7f240496d93941800212ea2479be73fb9ee9bd03c9a54ab70bbce452f SHA512 ac5d1bd9c44ed76c9e5cbd941b24bb552aa76e156b24ccda6cc8440ee90f3a574fdb393665adc75298e4f57111d7ab3115ef21ef9088fb327d0a9703d442450c
 DIST flake8-3.7.9.tar.gz 150123 BLAKE2B fd46710c0dcce7d3dcb3d5fc8ff7a83a35315679fa838e68abafd5bdc342c13218706fec0dac3fc9a6d919971f1f846c855f00cbd60c925e979378e431dace0b SHA512 c3c753ad050d8a8f87f7c28c8a1c953ed9bd04f08b09512d9323152b4eebb57d67fbfb0f5317d629174fa12fa234e1a86d6a633dd951fff6a45330b1c4f62850
 EBUILD flake8-3.5.0.ebuild 1600 BLAKE2B 8450b5b85db4ee14942a44eadb7db5ba22a424d9041bd6c556529459364528a948590a3927e95c401bcd1e77a41f881155cfa7880212a0d828d5b4a0b5aa4742 SHA512 832fd75e55330e6fb3a64d1bee5e6b544ca6b7a2d230c98638de10fe88fc35242cae647109071c2d5b564b1de8a6c380207659cd0b1d358c9d1b77ac24183fe7
-EBUILD flake8-3.7.9.ebuild 1587 BLAKE2B 37caab9cbb12b5b75d82944bd46d2df56dbfc1c892bc5a82178eeef08a0776cc80b96550b0153fee0ce499a744387d716c71fe8246051715e587d5006afdb3cf SHA512 5351184c1932e1950124d89e873abbd7cbde1cdf4e152a4b2a9184a05dded7e3d4454d92119310be63a3bb7e2ce1418050b300d5f8d80994146751c1141ad6ab
+EBUILD flake8-3.7.9.ebuild 1593 BLAKE2B d0c81406da3fe5850b60c7dabc2a52c1f4bc67e942540212d63b44bc6f2d8ae44080a49f4a540e9172c99d8f959fa7abf5734f87bc863218c187f89abb4105d1 SHA512 9b864ac71aa8077beef78ccb1bac6cca543aa395d51c17877632074c15e6047479d6abc54d8743c97ba0819b863bd555c9eb8ca0aff79bab6c6dcc9d46a3cb2a
 MISC metadata.xml 373 BLAKE2B af4d7678c87281f631048d3c49b0a642ceee1d771be2b662458888659b7c8e262c98adcd7bcb7f6ab251783998950725729ed35c887c004f8d8da87da81eda7d SHA512 449aa40152590e7103a4bf10006a33e6a0d5010a7846b0c5fbee8a78d99a3539995eccf441845c205bf48fc1e9b35cd7b1d6af0d98b469bdd06989baf8b88646
diff --git a/dev-python/flake8/flake8-3.7.9.ebuild b/dev-python/flake8/flake8-3.7.9.ebuild
index a53902663bb6..a1d579273d10 100644
--- a/dev-python/flake8/flake8-3.7.9.ebuild
+++ b/dev-python/flake8/flake8-3.7.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ia64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 # requires.txt inc. mccabe however that creates a circular dep
diff --git a/dev-python/flask-openid/Manifest b/dev-python/flask-openid/Manifest
deleted file mode 100644
index 605c78e3c7be..000000000000
--- a/dev-python/flask-openid/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Flask-OpenID-1.2.4.tar.gz 42570 BLAKE2B 121350ff34ea18f419cdc9ef22384d2d1a1eb9214400b9e7fd7af1c5a99b9a9188b7e0f3464abed132f4f770eb5741cdf05efd141c97299cbf4d679e4251242f SHA512 3a9cf29c425747fd2f00b0200c99eece4c66b29e3ef56c78c945f9da1029fceb59053798a26209289625c2e2a2e9118531ac2fced82758c76bc8002ec1d58ae7
-DIST Flask-OpenID-1.2.5.tar.gz 43369 BLAKE2B 743be1ea1785b29ce8b29f6c60d0af84feff70fbb9d8743146fe600ea67d9dd09d6dd187b28783aa5429ab44dfe01d200763f861659e1fe36bb3d49f6c172d7d SHA512 20486b3dc8364842f36bfeb2b8501c75a36ec7a16ecb43e826d67ecb2c91846be4e29f1f0bf616a85c5a264446ddcb7dfa52019c9809e8f6be77822e9f69b003
-EBUILD flask-openid-1.2.4.ebuild 1032 BLAKE2B 2f8146d5725c72b2bf750e3a27b001b7dcb65878f34263575a9ff4af703dd923eb2ae2750c196dcec57b9c4e0cad12454bc11a37e12eb9ebf9335e2132e1740c SHA512 9e3fd906f24e82d7a4a7dc430942b2030d7f0879fb22d175d61b71fe91a58e9fef126182481f61feeb3ceccb96eb69a533c11a5e9728bbdf3a3e954da5348b5f
-EBUILD flask-openid-1.2.5.ebuild 1034 BLAKE2B 1812fb7109b5f516a893180545f0ef2000bb1d02feab215b13d62fa979c5fe1d43e4890656ba2c015b475e5c38e36b3b3c553464f2880a2a444fd58f76545f2b SHA512 8206f752b317d0ff319843eb6c5112316908a598950a0f8857a5e514cc05436dd5d5b6bded891d3b130adcdcff43b8917895ae37e89cfb63287c50d4b8397235
-MISC metadata.xml 315 BLAKE2B 9451ab264e52ae5ab8c5eb53265b724f50a074ca998a0cc6d2794a041769028110dd24c46044235b9d1233fc5b7e8c1bbc596532d034eaad2184d773b123f064 SHA512 5263ba5dd535395613b174284d4eee15958167c326346152a62da40181b81e98dc6b2df22c6dc1d009f91d6a29ac375c68cbd46ad87ed744d8ea93af52444d12
diff --git a/dev-python/flask-openid/flask-openid-1.2.4.ebuild b/dev-python/flask-openid/flask-openid-1.2.4.ebuild
deleted file mode 100644
index 46814c914fc8..000000000000
--- a/dev-python/flask-openid/flask-openid-1.2.4.ebuild
+++ /dev/null
@@ -1,45 +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_PN="Flask-OpenID"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="OpenID support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-OpenID/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/flask-0.3[${PYTHON_USEDEP}]
-	>=dev-python/python-openid-2.0[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( example/. )
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-openid/flask-openid-1.2.5.ebuild b/dev-python/flask-openid/flask-openid-1.2.5.ebuild
deleted file mode 100644
index b177ec5259c4..000000000000
--- a/dev-python/flask-openid/flask-openid-1.2.5.ebuild
+++ /dev/null
@@ -1,45 +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_PN="Flask-OpenID"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="OpenID support for Flask"
-HOMEPAGE="https://pypi.org/project/Flask-OpenID/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="
-	>=dev-python/flask-0.3[${PYTHON_USEDEP}]
-	>=dev-python/python-openid-2.0[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Prevent un-needed d'loading
-	sed -e "s/, 'sphinx.ext.intersphinx'//" -i docs/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( example/. )
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/flask-openid/metadata.xml b/dev-python/flask-openid/metadata.xml
deleted file mode 100644
index 84d84ad328c2..000000000000
--- a/dev-python/flask-openid/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">Flask-OpenID</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/flask-xml-rpc/Manifest b/dev-python/flask-xml-rpc/Manifest
deleted file mode 100644
index 8f1e30f1e576..000000000000
--- a/dev-python/flask-xml-rpc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Flask-XML-RPC-0.1.2.tar.gz 5756 BLAKE2B c732fc91e177bf8d880af2f337da1b49c8549dbc25d96634cb6c102379dfa9cdce15792a56e12df8055782f47b8caf9659c4e97012ebcd234f54ebaaf8cc3a61 SHA512 0e083b70576b0d09a316f8be9a779eeb24723caede172fe51168b2b125553b7916e65012813976d46b03787d1f5c24ad6524267d432a246aaf8b222023481e85
-EBUILD flask-xml-rpc-0.1.2-r1.ebuild 638 BLAKE2B b34b87144c219528ab2d1e58876824a3f26a459943eacb46cf067a1f64158a33ee8b6630bd7ae25bd0e5ad3d6893e84b3dfec3131a64215295fdcc6851d0978b SHA512 8a9cfd7ee88060dc0d15e062c1abf5cf603f2daf66e98c13dd41d5cc55b687905164d60b2e9d6e23e459303321e7f5d75958e4631b31afb5e2b7a0ede30758a7
-MISC metadata.xml 316 BLAKE2B 8cac93f5ef2fe311bb11e89a5f28561ee76a9071513256cf2f2800c6a8351636fd0571cb03e9ec905515f86d3a343a1a47adc356271f9e3a2d2e18ae784dd4d0 SHA512 3c4cc08e88993f3a36c3df4bd8c1ae2d9cdc5e75fb27c34960ab749a1ecc1eb67e22dec85cbd3225f0401080104bc0a503df1b68db66de29e4d8e16af0f19718
diff --git a/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild b/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
deleted file mode 100644
index abb2d3211250..000000000000
--- a/dev-python/flask-xml-rpc/flask-xml-rpc-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="Flask-XML-RPC"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XML-RPC support for Flask applications"
-HOMEPAGE="https://pythonhosted.org/Flask-XML-RPC/
-	https://pypi.org/project/Flask-XML-RPC/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests || die
-}
diff --git a/dev-python/flask-xml-rpc/metadata.xml b/dev-python/flask-xml-rpc/metadata.xml
deleted file mode 100644
index 1db4779c1a77..000000000000
--- a/dev-python/flask-xml-rpc/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">Flask-XML-RPC</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 1e70be76d7e7..d77b30b2cdbb 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -6,6 +6,6 @@ DIST Flask-1.1.1.tar.gz 625458 BLAKE2B aea56848dd1f8bb2d96059adf069f8d19c55395e5
 EBUILD flask-0.12.2.ebuild 1852 BLAKE2B 227bbfee82cafded94dca9fbd8492c5b14fe4921bc9eee93bc7559bd2af90c510f76758ff9a323f26698266e76533448be0d48936c66a19afe58e360a5aeadcf SHA512 76caa706a286644af614cbdd39bf9ef6e609ac8f98d9e7e5951db84946ba105ae6defb64a73d5af1c3106b91b2155bd24c5b820c70340cf88199193deb496857
 EBUILD flask-1.0.2.ebuild 1560 BLAKE2B 9a6c26fd51921b29c8fefad6a09fc4a9d9a8c16bebd3431194b872893ecf0012457167d20bb0e8820fe6d8a5cb6b25e5f1ffa95b5c279d5a36a69cccfb1b7b9b SHA512 bb44972822e4e0d2b09cefce23ed5f9c9964fcee15db9279b7bb356789aaa29e5b45d6b98b033108710852eadc730bb7454054885cc7019e50aefd5de9d5f638
 EBUILD flask-1.0.4.ebuild 1566 BLAKE2B d4e6a59a03460c2050de9f4f4c1655948df2375671d3d6509eba08ceaec8915873c834e315c6b6b448934ec2fac7f350d3a7caaf25a78bd8f29abc43bb8895f0 SHA512 7e14a329956f2bae023af857b1ddbd53fab8d3e6effcfc4518a3127e3cbdbce0313a659bdd33eb9071edb7340aee74367f504b6c7a57e22995cc490b0431b98e
-EBUILD flask-1.1.1.ebuild 1415 BLAKE2B b956e7790630901883129e5f0df89795b9048f902a4b69326d303109cfebdc557d64a6edb24a7aa0a90bad15e9b3a2f86f2031e496f5599050c5ce31c6e0dc3e SHA512 168298edbf16e11ebe97754453700f31e422aa4006c4a4d1c531678789016bab36f0a659f24448bf42b31e735c9d8ff553a04aa0dc37de698cfacd02800c8474
+EBUILD flask-1.1.1.ebuild 1422 BLAKE2B 828ebab7966aa9bbd6911cbf9f2c1048ec4066e709512316df1ff0438fc4afa03962698cf715d95e609d5a8509dd22ba8ad5a6fabef9fca00f19ba5ef917dbf5 SHA512 71ab8e8e705f461c2cb5d2236a19e45da36236bea5941625d86b535347599487d35ff345679c171ff2cb1afb09267cf7e16c131bb894d4ec9442961c5adda8aa
 EBUILD flask-9999.ebuild 1306 BLAKE2B 624eabc5bd3dc1dc8470f04b49c65a3dfd9ea1ea72e75fbbdb4130cb5e5790e299f4309f4088ba3e9cd13a8c2400c6bac405515b7c3b01b3963b21d33fb6067d SHA512 af1a02401a2b305f0579dddbfa5f5430df4a04b9309e704ba9bab37449f06894a6c4f7b6f2e1c1e7e7d1a0330cc8d36b1dee8ac5a7baa8cb3aa22b910b742498
 MISC metadata.xml 363 BLAKE2B f031e9e0d44bc626f4cc00538e6030e732f97286a09d061cfd8b7e03c8506cc9ddc8caab73d9c10363c5bd0eab1bfe6129a668bd6c66e3d82d9221cfd1175629 SHA512 33989d02b79b82d3256dbbf7402d79580d529e728222d74dbb80f740dfc1f8f1357f03ab5da857ff1821f2bb90f7b7eeae71d89e237516da62656d3d124ef4d6
diff --git a/dev-python/flask/flask-1.1.1.ebuild b/dev-python/flask/flask-1.1.1.ebuild
index b43a865a386f..d3118ffdfd2d 100644
--- a/dev-python/flask/flask-1.1.1.ebuild
+++ b/dev-python/flask/flask-1.1.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/dev-python/freezegun/Manifest b/dev-python/freezegun/Manifest
index 370183d2dd60..b1274cdf7317 100644
--- a/dev-python/freezegun/Manifest
+++ b/dev-python/freezegun/Manifest
@@ -5,8 +5,10 @@ DIST freezegun-0.3.10.tar.gz 20398 BLAKE2B 971f4f3de565878b8a1e4671160f41cc7c558
 DIST freezegun-0.3.12.tar.gz 24346 BLAKE2B 09d7c662a82d7b7fa6ae56c09bff0d73e2b63fba2b492620cd8e68ee06a15129a7e901418d1881e65b440babcfe0d014ad3574ab8dd2c7eab8486b3d868273ac SHA512 f7d98ea84735b24380fa53e1e62622fe91be5a35cb75221ca4cb02418add9b0a4add9b2f691242be75acbc45d4745fef82ffe3c89890dcdffa4405940e527af4
 DIST freezegun-0.3.13.tar.gz 25419 BLAKE2B 8334f921609463bcb18779b61b234bb80406924578ccd43ca1f4a10c65eddf87f399fa7fb285453808988c6f74331345a373cbdcb29f3bd412f3a9e472fce43c SHA512 682f689c475ee574e7a466bfa102b96545cd8b7f095c4b5bdfda496ef667c712248db414d66c9f17fdb1a492c0deeb87a07d8b2a4128d7fdd771f89d5ea8277f
 DIST freezegun-0.3.14.tar.gz 25327 BLAKE2B d96dd84e73e1cd0fdcb8846d97901260aeab80b8ee1d1cc35715073df9693238b8b4e8b8163c6b70daf828f0f7f9e13e202ff99f3325871faca3c4a4331d63cb SHA512 960e63206622bbbc378a64a62c9c849cda1380c63c148588a10347c1bc6414aebffbbbca6c53e734c8651824688c38b47aa71192d94edaac0422caebf4b1cb8c
+DIST freezegun-0.3.15.tar.gz 25530 BLAKE2B 866736cfe556da50f8edba55b0b84c7365e6a1bf32d88e84dfcee6046474b30a9ea15522c3356c5ca30f9a8b79096ba17fdaab240f20e4ef1f91b25ec8262716 SHA512 9f3836f8c9f207d9bccbcaec3f1af977b26aa3699ad5f792d052e105a0de530c6dda1641480c9cd551627186bf0c65d92bf39a6f4a61f458f762d8aa999180ba
 EBUILD freezegun-0.3.10.ebuild 947 BLAKE2B b6aa03aff7b51c74dda8e97ff2252ca92f74e68e7f400bc9e66ff418fc1d6df34da3a6591b1c448be053e4684e4eeebba3487bef2b7dbeb7276075e49618dd7a SHA512 ade1225993ce5d898ce6ac3c9421904412cd7268ecd4de872320d1e9d3adfbd8c91a7cea564fc0026741a47dec3a11fcd55239cb44020b28d21fd67371a0ae5c
 EBUILD freezegun-0.3.12-r1.ebuild 1292 BLAKE2B cd79b9dc5b5469ed1d3177af3b5b3ee5acd6a67b337a1c64f5964f58fdc2da79b9f3e7824f9e116ef2fe6c59fffd0b29fcae34e5445de02669a0d3c10da11479 SHA512 b54d404c9f2263f0da56956fc5bc48c73eb39e4fff015a5db8cc9c9bd36481340d36995647eac0b90374196ad8e03547562aed8d3aa242d3ef1ff1b07a329693
 EBUILD freezegun-0.3.13.ebuild 1126 BLAKE2B 40c8161324a4f52d7799043c3856b594e1049325a3b4d0694371fc027cf5ff75d96af515763b36f1872fac37a02c442356a7afe23451766258d0a2e9e745be81 SHA512 9bc7cca4f4cce9a8bde0389ca6ad72cca53283082dca05866ea26d0225f6b63f2109d1e9261b20cfb9922b6f5316daf11c0b6e389f227995b578982c14472244
 EBUILD freezegun-0.3.14.ebuild 1126 BLAKE2B 40c8161324a4f52d7799043c3856b594e1049325a3b4d0694371fc027cf5ff75d96af515763b36f1872fac37a02c442356a7afe23451766258d0a2e9e745be81 SHA512 9bc7cca4f4cce9a8bde0389ca6ad72cca53283082dca05866ea26d0225f6b63f2109d1e9261b20cfb9922b6f5316daf11c0b6e389f227995b578982c14472244
+EBUILD freezegun-0.3.15.ebuild 1126 BLAKE2B 40c8161324a4f52d7799043c3856b594e1049325a3b4d0694371fc027cf5ff75d96af515763b36f1872fac37a02c442356a7afe23451766258d0a2e9e745be81 SHA512 9bc7cca4f4cce9a8bde0389ca6ad72cca53283082dca05866ea26d0225f6b63f2109d1e9261b20cfb9922b6f5316daf11c0b6e389f227995b578982c14472244
 MISC metadata.xml 392 BLAKE2B 574f859b6be3de78801f9214b561b366ddb87357be71a6891084da1f3de2e6481692d5da7ca6d5008d3ae963cc1e36ead4aae6115f0008d63d65a089cf70115f SHA512 b39f8a45d62f0c220fb915ad64c6a17e9f9619aa8c358694c3a3a83464eb5fcf50ed658430d9aabfb76e8310d4ab3baf059a8de78ebe46a59d6af187735489ed
diff --git a/dev-python/freezegun/freezegun-0.3.15.ebuild b/dev-python/freezegun/freezegun-0.3.15.ebuild
new file mode 100644
index 000000000000..c069ad36b75f
--- /dev/null
+++ b/dev-python/freezegun/freezegun-0.3.15.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Let your Python tests travel through time"
+HOMEPAGE="https://github.com/spulec/freezegun"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="
+	>dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r \
+		-e 's:(python-dateutil)>=2.0:\1:' \
+		-e "s:'(python-dateutil)>=[0-9.]+,.+':'\1':" \
+		-i setup.py
+
+	distutils-r1_python_prepare_all
+}
+
+python_prepare() {
+	# optional and only works with python3
+	if ! python_is_python3; then
+		rm freezegun/_async*.py || die
+	fi
+}
diff --git a/dev-python/functools32/Manifest b/dev-python/functools32/Manifest
index 614f826fb2a3..30e413dc9bc3 100644
--- a/dev-python/functools32/Manifest
+++ b/dev-python/functools32/Manifest
@@ -1,3 +1,3 @@
 DIST functools32-3.2.3-2.tar.gz 31171 BLAKE2B 6f228a7ae4977f333a4979b583e636394691036670f8ab330450153e77262929d981dd0988dc00ab245df6dd0667f5ae12d296bc72513a4ed5b031159e332a7f SHA512 ad944019f4aefde292b6872bfe06862d01920a2f44adf8740c36ed51d16d879be7638591aaddf9dac4ec83b6f05bbf81972d5f32854abedcce3dde080459f7f7
-EBUILD functools32-3.2.3.ebuild 626 BLAKE2B 2457cb408cb2d7cd0c6072a0a893b3d0dbb1b75bc635debd71a19e60f238fd88d4cc32bcd26c301dce634e9fefd1c06bd210d3dd981a0aabd0a88c2f01431044 SHA512 e62062b1c6b3756c80c6dc77d7645ae103b356fcb4961b8e65785121fcaaa7ccccfcd837f4dd1f8d50d62075ed912ccc6eb319d72a56d6c1a4cfdc30f716d443
+EBUILD functools32-3.2.3.ebuild 627 BLAKE2B 9fe8ec11be21470d3d790e71a2a43e1c33d65d239f4686088483d4dcd1e1c3b7ef9e7f4383d57add71250cdb0dd055270d896ed9ab5b7ff76717adeca196e235 SHA512 c68588a8fded6068ac6af651e3a94094b4bca966857fb20655768fd5cdac257a55fad073dafa72628dde363008e92204fcd338af2cedc99b5c7f2895ef780302
 MISC metadata.xml 380 BLAKE2B 112a93cd4165bae11a99c2668c01427f7deaf5d2d780c0a7a2d5d8a5f6d6d9e1e3609b1ca7bd96f1f37e718121d6284a3094fa87d376348cae1176b2a92b425c SHA512 665568fc9ce82f570e4601ea9574856c6e1d3db18e79a04ea46888b61ddc6da5aa0f73950346a8940a32ccf1c832981e6ed18ad547fb2f37edbea9b123b0fcce
diff --git a/dev-python/functools32/functools32-3.2.3.ebuild b/dev-python/functools32/functools32-3.2.3.ebuild
index de7cd8fbb6a8..fdda8be186e2 100644
--- a/dev-python/functools32/functools32-3.2.3.ebuild
+++ b/dev-python/functools32/functools32-3.2.3.ebuild
@@ -19,6 +19,6 @@ IUSE=""
 
 S="${WORKDIR}"/${P}-2
 
-python_test(){
+python_test() {
 	"${PYTHON}" test_functools32.py || die
 }
diff --git a/dev-python/gdata/Manifest b/dev-python/gdata/Manifest
deleted file mode 100644
index 585535231faa..000000000000
--- a/dev-python/gdata/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gdata-2.0.18.tar.gz 2475552 BLAKE2B 8679667c427aea162a13d56bb6e88d3c092960c3d0b15d4f297b6a96ea63a96373469e875629386d573a0a97024d16ef3d42798749554dc09b621919b98a4f65 SHA512 57d01a8e41fd7507621c10a4ea3e66223aa1d481365269daecdb5ef1bd725915448bcfa5aca9bef3a7fb4b735627d7916b7f971f1c05d7bf840069346e98ceef
-EBUILD gdata-2.0.18.ebuild 810 BLAKE2B eaa0292015e14d49ea7fd21a8a271aff3e3954f883a74252042a068632936eec9da32b2092aae0c3a7a2d377c8ec05b33a417a2cbaa10bdada197580b809373d SHA512 8958f836ec727dcf0b9ce733b98046422e10b5e98177147b60787bbdbe29f86b92be704116ee47e312f54aaeffd448eca9330ab5e3d9e80766fc947930f21721
-MISC metadata.xml 374 BLAKE2B 8034fd862b60a12ddf48ae0f61c5cd7b4c8f5f537e8ab6e2d5e8a826889d39f106e96c03114c5f99a265cedb2277fdead21316a39722fe3d7925f5aa594aa4e5 SHA512 d4c66573bcdb0cf9b1f9c61539180de94c57853fbd6241c4049247ca745779284072b39087d90b79ed79f83504dc0551fbc0c62b9a52b5572ae1681af97c41dc
diff --git a/dev-python/gdata/gdata-2.0.18.ebuild b/dev-python/gdata/gdata-2.0.18.ebuild
deleted file mode 100644
index 310cc571087c..000000000000
--- a/dev-python/gdata/gdata-2.0.18.ebuild
+++ /dev/null
@@ -1,27 +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="ssl(+),xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python client library for Google data APIs"
-HOMEPAGE="https://github.com/google/gdata-python-client https://pypi.org/project/gdata/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-python_test() {
-	# run_service_tests.py requires interaction (and a valid Google account), so skip it.
-	"${PYTHON}" tests/run_data_tests.py -v || die "Test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( samples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/gdata/metadata.xml b/dev-python/gdata/metadata.xml
deleted file mode 100644
index 84c76180c346..000000000000
--- a/dev-python/gdata/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="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">google/gdata-python-client</remote-id>
-		<remote-id type="pypi">gdata</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/git-review/Manifest b/dev-python/git-review/Manifest
index eef977d47916..1077a350e556 100644
--- a/dev-python/git-review/Manifest
+++ b/dev-python/git-review/Manifest
@@ -1,7 +1,3 @@
-DIST git-review-1.26.0.tar.gz 56557 BLAKE2B c8af82d7cc222078c1ef470da0ffac7b698df91ed991ba43c8d34a64bbfa3996bdbe475d9965d6d1ef8cca84293613afb92ac6405c0397232e568d2ec2226202 SHA512 74b2366d7884963caaa9b4614301fad56b7997d1cb16ef333cd2dae5df5a5343e5b891fc089078856b57db0083584a8b4ceea98dd67c401651a100fc4fdf7d81
-DIST git-review-1.27.0.tar.gz 58471 BLAKE2B baace809949fb5bdb22c6cca251deca7a200b070573840f391ad24ad045276d376616c58355c5159086dc67b481686d6382c71604f2bdc8adf0b2799240a976d SHA512 e9fff7e54457b300c269378062e5bcce28511dfd6662035dc8d276e33e6a0f6b6c68bae98fb3a8a36e468f669c4eeb461e96cdf073a831c42156f8c0ef14fa0a
 DIST git-review-1.28.0.tar.gz 60496 BLAKE2B 19fa2b9a5e2f25d89cf123f277cb0213675e4b99b75a978ee49ee9a394c6f212d5bb58d5e5aee9cc3c20165e9872be159ec81dcf8ea37f509c96bbc79a84bcbd SHA512 c29ad530abcfcf136548daf4865e1fe7c5819f6d4b11424c5c1425312c68fdc0e4073e009667b992e3f3db3396c7db618940c7f6e5be8b26e9d0d1b94fd078a4
-EBUILD git-review-1.26.0.ebuild 646 BLAKE2B 2b1e8a28e847a2cb0a86f4e70be86851117cc7857de7776e9584221205d2235759d3ee4d98d88136c51711797e309dcc5a437b4c334ad97a7e37ecd410309acb SHA512 597e9511a005b0b063b6ed14df79b83a900a73afbdb1ed9ad135226d21a67f0fb9d00758831814d0323db97954f59dfb5af8324031a93773947e694bdeb474ad
-EBUILD git-review-1.27.0.ebuild 682 BLAKE2B 5f8a3883573e0268a409741e323bba59b0b0107d6a8ee179c529dee67eb1d2346c3387478c332964d025e5bae17e2a3f6c5fda447bdf34c66b184bfab3a59c5f SHA512 955dd19ee1cb5ac0ae2179117fd51b8f05a184bffb9adfa6d07ee09a12254373c4c028019b52dc781e584456df87fd0b5160ba097335f04e53febab16640b7ba
-EBUILD git-review-1.28.0.ebuild 632 BLAKE2B a5a71509d25bcc791abff303c2aab24b82251280fde25a6011429baeb85865979114ab2fc6d9f101f070ddc67b30a84229b792c50dabbf67e1e8ffaa03812c58 SHA512 c4b8c4481fc3007448fb633f4dc6addebc658443054d5a2df17ad75a595632d69b1ad4f7aca0d79724a96dcc9324db542085f5f40c7647601ed0d113270c7d88
+EBUILD git-review-1.28.0.ebuild 630 BLAKE2B 3aee6c93f165ad24b83208046f28b5e3d0a76e3ac55d24125d70ac1e1fff3464b36573b36ee28d523fff07d3989821cd5e6714b82baa585f192d3084a6327c23 SHA512 4a34750a650ca8fbb2de7334dd38290b7c82e3b760612a551de5083b740b75edfbcb85ac9e9d7240150f139d78be57c91f3f9dad1c9d8c77e91747566b57d70c
 MISC metadata.xml 337 BLAKE2B abf6866cf38fbd7925eabe5d6f2a4cd5887dc263d419cad65ca4105a20ee975ad41e1a661696520fe016318ce55651dc123ba7e6a735335a70d3aaa1b10f3320 SHA512 5bb1243f031097419ceadb6935e12567d359790e5fe63c19687f1cfe4a64f5dfa23b5704232d5777c6dddc1908b0856a780129dc08b787d786d2b867dc40ff46
diff --git a/dev-python/git-review/git-review-1.26.0.ebuild b/dev-python/git-review/git-review-1.26.0.ebuild
deleted file mode 100644
index a79a7b836832..000000000000
--- a/dev-python/git-review/git-review-1.26.0.ebuild
+++ /dev/null
@@ -1,29 +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="Tool to submit code to Gerrit"
-HOMEPAGE="https://git.openstack.org/cgit/openstack-infra/git-review"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^argparse/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/git-review/git-review-1.27.0.ebuild b/dev-python/git-review/git-review-1.27.0.ebuild
deleted file mode 100644
index b2af9dbd87b1..000000000000
--- a/dev-python/git-review/git-review-1.27.0.ebuild
+++ /dev/null
@@ -1,29 +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="Tool to submit code to Gerrit"
-HOMEPAGE="https://git.openstack.org/cgit/openstack-infra/git-review"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8.0[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^argparse/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/git-review/git-review-1.28.0.ebuild b/dev-python/git-review/git-review-1.28.0.ebuild
index b7d83dac0a48..3b45fb2c1cad 100644
--- a/dev-python/git-review/git-review-1.28.0.ebuild
+++ b/dev-python/git-review/git-review-1.28.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 ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index f902318d7507..d72cddff6002 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -6,4 +6,4 @@ EBUILD grpcio-testing-1.22.1.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f
 EBUILD grpcio-testing-1.23.0.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
 EBUILD grpcio-testing-1.24.3.ebuild 517 BLAKE2B 8145c6e4b4871de3de6efb0b8629922f57a7a1a3689079413c719db118e448c25b3fb5b4591231bf3283cc56dd3ba40af8dd6536f3b04bbd28266e34203be052 SHA512 fea58e40b0e5dc3901df37891b37a8f4445e33a9757bdabdcd00bc0b40f052668fb5438cc947585ae0ba234c2fd53c50fc2500c5ee2a4f8acfb4ae30ee21fdaa
 EBUILD grpcio-testing-1.26.0.ebuild 526 BLAKE2B 48a7270fa3f6e8fcf6498bb5f059da45d9bd1a413fef8c9ade410127464951c2d05e231c770117ef00fd3cf37a9c95da1bb4a867edee36bbe787194f6264ed1b SHA512 b7cd30215fa0d7cb66ddfc7cdb3b32f0dd5d2f0752c23d8d65108fd539da6c57d375f4c6d51be9aa5cee68d379d100ec41d24ecc0ef10bb6f0c6d5f2a620f905
-MISC metadata.xml 462 BLAKE2B 159e29c960dba2f197de7e1b8eda84162039ecdb35777aeb00314f8af9a7bc0771071e63a1528c922519568594f06971b228036914500d2ce3d33b411ddf0685 SHA512 8326b0e1b98c2921b461ad44663711318f2c48e4e411380de4b4bb26fca11d726d627fe47ccd0d1149348b55aa9391d97d144f654d016a1fccb34791f5850487
+MISC metadata.xml 377 BLAKE2B bd545cc0c7eca567c067fe1a6a77ab15026216bd2ac23a489b681d580395e1dd9669de6c0bc189a55e3e17da6fd3fbef4bcaa51e872e637a6135ea93e8b8eaad SHA512 bd18706bf10487e2771b213d706fda017282cc3b63ab60501b28b65012c77de4aae6e4199524aa97bbd7d34bd60211d974e1606b773de747497b3f4c0d52f50c
diff --git a/dev-python/grpcio-testing/metadata.xml b/dev-python/grpcio-testing/metadata.xml
index 42fc46aff1fe..d2dd3d255be5 100644
--- a/dev-python/grpcio-testing/metadata.xml
+++ b/dev-python/grpcio-testing/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
-		Testing utilities for gRPC Python
-	</longdescription>
 	<upstream>
 		<remote-id type="github">grpc/grpc</remote-id>
 		<remote-id type="pypi">grpcio-testing</remote-id>
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index c41fbbc81c88..5e29750f5c9b 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -6,4 +6,4 @@ EBUILD grpcio-tools-1.22.1.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b
 EBUILD grpcio-tools-1.23.0.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b2bd0af9612e5b365fd0d5cdbc57ee0cc33b0546c232047b885664903613b67608f19a4aa8d40308976edcacfc22060 SHA512 dd945d4e09b05f2524370b6275ff97dcc098306eee547921f6ba3b72b91fb06c4aa4c1ad44ffe74fd2692df37b949fada9770f0c79c15e9a19242387deb13194
 EBUILD grpcio-tools-1.24.3.ebuild 738 BLAKE2B e4ed1960883fd8765c313944bc5a8c484b2bd0af9612e5b365fd0d5cdbc57ee0cc33b0546c232047b885664903613b67608f19a4aa8d40308976edcacfc22060 SHA512 dd945d4e09b05f2524370b6275ff97dcc098306eee547921f6ba3b72b91fb06c4aa4c1ad44ffe74fd2692df37b949fada9770f0c79c15e9a19242387deb13194
 EBUILD grpcio-tools-1.26.0.ebuild 709 BLAKE2B 3f97d02b96c6a857ddd0c3892f66f93063646715c42c022f95aea0caebb901069268888ffb2839bef00743e7b72bb5c287e95210a79fd7ae0f8a97fe0fefaa8d SHA512 5e06dee6cb7b8afbc19fbd8c9a557555e2eaef4c0a1e30ab24c5e26f287fef14b5fea02db6c28c4328fe28331af6278fd253470d761c8d501236a20f13f18548
-MISC metadata.xml 476 BLAKE2B 62016e9a321f9c5b06d8a473d75b5efca8246df90ef9a67a33c02c416c58a8ee1be875cd54567d55bc9f10ef32082e11c01a9f1550293137aab8942e05dcf744 SHA512 cedbae8a8d9d7c6689c676c433aa6fea3c16d41911e0ee4a30929dbf2adb8ff72a2f0d81f996196a3b4090f8a5103a54eab4c651b359f9487d59955a6861152d
+MISC metadata.xml 375 BLAKE2B 5bc161c29339492932031484663b5af94d2cdc7ab17fd7125e1f06988b8870c6c513549341348d531b5858e32757e0edd7bc0e364abcbefc58658d7153b85f71 SHA512 42bcc2c018fc04fe3166ad61cc7e4392d95edfdcc802d88423a903033ea6bbd781dd0a6df2251c6aca41b38db1fc57554149b390ed34d1e70527ac467007961c
diff --git a/dev-python/grpcio-tools/metadata.xml b/dev-python/grpcio-tools/metadata.xml
index b140e0d02b97..28e96d6e9bf6 100644
--- a/dev-python/grpcio-tools/metadata.xml
+++ b/dev-python/grpcio-tools/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
-		High-performance RPC framework (python libraries)
-	</longdescription>
 	<upstream>
 		<remote-id type="github">grpc/grpc</remote-id>
 		<remote-id type="pypi">grpcio-tools</remote-id>
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index bf83f661583c..7f7e9fc32253 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -8,4 +8,4 @@ EBUILD grpcio-1.22.1.ebuild 1148 BLAKE2B a3e7fb7051f1661cb603f8ae4ebc8c0f349892a
 EBUILD grpcio-1.23.0.ebuild 1148 BLAKE2B a3e7fb7051f1661cb603f8ae4ebc8c0f349892a7082ca6d8511542de380074679b5adf0e200232a0b6e005336a18a8802f5c90949fe66123904b22ee2a5a3f87 SHA512 a4ef36ebe6774323c7aefe6cfd47efaf7df407be2d42fc6a3b19ca7a69463a4a2e0f3ffab539e509aec102680dfdf66edbd14304688a90966df66318ecac9ffd
 EBUILD grpcio-1.24.3.ebuild 1085 BLAKE2B 317e3df67c4d6472991aa3dc1521f0ed93b57f086debd2b60cee6f5a26c32e83fab89cc296cfeb5de186b0f0773d3b79da2d5e27a16c31f73efc202ad727bb2f SHA512 eb6e8f515098f8c8164fb1ac92ab8072d8e7c2bdfe58c25bfc999839c9ae3255aabac5b994f03d794303289be1a6b1f677702af38049841cf326ca0d37e5c906
 EBUILD grpcio-1.26.0-r1.ebuild 1148 BLAKE2B b250cdac59077308cad1df4c84b8c4a62725b77580727a68ded4b85428fee0925f1497563e5dbd7990895421c286fd5b7c5c3b6f998a84c842490f9e785304c2 SHA512 1ab5a00941b5c681691376e86e7ab120816e917747478e953a6aded66510026bbd0bc0909a7438b852c4eb700d48213d79f85cc0ce2521dc9af95acf894ef89e
-MISC metadata.xml 470 BLAKE2B ad01d702b7a0ffe570bd30f50d47bb4fed725fbdff6f838acc54ac767d0cee88bb28bb0642f804fb04858d36a63f8ff7e110e4ae1dd26b8eb539b0a5c77cf5d0 SHA512 bf26387089977138bcf6be78b469bb412988e96c6bf5b4a9897f452378ce71fab1012a7d9268fb55f2883bc9636b712b59abe5498ffdcf199417d97fb09cd90b
+MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/metadata.xml b/dev-python/grpcio/metadata.xml
index 011f4a88ece5..8ab14201ea33 100644
--- a/dev-python/grpcio/metadata.xml
+++ b/dev-python/grpcio/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
-		High-performance RPC framework (python libraries)
-	</longdescription>
 	<upstream>
 		<remote-id type="github">grpc/grpc</remote-id>
 		<remote-id type="pypi">grpcio</remote-id>
diff --git a/dev-python/hcloud-python/Manifest b/dev-python/hcloud-python/Manifest
index afd3fd1b9b7a..69423b91ab21 100644
--- a/dev-python/hcloud-python/Manifest
+++ b/dev-python/hcloud-python/Manifest
@@ -1,5 +1,5 @@
 DIST hcloud-python-1.6.1.tar.gz 71866 BLAKE2B 0a1d37d4dc8be4e28595385ec7622ec65367c40f9cdd455e03827a5ee2983f43026b1dbb7e9bd20d241ed9a4748015d33bdcb53b15ce148c401984960e158716 SHA512 0b2ecaa311b4dac44b3122a45a38f76f8377bc189b1550f21327ea3f56fefad624ea6809c4abd6bbaf5c8fc23dfa5e6edd352dcbbcfae6c87af897ff376ce2cf
 DIST hcloud-python-1.6.3.tar.gz 71575 BLAKE2B a6c969d713d1351bba0cebef8752abbbf0805b4a39eedc918767ccf60d590ac8259e1405a25c2c563923146d52ae1318d6362cbaee311bfe04bea5afcc18951b SHA512 dec3f16197de9f02c2707601e1cad40289d3ccbd6256887da50b84fb8fe6b0fb98f708c9ba0cfc2ff1308a53b9997cfda579df3ec79a1d28686a3c43f4124e74
 EBUILD hcloud-python-1.6.1.ebuild 917 BLAKE2B 0bd428fda988bff334f8b1c5f8b640e917177d88617e8e917ebd6ab5e8b7bb1397f547a44a8513216c12f23e1940c6ffbfaec554b3a5ca5385f8955851ba6078 SHA512 678a457dc582700d175fe6e469487151f2c9f3c847beea8e7748e4ff8b05e3a78c7ea5ef39eef4894cc80333bf74a668e0939e444ee72a7870ad87a66c2a108d
-EBUILD hcloud-python-1.6.3.ebuild 1029 BLAKE2B 9e50bd30c67891c3989ce21bd9b9b97fede164f241c6706e5c5a7e4903f2a9d851be317830a5699663e7fe8b9641dd7262b87b02400c800ccaabf9423c70e5db SHA512 a9269769845ab954fb71ebbbcfdeae89be78ef6570f47fd32b5d5752ccef5d1f186be7205a0b7bce42b4141721c6b0dcc52e2080556e49bdf807e96355a8b8c0
+EBUILD hcloud-python-1.6.3.ebuild 1028 BLAKE2B 6568a2dbd9928e71d4d92a1c15072b15fd77686b142aa0cc921755b604936c4f378d3feef37e0c2e6df7ea5ac196c7881cef73b3000d538fa236a474d98e699e SHA512 cb7879547643d1532988135b2c58f80bb99e6515c440ef6c8ff009d5505878890aaff48678c4bbc59c6b2226ddce0b474ebf2ac576c4cdcc37f63c41c1973e21
 MISC metadata.xml 246 BLAKE2B 5439993f129fd56fc43062bce991abdd20627118aa0e723a343c721cbc910de4f8b7b34b6f1587acfe0a60d488d4b1d093c69eb7d78f6accade89bced7d69b93 SHA512 482630597bd2d56c1eaed7099225b4475aec8768e20bad70ea9d6b96791fa38359ba572ab9ad0fc7ea72f1ab736ed1e92fc3c156c3427b008c7220285edce11c
diff --git a/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild b/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild
index e1e37a93f177..4ecd707cef68 100644
--- a/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild
+++ b/dev-python/hcloud-python/hcloud-python-1.6.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hetznercloud/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="doc examples"
 
 COMMON_DEPEND=">=dev-python/python-dateutil-2.7.5[${PYTHON_USEDEP}]
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 0c4989b29469..69706532d508 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -2,5 +2,5 @@ AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65
 DIST hpack-2.3.0.tar.gz 41610 BLAKE2B 65fe4f07f64dddff5b24b3a84f7e49de32e358fa59bb1b21e619135ef33d282d4cd24283e93c71bb71c89d7b5b2a3f8ed36f6d406751c54247472a75192bf50b SHA512 a3d13da105482bb258ee3a2314b2629215028777f84127f71359f08819c96af088a3952bb0a74435472035d10ee6e3943cdad689a28f04cbc12cddcc4af9a8a7
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
 EBUILD hpack-2.3.0-r1.ebuild 1056 BLAKE2B cbbf33ebfa283017e5fb49ffd4940c861236f6a2d0b072a2a3917bcc004be34a1207df3f06715f8de1ae2868007e66b44d001adc239a0f13a4256735c9c7dd48 SHA512 f237d70b4f76b67406c20f99bd90d912c9f6b1dffc06ab2ee062d864c34f8d612a0e4a88cafb889893338bb687b56667203725556d2d1ba6d09d61794cd9f3f4
-EBUILD hpack-3.0.0.ebuild 1146 BLAKE2B 77391c22c21c8d61c2366e25e7af95e5ae8134aa1f7a5ef1117453e4015cf76e984f322eff8edbbbb6885fe2f92194069942b6bec1f172ca1c7f0508d1a013ee SHA512 b054528a5fdb29417ac5cf785984dd6152f500d56de96b1101b8c3bd72c3a2f411266d498a7ef843d7814d883487daa9a7bf0aa73fa67489ce6f7fe9f0f6dd20
+EBUILD hpack-3.0.0.ebuild 1145 BLAKE2B 03060a2465c952d7878e686deb41e2245674a81c0f9c7b27807158dc1024762fa9ec2e09b0573b34a74afbb8fb753293c54771bdcba067de2701876517230108 SHA512 899cd640cfcef86140586c85a6e514c410556b5b0417558c5f109c73619c8958a817be807cfe06f5b1efd4acc2facc7d2ef2b49e3289f90661735886140c529a
 MISC metadata.xml 677 BLAKE2B 1440fcf100740188ffc8ae85da9bc014004feb2aa04d5f5db73546e62a01ffbe0975b9b588e6d579c45a2b1c803958999dbdd1cad8c1cbee597a3202556b7d4b SHA512 b7d64d3fa13e9e2f7a794aab733b511ec37809294b0c353d9cff55950dca47e57da8b5b5b80ffb0763f509a498816f94586c11dfdb569ecc6fa604f75c7a6132
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index e3fc99046c29..8f7ed209d65f 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index 28aab484ff85..dbfc6b053dd6 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -3,5 +3,5 @@ AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b
 DIST httpbin-0.4.1.tar.gz 88101 BLAKE2B 3df333ba92d50e065a598b2dc51ff3355eb94eb4b3a3094ba79cbe95fc11424e05f187e434ac299023dfbfd790b32db070a37e08a962ac19d803de4405603bb8 SHA512 feb519ee909c5115971f4bfd488ec0f9e987cd473464721f4e343e09b9d8fc592cf48b50ff3a2960bb67310521d865091cd766ed351ebfaa2dc8193115e9f052
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
 EBUILD httpbin-0.4.1.ebuild 886 BLAKE2B b9e4d3eecca2d304f859ea3dba91f8e57db42717d7d37299afe97c5e68dc41035a9c31f522d0d8bd88806eb2b31fd637b9860895dc6f49b6f4af46e4c8eb4465 SHA512 90000e61376c4d32b904a19148bf61a79cf7fad83ac1ab473f3fd0226ec3de4cd0e59970567e706a064ef7ad04cf990684110b6896bd27b0a2e1fd7a8ce57f25
-EBUILD httpbin-0.7.0.ebuild 1092 BLAKE2B 99475f6af0c31efc6351a5b5c9a95168c6299d63337a4974ee7343f7233a7a4bf323f3829a8ac7c8371c640cb293aaeb2862b371647e6a5115e89e2a98a50937 SHA512 6766175e6d7fa820568791f9ee6a13a85f693467238e826135ace4fde446be5c57bc07e45043623c96497da8882a6d4bdb887d4d11234fb3eaba7301da7b2a64
+EBUILD httpbin-0.7.0.ebuild 1101 BLAKE2B 969de0f63885980ab648a5feb95bebe9fdd175070f306cb279d57853987ba27fec9446fc26abf3aa26d98721913897b5ff63acf39a2189f71f5193bdf8d21942 SHA512 65f7adda211176319a2887f2907dfc313ce5cc185035932eabdbc4f0fe6941297f53df628742d694b029f3341318c3e62b377d0a9aa672e15e76cbc039ad2b3a
 MISC metadata.xml 500 BLAKE2B 1270abbd84e19a72d75a2955858c49c6b33a8c92da7f86fb7853fde55968a840d941fe9f7cd1ec2718e8cbcfede6166c412aac7fc40e483043330935720dd898 SHA512 014a5e115d2cd225618e78ddf226dfe4f8772815efc3e9ecf49883701127335d9cba5e216daaba3f15de2944074c0041e5fd6eaf26772f0892da891570f841e1
diff --git a/dev-python/httpbin/httpbin-0.7.0.ebuild b/dev-python/httpbin/httpbin-0.7.0.ebuild
index f511793822f4..c8ef4781394a 100644
--- a/dev-python/httpbin/httpbin-0.7.0.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/brotlipy[${PYTHON_USEDEP}]
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 4085c6236c09..3cf19af5cdd0 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,3 +1,5 @@
 DIST humanize-0.5.1.tar.gz 20507 BLAKE2B 55d7b598b32658b1d4c4741b37b5c33bdc9d63a5a779455e2fb93e1e4c3a0d8fd58e8522ef82734e1ba2b161fd881829373ba3569baffd9ea3271ad7ed3e7568 SHA512 dd7ad7f3c564cc6abcb6b128e50dbea7f19f7f418bfd936aae2472961c53ec71202133c5c2b5b930ef41ef807b51d6ba1210565627ed32c0b41acc0abd32a2d5
+DIST humanize-1.0.0.tar.gz 34411 BLAKE2B dc1d2f3c5db2ddbecccf7c1f9894a7fa7ddbb98a530e971ecc1de2b666a1b3a21e2770f25cefa37029d1d439d03e68bbb5a3496cc2fbd074b8bb427a09f52cf1 SHA512 2e012b7be88d0297301f25ecba7ba8083f5fc6384715a657c815373c6f2742f1429e62363e6e16f1bfc85c41b8ab8d4a361112045414e9aef038c12783df2592
 EBUILD humanize-0.5.1.ebuild 877 BLAKE2B 53fe455e34cd55b205a800b213325e0d49fc5a34def7492befa0c85494ce456f1fb9cbbb9266933d3c53e88f5cfe46df1b5782b6ff64d1f0f926e34dee79ff6d SHA512 c654f8f6343dc8f481adbe71aadc5daeb01f7375d3fe995f59b71989620cb4fea377f4f1c918bff6461b794f6216bdf224bb43d023c6ea46dc306e1c21d525bd
+EBUILD humanize-1.0.0.ebuild 833 BLAKE2B dd99619762c947dd512b59fc4c730820d719c1dfc24464219592cc4d6d33b5d24db8453c474dfd7f418e19dc69c6128b054100158de38ecfb5e7a5efe59c191e SHA512 71a6abd61cd200097bd3af715544055ee6a8be5f62c2d8dd72e48a0483cb8cbbdcddaf5f94e61c28ddf27ed1756e447287fb2fee46e89b2ff20b68873aeb3ad9
 MISC metadata.xml 436 BLAKE2B 79f8554b22e171509667145d3270ea7068ff215fc9d999f2cf654cf42948ba49f850efcdb19cb2a3fb41347612a4d3f178c529410b42238555b20b652b40900f SHA512 871a75a8295b80f9884f191f2264329be5a2975429e35b1ded2e085771284cfa76e230d2e7784a05524ec51cb809fde24e34d6caea45904f5fed3b388fe855a2
diff --git a/dev-python/humanize/humanize-1.0.0.ebuild b/dev-python/humanize/humanize-1.0.0.ebuild
new file mode 100644
index 000000000000..be43d73ef82d
--- /dev/null
+++ b/dev-python/humanize/humanize-1.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+# The package uses pkg_resources to determine its version
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="https://github.com/jmoiron/humanize/"
+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/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
+
+python_test() {
+	# The package uses pkg_resources to determine its version
+	distutils_install_for_testing
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 1a0cdda641ce..6e10f8d4006c 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -2,6 +2,6 @@ DIST hyper-h2-2.5.1.tar.gz 92713 BLAKE2B d00baea98dfab43c2d6157f4dec3b04b2a42d0a
 DIST hyper-h2-3.1.1.tar.gz 2202601 BLAKE2B 62a7a9ff4e1295d279fbe7c02da6d60d97984caf8f4eee6fa69de3974913caf57d7933a991825296e96b54b4646139793529e839e492d440874aa134cdb7e96e SHA512 153c450ef918cc7cdb5d8efe61692a646925e76e6255ef46f679091590681be7d1f9319b37f6521c56207cf35e7d9e56951e4e3b55a24fe89d9e6aa28591957b
 DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
 EBUILD hyper-h2-2.5.1.ebuild 956 BLAKE2B 8e610db8171bb7e44a747b8edf4496b9b1e12dac689e5b57ca35941c99948a0670812b6f111e7023e406b292d59549680295e90114436ca6b6f664373a73d687 SHA512 97fd55d847419e45e41e87883c10a293ee8aef5fff953eeca524524cf6fb9b2711f96defa5a27aaad45c22808d4d9d09a7b69f19e646bcc71746951b6c6cac43
-EBUILD hyper-h2-3.1.1.ebuild 1121 BLAKE2B 7ac6f4f888822841df0da53fdf00a5b37734c81e48775d9fdf2dac0e5dd830d347670ad4ed943b66884089424275f2380d50ae30f72dbe9743e924f883dad118 SHA512 215725ef8147ed65cc9b537d7c3dfec2388814f82ff656e9e1c5f7c1eb9abdbace12adfa9cf09f813628f0514290e7a1557ecec00f7c4f912040762287ac253a
+EBUILD hyper-h2-3.1.1.ebuild 1120 BLAKE2B a415d6a0029bd945ce83546a7875156d815b0dda2e5aeed742c99ea43633a2bce4d2bb1d206979b50e1d947e71e252b18d844e384a99a85accef7b37e37dc0f7 SHA512 c6c18fe0797623fc10181d1c16642b0235bd7f7eb4d30cde16ea03fc1dc24572931c1836f79b14d37fc7c556c8498f8520bf403e50469320b54b5465715d21df
 EBUILD hyper-h2-3.2.0.ebuild 1093 BLAKE2B e006dc8e6eba5a6f2097c55b89fa3f072bea63f137899561fd296dc0e3fe15f21e9e8ab04d77c5c8a4fe5c347ede2a88fd45d4c9e282a9c3922251adcb1f13f4 SHA512 8ee1d6bc5f9852cecebb310571dc4736c80d975f4d85dfbcbc1c18e61dc24050bdd1d465ad28aa9ce35e4c789bbad8f7113ef3de25c035007abd58bb7fcd1c67
 MISC metadata.xml 669 BLAKE2B fb8b8c6d1e8ae5cd8a0e6473c84a3d0e161f17ca671b24cdad86029af14936aab6cfaa9c119536980a69d96ce82fd296e407d8bc0d7eb2c5f1cebf37dd7a8f99 SHA512 ecf3d13974ec803b298d9be9898e5dd70c9bb2d9eb5f89ed37fd46e05f313ff3f8a4c6f01453dd92d7b5f74271516a2cb8d152cb9c1b2f26848b909525a038a2
diff --git a/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild b/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
index 1f8f456465da..eeda7a5f4bd2 100644
--- a/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hyperlink/Manifest b/dev-python/hyperlink/Manifest
index eafb9c195211..c3e90899fdea 100644
--- a/dev-python/hyperlink/Manifest
+++ b/dev-python/hyperlink/Manifest
@@ -1,9 +1,3 @@
-DIST hyperlink-17.1.1.tar.gz 23067 BLAKE2B 8bf1e61c6ba72c1cef4a9df62168b513004ae8ef2d4fcc13a1984bfdbf174c6175e2bcd241396c97d4e07dd06999718c217b27432fdf36d632b34c2b97bcb1b6 SHA512 13b20fd54c6bb5d7de3c9a04133fdd848413d1308d9944a2288c76d5f8b9bb0c54401ca5ed53460112209806407497526f2e68a92d119656eb58a9a618e9b708
-DIST hyperlink-17.3.1.tar.gz 91359 BLAKE2B 46ca9ddf54b8e5cd68cd5dd821b7a0ea2b218f0ba6d4072c7448433c6bf63891fb59999358c5efa605d21e28ab6e39a87cb84b1e3c8e2e8fce24892acf2eb679 SHA512 c0c9d99a530c938b1d1e97b8344c5a0fb18f894c8b0b294cc8ae6aa6a550a5a0272cc6be7a913d371f3ce3dd8695b7ed239999f3ae5e8ce97e3693625ae761bb
-DIST hyperlink-18.0.0.tar.gz 97625 BLAKE2B d189445c7375657614c38db9045d96789b78a2d4ebe67e23b897a450588fbe1e3916707bb67916eb893e93a716125e606ff8be27e63f3db4e63b8bda1436fa59 SHA512 21b5f88f7aaa3f2b0b60566fdb0fefdf6d42866060606dac181c8e3d357c76a5c23fa5dc982812af2b7d49dc1f9d623bd5bea89bf2cf31916c855bc4ae85589d
 DIST hyperlink-19.0.0.tar.gz 99099 BLAKE2B 1213bbc404ebf04f178e3f8b986c343f64cd6a75202942d1cfaeab640d1523388beaafcd2662f414c9fb1eb87f746f3edeb5b5e395b9fc0acb7e82697f45f7a2 SHA512 5d5723bc0bd0c381edd3a9ef7bab3ba9ad4252027d5a4afa61e6cfff3e5b8457994b6dd36ecc356e638d41f797fe3367a3010249e0e77bee6e9e94336c1e7c2e
-EBUILD hyperlink-17.1.1.ebuild 769 BLAKE2B a1a61d231ccb02401e9e2db253891a197b22d3e8f182a256f0165a334efbb55d3b5728ce22c83d2088cfd9ce09065436b5ae610727378ba15a5ef2452182eab8 SHA512 a11fb6db5d646596d2db2788f77d745940998f6569d5ac246833516009f365d8d813c99f9ff9108cc77333ec29f7e1e4bfb98160986ae08ff341ecb48214778c
-EBUILD hyperlink-17.3.1.ebuild 781 BLAKE2B 00846f0737f4d76ae24aa3ea81131ade562882dde900b586515a4b6cd5f0bda33f78cdacacc48b1e1dff59e4168c7e5b8dd704fd557a1583a9eef66e0adbeb10 SHA512 e1d25eb551e8e615a518120ec69078ff7efa761c48d5266eea8913c511dc0fec0fb1e04149d544b540de3e6b19568d1ac93a54368caee6b769cc2737cad69ced
-EBUILD hyperlink-18.0.0.ebuild 746 BLAKE2B 9529dadaa95509ad3b3ed99358d1d2fec0b86c0211e8fed1f50da9c250e30e9a9835d652ce58d21c4a9dbd22bf11b9b9646291ea011f4249691df6889a1f573e SHA512 ad3494e61a2a545a98df57f2a894cbafa6c3d898d967f37ce748097ce6e075268ca551c18fb913e87ca486317a116278772f98a8ec846eec36bdb2b3c101a601
-EBUILD hyperlink-19.0.0.ebuild 633 BLAKE2B 209e5772e80acd1e06480886c603b7d09c30b634c330cb1435331ce685eb8ad216eab2742f31d079dc8312abe1274ee68ed19db4a1720d6618254fd5efbb5c56 SHA512 809642010890977d9d2b5f95f9b22cee5ed79f8e71d9da56f449da8f252ccb3e7af7a779ba02189f1310867ed03b6e0b8b1a66810207f04f9e5fb5afbb02662b
+EBUILD hyperlink-19.0.0.ebuild 631 BLAKE2B 221d63422441077b9a3f0519daad279bb79cfadf40d5a687d57639df4c43a6f322d1160f0ea872fe38135c1a8e63322e1661db30ad040f69190a01bb65f741fa SHA512 a09b40434fe107dc1434d8c41b158d9b3e2db4ed1c3d221a72ada65c65b903215c046ae703af6b2f46a6b6ae30d87120e4ceedb2253836f6c79a3be78a4806f9
 MISC metadata.xml 673 BLAKE2B 054899b405550c1b1e891ad235cf2dd553275aa2d791c874073c83510123d4c995656d9777b022211369b705b3c068fa48abf2b6f3f63e5a78bd0a77fa367248 SHA512 4ddbf3e9d95f7699b5099d8c296aa3a777d9685e93e7f84734773c49d2a9174055cbed229cc0a1ddd2e10e3f414a6c93dd08eb3bfbc0717a4bf828ccf350060d
diff --git a/dev-python/hyperlink/hyperlink-17.1.1.ebuild b/dev-python/hyperlink/hyperlink-17.1.1.ebuild
deleted file mode 100644
index c371206436b3..000000000000
--- a/dev-python/hyperlink/hyperlink-17.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=( python2_7 python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="A featureful, correct URL for Python"
-HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
-		py.test -v || die
-	cd test
-}
diff --git a/dev-python/hyperlink/hyperlink-17.3.1.ebuild b/dev-python/hyperlink/hyperlink-17.3.1.ebuild
deleted file mode 100644
index b0caf3c58097..000000000000
--- a/dev-python/hyperlink/hyperlink-17.3.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=( python2_7 python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="A featureful, correct URL for Python"
-HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.3.0[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	PYTHONPATH="${S}/test:${BUILD_DIR}/lib" \
-		py.test -v || die
-	cd test
-}
diff --git a/dev-python/hyperlink/hyperlink-18.0.0.ebuild b/dev-python/hyperlink/hyperlink-18.0.0.ebuild
deleted file mode 100644
index b1035c424b39..000000000000
--- a/dev-python/hyperlink/hyperlink-18.0.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=( python2_7 python3_{6,7})
-
-inherit distutils-r1
-
-DESCRIPTION="A featureful, correct URL for Python"
-HOMEPAGE="https://github.com/python-hyper/hyperlink https://pypi.org/project/hyperlink/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/idna[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest -vv || die
-}
diff --git a/dev-python/hyperlink/hyperlink-19.0.0.ebuild b/dev-python/hyperlink/hyperlink-19.0.0.ebuild
index 2e2723e063c8..f5f16f10df8b 100644
--- a/dev-python/hyperlink/hyperlink-19.0.0.ebuild
+++ b/dev-python/hyperlink/hyperlink-19.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 8b8570b3ef7c..53234aa29844 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -5,11 +5,13 @@ DIST hypothesis-python-5.4.1.tar.gz 8993002 BLAKE2B b96f9080f7a5b307698ee1119495
 DIST hypothesis-python-5.5.0.tar.gz 8996266 BLAKE2B c9eebe4bf1df5cbf7a40dabeecc9991e71ceda4c2084a1b045f77a2455d5581d055e55b22dde48d627eb3cd3b111bdb06b14ada2f31dccd201390430a4a38c15 SHA512 302211f91be253e15bb84c81e80e72c6de41c3a640569363aeac27b2650e569275f9614a678beb9e03f1e97090de4eab7954bc39b55a4324be0ef0b45daf5228
 DIST hypothesis-python-5.5.1.tar.gz 8996186 BLAKE2B 0e1e013b0339e504603b583882f6d05efa96e5b97b02967c49001c329923df7b2b2666a5351f223ab991cc86f6b0b7ae91c3f6e34c1e089a9f06a271dc7b887f SHA512 4129d85a0e4d2614cd2d8d018043b6346d59f973cce79cdbab2d8688d1c18e9dd0b9044515d715c80e03812020f134a8897931a9942eaad181567750a7cee049
 DIST hypothesis-python-5.5.2.tar.gz 8996253 BLAKE2B eccdbae595e3242b6e0f8d5b363aa4b23f279959bf87e801885be2f072ea8cafa39ec1122695f26a333ee99a191cf17342d95b74a4d216e06fecda53ab47d96f SHA512 e2be0bfd07e0e192e104b827616f822c1a4e87f7691a6b754a623d8ec268851f769ff9a0bf64c424cf583b5d87e4040df92ec203eac1b41034b4d24d5ea1d1d2
+DIST hypothesis-python-5.5.4.tar.gz 8997160 BLAKE2B ef85a521a9572afd4fa3d682722bddca04f6e5a5cb4283e05099148b374a635e1ad67d4b72b8baf752d33d4b9967464d28c5e293113af1a2218928352ffb2e15 SHA512 fa1946722a8fa3bb90ec0fa0786b03da11514779d5598d549c98a17217ce6e848603904de06b5f8a24321adbfa7b3c6e0d79e63d158c633619572623243deb13
 EBUILD hypothesis-4.47.5.ebuild 1715 BLAKE2B e11813476869c123bce76c05955412b1f6697df88060b5e9bdb205b4bca60c9042194210106b6ecb80e5465cd098821189f1dbe2c1f31d4336e7d0b2bb58abfd SHA512 54049e33fb298392b89c992bf3c73cb928716076060f4fa7b65ab8680e52dbae16ead0affdd5ccdd03550259faf5629d43b30d57a944cabeebd9751e8be41b16
-EBUILD hypothesis-4.50.8.ebuild 1716 BLAKE2B 633d6c449f59a01891ab387f2ce6a31db64b51eb43995e7cf2a807abb41a8136d8261de8ba4c41b74b14d5e5b23394ea0d733a22692f06dffa0ab3826ba5c614 SHA512 303966a8b4c0751b3785d53b88732599cc61dc6b762293c472bb18c81da03bdcab883301cf0d24040991738d9ae720d0f8becf1972e29feb8f3434e7efd382dd
-EBUILD hypothesis-4.57.1.ebuild 1714 BLAKE2B 07b5453f2f310e8c25684e95e6b47dd4b7065de5a2f08b8869d2559adb6f933dec37d2b529c0d1ae53af37cd7fd940111488dd335ea7ee8a77da048e2f096b2d SHA512 2424cfe7fc424e1a9de603e8dd4a3dd61a542e43675d2210803b39843d48033a854d0e0c2bd35bbbe9e9963b168134c554a0dfcd1239919c3244becb0fb6e72c
+EBUILD hypothesis-4.50.8.ebuild 1715 BLAKE2B 387f9fab7204c001d1b49802fd62baa54887b2e46221aac67997e89529496cd865476cf5b07beaa1271499fd38733666f162281132cd746e8665936afe8b30f4 SHA512 f3f7cc13983277dd30eccfe800bc9965a4795334f9032133a21f0b8ed164b212390e655188e889a4759d83785c1cc75454d98e7b7c5b2cf5bbb22faba901d53e
+EBUILD hypothesis-4.57.1.ebuild 1720 BLAKE2B 4ec5b05efb157d2b67992bffbe77b749f0a5602046e9b977d467e54110aa2002a5a4928cb0653038561d7c8c114c6af0a232e9ce6ee311db5e3edec2e13e3008 SHA512 f3b9fcb15b31173aa9ad7975088211a76a4f6e759f2ba185237c20dccbb5e2a4024c99e5ca2fd8f62aec11579d6d530f273bb93405b1ba2d3eb49b33e01e5e03
 EBUILD hypothesis-5.4.1.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
 EBUILD hypothesis-5.5.0.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
 EBUILD hypothesis-5.5.1.ebuild 1572 BLAKE2B ddd7da2122ffc5ee7f060e4be9b55a44f01057c91728555bf2b826c76eddf58f701c73332f805a649441a97a23152220e1dbafc9454f5d489813c4396082cfba SHA512 8905352d77dfe2b72ee1eede9eed0ff35f8889a660cae61e4dcd7a3c51404b28f582304ccbe2385612d8438db45566a7754bdd7339801e39be54b324a53a321f
-EBUILD hypothesis-5.5.2.ebuild 1555 BLAKE2B 0ed364bbc68fc33d23b0794b48e63dd843b1ee00bbe4e85aa1f3f6d8610fe7e190424ad65ec5f66509b69c3c9fd12c8b7ad61b5b273354744d67b2108aa27858 SHA512 5547cb6dc751ee9247d8780b11801632ce901c05b43b2b7b608d5477af1f4e2371f7230b618c95fa2586de629470b7125ca2237592ce959514ecb3f5b69ba2de
+EBUILD hypothesis-5.5.2.ebuild 1561 BLAKE2B 015f88b2a8c8dff1d3c7e44f097226169c0554c3b92a9cd455cee10f80fd5eb88cfd78773ad7306d773b70bd16509024e239a1b2ea6a929d87193d7ea9e14f99 SHA512 edeecd45db368ba6440f268754e09588213e5fcf4c35b334766f1550653dad4aef677830d5c96cc6b66604b763a60acb6cd3c8c6ffc29441a7b8f3f2f589d196
+EBUILD hypothesis-5.5.4.ebuild 1555 BLAKE2B 0ed364bbc68fc33d23b0794b48e63dd843b1ee00bbe4e85aa1f3f6d8610fe7e190424ad65ec5f66509b69c3c9fd12c8b7ad61b5b273354744d67b2108aa27858 SHA512 5547cb6dc751ee9247d8780b11801632ce901c05b43b2b7b608d5477af1f4e2371f7230b618c95fa2586de629470b7125ca2237592ce959514ecb3f5b69ba2de
 MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/hypothesis-4.50.8.ebuild b/dev-python/hypothesis/hypothesis-4.50.8.ebuild
index 9ef46441156d..0b29ec276321 100644
--- a/dev-python/hypothesis/hypothesis-4.50.8.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.50.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-4.57.1.ebuild b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
index 81d602fd53c0..96f887e12f16 100644
--- a/dev-python/hypothesis/hypothesis-4.57.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-4.57.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.5.2.ebuild b/dev-python/hypothesis/hypothesis-5.5.2.ebuild
index a0f000b29f96..b3200160cc3e 100644
--- a/dev-python/hypothesis/hypothesis-5.5.2.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.5.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.5.4.ebuild b/dev-python/hypothesis/hypothesis-5.5.4.ebuild
new file mode 100644
index 000000000000..a0f000b29f96
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.5.4.ebuild
@@ -0,0 +1,56 @@
+# 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_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils
+
+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 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+src_prepare() {
+	# avoid pytest-xdist dep for one test
+	sed -i -e 's:test_prints_statistics_given_option_under_xdist:_&:' \
+		tests/pytest/test_statistics.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality ||
+		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/imapclient/Manifest b/dev-python/imapclient/Manifest
index a2a0f9577db3..200f98e25a70 100644
--- a/dev-python/imapclient/Manifest
+++ b/dev-python/imapclient/Manifest
@@ -3,5 +3,5 @@ AUX imapclient-2.1.0-py36-tests.patch 1224 BLAKE2B f3a9a7257f8eed538d9c030e1c868
 DIST IMAPClient-0.13.tar.gz 102427 BLAKE2B f087b6e89c45810f359bed889345e6748ebf9ae90f6e3c4e013097a4e57d3f5ab0ec21906cfdccc03a344d92ccc442d58e38e687cd0761d86956047e89fedb03 SHA512 daebaf7f4180b6c9c6f4a486b313abfdd06f3ed8ece18a19bf46a50e56c2094e85de8a8e4efb8850566378eba016c10816611d03852caf637ee1d43f3c8a418f
 DIST imapclient-2.1.0.tar.gz 85925 BLAKE2B 9725be7988c4bec105fda73389241e39e6c006bccd8130125b280041d13becd6a71a1832763171daf25dfb4e7b4a7fc86c0a3afa93216c3dc4370b19348c0a5e SHA512 57e5824504f2667cf41ac4983130e16a5ea73ea37f29cdb16295eb725b56eda55db26a12e380acb579ef6b8540d38ae6badac5dd5b644d4419cbe9151f634e70
 EBUILD imapclient-0.13.ebuild 1602 BLAKE2B c42b001329983cabfdd92998fea541b5ae79616db4bb5f2cb5f6c15c1fde71d05a6f56d37059efd105667812341fe88fb576e1080a3fd869430a867e279226c0 SHA512 81363697a5d4c46921214c4ff76dc2c30fb05978185cfacc531b4d08dca7fa559ee905495290b68687701e89bc8478691193b0601b3d0a7799354d14b0d94a10
-EBUILD imapclient-2.1.0.ebuild 1020 BLAKE2B f501b0e3f2d7276f7595e2ad14440d396e1563b9f2ee409c0786bba754f958eef04e1aa9b639fa0000562620432de11e2587dd6ec2b8891adaf6fd3f9cf5e02e SHA512 2b536f7c46131b63f91679b4f46ae010eccd3c6bb27521f7f8115b804162542f3ca6bbe5b83e23586682be1731f790d133a33b6d66dd4bfac27ee4c4266b95f1
+EBUILD imapclient-2.1.0.ebuild 1019 BLAKE2B 9279862a514848b95b111d364fffdb5da6380553e3e6f2910172717ae23f28733e43d32b073dbe439e7fe8191b62b0718165de02d5dab9b1805c88b6678f0d38 SHA512 3feebf090f839431ad24d1a4d26147432d5e500cf30e231dc168d98a1567436e36b80b9923b19cd17322a626378ec02a2767d24e8827267f157c205d3ae4d11e
 MISC metadata.xml 313 BLAKE2B 89d6cfc58f1d5e5e5e0737bf8fafc74e26800234041390fdc259aaf4a49b9c8aacbf9c5c2c55e8ddac4b5010dd70a2ca349f41ee15a0812335522354381bd151 SHA512 b8b32e8bfcf59a3f7134ca2f562365c02e590a2d6e8e5eae9c6d3dbe2d4918b973b614aa38650cc67a5c34167b6293f4dede92e53f635f079a050bb26289d48b
diff --git a/dev-python/imapclient/imapclient-2.1.0.ebuild b/dev-python/imapclient/imapclient-2.1.0.ebuild
index f0f2091172d7..993fad2fe0d5 100644
--- a/dev-python/imapclient/imapclient-2.1.0.ebuild
+++ b/dev-python/imapclient/imapclient-2.1.0.ebuild
@@ -27,7 +27,7 @@ PATCHES=(
 	"${FILESDIR}"/imapclient-2.1.0-py36-tests.patch
 )
 
-python_compile_all () {
+python_compile_all() {
 	use doc && esetup.py build_sphinx
 }
 
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 03139da9d2d6..38fc96ce5778 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -3,6 +3,6 @@ DIST importlib_metadata-0.23.tar.gz 25172 BLAKE2B 8b88081971c658a01fd1c47cc664e5
 DIST importlib_metadata-1.4.0.tar.gz 26380 BLAKE2B b185183b5a71b822f068856a4b1af3fc833a0cfcad65e522d3034022c20ab382a02b232cf3b365bfadc971d4a150b93d7e3b0ada7645dd33f201ffec976117fa SHA512 859faa1ef9cecd6b2ae88fff9d90d72e54e6f0ce3025b09e8a22d8f2b0d7c204c4041aa6a1f35ce79751b04ae482e406d2157f9296d4f8b579b5b29591b39089
 DIST importlib_metadata-1.5.0.tar.gz 26738 BLAKE2B b2ccc2244a2b9e0d384a22e0805d2a9931a3412afba98246692bc7a10684c9e1cc8435529461d45cd6d0b75c81a75c028b9269860d5de6cd376c70ad30700eed SHA512 074bc38df2a1b20dac62d88e209b2730cc56f8a8bb7f7b99bf766028f602700733448e7cb4d22ea099be38cfc9484ff6a235a46c6c114c3d70883393eeef3aa0
 EBUILD importlib_metadata-0.23-r1.ebuild 1407 BLAKE2B 2e4d29c2677331817023b7258a4a741019ad14c2fd2b81f2b4ea93ddf25d99a5e0f543c65663ed5929b84200897a64b58e0fad46c625984d4fdac0f561127323 SHA512 c24af8a052681a6c454db5dd6678945d2985966b45297de7b012f733ed79b5c29c8b209f767c3dbe8232021b34a6669222d741072fc9440e0ff71f10823db5dd
-EBUILD importlib_metadata-1.4.0.ebuild 1072 BLAKE2B 5ab171869b16eda2d900a318a69655decb5cb2fdfb2b8f14937a1b04f28916b1022cd7d86b18667a26daacc94827a792784f5367dfc89a1503a77fe3adbfc362 SHA512 312a6e2d4cd07b769734f7472bfb403f7a42e7a887dff7a550cf9d07ccfaca31b7250f0d21fe36aa409b4fd69ff06a792f37f133e38173a4311ad3b1af1c055e
-EBUILD importlib_metadata-1.5.0.ebuild 1075 BLAKE2B d017de3a23e4de0914087de4236b802b2663f3491a85089149c66060c06c001f09fb8f895b059087764668115f3aa6a3f67bda840ef0b363262ebe5e2c2f8afc SHA512 f591365f6f2a2653e9c5c0f983108446a0c15e31a278d16703c168227a928d6cac04eeb8747c16548c727ea6983ffe86f030a223133bdb8fe1488ebc33b158c8
+EBUILD importlib_metadata-1.4.0.ebuild 1071 BLAKE2B ca6816dbce60b0b05775d0867a555ecb8b333de092813b4867771f12a0e9285e74531b77ede3fca7092357a86093c4fb0163c8756c9eb38e53db5a3569a1ca13 SHA512 3f7889058c964331779c610e48ac625e6d2db0cec912cb54701f32f473eb61e8d88e9b6e1cc30eae5948ac2c7d2b5d8005f6c289a7c5567f295a9343e399d58d
+EBUILD importlib_metadata-1.5.0.ebuild 1081 BLAKE2B 921e68237aa4f21a4667c33232c84dce7d3ad0e0cae4788eef174d8bede33c646c05a333532344c1eebdae698b48a83d3c71c694f2a495ccedfcdce13304635b SHA512 d7d5ada1878b1b63508042f1a26cb4decf5c875677bd4d63673bd788e947051e62e32e83a786bd6a7132495eb2e3fa015e9ba70faa527ea9e5c5efe83bca04cc
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
index f5089be4b057..15496a4144de 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.4.0.ebuild
@@ -13,7 +13,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 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
index 98c15a5ee877..242a727f4b2d 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.5.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 
 RDEPEND="
 	dev-python/zipp[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 2d4b7fb84952..12b014100d6c 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,4 +1,5 @@
 AUX importlib_resources-1.0.2-skip-wheel.patch 305 BLAKE2B 741e9825c64a88696603d31d9b749fcd3756bcb44755730b12d22afddf911d178365904885d2323aa5b331f44f20b6e3306ad03adb60794c6c83cd1b0795c902 SHA512 6e3f90b1544c6de97768aaae708d1bc93494dcdf1cf10d59e48b55406c9a6c9bc9eb5f5c0d034bcff99eae5274c1f1a467a9bd2a4292f0eadf0686286b879f77
 DIST importlib_resources-1.0.2.tar.gz 23602 BLAKE2B 24c27b45ec56d3838b039baf2ebc1e0c5ec582d5cfdeb5cf26587255bf8b32aa1fcf43802cabca3b82b3ddec8cdf2616d10489c3c1aca77c9fa91af1f25ef9e7 SHA512 50bfc5130a2c9c9354efef1cd7132e805ed0f13467ba67172f83e11d907212bef3957aeef51fd904b73996c8280008d99c918637956a470448dfd67ef4807f82
 EBUILD importlib_resources-1.0.2-r1.ebuild 1254 BLAKE2B 295ecf68ea748305ab37ec0b1aa5703ebc9c62728b6a6053cf82561b44d09574d7e5c257b134fa33c7ce950a9f2b83a99bb0c6f21cc56396c97d1f1c8c085c47 SHA512 98e853072c15ebe11dd3091cc6d5a980b35e72b08e4a3330ddc2ecb718493fe87a3f9b9dc879b4bf391b64e53dbebb367ede494b27ede0abe4c5b018f63d4694
+EBUILD importlib_resources-1.0.2-r2.ebuild 1039 BLAKE2B 3419970975065c65ad0f1eeadbdb0eebaf74528391fca9958ed9d4cf7fb3de406b2a74b3a28d8a0e9c4cc4eba7c4d4a59bae2e4ee1ead8b21461f95d1a0bfc0c SHA512 91a66ea5b7046bcf65769e0c4a59ac1895be23d2073a0601c5583e7200c36b1fc0d3493c96e49ee0addd82ec4d24590168cbbd2cbac58924a0a09fd116aa531d
 MISC metadata.xml 1121 BLAKE2B 51c2d6c7fbdd7da49d9eb489e8268cb7d5ac85c0ed2505784b377cafed49c29fbc895ae5aa831418175f6f826822a92b6491fc82cbffea428a33b9cba76d0408 SHA512 99fd2fc5abc3deafdfc7eab5e159c80836c3b58ddab63e9bf74f102ca917567be0c5068870206410e82937cdb05d68cb9964402bae9291bc3028417cd316f8cf
diff --git a/dev-python/importlib_resources/importlib_resources-1.0.2-r2.ebuild b/dev-python/importlib_resources/importlib_resources-1.0.2-r2.ebuild
new file mode 100644
index 000000000000..d179907d9e97
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-1.0.2-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.7's importlib.resources
+PYTHON_COMPAT=( pypy3 python{2_7,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://importlib-resources.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+	virtual/python-typing[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx importlib_resources/docs
+
+# https://gitlab.com/python-devs/importlib_resources/issues/71
+PATCHES=( "${FILESDIR}/${P}-skip-wheel.patch" )
+
+python_compile() {
+	distutils-r1_python_compile
+	if ! python_is_python3; then
+		rm "${BUILD_DIR}/lib/importlib_resources/_py3.py" || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/indexed_gzip/Manifest b/dev-python/indexed_gzip/Manifest
index 4323ec3e99d2..92b079a3f603 100644
--- a/dev-python/indexed_gzip/Manifest
+++ b/dev-python/indexed_gzip/Manifest
@@ -1,3 +1,5 @@
+DIST indexed_gzip-0.8.10.tar.gz 79133 BLAKE2B ebb5bc69d92b627b0546c8570ea533a7d6541cffbda6ddbf38d2712e5d7b13f5684a4d962b457cb0beaf8f6d9d6c5bd810c31af18396d7ce2a7d3f9ce0a039d6 SHA512 cd57a0442e95a4760d710227a5d9f69841bef851427c536e5cfde7c9f962c9d403e0b38341ba2e07c5cde668e0f26ff7848d154f6243a2cee1cf6c327a7f4e1e
 DIST indexed_gzip-0.8.7.tar.gz 77640 BLAKE2B ff35693204a41df439b835f232b4e0ad5ceab19532a7f1f4a4aba5cfd810f447ea56c0f6cc0c5600f32317c5a4f4283a3dd5bc791dc9aec5742303728e76ecc2 SHA512 90872898b69269f42d28f61f7840879c1942060da923e8d5480c4f99feb160c1b03412378b1dda3cdf94f64434d81e4cdc524e19c268797f11444362149d0e18
+EBUILD indexed_gzip-0.8.10.ebuild 850 BLAKE2B a6dc1fa7549b8760810478d581442e2d4c107e30d9e7264828148ec5c2cb337e2aac170a884efdb8233e09a8448ed7f09634a2fddd20a70042ac07d0d78e9eca SHA512 e3e08aedc4a483d29d1088f53ac90c906515cbef299f28f7f68e5c2582215f2455522b5e142250ed76da8cb11fb96e65690cba55fae62b9bdf5147811bcb2f27
 EBUILD indexed_gzip-0.8.7.ebuild 850 BLAKE2B a6dc1fa7549b8760810478d581442e2d4c107e30d9e7264828148ec5c2cb337e2aac170a884efdb8233e09a8448ed7f09634a2fddd20a70042ac07d0d78e9eca SHA512 e3e08aedc4a483d29d1088f53ac90c906515cbef299f28f7f68e5c2582215f2455522b5e142250ed76da8cb11fb96e65690cba55fae62b9bdf5147811bcb2f27
-MISC metadata.xml 902 BLAKE2B 8d1c493782d05a3c3626279266a44b0d0954977dccbd9d0a87e2f1e744dd6b87c21a8d61d4967da6ec278d09b87c5939b7997ab1138346e63616aa65de6c9b4e SHA512 c6bc3e97af583690a86620ed44925827d3320bd295018c44c7dd057848c6c9833906ac35e99404032377b8f6584b2bce92deb1465dec9e0f7daa21f66c52120b
+MISC metadata.xml 901 BLAKE2B 4d4d010ea7ce0dac74b8fb1d4b77839dcbfc3869fc4add48b9e480c551d1c8ffb1f1912ce2d9bb307823f17a14bf428ddb04a470fa1cbd1070dc2dde2461bc9a SHA512 2745a6eb598c27866d591f99992af9417d63a41e2bbfa01c5b629182d48dba4328b2588618b100c73550ffaad34426fbafc76adad8cf7bb511841d5cd348b8de
diff --git a/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild b/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild
new file mode 100644
index 000000000000..e18054409874
--- /dev/null
+++ b/dev-python/indexed_gzip/indexed_gzip-0.8.10.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Fast random access of gzip files in Python"
+HOMEPAGE="https://github.com/pauldmccarthy/indexed_gzip"
+SRC_URI="https://github.com/pauldmccarthy/indexed_gzip/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+	"
+RDEPEND=""
+
+src_compile() {
+	if use test; then
+		export INDEXED_GZIP_TESTING=1
+	fi
+	distutils-r1_src_compile
+}
+
+python_test() {
+	cp conftest.py "${BUILD_DIR}" || die
+	cd "${BUILD_DIR}" || die
+	pytest -vv --nelems 500000 --niters 250 || die
+}
diff --git a/dev-python/indexed_gzip/metadata.xml b/dev-python/indexed_gzip/metadata.xml
index 11c36e8de929..d4003909bf2c 100644
--- a/dev-python/indexed_gzip/metadata.xml
+++ b/dev-python/indexed_gzip/metadata.xml
@@ -18,6 +18,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="github">pauldmccarthy/indexed_gzip</remote-id>
-		<remote-id type="pypi">indexed-gzip"</remote-id>
+		<remote-id type="pypi">indexed-gzip</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 76581d4a7b38..172d45fd1c98 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,7 +1,9 @@
 DIST inflect-0.2.5.tar.gz 109756 BLAKE2B ecb64b0fea04602f112dfba11ade6828eae7a7f3f44d4c4fb15c2300ac18025ea4c51f9c36aae5e7e92bd09e24d08091ce096b888a520fd2d4c40374356333d5 SHA512 68371158ac90d9662c19657cbf697f44ee9ceac090286d53e29ee04252efbb7d0bfbd99ae6847e6eec1991ef4ef670eff60693d1f0a301885bab2a09c7ce4616
 DIST inflect-3.0.2.tar.gz 71546 BLAKE2B 951eb818ba1645a9e426468811ad449378aa5a7341575ac2aff5e9d1e06237fe8e96fa64cd678665cd6c05e1dc5e477a65b261b9d8bd170be4fb923d5fb90e9c SHA512 5858548e947f742b91630fc584f568a2221057ada7cd4a55f39de1b52a82c97884d6a78c2f32e5995e354fd1c4eae4d5b3d30491ef57dd5187fd6baca93d2779
 DIST inflect-4.0.0.tar.gz 71091 BLAKE2B 597db3d84cce1660ea92b84af5d07d77f537b2d738caedbe132ed9cb074a3c80c2f9e1cab321f0e231b2a29803f3b25206f27b78672c4917873007f3a56f1a8a SHA512 7d9ef9389b9301e596165fcb1774467ddeb421636094a0f0cebbcaa11558b4529ccb90644e1097f91cff3316911c98f4bb1df92180193a5313ca7da91a282e5c
+DIST inflect-4.1.0.tar.gz 72200 BLAKE2B c15f6b0d5d93050283dfc4d691e9fdbc26bb2f71573d6b397834e87af62f3afb8f5cdb0448c531de37e84729c0c6ae0cf4ea7a7b081a9dd784f7c06b962d7def SHA512 9a2ba4777f01475390976f3ac28f046d39d1f86cfdafd161cc7c8d33526aca35d44e6598ccf2a0b68d3511a64b67ed0991b51c78bda8f279cd706fd29a3fa514
 EBUILD inflect-0.2.5.ebuild 575 BLAKE2B 3b08519374ff99105001452bb98e23afee63434803d8f789913ab3a9099911c5d10ddf0981ccd926d084ccf686a6fc11db14544855c0ba13c55a624d4c196d6b SHA512 c45ec21562859554af7aca682f34e6f09b2a5b2fd8fdd22bb1dbfa2266f9ee8dacbb182b368f0395fe584d7d2cce2868a0f9a76b6e765ec8618692a077add8cc
 EBUILD inflect-3.0.2.ebuild 1222 BLAKE2B 075da95d632a0e250a9bc9654851417ea25237e8debd4d92e8e271aa456696a637e43f41920ac32d0e569d873b2ec9570272e260401e53cdd2ae32a3cd016426 SHA512 cc7f57360900e5079734dd1cda1ba4e97e2ab8fe0f3997253d81f4aad7ccb30098c22ade0826ae8b4c3f14a28396a43cb523acf906ca726b116afdc6afad1e33
 EBUILD inflect-4.0.0.ebuild 1137 BLAKE2B 8aa2cb050f5cd5092a92ba8fc8a12509e9b8484967556957dbe1f56508f3b0d45f30b0a36f728f94d754a6633c032aabbe34d4df7866fd565daa2049fb399aa8 SHA512 97f03bc2b401ccae8b24402da88f13ec662d53feb4ef0f67b30523e0986950e1362991f70b3a7ecc4c17cc4399c5969297f831c55502827defc73d0a787fe0e4
+EBUILD inflect-4.1.0.ebuild 1104 BLAKE2B 00a94ef1da9aa140a242ab0eb863a87cb4b23ac8d43dee4094a44a5601762b5cb49beff73fb3a52346a40abce9ef7f4aac7611778247938a087c9f6e51fecdd5 SHA512 6c0f7947522f1c110cf42ee1f120662134c8c198fe0ef68f44578138349ea85896c5d25ce422b6042fac8f1c2fb91d391954b5473c88024d73ddefad220c3e91
 MISC metadata.xml 371 BLAKE2B 0c72b1b5bfd404e494c2a6e2f48cf56634981d6ac86026dcd43f9c81804099b0a4693d4971f50db501e1f9421b5952ee6ab65805fbb17213cd0af75f4cc5aa1b SHA512 266d5f9dd95fc339a8653f0f8342996d194565a23e8e024523e1e8880f900301ca796a2abe5f550c51281be0df59d1704e44bb1bfed000d5a880f1a915b8af07
diff --git a/dev-python/inflect/inflect-4.1.0.ebuild b/dev-python/inflect/inflect-4.1.0.ebuild
new file mode 100644
index 000000000000..6c7a9a01eb80
--- /dev/null
+++ b/dev-python/inflect/inflect-4.1.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+# [options.entry_points] is present in setup.cfg but it is empty
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Correctly inflect words and numbers"
+HOMEPAGE="https://github.com/jazzband/inflect"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9' dev-python/alabaster
+
+python_test() {
+	# Override pytest options to skip flake8
+	pytest -vv tests --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/ipaddress/Manifest b/dev-python/ipaddress/Manifest
index d611bd9cc983..59929a4789a1 100644
--- a/dev-python/ipaddress/Manifest
+++ b/dev-python/ipaddress/Manifest
@@ -3,9 +3,9 @@ DIST ipaddress-1.0.18.tar.gz 32475 BLAKE2B 7d116b1aad36bc58f9a6769b562e0b6dd260f
 DIST ipaddress-1.0.19.tar.gz 32854 BLAKE2B ea6bd0ac5418dca343e39c12e31a96aa6b13b091da05b7afcb3051251d3c8b8ce76a19f1d6b7ad2caf3f0077f6b522c4e0915a7a8eae28a72700732278ae4c6b SHA512 e49d0d0b76c108f985a5d209092495b5839195d9c4d5c975cc17c89e98d9b6bf0983f71f3b183c3974eccf0529cfb22aa8fbe384485be019da3fb74d50f1f4f1
 DIST ipaddress-1.0.22.tar.gz 33051 BLAKE2B ae9145a275d373f07ad3996b9c06007259cde7a03f6389fed2a83d9210dc8f135026d931b2ddf408f5f465b37861c9e998ae2eaac782741a0fa6ae07dd4259c7 SHA512 b0b0bae50c0819c46554f4ca2d14403a054d73cb9df7efd8bde03bd32b7599510a0e8eb7a63bd7cc6af45a035a0fcce38058b0625732472c7f252f72b88a6084
 DIST ipaddress-1.0.23.tar.gz 32958 BLAKE2B 96f8f3065aaa082c67c5468598e78bf928653588333f8f96c47aafea30c6aa5e3abf419f98e6388b9791a8f7e679f7fb31f36bb1d6a274a19b0e8ea434a8cbc1 SHA512 340e2a8698df1868038f55889671442eba17f06ec3f493759d8d0a9bf406eefbe1f67c14ca616f52e5bf2280942dcece7e89fb19de0923bee1ee20e60f48896e
-EBUILD ipaddress-1.0.14.ebuild 610 BLAKE2B 85c4ca022a8c7c2c3e67e5ab2b93e97ed0d7c9e04411a074f004d8ef883a8cf248a7e4928e6bd6c41eeee258447548442f600ed55a89a5b16e69243cb520a5dc SHA512 633b28ed71393db42eb4748801e1b5a3ac88cd9f22b04b999a8af03bb39fc175401e80d53550b8f3996364c23c7c892b711d030bc7e0bb69ea0e3ed9df0ce377
+EBUILD ipaddress-1.0.14.ebuild 604 BLAKE2B d1683b940a2b53a6e161227929dba47feafecaf858b90126334a36ecfb9ddf99464dedddbf34bbf9be59a64e06b84b62e1436d2eea0b89962acca72e08e84fba SHA512 c505b5e56fb114b0c9a390cba338a508e1085b027202c5a7a923ae675f5e5874cef3fe61824b18f368e0c2eb72ba5b541bd1689dd3afcce1e7009a7c0beb0c3c
 EBUILD ipaddress-1.0.18.ebuild 636 BLAKE2B e6cbfa00f070ec144158f580eac46bf119a5eafd8e58e8486056a682483bb3a1ef9d644a99a885b8292d6c1b2f1e75b3ef7a5666fa1f8f84004d7141fabb5612 SHA512 627ffe7ee6ef48205499dc312761544edc72fa69a1de8bb020048de4176435d2b4e908730227e16020b646ed86bc2c5471ffcf7853c9af2762cfbdd95e68132e
 EBUILD ipaddress-1.0.19.ebuild 650 BLAKE2B f786cc0a5e828b73ccb09fc5305cc59b151f21f3266e2bae1f4333f6d727756421406b5dc75461183a1a315ddfd56460ea08833bc2611ab5d3882a19c737874f SHA512 8f696747afe616747e04ae12ea158a164e942e1a219764b29be3b6af9203f861b62925caba4161a3258b2ed108fd2a3c25bdb96cbed08f735944ddf8c1671301
-EBUILD ipaddress-1.0.22.ebuild 716 BLAKE2B ca40b3838c233137ff7ec96bfb6983b3e7c615d8d24bc2b75af4866bc72801d1efd2b40f094c9924c27b562923b5b822b3d0ba325933f60544fe2be3aa4d1f8f SHA512 dada131b4235e24b6ea7bb506c3ccbca96b7c8a4039776130f3fb097499132d62ac65f693ca8ef339e4511250f49eceace7675164c345a92a72dcb05f32c3039
-EBUILD ipaddress-1.0.23.ebuild 858 BLAKE2B b82a8bc81d5dece59c10781cabcdfd76592da9247df14c0d4ed9ad81ff80f90f9677a354ce46ae7336fcd34bb8436c0b01dddc7adb87c8b36ae351bc551060d7 SHA512 648b235ba6321177c2369f051f53f17f89bfa86a0c588f2b329dfd6e780e4227bdf4ea824a9263fab0c9977da3bde6abceaf4ca5a5badd0c08ae7506c183a158
+EBUILD ipaddress-1.0.22.ebuild 696 BLAKE2B 0ced72d828c2b5ffad19794331b9af42c3b75347f9a5c302a74e73583bf5fad875e303a4f3e31d8e14c8641718e8a4107a08a4bfdeaf62dd2e3cb70adb915e95 SHA512 bfad5e06fc406bcf0713e813b05becd675fd3a49b1de3de963d4b27d6d125e133df00ebb377340a76736cf451bc08dc16ee09b6d7067de1ae0bb9f6a41d6f94f
+EBUILD ipaddress-1.0.23.ebuild 840 BLAKE2B 3dccbf06331103edab84d37bd1fe646fe6619b309081d0e6d4dbe7be1973f58503345b79853d70042b7455ddaa620b530c4a1d7611d68a796bc6253f50e65711 SHA512 4ff5a7bdb1b2c7755ce285aed0d3aa56a32e460c06fcb9a1794ccba2f1ddc91c694220965a2c5f8f8f3c0aba6cd8cc340a04214a21b2a1325677ade85bf2de88
 MISC metadata.xml 501 BLAKE2B a1528e6bef6960599198e71c0bf4ef65b0feaf042d588e5a29970141703780892f907ac73aa247a94a14d00ac7e42d393ede430c39c9c322cc45403c22844182 SHA512 e3b1bcf46848fc0b6faf58d4b9df44df0d0dfb6649a6c7f3806d1ca148528ddccefb4323ebdb046ff4469c07f081a0ff0ef32d767b37d6539b77c356371ffd12
diff --git a/dev-python/ipaddress/ipaddress-1.0.14.ebuild b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
index db04fac221f9..44e45406fc8f 100644
--- a/dev-python/ipaddress/ipaddress-1.0.14.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy3 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipaddress/ipaddress-1.0.22.ebuild b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
index ef4b016f79ab..7b0d6a1b5f0c 100644
--- a/dev-python/ipaddress/ipaddress-1.0.22.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.22.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ipaddress/ipaddress-1.0.23.ebuild b/dev-python/ipaddress/ipaddress-1.0.23.ebuild
index febe02b7822f..91690955d2aa 100644
--- a/dev-python/ipaddress/ipaddress-1.0.23.ebuild
+++ b/dev-python/ipaddress/ipaddress-1.0.23.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index 0835ba9ccefc..07b8a0dc7609 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,5 +1,6 @@
 DIST isodate-0.5.4.tar.gz 27691 BLAKE2B 91c05cab9a9d7313a4a98bf6843c4a6baceae86e2f030c684d0b7046d6df9e446124fa7704fe2c4689f2ab10da6c3ae96922809742cb4efcfb04a50f48bfc610 SHA512 ef5fd27ffa61ad10abf499723c452fd8fd6c2f08a0d5aca6ead88857e5d159f50a3d01769b9fe0aed59a57b0f89a70b359135b0d7c5e6a75d023daa824e5d80a
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
 EBUILD isodate-0.5.4.ebuild 623 BLAKE2B 8d2bc5c72d237b6e9d3668153c2781627cf090c1e753cde48f2236019520f6ba7866f79185c36d4b8679fa910822876991bdaf01c4aa84af1ea082b606971ef5 SHA512 7cfd1f3841e1e3d2c1fbb0af38a6181fa29f61896e45986eacc4731778952068fd6c7765b5c8cd0628f91dea811d34de2af879b65b536f30fe323acb757afa9a
+EBUILD isodate-0.6.0-r1.ebuild 746 BLAKE2B 3d9dfff28b5a954d84df8d82f4ed1d4ebfa0c049af642e045650152102e79ec450f26edf244280b1e167173e757de7eada603f31021684a2dc7f900d7362253e SHA512 3e608e0876650a0c7efd0d5083f6f072ceb3fdc3661d2e7672b62a09e8b4dafe0177982fa75e557276c54647bb2c655cb4a21f1cfb26cfbcc21ff5ee05f886e7
 EBUILD isodate-0.6.0.ebuild 738 BLAKE2B 72c9ba75969b75ea3427a487628ced51efcf8312bf7b2876169b12619ec5da1413d0a7d8a042c482fb5deedd73159c3cab687ef4b6784d7e0b3e1a43d42b5207 SHA512 1e065ba0a73f7586c757d58697c1e6173aed5bc75a8facc88e1c0fd361b517867fd623f249554c6952850cf60dafb761dd97e9fcf14d2aa6cded285e11289492
 MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
diff --git a/dev-python/isodate/isodate-0.6.0-r1.ebuild b/dev-python/isodate/isodate-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..fd81d209047d
--- /dev/null
+++ b/dev-python/isodate/isodate-0.6.0-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
+HOMEPAGE="https://pypi.org/project/isodate/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${RDEPEND} )"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v -s "${BUILD_DIR}/lib" \
+		|| die "Testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index c372d9d8db42..add3e090849a 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,10 +1,10 @@
 DIST jaraco.packaging-4.1.tar.gz 8820 BLAKE2B 43c14e12439d161f9a42005dcaed4d6945fa35ec3498bed81d2e6d10b08b056838dcf92fd6319951dddcfc908c8d33796bd9515aa5e77a04c02298cdcfd240ba SHA512 381ac1ba3a8eeea1235e719d98b61e38399d3fea1310732b0e2f921a3d46544efbb12c23c03bfa3ecfa07697458cb8930ca5156df7b411509c7b1da0b673d7cd
 DIST jaraco.packaging-5.1.tar.gz 10393 BLAKE2B ddef0ea4006b1a114d81238d5182c03cc50186452b326ef9a02f1a2e745bc731fc6969475a306b25a22d6daec5951e8d11cacd61d519e82cb461140e5003813d SHA512 d86cf6fce8037a9a5f2dfe29c7df810376127b3e02d270bfbc11e16bd43c10e0ab76f2739e5cdf904a9e54ca8d7fc3559e51d089ee39b4486c84902b23be530c
-DIST jaraco.packaging-6.1.tar.gz 14736 BLAKE2B 278ab889f236b4a53e6f3978b876952e83777da2e1c096801712bb6833fc85b342fe1c18bb7b1bd78a801c6216dbae74a75a416ef29cd4ec0a7017b8d5bd73bb SHA512 a84c71bd880879f172e6527987e9ffa681da28803112a0195fb21153cb6cd1b3d5c00a6d21c562d7c5542349f335bea4a349fd22662f22dd7bf9bef7b6b0f7d8
 DIST jaraco.packaging-6.2.tar.gz 15408 BLAKE2B 21c63b4e400bdf8b4b79873e6a96c7576b91500624c942246a8f64fc06da22e90203832c3c3084803c6ee23af8f102bb23cb12276cd3bba13446815f4a71f0dc SHA512 f8496a9dccb29dbac24927b40bc29d472b8c6bdb939bfcacf70196130ba9c961747a8b75c63574352a8bfeb2a512eb849dfba3344e942f1338ea1538e0767f33
+DIST jaraco.packaging-8.1.0.tar.gz 15322 BLAKE2B c354bec458a319bd9df0667c155203efa5c3de2d95218d0dd3a5878011d2d8fef694a490a2bac0035bff8daa18d1a3447c2c8dab7c0bd7bb09b62969f91d4709 SHA512 99996765cb047f2f0416d6afc4ff6ee0d84d03da0e07c7a7121518fbaf668f587c044f567c1d66a455372897ec1634ba5ee490552ac92064ca072e20b8f60a3b
 EBUILD jaraco-packaging-4.1.ebuild 1206 BLAKE2B 7d28f5f5fb66774a749948696c8b96078abc5dd4bdeba1c7d028491ccd388149a5d280973b7d0b494ada69f3871312813223944380011138a7e50ac3da19f9a1 SHA512 c1edd891829647c2150816b39d8f0cd5c14aa3d8f842a9fdf5861cb26706079add9d635566adbb23ac89ab8c3a748a1ec266126b608bf9f0e7abdf41d04c1d0a
 EBUILD jaraco-packaging-5.1-r1.ebuild 1330 BLAKE2B 0722babd07ccdf0ba7fd202ad550f202afcb68673e721b62ef1f22090edda54e80aafa5335d2a6e140450f847ad9b198fb0d2ef2d0e63d306bfc60d44a4cfd2f SHA512 b39a0970eda12e343df2cbf6e21e038768e17c93d302e37c1f4f2a4a898c5ea8492ece5ce526172edca8772441179c4d7164eda306e7869d124803223e6f0d14
-EBUILD jaraco-packaging-6.1.ebuild 1612 BLAKE2B 7b13fc1abcb4e53d299f409435acb643ebfa199b2036944f950de499eb0b58f579dd8c5f21c94803a85cb33e148d924d7f664177907443e66a378fc6b74b304a SHA512 95e662c374f2a49b7ddb3520e60df1ed4b0deea415005240ce9def7be4e856e6de4b55d5f0db75ef8f66e12d84e4b44fa5e462c303e32066bf4e1f8337fb3446
 EBUILD jaraco-packaging-6.2-r1.ebuild 1727 BLAKE2B 1da0a864b60b5300d3bce4aacbb8d3e582e327799669ee108a6d11a81c795bc1def655c9ebe89cba7d0d89266a966b6794182e542360d983fe616a72c68a3368 SHA512 09be3398abaae66b5ada39e9e7280f1b2c1a424ab1592319ea8e721ff3d6b32b63747a8f89bf9a7c323c6be336449ac0bb94c95c45e87a0d74faf2dcc5955b63
 EBUILD jaraco-packaging-6.2.ebuild 1661 BLAKE2B 55412f653667ce109e246215786bfcb70c67e622444cedd766fa21435ce48eba0e38cb5380edb06629dad9260063a4e381f501b0aa60a4aa83bdc5e9f8de8a32 SHA512 c0791a2da97e6bf40fd84122669aa119af22209ebc20a15426c6cdbfbdc62fa3f25399cd3b65727cce915cfd404caffc59c71666fbe1d22439274e0952df0855
+EBUILD jaraco-packaging-8.1.0.ebuild 1506 BLAKE2B cdd0669613a1b4b2eca70b1ad23d887d81f6f8873ae2b1354d3db564dbdf0585c7cde1e09f793cfd9394bf4ff55a9a23f555a4855398d3ec12409a7d5279a966 SHA512 18c778f20d47213caf101dbeee5bc10fb4fd7946671bb388e83e6e29ac876b3ce632283d7e7005c24f54295ba367e1d4596eb45b815775cc5730e779af2c6b5e
 MISC metadata.xml 651 BLAKE2B 145a05709cfd4b85e623982b7defaf588eb0d68ed3fcbb52655a5a8cd10fcb2cfb269b9179e81e5409be0485f4c71565ecbdc4019d9f07f322d2cfbc3731c2d0 SHA512 d8f857056e0a73cb34903a7001cda6f543eeec0182a87ee2bd660631ab9e855d1214166546c179b9711ec8ed9a5063b14d9362001e67203a7132694112ebf086
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-6.1.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0.ebuild
index 1f732fa28f6e..e6449b236334 100644
--- a/dev-python/jaraco-packaging/jaraco-packaging-6.1.ebuild
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.1.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -11,39 +12,29 @@ MY_PN="${PN/-/.}"
 DESCRIPTION="Tools to supplement packaging Python releases"
 HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
 SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
 	>=dev-python/namespace-jaraco-2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4[${PYTHON_USEDEP}]
 "
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/rst-linker-1.9[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
 	test? (
 		${RDEPEND}
 		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
 	)
 "
 
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-python_compile_all() {
-	if use doc; then
-		cd docs || die
-		sphinx-build . _build/html || die
-		HTML_DOCS=( docs/_build/html/. )
-	fi
-}
+distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
 
 python_test() {
 	# Skip one test which requires network access
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index a073f73f0d40..86a004826d98 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,8 +1,10 @@
 DIST jinja-2.10.1.tar.gz 267828 BLAKE2B 0cd7e2880f1d41f3a6aafa0878343c2ff017099de6b2ad607baa3c9cba9d58c9241e1ba65cc23ea16244a1b3ea8720933f45f1061811e5f1abdcd881c4017bce SHA512 71c90be0b2aeefaa80279cba55f7827b5a42455f9dc55de9ca7e9e3e363678caa357426955267542f3c8a9b775e61aca55e439af192ed0a67f592be4ef91aff6
 DIST jinja-2.10.3.tar.gz 266316 BLAKE2B 0d8c10bb866eb887fd1c88ca5c5304f46d27930d8426587185ea72c0b79b512919bd5fa75987c26e433be049fd5764fb4ec08d42a4ec5ed00510fe8051e10f5e SHA512 566b781218b533c16b107b57e0252da5947fad262fd8d3fbb134b5916939c5e5d31c95e34bd6b14eec333d2ba3b4a6faa4168497a1ac774e7044f8220ac1b06e
+DIST jinja-2.11.1.tar.gz 258637 BLAKE2B 80826397ada553b2bd1452f72430589ddebbd55aecffe6c6d9161ddcb46d9caa35635abd0946e063efda856391843831d25a7de91250d0f066b12cbf8b4af988 SHA512 66d9b7923f4b78133489bc28525d83032d37d5409ac572c00ea1aa342b3291bf0505c1e9d62f7a553553e26f06885e3d5c71bdcd2b334064b610692681694d33
 DIST jinja-2.8.1.tar.gz 397144 BLAKE2B 78e4903da05ab3e8961b6bb6047116941b4bbf59d08b8283582972590409f98b5dc1f468a988525d96c552000279fcd0a31dae3ac1e5226f609a8854c8f9ca0b SHA512 f4655f1a43c06f7651fbd5251d0538788a3a6a3ffb93d9a8c239711cf043082c43d34706b6d71a18679d957faa6590e7e0259ffb8f7cc5e3300749526417a987
 EBUILD jinja-2.10.1.ebuild 1616 BLAKE2B 6957dc33aebb826cf0465c4cd1ccc79e30ce28823056f934742146b703e29d03b319416703a5b0e7027bd1b0722262eba84652afacb4dea0fb420dfa6447da5d SHA512 7205bbdaf8494f09ab46a3a6e0855ad4a7d63e6135213cb7ca714dea1b2b0828119004fa3e1b607e8fda090e79660e05d8c223974b5a24329f2f6f54e797c24f
-EBUILD jinja-2.10.3-r1.ebuild 1928 BLAKE2B 3402ee683b2716210e1be8ef209008b80167714e75b1a9882a1fcfeb141238d24877061dd85ca5033112a7456562d32b5a19ecc38e9647022a895e2773fc09fe SHA512 39e8671a2ae672761c05225fb05e52a2575ef0223784e48c311103af23fc430c48a3091c3ea5a74b32a1c8b994ac0ad0494714bf6c6b01f088287924beb88858
+EBUILD jinja-2.10.3-r1.ebuild 1892 BLAKE2B 5d93c1736cdc2fe8321e5b50a9e475e0194d7f8d2a4a1e6403d8316cd669706e3ad688e323e754fd6c2e173c351e5252f2fa2e584c457d143690f28d4ff88335 SHA512 13b2299e9c2370f531554f0d0f6a5ab83015bb7cdd79c1cf8dbee44a8ac2a38197fa1d4c66b7651a6be139639b411aca6313caca1fd05358b72e237067a99832
 EBUILD jinja-2.10.3.ebuild 1751 BLAKE2B ac3b07a4cb7036cdc59e610f0c91f9d54e90954d5109217c384ad472fe5dfbc8392cd448dc1b49f0b40d39e1b7cbf2fc32efbb59810d2b204672f8744ae216e2 SHA512 7a557463a07e567d9261a63f0d8305784825449ded2a6cf2553b4260c585a4bc24ca6be331306c4ba9300797de351a1b3bef2d1d0375fed919ebd2ea36e95ab9
+EBUILD jinja-2.11.1.ebuild 1606 BLAKE2B fe2195a56bc55a2b4d879cf44ccca8eae52be84060b964ba8d323e9fd0370ada2ae204d02c9856d6f3e1a0bae2899a41a1673e30db37e653e0ddc49d24e0e846 SHA512 59c37e0a69a94caacd40b545a0e58f34dca4585c76090f6ab8fa5f710eb388ee729bc7f933897d11a479147488dd48aa3736bfce928c94dc19ef08cdafb279f2
 EBUILD jinja-2.8.1.ebuild 1928 BLAKE2B 3402ee683b2716210e1be8ef209008b80167714e75b1a9882a1fcfeb141238d24877061dd85ca5033112a7456562d32b5a19ecc38e9647022a895e2773fc09fe SHA512 39e8671a2ae672761c05225fb05e52a2575ef0223784e48c311103af23fc430c48a3091c3ea5a74b32a1c8b994ac0ad0494714bf6c6b01f088287924beb88858
 MISC metadata.xml 374 BLAKE2B 7d6caffa81473cac206ff3ad29cc5be6ebc22d82bd3a7eb0befec7cd65a859aa9208851237c629d0c019307986eafda5a93d2977d62f847d68dfe5d415139daf SHA512 5c3b1f608d45786b27c3bf31f04816f6a85e2cfaa44eec5a9aa21029a2e8ab26264e87f9a6faa4c44a44d718aa8186110fb4d0878655dd76d880a7173b6e5d59
diff --git a/dev-python/jinja/jinja-2.10.3-r1.ebuild b/dev-python/jinja/jinja-2.10.3-r1.ebuild
index c23ba3eda257..74ef7313be3a 100644
--- a/dev-python/jinja/jinja-2.10.3-r1.ebuild
+++ b/dev-python/jinja/jinja-2.10.3-r1.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
@@ -10,21 +11,19 @@ inherit distutils-r1
 
 DESCRIPTION="A full-featured template engine for Python"
 HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
-
 # pypi tarball is missing tests
 SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
-CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]
 	!dev-python/jinja:compat"
-RDEPEND="${CDEPEND}
-	dev-python/markupsafe[${PYTHON_USEDEP}]"
-BDEPEND="${CDEPEND}"
+BDEPEND="${RDEPEND}"
 
 distutils_enable_sphinx docs \
 	dev-python/sphinx-issues \
diff --git a/dev-python/jinja/jinja-2.11.1.ebuild b/dev-python/jinja/jinja-2.11.1.ebuild
new file mode 100644
index 000000000000..5c684ec1237c
--- /dev/null
+++ b/dev-python/jinja/jinja-2.11.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="http://jinja.pocoo.org/ https://pypi.org/project/Jinja2/"
+# pypi tarball is missing tests
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND="
+	dev-python/markupsafe[${PYTHON_USEDEP}]
+	!dev-python/jinja:compat"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/pallets-sphinx-themes
+distutils_enable_tests pytest
+
+# XXX: handle Babel better?
+
+src_prepare() {
+	# avoid unnecessary dep on extra sphinxcontrib modules
+	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	if ! python_is_python3; then
+		rm "${BUILD_DIR}"/lib/jinja2/async*.py || die
+	fi
+}
+
+python_install() {
+	distutils-r1_python_install --skip-build
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins ext/Vim/*
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/kafka-python/Manifest b/dev-python/kafka-python/Manifest
index 5ec0dee8605c..36bada21ecbb 100644
--- a/dev-python/kafka-python/Manifest
+++ b/dev-python/kafka-python/Manifest
@@ -1,5 +1,5 @@
 DIST kafka-python-1.3.3.tar.gz 255686 BLAKE2B 01ce6d3faf55988f291a0aeb26f6e5e01407c02d440f21622e565a124595e2df46e253c539ef1ffe44405960249ba49f426f25a6a6ef3b67d3f3f1bf6fe37aee SHA512 19b43ddc7a1ad3fcf58c55198de60c4434bfa3747d5bbc40f1acf0aa28225eae87effbae69087919b111cb739010bd4087e2497fdc78987f4cdaf33e81e516b3
 DIST kafka-python-1.4.7.tar.gz 352844 BLAKE2B 812c185bf19f3398c358722a44feb572693556ec671d07f2d74d63e45473f5b6d35390cc0fa2c95b8c42a15b635237ffa3c3829adde1f60a7611ce4fdf06f587 SHA512 5bbf9f998fba12e8e7c67a48e82b04e745f1ac528684e91b7454e825656e4a68b8c369984308cff575241b7f808f52f16ab02b7effd6d6b4319215f44ae4748e
 EBUILD kafka-python-1.3.3.ebuild 767 BLAKE2B 24dac7fd85c6d7e298023a62dcf95f7ed27349946248604893fc1b24c87ab6a536fb41becbab0af297added906a0a61c13543e8d6242d1665e194c1589ba53b8 SHA512 819d54ceaba8a41f7e41a8e1bc99613f73c61bfd86bc59c8cb5d9bf5b9aaca56ae0ba545eeab891163b318858835d5783ea29ace613cd7b3cf1451bff6c18eb4
-EBUILD kafka-python-1.4.7.ebuild 771 BLAKE2B 18caf23b3d7217a903400c61ae940bc9cb10fbcd2f07e9da6db170091b714dd6939b782563469896fe356bb7ccd7786772c30b920c16f7ccb252b4da622ba010 SHA512 db4386d593609da161546043d0c3adff5f5dd6cd45ba6389285fa5b08870ac9ec1898a03c64b5da852b92e458158930993c134c1a955b7bccdd84768a1d13cd5
+EBUILD kafka-python-1.4.7.ebuild 773 BLAKE2B cce44aa0f453dcecc1b0c92460db0e61d4390d4c4a6e27ffb55164353342d90bfc549dc0d3176529ed3b9219ce92e04f8ea888e93d1e7168b2c41b598efaf1f7 SHA512 8f34d385e900a875b6d3f9d3976a22d30ca4b1f439afb1174bc2966ba9b21a14a46ab4d5204bd05a81058983a527974bd62bb02175afbbdf1bda74843d14a576
 MISC metadata.xml 384 BLAKE2B 0fb6669950cfee792645c9dbefbd9bf6291e69a48294b4696729bb8cc9c4c7d21ff01cc570d62e74e2f3b40f8216f7351fab6d20e0f3267a49295818c4a6a781 SHA512 8544992c46b3ac30d3ea25c9ab5005d39636e30c929d6fc8be8e1942f8ad008f4e95b03a52facb31e5ba4a982c52567a78f63017d3936986e34a08c40d3817bb
diff --git a/dev-python/kafka-python/kafka-python-1.4.7.ebuild b/dev-python/kafka-python/kafka-python-1.4.7.ebuild
index 5a21f667e958..6a83fc9b9507 100644
--- a/dev-python/kafka-python/kafka-python-1.4.7.ebuild
+++ b/dev-python/kafka-python/kafka-python-1.4.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index e0bd6388f73d..1a6725bf7585 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,11 +1,5 @@
-DIST keystoneauth1-3.1.0.tar.gz 217744 BLAKE2B 4e07c7f4dd6fc097c6838b2a18105656b16f8e45dd553d2908c55fa7aeb5c8dcd2968ca0c3954be0b66044880eec7c33fd9c42413a1ae6c93258a902666bb896 SHA512 3214e08cf449a0eff35eff0400542cbb9e46051095d7955593fec89c4ba31062677f434c70c40037db213fa0e0db15c66d1058e0eca35b1d214967f7fa3fcf14
-DIST keystoneauth1-3.10.0.tar.gz 242560 BLAKE2B 40569c8078ab851d93ba2e4ecf3a3c77ccc2a74bae2866a0993e03021fb475f644a6b04956be756f67754dac31cbc3b53d085a0de82f5c7613b2fb6e138be427 SHA512 ed4451f26f775ea5580766eb431d563bc5bbdde5df24e529c2f3c4517ccfbb9a657e5af535fa6176d905922fc3b6540b5dfb98ce1627efe91861fdc23da8eccd
-DIST keystoneauth1-3.13.1.tar.gz 246906 BLAKE2B 92877ef5a0ded692372521244c006f0a8ccbfc648c1ce058d8915189343d70278f529ced99f94ebabaefbb184490ea22546229c78f00e494011e5490886b057d SHA512 ee83652b67032cd04e88c8c4fcce708d113bccd17cb62843b4a03845ffcd40632a10613759946fbc684a80c2391e144dcf37aecb41eb151ebe83e08f9e08a536
 DIST keystoneauth1-3.17.1.tar.gz 253985 BLAKE2B 4df40a5cb993d6bec3972152d7557c03b9283621f58f4c6d29b680eafabaa0ee4ec60dc52851738f22c6f3182339e6bb0554e6a4ce9ace30473a902b74a57b52 SHA512 ca2f5a46450ed9a772bfbf882ab23ac4f251b2209ad038190fca41af0626616ae4f607ae03fb837b1e7bd87c2c239dfae64bc122ffc8db551451d95353743016
-DIST keystoneauth1-3.4.0.tar.gz 227170 BLAKE2B 57f28ce5a36362f34fcfb2f456a19332df6851a4d372fe890286b4d48469ff69a3ad7281b55d4aa338f61d437f5e07908fc55210e2085a6d9a974cf0bf451c81 SHA512 aeaefb0e5b369e36e06adc1bada104dab2c2aed22bf96cc3e20a5dd4ce8ae10869eb73ce4802faef70f191c3bbd38e3b5c3dff3606c46956fb350c0875cb7a7d
-EBUILD keystoneauth-3.1.0.ebuild 855 BLAKE2B 6c95358085c9f74b28596a0260c44e379240fe35928941e802da64f189603e172a881cf467a65a101ad838bda09ee1cfb3d168f563869d272a8d243d5b79ead7 SHA512 c681d23858a5a8645bad06d21b0326be54e1c0a677454e1fd473a876c2196bf3376f697e4e66ed256be79d660064f8375815b38c7b7c86adad53b2bc791511ea
-EBUILD keystoneauth-3.10.0.ebuild 872 BLAKE2B f9899c38409eccd2955a182bbe0e1e626263341f680966a1c86b7765429ba83e406f1f8ba01d08af8d2191176d9cd53952ed59d1d14c9a02bc6a2ce19d9de1d1 SHA512 1a7965d08d31a3702cad4a51f29f1f1d3cddf70cd0af8152117b6b354302a5772e3ed97a44254f61279ac3391827a7a2d27c0cad69f1b09ddc3b73b06ded1b91
-EBUILD keystoneauth-3.13.1.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
+DIST keystoneauth1-3.17.2.tar.gz 253877 BLAKE2B 9a8f10a5a535ee6ee02859f6a7da38777af250303d0be0feed266c677fea3f6bd465e3e14309c38f67dc5886c846a6aa9a9a7438f5e511f7a80782e29ce88b52 SHA512 6ead83db401d9bb31df87da5c9eff576f621d0b0964c9423de6cdd45777b9a2e3cef27fc20d91fc01b82c64b9b0ffcb83f270b4df7b740319809207ed0b2cb2a
 EBUILD keystoneauth-3.17.1.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
-EBUILD keystoneauth-3.4.0.ebuild 807 BLAKE2B 4f3610d7b920935423f91fbc88c93215f7cc0786a14eca40779c3a5203528e3bb4649be0813d20020db6f37b91409e328486eeae57c9a38ae33affac5bc1cd15 SHA512 e39d10d017426400cb6dc489a86c2239a64aadfdcdd9655ebcb73af1c8b964b434fea1822948b3e0892b1b94d0e91754b4a03bd26b2689f1eca92bb210866da4
+EBUILD keystoneauth-3.17.2.ebuild 874 BLAKE2B b852dec1e77179c7283a48cc45901ac57f050cec9784a54a09b4eb20196767a54652fa553c120ebdbc894134accecc2f9df07ffb76370a579c034aa97193fe3f SHA512 6377faae295670fa72ab06dc7eccd9232bd81c571e5e9e88910f09e816dc3eb3cdd53500daec2b6a4af120bab1c56614e36f3225772f55a27a746e3efe4fa044
 MISC metadata.xml 519 BLAKE2B 22f32029ae01c1067c8ce7c4ea3adca3e462ef4f274b278dcdbc45f74325c719df3ed89b77a6f5f40a3fdf2219b7ed1b1272a944b1e30ea2d50f4ab2b206e000 SHA512 8a00d549ee4cf755cb819cab370b9e66cea6d3396d7c15c3b644731991ad292b0a2c862b2be42e045584e1a429ff5b8950bfe55d58a904cbefaeda8d117ac117
diff --git a/dev-python/keystoneauth/keystoneauth-3.1.0.ebuild b/dev-python/keystoneauth/keystoneauth-3.1.0.ebuild
deleted file mode 100644
index c30d5bd027ff..000000000000
--- a/dev-python/keystoneauth/keystoneauth-3.1.0.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="This package contains tools for authenticating to an OpenStack-based cloud."
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/positional-1.1.1[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/keystoneauth-3.10.0.ebuild b/dev-python/keystoneauth/keystoneauth-3.10.0.ebuild
deleted file mode 100644
index e16c23beab6d..000000000000
--- a/dev-python/keystoneauth/keystoneauth-3.10.0.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 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="This package contains tools for authenticating to an OpenStack-based cloud."
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/os-service-types-1.2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/keystoneauth/keystoneauth-3.13.1.ebuild b/dev-python/keystoneauth/keystoneauth-3.17.2.ebuild
index 60b0dac745a6..21ce2d584e88 100644
--- a/dev-python/keystoneauth/keystoneauth-3.13.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-3.17.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild b/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild
deleted file mode 100644
index 70637cae17ec..000000000000
--- a/dev-python/keystoneauth/keystoneauth-3.4.0.ebuild
+++ /dev/null
@@ -1,27 +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="This package contains tools for authenticating to an OpenStack-based cloud."
-HOMEPAGE="https://github.com/openstack/keystoneauth"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}1/${PN}1-${PV}.tar.gz"
-S="${WORKDIR}/${PN}1-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/libwnck-python/Manifest b/dev-python/libwnck-python/Manifest
deleted file mode 100644
index 3e6bfc020adb..000000000000
--- a/dev-python/libwnck-python/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX libwnck-python-2.30.2-flagsfix.patch 847 BLAKE2B 27ac35b676d6c2190b2f4e0c5f6f5b830cdc58c72098662a67667a5439a0196961d869f26f5fdae4e037865762108064bdd13b5ae92a741bc0e6df052c0976d1 SHA512 ff30e03ee241ab6d26fafc4ab52f6b1c241b37b476fabeb72e9fb4536ad20604dffac6af42bb0c3170cc062ac90bee2f8c501fc0cb8478bb2adca3d07882c3ee
-DIST gnome-python-desktop-2.32.0.tar.bz2 621277 BLAKE2B a6ec5161eff68cbe9820a1ca1f31d39d9cd4c2e944564fe9ed36f06723bad8ec7525f488cdf6e5f9556ad42053e88e3cee3405146caf778df59aa639f0108099 SHA512 51beefd21fa3aa6242ba4c66e57d940372fbf4a84ffe34063339f6e7e7c22e76d281b25d5f113de3780a0dbf733c7e07142f05a285056cda26736323b4185d18
-EBUILD libwnck-python-2.32.0-r1.ebuild 715 BLAKE2B cfb2f561c61d5bd8bda76f364368a4f0312f95bed29287da791c1625487be56c030ffa0d8688229dbb78d8cea100a1a2059809f192b4f00de25602ce96c99a43 SHA512 9f91e39e1232eb0b2c1e7aff86f5fcc4be398d628ff10eb9386b8ada28576c9167b5a56434a358770b101931b6f8a560431247e1eff20a628a7c3bcc8ada3c9b
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/libwnck-python/files/libwnck-python-2.30.2-flagsfix.patch b/dev-python/libwnck-python/files/libwnck-python-2.30.2-flagsfix.patch
deleted file mode 100644
index 0be84c96b533..000000000000
--- a/dev-python/libwnck-python/files/libwnck-python-2.30.2-flagsfix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -up gnome-python-desktop-2.30.0/wnck/wnck.defs.flagsfix gnome-python-desktop-2.30.0/wnck/wnck.defs
---- gnome-python-desktop-2.30.0/wnck/wnck.defs.flagsfix	2010-04-20 11:27:20.119491538 -0400
-+++ gnome-python-desktop-2.30.0/wnck/wnck.defs	2010-04-20 11:28:34.715491536 -0400
-@@ -100,7 +100,7 @@
-   )
- )
- 
--(define-enum WindowState
-+(define-flags WindowState
-   (in-module "Wnck")
-   (c-name "WnckWindowState")
-   (gtype-id "WNCK_TYPE_WINDOW_STATE")
-@@ -121,7 +121,7 @@
-   )
- )
- 
--(define-enum WindowActions
-+(define-flags WindowActions
-   (in-module "Wnck")
-   (c-name "WnckWindowActions")
-   (gtype-id "WNCK_TYPE_WINDOW_ACTIONS")
-@@ -184,7 +184,7 @@
-   )
- )
- 
--(define-enum WindowMoveResizeMask
-+(define-flags WindowMoveResizeMask
-   (in-module "Wnck")
-   (c-name "WnckWindowMoveResizeMask")
-   (gtype-id "WNCK_TYPE_WINDOW_MOVE_RESIZE_MASK")
diff --git a/dev-python/libwnck-python/libwnck-python-2.32.0-r1.ebuild b/dev-python/libwnck-python/libwnck-python-2.32.0-r1.ebuild
deleted file mode 100644
index 3e722fa99191..000000000000
--- a/dev-python/libwnck-python/libwnck-python-2.32.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-GNOME_ORG_MODULE="gnome-python-desktop"
-G_PY_BINDINGS="wnck"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome-python-common-r1 eutils
-
-DESCRIPTION="Python bindings for the libwnck library"
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86"
-IUSE="examples"
-
-RDEPEND=">=x11-libs/libwnck-2.19.3:1
-	!<dev-python/gnome-python-desktop-2.22.0-r10"
-DEPEND="${RDEPEND}"
-
-EXAMPLES=( examples/wnck_example.py )
-
-src_prepare() {
-	# Fix three enum items that should be flags, upstream bug #616306
-	epatch "${FILESDIR}/${PN}-2.30.2-flagsfix.patch"
-	gnome-python-common-r1_src_prepare
-}
diff --git a/dev-python/libwnck-python/metadata.xml b/dev-python/libwnck-python/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/dev-python/libwnck-python/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/lxc-python2/Manifest b/dev-python/lxc-python2/Manifest
deleted file mode 100644
index a29605e781eb..000000000000
--- a/dev-python/lxc-python2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST lxc-python2-0.1.zip 15251 BLAKE2B e9a7ef693f2cab70a626a5fb7325d2bbdd8b56356d984eebccbdc26e61abf7e55cb87df3fbc717af38ba2278de2c6d2bc40ea950f88aff43c8859b2784e17a54 SHA512 e2374373dbf0567209f028df6c8dcf66b1f06be89934824c9663104e4fed9341f2b68d89011624f87de0e4e2702affaf1f7b17987bb179d1d945c2e04f8aa1bc
-EBUILD lxc-python2-0.1.ebuild 460 BLAKE2B aea88ece733d227d1282f28d2b98de15eda5a4094ae7a1a3cfa31306b8140a616911eae71da1c711a14329d6bf61084c1e6eb35dede847662ccb9de0dfb23a42 SHA512 63a7376d098e527543c83e656226b2229d7ef62bb39ff11139a0494f86b79c14481964a09f80e823ff45a2f10e6ba65ae671fe29d43e5231430e711a41209da1
-MISC metadata.xml 650 BLAKE2B dbeccf480a7490564add2ef993fa1e07ef8ecf61ea4991128e4125dd1a9a7ecac1f4b846a59065b382c7e526341c341901b5375526d5eaa2a88d216653e6425c SHA512 651a2eccf19cbec960bec4baf4b3b4425d896df55249882640068e3fb4fd005fa8a77a2a2cbf88c77542532b9161f9d1390a90fb61659b09971acbc86016bec3
diff --git a/dev-python/lxc-python2/lxc-python2-0.1.ebuild b/dev-python/lxc-python2/lxc-python2-0.1.ebuild
deleted file mode 100644
index 9e09af92cbcc..000000000000
--- a/dev-python/lxc-python2/lxc-python2-0.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE=""
-
-RDEPEND=">=app-emulation/lxc-3.0"
-
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/lxc-python2/metadata.xml b/dev-python/lxc-python2/metadata.xml
deleted file mode 100644
index 91254ea2063e..000000000000
--- a/dev-python/lxc-python2/metadata.xml
+++ /dev/null
@@ -1,21 +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>
-  </maintainer>
-  <maintainer type="project">
-    <email>virtualization@gentoo.org</email>
-    <name>Gentoo Virtualization Project</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <longdescription lang="en">
-    Python 2.7 binding for liblxc
-  </longdescription>
-  <upstream>
-    <remote-id type="github">lxc/python2-lxc</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index 6fbd7e59286a..5a5f065dc3d4 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -4,14 +4,8 @@ AUX m2r-0.2.1-upstream-fix.patch 641 BLAKE2B 4d75137a8bc0e5ba9363d72b611b83933c7
 AUX m2r.1 9244 BLAKE2B d7ac673d0750695f8b21b6e9d0c5328ab8934dd20eb88835c655affab45d4b86adbe4306d39a705509f7c4597d9f0ef37cd61af035d59871e04596f6cbdc10c5 SHA512 bb085477c363a0384a5aea0f5cac3e64ece957048f5a610b3063a5d96a31e8b78167dd847bd42d0f267b506595b55cffdf7647a5c819c9755b054e34d2ee3a99
 AUX test.md 34 BLAKE2B 88eac9a501f3fd54ac3c9555612c7d3860d5c692170fcfeca3d75b665611b75e627443e8a54d8dbba4c820b2f793c5b933a76493381d295aefdd5ef55b7fc1d5 SHA512 c4b98b3256e14d46187d4c5cf5d3b26e4e4e0b1c6f2f61618987c234f49ea5a9bf31a94b9d2c4907bbd0685fb30138a5916b5dd3c8f92cd80bf0c7c2e657ae26
 AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbdd1cded336a736978a79efff42c7cebcd1a420d8bc4485593d675b3a66e3f427434147c9a SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7
-DIST m2r-0.1.12.tar.gz 15358 BLAKE2B 07f22ab486df3b0382c427b9c9ec3e1e2557bcd12edefa3800fea970012e55d9a6e66dfc720ff7ab394003bc26055c68756b4578adc2de9a5cbc4089ef5c534b SHA512 5579f993c9a8aa72195e97ba6ea2a317f97587f2f8fdab6d7cc16ced6ccc169960a99c712b9ab1251cd021b03f1c5566139bfe6c314bdad43b9bf138a921f0f1
 DIST m2r-0.1.14.tar.gz 15926 BLAKE2B 48d8961b6ebf66d494511f6bf755ae2d2de0740aa27eec82f6690a3ccb686795c204a51ddc6d89d44440fc74bcd6f914917ef5d56f2b2275dd98dd8e6d5a9c0c SHA512 fba6c580c1e8f1fda704628a3e16dc75d23faf532767e56065cc3786e59331196c1d2dfeb49804b7b931356d5ac2d498320a752d0e20cd6e3b8e28be92d38120
-DIST m2r-0.1.5.tar.gz 13202 BLAKE2B dcfc5ecdcb2c696c1eec8fe3eca4cd7e238f605c399b750286d9eb18ecbda9d80b608fb362a85959769253c5f5bca7e392ed5b61a7804b25cab5e7bfb5edf574 SHA512 78e9e8daa293b2466c95f0adad937fa0bbefaf0dd9663695bb916be13182633e0d462afa5331a595db424420485ef54bbfd4e0625962026fab4ce0c63104bc84
-DIST m2r-0.1.6.tar.gz 13615 BLAKE2B e0c98c059f5c569bf88a1f97bc1c8a912675f9c0e044175f4ecbf885b80019d62f5fe80579420af373ea3d62fffdcc62344d1035d901208719be1cfd56654a01 SHA512 3641cf4013f71fbd43d6cdad530cfd3e909c93709edfbd79d6a51e7121de68e279d3ec4eb7eed391a35902ffa467310bd6b020139b2024c3e80fa44e5f6cc4a7
 DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
-EBUILD m2r-0.1.12.ebuild 1224 BLAKE2B 4d86e3c367c2f504e00c3452bf0a12d804192cecc4c1ce74fb26d42855b2c4f454158da89ffabd65da761f6814984c77b66fbab8e74c3f8c4c04d270de1c68c0 SHA512 f79cb47a1eecac2e75a45f2984dabf61bf9594a25ad8f5dde5f54265a02dd813a303480596ead89f46f3a7e026d9e8d1404cc35b807ba908e1aadc975d3c3c3d
 EBUILD m2r-0.1.14.ebuild 1306 BLAKE2B 68348e610a98228a2569e38160ef7478dbb669c961cf57c81da1bade26fa17d5f8ca42844bf54df55b6651fadee82b5eb03e5a371e29d823a03e9026d2875561 SHA512 e9eef841274d2a72ba3aae3c6d11ccf8ae5c53d2af6f1b3e6e706649317f01cfcf36d28c85e8c4ebb33c36d62306e1751483771e7c8d946efa5ea7741ded70cf
-EBUILD m2r-0.1.5.ebuild 1289 BLAKE2B 2c37ab2b2c1fc58af1a839504465532e0579e098f0b8664fa732cbb71462d4c5a8b8cf7579534cffa8ba4e76b39d9dc60fcb621cb1873c4ffbfa903b391754a1 SHA512 ad1b5d8f87024725075b5e01aff044a8367c3b509dfee480cca2d3390b2c4e9158e5ff85711bcce89ab6fde606b4c742c97e4c51b2f7ae9ea7aac51d5245f0df
-EBUILD m2r-0.1.6.ebuild 1313 BLAKE2B b48013394657b4a3b84245943ec3552564213df94ba2f2e110409ba143beb7293132d0199cf865de64dc7252398c35c4f4f0b26ae689d2d54954c20e699a3ea8 SHA512 ba50196ff48945f8447cb470b2006870d4cdcfb0c7abe08561a07c79708f0216b7f643de79bd4a2b54f06e7c4c6b1df52b09f4cc0ca5408b4cd2b6cbf60f9929
-EBUILD m2r-0.2.1.ebuild 1423 BLAKE2B c1b4e056d8b8f2c837d13a7cdc7d5776ac99bfe9e17950f19ea5fe959be7b46b2cf313a04d59a0169e7683c97fd960951398da8d89da08547212b6f6d42493e2 SHA512 3e3f89382cdaf9fa71845f37ef38eac40d0dedb793559daa722709575c3d2a2e6ab15496c6ff18c28623d3a242ec51c5a6d502f2d5f9f2f811e0f0ae7d0b2142
+EBUILD m2r-0.2.1.ebuild 1421 BLAKE2B ef3120cb488085399345d9b1a2aa0b8f2f22fc02319ceb8f3e73a6461732d4db6012fa808da2e22ce50d93eabfb7976f2c756353f4d670db9e86af0de74172ae SHA512 83390afb830fa4117e9c0a2390ab8c8cce34c96f4f76e57e1629b7dbca7638246e62c153fee6dfddd4738436fc30ec2bc785324c89a81005334de36d75543a82
 MISC metadata.xml 504 BLAKE2B 9e21e9256baae870dce5b60ba0f2c9feb5857c79f6ff81dbf10aafcb81d7886c18114155f2f825a6bdb7ab5b51f5e9f733ae4e8c799bbbb8c424c662cec85959 SHA512 551e5a6e90f257d5171995d6cb7ed7122e3820a787cb4acf177a9b0acc22810e71d432b8cd53667793c2e01e39edcb43540841e541737097231fe36b51eca7fd
diff --git a/dev-python/m2r/m2r-0.1.12.ebuild b/dev-python/m2r/m2r-0.1.12.ebuild
deleted file mode 100644
index 7290a3e261a5..000000000000
--- a/dev-python/m2r/m2r-0.1.12.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/mistune[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
-	${RDEPEND}
-"
-
-#S=${WORKDIR}/${P}
-
-python_prepare_all() {
-	# fix a Q/A violation, trying to install the tests as an independant package
-	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
-	# add missing test files
-	cp "${FILESDIR}/"test.md tests/ || die
-	cp "${FILESDIR}/"test.rst tests/ || die
-	cp "${FILESDIR}/"m2r.1 ./ || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman m2r.1
-}
diff --git a/dev-python/m2r/m2r-0.1.5.ebuild b/dev-python/m2r/m2r-0.1.5.ebuild
deleted file mode 100644
index 8c145d1d0fde..000000000000
--- a/dev-python/m2r/m2r-0.1.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6)
-
-inherit distutils-r1
-
-DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/mistune[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( $(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
-	${RDEPEND}
-"
-
-#S=${WORKDIR}/${P}
-
-python_prepare_all() {
-	# fix a Q/A violation, trying to install the tests as an independant package
-	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
-	# remove duped old file in the tarball
-	rm "tests/test_r s.py" || die
-	# add missing test files
-	cp "${FILESDIR}/"test.md tests/ || die
-	cp "${FILESDIR}/"test.rst tests/ || die
-	cp "${FILESDIR}/"m2r.1 ./ || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman m2r.1
-}
diff --git a/dev-python/m2r/m2r-0.1.6.ebuild b/dev-python/m2r/m2r-0.1.6.ebuild
deleted file mode 100644
index bf9a610627ba..000000000000
--- a/dev-python/m2r/m2r-0.1.6.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{6,7})
-
-inherit distutils-r1
-
-DESCRIPTION="Markdown to reStructuredText converter"
-HOMEPAGE="https://github.com/miyakogi/m2r https://pypi.org/project/m2r/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/mistune[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
-	${RDEPEND}
-"
-
-#S=${WORKDIR}/${P}
-
-python_prepare_all() {
-	# fix a Q/A violation, trying to install the tests as an independant package
-	sed -e "s/packages=\['tests'\],/packages=[],/" -i setup.py
-	# remove duped old file in the tarball
-	rm "tests/test_r s.py" || die
-	# add missing test files
-	cp "${FILESDIR}/"test.md tests/ || die
-	cp "${FILESDIR}/"test.rst tests/ || die
-	cp "${FILESDIR}/"m2r.1 ./ || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	py.test -v || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doman m2r.1
-}
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index e41606362361..cf55c799edfd 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/miyakogi/m2r/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index dbcd4826c7c5..df39da2bfd7d 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,10 +1,13 @@
+AUX mako-1.1.1-pypy3-test.patch 822 BLAKE2B a6c66e8ff7f430c005843dbdcdb874b520de0ef0b727415745a53bc153e87632be39257124b5640c6e22cee8cca40c2e6dd059302adad9089a40bdac6224be61 SHA512 60eae74863f44c50f45b51519dc887eb60f45708fb2cb272e64b82938b00c3ce3f53933066a56e3385930654ea2295c78aee5cbe82a51c7e2001c8d5e6a54da9
 AUX pygments-exception.patch 1456 BLAKE2B a5cea58cab2dfbff872db7eda2a7753d69fcd0ddc2cc70ac9ba05978beff8fcbf2bd3ea4627639247de5a2e343ee30144216d28b890414a50cfa54b9cd97a73c SHA512 c43f620fe52e1a69e52a14a4ef3a390ff38d6507a53a70b2da0625b3be1941a0f6b2cb23d2ee60a391e78d8062ba2a9c76d8c5ab0556e01c256867dede44ef61
 DIST Mako-1.0.3.tar.gz 565224 BLAKE2B 8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab64e3b3b9066ba7010db94d98c7e8e422e1f89a3ff326501eff8dd6129a1af97d131babcd00047b0db19c29 SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d
 DIST Mako-1.0.6.tar.gz 575112 BLAKE2B c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5 SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
 DIST Mako-1.0.7.tar.gz 564418 BLAKE2B c7ecad786213a8d3b77241955d5a825513f81bf66b705b6f54d6ff74a6513f7c8bacdc55fa8f21acb03e691900f45605da834a2b941bc65bddb177ce86dbe961 SHA512 d67af6788bf8603010361ce8b6d0355b0191657c07f3b5845f9d5e91653c3e349a7b35d5b36aa9c7f291973c83911ce94075e1cad78e6935d0ed4ee9c6e2a571
 DIST Mako-1.1.0.tar.gz 463945 BLAKE2B 31e5c3455f19756dfad6b61c71923c43ccb734aabffebaf3bbe853ab8a549ec11e6ee0b93f09b5dc30069f8969c8ec996143c0888b675bf1a72079fb2e478549 SHA512 acb0f53a22ae152c359c38391f508eca706efcc52916a6e87f2702517dd48b5ffd26eef0f2f9172046f1abd0aea1f47328354ff622938886aa00f950a261e8d4
+DIST Mako-1.1.1.tar.gz 468894 BLAKE2B f6ef4f67e369c6d2078b0a7534a765aa254afcf7c373b5d3f8fcac05336b9a46d8391398e4b287fa0826bc03cdbea3361c5225c5e5bcc966f88adb089ff3a5be SHA512 ff707ab3360148fe6e80bea7cd80d043514f08caebc502247c28c63a83e33d1be7513019605fc1adb77c32fc550e9bc16015c512bafde1a6f846aab0775d4ce7
 EBUILD mako-1.0.3.ebuild 1422 BLAKE2B 8a03fed7eaebfa8eabfd4418cd75cbe5f342114d7fe5016d4de31f0fb8feecccade64bf3cadbd990c6e6c8eb4dd20f0afa3dd27f6425937fdb6bdceadca5f38b SHA512 fee3ca9fded2a85d07391d9ee1f9d4e9a9498c43c778e99cbe3950b4088c8af7d1d9004c043a9f674697cf29184fe325420453e6e17c655bc276dcd576d21b2b
 EBUILD mako-1.0.6.ebuild 1478 BLAKE2B 82dc6e6ded16423f03f9304f94fde58b566c224c2c530a0bee696166d80db903cbe1833ea927f35b32114bcd1acd68a61736476626d8d88cfc214bc911c0d921 SHA512 91cb999d3275193c7f37bf21ce0e747e8d9bb877019191b6198464808bcdf842bebce436f1c806aa97a6b759712968f0f6a9121999d483519e6bd67691ac914c
 EBUILD mako-1.0.7.ebuild 1169 BLAKE2B 91e96e598344f4df7f8ba0656ea533250774a9f07b343813a4c780d66cc724ee72c077ab79706bb1a19afd8f359713b78244d2986fe83236d5060f2e99e80906 SHA512 a9b47ca8f19fc33e01e1009aa3afd4281ffb49d8e2a57aa8e48d67523408263ad82d3d0ae148ad7ce159e379b73e08f32707a7947646a8646fd78117a88c89fa
-EBUILD mako-1.1.0.ebuild 1170 BLAKE2B ec353a7ba7008ae87427f3cc290d549dcc3c2afcc124bfa776619fcdb604741b609d5bfa89d37c635dff9412fe265777bf86aca1f53e06ac2fb049bdb4f21f88 SHA512 f9048e1365ef4205a896b128c4afd621e362b37e8f9bd07b1c71bb04eb387d39a61d80971eb106987ebd710060fc1b6e8eb7cfce7b467f5ed365a498d3061680
-MISC metadata.xml 437 BLAKE2B 4dc2a160a2054ffe0bd59638a0170845b22d7eafeb77e94999ff239dac231e9b1a0c06b688da2c4699f73b99ae2c1306332cb0b5e91779da757bc048452c7c22 SHA512 ac01b2c4843ec9ab15f5b20677a003aa34fceeb2f1ad39a76e3782e077824f1d1103c831dd2f911ae5e64bb7530db2e87c2b1e5fde2fb77acf6d1df65f0e0b69
+EBUILD mako-1.1.0.ebuild 1154 BLAKE2B 084f154a914c49ece4cce823dd6a57afc6a92f2a607ccde9ffe2344338ae0807fe93b6260f2141e0da81d64aeb23c005c8b9f8916a479afff2258c79a49a1617 SHA512 6ca3749a017bbf11fb9fda487ece4ad828f91896ecf71e149ebdce201a704491d522465b38ee8d157fa68b56979cfe509e7832f233d9ee4d105c30c11a1f3fed
+EBUILD mako-1.1.1.ebuild 1087 BLAKE2B fb89cdd9199e7398cdec99c165bc894c56280d2b8227dd8fcb27aa20745edb64ee8cf84fe41b7555f776e11d6936758e2c4065452e0a2e31ca33618db55e497d SHA512 e9f160bf3f21112d9feb9a6b014f5703cadd25b93ca24f7978ebf111233ae176ec66ea802c8591f76d5203ac42056f4f2ba41e7301d232f3f91c371fbc7c39bf
+MISC metadata.xml 439 BLAKE2B 878233e885789b9b6efac5aab00feed58d9eb0459070cecf2444e4d7d101675bbeded1384982e7445dddacd73093efd02cf061d9d7f318188eaac3c7a417a12e SHA512 5cebe17cc0901496fa9a126f9e6920a90b1296ad8ec2b8670edbc16d84b48d38dfa9d351a8fde3a48005c33d0c4dd93c759373fa6f76b9bd38c7babdb3346ecc
diff --git a/dev-python/mako/files/mako-1.1.1-pypy3-test.patch b/dev-python/mako/files/mako-1.1.1-pypy3-test.patch
new file mode 100644
index 000000000000..6ae5c04ab997
--- /dev/null
+++ b/dev-python/mako/files/mako-1.1.1-pypy3-test.patch
@@ -0,0 +1,31 @@
+From 5559e0205c7fbf2f4a321a978249a41c1d073278 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 21 Feb 2020 19:03:29 +0100
+Subject: [PATCH] Skip broken test on PyPy3
+
+---
+ test/test_exceptions.py | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/test/test_exceptions.py b/test/test_exceptions.py
+index 2ec46cf..6a30b48 100644
+--- a/test/test_exceptions.py
++++ b/test/test_exceptions.py
+@@ -1,5 +1,6 @@
+ # -*- coding: utf-8 -*-
+ import sys
++import unittest
+ 
+ from mako import compat
+ from mako import exceptions
+@@ -429,6 +430,7 @@ ${foo()}
+         else:
+             assert False
+ 
++    @unittest.skipIf(hasattr(sys, 'pypy_version_info'), 'Broken on pypy3')
+     def test_alternating_file_names(self):
+         l = TemplateLookup()
+         l.put_string(
+-- 
+2.25.1
+
diff --git a/dev-python/mako/mako-1.1.0.ebuild b/dev-python/mako/mako-1.1.0.ebuild
index c993bccace2a..df429c95db68 100644
--- a/dev-python/mako/mako-1.1.0.ebuild
+++ b/dev-python/mako/mako-1.1.0.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 
+DISTUTILS_USE_SETUPTOOLS=rdepend
 PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
 
 inherit distutils-r1 eutils
@@ -16,14 +17,13 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
 
 DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' pypy python2_7)
diff --git a/dev-python/mako/mako-1.1.1.ebuild b/dev-python/mako/mako-1.1.1.ebuild
new file mode 100644
index 000000000000..bd9a5bccac50
--- /dev/null
+++ b/dev-python/mako/mako-1.1.1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+inherit distutils-r1 eutils
+
+MY_PN="Mako"
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A Python templating language"
+HOMEPAGE="https://www.makotemplates.org/ https://pypi.org/project/Mako/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="doc"
+
+RDEPEND=">=dev-python/markupsafe-0.9.2[${PYTHON_USEDEP}]"
+
+DEPEND="
+	test? (
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' -2)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/mako-1.1.1-pypy3-test.patch
+)
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	rm -r doc/build || die
+
+	use doc && local HTML_DOCS=( doc/. )
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "caching support" dev-python/beaker
+}
diff --git a/dev-python/mako/metadata.xml b/dev-python/mako/metadata.xml
index 4e2283f56f3f..13bb07869643 100644
--- a/dev-python/mako/metadata.xml
+++ b/dev-python/mako/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">mako</remote-id>
-    <remote-id type="bitbucket">zzzeek/mako</remote-id>
-    <bugs-to>https://bitbucket.org/zzzeek/mako/issues</bugs-to>
+    <remote-id type="github">sqlalchemy/mako</remote-id>
+    <bugs-to>https://github.com/sqlalchemy/mako/issues</bugs-to>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/mantissa/Manifest b/dev-python/mantissa/Manifest
deleted file mode 100644
index 942b93e9af6c..000000000000
--- a/dev-python/mantissa/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Mantissa-0.7.0.tar.gz 827087 BLAKE2B e7201518a87237ba48778692e7665300bf032f06fee175df16cc47bfddeaac62591dbf88247da163e4dd14d1b4fb948450ff09424922ce6ae884527acc950bfc SHA512 a0ef58902d0d752f2643f0c9639d9338a0441651cc0a2c3b45493a79b81757c4b642a7adcc940e0228033280927b7dad460a345fac62da1dcb9d73babd981d8c
-DIST mantissa-0.8.4.tar.gz 832649 BLAKE2B 1658f34d9f3328953628da188849c7b9b522ece03898398ff7181aa1122c82c9aa2f9e4ac862553177fe559d653aa63a7eea0b067ced594215546635f053a839 SHA512 448f26cb540e7d19ede1b39c1b0157ccdd04baeac6cb8eb918fec2eb2bd395e12b0a659633ffb4c260a84c87025b81b41a8e168e7d1f1a0235bfe25f492c2c32
-EBUILD mantissa-0.7.0-r1.ebuild 1318 BLAKE2B 4caf0db1b2d4a926de5ef2dd474eb15d7069fe19db81d76c652605de05a4bb5c453643ca62b6548315cfd111c6333b49165ccd10f21847f1a53501973c4aa4cb SHA512 98830c0b149a485f45100172026ec43b681409ed719c0d3bc47cccd12903397d9ab8d86a26fa92bc72aad361d36a258a4aed6386b4b77343de56bf5ddf3dcb91
-EBUILD mantissa-0.8.4.ebuild 1533 BLAKE2B 4033091812da087d259e056a53ab999e39b585f8d30cd3c5a2faedf10ec23a39e67799828695dde3354f27decdd06915f61ae12f175a97ca56f01ae2ed0d989b SHA512 37757cbdc4d495afefccac998fa5c6fd1a11ee8ba06057f663fe47865c17a067c23881ed5b662cb6e00f4d1db202cec5bd7e5c245cb3aa10d05c0bfb417bee58
-MISC metadata.xml 585 BLAKE2B 2a0ea0ae36f2bf962fc9f3c4c2fd5a43bba8e3f96b0540ff9c834e68e4e1f31a81c002f2a15947fd6e8dd501949d072cf4925c1a73d39592621d11cb3f829537 SHA512 5126e2561efaf55f617c60991b2870cb51ad784f8185bd18650a605139103cdd1b1011e2f4cf8c2ab2b4806b65aee9402ec575f93deedf671e126d9bf2b05ee5
diff --git a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild b/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
deleted file mode 100644
index d1779b496aa2..000000000000
--- a/dev-python/mantissa/mantissa-0.7.0-r1.ebuild
+++ /dev/null
@@ -1,45 +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 twisted-r1
-
-DESCRIPTION="An extensible, multi-protocol, multi-user, interactive application server"
-HOMEPAGE="https://github.com/twisted/mantissa https://pypi.org/project/Mantissa/"
-SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-python/axiom-0.6.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-0.9.10-r1[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=dev-python/nevow-0.10.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2012j[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-mail[${PYTHON_USEDEP}]
-	>=dev-python/vertex-0.3.0-r1[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-TWISTED_PLUGINS=( axiom.plugins nevow.plugins xmantissa.plugins )
-
-python_install() {
-	distutils-r1_python_install
-
-	# remove foreign caches we don't want to own
-	find "${D}$(python_get_sitedir)" -name 'dropin.cache' -delete || die
-	# then our own one
-	touch "${D}$(python_get_sitedir)"/xmantissa/plugins/dropin.cache || die
-}
-
-python_install_all() {
-	dodoc NAME.txt NEWS.txt
-
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	trial xmantissa || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/mantissa/mantissa-0.8.4.ebuild b/dev-python/mantissa/mantissa-0.8.4.ebuild
deleted file mode 100644
index 8b3fd5385d0b..000000000000
--- a/dev-python/mantissa/mantissa-0.8.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-MY_PN="${PN/m/M}"
-DESCRIPTION="An extensible, multi-protocol, multi-user, interactive application server"
-HOMEPAGE="https://github.com/twisted/mantissa https://pypi.org/project/Mantissa/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-	>=dev-python/axiom-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/cssutils-0.9.5[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=dev-python/nevow-0.9.5[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2012j[${PYTHON_USEDEP}]
-	>=dev-python/twisted-core-14.0.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-mail-14.0.0[${PYTHON_USEDEP}]
-	>=dev-python/twisted-conch-14.0.0[${PYTHON_USEDEP}]
-	>=dev-python/vertex-0.2[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} )"
-
-TWISTED_PLUGINS=( axiom.plugins nevow.plugins xmantissa.plugins )
-
-python_test() {
-	# https://github.com/twisted/mantissa/issues/27
-
-	trial xmantissa || die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# remove foreign caches we don't want to own
-	find "${D}$(python_get_sitedir)" -name 'dropin.cache' -delete || die
-	# then our own one
-	touch "${D}$(python_get_sitedir)"/xmantissa/plugins/dropin.cache || die
-}
diff --git a/dev-python/mantissa/metadata.xml b/dev-python/mantissa/metadata.xml
deleted file mode 100644
index be380a8e5f32..000000000000
--- a/dev-python/mantissa/metadata.xml
+++ /dev/null
@@ -1,15 +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 lang="en">Mantissa is an application server. It provides integration between
-		the AxiomProject object database, and the TwistedFramework, as well
-		as web user-interface utilities.</longdescription>
-	<upstream>
-		<remote-id type="pypi">Mantissa</remote-id>
-		<remote-id type="github">twisted/mantissa</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/miniupnpc/Manifest b/dev-python/miniupnpc/Manifest
index 0db358dfe327..4ed417653587 100644
--- a/dev-python/miniupnpc/Manifest
+++ b/dev-python/miniupnpc/Manifest
@@ -2,5 +2,5 @@ AUX miniupnpc-2.0.20171102-shared-lib.patch 1220 BLAKE2B 97fa99582f7992587e5f13e
 DIST miniupnpc-2.1.20190824.tar.gz 94564 BLAKE2B 1569e15bc9a886bdee5192526b83e0a628f0d6c9b4449c547c0c22c2ab1f912b1671d84ead6aa6961161bd99e5f62f8428f3867b8f9ca14e04d5f953e6553d4a SHA512 9ed5fc6fbe6f64fbfa23938043732db1999f3c8585422a660fde04fd9e203d7acf8a5c3f1f1433468ea179f090261702194cf5714601c5c0ed9094250352f175
 DIST miniupnpc-2.1.20191224.tar.gz 94740 BLAKE2B 85c0b3eb678685bc7192dbee9440ec5f5be80cbac4d6a4e0a6473662c66f05ef512322cd535a142ffe16d3099a86f78ea70645a7eb2979c373e7a486aeab0cd5 SHA512 d362f914ce9177c1bc46f1f3ae59069c61c0c9c1b6ea7e78003d6b46445d3550835ffc541c2649b5fbc997d035357b461148edb3648135f33d0ce98b54961917
 EBUILD miniupnpc-2.1.20190824.ebuild 739 BLAKE2B 73bad0a0fdc74606e0783569bc152e113fa3b1424c5eb05dcc6f94d5a64b7c2ff996651c1714aaeda494780af3bd8a6d74a9874780cb5613eb4228d6e7e8cde0 SHA512 a073fdf2b62eef20783fd866fcbc785f90e0b9e60669fc727584884eee03a8e48e101bd9c1a9a7482c1039f63aa1b7e8e9f8069d9fcc47553b507ee9c3d0e708
-EBUILD miniupnpc-2.1.20191224.ebuild 745 BLAKE2B 8ae3f7b8f67acf1223017798aaf71de5146741436873d532256d5e24c158f899e31a02174d481e1e2a2f3550823b9dd90c5fb2252d5871bf6b5566628dc832f7 SHA512 722fbddffc96f82563d51f7d13eeb7950ddcf61cedc44616646bf5f597f405ab0808ed8576af82339a8937f0def52fa068a26a51a5c8e61fd594312484fa3274
+EBUILD miniupnpc-2.1.20191224.ebuild 741 BLAKE2B 7a10b4c13fb48b8a3ac67f1f85415bb73a03453447210e251ba5197c6af0fb8fad7cf006f40a609f9b95157ee882f09c049aa1644840660714c33b002abb8a84 SHA512 e4c3eed34a629410f236d7d7cdca9d2d4d8aa95b939d108990cf33381f7822096dc1c6f023a8070bd89bd9cf79a3115d95d2d1f2a43a511f0fa75f3ee01c709c
 MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild b/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild
index 8c1fc893ace0..5e1d489b2e1e 100644
--- a/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild
+++ b/dev-python/miniupnpc/miniupnpc-2.1.20191224.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND=">=net-libs/miniupnpc-${PV}:0="
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index be3ccb727dda..6f3fb11f361d 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,5 +1,5 @@
 DIST mistune-0.8.3.tar.gz 58506 BLAKE2B a4b96162514ba1b82710c9264d9005f151943d525ff7e28a2fd4a92b16d4c90818715bf851573e25be203537a3059dbec1e86c75ec0ebd0a4b164303c06d7029 SHA512 fc0b6d53e7a62712b752bff77c2529750628e9e1eeec02603bd2c793f9b0a46efe31fe7a749c5d6aae3c591d74e43c45e450179650bfb57128fb0ec366de6aa3
 DIST mistune-0.8.4.tar.gz 58322 BLAKE2B e65d45c5c95706a49a7fd407afe5f10e82a475766ca272ec3bebba8c89e670fe6efced7b09537efb69d3fd36e75091e370170a15ad7488b5cbe9186e2ccaf4db SHA512 36c3ef5d5537f5cceaa43e4da20a84b27c378cb744a93f0380024faefde490bcb42c453f79002ca049083fc437278f4afb3e10de5462f9eeb9077ca2a2fcaea7
 EBUILD mistune-0.8.3.ebuild 744 BLAKE2B 06c27d31d2df93373ddde1aac9d8ae5a0c0fa678815965c63a3a0c7f85e17c262fe7c935e45efa041cd62ffd75f566dcd703ca3ccc18355bd59ba84c81dc287c SHA512 fa16e34d129e753f90d6df135e236955c5745b28402b8608088949c16f415c3ef3882787a228a0dbb7aecc0b8e8fee2770f4b218319494302f1daafd3bc28c72
-EBUILD mistune-0.8.4.ebuild 626 BLAKE2B fd0df68b0ba99ce4c32c559e297e01442160e12e96a0b7d3c8d32079dc43e6c2bd20f635bcff906fa09e8f07e97b921e32188127f8bc3a0566b93fb3b5e21d0c SHA512 aae3f3dd05a7d41bfb72e175603416f7c3d8495bd339c5692f6622a148efeb5e84e23b42e6c918e9f824aa100d229bc273b5611f91ac8e1a9329c5bae4a30abe
+EBUILD mistune-0.8.4.ebuild 624 BLAKE2B 2e53ce0d1d6c5b7028682e26c9d2b5b83b9c0803920c0cb9cafccefcfc5ccd75c6eae2eb2311f99410c4f31c59742b810cc4e4a9d51a5d0235fb8e4833bdded1 SHA512 20aed9107615fc6d9a9b7578a595182ff14ceca93c68ecf18882276fbf716f40fee6afe25ee0633db6931c0228d3c357c3355673b3e105857e9028c4161995fe
 MISC metadata.xml 377 BLAKE2B 6c495d3d88811994e4baf0aabb5267343c09162239cc655b5fe4f9b8b63df4cb08dff0186cbe6b63018eac2cc2489a3f612f72d49885df3055591da74f5fa5a5 SHA512 3630e9ba514f3f3b1ecf532ca928c3bc89c05ab50a9113ab4b1d609edf07a6421796774ee4a71cf17ea3c2939acea24e22a74f33b66fe630706dcd6482cf817e
diff --git a/dev-python/mistune/mistune-0.8.4.ebuild b/dev-python/mistune/mistune-0.8.4.ebuild
index f618deea3cd6..e41ac1dbb0ad 100644
--- a/dev-python/mistune/mistune-0.8.4.ebuild
+++ b/dev-python/mistune/mistune-0.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
diff --git a/dev-python/mkpythonproj/Manifest b/dev-python/mkpythonproj/Manifest
deleted file mode 100644
index 09c3e47d2a72..000000000000
--- a/dev-python/mkpythonproj/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mkpythonproj-1.9.tar.gz 34828 BLAKE2B bd8302e81285ee8922f6eb04de94820cd978a3e236504e1072eab3b48df4e39c44545d69043b011dbf102397528f00ddd95dcd6830d6ac5f4a93485d58850ed1 SHA512 6ace3a00657ca1e853b882e897ae727eede5f1f5d72f016b439be2d747ea7cf4954aed85032a50549c1a44f88fd98afd727476bef77797fa53c2234e1d22673b
-EBUILD mkpythonproj-1.9.ebuild 594 BLAKE2B e61d55c07aa8adab702415a37e491b58c4dd6047beb4f1e11635a5803fbc494267f41bb2589bb500791cb91ae963c23dc4492fe26579615cc2e8786f0f3d3796 SHA512 46c4c2c091ccdd1cdfbb26bf389b11a96ecf536f9cb256a449ff46eeec079731effdb2d27b123ea4de4221b7e1274e927e066ca31e526bbe8125c4070eb882f7
-MISC metadata.xml 239 BLAKE2B f298704840f96f80c1e9ceadb8449d5486b5f79ec5e8c862ec28f7f1c274c79b6c1ebf72239ed5a6e5f79f5e5f947a7b0bdbecaea0a4dbbde88a23f63aa25eb8 SHA512 aaa56fc28c4600c5b0de6d837feece75d69a7ede375e5758766f46dc4fb44060f35e6d6eb343bba9e1698400139059e2118fa401969cdb66b80f422c95b59ca2
diff --git a/dev-python/mkpythonproj/metadata.xml b/dev-python/mkpythonproj/metadata.xml
deleted file mode 100644
index 47612bb6972d..000000000000
--- a/dev-python/mkpythonproj/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/mkpythonproj/mkpythonproj-1.9.ebuild b/dev-python/mkpythonproj/mkpythonproj-1.9.ebuild
deleted file mode 100644
index d8d6df081f54..000000000000
--- a/dev-python/mkpythonproj/mkpythonproj-1.9.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Creates the framework for a new Python project or script"
-HOMEPAGE="http://www.seanet.com/~hgg9140/comp/mkpythonproj/doc/index.html"
-SRC_URI="http://www.seanet.com/~hgg9140/comp/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/morbid/Manifest b/dev-python/morbid/Manifest
deleted file mode 100644
index 9133ab01230a..000000000000
--- a/dev-python/morbid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST morbid-0.8.7.3.tar.gz 15054 BLAKE2B 17bd4637c096cbb750bc5b6c4266c6f2e21f1560b34b367380e244253e03540ea7045f7609dc65130c0bea856505af8bdf3528431b4e98f499072e0f56f96ccf SHA512 50a01e75ecf1691dcb6f4354647038627196eb4cd37d6e44812912bf0890870d307c8705f6894ecc389a86508d2dc81ed9195408b922c5ad140104a9b78c26dc
-EBUILD morbid-0.8.7.3-r1.ebuild 630 BLAKE2B 106d3d15decde4dbab16484774fbcec80705c478f4b02a194c51bd316cc21c86d0356095f35fc24087299c777cce5128f4265a0590fabed203ef6d1c122faabd SHA512 83a05c5e7efecfec1e39abe3b7e7d7d7c29ce1f84f5cad90a7debece1b8ae5203e1ee05ec124efe2c29e5c4fe219518357b9f653df3bb3769c873d773664ad24
-MISC metadata.xml 309 BLAKE2B 3b56e1c4a7e92504cb27cad78d4ccfed617813334ea4d7b885de7b2db97963887a865352d71bbf671b6d3b6f5915afad3d750befbc6c3de87f43b7470f1138b4 SHA512 30fff36a70026750507a9682e3482061c6451e7035611941964bec90896402489e13c155acbcc9ca082bb3fb090fea0add83971234e2611c1eddc1e20350e20d
diff --git a/dev-python/morbid/metadata.xml b/dev-python/morbid/metadata.xml
deleted file mode 100644
index cb0bbdd88866..000000000000
--- a/dev-python/morbid/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">morbid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/morbid/morbid-0.8.7.3-r1.ebuild b/dev-python/morbid/morbid-0.8.7.3-r1.ebuild
deleted file mode 100644
index 3aff351396da..000000000000
--- a/dev-python/morbid/morbid-0.8.7.3-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Twisted-based publish/subscribe messaging server that uses the STOMP protocol"
-HOMEPAGE="https://pypi.org/project/morbid/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-RDEPEND="dev-python/stomper[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-web[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/myghty/Manifest b/dev-python/myghty/Manifest
deleted file mode 100644
index c89fe70e0563..000000000000
--- a/dev-python/myghty/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Myghty-1.2.tar.gz 292439 BLAKE2B cfc7bf97be933a40e1360ec119e28d30e8ffedd3e72604dc735c48d461059bc0024e81d44e08ac6f50a4e0a103388512dbbed4a29f63137e51b45635a48f1833 SHA512 a4534149241e794eb8a469b062d2696076cc5bc0fc07f3e093dc2ae0e489a9e79ce6d053f75ddc5b5ab64de9c0e4341d801e7e595dd5a0dcc24a3551fcef7098
-EBUILD myghty-1.2-r1.ebuild 1013 BLAKE2B f6181fa6a0827b870386716c9d16e2b9e304611ed7843b267836daf72bd56065fe2ec85a42b0159027ae6361da8714e9e8d8542c14b69502d212884cd397b387 SHA512 fad708900b201954b282b1fd465b9118899aea34de2c70b276b745fa1249884a3b2957d19024312020f723b2bd3aa6cc97042ed55f4f01004ceef3193a304b62
-MISC metadata.xml 309 BLAKE2B 092b228974bf5b89e6430f4491623f41a482e21f76b0f8551fd7da90804629a563395ecd357218d2a8005954f19d2851fc5e060c4766c86aaf19872d99ac51e2 SHA512 56372c565bd19b3c3d1aa685e74d20658afc18f6f60c08bfa95d808f340426c54bce08ef60755b5ae547356769e8915c2406561db42ea455a2da766a954bd80c
diff --git a/dev-python/myghty/metadata.xml b/dev-python/myghty/metadata.xml
deleted file mode 100644
index 86506524630e..000000000000
--- a/dev-python/myghty/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">Myghty</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/myghty/myghty-1.2-r1.ebuild b/dev-python/myghty/myghty-1.2-r1.ebuild
deleted file mode 100644
index 66668284403b..000000000000
--- a/dev-python/myghty/myghty-1.2-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="Myghty"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Template and view-controller framework derived from HTML::Mason"
-HOMEPAGE="http://www.myghty.org/ https://pypi.org/project/Myghty/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-python/routes-1.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	dev-python/pastedeploy[${PYTHON_USEDEP}]
-	dev-python/pastescript[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	if use doc; then
-		cd doc || die
-		"${PYTHON}" genhtml.py || die
-	fi
-}
-
-python_test() {
-	"${PYTHON}" test/alltests.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		dohtml -r doc/html/.
-	fi
-}
diff --git a/dev-python/myghtyutils/Manifest b/dev-python/myghtyutils/Manifest
deleted file mode 100644
index e221ef5348d7..000000000000
--- a/dev-python/myghtyutils/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST MyghtyUtils-0.52.zip 31038 BLAKE2B 159a11e1d426d77447cbd327f4855afdf28a94994ee13d02c6c1f7898f3e1aa94d4da2d8793c59e24eb593e73bc95d084af5fd9cb0f36243942d9365af747172 SHA512 353174413c74ff440db299e0aa4c64cf01f67282f7290df8a9f7156c9efd6e502217ec8fa972ad91d37b0a137c5367378ece325f7f32c0f9fa83cdc0c15aeaf8
-EBUILD myghtyutils-0.52-r1.ebuild 602 BLAKE2B 5185ddf4d8fae2a84d7ea4f3d442850c09dcfcfbfaa79bd07c414bd11af4ce77fdd4475026e9bd16e8474699dde9314c423665e81e67bbab75c9515d4041ef06 SHA512 627ad5cb623635f724481cdac0907315ce714d5d171ca25ca6db0bb0375c5fc908dd14814a6f18436f354a4ca4afb1b49e46b603e00cc3f951b60cdef2cfcd91
-MISC metadata.xml 314 BLAKE2B 70ca25b76e378acd580b0cc42b94d7783f7e8c8d3daaf9d2225aeb1580eb34ab0a27efaa742c6abac3b35c3160a15672bb3af2a7be777fd0dbc873c55713fa44 SHA512 37dd8047d06d6b60fa54c2845eefd35109fd7c5a1923597db27a2623eb00b5adf2a52f7dae6ff3a751d1ee2f55c432234307f17c3abebb3e1135d68b02a1ffff
diff --git a/dev-python/myghtyutils/metadata.xml b/dev-python/myghtyutils/metadata.xml
deleted file mode 100644
index 0aa6c8c5ce9a..000000000000
--- a/dev-python/myghtyutils/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">MyghtyUtils</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild b/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild
deleted file mode 100644
index 556f6b1641df..000000000000
--- a/dev-python/myghtyutils/myghtyutils-0.52-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="MyghtyUtils"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Set of utility classes used by Myghty templating"
-HOMEPAGE="http://www.myghty.org https://pypi.org/project/MyghtyUtils/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/myghty[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 8f327fa3afc4..f2d127412fa9 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,7 +1,7 @@
 DIST mysql-connector-python-2.1.7.tar.gz 11781659 BLAKE2B 332092059a32249e449f99540beb9eebf80e9381cef4560208412a19385894eb2193f02d5a20aceafe9644b8a225926a02d57c3acc89ba7d321b6d0f9c7c4d76 SHA512 f88c3a6dd3c3c1cd5c16165daef801dbcc7ea9163406273dd751e25687a57dcdf4ffbcdb65bb107e8cd9d7c91029823f625dc19ab34116398263fa074598880a
 DIST mysql-connector-python-8.0.18.tar.gz 12037201 BLAKE2B 54dc45c9ecc09bad755bafec2b3b73e35368f742f30c8644764c8c892c6f79c3b6b438cf38dd9ebc878cd76d5d74d71be6668a903b57b3d0feaba9ff6f5b58cc SHA512 cb441a6388de8609b56e4d9885ae2491d207c7b1e3bb387341d55853d383eff6e268e34feb32b42797c7b210d35f9d6dbc302ea4c9ed2441a76b91ea66d504b2
 DIST mysql-connector-python-8.0.19.tar.gz 12051609 BLAKE2B 252d4ee650c1eddbe54575451ac378236b6a795237c445239ecec096c7adcb60da2244592f083a50df57c9e2ae6447f1dcaf861042973a31c3fe7292509ef93d SHA512 9137b0b6aafbff16c83f59ab03da810232a92f6b76e38f460782153c5ddbdf6ae55d0c72a0c7902b7bc05ad1010bdc849662cd3d2138ae93476abf013e7a508f
-EBUILD mysql-connector-python-2.1.7-r1.ebuild 983 BLAKE2B 011b881be64cbc535c28cbd49b599fddd9fad3c46cc1cdab71fc18b4a676bafe6a63c48abdae52ad7f35d1704642f93f8a875ec63b5577b23f13a60fd75af1bb SHA512 da530859a71e8b5838b76a688db1a3aba2a0aa248e3c5e66ac4e059650abe94edfc999d21ec0278ebf0bb26fe67d05495e50e3cd09c5b0cb037272976cfa695f
-EBUILD mysql-connector-python-8.0.18.ebuild 1483 BLAKE2B edc92a5a406b6b71abaa1ca4cde3c7f79901054cf2c413c06b44aa39f737fd10f56fe6ed32d45f2fe44ceb7ecdd4c116729630f08cec2a3404e66b03e8d997d4 SHA512 955a5d5bca969940acc080188ad58a7e0675d72e3465685ea66926a2587cccf2fd0cd317798fe9db06a8349adcdd3b0747521be19ff6ec4cd64d5eb2c408dbf3
-EBUILD mysql-connector-python-8.0.19.ebuild 1485 BLAKE2B 11b3c983cfcdb0151cd2bcb11d7c220852c9beff22b86c8a43c5aa40f43079ab5612386fe0b1be108df2641f77ff5d50b1f964c8d6d13762d4019e5484365dbe SHA512 d1e5f7b594021b130321f640d322bbe33534cb60e1fc262c9af05f49dd97c2e098c2434bc793179300c1db71e647d17cfb7c9276e86173330faec9f94246b68d
+EBUILD mysql-connector-python-2.1.7-r1.ebuild 984 BLAKE2B 0623eccb5346218340ec0bca70fa6998511ffb04c591b6b7c5182c194a0d9f04fb477da4da7c6fd653caa3e8b725b2a23a4502b755b29ec4f509d3301735dcc6 SHA512 54c3377b0e31f96f73b9668d73af800aa52a8d544f5b8347674c448e8b28d9ab8977eea7388d2c5cd1b676fca542ab6c9b312bc85fcd90cb622b1d27b43c7dbe
+EBUILD mysql-connector-python-8.0.18.ebuild 1484 BLAKE2B 7bd5e067512503ebba524b14dfdcc7e5442bd57439136cdeda2795bf372d1e270cded80ed2a430cd85004fafb328bcba8c48669f1ed4d6b3faf4d35520e7b636 SHA512 2482ffd9ee7e171dcb9d5e2d5f658a6a8cb3893278e4a2ac6c515af368b7a2499e76d1de89bbf492fb59ac4443d62b7e177431b5c0be362eae48e0e769927df6
+EBUILD mysql-connector-python-8.0.19.ebuild 1486 BLAKE2B 79d839bd889d5ccab640f76735439eeac3c5806023c19aa71448793b3bff33c8952b0929ee492d0b0fe93981b3f124a1638d467395718937945cc666496bd767 SHA512 8b0b9770e59ae87999b2c36795aa60098d558795bc993e81d6786f7b5a1285061b6bf0ac975b95e40aaab9a608a33824c0686f1bbff8e89f82edcefd59a7e733
 MISC metadata.xml 336 BLAKE2B 280111bac38fbd60e25601789026033a61dab0c2706af1874a765aa3a697cdba5d5b051a0dc28490782cf135104f92e793c68d02b74bdcffdd113252b9a3ac7d SHA512 27da38ceaf7dc44250dcb4651e2d171f1ccf0d5a3a2c04845dc6369e1a264b71ea909f7d799d3eabbd989f4c9c37c201f511887956613bf7176697da63378838
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
index 17033a7a7b03..101dc7922036 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-2.1.7-r1.ebuild
@@ -29,7 +29,7 @@ python_test() {
 	"${EPYTHON}" unittests.py --with-mysql="${EPREFIX}/usr" --unix-socket="${T}" --mysql-topdir="${T}"
 }
 
-python_install_all(){
+python_install_all() {
 	distutils-r1_python_install_all
 	if use examples ; then
 		dodoc -r examples
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild
index 5a3e307aa1d3..bb4fd728f8e4 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.18.ebuild
@@ -44,7 +44,7 @@ python_install() {
 		--with-protoc="${EPREFIX}/usr/bin/protoc"
 }
 
-python_install_all(){
+python_install_all() {
 	distutils-r1_python_install_all
 	if use examples ; then
 		dodoc -r examples
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.19.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.19.ebuild
index 6bdd001c81de..d232be34eff5 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.19.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.19.ebuild
@@ -44,7 +44,7 @@ python_install() {
 		--with-protoc="${EPREFIX}/usr/bin/protoc"
 }
 
-python_install_all(){
+python_install_all() {
 	distutils-r1_python_install_all
 	if use examples ; then
 		dodoc -r examples
diff --git a/dev-python/namespace-repoze/Manifest b/dev-python/namespace-repoze/Manifest
index c5034581c30e..5691bd80aa40 100644
--- a/dev-python/namespace-repoze/Manifest
+++ b/dev-python/namespace-repoze/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-repoze-1.ebuild 726 BLAKE2B b852a2836ea307ed5bd27860e38f6787dcec5c615e59d4688fcc9ae72e62f7d1535dcc67a087002175bc4830280d66e4c6e52856521179c5e6ed01e0242067fa SHA512 b54c234700c8e87e5ef3998afe5fd81a33228da203d9abcf16789bbea41366575e663f552f4295554b745350b0bf42ede32e9c437fadd3c6fa3244b91e448b9d
+EBUILD namespace-repoze-1.ebuild 733 BLAKE2B 102b1e91797656f05344e22d8de80b29e44aceb0eaeb4f8f6a3c013105c6200af961c9ae4eb922fbff9b20de9836d231df611eb976b466cf35c52849c7680f32 SHA512 b3ce543171cba648e7d94ef280ad41f48a49eddee7a0db46b93bb866b7047e50e5043c2070709b0dd9e8f252606db7fbb743c363ea0d53a2f7dd1a2b361c669c
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-repoze/namespace-repoze-1.ebuild b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
index ac9e525877a5..7bed309424e6 100644
--- a/dev-python/namespace-repoze/namespace-repoze-1.ebuild
+++ b/dev-python/namespace-repoze/namespace-repoze-1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index dbcbff05e731..2bd3f1be3244 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,5 +1,7 @@
 DIST ndg_httpsclient-0.4.0.tar.gz 24038 BLAKE2B 147ba36c966b2220c068ce3376bd84259807f66c57141fee4ed95457333cd9d568d19fd4d3348e7ef25d456e3f7d794f83f8302a15beb16f451aa02ef6181848 SHA512 3c0225a20c25cf0f12f03005bb79e738527c0488bb660c1eb3b55c505a0ef503002d37fcffb3d013e5f91101bdd03080a68d5805d6d29b682cc01bdc9f0e4a19
 DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e5430e7fbb5c2bfd444e4051c60a9ac14ecacd3048f87f546516bddc4c0403738aa3ef227b3fd763a48bca28da09a47f707 SHA512 c7d6f442242ce01f69d2386b8ed41e4e5f72a2523ecbe38785c4333405f1b000e298133ccc4169d9685a3dcdcf0b20567c8e4b2dfd36f42721d36c73ee27d90a
-EBUILD ndg-httpsclient-0.4.0.ebuild 797 BLAKE2B 114cc9d20b84ec0919330441da6501ce50ef6526dbd9beb38ae6963814c3ea203b32bdc7bf09462c29f5811fc69e19e51d38c3c50ef1a3f0186e90c216e47af7 SHA512 39a2e7afab6c2d985897e650c3696201cbf2e0370ea0c569668201f2133bf8007d73b8ac52f92f49288b4e1684f81ab8f6d440e32355a9fd18222bb352beef90
-EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1656 BLAKE2B 3625e426f0d4490b8f0b7a513879bbb65562dc9adb2d6d179921c17f619be446713829478f12aaf747a6e96cc273f634f502833df4cda2365e0dc5b15eedbd8f SHA512 21a5883444f24f8ba8d71f22f9489e5b77e763b631211cc3599698d94c7f865a3ce782f399718cea07022bdcd6824c777338f83f108f5ca6af15576a2462c52e
+DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
+EBUILD ndg-httpsclient-0.4.0.ebuild 787 BLAKE2B 834d5a9e54f39561fa1999a8f317470680c5fdb0cea7bd86550ebd88040bc3db5eea624f31b5b142488f0d58b2e342a6909c4a166b3599ad515505998cffcb90 SHA512 04a8cc8281d293215f8f894e5c719aece764391182198c931a6527d10b5be61f70e70bfab69bcfb2d337fa3202675108f7dce8a3456eb4a98e22353ec7af4474
+EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1646 BLAKE2B cbb77db68c57078b1294113153e4106002dd86a2bd47dc2eb4305d854d40bbf299e619003ea8ac7e4bbd15899e17fe6ea95ef63f938097d33b1ab4434a2b1a8c SHA512 73259967137b56aa1ae1cb75ef0e42cef804d947022a20553f6a27cbc4427905f366a1988bf9716e46eb4262edbbebfaf88051efe329f2ee3a33d2f67e50f6b2
+EBUILD ndg-httpsclient-0.5.1.ebuild 1236 BLAKE2B 0de4e9ad384177545443e9756932ce0bd3a79ab48982ecf50bb6dd98139cb27321c0a624c824126dc3c517502c41dd0df841fba94d86d244735efe6d65e28eec SHA512 0e02b417b139178bd5c9ab50b1bfda970ef134a26fae202e5a90e8477c61bef9f07e0ab79fe31a55bdec379ff7247cc361f750ba8a78dd23d4d715a3958d48c6
 MISC metadata.xml 393 BLAKE2B bfb003be060fefbbdd7e46aafa06dba5c0207726a303b4d0794a115b2995bb65505ceda29ad37f0cf6d86a8f1c0521f14a004869ec8d8051e374bd11255e7266 SHA512 1092b2a6c3d9ed56cc6429ce9b1ffeb14f18934f2dc8dc9e34b28eb9a048304f31634fe2d7265a599afd338033605c831290b903e933e1a1634ed8fdbb1719ae
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
index a96ed1a10945..6eafff557f9f 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_6 pypy3 )
+PYTHON_COMPAT=( python3_6 pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
index f63a67698c44..fe720e015ae6 100644
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python3_{6,7} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
new file mode 100644
index 000000000000..4ad33ed68364
--- /dev/null
+++ b/dev-python/ndg-httpsclient/ndg-httpsclient-0.5.1.ebuild
@@ -0,0 +1,49 @@
+# 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_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
+HOMEPAGE="
+	https://github.com/cedadev/ndg_httpsclient/
+	https://pypi.org/project/ndg-httpsclient/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+S="${WORKDIR}/${P/-/_}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="
+	dev-python/pyaes[${PYTHON_USEDEP}]
+	dev-python/pyopenssl[${PYTHON_USEDEP}]"
+# we need to block the previous versions since incorrect namespace
+# install breaks tests
+DEPEND="${RDEPEND}
+	test? (
+		!!<dev-python/ndg-httpsclient-0.4.2-r1
+		dev-libs/openssl:0
+		sys-libs/libfaketime
+	)"
+
+distutils_enable_tests unittest
+
+src_test() {
+	# bundled certificates expired, so we need a time machine
+	local -x FAKETIME="@2019-12-01 12:00:00"
+	local -x LD_PRELOAD="libfaketime.so:${LD_PRELOAD}"
+
+	# we need to start a fake https server for tests to connect to
+	( cd ndg/httpsclient/test && sh ./scripts/openssl_https_server.sh ) &
+	local server_pid=${!}
+
+	distutils-r1_src_test
+
+	kill "${server_pid}"
+	wait
+}
diff --git a/dev-python/neutron-lib/Manifest b/dev-python/neutron-lib/Manifest
index 788858c86f54..90c20baca058 100644
--- a/dev-python/neutron-lib/Manifest
+++ b/dev-python/neutron-lib/Manifest
@@ -1,7 +1,5 @@
-DIST neutron-lib-1.18.0.tar.gz 395616 BLAKE2B 4970a7254eb3d94e06f332a9ac75d371db370fe1348497d86a535e3a12fb9f56652b319d23e9d6e5b83aa0fef30ff9c903704e00747e1176097572a7a0ec2a19 SHA512 8b20fab0f2b0a7c4ffedc0012fe80a0b1a972233fd4a4f1b5c68c77f4dcafb67df3074573453961a087481a821c2df4696a1e186adbffc09f55172cecdc1c132
-DIST neutron-lib-1.25.0.tar.gz 434978 BLAKE2B 5e7687862a8e02b1b7cb1e10135f7940c5e42c96f652ed3e694d8ffd12a55528637928ce31c6511367b80251feb609fcc6b1c92ea73c3ecc27902798d68f63bd SHA512 79614d391e6b812875312970b1cd020bcd3fb6c9135935b8f3e7a2c611d1948a9ddfa33a5f625cd6badc80c1a2fc37549add85a09dfeaad0422353b7e641e9e9
 DIST neutron-lib-1.29.1.tar.gz 454760 BLAKE2B 21dc2059d7e34e8fb155620d176da999e839019915d6d37bfc0caced305964402a38ecc8f4cac59c1e9c89db9a57a6116082253d8359835ad0460e828c447a6f SHA512 b6f646806a137cd0114663c5f192b9b20ee72af30d453a19218a00f25cd48389f0888ddec13082838cf1c88cb6c9204a08f73b0605f82801b9f4abd610ab6798
-EBUILD neutron-lib-1.18.0.ebuild 1987 BLAKE2B d18b6516ed675fc6d3909058706a5478802deae4928bf23917298d4556f63cc266e01d11b4ee232f0fd1a6c1642378079e9f7686ff76d72b7b01b3a2747c9514 SHA512 da271ece2d464f9a887940d9afadf9f6fea00212f27b5a80b1cfd1b840da6ad2dfc2c691f0b53dcf37fd2d6ab2d7cc64c5cf9ad206e1eb8e32c91af24ea6360d
-EBUILD neutron-lib-1.25.0.ebuild 1893 BLAKE2B ee5295e0b69a16dd06e00b2edfc5f8e8b9d04795e639e3c65007a11e6f1aa67a463ee6798164983e7c02b33e76ff9b2c458e9f121687c22f69ce7a7786a7b4ae SHA512 3095536d04cde366777e0eca13af4bc3ca5faa1244b4cb52be008279f2559c278ffc9b881b35dc0402c41eb1a7e8a5cbe1d7a28ec833c7cd55aa6354caee0ca1
+DIST neutron-lib-1.29.2.tar.gz 455629 BLAKE2B 2969a7d844ec5a972bbd5cacc07d3fbeb59bb9a62bb98a94d6fa60dc1f0b7796499433fa54de80d96e2a467e3c022092e816e282e390febeabc8d87d1c13273f SHA512 9c3398e268be56864410fd7c71d796c3944f49c334faa1e7099fe768f1916b23b2b996d06c76c23b54a1889b605717091c787d345069cb51852f3f9cae636213
 EBUILD neutron-lib-1.29.1.ebuild 1985 BLAKE2B 14e1044528257d70746e1f4c2d7890ded39c4e342979d59b5f3568da4eff211eee5e8aaa5fe99d0fece1228b957d9937e5c234aa64bb90b3b8da44bc2a46c26a SHA512 8fc3ef8b0a245e5b777d68e98396a6283090e307c223cedecf948d6d1ff64831219fa2ce39baf7987515731ffb113848ad4063750a28ce95ac8f1455c3254890
+EBUILD neutron-lib-1.29.2.ebuild 1987 BLAKE2B 60534e5d5ab69adcc81c90206d742c3e1b2e7037c9f8abf305203c6010cd2acf4fdf566c7f97a4b49bf96f6ac366da6ec4f3e3d87f7e465a4730e31ee191cfb1 SHA512 04a9831882c2297177aaad524172324f12bda3e0f02ccb6abad6253b15a7c11d9afff67caea8144cf5ca295e254adcab3ae5bb8c9e27b50a56119f84d4b85348
 MISC metadata.xml 478 BLAKE2B 479b1ffc2e6b3de332fbdd2612c50a3471bd26615beed90810463b56122faf219cb602818de421a16c1e3227d13f5553d9db330dbbcfd6e67a725a3479566f3c SHA512 c642bad9f710c347629fca6952be3efe57e247dee81fac187d4a6458b4cb8280dc0d3d4a66e4d329bfd293b9e27edbb7a38247311fbb817088eeb70c441737bc
diff --git a/dev-python/neutron-lib/neutron-lib-1.18.0.ebuild b/dev-python/neutron-lib/neutron-lib-1.18.0.ebuild
deleted file mode 100644
index 0c00989638cc..000000000000
--- a/dev-python/neutron-lib/neutron-lib-1.18.0.ebuild
+++ /dev/null
@@ -1,51 +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="Neutron shared routines and utilities."
-HOMEPAGE="https://github.com/openstack/neutron-lib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		${CDEPEND}"
-RDEPEND="${CDEPEND}
-	>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-	!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	 >=dev-python/pecan-1.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.2[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.3[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
-	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.29.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.24.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-service-1.28.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.31.2[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/neutron-lib/neutron-lib-1.25.0.ebuild b/dev-python/neutron-lib/neutron-lib-1.29.2.ebuild
index f6fac8a2e762..4501586dd885 100644
--- a/dev-python/neutron-lib/neutron-lib-1.25.0.ebuild
+++ b/dev-python/neutron-lib/neutron-lib-1.29.2.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 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
@@ -27,8 +27,10 @@ RDEPEND="${CDEPEND}
 	!~dev-python/pecan-1.0.4[${PYTHON_USEDEP}]
 	!~dev-python/pecan-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	>=dev-python/os-ken-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-concurrency-3.26.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
 	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index 7a5d6d686811..992a1428a963 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,6 +1,6 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
 DIST notify2-0.3.tar.gz 8798 BLAKE2B 57e1eeaa96b9e5354991db36440abfbf80471887c094e41dd6ccff72f1b1b35524bebf83b44afa455c64cdc3fb7b0ef66d2517ca499340a3d001e796828ff9b6 SHA512 3290a5ff291d5500bcf631094fcf10302b234353eb8c26b91e7cd264238443866aadc15224d51eb6608e16b7ffbc9316d4bc551e5ad9de2a48b12a31b195739f
-EBUILD notify2-0.3.1-r1.ebuild 671 BLAKE2B 7d602cb1b6fad935ea4bc814ced510909335c4d4bd448b16386381d0947bbe26616368209f9fc3f8e934cd6e2d5b94eabee75e8383cf5cbc7251aa2a0dd8468f SHA512 35df20cb15936fbc89c96a6d43477cb3769326d310f12cd9a902c6e0172547ddae4347ce8264ae5b223b60a91df390c91ac3edc00e9c2edef63b77760a8ce87f
+EBUILD notify2-0.3.1-r1.ebuild 700 BLAKE2B d50495be8f7a580b5c3a313dd9af07b122d563e09f33f108587d9cf8db2f1cee521bfa1001004d7adac359d9f785a3e5a79a94dbfb874c7383479ecfee32f14a SHA512 03e2cf512bd9e5bdf11f0fbbd4864900e2a9cecffb280b6302369f84bd3cf974d2e15cda0a09491d472192f7581d6ca235e1a4a30d516fe2e68b1fa465896bd8
 EBUILD notify2-0.3.1.ebuild 667 BLAKE2B 9cff613acf78a5471cfe73e5210e040fd980dad46ee8f04027b28647924246110373bbd6e343ffa1f6e6941ecb0dec122823ad515d24a65f9b6d1c957c7e096f SHA512 2ba67f532c2df4586b9c157cfa5b830b954bca22d64640bbb1f97839fb699352137f3ac302ba257a881dabf3843a563597c492520aa684193a032839311bd5b0
 EBUILD notify2-0.3.ebuild 662 BLAKE2B 454554f3f692ca9fc5a0cea4c2c231f5a0281ec76bb0b266a1bea9cc257f760ac4cbe70705dbd25bd13d05a038edfc9ece9f26a9dc518057a0aa6486a0b34c9d SHA512 04a55e99124cdd89031ae282dd9d73e4cb9fa13a306c50ea575a0101d1a9877255a648aa1931ca775cf8d3f921ae81ae922856d4989428216391d040fc25abcb
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.1-r1.ebuild b/dev-python/notify2/notify2-0.3.1-r1.ebuild
index bce48f799b80..d91edd3ff6af 100644
--- a/dev-python/notify2/notify2-0.3.1-r1.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r1.ebuild
@@ -2,6 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit distutils-r1 virtualx
diff --git a/dev-python/ntlm-auth/Manifest b/dev-python/ntlm-auth/Manifest
index c0fbc12e751c..d992ab84e3ca 100644
--- a/dev-python/ntlm-auth/Manifest
+++ b/dev-python/ntlm-auth/Manifest
@@ -1,9 +1,3 @@
-DIST ntlm-auth-1.1.0.tar.gz 38624 BLAKE2B 22c6fbe7ef95b7ee88b803b7ccc5f63f1a27ec9285a4527dac20c3d774abef9765f8a7aa7265effd70869f02e09e6d3b8012c50b703c3b0979e41c0134843be2 SHA512 0c41cfab957c48d5fabf391422323556289cc6d8ba5a50c82bb179f6cdbf68528f005c3987e0b47fb47aff2fbcf00deebb0ac4220df6bd08d335879344f8470a
-DIST ntlm-auth-1.2.0.tar.gz 40006 BLAKE2B 2fbe7533411dde27938412b3e5e1292ce0fa197abb048c0e52f521ff351bd7e51bdb83b5fd8c1f05e0bb3ce206a4442b8b7059c859eea7333ee2d20ed2e7f7dd SHA512 4fa537c5a6a7f3493df2fdf49261f9588b7aac876f72b7a7ef5b8a7a1dd971d9426dacdc8bbf520cecdbe5b7adb916ddcad9e9cf4df725b69793299304601912
-DIST ntlm-auth-1.3.0.tar.gz 40684 BLAKE2B 74c2b914f508b5291cc2a23ae99417db5e5ad9fe107c03f63c795bd4da202db2f1a4f6f289645d2164e708a5a5a2e3bf626aa749dff3367420d669965c462b71 SHA512 e2d5401161ba6f9fed377a7bfed501d49ad64d5104accd7df298747abade34a3ddac9e68332416a3ab68156e9bbf7a8de6a8a271542d080cafaa84ee19f01986
 DIST ntlm-auth-1.4.0.tar.gz 40745 BLAKE2B bf2c0dab7303cb0f87d83ed11d79bc12b8f74095f2f251c190eb43879bc0e9419dedf706fcb4929c51138658910bdfa836778084b34c974ca120aeb848e2da0e SHA512 abe0260c66e2b5f57c1fd672ea121129926f1c32020166dd61973cf51f6bd320f6057f3a148d602b96d8417c2ad57c335048da185100417401e049ff14b46004
-EBUILD ntlm-auth-1.1.0.ebuild 466 BLAKE2B 0cb17e871694c673b235738fd99d7a6b2af5b26fa216ff70c313d184aab07b459753ea13c419d61faa3211d8e70ab05f62354db1ebc88e648d067d36d51bf840 SHA512 49261a38c2cd7b9ba3f160d3517d4400de888d2c67a99117d34aef74f4b27ab6f2821373addae42d07e7a5c001441d9613371c4dedb2dc00006fa25b1df5dad3
-EBUILD ntlm-auth-1.2.0.ebuild 466 BLAKE2B 0cb17e871694c673b235738fd99d7a6b2af5b26fa216ff70c313d184aab07b459753ea13c419d61faa3211d8e70ab05f62354db1ebc88e648d067d36d51bf840 SHA512 49261a38c2cd7b9ba3f160d3517d4400de888d2c67a99117d34aef74f4b27ab6f2821373addae42d07e7a5c001441d9613371c4dedb2dc00006fa25b1df5dad3
-EBUILD ntlm-auth-1.3.0.ebuild 513 BLAKE2B 9153dcc58e486d49a30c80afbcd49988edf684a13856b2e57c0803700db76e788b134f0fdc2f63a503df65b19e057efa22827984db6571cccde13b2e868fbd4d SHA512 2a8c6982c2b662724e010de55ede58c0d91b9c4f90834c03bb47fb2b0446c7f3178b39e0e5765d6be8c9604e7cd13696aab2a9f4a69a36a0414259bff0fca841
 EBUILD ntlm-auth-1.4.0-r1.ebuild 513 BLAKE2B 9153dcc58e486d49a30c80afbcd49988edf684a13856b2e57c0803700db76e788b134f0fdc2f63a503df65b19e057efa22827984db6571cccde13b2e868fbd4d SHA512 2a8c6982c2b662724e010de55ede58c0d91b9c4f90834c03bb47fb2b0446c7f3178b39e0e5765d6be8c9604e7cd13696aab2a9f4a69a36a0414259bff0fca841
 MISC metadata.xml 425 BLAKE2B 791b65f110ff47908b2ada3e140cbd1fb262f0cce02e5ac083cb4fecbfba686a44aece6a3d44a69b6876c4603dd74d343fd9a61638f908836250bf3badeb9524 SHA512 a38de76267e3e44d11a8e3571809031b94697d270e3c752629764300893e95ccb1e8daf8a9bf897a442fb3b097fd6da4f3d4d34fbaead847474335a53ab91768
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
deleted file mode 100644
index f458dfd91960..000000000000
--- a/dev-python/ntlm-auth/ntlm-auth-1.1.0.ebuild
+++ /dev/null
@@ -1,20 +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="Calculates NTLM Authentication codes"
-HOMEPAGE="https://github.com/jborean93/ntlm-auth"
-SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
deleted file mode 100644
index f458dfd91960..000000000000
--- a/dev-python/ntlm-auth/ntlm-auth-1.2.0.ebuild
+++ /dev/null
@@ -1,20 +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="Calculates NTLM Authentication codes"
-HOMEPAGE="https://github.com/jborean93/ntlm-auth"
-SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild b/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild
deleted file mode 100644
index f0903195190e..000000000000
--- a/dev-python/ntlm-auth/ntlm-auth-1.3.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Calculates NTLM Authentication codes"
-HOMEPAGE="https://github.com/jborean93/ntlm-auth"
-SRC_URI="https://github.com/jborean93/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 0415d89d4040..be665398a41a 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,28 +1,10 @@
-AUX numpy-1.14.5-no-hardcode-blas.patch 3767 BLAKE2B f580a067b9c91a53f99daffd33f38306abb3d2852f4d513152531fb0796f50371c9031b7c685fd35801afbe2a5b649efd4d2cdca9c239f119893b1fde19bda3b SHA512 66a7d9988ab3e6f5b1788df7db9d81719c43ba641edc3450a4912c46aaf0ffb3ba6030dc458182adfb11eafac91f2ba6e1c5aa9b8eb077d6d8c776b2ec5ad2fc
-AUX numpy-1.14.5-py37.patch 5417 BLAKE2B a6660b06a6f5ebc436b8bef4f53934892384889304f3b48ed1e9e84298deb78528e431e2102856fe1bc44b5e9a472b3a0b51401ad824b7072465d8c54f6aa939 SHA512 78b6a1640cf51e9b58478fd9ad5044bec2efc1319cc050f0a1345fc367b57b9170954ce25b88b2851007b438a00ac380eab48f6b699fed1115d109972ec553ad
 AUX numpy-1.15.4-no-hardcode-blas.patch 3841 BLAKE2B 19ddde096b5b0b1d3c0a98e16c14b96cf9c16ec5d96736ec561f14535fe240eaa8fbe71f396d432ce557b78b18a98ad8684724614f201b1d6151c8edfd07f483 SHA512 8f870f8a52c096f6f0f614dc64ff6d5ed8d8805e14723c60c6e85b69cf915fc698e808f3fcafce75a6ea9e7eb728949dc56ef823d70963d25658e50aa8becaae
-AUX numpy-1.17.4-no-hardcode-blas.patch 2769 BLAKE2B 800bd23df8f23f335a8298041403f7caca92128e759db85c354c0328447c2b0cada571694bb96d4e9231b12ab91c7f9533526a06427723a3db4a75f502aec443 SHA512 8f31fdcb5acec9f5a346b35625e526d120577fba95d9039d53c3ad2441a5fc6950251d6ef58ecc53110873d76ec9f9a12c65f60f909413f26f3734f8e0bcfb09
 AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67b2843021c6f42773781668a556eb48d7038acd0b1c7cbf30a432fdc3f4d2abf8eef28df7102be1bc9669a4ddc4ee4fc5e239d68 SHA512 9c6dc7e4f5b28b24ac5e1c686066c973b218b0e4e07b500a52c8b3e247acb150714072d17dd1a8579f47c48e9776bddebf9f049616aca52e0325c8f09ef09dad
-DIST numpy-1.14.5.zip 4904624 BLAKE2B 14d266bf1139b9539e39d08a6537e2b772e80bf46a0769cbb06b63ba54858c9284f6d0e8a19627a4d99f2c2638e9a4031bf4d4aaf773eaf34b7203d131636dc0 SHA512 e131f9fa815084e334b59c5d9abd8de0088ad1dfefecf8615ad7deca0b54b0dfa0446c8de99c90670ea9fcabea9980bd171618a5b9032c1937b597a5ce363c5b
-DIST numpy-1.15.4.zip 4473522 BLAKE2B c030ef4a06c84091eec11b6602422468bd0674489a2c7fea1230132cd3a3ca1b10ec87eeb6788f2f263943f9ac43026dc1e7f0f5f1d52e9d1cc6934a5d361090 SHA512 9e0516da04368f0353fb7e3cc2c72e1ec936042908309732a298405bd7111e712899627b82f3674295b611e0ebfd74ef91d693f065fe9cb03dc7de23d1e72676
-DIST numpy-1.16.1.zip 5070040 BLAKE2B 0429d27d88ec97e207822c9c7fa759453bbef97d1d5fdf3e68dab21ca098a6321e2e57d85561dd99084d190b8ed6fce20f00b421c8d14a249fc45dc1ea09569e SHA512 e4adce4f40a3cb6ac482f82db9fcd079179b03b0e878920cfc7d98b9f622adab997c68af892b209f417d5f31b4123a1c5ff5c07cf5b0aaa496d8be6c8354bde8
 DIST numpy-1.16.5.zip 5138208 BLAKE2B f5511650e66939a6ce21cfad7874aecdeb6c07a70b32419a808956e42c7819d82bb364f1632da91b4d8a5237001c8ae3cbdcac10651fa0acca9558bdeafb5437 SHA512 6dd790ff57fdb7e7b0bddb47ea2b70b2667edefe632548ec68934e12a16af4a51bed9726e495c4993aad4c448dc4a204d0a087577d43dcfc9fa0164eb1d4b898
 DIST numpy-1.17.4.zip 6366657 BLAKE2B 89f729bb0740fa721dfe8d1165094a96302fde1e8c272689c11cb4a9bb39d11afaf6eda3ded8a370333b47b9d1ee25e8cb0a602c8cf44964612342c50ea5824f SHA512 f3264be7152437d71718da4728222962013ebd7fe02288d5063f1c763d1c4eee26485c27e8088f4dff79a4d491bc9f191849748c6007d093d22e89c6bff317f3
-DIST numpy-html-1.14.5.zip 11197881 BLAKE2B 00cac3c5be07f644328acd9ed155a6fc07ed7d7380584732bb3ac03562c8705cd152612f461d5dc251dabe0be4ba45593165a961496e351110e1aa7598c37370 SHA512 578d31660de4e1f57310b3a2137cefea17228f40046eef1689fb6d9302f0fe0fda5aaf473c3b8c69ae781049950022321593ec891a5640e3c36c886ab3bf4383
-DIST numpy-html-1.15.4.zip 11158615 BLAKE2B eb264cd51fd61b389e858300d96be63f8e2eeaa0b7346beac571b62d96867d6820c19d5043a6f81088dc52b1e4d7f3f295e02ff5ff90351b0feccf657ce90001 SHA512 1cad60013f374f456bbb1fb6161545a94e252205c28054f9b33cde65330772ab243339289517a8825957a21e210455d33bcc0b9c588052c49c88257b1b04facb
-DIST numpy-html-1.16.1.zip 12132467 BLAKE2B 050a8cba160e36a4c547f1b67b8ab2b9220c9841a9f8343dce6f3221313505530a1687efa2116384a03d3bc9172a0298b4ea5ece2f423841d595e45f565ccbc2 SHA512 5af356313363e00f05db560902cc7578162c7d2ab9c1ef0f3713854682b63d76297d55eb9aac0dfc7f4b687ccea93a53462e2082ef1270e29e19680e1222b34d
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
-DIST numpy-ref-1.14.5.pdf 4855150 BLAKE2B aa924542346bd06b1aa8b11ceb8eb5de936cfdccc10a8339720a297e27b5b34961044eb8db8dd7b9a19ba93b3cbf76ec278a9a50724653aafd2b9d57a00007f2 SHA512 717f58fcb1aa66ecc5f5d4c11c9923d2beb21a1b1a0ca1e46f3622c69f1122fd0547b7f7abaf6de008e2aa988b2453af3c2590877f5596fb6642479ece651746
-DIST numpy-ref-1.15.4.pdf 4843444 BLAKE2B 26154930a8c881f49e7eb7d9540d1deba27baed1acb15dbacd42a659c05f50605cd44b63b2474e66d1d22851145cc65b3e3f26302f8966e141cbd2afc666c654 SHA512 aebff74389e785bd588ccc287329aea4dbc3ef51b46fbffdf088853342fea724f79f712733e453877949e756a52e89de3b257e5feba86e830df84ed8f9bb0e30
-DIST numpy-ref-1.16.1.pdf 5175448 BLAKE2B 5cd692a0fc825216560dbbf48738a49b794973d4539bd778f0f9a2f7f72b32d3061675f9a76db4cbfbb38eec0793c70046180fcb07e23ffc6177dee76b16bb92 SHA512 6cad03e30d7c2204fb899f4e4d1167fefade60d20dedf0ea87ac15c70139fbcca8789cdf17af5a2d221ba06eb78e9376b4b542621f9d78772041c83ab2405d1a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
-DIST numpy-user-1.14.5.pdf 574418 BLAKE2B 80738f1760932fa74b07334d1a355ba3ce319e0b03fe1428d0b3497466fa1164ccbad84969cb7bc8daebb5525094f0d0c7710e1d661b1c6bbaca0669bfcbf875 SHA512 fb00305408c56ee203ed71ac042474592e7e933f14a639f6dce0f6dc80206c13b844c2425a919f9072a114c7af2c2f9f85b78a07ba3874259e5d173290e51a13
-DIST numpy-user-1.15.4.pdf 596191 BLAKE2B 1387b7aac9cccba4b7ce259391f56372959db35c4ddce111afb9949347ebcf3290e7d3fb5b1b2d2e7850911259cddb07edfe104c1396ae8e31a58a81e9293f16 SHA512 2089753b48412f094b279c378be1d221ec9b171957171a4e26b4589d594e00b4f66b6f8a88a7eb665e8c3fa3e6ed505d63da80d4d01ced041544b97ea56fe212
-DIST numpy-user-1.16.1.pdf 592508 BLAKE2B 88ef7aac2998fd8eeebc3ab92df9ad9ba139b67ab0442cd4ed91cdc7b1cd72acf7905468118df25634640b709106758455c7d316539b941d7760010b8135fafa SHA512 d089b4c663f92c38aa075c37974df757bdc457f75980737477a4477f67311d28149bc4c20f5d1cd0877221a78e5a9ff10702b1ebcc8ab062d328cdda4087d0f7
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
-EBUILD numpy-1.14.5.ebuild 4104 BLAKE2B 66a822debd2636ebae9f3c6a14d4917f69ee69f08ab28ff3448d8f206b30a25791a302b9a5e847b7d8836738d46f75a990bd4dde2c06278c9acec2944cd479cf SHA512 6abf839ffa1ab6003f88129909bb01cb7f968f10b861fd7978d7baf213b02ba3a791109d5b4a570af01f78c3f538d9dc969dc6c35c025b583256e1e0ebacb189
-EBUILD numpy-1.15.4.ebuild 3914 BLAKE2B b1e4541facef34dc973bd1de3d7c9fc556116fa936c7c4ea6f4aa4cac2d727f56743743f5e04f7f0355d8c085457d44c2f2f478bf5bf52310be23d2ec1451b80 SHA512 23ecdb6df8cd632f661aa8518f90e90d1d0fd5fb566e4d97149f92cf19995f067ce5e405b3b0035e740de53383d358eca00f503b63a4227b4d7592909d26b90b
-EBUILD numpy-1.16.1.ebuild 3934 BLAKE2B 35063ed7529f4cb757b7dc3aaf8c0009bc4e72aafb6723267ac582ccccffa2e2f079d3cd067a88c32f935de3622abb1875d7bdcf8417d125ad1750f2568b5b2a SHA512 db1c4337360dddbcba2a34eb1f282dabeb652f36a3f216332b2e6d6ea8058e16dea642ea5e6f583871436e7ffa75eae59cb1daec797a41a3097678b8554ca5be
-EBUILD numpy-1.16.5.ebuild 4214 BLAKE2B d1efcaacab4007df66bd72066663e394688fffba4b556dc2d5a4dc690fc49e42930afcc9fe8a050f22eba178ec1f5bd87fdefc3ba8dec5e7bf6b326cd220d860 SHA512 c129a99fdbeb74a7755a156d95ada546b4fbc1860b1359fb1eb15d4d0913669b28dcfe058a873b8ae1be7d961d8ca2e7f0946cbd19f1bf84e6d8f90481be17c0
+EBUILD numpy-1.16.5.ebuild 4213 BLAKE2B fc122d060f44e713b588e22b1a1189cb56681d1484aef9476e1a4895f35fbb2c3f66df4f17f5f35fe74a2785b76dc7512c7995dfa1f714563209b6ba988e4ece SHA512 476bde0ec210c26b96580c5fd92f89c99d99df15355edfa453d7cbc4aeaf00fbf2ba5a41f7326fd834dfb8aee89e3d9b195aa9e4bdc19960affc1aab63583f78
 EBUILD numpy-1.17.4-r2.ebuild 3624 BLAKE2B 903d92b51a841916dd84edf5be6d13d5229c953bbe55067dd265a3ceb40dae50d8bdb3b0b26fc49863296c23a106a1e36687ce80650c0bee26006156bd470f98 SHA512 3d72c6a20b64892cdbe7e918825eaf2bfb2ee952d102e9f6dacfd2904e14188b1b3870fe4bfee63aa038c23c5222532f2e96dff1d2686b3e7d156294057616e9
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/files/numpy-1.14.5-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.14.5-no-hardcode-blas.patch
deleted file mode 100644
index 39777ec55afb..000000000000
--- a/dev-python/numpy/files/numpy-1.14.5-no-hardcode-blas.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index 93a8e6f..df3f3f8 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -364,28 +364,7 @@ def get_info(name, notfound_action=0):
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
--          'blis': blis_info,                  # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
--          'x11': x11_info,
-+    cl = {'x11': x11_info,
-           'fft_opt': fft_opt_info,
-           'fftw': fftw_info,
-           'fftw2': fftw2_info,
-@@ -730,10 +709,7 @@ class system_info(object):
-         return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
-     def get_libraries(self, key='libraries'):
--        if hasattr(self, '_lib_names'):
--            return self.get_libs(key, default=self._lib_names)
--        else:
--            return self.get_libs(key, '')
-+        return self.get_libs(key, '')
- 
-     def library_extensions(self):
-         c = customized_ccompiler()
-@@ -1740,7 +1716,7 @@ class blas_info(system_info):
-             lib = self.has_cblas(info)
-             if lib is not None:
-                 info['language'] = 'c'
--                info['libraries'] = [lib]
-+                info['libraries'] = lib
-                 info['define_macros'] = [('HAVE_CBLAS', None)]
-         self.set_info(**info)
- 
-@@ -1772,16 +1748,16 @@ class blas_info(system_info):
-                 # check for cblas lib, and if not present check for blas lib.
-                 try:
-                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
--                                      libraries=["cblas"],
-+                                      libraries=info["libraries"],
-                                       library_dirs=info['library_dirs'],
-                                       extra_postargs=info.get('extra_link_args', []))
--                    res = "cblas"
-+                    res = info["libraries"]
-                 except distutils.ccompiler.LinkError:
-                     c.link_executable(obj, os.path.join(tmpdir, "a.out"),
-                                       libraries=["blas"],
-                                       library_dirs=info['library_dirs'],
-                                       extra_postargs=info.get('extra_link_args', []))
--                    res = "blas"
-+                    res = ["blas"]
-             except distutils.ccompiler.CompileError:
-                 res = None
-         finally:
diff --git a/dev-python/numpy/files/numpy-1.14.5-py37.patch b/dev-python/numpy/files/numpy-1.14.5-py37.patch
deleted file mode 100644
index c53b3acf6966..000000000000
--- a/dev-python/numpy/files/numpy-1.14.5-py37.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From dce7f20e95e6bd3fc07517c0b2daf3942a34ddf7 Mon Sep 17 00:00:00 2001
-From: Charles Harris <charlesr.harris@gmail.com>
-Date: Wed, 14 Mar 2018 12:52:26 -0600
-Subject: [PATCH] MAINT: Fix test_utils.py for Python 3.7.
-
-The contents of the module warnings registries was made more module
-specific in Python 3.7 and consequently the tests of the context
-managers clear_and_catch_warnings and suppress_warnings need updating.
----
- numpy/testing/tests/test_utils.py | 43 +++++++++++++++++++++----------
- 1 file changed, 29 insertions(+), 14 deletions(-)
-
-diff --git a/numpy/testing/tests/test_utils.py b/numpy/testing/tests/test_utils.py
-index a97b627f9..33b3555b0 100644
---- a/numpy/testing/tests/test_utils.py
-+++ b/numpy/testing/tests/test_utils.py
-@@ -1114,18 +1114,28 @@ class TestStringEqual(unittest.TestCase):
-                           lambda: assert_string_equal("foo", "hello"))
- 
- 
--def assert_warn_len_equal(mod, n_in_context, py3_n_in_context=None):
-+def assert_warn_len_equal(mod, n_in_context, py34=None, py37=None):
-     mod_warns = mod.__warningregistry__
-+    num_warns = len(mod_warns)
-     # Python 3.4 appears to clear any pre-existing warnings of the same type,
-     # when raising warnings inside a catch_warnings block. So, there is a
-     # warning generated by the tests within the context manager, but no
-     # previous warnings.
-     if 'version' in mod_warns:
--        if py3_n_in_context is None:
--            py3_n_in_context = n_in_context
--        assert_equal(len(mod_warns) - 1, py3_n_in_context)
--    else:
--        assert_equal(len(mod_warns), n_in_context)
-+        # Python 3 adds a 'version' entry to the registry,
-+        # do not count it.
-+        num_warns -= 1
-+
-+        # Behavior of warnings is Python version dependent. Adjust the
-+        # expected result to compensate. In particular, Python 3.7 does
-+        # not make an entry for ignored warnings.
-+        if sys.version_info[:2] >= (3, 7):
-+            if py37 is not None:
-+                n_in_context = py37
-+        elif sys.version_info[:2] >= (3, 4):
-+            if py34 is not None:
-+                n_in_context = py34
-+    assert_equal(num_warns, n_in_context)
- 
- 
- def _get_fresh_mod():
-@@ -1134,6 +1144,8 @@ def _get_fresh_mod():
-     try:
-         my_mod.__warningregistry__.clear()
-     except AttributeError:
-+        # will not have a __warningregistry__ unless warning has been
-+        # raised in the module at some point
-         pass
-     return my_mod
- 
-@@ -1147,21 +1159,23 @@ def test_clear_and_catch_warnings():
-         warnings.warn('Some warning')
-     assert_equal(my_mod.__warningregistry__, {})
-     # Without specified modules, don't clear warnings during context
-+    # Python 3.7 catch_warnings doesn't make an entry for 'ignore'.
-     with clear_and_catch_warnings():
-         warnings.simplefilter('ignore')
-         warnings.warn('Some warning')
--    assert_warn_len_equal(my_mod, 1)
-+    assert_warn_len_equal(my_mod, 1, py37=0)
-     # Confirm that specifying module keeps old warning, does not add new
-     with clear_and_catch_warnings(modules=[my_mod]):
-         warnings.simplefilter('ignore')
-         warnings.warn('Another warning')
--    assert_warn_len_equal(my_mod, 1)
-+    assert_warn_len_equal(my_mod, 1, py37=0)
-     # Another warning, no module spec does add to warnings dict, except on
-     # Python 3.4 (see comments in `assert_warn_len_equal`)
-+    # Python 3.7 catch_warnings doesn't make an entry for 'ignore'.
-     with clear_and_catch_warnings():
-         warnings.simplefilter('ignore')
-         warnings.warn('Another warning')
--    assert_warn_len_equal(my_mod, 2, 1)
-+    assert_warn_len_equal(my_mod, 2, py34=1, py37=0)
- 
- 
- def test_suppress_warnings_module():
-@@ -1178,6 +1192,7 @@ def test_suppress_warnings_module():
-         np.apply_along_axis(warn, 0, [0])
- 
-     # Test module based warning suppression:
-+    assert_warn_len_equal(my_mod, 0)
-     with suppress_warnings() as sup:
-         sup.record(UserWarning)
-         # suppress warning from other module (may have .pyc ending),
-@@ -1189,8 +1204,7 @@ def test_suppress_warnings_module():
-     # got filtered)
-     assert_(len(sup.log) == 1)
-     assert_(sup.log[0].message.args[0] == "Some warning")
--
--    assert_warn_len_equal(my_mod, 0)
-+    assert_warn_len_equal(my_mod, 0, py37=0)
-     sup = suppress_warnings()
-     # Will have to be changed if apply_along_axis is moved:
-     sup.filter(module=my_mod)
-@@ -1204,11 +1218,11 @@ def test_suppress_warnings_module():
-     assert_warn_len_equal(my_mod, 0)
- 
-     # Without specified modules, don't clear warnings during context
-+    # Python 3.7 does not add ignored warnings.
-     with suppress_warnings():
-         warnings.simplefilter('ignore')
-         warnings.warn('Some warning')
--    assert_warn_len_equal(my_mod, 1)
--
-+    assert_warn_len_equal(my_mod, 1, py37=0)
- 
- def test_suppress_warnings_type():
-     # Initial state of module, no warnings
-@@ -1232,10 +1246,11 @@ def test_suppress_warnings_type():
-     assert_warn_len_equal(my_mod, 0)
- 
-     # Without specified modules, don't clear warnings during context
-+    # Python 3.7 does not add ignored warnings.
-     with suppress_warnings():
-         warnings.simplefilter('ignore')
-         warnings.warn('Some warning')
--    assert_warn_len_equal(my_mod, 1)
-+    assert_warn_len_equal(my_mod, 1, py37=0)
- 
- 
- def test_suppress_warnings_decorate_no_record():
--- 
-2.18.0
-
diff --git a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blas.patch b/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blas.patch
deleted file mode 100644
index 8c2a58a19401..000000000000
--- a/dev-python/numpy/files/numpy-1.17.4-no-hardcode-blas.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
-index ba2b1f46c..09db18e69 100644
---- a/numpy/distutils/system_info.py
-+++ b/numpy/distutils/system_info.py
-@@ -374,28 +374,7 @@ def get_info(name, notfound_action=0):
-       1 - display warning message
-       2 - raise error
-     """
--    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
--          'atlas_threads': atlas_threads_info,                # ditto
--          'atlas_blas': atlas_blas_info,
--          'atlas_blas_threads': atlas_blas_threads_info,
--          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
--          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
--          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
--          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
--          'atlas_3_10_blas': atlas_3_10_blas_info,
--          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
--          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
--          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
--          'flame': flame_info,          # use lapack_opt instead
--          'mkl': mkl_info,
--          # openblas which may or may not have embedded lapack
--          'openblas': openblas_info,          # use blas_opt instead
--          # openblas with embedded lapack
--          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
--          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
--          'blis': blis_info,                  # use blas_opt instead
--          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
--          'blas_mkl': blas_mkl_info,          # use blas_opt instead
-+    cl = {'flame': flame_info,          # use lapack_opt instead
-           'accelerate': accelerate_info,      # use blas_opt instead
-           'x11': x11_info,
-           'fft_opt': fft_opt_info,
-@@ -796,10 +775,7 @@ class system_info(object):
-         return [b for b in [a.strip() for a in libs.split(',')] if b]
- 
-     def get_libraries(self, key='libraries'):
--        if hasattr(self, '_lib_names'):
--            return self.get_libs(key, default=self._lib_names)
--        else:
--            return self.get_libs(key, '')
-+        return self.get_libs(key, '')
- 
-     def library_extensions(self):
-         c = customized_ccompiler()
-@@ -1842,7 +1818,7 @@ class blas_info(system_info):
-             lib = self.get_cblas_libs(info)
-             if lib is not None:
-                 info['language'] = 'c'
--                info['libraries'] = lib
-+                info['libraries'] = [lib]
-                 info['define_macros'] = [('HAVE_CBLAS', None)]
-         self.set_info(**info)
- 
diff --git a/dev-python/numpy/numpy-1.14.5.ebuild b/dev-python/numpy/numpy-1.14.5.ebuild
deleted file mode 100644
index 94fb9ba2ea2b..000000000000
--- a/dev-python/numpy/numpy-1.14.5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="${PV}"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? ( >=dev-python/nose-1.0[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14.5-no-hardcode-blas.patch
-	# backport a fix for py3.7 test failures
-	"${FILESDIR}"/numpy-1.14.5-py37.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.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() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = $(pc_incdir cblas):${incdir}
-			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
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# we don't have f2py-3.3
-	sed \
-		-e 's:test_f2py:_&:g' \
-		-i numpy/tests/test_scripts.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	local python_makeopts_jobs=""
-	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
-	distutils-r1_python_compile \
-		${python_makeopts_jobs} \
-		${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r.wasSuccessful() else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	local DOCS=( THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.15.4.ebuild b/dev-python/numpy/numpy-1.15.4.ebuild
deleted file mode 100644
index 7c4e514f4986..000000000000
--- a/dev-python/numpy/numpy-1.15.4.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="${PV}"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		http://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="lapack? ( virtual/cblas virtual/lapack )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.15.4-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.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() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = $(pc_incdir cblas):${incdir}
-			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
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	local python_makeopts_jobs=""
-	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
-	distutils-r1_python_compile \
-		${python_makeopts_jobs} \
-		${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	local DOCS=( THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.16.1.ebuild b/dev-python/numpy/numpy-1.16.1.ebuild
deleted file mode 100644
index 3cbc081a140a..000000000000
--- a/dev-python/numpy/numpy-1.16.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-FORTRAN_NEEDED=lapack
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="${PV}"
-DOC_P="${PN}-${DOC_PV}"
-
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://docs.scipy.org/doc/${DOC_P}/${PN}-html-${DOC_PV}.zip
-		https://docs.scipy.org/doc/${DOC_P}/${PN}-ref-${DOC_PV}.pdf
-		https://docs.scipy.org/doc/${DOC_P}/${PN}-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="lapack? (
-		virtual/cblas
-		virtual/lapack
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.15.4-no-hardcode-blas.patch
-)
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/${PN}-html-${DOC_PV}.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() {
-	if use lapack; then
-		append-ldflags "$($(tc-getPKG_CONFIG) --libs-only-other cblas lapack)"
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = $(pc_incdir cblas):${incdir}
-			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
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	local python_makeopts_jobs=""
-	python_is_python3 || python_makeopts_jobs="-j $(makeopts_jobs)"
-	distutils-r1_python_compile \
-		${python_makeopts_jobs} \
-		${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed --record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	${EPYTHON} -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-}
-
-python_install_all() {
-	local DOCS=( THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.16.5.ebuild b/dev-python/numpy/numpy-1.16.5.ebuild
index 351acbd56531..eb3fb71b1791 100644
--- a/dev-python/numpy/numpy-1.16.5.ebuild
+++ b/dev-python/numpy/numpy-1.16.5.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/openstack-nose-plugin/Manifest b/dev-python/openstack-nose-plugin/Manifest
deleted file mode 100644
index edb5377469c5..000000000000
--- a/dev-python/openstack-nose-plugin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST openstack.nose_plugin-0.11.tar.gz 4120 BLAKE2B 5335b920cba985639d0ca36f475d0d020bdf15eab5a32fc481f0d7200de867c437dc0fa6766aecd93e41a564c584201ebec92c10030c577768f3b2e798661258 SHA512 25139ebd3229cb5e07e296848d5a0bff090bec9b3ba618fe3a4278bdc9b2f7f0eced887285e9e3836b555afcbd74f061ec90a8a63d5c1fdfc53b7aea48a102a2
-EBUILD openstack-nose-plugin-0.11-r2.ebuild 646 BLAKE2B 62947daeceda964398fbdbab95a50ecf47989a3c9027c0a6a99fa5917aa71da2f87d5413413499fafb6d1e03969e073a370d8a011a8f7d17bdd1c0eb4086bca8 SHA512 34da4e2069aecdffdb179974523a3806d1b1e4c06ec4057fb6d2db329249035dfd84fc9c12eab1bb4dbb36249313654cb21db0f55e15150eff173cb002f040b5
-MISC metadata.xml 684 BLAKE2B 47a57afa49f7edb3df474f5859e3b735c69e4dd916de9228b0272590838edb8e0140b9be6b1ca9321d38e34470f79899ca24b15640d0ebe3f1da572538fac0fd SHA512 a1e6ea9f0bdd146e9b61d2679c425cc0946e0fc835edb39feda2b103355d7a3cde81366b417297eebc9ee7a0e8044fa02b99cc596e834dc63910f6f80f9a9a73
diff --git a/dev-python/openstack-nose-plugin/metadata.xml b/dev-python/openstack-nose-plugin/metadata.xml
deleted file mode 100644
index 087aceb21ebd..000000000000
--- a/dev-python/openstack-nose-plugin/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="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription lang="en">
-		openstack.nose_plugin provides a nose plugin that allow's nosetests output
-		to mimic the output of openstack's run_tests.py.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">openstack.nose_plugin</remote-id>
-		<remote-id type="github">openstack-dev/openstack-nose</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/openstack-nose-plugin/openstack-nose-plugin-0.11-r2.ebuild b/dev-python/openstack-nose-plugin/openstack-nose-plugin-0.11-r2.ebuild
deleted file mode 100644
index 56df4bfe15ed..000000000000
--- a/dev-python/openstack-nose-plugin/openstack-nose-plugin-0.11-r2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="openstack run_tests.py style output for nosetests"
-HOMEPAGE="https://github.com/openstack-dev/openstack-nose"
-MY_PN="openstack.nose_plugin"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/termcolor[${PYTHON_USEDEP}]"
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index 05a49cd74071..da47bdd1f72f 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,3 +1,3 @@
 DIST opt_einsum-3.0.1.tar.gz 66204 BLAKE2B a8d2d1246e890d24ea73d129ed1ee99e8fbbca30771c96a48858acb5af5eac93bc73b9e8f1c5f1ece6e0872277de1f01fd1d0f7d27e044fa5f9de09060792565 SHA512 d6c2b95d17f523680e3f849ad2b0a4c36e7102e0540fddee365446bfddad4a26be2aed19060570ac0d1db42ccde8e15f0e7e4c066b9117024a58f8cc8978508a
-EBUILD opt-einsum-3.0.1.ebuild 467 BLAKE2B 42ea9767dfd20d527f768fdf72b765cfd41aa3685b71d3a39efc487f3025faa4d267e21c898ff7fe44c6ba415557b9e3e67b5b8cb3976b92ce78f9f8baebe043 SHA512 798baff683292754346966581b9fbc313fcec9b3cc743f4ffd160d235a3eaecfe647c4261fff112c22a41d4aaeb8491bed3cbaf5ed2f83f08baf7ca372903929
+EBUILD opt-einsum-3.0.1.ebuild 465 BLAKE2B bb2aa8539690d7911c526b49a164900d6ee2145142aa94a734420f6380ef12ae7153cf908c4c2bbb09e1eb285b274d992ecf1dc9ef88f5e037cbcfbdb1d2f274 SHA512 b7816352355a75137195ce4ac6b405d99abd89afdda028ddb27fb16fff1b7eadd99c28a8d612b77afe704da87a56c533440a60955c5e6b52c5129336c2cafbdc
 MISC metadata.xml 373 BLAKE2B e60b5def188efafe8cbea965732384164a8dd735c37d065cfb9b8c3edc652dcd5b23641e11655fe535206823317e8aa9c0c2f2a624e654d511595e36ef8fc5af SHA512 5471c7592bfb2e9ab1f3c47fdb1ab2211debda6e928f2491f17a171d14c95d5faacf03eb105c94d35ab6f5e889f24cc327f5111e8ac8c11527dcca1e04d61290
diff --git a/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild b/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
index 45bd617ea825..077e569b1678 100644
--- a/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 S="${WORKDIR}/${P/-/_}"
 
diff --git a/dev-python/ovsdbapp/Manifest b/dev-python/ovsdbapp/Manifest
index e0fbeaa41256..c0a1b3eb63cd 100644
--- a/dev-python/ovsdbapp/Manifest
+++ b/dev-python/ovsdbapp/Manifest
@@ -1,5 +1,5 @@
-DIST ovsdbapp-0.12.2.tar.gz 78135 BLAKE2B bd0e0b209352af0bc2939a98d2ef52aa4d610471669d9eb3e9050dccdaa093ea9c922a588e6709defc0182cc991cd38883a9a9780f03cf7350a08eee5b99d424 SHA512 ef2b4080e600c585e23e5e9fa80fd684b42a1f2209db7ff00ec59a751e47c887d296339958d2805be0d359bb30dfab35271cea1b750039170c7bbf719ccc9d6e
 DIST ovsdbapp-0.15.0.tar.gz 79493 BLAKE2B a035a8571033e210db253dc4a301c602f9b213bbeb6fc73e9317d2a29f3b3520f43c0f6c8fa7f3d549f3fd76484993f5b905d3916c93c1daef228e9c15fa4a0f SHA512 db8179c32bb58b04019b215083bbf7490418305631a826a44965d52ebbfa9d75e08bff840659982a93c3941cecc0ef1e81299e83408731582907e24d2e2764f0
-EBUILD ovsdbapp-0.12.2.ebuild 722 BLAKE2B 2ebe5e49ce0113310dfd6284adb4c338901e5749b0c785ebb5b4469c0a32fe095c2e1e5eb5a4a7417462972fca5e8f9ee3327908f415d6e76f14a087642be571 SHA512 e1f7cc98dee6c57c47d813756ffa133f64279fae51c41c039b1ea1dfa8ffb1163279aeff9e9e3097a9ae7534c7379d26c1776cc1bea25ca1bf9ad38e2697af24
+DIST ovsdbapp-0.17.2.tar.gz 82830 BLAKE2B a9c7661685aeb215f79b9c14fb7069019ae3641217fd2234db44f4d7bada9c9533919a104ec5a0f05843edae2b71e86edab11e545973e626ea657eea852e0682 SHA512 0d7a5d5c0ea0456a2bdf51b39b864253b52d1699b32a301a549b80568fef63d516158dcb6772cfb97b88d56e840a070f5cc2569acaa414bcab4a65be673a66eb
 EBUILD ovsdbapp-0.15.0.ebuild 726 BLAKE2B 5c7b9ac30b8431c1d26fa02a68f240bd5eb1db020f00e2e1c4e5c836847ff7a939d0726f9772bd19dbf161dc33d43a37d12dec73beaa85ff29aefe550f4383b4 SHA512 7f474eeba18f7972b3b8e595732f909d3eb6fd4f61d807f574c61b111af72ca34a6370f43ede70f71ce9a1c7bf386979ddb290d027b961deb623edfd9aad9445
+EBUILD ovsdbapp-0.17.2.ebuild 728 BLAKE2B 993cb15f55c3cd157f08870f2cc1c237da68e1eecd5f0faf097bb4f2e8e92abb1cf400468f93ad44ea1019c9b097e5491ea7527ee9a60ffa3b933fd728b7bdd8 SHA512 b6b725e5ff0f0a958671cd3b0b5ba3bc1431f20584998d14299d6153357381cca568f57f1d4fac4c1328d408d71c0198398f473edf97d4564fd506130f09a440
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild b/dev-python/ovsdbapp/ovsdbapp-0.17.2.ebuild
index 8445558ea1ba..14a97a3f2a23 100644
--- a/dev-python/ovsdbapp/ovsdbapp-0.12.2.ebuild
+++ b/dev-python/ovsdbapp/ovsdbapp-0.17.2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
 
-PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1
 
 DESCRIPTION="A library for creating OVSDB applications"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pSQL/Manifest b/dev-python/pSQL/Manifest
deleted file mode 100644
index 1a3836ed574f..000000000000
--- a/dev-python/pSQL/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pSQL-1.2.1.tar.gz 21158 BLAKE2B e4dd1210db957d3f88a5f5c580af7ad4116b976d6a70600d113e27446fe8a922332934d99f2de404a93634e7e373b4913c27a3aa91686da77457a028a73f06c9 SHA512 39b21327eb2cd1ad6207c08e2ce6507c7d05992ef852fd06427dcb461e5175b24e983e432c8616c759f291d3bfd9906a654834afa79e37cc7c839ddb5e181779
-EBUILD pSQL-1.2.1.ebuild 616 BLAKE2B 6f8653c1da5e335f72b7b8c81a5d8d3cfc9d8660ff68e728bbc214faf6c681032a8bfe553590fe9b908845761f9d10678260dba59b09153da57dfc2ff4d6a349 SHA512 2d601cf49e7642987317711eeb5898d436fd99b814626d177277437a9aeee4ef4a0798946906e5b4ea2f9a21a6a41aff1444a3fa25a1b7fe2ae5ba2f61bfc64f
-MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pSQL/pSQL-1.2.1.ebuild b/dev-python/pSQL/pSQL-1.2.1.ebuild
deleted file mode 100644
index 4482535b12e6..000000000000
--- a/dev-python/pSQL/pSQL-1.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="MySQL abstraction layer for python"
-HOMEPAGE="http://software.fionet.com/pSQL/"
-SRC_URI="http://software.fionet.com/pSQL/release/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/mysql-python[${PYTHON_USEDEP}]
-	dev-python/egenix-mx-base[${PYTHON_USEDEP}]"
-DEPEND=""
-
-src_install() {
-	python_foreach_impl python_domodule pSQL.py
-
-	dodoc *pSQL
-}
diff --git a/dev-python/paisley/Manifest b/dev-python/paisley/Manifest
deleted file mode 100644
index 795d6d8ae78e..000000000000
--- a/dev-python/paisley/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST paisley-0.3.1.tar.gz 6373 BLAKE2B e422952a576a72d921fea4479c06b3a7fe9744369c9538a3f5ca1c07db7d3c03b77f7c3a5af202ead7128cd37fb17a3cd99886c9a02870bdd3253004756fa627 SHA512 abfceece7c3156fd3ed234e1c2ed07e8f3e366c735969e382feb3b8c464679d8a9f0a224be0720c351b3e19d576bb5aff6fc11d789bfd879a0f2aba40dfaef73
-EBUILD paisley-0.3.1-r1.ebuild 724 BLAKE2B a7142024ee6149fdc9e17ee4f9fcf1108465319b7e322672c1f0f0ee3955a89e46be5589c35d179053567fed9b243b61b211c0140991a3d2303bf3408d9fd8fe SHA512 69190461d2b9dc8a983729a190f0b0180e1adc358ba63bee87acee58692ce02751b39a46d61ced713a72bcd6452cb430381bc57ab7158d1c908bb6ee414697cc
-MISC metadata.xml 360 BLAKE2B e2f4b3876d8c4cd5c96d2ea3c5acfbb411357b48889facfa9ff9394408162c02cb0528ac5381c9bc7f909b4cbec5c5f117b970ecea07b64d35b54b4ca1879961 SHA512 ca6e4de92fe0d28e9165200e837d6031be7ff5aec3f83135d51da44aab7a31735a84ff392d4fa42a0c977bccd454c6da061fdd280cd640ec59a76c33cc6ed075
diff --git a/dev-python/paisley/metadata.xml b/dev-python/paisley/metadata.xml
deleted file mode 100644
index dcdf941f87d8..000000000000
--- a/dev-python/paisley/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="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">paisley</remote-id>
-		<remote-id type="launchpad">paisley</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/paisley/paisley-0.3.1-r1.ebuild b/dev-python/paisley/paisley-0.3.1-r1.ebuild
deleted file mode 100644
index 8fc68c967b0c..000000000000
--- a/dev-python/paisley/paisley-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A CouchDB client written in Python to be used within a Twisted application"
-HOMEPAGE="https://launchpad.net/paisley https://pypi.org/project/paisley/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/twisted-web[${PYTHON_USEDEP}]"
-DEPEND="test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	nosetests || die "tests failed"
-}
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index fec173d32c14..827fb6489126 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,3 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
-EBUILD pallets-sphinx-themes-1.1.2.ebuild 662 BLAKE2B 4359c556e879a45d3a6824485aaecc2ec4a14a54943ad6fe311c5f35dcfe16823cc40fe456cc5d5486ada153935c4f553b6a5b9495eda59dd4ed53277b4f36b5 SHA512 8a5256b7153a603bf1cf003ad1759fd9f6252ef410a41a66210f0430f48daff90ccbf3d6564a0313615a425a30463ea32c92b6dbfe31c504808cdc4d752abc28
+EBUILD pallets-sphinx-themes-1.1.2.ebuild 655 BLAKE2B 569ea94e192c31425d7d6ecd8b05c84ad987220bd66d25b91c71a93bb66e545ba05cbed8e4ef898daaf99e3cc8d912ee9441e0dbe467413907240fbe10dae6ee SHA512 b8465f335092a7f577bf3582534c05d6c5bb4658ce788dad3431aca68d968ce0308e6b06a9740ff4f9cea870243dacfabf1476f7c9d9e5fb59c5175b42514472
 MISC metadata.xml 324 BLAKE2B 270575fc533cde85d524756cbbe22ce43375a25f5d2b83ec37423b8af4a54fea9c679ebb66433a3c3ee090150201551c8804ff86fefe12636a6e0a83da25f417 SHA512 dd0d1c39fbfdcae041c6cccee7855d5fb6eac3037be3ac79cae0d36122f3ff75ed86c7ad63aee8a5fcebd936cfd2a03bfde52cc009655aebb1f25db77a18e698
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
index e613698edb67..85fb6d67b67e 100644
--- a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${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"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index ae23e9ff9711..f4a8974b2839 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -2,8 +2,10 @@ DIST parso-0.5.1.tar.gz 388060 BLAKE2B 429ab40501d38e982cf77e0dbbfa4d8677dd1e240
 DIST parso-0.5.2.tar.gz 390495 BLAKE2B 257de5853cad74803d9b45ae4820c96933d09ebe7c09d30a98ccb1d40d1473d8ef55f9be692278012f3d6f57066600ae14817d20bbde2258f2362702f3056f93 SHA512 d8a2b8c4f30eec676f9cb36afc86b4f80d8397ce4d82a2452598116ae50cb861a1eea6543a51898f4c94acb13b8345833283a353f19ae27242b6e993c02f0ef7
 DIST parso-0.6.0.tar.gz 390815 BLAKE2B 3f1def6bd7d88f09e943c9e75e653dc5ed74652188ad5480065467e393769efdfc19645f4ae49725837cb9b903c2b1589d0715a7173655e9b97899ea9c987aee SHA512 1382b5005ea7e19c3d4f8910b47e9b730e61045fdb16d833a43a7eded8bd568a7528f1822bf193d3c110a5496f53a540ca5028dd10bfd4a59193d58a7e457014
 DIST parso-0.6.1.tar.gz 390866 BLAKE2B 3dbbef687f194f41bc7fdeb7c78930802ee5a97150d2585eb8949ac74ac640e897b8f04b29f2768df920aa5d54ec80f1aac3b84f996ef0ea957ddccf9da77cf0 SHA512 98cc20a3378c89b870df5e5df52f2c2091c1a133ea9701141ed90edbb05c5b8ddf30dcc19069cc19666f34e37f8ca64e37bfd701314adb24b0a10ab197862cf1
+DIST parso-0.6.2.tar.gz 391060 BLAKE2B 476b91286dc69161558dbb82f2e5eaf1b7f9ded6de467d97c74ec7e08a7e956cfbb67bd64e6ed975fddeaa64a616bf714f069e7185a3af8140aeaa2eda2de729 SHA512 da011c6fbab3ca2157c8934086cc0db0b7a37f5cd67debe70f56429f409de8762b124948ee75ac65779b806d8aaab759ee790eacb580910f3609ffd280dba2a8
 EBUILD parso-0.5.1-r1.ebuild 653 BLAKE2B 3e812b5c5882e6b482c1a3dba3df575f06ded2fa3e8b174691ef5e92074aed573d5c3dcb243d4f9b337c96861cbb8ed0be9356854aaf98afc1caccbbcbddac4e SHA512 8b23fd80b995261ad8332c74c7290ab5a6b4195e70f57a3cc0c04c9d2e3ccbb409a135b01843537c83a4b6845a9b088d8be9a2d77d60565ed75d76946d7d2c42
 EBUILD parso-0.5.2.ebuild 654 BLAKE2B ce78d5998aac228edf3fa84a778b552ccd8d5fcb394b4db865193b5629de519c911a0e632d373e6c0464568a1805b1183310a21e5d550ebdbdba3c798416ae93 SHA512 adcd9d76a2ebd0ca5e16b9557576a11415576728c90d87fddc72cd6ad4d195edbee27264ae274a8d06864c96a166e722a6b7d48d19296facea7694444b49fb42
-EBUILD parso-0.6.0.ebuild 606 BLAKE2B b636f1cde5d94365e7c93b4686328eb466c609cb4cc68fe6e3ac562551b24432d4061cb508d7134d73a121301e83861b2b8271a12b58becae841bbc447c02771 SHA512 fb5a8ee0590445a842a86dc1e87a017d7396ec07278d8d611354eae23655f0abc7669de6f53034580808834ba185fb1e501fc781b2dd8cf318f89d38d0c9822d
-EBUILD parso-0.6.1.ebuild 606 BLAKE2B b636f1cde5d94365e7c93b4686328eb466c609cb4cc68fe6e3ac562551b24432d4061cb508d7134d73a121301e83861b2b8271a12b58becae841bbc447c02771 SHA512 fb5a8ee0590445a842a86dc1e87a017d7396ec07278d8d611354eae23655f0abc7669de6f53034580808834ba185fb1e501fc781b2dd8cf318f89d38d0c9822d
+EBUILD parso-0.6.0.ebuild 604 BLAKE2B aa9d9111d014c3ac9c1ddb86b62f82c3b8cc20642d53f4e68c1fd5a4878dd288a691b7747b7e79cbecaf3b05562eb33818f017f13ec4d66f7c1fc155d9b3abe0 SHA512 13dcf99522427e95619814eb0ef5cc15788097a476a481fb3def7f20666b18e6f1005f9c790c579e2123e9934f81a1c77bbf8f708c31a6e4839b6c775c90fe2e
+EBUILD parso-0.6.1.ebuild 793 BLAKE2B b6ed3d1e234a4e3acb5682c4b708b856070eddc8e846fd86864ee149033aeec9faa416c076f20212e12047f4644faea5a34e947ba11905621a97cdd7be422b22 SHA512 c9009a9519f46091048b18deaa672d6e68f86de516287662558b8699b1afac0a62127dfaeb272f2e91d40dce51d5ae3e8e83999885ccb4c6bed47eef874af0c0
+EBUILD parso-0.6.2.ebuild 793 BLAKE2B b6ed3d1e234a4e3acb5682c4b708b856070eddc8e846fd86864ee149033aeec9faa416c076f20212e12047f4644faea5a34e947ba11905621a97cdd7be422b22 SHA512 c9009a9519f46091048b18deaa672d6e68f86de516287662558b8699b1afac0a62127dfaeb272f2e91d40dce51d5ae3e8e83999885ccb4c6bed47eef874af0c0
 MISC metadata.xml 377 BLAKE2B 0ac7d9c46c0b591fe46ff373bcb8942261cf0b819d9397500928546c4b07541c958edb116ecf1ff79f0a83c2f02784b019e7d64bd8a82bdfb397ef70fbbaa0c3 SHA512 7d719c633f81372caafbfb0a913fa455fd1d150210ea09713a0888b38d18ccae646b17bbe32a66b931016ee6e4bc826a1670a033466c945a2591e77f9d6d7b7c
diff --git a/dev-python/parso/parso-0.6.0.ebuild b/dev-python/parso/parso-0.6.0.ebuild
index d33ced31acc5..98d5de60277f 100644
--- a/dev-python/parso/parso-0.6.0.ebuild
+++ b/dev-python/parso/parso-0.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parso/parso-0.6.1.ebuild b/dev-python/parso/parso-0.6.1.ebuild
index d33ced31acc5..d9dff2d95d49 100644
--- a/dev-python/parso/parso-0.6.1.ebuild
+++ b/dev-python/parso/parso-0.6.1.ebuild
@@ -19,3 +19,11 @@ RESTRICT="!test? ( test )"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
+
+src_prepare() {
+	# tests rely on specific exception messages and fail occasionally
+	# upstream suggested skipping them
+	rm test/test_python_errors.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/parso/parso-0.6.2.ebuild b/dev-python/parso/parso-0.6.2.ebuild
new file mode 100644
index 000000000000..d9dff2d95d49
--- /dev/null
+++ b/dev-python/parso/parso-0.6.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="a python parser that supports error recovery and round-trip parsing"
+HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	# tests rely on specific exception messages and fail occasionally
+	# upstream suggested skipping them
+	rm test/test_python_errors.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 41d193d768c2..a6911d513ceb 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,5 +1,3 @@
-AUX pip-19.1-disable-system-install.patch 795 BLAKE2B 03cf006ae4482d530a614d4e0b9b5420d924835c88118ea895bbd7db69faa07867d255585fe9b49ea6d81d9689324f1a4844bd2badf3a1304ad748db6c2d6aeb SHA512 fe6bd65e73ed389173b636e339c58de58a96ca6c6dece93e8e5c3178d0c1fcbe2aa5019efba34831b54b09aed956a186604f44da7a50026ec3bf5fad425eaf87
-AUX pip-19.1-disable-version-check.patch 782 BLAKE2B 3dbd3472396edd592d79b418c0c76a2d71cde8557e2c5598bc061c618a7f0028fb086afb7e28e5c051075b65abc65e3568d3ac0c85335d0f8a3db6ad44795ad2 SHA512 ad65449df3e68e406052e21b6349d897dd988a0a257f4ee92032b8c0607807a4427e04d22b32bbef12b3607364299f8521d3c5a6774e32886a665b315b0b6779
 AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8ee0272c5c4c3cb569e6c300ac62fc9fbe8ec2a1bfe257047c15ddcf9cc44c47b7f8b9ab99e17b722bd6ae4cf9dc2a168e01d6 SHA512 1ece773f66556e4380eabf76490430e8fbec23f7cfad27dac02c7e49f7136b632515ef04843e89dfae42c095dbf5280d64e61da1544801c998f802aa59be8e22
 AUX pip-19.3.1-disable-system-install.patch 809 BLAKE2B e3a6027922291efe4d1603cb730a9b6aaf653692bc176fd9eea5b804f3d10c419317e9caa97673c02533d4072baf99439af4f76bd38dd5c2ddb98a234ea32c91 SHA512 cf5418444c1a39716b0e528f0630ef931cdd0a4890d16801a575a5072600eb15195d0c0c67e711290e5ed6c7fc40da3f2fd3e5993c638f152240e0ee6f895ac0
 AUX pip-19.3.1-network-tests.patch 2436 BLAKE2B bb4397074428c2fa0729380ee30e3e67be09871d592df1012937db495a79ffcbd92b534d48c8b459cd6f3ddd30e363f14961511fc8574d438cb5a8acc7b64f20 SHA512 ec3ca2a8381cdca5d8952803389837070b235b08c9df7985e4ffc4f78e83defb9284480fdee439fd42b86d0de5574c707c1de72b230742fee39ce7b8a57a066b
@@ -7,18 +5,14 @@ AUX pip-19.3.1-r2-disable-system-install.patch 835 BLAKE2B 11a8b86f57619b87d090e
 AUX pip-20.0.2-disable-system-install.patch 1260 BLAKE2B eb2f86c6792b52f446e2c5dbe14eb015032879137a058b291d90da6b5da2c4a563959c34f25cbb551e1218306be136abec692950bace60fa46b439918a16f81b SHA512 0ca24355f54b45d74eba5eaecaac9d6c017a2e7b5743eef533c5ad4f7f28f1f707945a9407716e1a3f88121c6d4179bb6c991696b7f24bf6c77eebcff8d73104
 AUX pip-9.0.1-disable-version-check.patch 1031 BLAKE2B 148e528aab19de021f193ac56d758c803e0875b618ee32e948eb103eb6b05eb56e2ecf5ed4dbe39893f5c44ddee17122fdd686f433f5ce89044b2c02291e0ba1 SHA512 8b5764d3ecdbfc871bdf051b41d9610d5028bc3b95a4bf990db46325d10e5d559449ec97ab052686148d6ab6abfa630fb38101c726b6648d19fa94ac593b0a28
 AUX pip-disable-system-install.patch 1070 BLAKE2B 85bfd82888a169cf771467f4f811b9859fddc1cfd134ac21be42b9fd93d84118354fa23a2f4b0ec9c67024f571ba7035665302671420221b52f3fc89f24b1af3 SHA512 bb0a9a32b2eac0a12276c3f0527534226c03868300f54945d20eec16902ad51cbfdace9d79b0caa304bc641323194031a5ca9e5e784366a44527441bd0f3c231
-DIST pip-19.1.tar.gz 6320747 BLAKE2B 9b69fcdef751d6938a7c67f44692afa7088f660ab1e0ae113d21d0f48b4e29f43e0f0bcc137cf16ac0324ea3b500bd2a84234823f8d82556d6727f68139aab4b SHA512 0d2442c22c41133118353ba98f45260f0615a891725b2a069d8fbf26ec4033cc7297bb671944c3dcc1f68800b91e92e58fb407ca5a333382e20ac4bb5c9e0cb6
 DIST pip-19.3.1.tar.gz 6409819 BLAKE2B b3aacd0bee60400a1f30b4be57871002072e5cc7a86e76cca1848e977ebdc85b6e282fc521c19bf7a518d1aef3280133fcd65a431cb2a16e202dd7721c5b97ad SHA512 39446c0ab6e4495d98f22923a2a76901b024d9047b60d92580b21d447a718e5285cfd66f8ad0c20befcfe1abc7f06be29b6a5644d1b30265d3b67399fe76e033
 DIST pip-20.0.2.tar.gz 6445047 BLAKE2B 8f6e0a8908cf594c8d51818942b0839f59a495697a95dcc0347235e90cbe6d7f035f155761e7da9cfca1ba08b2c5a2c5def52c60c381f5428ef48efd1b6b5131 SHA512 f9965944ca0f319d01db1638ce97cf64772afff1778b3b1271155de73208cfcb3954d89a469c1143c0bf3288a53d4446165a49df994374b16ac6f7ffdae85857
 DIST pip-9.0.1.tar.gz 1197370 BLAKE2B 3618161690d5e0a38d141f9b51baea4aaa3fdc225664ef180bbeecf6e2df95e9ea4f97c63fe3a68f84f4fb5ebcc74e316827253c7e07b03565e58113bbaa918a SHA512 ee59efb4b009ff6543b7afdea99b9cbbee1981ecc03af586acda76674024d3b66dab23049e68f3da9448734984619fc1eaba6e965c9dd3d731973376c8a42e25
-DIST setuptools-41.0.1-py2.py3-none-any.whl 575966 BLAKE2B 332986453a35e4ec36ab2bdb80a8b0a70ffe4fec1bb874f481b0d8e31016a26d53070f90d0eea9030b8c48a1f9bc21a54d8a5a2b70096e1f8db84d42449903e4 SHA512 c84ddf1d1ea90216b2c475f3e4879f4e6792a859adf61db70d67f49a35f2cb4df6fd6d93049881e6d2a8d914768edfcd091475206bb5da3ac66c41c4b9147102
 DIST setuptools-41.4.0-py2.py3-none-any.whl 580302 BLAKE2B 58dc2d48445406f7467bfb0934dc507e8a569e4759bfcc95287cfb21b5b1a7bcab061656a29a8b4976ee3ae12a3adca570035ae4a6d9df09ae7a799857775d36 SHA512 a27b38d596931dfef81d705d05689b7748ce0e02d21af4a37204fc74b0913fa7241b8135535eb7749f09af361cad90c475af98493fef11c4ad974780ee01243d
 DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
-DIST wheel-0.33.1-py2.py3-none-any.whl 21496 BLAKE2B 41bb9ed91d43f94209a010c286d541da9d68b9e727ec8a339fe3c24fb806746b1de5b62c6cd26d2c2841be17406e1f99353b6d172f5258540faeba014945e9e8 SHA512 761ad8cb96557b146642871e1f8ce75849a9828193d992a19d072236b9f8452ab54907a3b82bc7441f75f036155ae21b7450120e0c4c19aa5100b58337945ac0
 DIST wheel-0.33.6-py2.py3-none-any.whl 21556 BLAKE2B 6b6124c1e8e70592399a90c88b2a70efc5885bad81d2ff07a2e243eee008ba5cb0c927454036915a61e97489e29fe1abc4ba2e63d7eadf1a8985c8a8b7cdf4c4 SHA512 4663cd55ee9d3de138216bb06870606b546b19cb6a733f1beab211c0ba72e63d849c422d320ddc8aa8275ad04a30119a84c1351e589150cd18c2a34f9fdb224a
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
-EBUILD pip-19.1.ebuild 3584 BLAKE2B 546155c7fa234911831c843c8162e47abd037446b5968c4de59a6565b972318e973a646e16e9383b2be4f6a9d963d67e9e26725e9fc52a1a1d2845a159324d59 SHA512 018b88185e223c3578cdd6bac808807f23de514069b7a13fe3d285b284d1c345ca8c909832d5975efed63c8ceacc908852ec136973793cbdcd8e1f1fc45c445d
-EBUILD pip-19.3.1-r1.ebuild 3953 BLAKE2B f3c56b3691e0b595a543934a391a19c27b20b4c14c57066f76535bcdfdd34d0f45435d44f74b844ac85a86389e2f4c99dc99a6f369558c788327e34496f4ea17 SHA512 c4a2d0d4cdfdc8dc917333fe7ed2e0e1e490cfa00f365d9bc6e1fa8719400f271ddc77c25aa8191f1a3fe3592de10697855ebabc2ff287b5cc7b52d9de6885a5
+EBUILD pip-19.3.1-r1.ebuild 3952 BLAKE2B 47558ece06c8b19b245eda03d1f4715d69897c245f492bbf7256237d965eed978919b4373bd9bdafb713305528356a7c178b605ed9db5273577b1485dc436bfd SHA512 3d7d4399a939e2379ddf016ae2e0cd28226272edc86b8e1faee88860b21d32b0a50dc3b3738a3eb52491e32bdac2584b1ed97076740b5f59bd491a0699827a19
 EBUILD pip-19.3.1-r2.ebuild 3916 BLAKE2B 0b5663135d0c61e1fba71bff7de5e6b9e74a989f674d1cc1dc418a20631bd0d72680e9360470257b1205100a6ccf7c8f876e236327f591ba1614dc237fbe530f SHA512 f30cb585dad403eea8cee9d17f4b602ab34bf582762ec086fdfd0f93f7c0314421df62336112f42d42528be8072e2cb798cd5e5d1c8c8a6b03fc160ba69d1a5b
 EBUILD pip-20.0.2.ebuild 3957 BLAKE2B 6eeb001d9789afc065e86d13306a7c3674dfee90f4b6a4927f26c1fef7369b34f58cd1489d19b1e74c8db1c7146e6572c262071b5fe86cf2dfe892ffaa901cc9 SHA512 2dc0f239b7384054655adfcea9a081bf67867e79cdd9e3bf4090a59b5088fce04b653c312396e37da48763f08a2ca8eb1d9347bdc1a2f6e31966d8c71f7793df
 EBUILD pip-9.0.1-r2.ebuild 2455 BLAKE2B b891741da8946986a3140e1023ec956358d70b1fbabc70964ae2edf596ed96d0fa80b62732da6193ba6a9e45c81ce239058dc4054cff59b3c749d309cda3f85a SHA512 727ebc793313293384c9fcc32e403fd5dbab8ac72528fe0bb96b2011ecf9e8b659f6b4fa0b5165b97d68ef33627b0c0233ce88b955fd962b794d10c613659a45
diff --git a/dev-python/pip/files/pip-19.1-disable-system-install.patch b/dev-python/pip/files/pip-19.1-disable-system-install.patch
deleted file mode 100644
index bc88ef715a2e..000000000000
--- a/dev-python/pip/files/pip-19.1-disable-system-install.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-install: Raise an error to avoid breaking python-exec
-
-Running pip without --target, --root, or --user will result in packages
-being installed systemwide. This has a tendency to break python-exec if
-setuptools gets installed or upgraded.
-
---- pip-19.1/src/pip/_internal/commands/install.py
-+++ pip-19.1/src/pip/_internal/commands/install.py
-@@ -246,6 +246,9 @@ class InstallCommand(RequirementCommand):
-         if options.upgrade:
-             upgrade_strategy = options.upgrade_strategy
-
-+        if not options.use_user_site and not options.target_dir and not options.root_path:
-+            raise CommandError("(Gentoo) Please run pip with the --user option to avoid breaking python-exec")
-+
-         if options.build_dir:
-             options.build_dir = os.path.abspath(options.build_dir)
diff --git a/dev-python/pip/files/pip-19.1-disable-version-check.patch b/dev-python/pip/files/pip-19.1-disable-version-check.patch
deleted file mode 100644
index a46a47f0fc68..000000000000
--- a/dev-python/pip/files/pip-19.1-disable-version-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Don't check for new versions of pip.
-
---- pip-19.1/src/pip/_internal/cli/base_command.py
-+++ pip-19.1/src/pip/_internal/cli/base_command.py
-@@ -213,12 +213,8 @@ class Command(object):
- 
-             return UNKNOWN_ERROR
-         finally:
--            allow_version_check = (
--                # Does this command have the index_group options?
--                hasattr(options, "no_index") and
--                # Is this command allowed to perform this check?
--                not (options.disable_pip_version_check or options.no_index)
--            )
-+            # Disabled on Gentoo
-+            allow_version_check = False
-             # Check if we're using the latest version of pip available
-             if allow_version_check:
-                 session = self._build_session(
diff --git a/dev-python/pip/pip-19.1.ebuild b/dev-python/pip/pip-19.1.ebuild
deleted file mode 100644
index 7a298c231eb3..000000000000
--- a/dev-python/pip/pip-19.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-SETUPTOOLS_PV="41.0.1"
-WHEEL_PV="0.33.1"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
-	)
-"
-# PyPI archive does not have tests, so we need to download from GitHub.
-# setuptools & wheel .whl files are required for testing, exact version is not very important.
-
-LICENSE="MIT"
-KEYWORDS="amd64 x86"
-SLOT="0"
-IUSE="test -vanilla"
-
-# disable-system-install patch breaks tests
-RESTRICT="!vanilla? ( test ) !test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		<dev-python/pytest-4[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		<dev-python/pytest-rerunfailures-7.0[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		<dev-python/pytest-xdist-1.28.0[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-19.1-disable-version-check.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-19.1-disable-system-install.patch" )
-	fi
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/
-		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl tests/data/common_wheels/ || die
-	fi
-}
-
-python_test () {
-	# Exclude tests that fail for some reason. Some of these failures may be Gentoo-specific.
-	python -m pytest \
-		-n $(makeopts_jobs) \
-		--timeout 300 \
-		-k "not (svn or git or bazaar or mercurial or test_pep518_uses_build_env or test_install_package_with_root or test_install_editable_with_prefix or install_from_user or install_user_conflict or upgrade_user_conflict or build_env_isolation or config_file_venv_option or get_legacy_build_wheel or install_user_wheel or uninstall_non_local_distutils or install_from_current_directory_into_usersite or uninstall_editable_from_usersite)" \
-		-m "not network" \
-		|| die
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-19.3.1-r1.ebuild b/dev-python/pip/pip-19.3.1-r1.ebuild
index f0dfd5344704..8a4b36362386 100644
--- a/dev-python/pip/pip-19.3.1-r1.ebuild
+++ b/dev-python/pip/pip-19.3.1-r1.ebuild
@@ -64,7 +64,7 @@ python_prepare_all() {
 	fi
 }
 
-python_test () {
+python_test() {
 	# pip test suite likes to test installed version of pip, both the module and the executable.
 	# Here we install it into a temporary dir and add to PATHs in a subshell.
 	EPYTHON_ROOT="${T}/${EPYTHON}_root"
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 4c9f531811bd..e5d52868cfc7 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,5 +1,7 @@
 DIST pkgconfig-1.2.2.tar.gz 5305 BLAKE2B 39fe5e05489e4eb8fefce66f23820d96039f5dfb82148e8ac2d691644aa2d4f1205bfa483f9fdc69837b7956834d1525d85281ba6aa0a0c079748336d47708c7 SHA512 88cfb27755297871c500f37c422da5d4ae30a14e0b9974afbe63f22c59746be0d175b65d9e3d2ed315b4d942046e7c18be062aef914199c99070a2767699848b
 DIST pkgconfig-1.4.0.tar.gz 5915 BLAKE2B 17ae11783b6642f6c8e726b42b725b7904ea282829b4527f92daa1e6ea43c3c126e6ef7e29fe5eefc89b40f3b69799087a46df6ac5695a593903dab9dc247c04 SHA512 8a270449b7b8b850aab9cc5774d1d6c6b68254f00157b66530c15697eda214948d3a71a75725067d63b906a9c3b1d789a775ac15a1094ff5ba3f227bcd666528
+DIST pkgconfig-1.5.1.tar.gz 7000 BLAKE2B 5eec60ed5af17315513f676ba37b201f4ce897089a823a9bac89d281095848504f69fdb02637eefa2872cfc6e4d1150fc18d0185288c3418500a0e201be8fc59 SHA512 2d62ad1a51620d4ccbeedf621b563c42258d69cf3aeb63f2a29399a9e03f111be1728bdb0d9d924f916839cf9a3d7625bbdd1a7b6f2471a221e764180a56fa59
 EBUILD pkgconfig-1.2.2.ebuild 705 BLAKE2B 4acd0027aa2cd3f3a597b3f0f490520a063c22c202f83e5a9970ad68f91701e9c2fffbc2473b4d589bb1037be9ddb4a54350844cbd8c9dc4745db587585805d3 SHA512 a619e02a08ba309a2d4979c67813776a41a54c3366f2ba79b7c73f22b3ff9e22587c3fb9fa1c614ea8a016499ba178a0a87febb1dfdc3bd9e63f0c8ccb92c0b8
 EBUILD pkgconfig-1.4.0.ebuild 746 BLAKE2B a70d3d536ffe1d0508f38d57d29a44e7d8d352a0ff2d04fa469c8612943b0d59b3cfae1e823a2511e47a06dec5eddf352ecef8bd41feb536da29d363c23ba68e SHA512 b7b2e514c1277e857f9a824fe1bc2e8e42961c1583a91cf77116fce4c8b470c0914cc01fce5d0a9268048a7074b9653ec6c4b7705be43cb9eba8a1ddabff7bb6
+EBUILD pkgconfig-1.5.1.ebuild 564 BLAKE2B 9be09485dc29e3f830207f29359b178b468d1611dc0d46fd76dee8d2b82033e044dae108c2ff7591ec7baa48dfc6e499eed973fab0716aab148fa13cbff1249a SHA512 d521912dc0837a531212522c8547e4918b78c3bac3d245984849709eadbbb5237d271649aef8eadd116cd5c07c94223741b1304ea285fec78eba98ba93292ad9
 MISC metadata.xml 379 BLAKE2B 6d974351e99e999b08f6c18b48ecd4dcafb45452f724d6d038a2307a205ca00f300bf1c60761bc9e63726426f499c2622673dd677afb263c957fb398f264504f SHA512 2e92f2bbce0b0b8d9524ffdd2950c90ce34776d497c3d3ad47f239cfc562cbc7f52c3690b9df132f8466e386783b5287e63011c0bc8b1ab2ea839d1fc3fd9af4
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
new file mode 100644
index 000000000000..7be81912d787
--- /dev/null
+++ b/dev-python/pkgconfig/pkgconfig-1.5.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Interface Python with pkg-config"
+HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
+SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="virtual/pkgconfig"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pkipplib/Manifest b/dev-python/pkipplib/Manifest
deleted file mode 100644
index 92c89f68cd36..000000000000
--- a/dev-python/pkipplib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pkipplib-0.07.tar.gz 18704 BLAKE2B fcf2157c4481f78228df043079fa6288f2acfc0278c28d25b2c0d6c6fb32c0ea5a2a1152a3641fd7c6109c512569343fa9460f04a4fe42d67ab714f8a3c8c01f SHA512 223aaf7dcffa3a435ae9a407c1f7c31cd69a15f8b12f6a6d24f3ea589816b1e641cb1efbdf2ea0415e36d0df07d8dae83a55604e7f31d2f1bd7827a3f4724a2e
-EBUILD pkipplib-0.07-r1.ebuild 446 BLAKE2B 133d0e2d2e6a63eadd50979dc75d1d2ded3bf279f7d54357de522fdc141532ce7d8a7d1cce46c575f675000a2f59fc2695594ff1ea19394f500444e6cac957b5 SHA512 1b29b2313d008bc2a450e2a12a002bdeae6496caec1c1b861f03e7119fc56a844a3ee463993c372ce6e685a0045940b6ac808be10d491f22eabf3b5ed5596ded
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pkipplib/metadata.xml b/dev-python/pkipplib/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/pkipplib/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/pkipplib/pkipplib-0.07-r1.ebuild b/dev-python/pkipplib/pkipplib-0.07-r1.ebuild
deleted file mode 100644
index 7e0603254d12..000000000000
--- a/dev-python/pkipplib/pkipplib-0.07-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pkipplib is a Python module which parses IPP requests"
-HOMEPAGE="http://www.pykota.com/software/pkipplib/"
-SRC_URI="http://www.pykota.com/software/pkipplib/download/tarballs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/processing/Manifest b/dev-python/processing/Manifest
deleted file mode 100644
index 8d69bfeb7566..000000000000
--- a/dev-python/processing/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST processing-0.52.zip 178013 BLAKE2B 312f18e7c138bc55d5623c4a4896ac9ee37a7a7f37953c760650427d4d38d5de506de99f792143176e990ef5cd6a5bd1e37b837337526385b144124c5872932f SHA512 ce5244eefe1bed629afddf2309ea61f44a2a5fe913b97032752ecd92e58add278f7bcf02c5dc9e1985720ceaaa2e4d547f67e9b018313a26ca084c2a86f0efb3
-EBUILD processing-0.52-r1.ebuild 555 BLAKE2B f127ebac512c18aaf0e8ee13418b117e255ed8a9dec29f88d1db832cebf1f772202c61e6ac1e1124e9b91f4eadfe375cdbcf24fb2c9b0824da64bdcf05343685 SHA512 5ff478f43de5cff222319b9dbcfa8d704cdb75fe728bc3b3fb359f4b0c1733f0f8102c38c1383a485e32950a3c13b2682b9ea81b5fc327be01fb0afd4862af61
-MISC metadata.xml 313 BLAKE2B 83629944e2c85deb82ad499d462573ef23e42782f4105927c4ac1e3e5779cba3a70b850545c76ed119e20fa3039c83d23732f4a7832ce1355926cc88ef5716f2 SHA512 77df3ec80696cb2ab14b05e37e90e06a9aa53c58f2871309b9c754014682c559aa687581fe8642b11d409ec8d520ce795a192cb599505a9faf2ed5743411c57c
diff --git a/dev-python/processing/metadata.xml b/dev-python/processing/metadata.xml
deleted file mode 100644
index 74199fc077ef..000000000000
--- a/dev-python/processing/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">processing</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/processing/processing-0.52-r1.ebuild b/dev-python/processing/processing-0.52-r1.ebuild
deleted file mode 100644
index 1682aa23d70a..000000000000
--- a/dev-python/processing/processing-0.52-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Package for using processes, which mimics the threading module API"
-HOMEPAGE="https://pypi.org/project/processing/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	app-arch/unzip
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 0a89ca09d58f..a7f5cc22b636 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -1,13 +1,7 @@
-AUX psutil-5.6.5-tests.patch 3942 BLAKE2B 95c1f1c65b68a274d4bae00acc7872dbc25e646a94cb466f811efa90883cc233fdcad9f268c77f56a0a4cacdb65089e0c4038c16a7ddf275260055b2b7127a92 SHA512 de6e199927e548cda039c8296b8f8402391ea48586db873e8d1337145428eaebcb5f64847f3c661883a2898be1345edef4ff1cb30da3da84daecede2eff4907c
 AUX psutil-5.6.7-tests.patch 4286 BLAKE2B c0170138af6e1dac482f4c3589c2311186916a4a6150fa8679df01bba7fe99925f97bdaab61cac7ffa19341ea33c7a68260d644fea09a4774b795e813e12c4a4 SHA512 e33a7d375b72b3d43169adb493d8ad0684a2ce88159fdeb2e92ed966b2de1a6381a023f2e226b8d91194c66eeee4ce2b936cc08a9a84152a7119fecd8679723e
-DIST psutil-5.4.8.tar.gz 422742 BLAKE2B 13c4b9b412704728c4b192032a6be78756b03a37cd6f425a81a83d0aca4ce155ebf24a1f62b75e66433f21e8bd3f2fa3c7bbb5ec2686c6dc951b89e97ebfa688 SHA512 5691e7e7ecd827aff2755a85c4c1be3a23beec3a1dbff079547991dcfffa8e075cff7fb6983e1f6fa287e2216e3b1466618730afaf114a0ee209d7b70d7b0c6a
-DIST psutil-5.5.0.tar.gz 425058 BLAKE2B 0a13149b060d1a99faa600470fdbd592ee520b247f916313bef428feaa652bc4e9152f09ceeea5378769d4cdcd9876ccdc96dc4378d74136bcbcadf4a9266b90 SHA512 e614d41162087e236779738b50ec9e83403082f20492e152605fe80da23a11a4bd667db82a234f00815f68139d53b19368c2118ab27d52144341c2250091c570
-DIST psutil-5.6.0.tar.gz 426596 BLAKE2B 803cb09262575a7193ecc9cf9bfbbf721e10ef4adc25672f6747111306d1803c1422c9894636421653eaae11c241100f58837c80173ab473bb9dc39da2580aed SHA512 01daf80698954a53a9e987afad6c7aefad502c76b5f34601728c3864c924ca52099f139242e508fd4c72378cbe436c9870eca7a33c112fb8dead0be501aaf2aa
-DIST psutil-5.6.5.tar.gz 447489 BLAKE2B 9301d1580bded927b4b117facf82a3c6be9b43cb648f0f52b841dc2c59cbcc58b5a5c3e0ea7cee30a546e1ea1c00fc0e03b3b49fa69209bbfd3c873e18510859 SHA512 037b1501b686b7101be4180c8698b09d20d4260962a88f0c437ff558d91c405f56eae186c9d55c1893c612c4534093ab26e6943f0ed56db69e343c5c0317be1b
+AUX psutil-5.7.0-tests.patch 4420 BLAKE2B a3daf702d70c2a945a7373e34d7ddbb730f884eb99716605f3d202a4bcb271d899330de9a96d7666ebf743157604721f5ee76136559f33ac34d8a0ecab4368a5 SHA512 89315123d1de4c5f1601b56bbaa200a180419865ba2e303b8470c56ea36d7eba251bcc2592b61659762c04f02e4ccea20a4774a11b4936c03efbbd42f58c4a51
 DIST psutil-5.6.7.tar.gz 448321 BLAKE2B 4e47fb7def5a0eed162686d4e90dd122bd380eca50c3294cd89ed154e27f71972dbc2b3b481456d5022107a1adad2a637e8f233002d429463232c38a04a957c7 SHA512 74eb488b91764941e38214f07bca00e3c837167ad543bfd9ae3b83d665e2be1bb5341eca4aff9282ad50d321568a679e1ffa2ee72ad7b4965cda92b7c80b2503
-EBUILD psutil-5.4.8.ebuild 911 BLAKE2B 552531d6c0b70dcb013cb8a4f089fa788cc90c0ba62a82f11b48dbb7e9f7f6d9ede63c8f51c8e89be55c1242569fa60c2e8b6246914d996fd3d9d96d412949c4 SHA512 54a6fde56fd09337094025e5272615e03c521d66c041a9cf0d11850c0b7c36734e02cf5082f0e6567955593badccd73dc87bc655df98376dff8d0f3a39640bad
-EBUILD psutil-5.5.0.ebuild 902 BLAKE2B 73d74d37194d56024151676e46d7ab2de98bc4b28cd9ff2d1763290df33f71eb526d2ab5bbb402fd755794386ef6995224f1ec58a686f6c07af36714ae1f97bf SHA512 5df37887f03dff322ceb6eacd0d1737bb1b31a203c1664a7ed38e7a01cf31c2f1bdcd0eb707626cca4ec523b53d429b9608dcf23a0861a2e1513c2362250a291
-EBUILD psutil-5.6.0.ebuild 904 BLAKE2B 5d85f27ecb4d758cf8ea4de82d0605ec1f8cf047835259c6069230f936b9a212b082be539cce6f8c5ae70c83a391ffb42f11ea8e7b4d6e7ce9f1f34fc38f327d SHA512 27991183c768aaacc25993d727b3905a74df0638b69c1d0f5a23e38c7008fab9bfc8e67e49067bd4775773ae79587824c4ba38505cbd13d984e08d3e185c72ec
-EBUILD psutil-5.6.5.ebuild 1219 BLAKE2B b9a1cf7ddcf48299f0b9a97754b29d3b6ca3ca32b34f15c2bec7da5c189cb744d11cc7b06d7a6e7f89500627a40b754eccf68016d383d9d4e36cb64507cc6b39 SHA512 95145244df8b0a050ac9e74068c5a82dce594169a7a8157a973faf7b99cb17711c7d4ddad70525c756c72e35fd7c675f68156e7b8de9569f3a4e27fc67f2f652
-EBUILD psutil-5.6.7.ebuild 1300 BLAKE2B 4840866eea59dbbad5fb5a395e93de1f5463ad339e89d2119928b6b890121a291a7b7d64a22f60c9ee3b66fe180c938de1c7c21115375a0ee29336d4f3546508 SHA512 307518cc34244bcd2caf3bb74b4179cdaef1e388feafc1ad581f858a53c93c586215ee79bae4e4d12c88af4a515882ab0f6cca85c92651a1cb931a472b05750c
+DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981
+EBUILD psutil-5.6.7-r1.ebuild 1336 BLAKE2B cc0a153d2eabe52ad6224f181e84f769faef36a8619a50e34426f3eb538c0e3302c268ab5acd94b2cc812e2eb4085c2557a10e793888b8b295955c515243b11d SHA512 cfc2c90df13a952ca2b054f05233d2ace7e6cf4788c7404e28a3fbd594fe4668e48f3ab711fcc09d08613d603d193df3ecb674b2d60329625a9b54a03865ed61
+EBUILD psutil-5.7.0.ebuild 1343 BLAKE2B 43db8ce77edc252c097d9eefa36bcc697a6224517cdaca2a72b83f02645737a321e23a8de716704a9c8b8bbb82ba686824a79b751926985037c1f6734f5cfff0 SHA512 4d5ccc004d4930c23e61e5bb993930cc358eeb73c908661208ad2e278306c779a5dd99ee3768392d246de7ebfc48f56f122b8c0603872069b3807692f907138f
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/files/psutil-5.6.5-tests.patch b/dev-python/psutil/files/psutil-5.6.5-tests.patch
deleted file mode 100644
index ab06ffd069b6..000000000000
--- a/dev-python/psutil/files/psutil-5.6.5-tests.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
-index 80fbf8bf..13c195b8 100644
---- a/psutil/_pslinux.py
-+++ b/psutil/_pslinux.py
-@@ -1108,7 +1108,7 @@ def disk_io_counters(perdisk=False):
-                     fields = f.read().strip().split()
-                 name = os.path.basename(root)
-                 (reads, reads_merged, rbytes, rtime, writes, writes_merged,
--                    wbytes, wtime, _, busy_time, _) = map(int, fields)
-+                 wbytes, wtime, _, busy_time, _) = map(int, fields[:11])
-                 yield (name, reads, writes, rbytes, wbytes, rtime,
-                        wtime, reads_merged, writes_merged, busy_time)
- 
-diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py
-index cb4a2b96..1ff7f6ca 100755
---- a/psutil/tests/test_contracts.py
-+++ b/psutil/tests/test_contracts.py
-@@ -174,6 +174,7 @@ class TestAvailability(unittest.TestCase):
- 
- class TestDeprecations(unittest.TestCase):
- 
-+    @unittest.skip("broken with newer deps")
-     def test_memory_info_ex(self):
-         with warnings.catch_warnings(record=True) as ws:
-             psutil.Process().memory_info_ex()
-diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
-index ccde735d..db7183af 100755
---- a/psutil/tests/test_linux.py
-+++ b/psutil/tests/test_linux.py
-@@ -380,9 +380,10 @@ class TestSystemVirtualMemory(unittest.TestCase):
-                 ret = psutil.virtual_memory()
-             assert m.called
-             self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
--            w = ws[0]
--            self.assertIn(
--                "inactive memory stats couldn't be determined", str(w.message))
-+            # i have no idea what they are trying to do here
-+            #w = ws[0]
-+            #self.assertIn(
-+            #    "inactive memory stats couldn't be determined", str(w.message))
- 
-     def test_avail_old_missing_zoneinfo(self):
-         # Remove /proc/zoneinfo file. Make sure fallback is used
-@@ -410,10 +411,12 @@ class TestSystemVirtualMemory(unittest.TestCase):
-                     ret = psutil.virtual_memory()
-                     self.assertEqual(
-                         ret.available, 2057400 * 1024 + 4818144 * 1024)
--                    w = ws[0]
--                    self.assertIn(
--                        "inactive memory stats couldn't be determined",
--                        str(w.message))
-+
-+                    # i have no idea what they are trying to do here
-+                    #w = ws[0]
-+                    #self.assertIn(
-+                    #    "inactive memory stats couldn't be determined",
-+                    #    str(w.message))
- 
-     def test_virtual_memory_mocked(self):
-         # Emulate /proc/meminfo because neither vmstat nor free return slab.
-@@ -878,7 +881,7 @@ class TestLoadAvg(unittest.TestCase):
- # =====================================================================
- 
- 
--@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skipIf(not LINUX or True, "Not working with latest ipaddress")
- class TestSystemNetIfAddrs(unittest.TestCase):
- 
-     def test_ips(self):
-diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
-index 24a29b5a..9d9d36d2 100755
---- a/psutil/tests/test_process.py
-+++ b/psutil/tests/test_process.py
-@@ -950,7 +950,7 @@ class TestProcess(unittest.TestCase):
- 
-         for combo in combos:
-             p.cpu_affinity(combo)
--            self.assertEqual(p.cpu_affinity(), combo)
-+            self.assertEqual(set(p.cpu_affinity()), set(combo))
- 
-     # TODO: #595
-     @unittest.skipIf(BSD, "broken on BSD")
-@@ -1486,6 +1486,7 @@ class TestProcess(unittest.TestCase):
-         d2 = clean_dict(os.environ.copy())
-         self.assertEqual(d1, d2)
- 
-+    @unittest.skipIf(TRAVIS, "broken under sandbox, using TRAVIS for Gentoo")
-     @unittest.skipIf(not HAS_ENVIRON, "not supported")
-     @unittest.skipIf(not POSIX, "POSIX only")
-     def test_weird_environ(self):
diff --git a/dev-python/psutil/files/psutil-5.7.0-tests.patch b/dev-python/psutil/files/psutil-5.7.0-tests.patch
new file mode 100644
index 000000000000..2def4979faf4
--- /dev/null
+++ b/dev-python/psutil/files/psutil-5.7.0-tests.patch
@@ -0,0 +1,113 @@
+From e910d08976e00bc12b5a516daa9e6a6d42d48354 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 19 Feb 2020 07:27:32 +0100
+Subject: [PATCH] Skip broken tests on Gentoo
+
+---
+ psutil/tests/test_linux.py   | 8 ++++++++
+ psutil/tests/test_posix.py   | 1 +
+ psutil/tests/test_process.py | 2 ++
+ psutil/tests/test_system.py  | 1 +
+ 4 files changed, 12 insertions(+)
+
+diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
+index e51f8bd5..48527ccb 100755
+--- a/psutil/tests/test_linux.py
++++ b/psutil/tests/test_linux.py
+@@ -17,6 +17,7 @@ import re
+ import shutil
+ import socket
+ import struct
++import sys
+ import tempfile
+ import textwrap
+ import time
+@@ -381,6 +382,8 @@ class TestSystemVirtualMemory(unittest.TestCase):
+                 ret = psutil.virtual_memory()
+             assert m.called
+             self.assertEqual(ret.available, 2057400 * 1024 + 4818144 * 1024)
++            if sys.version_info < (3,):
++                return
+             w = ws[0]
+             self.assertIn(
+                 "inactive memory stats couldn't be determined", str(w.message))
+@@ -411,6 +414,8 @@ class TestSystemVirtualMemory(unittest.TestCase):
+                     ret = psutil.virtual_memory()
+                     self.assertEqual(
+                         ret.available, 2057400 * 1024 + 4818144 * 1024)
++                    if sys.version_info < (3,):
++                        return
+                     w = ws[0]
+                     self.assertIn(
+                         "inactive memory stats couldn't be determined",
+@@ -882,6 +887,7 @@ class TestLoadAvg(unittest.TestCase):
+ @unittest.skipIf(not LINUX, "LINUX only")
+ class TestSystemNetIfAddrs(unittest.TestCase):
+ 
++    @unittest.skip("broken on Gentoo")
+     def test_ips(self):
+         for name, addrs in psutil.net_if_addrs().items():
+             for addr in addrs:
+@@ -1364,6 +1370,7 @@ class TestMisc(unittest.TestCase):
+             psutil.PROCFS_PATH = "/proc"
+             os.rmdir(tdir)
+ 
++    @unittest.skip("broken on Gentoo")
+     def test_issue_687(self):
+         # In case of thread ID:
+         # - pid_exists() is supposed to return False
+@@ -2073,6 +2080,7 @@ class TestProcessAgainstStatus(unittest.TestCase):
+         value = self.read_status_file("nonvoluntary_ctxt_switches:")
+         self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
+ 
++    @unittest.skip("broken on Gentoo")
+     def test_cpu_affinity(self):
+         value = self.read_status_file("Cpus_allowed_list:")
+         if '-' in str(value):
+diff --git a/psutil/tests/test_posix.py b/psutil/tests/test_posix.py
+index a96b310f..70199203 100755
+--- a/psutil/tests/test_posix.py
++++ b/psutil/tests/test_posix.py
+@@ -364,6 +364,7 @@ class TestSystemAPIs(unittest.TestCase):
+                     "couldn't find %s nic in 'ifconfig -a' output\n%s" % (
+                         nic, output))
+ 
++    @unittest.skip("broken on Gentoo")
+     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
+     @retry_on_failure()
+     def test_users(self):
+diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
+index 987bdf38..cb04f3ef 100755
+--- a/psutil/tests/test_process.py
++++ b/psutil/tests/test_process.py
+@@ -350,6 +350,7 @@ class TestProcess(unittest.TestCase):
+             self.assertGreaterEqual(io2[i], 0)
+             self.assertGreaterEqual(io2[i], 0)
+ 
++    @unittest.skip("fails if builder is ioniced already")
+     @unittest.skipIf(not HAS_IONICE, "not supported")
+     @unittest.skipIf(not LINUX, "linux only")
+     def test_ionice_linux(self):
+@@ -1495,6 +1496,7 @@ class TestProcess(unittest.TestCase):
+         d2 = clean_dict(os.environ.copy())
+         self.assertEqual(d1, d2)
+ 
++    @unittest.skip("broken by sandbox")
+     @unittest.skipIf(not HAS_ENVIRON, "not supported")
+     @unittest.skipIf(not POSIX, "POSIX only")
+     def test_weird_environ(self):
+diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py
+index 3834209f..b07b5883 100755
+--- a/psutil/tests/test_system.py
++++ b/psutil/tests/test_system.py
+@@ -215,6 +215,7 @@ class TestMiscAPIs(unittest.TestCase):
+         self.assertGreater(bt, 0)
+         self.assertLess(bt, time.time())
+ 
++    @unittest.skip("broken on Gentoo")
+     @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
+     def test_users(self):
+         users = psutil.users()
+-- 
+2.25.1
+
diff --git a/dev-python/psutil/psutil-5.4.8.ebuild b/dev-python/psutil/psutil-5.4.8.ebuild
deleted file mode 100644
index 02ce4a8970ab..000000000000
--- a/dev-python/psutil/psutil-5.4.8.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	)
-"
-
-# Many tests fail, even on a regular tox run on a upstream clone
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} psutil/tests/__main__.py || die
-}
diff --git a/dev-python/psutil/psutil-5.5.0.ebuild b/dev-python/psutil/psutil-5.5.0.ebuild
deleted file mode 100644
index 98afea2f8060..000000000000
--- a/dev-python/psutil/psutil-5.5.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	)
-"
-
-# Many tests fail, even on a regular tox run on a upstream clone
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} psutil/tests/__main__.py || die
-}
diff --git a/dev-python/psutil/psutil-5.6.0.ebuild b/dev-python/psutil/psutil-5.6.0.ebuild
deleted file mode 100644
index 205a8af99750..000000000000
--- a/dev-python/psutil/psutil-5.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Retrieve information on running processes and system utilization"
-HOMEPAGE="https://github.com/giampaolo/psutil https://pypi.org/project/psutil/"
-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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/ipaddress[${PYTHON_USEDEP}]
-	)
-"
-
-# Many tests fail, even on a regular tox run on a upstream clone
-RESTRICT="test"
-
-python_test() {
-	${PYTHON} psutil/tests/__main__.py || die
-}
diff --git a/dev-python/psutil/psutil-5.6.7.ebuild b/dev-python/psutil/psutil-5.6.7-r1.ebuild
index ca07e5b732d8..251842c884bd 100644
--- a/dev-python/psutil/psutil-5.6.7.ebuild
+++ b/dev-python/psutil/psutil-5.6.7-r1.ebuild
@@ -19,8 +19,10 @@ RESTRICT="!test? ( test )"
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/ipaddress[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/ipaddress[${PYTHON_USEDEP}]
+		' -2)
 	)
 "
 
diff --git a/dev-python/psutil/psutil-5.6.5.ebuild b/dev-python/psutil/psutil-5.7.0.ebuild
index c33d3e6eddaf..7940191f1b91 100644
--- a/dev-python/psutil/psutil-5.6.5.ebuild
+++ b/dev-python/psutil/psutil-5.7.0.ebuild
@@ -14,19 +14,20 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/ipaddress[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/ipaddress[${PYTHON_USEDEP}]
+		' -2)
 	)
 "
 
-RESTRICT="!test? ( test )"
-
 PATCHES=(
-	"${FILESDIR}/psutil-5.6.5-tests.patch"
+	"${FILESDIR}/psutil-5.7.0-tests.patch"
 )
 
 python_test() {
@@ -37,6 +38,12 @@ python_test() {
 
 	# since we are running in an environment a bit similar to CI,
 	# let's skip the tests that are disable for CI
-	TRAVIS=1 APPVEYOR=1 PYTHONPATH="${BUILD_DIR}/lib" ${PYTHON} psutil/tests/__main__.py || \
+	TRAVIS=1 APPVEYOR=1 "${EPYTHON}" psutil/tests/runner.py ||
 		die "tests failed with ${EPYTHON}"
 }
+
+python_compile() {
+	# force -j1 to avoid .o linking race conditions
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/pudge/Manifest b/dev-python/pudge/Manifest
deleted file mode 100644
index 4cf85acf6237..000000000000
--- a/dev-python/pudge/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pudge-0.1.3.tar.gz 62396 BLAKE2B 073d1097c99094f8efda951c07afd70730e02fdbf7361d0b9062f4da4139cdde88265241995964d2a06e946080f35a4e896287fdb8b6867e3e8944134b5dde16 SHA512 149efd60d04a75de23b65b5c10df9b0c347b659d1c998812bd3dc438f2a398aff28352858d17ba3f456c2cba0006707102376bcdead380156338d2a379e6b06f
-EBUILD pudge-0.1.3-r1.ebuild 946 BLAKE2B 4606a60ebe4f19fc8c305d86e5b6eb75eca56b2b5b320dd5921d9fc46ed4420dd6816632613342e5c9c3b1b8b779e0078526fa742227ec2ce5fee23730917fc2 SHA512 8c36bb51cb69b3ee730c21369999771a09b863779c0a3a7bbe7d4b999d792c3ae26ddbeb6aada7423b4abf5477389ed45ed227994dfc24379f51db9aa4379ab7
-MISC metadata.xml 308 BLAKE2B 9f5b7c69858451a454940101c61c3ca72fe441fabc62abee7c94bb5fbe936b330a762845f6344fce1e548f3e02e9702e1e82bf8902ad13fb28b0d3fdb7f4a95e SHA512 c4d300be17d94d49a294d8dd20d0f98183d442573df5b42e3f9bd7f037858d02a2e668212c45a459da3b96867642f8f7e44c651ad62a8e55093a6dcf47828911
diff --git a/dev-python/pudge/metadata.xml b/dev-python/pudge/metadata.xml
deleted file mode 100644
index a9db1b5da032..000000000000
--- a/dev-python/pudge/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">pudge</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pudge/pudge-0.1.3-r1.ebuild b/dev-python/pudge/pudge-0.1.3-r1.ebuild
deleted file mode 100644
index 77ed500a2342..000000000000
--- a/dev-python/pudge/pudge-0.1.3-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
-
-DESCRIPTION="A documentation generator for Python projects, using Restructured Text"
-HOMEPAGE="http://pudge.lesscode.org https://pypi.org/project/pudge/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc"
-
-RDEPEND="dev-python/docutils[${PYTHON_USEDEP}]
-	>=dev-python/kid-0.9.5[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( ${RDEPEND} )"
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		"${PYTHON}" bin/pudge --modules=pudge --documents=doc/index.rst --dest=doc/html \
-		|| die "Generation of documentation failed"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index 16f21ac8fd33..8287a21455bb 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1,4 +1,4 @@
 DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
-EBUILD pyGPG-0.2.ebuild 1126 BLAKE2B 667fab5086883c2d7a3cffccb761af9a13ba6dedfb026a6456e5df6c8ee533915306da88a9681f2d1ca5c22bc2b005655f517412519a97ec13a5352f6f1c805d SHA512 f374f2a3197803eb5245984b780eb4818ce2ae95d9250670626e6fb1eaef943309c069d99343b59202796369e73e6f0e21bb37526399cdbae66a3e646ab85c51
-EBUILD pyGPG-9999.ebuild 1135 BLAKE2B 72ee90f9757fe60e75b382b31427f942ffd2a09ec3cadb90d8f9426ebccc73f9460d4d2dc7a7ba67e99e8795669f7bce90d2c6f3b14103e9c30b6b2e8ee03b5a SHA512 725451e20609d475587561f29e882c68f511ad871e22deec4ba6ae7a8adc048af50b88a26080619b29f4023d4e649a8fb351c7cadabec991d7366c33f0764b36
+EBUILD pyGPG-0.2.ebuild 1116 BLAKE2B acb7a3fcf5c6aa52973549875a9fbd37270bb2cc74bb410c5dcdcfe8982ddb926f7992a7066c7802799c47463c66b1dcdc7a242add486e23fdb3e33a57552c03 SHA512 66e5badf0400f4b5dbd3827c412fe9b68500ac043b8495d3bf2f2f8069ffe96337353baad34f8a26dd1fcbd91398216a7b6ef850fd1452b5d8c6cd883bf180e9
+EBUILD pyGPG-9999.ebuild 1125 BLAKE2B b65cd31f019a15f474083c8324f5fe0866cc81c4ed63713ed89db12097ef3c1ec10d2c6a11829815999ca50e43e44ab420abd188b85dc1897ade665470a74609 SHA512 9ad0db2f3dc0e27c8298395aa26f52d191607d533eb02085b60928ab367dde65564d6183417330cbdf33983bc0c04989a607798d2816400769c19826e756e1d1
 MISC metadata.xml 566 BLAKE2B 85f26a61bb3bbdc790bbd1f67133d51d522f492f16ee59dca909eb1c33668cd330faa69cd75603e65b41fc3a0ceb760e0a9aace292de9c7fad248273d0c407ee SHA512 03125338286f45302cc2b60257f4650a8bbcb43e8b7d433b6f012e646a2a2ef7f84b994057a93c3fbdeddd94b838a428d1409d965e0d190c937e4e2463ad34fb
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index eeff26977f72..24cd5e76b7e1 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyGPG/pyGPG-9999.ebuild b/dev-python/pyGPG/pyGPG-9999.ebuild
index c62035eebd34..ed59d0da0369 100644
--- a/dev-python/pyGPG/pyGPG-9999.ebuild
+++ b/dev-python/pyGPG/pyGPG-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyTenable/Manifest b/dev-python/pyTenable/Manifest
index 8adb4c94512c..76c66ae8e074 100644
--- a/dev-python/pyTenable/Manifest
+++ b/dev-python/pyTenable/Manifest
@@ -6,4 +6,4 @@ EBUILD pyTenable-0.3.18.ebuild 753 BLAKE2B 19b5ac2d1047efeb57929d3cfcdd6964d77aa
 EBUILD pyTenable-0.3.19.ebuild 753 BLAKE2B 19b5ac2d1047efeb57929d3cfcdd6964d77aa2830bb2063a68821d8c7dbe24a6dcfe6db81c94f8fcd9f67ae5b19085c475d69139b2637489e3cbadc8fc0156bd SHA512 8e282adec68df92890c4ffc5a2071cdf2a3afc1748a1c0e6b61cafaa9f925cd4db01f72176cabfee354392d4f4f471eb07d19ddc9f596f24cf3f2f57d0ef96b9
 EBUILD pyTenable-0.3.20.ebuild 753 BLAKE2B 19b5ac2d1047efeb57929d3cfcdd6964d77aa2830bb2063a68821d8c7dbe24a6dcfe6db81c94f8fcd9f67ae5b19085c475d69139b2637489e3cbadc8fc0156bd SHA512 8e282adec68df92890c4ffc5a2071cdf2a3afc1748a1c0e6b61cafaa9f925cd4db01f72176cabfee354392d4f4f471eb07d19ddc9f596f24cf3f2f57d0ef96b9
 EBUILD pyTenable-0.3.7.ebuild 652 BLAKE2B 4cebdc4457aa5c908e55d6630f7218903ea989f756851d0ed10c6f1541edad6497bc13baf4adb8297b25275f87590b27ad5bc5ffc4c6aec950b59ad1978d813e SHA512 ec8d1abcc16951b78cb6ac95711ac64c03fcf4ec72963b67337aacf5d804672301b35ce7d56cd2f89dfc241a4d5e5f20cc1667ba7b17599ec343ff2d2a6541f5
-MISC metadata.xml 529 BLAKE2B eccd96c558e42e1d453f21c6ce85fdda19c47a9bebd5803cc1f789f311726ff02a41d6da592ad1202a6c970413745a5e272dafa7efb6c2abdbe5361c0d7544b0 SHA512 9c8094a71191ceda8919499eca6c8cebcbb3db0bc668b5d2cc414b1ed0798ad1431fa9e102358deee6eeadd5a11c610d2bd90ade8ace0d4451b4d87ac66a5ae1
+MISC metadata.xml 380 BLAKE2B 051d5d76aa2da7bc57d1382fc596b4f061f1c028414038a73ffa977279dd9592c581fb8877e49e8848bc8d44d473f32bd548007b91b259e407e642c5a965e1a4 SHA512 513a84951b784b1c14391c1a283a5d9796d9cb56e178c9ad58f9dbaff3e285c48d45dab6b9fe0fa531cc358a4454e35348c8472e986a43259bef784eb565d065
diff --git a/dev-python/pyTenable/metadata.xml b/dev-python/pyTenable/metadata.xml
index f35b855682a1..a14e32b03dd6 100644
--- a/dev-python/pyTenable/metadata.xml
+++ b/dev-python/pyTenable/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
-		Library designed to provide a simple and easy-to-understand library into the Tenable product APIs
-	</longdescription>
 	<upstream>
 		<remote-id type="github">tenable/pyTenable</remote-id>
 		<remote-id type="pypi">pyTenable</remote-id>
diff --git a/dev-python/pyaes/Manifest b/dev-python/pyaes/Manifest
index 9ae75bfb57af..947fc4fc2600 100644
--- a/dev-python/pyaes/Manifest
+++ b/dev-python/pyaes/Manifest
@@ -1,5 +1,5 @@
 DIST pyaes-1.6.0.tar.gz 28237 BLAKE2B ccce23a58d88582fde56dfe26b774effc00c999c6dd0625e17c5ee7cea7ad1c16c9ab83f452cc4eb47fe88bb7367a37425c1975005249591656bf29ea3af4064 SHA512 32f6bf998b7e200fc73b4852873f60067ac056d646ae87cd8ab55f3ec99c9e26fa2b418b67ba0264a8016311a5f0eb2d40c8e7f917c0715e19f5c3dbf6a8238e
 DIST pyaes-1.6.1.tar.gz 28536 BLAKE2B fa7ca95ae181cd48e21ceaeab42f937c54bc9b90b1a337aaffd6317c8091f813b1fbd2abbc14a600a747829a0e94ac6bdd5624010a27f1c342bfef2390d7c8fb SHA512 00ce3babf72ea18b0de369860cd884058c7c6f3bd8b961c3ff591ef7d3dc0a69fabad5311f61c9f91d2f1a480c8512e34eeced5ec7145ed9f963bf91c5f8838a
 EBUILD pyaes-1.6.0.ebuild 534 BLAKE2B aee9815d8efc3da51919e8430950a8ecd13c82546ff25fbc6074bcf0cb695dcd9a53957833638e5960c44d44d35fa1252f15c6fb70a70862b4394818115d4d71 SHA512 1db5fb0e0c0c6c7c2419a702244a9ae235c5d9fb7918267cbdfec74ed86fc4915a8786af6b5b06eb2bf1d0d906e77704c6e0b46886c81effe73dd2dfd3a5a9fb
-EBUILD pyaes-1.6.1-r1.ebuild 584 BLAKE2B 0ed1af4f30bf3b5b54dc6a454d44c73d6725b33c30d3e104857dc24c16419f6c54ffb597f2b046e8b64acafa55df0c5289d92365aa04b730e82eb4e58bc1cbf4 SHA512 456ab0c8fa8429ed8b34c9be21551fe2348fc37af4555537d38c5656ffb6b33bcaf1aed3a5a6fd13498d7b2ed11d15367dc5b43167775442e33541106e4f72bf
+EBUILD pyaes-1.6.1-r1.ebuild 620 BLAKE2B 52e26e577e5aa722f7c80dd75d6d7b58de039b766ae6000cb5eb8a2b53843cbe8c3d13aa72b2ea29c9cf4e8b4c0ee9a62a6e5b54925a87233de1f6b64d9e6c84 SHA512 6a48184e4678a0f6d43a06206ce7294ab2c6cc6ca9eed509b09149d15f33a061cc35218b025a2bba1f1f90eac4f5accb400bcf712a602680e6de098e527f3119
 MISC metadata.xml 413 BLAKE2B 8f8dd44dbba6ea7f5428112866c3dcec032237c42001522d4e520d2565d378cd9e6e48dfb9eb1205f78b5e85c4f9964c44075774807d35188eeac72cd1e67fc0 SHA512 63a02ec94c96d1183a71a1a4676d54c3aa915666a0080edb472e169769669ca5268706189613a370b754c66df8879742e0705bd378c7ba9aeb9bfc0015e7a2c8
diff --git a/dev-python/pyaes/pyaes-1.6.1-r1.ebuild b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
index f6806c7c8c2d..f918a36c506c 100644
--- a/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
+++ b/dev-python/pyaes/pyaes-1.6.1-r1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pybluez/Manifest b/dev-python/pybluez/Manifest
index 3de331efc811..0fbf4a62157c 100644
--- a/dev-python/pybluez/Manifest
+++ b/dev-python/pybluez/Manifest
@@ -1,5 +1,7 @@
 DIST PyBluez-0.18.tar.gz 74501 BLAKE2B 59ff94cd001f98ef113b0c705c11171ce61e1cb69d2eb596161a3c52764dad64ec2e3f6c5b8c1eedf2bcc463de781e60bcea84413866d10e47e742851bb23f43 SHA512 ddd185ad90f7c6235e25182afccfb586efa0d361f38140f33718dc2d29ca62f3aa68867d075820afffd5ee2fbd306b907b565fbdfdf32f906657f6a3a8c779da
 DIST PyBluez-0.22.zip 109060 BLAKE2B 0bbe0d23b3baf0e76567f2dee8f38ca1460767179df15b52c545e84cd131d23a5ae3752dd7867aae6307fd98f0b2c5a5f55b23c550805e163675526696f559fb SHA512 c166a976d311eba73516aaf86ab42b100a39ebccd3d70f93ccb89f59c12127a857698dcfe4b25f8f689eee12187b5f35ccc8235e36cf012e73df155ba5adfae6
+DIST PyBluez-0.23.tar.gz 97562 BLAKE2B 6a234d5c41dc0bb9f08559431eafcf1d1fb1c881d2cb912cc048e2717bfe8a06f09aae045d2961c9ba5e087422cfc8249a1907368eb6dc45942175bcf97b1841 SHA512 78ce2c014d0055d0220163e7df94de5b6e891aa528ecf4f106f9dd0bdeb94244d18c752f93e62a133f3cec7053cb4646599e7588cf7ce5994ae7abe74ed05d47
 EBUILD pybluez-0.18-r1.ebuild 574 BLAKE2B 69e35680ca72d37e5162e6130cfc20b94208f77727081ce193de29d6e2478587487e3cc26da3949dff7c3e3fad7b09897fcfc421d7666cc2e0062b5cced20391 SHA512 cfcc9d653c9dda462e742228625dad0526cf2691482b29d03b1b68d8e1397a4575a8840f72c6cfabd2452411d77e02dd9d53576697067e5e7ce56437cf3362fe
 EBUILD pybluez-0.22.ebuild 649 BLAKE2B 59d828aa8280f812fab6c3f448d32030cf35b687a3d36866bb96b30bf25bafbd7b91e63e2da7fbfc80e6572f81c73d1cff79199e7b47ee866e21c733b64ab87a SHA512 311bbcc07e1cf28650a1d0765fb1bef594059dfde58c65df2164d05b73b1d2d9a3c1f30a2bcf88dc8931cfd0a10bd13b7e488e90d932962dbd0d1e1765a8900f
+EBUILD pybluez-0.23.ebuild 652 BLAKE2B 4c57e70609c1c9b282df25c18df92350b32496cbc6bbc373265041dc067f106a780befbc61c365d113ace10fdbd490f93cdc11f7c3b14c8fee0b96ffbd636719 SHA512 e1a4ae7e676ea691c8bfed52b0ee50e554123f281b081a4ccb91a3d2268725438a9a8d4484cb79a0836a2e90bb3be0b627132dfdd9f60a54ac17b798bc7d5ce3
 MISC metadata.xml 539 BLAKE2B 4e87b2e8a4ae9be5916825471188649fe825c2dc614970a6c9af95098ff4abb97c0c59c3eece1b47e7bbc14d78f172369fa5498b3bb7ca9bac6218bc54ea0a7d SHA512 9560c0dd1afb3fbb49c6d17c0b730ebbee42df60014975d5b46fd07dfb7f40126df9798133f329b829cb235f3f97034a3befa5807499c721073072ddca25ec18
diff --git a/dev-python/pybluez/pybluez-0.23.ebuild b/dev-python/pybluez/pybluez-0.23.ebuild
new file mode 100644
index 000000000000..7a47efc5362d
--- /dev/null
+++ b/dev-python/pybluez/pybluez-0.23.ebuild
@@ -0,0 +1,33 @@
+# 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
+
+MY_P="PyBluez-${PV}"
+
+DESCRIPTION="Python bindings for Bluez Bluetooth Stack"
+HOMEPAGE="https://github.com/pybluez/pybluez"
+SRC_URI="mirror://pypi/P/PyBluez/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="examples"
+
+RDEPEND="net-wireless/bluez"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pycdio/Manifest b/dev-python/pycdio/Manifest
index 57efd2f4c628..9e8141c48e46 100644
--- a/dev-python/pycdio/Manifest
+++ b/dev-python/pycdio/Manifest
@@ -1,3 +1,3 @@
 DIST pycdio-2.1.0.tar.gz 241434 BLAKE2B eb981fdf52b205e14c6dd353ac4aca9a9e82dba6967a53b9059f8a265ef80832fe7236d68b2af7a6e408665fce0f5ed3541289e0b7d282834c4feb8e6b428fc4 SHA512 dc18fbd212f7040b8b06efaf263b17568e9c2d089cff7dfc4dda50a7225059e44c9c86e2d81ade92cf09c823f7189b5723fb601cb12f0884dc04e9f5418c5927
-EBUILD pycdio-2.1.0.ebuild 1059 BLAKE2B 845c1aa6ec99b7501ac46a02e5b55f2ceb3edecb73636018803549e938432cac00244e0d418bc130b827d7f98c6bc6f2c341538bbdf071893a3744ba1eaebba0 SHA512 78b7d78f91f2b5b4e8845efe1a631d92f53984e9dba228e67d85870f744418ec7af8faaa355e24b3f87b42340191c63a39f623d3af8bed4490d85cb5ed924348
+EBUILD pycdio-2.1.0.ebuild 1060 BLAKE2B dd684f418514efa0d0fe8084e27b683298a7f044a55b1ec99ede7b23e470f23fbb404f9d2e9df8d359398c71aac1a06614d8fe8e37e574ebc6853d0641d87689 SHA512 ffddcbbae9a04b50e25eedad6dee08235dbe9ddfe3d8d172a419a3f1b75363404dc0db2850dcedae4e2c94583163e785254794f48f85cf5e403425ecbd285d07
 MISC metadata.xml 551 BLAKE2B cb87788bd6a8cd15e83547dba1f44f710a27db24b962790484b252553e6e3563493000a8f9e17ad72bdc205d7692aac19f6aefefd4b586dc2c5469c6045aff1a SHA512 e74e3c72794ff1356a6d91482162adfbed24320821e8df6ea4043416f586f6e30f91980e4c15281e59c6428a64550986eb69007da30390de6d7de51b250900c7
diff --git a/dev-python/pycdio/pycdio-2.1.0.ebuild b/dev-python/pycdio/pycdio-2.1.0.ebuild
index bf82efeba6ad..31816a47a2df 100644
--- a/dev-python/pycdio/pycdio-2.1.0.ebuild
+++ b/dev-python/pycdio/pycdio-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-python_install_all(){
+python_install_all() {
 	distutils-r1_python_install_all
 	if use examples; then
 		docinto examples
diff --git a/dev-python/pyds/Manifest b/dev-python/pyds/Manifest
deleted file mode 100644
index c06a280bfda5..000000000000
--- a/dev-python/pyds/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pyds-0.6.5-py2.3.patch 514 BLAKE2B 795c7bbf5bb7b9a3f54ed1ac0931742abb840bb038a3bae51ebd959ce8ed1574f56e388ea9d261341674601b254297f9d269a087c5a3f2e99b6b47c2482d22d1 SHA512 753c6c482fc5da23490bdd2f4a97a3f2258d116afdbbee61badc979187504c71fafc5d361701e53c67a8e22d34941860cab7617843801ac6b34224fe02c8a067
-AUX pyds-pillow.patch 272 BLAKE2B 49b4fe326960737f45f4a757cd75448b5e25e9a6aa947275f340c074a90bdf934083b8c48b1ec34d9de32d2e8589409232334821a9dc6ea18f1cd68e8944edc2 SHA512 f56fa2800e631b1c5075b4a43340b14e3650db5cd34ad0dd7619df6d6845f958f59719e0f90635b3f92cea6590e5fcae43a0d4d41f69e9fcfff9f66affad1aa6
-DIST PyDS-0.7.3.tar.gz 660766 BLAKE2B ac47eb4b954f7a38a6123903e2fc4eac0b146cc8a80bd5da947370db78878f96330aefca9764c0fc4dd871c5022fe340c3704b6e12b126d62f979c50df5cc80f SHA512 1ac395e9c93c04710c3ffc335c6ead8a4c35401959da3bf882906cf993e2dc316e52d567e218aca07beebc1b32b71abbeb3f92c7f673d2b613ea0bd62b654e6f
-EBUILD pyds-0.7.3-r1.ebuild 890 BLAKE2B c2454148a520cd5a8b49beae67749a9875a9abe282c822db1e7dc8fa06966bcc2b22857b4ca34df3dfb0b6cb70b0f41eeae7c44bb721d5afee0a047f697959ee SHA512 1e0dcd9d8b1436f2c509520d4e2cc497c80d5d0dd2594c8556e15713fbd283dfd4dc4de51d28cd8423dbf531714a51d1fb05a5a6d408258e4033ce377b98ba7e
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyds/files/pyds-0.6.5-py2.3.patch b/dev-python/pyds/files/pyds-0.6.5-py2.3.patch
deleted file mode 100644
index e32f7473a3ec..000000000000
--- a/dev-python/pyds/files/pyds-0.6.5-py2.3.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- PyDS/DownstreamTool.py
-+++ PyDS/DownstreamTool.py
-@@ -36,6 +36,7 @@
- import urllib
- import gzip
- import mimetypes
-+import urlparse
- 
- import PyDS.Tool
- 
-@@ -74,6 +75,8 @@
- 				for h in self.cache._getUrlHeaders(theurl):
- 					apply(self.addheader, h)
- 					self.message += _('<br>adding Header "%s: %s"') % h
-+			urlpieces = urlparse.urlparse(url[1])
-+			url = (urlpieces[1], url[1])
- 			res = urllib.URLopener.open_http(self, url, data)
- 			self.message = self.message.replace('%', '%%')
- 			if self.verbose:
diff --git a/dev-python/pyds/files/pyds-pillow.patch b/dev-python/pyds/files/pyds-pillow.patch
deleted file mode 100644
index 505a86675e2c..000000000000
--- a/dev-python/pyds/files/pyds-pillow.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=471508
---- a/PyDS/PictureTool.py
-+++ a/PyDS/PictureTool.py
-@@ -35,8 +35,8 @@
- import string
- import mimetypes
- 
--import Image
--import ImageDraw
-+from PIL import Image
-+from PIL import ImageDraw
- 
- import PyDS.Tool
- import PyDS.EXIF
diff --git a/dev-python/pyds/metadata.xml b/dev-python/pyds/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/pyds/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/pyds/pyds-0.7.3-r1.ebuild b/dev-python/pyds/pyds-0.7.3-r1.ebuild
deleted file mode 100644
index d3e36a16c0cd..000000000000
--- a/dev-python/pyds/pyds-0.7.3-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="PyDS-${PV}"
-
-DESCRIPTION="Python Desktop Server"
-HOMEPAGE="https://wiki.python.org/moin/PyDS"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="app-text/silvercity
-	>=dev-db/metakit-2.4.9.2[python,${PYTHON_USEDEP}]
-	>=dev-python/cheetah-0.9.15[${PYTHON_USEDEP}]
-	>=dev-python/docutils-0.3[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	>=dev-python/medusa-0.5.4[${PYTHON_USEDEP}]
-	>=dev-python/pyrex-0.5[${PYTHON_USEDEP}]
-	>=dev-python/soappy-0.11.1[${PYTHON_USEDEP}]
-	virtual/jpeg
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( OVERVIEW )
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.5-py2.3.patch"
-	"${FILESDIR}/${PN}-pillow.patch"
-)
diff --git a/dev-python/pyfakefs/Manifest b/dev-python/pyfakefs/Manifest
index 48524268aeaf..a1816a056c36 100644
--- a/dev-python/pyfakefs/Manifest
+++ b/dev-python/pyfakefs/Manifest
@@ -4,5 +4,5 @@ DIST pyfakefs-3.5.8.tar.gz 171519 BLAKE2B 18eb784cf62108c3363b3b5fa137ec4ce83058
 DIST pyfakefs-3.7.1.tar.gz 179420 BLAKE2B 46f902527c2c69af1d7d5e296a25d5415b4fba68d4ed76d7bc138e4b2d53dbd4bf7dc6fd75a8e5277eccb9740c67d5fdf5b640fbc577f22690ee32db434c3676 SHA512 910cef89443546c9a5f600cbe06cbdc396ac82d15d852768c06c2f97e764b05ee9fe9bea7687404a9a962924bd33c45d9de2a04b448fe6350d8cc31c4e163dfc
 EBUILD pyfakefs-3.4.3.ebuild 713 BLAKE2B c1aae975305b1d3555cccea2aee091b75f158c638a50f39e84a8f0b4aebed0be4638548c70b940a8f45ff521ed9826b54488130c39762911de8f6733f5693d7c SHA512 4272510a33b3b29aba9d2882fe3938193a7c323bdb81c014b429ea10cd59bb7558b3394898a8794cad8e60c22989347872cf30dd037b799976482f0fd0677811
 EBUILD pyfakefs-3.5.8.ebuild 856 BLAKE2B 2592aa52f4db10fdad9b81beefd941cd3efa18b8234da2fafe8c28e26fef759d7158208fba8014b1d90269e14c7078066cbe4da4b7a34ac2c636728adf07e973 SHA512 cfd6413cfd3b53e4340b422b8b8fb91a31ec93717e2e226f2a2e9892550f3716f8550cf57ee0718981897604dac8aa90a91f8eb8bc87105f24f30535b73160a5
-EBUILD pyfakefs-3.7.1.ebuild 859 BLAKE2B 9f19f9a75b8c64e95e710e5f48208aee203fc8a159c98edf5c3efcc6bd9c25d8d5db9c7d20492529c6ddc22dd0c7e150bb583dab5bbc668dfcc85a2801d09866 SHA512 0de4468b8f338eeb91af6bb787e4575f83457f722184427ec9e64746ce10b351a06f8f34409b50b8147c375e5e0c802ef98bdfdb382ceed08110fe53dacea590
+EBUILD pyfakefs-3.7.1.ebuild 865 BLAKE2B 80b219a5269c1bb068deba60f5a9a5f07788d107a9abf7f29d1e7f561797df0b48d0b76d233cc9275177c039b5dcb0460d2f8973aec0310411ae6b49409adcf7 SHA512 ab822eda58f4e2540482ec3fd480a44ef5a595e35b0d21c3f1a653a8205a97021e840adce6577b3741053235751564f8477001fbf2c11aa085ddb147f0bc2a0f
 MISC metadata.xml 370 BLAKE2B 9111da9b75b84d43a287c2d902b6b83b77b3c0e0a0f650fb73a904022304028678abb75f5620e93d15b0cac474b731c2c39ae2589a77e6dc96e1797253062e0f SHA512 674874289f039549b14d81863c992ab20053777049a25f3f9ba1f596cf345a7e463db7516738d35e78a5079f660fb63ec24e9029963ef0702d6c268eca384d8f
diff --git a/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
index e5ac13203eb6..f4f040ab876b 100644
--- a/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
+++ b/dev-python/pyfakefs/pyfakefs-3.7.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/jmcgeheeiv/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyformance/Manifest b/dev-python/pyformance/Manifest
index 781aee0126ad..c5e2007a1ffa 100644
--- a/dev-python/pyformance/Manifest
+++ b/dev-python/pyformance/Manifest
@@ -1,5 +1,7 @@
 DIST pyformance-0.3.4.tar.gz 19394 BLAKE2B 4bd141df5b3264ae8abb5b5314fcba93aeeab960e4d1d70631a3d5ac072f94a2da48b480f74c446124fb9fbd54a8ffad9c75b2352509aaf991025a02bf736648 SHA512 5dbc83da62bf66767eaaf316824cf5683488d8ee594b72baee327c4ef594f84b5aed07654da483aff29bee98605e5265425be88c165a4bb06e7bdddbbf28e440
+DIST pyformance-0.4-patches.tar.xz 3500 BLAKE2B 511001e9011db5ef25b802739dca51337d039193a9d3322bbf94bcb120bbbeff2e1a818217970a1a97d77cd8d7da462792248910acbb3ef586704596276b7056 SHA512 858cefd6c8b151db10c63e0d8117cd6c226bd153103993040909e8fd2ab7a41a7770a2ae6de0f395a4f9f6cce3213d7ecabc0bf647657ee04fc10d76f51e07e3
 DIST pyformance-0.4.tar.gz 20683 BLAKE2B d818832b7ff43a7e1db888bdb7dc333a532c7d3365dd472f9dbb3300f676cd3cc8f82f8d1c444aa277404ff8e72843eca35e3905542700ea37b1dad3e05c8b4c SHA512 a03324977b40f5097ae4608dd7c36bdbd2a20b261c9d3e32d1be19e5fca50e17fcc24df781b6c3ab60314534368c5e9cf08bc3863d4d2d7ecc59f9af26f8d20e
 EBUILD pyformance-0.3.4.ebuild 900 BLAKE2B a23428ba3bf54af7f9b86d82a70939c81c74ddb8582469dcffdbbc21404b8bcdd98e91e80b035b76434e7640ab60e13b7eb0395c64571130baf97f37457f3486 SHA512 c7493340143d6c92c0b88c3ba64a06f97bf6f2b0bc10de7ee8352cae147d59688f881e0bd8cdd10a9e80e8ae1498bf8f0ef797d42c584f3a742810d11934a274
+EBUILD pyformance-0.4-r1.ebuild 894 BLAKE2B 9edcacc0670ad000dce12e44eb97e5bc8691548d285aca8c6216832bc6b752ce1e25fe3374bbe534dd4640798b54a906e064dd6f5f3bd1eea37f3dca64f84546 SHA512 19ef560ef36bb6aae1b439e1d1650c4f18ab915534d6e5096d7fac722b1ee15651bd26c35514be63096c56ce4d581e97f741277b63574d6ea99a7542dbeb6feb
 EBUILD pyformance-0.4.ebuild 823 BLAKE2B c9004270922f265191e2e15ff1ae0a2b8001a59761cc3b7058eb01ea89684bf89e8de4f2d777dab025cada9f0b9a23b682c8dede039d2312a540bc94784f0059 SHA512 c68a801eb78a867c4be3edbd8655e5e7bcdff8c88d600b37c0b9f56c348d352b681afb949553beac490ad71f05bfa18a7bda334873c27c1670c8f2e43f6f52b0
 MISC metadata.xml 452 BLAKE2B c229f2c744aad33f55a3983a97780b9c0e361e8786a3c9b372f556656c7e1dec34dc30b1f9985747a8f917c8714e867b509143faffacb4242aeb1b61ecce54d1 SHA512 d1fb11333e19747774ae686b9c12f221c9b844be16ee6d2381f38d09d775118c4ffc3379d18217f83d2c0cf518de61a448680e78a1650e289c390d6437702240
diff --git a/dev-python/pyformance/pyformance-0.4-r1.ebuild b/dev-python/pyformance/pyformance-0.4-r1.ebuild
new file mode 100644
index 000000000000..92b43e1f1e9a
--- /dev/null
+++ b/dev-python/pyformance/pyformance-0.4-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_8 )
+
+inherit distutils-r1
+
+DESCRIPTION="Performance metrics, based on Coda Hale's Yammer metrics"
+HOMEPAGE="https://pyformance.readthedocs.org/ https://github.com/omergertel/pyformance/ https://pypi.org/project/pyformance/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~chutzpah/dist/python/pyformance-0.4-patches.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${WORKDIR}/pyformance-0.4-patches"
+)
+
+python_prepare() {
+	sed -e "s/find_packages()/find_packages(exclude=['tests'])/" \
+		-i setup.py || die
+}
diff --git a/dev-python/pyftpdlib/Manifest b/dev-python/pyftpdlib/Manifest
index dadfe158782c..50609dcd91f0 100644
--- a/dev-python/pyftpdlib/Manifest
+++ b/dev-python/pyftpdlib/Manifest
@@ -1,3 +1,5 @@
 DIST pyftpdlib-1.5.5.tar.gz 184314 BLAKE2B 2d02839c6809674c7b7c4dfd610610a9231799802cc53ad0a05bfabc8985e77c64d9b239628f13bdc22942460b3e923067f084c3c5ac2b7be7671279a08e0351 SHA512 27427154f893812f689adf3a9ceb4ec2d8f0ea7a4bf7b08671dc146c95f09ddd596a27c85e009d8d6647277def48c0bf0a8b76fb3fba5818eda3dfdc6c10795e
+DIST pyftpdlib-1.5.6.tar.gz 188099 BLAKE2B 508e94da6b27b4b1f15306df2916c176f07ca31944398e9ac580fca8d2cdc72ca0ee8e7db282de6745e2e401b23b1fa8cb8de400dc2ba998b93ac45772c78157 SHA512 a3c3c1cac221a8a3c090ee208c03134bb1b8de58099a23ca6ee422f06fb97a0ed561c96e62c62b21fa112dd0b3458651b9fc0c55d72dc0bed79d0583b319a50d
 EBUILD pyftpdlib-1.5.5-r1.ebuild 3097 BLAKE2B c25dfee499516bfbd9722b265b834425af6d77ad92a07fbe078094d986727b36e1b1104d1321e4a5e92defb3eecb9706bf2b5ba20ce146a1a75b61a59d6615d0 SHA512 1aa8d876bc2000a4957c45a00528441d47c02539e038221b6124779c79679c92143706ea243629c228c73108aefe6a18239e2d64b89cf2073603196fe2e2013d
+EBUILD pyftpdlib-1.5.6.ebuild 3100 BLAKE2B 545b3b866fd378ed0f9726dbe5f95ff71fb0ac26771aa87690755d8152d04b12979b4b362e2a368be49a82455f39ad6403a4275844145f3f3b1bec399759b672 SHA512 ac867a75957fd4f083e0b223649123f4e6c8d941be115d12576f6d21eb0e5575b3cbdc9ac3616a95309c87cd0a5362052524105f50a2d4547acfb6a985d0c1f1
 MISC metadata.xml 438 BLAKE2B 0e0860eb9d885ec9b432b504bef6a9394cf4a2d6d99751c80fec8441d8910f8a17364e5f32782638ac689abf5cdd3ebcb5fa20e7da3d612a5e8844e8c8a34d76 SHA512 a748827370b53c94fed352cd6bbd7468a22c7ca2f15c4601c98a2689e3a7e652ed28434bcd125fe0f3018d5508600df03130c18d7d67834b28ac0c3480b16345
diff --git a/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild b/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
new file mode 100644
index 000000000000..a73ad6bcc5ea
--- /dev/null
+++ b/dev-python/pyftpdlib/pyftpdlib-1.5.6.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python FTP server library"
+HOMEPAGE="https://github.com/giampaolo/pyftpdlib https://pypi.org/project/pyftpdlib/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE="examples ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	ssl? ( dev-python/pyopenssl[${PYTHON_USEDEP}] )
+	dev-python/pysendfile[${PYTHON_USEDEP}]
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_test() {
+	# These tests fail when passing additional options to pytest
+	# so we need to run them separately and not pass any args to pytest
+	pytest ${PN}/test/test_misc.py || die "Tests failed with ${EPYTHON}"
+	# Some of these tests tend to fail
+	local skipped_tests=(
+		# https://github.com/giampaolo/pyftpdlib/issues/470
+		# https://bugs.gentoo.org/659108
+		pyftpdlib/test/test_functional_ssl.py::TestTimeouts::test_idle_data_timeout2
+		pyftpdlib/test/test_functional_ssl.py::TestTimeoutsTLSMixin::test_idle_data_timeout2
+		# https://github.com/giampaolo/pyftpdlib/issues/471
+		# https://bugs.gentoo.org/636410
+		pyftpdlib/test/test_functional.py::TestCallbacks::test_on_incomplete_file_received
+		# https://github.com/giampaolo/pyftpdlib/issues/466
+		# https://bugs.gentoo.org/659786
+		pyftpdlib/test/test_functional_ssl.py::TestFtpListingCmdsTLSMixin::test_nlst
+		# https://github.com/giampaolo/pyftpdlib/issues/512
+		# https://bugs.gentoo.org/701146
+		pyftpdlib/test/test_functional_ssl.py::TestFtpStoreDataTLSMixin::test_rest_on_stor
+		pyftpdlib/test/test_functional_ssl.py::TestFtpStoreDataTLSMixin::test_stor_ascii
+		# https://github.com/giampaolo/pyftpdlib/issues/513
+		# https://bugs.gentoo.org/676232
+		pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_anon_auth
+		# https://github.com/giampaolo/pyftpdlib/issues/513
+		# https://bugs.gentoo.org/702578
+		pyftpdlib/test/test_servers.py::TestFtpAuthentication::test_auth_failed
+	)
+	# Tests fail with TZ=GMT, see https://bugs.gentoo.org/666623
+	TZ=UTC+1 pytest -vv \
+		--ignore ${PN}/test/test_misc.py ${skipped_tests[@]/#/--deselect } \
+			|| die "Tests failed with ${EPYTHON}"
+}
+
+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
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] && \
+		[[ ${PYTHON_TARGETS} == *python2_7* ]] && \
+		! has_version dev-python/pysendfile ; then
+		elog "dev-python/pysendfile is not installed"
+		elog "It can considerably speed up file transfers for Python 2"
+	fi
+}
diff --git a/dev-python/pygene/Manifest b/dev-python/pygene/Manifest
deleted file mode 100644
index fee680f9bf34..000000000000
--- a/dev-python/pygene/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pygene-0.2.1.tar.gz 147178 BLAKE2B 267eac7130bf402dc5f4a0a2c1c31365437cbcef81fdf3baea0ac289fe412920947e182ed2b72687a42d37ebc0458c24dbb828bf99963f50aebc5a896083ec7a SHA512 4f6b32c4e17e85d80530f8f3d94f9726bb5adb80933aa39948ae3824effa780d333ef01ac4a304e63345314a298edd31aa687c6e6947486e74efafa6678951c7
-EBUILD pygene-0.2.1-r1.ebuild 1006 BLAKE2B f7767f6bf4cf7a3b9aa8006f4705f765647cc168ec80183d85e93d05580de094c2f33a7dd5791cbc11897f318bb400536293c8a7a076b550d711297ab49b46ce SHA512 65df6f6d820da5412988bfd0cdecd9b23a9b96142fb5836b99895ee572795f66aa8c2794c774bb3a79150ebc90559defc0063f6ea90c2023753a5ac910f93f5a
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pygene/metadata.xml b/dev-python/pygene/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/pygene/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/pygene/pygene-0.2.1-r1.ebuild b/dev-python/pygene/pygene-0.2.1-r1.ebuild
deleted file mode 100644
index 8f7505711f59..000000000000
--- a/dev-python/pygene/pygene-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,41 +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
-
-DESCRIPTION="Simple python genetic algorithms programming library"
-HOMEPAGE="http://www.freenet.org.nz/python/pygene/"
-SRC_URI="http://www.freenet.org.nz/python/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-DEPEND="doc? ( >=dev-python/epydoc-2.1-r2[${PYTHON_USEDEP}] )"
-RDEPEND="examples? ( >=dev-python/pyfltk-1.1.2:0[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples || die
-		mv demo*.py salesman.gif examples || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		epydoc -n "pygene - Python genetic algorithms" -o doc pygene \
-		|| die "Generation of documentation failed"
-	fi
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pygit2/Manifest b/dev-python/pygit2/Manifest
index 09b7ca96cd5b..aae2c2ab7225 100644
--- a/dev-python/pygit2/Manifest
+++ b/dev-python/pygit2/Manifest
@@ -3,5 +3,5 @@ DIST pygit2-1.0.2.tar.gz 501736 BLAKE2B c8f1a7e4a3257af42d97b0fae8e14f26968e2be5
 DIST pygit2-1.0.3.tar.gz 501720 BLAKE2B ddfe228bb50df08c1b5e880f58be6b0ae111a10235b695ce93ef04b685507bda90cdccdacefd5400807cd19bc9c63b49061c2da73c89641fe9641c52a4ed16ab SHA512 debf4018e6daa938f44cf22f2acec1f850156e30ac44052e2edb8257f86a60453428356851cc495ae234df9cdbee922a6a7ad7886c9a6e3746b7315c71f0a3df
 EBUILD pygit2-0.28.2.ebuild 904 BLAKE2B d41f74f5516bc0bc7bb1a485493e36250aa76d4a210d2af30189641dde7a703bf111bdfab2ca0d0bd862fde21483682d4ebfdca3f90f79cf96fc2fc35ec867c2 SHA512 3c8bdd32422ac1f140ab2804a96f93e4c43df75e077c6c8a2f22a70bf4acf32290c0a6a97bd62caeca40939775bada4e38cd54eff431f4e8918dd1262e24176d
 EBUILD pygit2-1.0.2.ebuild 964 BLAKE2B 741670a4507817e32fa429acd6f8ff3641f11ad7f9464ecbc9c8edd218eaa728046ed1f2c7e3acfe14c3db70650cb9244ff5dd890949d59a554fc6a6bd2abf4c SHA512 61929067a21d707ba74d02a6106767c1952908c77e4aed1d60bda5cfc62b1f6d00e968e7f1ed9281783cfd7bfa586cdeaf502a3dbce1c35c450b43af5e9846ea
-EBUILD pygit2-1.0.3.ebuild 964 BLAKE2B 741670a4507817e32fa429acd6f8ff3641f11ad7f9464ecbc9c8edd218eaa728046ed1f2c7e3acfe14c3db70650cb9244ff5dd890949d59a554fc6a6bd2abf4c SHA512 61929067a21d707ba74d02a6106767c1952908c77e4aed1d60bda5cfc62b1f6d00e968e7f1ed9281783cfd7bfa586cdeaf502a3dbce1c35c450b43af5e9846ea
+EBUILD pygit2-1.0.3.ebuild 962 BLAKE2B 6e16fd3bdba8102c51de84d67c050d074842c458e6c15424d8d7c847cee5d889fbe26935f35a4c10572f5eae0cff02d782c1716e454f66a37d17f00afe97b85d SHA512 d6dfefa43f8a0c38334fd7192fb1e27f2649967cd278e008c9a046797149f9c97afa1c6a7e616d4871887efdafbeff03db67998cf600a9e673d95110d620f868
 MISC metadata.xml 489 BLAKE2B 3733ff314640ab2cbfa07e0ea67041ddb3635b51d339070abe97c95b5b358851b412cca5d8996dc1f25abb986a03095f19e8a50cbaeab7eb156c6b9107108cf6 SHA512 d20b7ebbdb3ea2ec72c3c5ded9874b7506b3ddabb43dbf329891478fcf5d7c4b9487ab0675d735733f463dd897dd5cdcc28080ad597f4f838bbcaa565c26915e
diff --git a/dev-python/pygit2/pygit2-1.0.3.ebuild b/dev-python/pygit2/pygit2-1.0.3.ebuild
index 920c961be99e..e2804c5c9368 100644
--- a/dev-python/pygit2/pygit2-1.0.3.ebuild
+++ b/dev-python/pygit2/pygit2-1.0.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2-with-linking-exception"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index aa0123482b5f..de1a38491974 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,12 +1,9 @@
 AUX pygments-2.2.0-pep479.patch 1669 BLAKE2B c39e582d85d5903831749ccf563b13a88f623ebe7279205465bba16640fb85df1d1f9d15020d7e19b9d0ca8fb409426dbcfec4729e8d1b16d90e9c075f674c25 SHA512 e6195c6f0c0fb0ba725621ad564e85e69db31a3e2e903279512d0af06db32d7fee1284ddd0db00c80312c29a19f345325a7353bc5fc2e1f0bc64f8c32f71d918
 AUX pygments-2.2.0-sphinx17.patch 645 BLAKE2B 07601a0e952d6e5f978d111a273bfe8c6fa6489e23acad4f61beb535e37aff1e3182a5317ab4e424a1b632924bb3c1b3562aefda17b638aa5a367d861f164c64 SHA512 937ce1168ab488387918220995f1f32e4664a505af3b6610143af15b6cfd3bab1d1fa4a0dc54c59db2ce0775edcc762f70ff948f8bd4e3bbeceb14774d30f287
-DIST Pygments-2.2.0.tar.gz 2113944 BLAKE2B 58d5f2fa0e6d97f5b7d7a17314b82ef219f23b72f8da49b4f8ce9b892d54ffbc1b490e87e87efe8d727dab297f775d0d8abfc4a31a734c5a7f8df885e5eda82f SHA512 cc0a4f73e19fa6cbf46314de2e809460c807c631e39ba05cbe5edb5f40db1a687aafcd9715585a0ed45f791710eb6038305e273f282f8682df76f30e63710b29
 DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
 DIST Pygments-2.4.2.tar.gz 9405880 BLAKE2B 20a955fce2b06ab12bd4ede4da9308f1cc5f2286391146fd83f3d598cd38ae66e7df3c1d779c8f6f5de67ad92d032ff02fef8f41141edb007e2f24d3586d82e6 SHA512 c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
 DIST Pygments-2.5.2.tar.gz 20263984 BLAKE2B fab5d11458bcb3bd9a825026f119c0bde6f672b00704f3d5db24ce050b959f0c1a34544642fc1b5911f6ae12a9b595a2cbedadc791d6a3e8c83da1a1add60471 SHA512 d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859
-EBUILD pygments-2.2.0-r1.ebuild 1615 BLAKE2B 768bbce36b21c4bce6dd631bc2a5a0b0255c67f8baa41602f14d21a0bb1cafdc765882cf8d5151d7f18ddb4d34ac989ab67b999c836197d294b1a738d69e8b2d SHA512 203332c057f87b4a885242a2f6b7c1d1578f2c79905bb103b4731e014de76e5caca16b8255286c121e736622c1621764a615d6461e43b7ed038ca0d25596caaf
-EBUILD pygments-2.2.0.ebuild 1767 BLAKE2B e4cfb79a3c348196c3afae5629cf9a40769144b58130b42a1ea2c42ceae9fd5dc9ac3a886c25f520961ae906222776995d76f36159986fe014773c87971541ba SHA512 611575173b2b7e932f273368d9a30854328f5c08905b91ae19220af58df56b645ab29381e42c6b3e69585b148ed2859c86e3fc54c5170fe82015d70b1479cdc2
 EBUILD pygments-2.3.1.ebuild 1428 BLAKE2B a266ed307506d6863aa0f0f759d448721bbdab8f159b6c6e765e0b435bd424b167215d2bb848bed19964bf5577eba29d8a0c07c940b4d31968865478f6d021a3 SHA512 b06dd64b3eafe026004dc2dab8f8806bac397642a9aa171444a8deeac1f1edfd3b180dee5ec6f7bdb044b47ca4c212abb204119760500320693dd32184c01f6c
 EBUILD pygments-2.4.2.ebuild 1157 BLAKE2B b3d1df915fa7a56074bea2bd51430fa1b1e6ba9a837e4573ac2c5f5e6dbb2d4c2d5823525b0d1dfd7ec98ba3a8b4b4169fa1f4dc882b866fa8aeb1dcc00ae842 SHA512 e82fd0d04cf54e193d7d3d4afcaf14a9bdce89e2500ac809866b2893efa164facc041ede9c54b8b1154462034555dcb102bcbb51bcc21ea8a5c393d8c9737616
-EBUILD pygments-2.5.2.ebuild 1139 BLAKE2B c0b3deecb13b5a0e5aa4d0847a5414eb4643aba959b162a7a3417b3357105ffb6537eb735050715bc7fa250e272b0887f811b196fd19cdf2df36cf6bd6ebcf0e SHA512 5297a48b0d2ce337ca8f2e201ff446b588c00b81233ad0f814e2b3b516df4471d4cedbf45334c0c465a65129267a205bd9235a7836269c9a4ac45b308f239848
+EBUILD pygments-2.5.2.ebuild 1136 BLAKE2B dbf4dc8cb4351522fe8c6bffe4e218dddbbb5cd406a331b2264e3c0055e6d6d8981d14a3ea39e0b2e75bb7c6202b22ef28650f23eb76706b4c709302f4ec1539 SHA512 4ec29f369fb1694814480b945abcfb6479ad6e0a7611bebda7e984b83c7f18420550d359a6caea11b0cb6218f5bb4b9f0abaf70a2fa9f42d29ba2d0f068a9ab7
 MISC metadata.xml 542 BLAKE2B 88e44c4b6f29e096e67521c621724d1a5415d089f73612fb8d02ee714a4af1e8080cf98542d7f0c9b1331d919bbeba31b1fa8269a28cc1be841af069a497d889 SHA512 f15732bb743ed5ad4049036c7b87118c89be09e260ae483b4c7e25155a31c0ab8844f8a1050386a0ee81d2b1e55d240f90cab3e28749b8f943baf64ec176814b
diff --git a/dev-python/pygments/pygments-2.2.0-r1.ebuild b/dev-python/pygments/pygments-2.2.0-r1.ebuild
deleted file mode 100644
index f3d2d7fd6633..000000000000
--- a/dev-python/pygments/pygments-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# fix generators for python3.7+
-	"${FILESDIR}"/pygments-2.2.0-pep479.patch
-	# Fixing USE="doc" with sphinx1.7+. bug #662640
-	"${FILESDIR}"/pygments-2.2.0-sphinx17.patch
-)
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	# With pypy3 there is 1 error out of 1556 tests when run as is and
-	# (SKIP=8, errors=1, failures=1) when run with 2to3; meh
-	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.2.0.ebuild b/dev-python/pygments/pygments-2.2.0.ebuild
deleted file mode 100644
index b9217c8d5c31..000000000000
--- a/dev-python/pygments/pygments-2.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1 bash-completion-r1 vcs-snapshot
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		virtual/ttf-fonts )"
-#		dev-texlive/texlive-latexrecommended
-# Removing / commenting out this dep. I can find no mention of it in tests other than
-# importing pygment's own tex module.  If it's there and I missed it just uncomment and re-add
-# Tests pass without it
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	# fix generators for python3.7+
-	"${FILESDIR}"/pygments-2.2.0-pep479.patch
-)
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	# With pypy3 there is 1 error out of 1556 tests when run as is and
-	# (SKIP=8, errors=1, failures=1) when run with 2to3; meh
-	nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.5.2.ebuild b/dev-python/pygments/pygments-2.5.2.ebuild
index a10df584c1ea..5406c0facffb 100644
--- a/dev-python/pygments/pygments-2.5.2.ebuild
+++ b/dev-python/pygments/pygments-2.5.2.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pygtkhelpers/Manifest b/dev-python/pygtkhelpers/Manifest
deleted file mode 100644
index 1b1d9f0df03e..000000000000
--- a/dev-python/pygtkhelpers/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pygtkhelpers-0.4.3.tar.gz 118768 BLAKE2B 13736a8e38e435940845b55cf81ab9422328b83ba0f8f84b40fb6d9506d4c04be2c133aca403a0d258f751aa9f65c83c56b83f8e92448add1fec63620c7bec0a SHA512 6736cb77ad7d5f8a9811d6604ef112ed73b27347fb4633c611d3cc77ac28a9b51e03b32a2ffb76fd94effae485b3d890699bdcc3726fcd6be509809045cb3830
-EBUILD pygtkhelpers-0.4.3-r1.ebuild 1114 BLAKE2B 40bbfea0711952bf59d41265070b1205d75228f73b3eec83efc4e2bb4af7fb2c0e34e48fc2c282b2a7950a0908373abff5fa65fc72c935a345c3b40638e5bfec SHA512 fdee5a23fdc341d7dfae4878dad3fa17407a8486ab15c4b06dcccc07b1b6a1451903328c9ecb747ead96f746a8b0b57aed5b103d414254f5db62ad42da50c35d
-MISC metadata.xml 315 BLAKE2B 433d7d132dae501a7e8b25f3aa40909cbd356b2820ac2cb392c2f3a19d8d29288386cc686e067708f9be5ad80cdc8253245a95432a0fc3e4d0dd80e341559faa SHA512 c9bf832b017bfbb4ee79d2553bdbc6fbcbe27f3ddb11d942ddb7f8fc82926cd442c322ed9a42410c6611e6bed9257d32476a3c87ff8f237d47c48e0244796ca8
diff --git a/dev-python/pygtkhelpers/metadata.xml b/dev-python/pygtkhelpers/metadata.xml
deleted file mode 100644
index 1bc45847ec63..000000000000
--- a/dev-python/pygtkhelpers/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">pygtkhelpers</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild b/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild
deleted file mode 100644
index eee4ec377aa1..000000000000
--- a/dev-python/pygtkhelpers/pygtkhelpers-0.4.3-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="PyGTKHelpers is a library to assist the building of PyGTK applications"
-HOMEPAGE="https://pythonhosted.org/pygtkhelpers/
-	https://pypi.org/project/pygtkhelpers/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
-IUSE="doc examples"
-
-RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )"
-
-python_prepare_all() {
-	# docs/_static/scope.jpg does not exist.
-	sed -e "s/^\(html_logo =.*\)/#\1/" -i docs/conf.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-	fi
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use doc; then
-		cd "${BUILD_DIR}"/sphinx/html || die
-		docinto html
-		dodoc -r [a-z]* _images _static
-		cd - >/dev/null || die
-	fi
-
-	if use examples; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-}
diff --git a/dev-python/pyhamcrest/Manifest b/dev-python/pyhamcrest/Manifest
index fce28ec0239f..d4c307d70a46 100644
--- a/dev-python/pyhamcrest/Manifest
+++ b/dev-python/pyhamcrest/Manifest
@@ -1,5 +1,3 @@
 DIST PyHamcrest-1.9.0.gh.tar.gz 57650 BLAKE2B c497688f03ec3b072d8ab076fc096a442d5cbbd94493eae57779879ccb6f281477aeeb7f7a67e539442010e60194f9f04a6deddd1d2267e9743742b45433f124 SHA512 3a878637ed5138365416c170871a63640f089047b723c7ec8db893dd716c0b1cdad16a98584700405693b954af7d4868a8543d1a3fc58ded22b493c8c61661b4
-DIST PyHamcrest-1.9.0.tar.gz 376623 BLAKE2B 808c74aa4dff89467c126cbc0e18029a9504cb27bbf03662a90666f85c76d7d7617260f50d35acde3a8e9e437b846589423cbb3697f8ceb86d0b5b838c586ebd SHA512 3b8393d0079b619b208ec7f06ed5133c4ff9d9dba050f818adf56347fc2225fd1c85d60f3dc262b7b9722061f0b8e4966180b6b96245a371e578d0d51633b4b0
-EBUILD pyhamcrest-1.9.0-r1.ebuild 2090 BLAKE2B 1f2bb9cc18deb1ca187c76498b0ce6641ffe0f1d2f8a05e39604ceb1a68ce48f99d6f142b9fa6efac95e306e7c0bc2e97fa09af44222d8c5b4b0aa453d82bb6f SHA512 a5080a147ae58f93939e4ec892df943bb249eca4168d52afbfce0f1fee94ff9502eccf772c98d756683f41208ead9bbbf7c486a3e8d49531a511cc1bd5f90050
-EBUILD pyhamcrest-1.9.0.ebuild 1218 BLAKE2B ffe0c2bb1126b917ccaabb54791579738244d071fd44f57b8dcd113212dd76293eb87a590cc248a9f33df7ec30339c3771907944f5b43a6a1442b16808057d62 SHA512 b89889eaac87b17f5f57011d9dbdd3f0038cb7fd4a53267cc323e101c9b6d16b924c348ce4d4052397a5b4a1e04f3a09ba7e29472c6c2b899a747e3a7ce1fae9
+EBUILD pyhamcrest-1.9.0-r1.ebuild 2088 BLAKE2B 8bb6398d81ad72909c3b559b495b85c6eec91f88afff03c6aba58e2d1fa632a03f61bc34d6343e84e753efb28193ef99a9265d81f070b74f442994d24cf723bc SHA512 09982e0cf39b12019fd5946a79a7e7215ce26d12a1da09871b85c8ffb744a1b1397c14f373bae7df2f367082b4d8223559f956952017ecb6b4f6ea094a93e79b
 MISC metadata.xml 297 BLAKE2B 1d304f6e46130d706190ceaa75f188fba8b3934ebcb42b48d7209f9a9dc67e3561cc2a823b9a591cd58a945161c382698178979e4dacf776178367e43c5519a7 SHA512 999f2517a446b5911d475789246dcb70a08566fba9ecec5f2b69fa29180fdfbb17f4f24b4c87ef71c422814bf7502da2812e5c7938293e96affe721d92e428fd
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
index 37c195ef5829..9030f0d5741b 100644
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
+++ b/dev-python/pyhamcrest/pyhamcrest-1.9.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/hamcrest/PyHamcrest/archive/V${PV}.tar.gz -> ${MY_PN
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~mips ~sh ~sparc ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ~sh sparc ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 REQUIRED_USE="doc? ( || ( $(python_gen_useflags -3) ) )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild b/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
deleted file mode 100644
index 4bb3d7d9b0f2..000000000000
--- a/dev-python/pyhamcrest/pyhamcrest-1.9.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
-
-inherit distutils-r1
-
-MY_PN="PyHamcrest"
-
-DESCRIPTION="Hamcrest framework for matcher objects"
-HOMEPAGE="https://github.com/hamcrest/PyHamcrest"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="doc examples test"
-
-RDEPEND=">=dev-python/six-1.4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.2.2[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)
-	test? (
-		>=dev-python/pytest-2.6[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-RESTRICT="test"
-# the pypi tarball is missing the tests
-# and the 1.9.0 tag is missing in GitHub
-
-python_compile_all() {
-	use doc && esetup.py build_sphinx
-}
-
-python_test() {
-	py.test -v || die "Tests failed under ${EPYTHON}"
-	"${PYTHON}" tests/object_import.py || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/_build/html/. )
-	use examples && dodoc -r examples
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index bdd99654340a..3495427fc8df 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -2,6 +2,6 @@ AUX pyjwt-1.7.1-ecdsa-fix.patch 1179 BLAKE2B 79fcaf69d6021f04fb624fc36314135c970
 DIST PyJWT-1.5.3.tar.gz 73044 BLAKE2B ae2e3caec52ddd768d573e0398bbc355c6eedca238db9b1808ff1d723b9fdee0845cf119d78e561833fe770e5ec39000905cec43a5e96102865f60e204c72c22 SHA512 b25a9f6a04bd072020fcf00bb559b7560902adb79746fb880432c01fa356748238432f53f6b9a21db50ece3e59ed4c45ca3f48ecec0ca3c4095e6a739a5c150c
 DIST PyJWT-1.7.1.tar.gz 41979 BLAKE2B 5604b309838b2dfb2f95e18e291c43703954664aa8acb7439072f002c1c8a1e49ff2c21d907be77a4d2f86e695ec71970d550aad2541252ac85bd7133e300b28 SHA512 70cd38127b6848933992c8b88303725ef71bfb430ad42eb63247e549b0bdab2a194137349d43ab02a1c97212dbc89f447ee3f0c5403dd14632b8b4b6b9235fc4
 EBUILD pyjwt-1.5.3.ebuild 1289 BLAKE2B f949371337531c7d6f7ff8a2c06587667d50440442959aaeba7c6897106fd54413475250b6f262d37437f53161636d54ddbecb2ac98b93792d49d3ee266bc86b SHA512 836c48af9bdfd92062efb542d459d9c2fbbc1ddfaae4fd89ea60fdf82572e535c4144c7e4ce17ea39845001ae5b5ff7673c28d68ad6cc779a9f749ca31915020
-EBUILD pyjwt-1.7.1-r1.ebuild 1396 BLAKE2B 551f1b5bf97b36ea379751d98b219f59db7ade4420f4877d40c771cf13296fc65884c989e80d2189aee387c51f65e70b75c4739bb0a3ab286956b782c1c524a4 SHA512 01ee142064afe5d50121f35a031e8466b90c6082aa509b521e2df717ebceafc9e7a8f96f379cfb2b67e357fd7924038aca92ee564a0e9ceba27e43081674a08e
+EBUILD pyjwt-1.7.1-r1.ebuild 1403 BLAKE2B 9ff040b70c8e7ad00fe46bfa6ee916d5be3eb63a99e91319712dc9698e1f45e27a15b0d974ab62679124e22c24fa2846cf31144c209957ef7377109e6b4decc5 SHA512 f3e666cb50b4a53333f4ae96b4de0d1ce496bfb911c08b0338b84f2b00500ab1fb8030e46fac66d8aaf996d8799d41dace92a317b696005ce4f460b3576c190b
 EBUILD pyjwt-1.7.1.ebuild 1313 BLAKE2B c6fb3d75a4af0f3bea0d91aeba245d290f491613b092d4c947a5777df6b2a19517847ec5badfc20d230dcabf24e5c57b068585432c8879461142286eea73ae24 SHA512 b83bdab9905d9a685342c229699ef8e252a77294d1a8f25886adc73e1904c24ba633eec39f79b25945bdd446250c34bd2b4955859a5f5f89500232d649131d40
 MISC metadata.xml 374 BLAKE2B 29e7fb2995367400d4f8d836cda63346441ff6008ac4554cd06859827d92924d3c34f2fb9763291766014a364d1e02af1ae6412fb02d316c775c3c0c13dcb22e SHA512 87a019a49c2e355d19148214f8ac7212758f7a36f77e7b959d32df1146c145b764f93707fd7b45a8c5276209a66380c888670181bf78bc4d241d5a7294a032b4
diff --git a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
index 1cb2f6e14153..b9fd937ec374 100644
--- a/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
+++ b/dev-python/pyjwt/pyjwt-1.7.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/${MY_PN}-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=""
 DEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 24fa6f6dc5d4..b6ba7023d0bd 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -4,11 +4,9 @@ AUX pylint-2.4.4-no-pytest-runner.patch 345 BLAKE2B e11b2be3eb2721817d118bc161fd
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 AUX pylint-2.4.4-tests.patch 522 BLAKE2B 1ec6a2c49a111a35f50f755b59e0c288e4fa801204b72a0f4f8a6b4ec54fbb35e0bedfcecfae329cf39022fca6c35c99a1b3130dbf63bc0fe5dd6ebcc3a42205 SHA512 d7a22c0f4f9adcef0a3bbeca0321c90c1ebdeee678ff5f2fbb5b404514e110f69ae294fb3bbdf2431e932326d7bdedbefc5fca5cdf145f8221061eae15ff92fd
 DIST pylint-1.6.5.tar.gz 465578 BLAKE2B 05412a528878633ef7529dd2f2d2d1989bc9406666626d62764f476bbc024e34fea06883fae829fe6617ebfffde54dfa5600c140b9a25e6c9633f48d76f5c331 SHA512 2fac352dc752b37f1ce4f7fefe5afbbc880d7e6c38f164d1c50734716af1dd6fe31f7d41e145a8256837d5a63b1989efec40c169fc14840cf8eb4e18d9bb2410
-DIST pylint-1.8.4.tar.gz 512582 BLAKE2B 623e224ec71756cc2528346ac62b8e58ac4d5ef55d9e31e667d5389aa5b2dad712f60c7e90df5c831f57bf28e0ccbd00ddece4ade46410c28b67adb1a041a85f SHA512 07e55ed3f09326e1973215046e3b172f6065a7ed0ae657cba7a6825a26bb103bdbf8b83126bafd99f332fe0eec3547bcd6e618d6e9f612ddcf9c504bb850dcd9
 DIST pylint-2.3.1.tar.gz 577767 BLAKE2B 2af206a9d9be04f369c2bbc39c5ddb80c29a5a39c20d75bfec84498882eab628a7cf5abcc5786933304ed99bd00ffa142b9a58abab348c947799f962b877bb30 SHA512 924d8adc95f04ba750b3b44fe79ac569151ea7c8f693cc9867bcda3878209ebc2202931702b98f80709d161d3781b6e181aea0ded35a3323c023497e2a749ea9
 DIST pylint-2.4.4.tar.gz 646113 BLAKE2B d62b66b056e01cc13e90f45ff4a11f94983e0b9b42b9a05e5c7b7385280000d15ead9a282e7eea31a8ee6a24ffe539576a6e9bd40dc4d89093263da99029123b SHA512 835e0687ebc76c530e0042c5a5188b8aedab446531f621627e990cbeb37ab6ecc8de0f8c6ab171abaa63488e049e8d7782958461421f9a4127435f56b6d2ed0b
 EBUILD pylint-1.6.5-r1.ebuild 1791 BLAKE2B 7e139c0dff53c6ccc17eac6d37cc865b621e8fc7f2155be3441f92f05946a6e5cfdf0ec708b748c70c57caee87c0a7874da5981d1c7f3ff0dde74083ffc04fba SHA512 3a4ebbe7946d4856ff42731ccf6becbf72f0e7a3d219df088699429f18023a369e1824b055dce4cb9927792e95315dcf8dda19e5cc73662ae6c67391e82a88ab
-EBUILD pylint-1.8.4.ebuild 2467 BLAKE2B 1e55ff2939fe5185d4e8deb20acb31143de82a8350d9e39fcf1b091ab2a47dd57d40c617551ad6c67587490f2ac9ac7179ed03ceb92544e55a97e91e3b9c94cd SHA512 7e72496d0c6efe4731945a91f48477a02c8367ea314f370f41a5ea14eb619f4966f973929fe3ee79ae0b8967a11715470312e19b5b1675e197434ef00a648b15
 EBUILD pylint-2.3.1.ebuild 1649 BLAKE2B ef78c010054846cad6281e86a3acc9629469d22a58df635986dc82b101c07f349ddc19ae340ced07d7568285d2bff05eafcb246b8877df434a551600a6255b35 SHA512 564c255faa76b208c363b38c69f0e4a29733bf4784e3f62eda9eb54e4222afb5f38c0bd5e3f824216782d3e7659d0ed6e48817aa7508def98d57d13f5d7b650a
 EBUILD pylint-2.4.4.ebuild 1446 BLAKE2B be035ef9f3f7a52ccfc8bf233a07b02178c0597facac153e35362befdcc486ff47f794b9fcd7cf6bd4ef78d02ae928d1867e260d9d1a5c9d1bb6960e938fcd10 SHA512 07a7056f1203691c137c157f500bc0fd9d14cbf77e40871bee1d51c3401bbc6958d3034abfe1c0b72cac729dd6947cc442b1e34be0179ed10ff99e0cd30d45c9
 MISC metadata.xml 1074 BLAKE2B 712009f2963542b06e481ae89b331e9ddeec4d2d340ba076f73f12e328906527daeb814a03df11e0c9f12ce5b19c6639f8686294d2673cfd2fcac96c94aef6df SHA512 83ad47c0dfcd143d058267fb1c5d250b9316124a91f431356a881937b4a527a0e23575cf353da8aa678645e6ec4a455b9114ac6ecfa0b36d88ac0623ca66ce57
diff --git a/dev-python/pylint/pylint-1.8.4.ebuild b/dev-python/pylint/pylint-1.8.4.ebuild
deleted file mode 100644
index 1283cbb5b941..000000000000
--- a/dev-python/pylint/pylint-1.8.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/astroid-1.6.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	dev-python/mccabe[${PYTHON_USEDEP}]
-	virtual/python-singledispatch[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]
-		dev-python/configparser[${PYTHON_USEDEP}]' -2)"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	test? ( ${RDEPEND}
-		<dev-python/pytest-4[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	# remove unused dep
-	sed -i -e '/pytest-runner/d' setup.py || die
-
-	# Disable failing tests
-	# TODO: investigate if it's our fault and how can we fix it
-	sed -i -e 's/io.StringIO()/\0 if sys.version_info.major > 2 else open(os.devnull, "w")/' \
-		-e 's/test_libmodule/_&/' \
-		pylint/test/acceptance/test_stdlib.py || die
-	sed -i -e 's/^# pylint:.*/\0, import-error/' \
-		pylint/test/functional/deprecated_module_py36.py || die
-	sed -i -e 's/^# pylint:.*/\0, wrong-import-order/' \
-		pylint/test/functional/generated_members.py || die
-	sed -i -e 's/test_good_comprehension_checks/_&/' \
-		pylint/test/functional/using_constant_test.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# selection of straight html triggers a trivial annoying bug, we skirt it
-	use doc && PYTHONPATH="${S}" emake -e -C doc singlehtml
-}
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman man/{pylint,pyreverse}.1
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-	use doc && local HTML_DOCS=( doc/_build/singlehtml/. )
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	# Optional dependency on "tk" USE flag would break support for Jython.
-	optfeature "pylint-gui script requires dev-lang/python with \"tk\" USE flag enabled." 'dev-lang/python[tk]'
-}
diff --git a/dev-python/pymountboot/Manifest b/dev-python/pymountboot/Manifest
index 4a95530fe2c1..2cf637408d4a 100644
--- a/dev-python/pymountboot/Manifest
+++ b/dev-python/pymountboot/Manifest
@@ -1,4 +1,4 @@
 DIST pymountboot-0.2.2.tar.bz2 4098 BLAKE2B bbfbe631313189e6aef684ff29e73fcf2dcbbb998528103afe9c89e517e5a6c13bf6e05ced7c2eb05f668e0cc269212618b648043b65fb95da2e1b46c37476ac SHA512 bb6ec0772300b2edf9864a09ff64f67ad99f0cd29b009793e1b2a590be48146640c927b5772023d27e68fc2fba51652a55ab66d1cf875dd9b4134f043ac353c9
-EBUILD pymountboot-0.2.2.ebuild 602 BLAKE2B 4b510d4960a7acf20f8f325306b69f8c23519cd68b44f89a6d91c33cd7fabafa0eb840d2055c03d4a727494e28f8728bad1cd80c2a3e31bde1652e1960993c80 SHA512 b7b787087724b1035a612ae4af232fbe25ca60af2ced7d9d71060c194d9607ffe90427fe87da43ee04a749adb8037dcfe1d8de5858d1d19aef1a78bdc3af8cd7
-EBUILD pymountboot-9999.ebuild 559 BLAKE2B d9c8544043eb21f27db3505bc64812fddfb61d9bbae7cae66f4a5f55b19ded78e63e9a073ebd631a55c03bf6dcc21ef2d4760323132b3457ba3167a6cb6d4eb8 SHA512 a1f02b414f93299d13703cb031018c22ba6a5112f2f6c3988fe62c1aad5e74b8248e95b534a2c021faa8b6ec3a8f7f8e94ae75303eac639a141b5a0a330f4548
+EBUILD pymountboot-0.2.2.ebuild 513 BLAKE2B de470a0cc808589f36080ae6084a21060f8f1c41b9f77b8819540d4f89a4ea4218533ea8f675ef13558c047c2cc3c79843c4d2cf9aba55ff5742e1332eeeb42c SHA512 1b825d040a06986c839e15ed7c1132bde9a83d4a410f862d663c795f093843364a03425ce227e9ade1cdb62dfe059832aa14f32a66e78de331e16e4ebcbc8465
+EBUILD pymountboot-9999.ebuild 470 BLAKE2B 03c4de0bc0a5934f2081bcd9ffd77a49b61b054ec4afaa64dd9b0cd395c12cc1568cbaf716c55a04a1f7a2efd65f35247cd9ba7a21da8e75936b65417b9a9498 SHA512 21887d274fcbbb4b43920352a76f70451a239fc525235b3789530deadd9fffce3a25d5a8ab50fbafdbab584121b1d59e85af413f013c535d82fe78f86a582caf
 MISC metadata.xml 533 BLAKE2B 682a500aa018e96494eebe8a43af1bdd269fc0a0e049b2b022d014bd8e977fe8160202263d5d6ed5fb5022551ceee3b77ca92f58cdd272faa00141995afccfb4 SHA512 b0708a5c130422d6d5150f1a1d07386ea3494fa667acc4e05f41550d6c33e7334b559fd0b3e71bdce67b53e109ccdcba4e845ad10a0fd39b6505b8ce8b27d17c
diff --git a/dev-python/pymountboot/pymountboot-0.2.2.ebuild b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
index bd534a02f4e3..c5007a5efda2 100644
--- a/dev-python/pymountboot/pymountboot-0.2.2.ebuild
+++ b/dev-python/pymountboot/pymountboot-0.2.2.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
 
@@ -17,8 +19,3 @@ IUSE=""
 
 RDEPEND=">=sys-apps/util-linux-2.20"
 DEPEND="${RDEPEND}"
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
diff --git a/dev-python/pymountboot/pymountboot-9999.ebuild b/dev-python/pymountboot/pymountboot-9999.ebuild
index d631744311ed..d68a2826bdca 100644
--- a/dev-python/pymountboot/pymountboot-9999.ebuild
+++ b/dev-python/pymountboot/pymountboot-9999.ebuild
@@ -2,7 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{3_6,3_7} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1 git-r3
 
@@ -17,8 +19,3 @@ IUSE=""
 
 RDEPEND=">=sys-apps/util-linux-2.20"
 DEPEND="${RDEPEND}"
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
diff --git a/dev-python/pynotifier/Manifest b/dev-python/pynotifier/Manifest
deleted file mode 100644
index 1352294858ae..000000000000
--- a/dev-python/pynotifier/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pynotifier_0.7.0.orig.tar.gz 35358 BLAKE2B e709401b1667f8b902b70d7a1b1606fc492b2be073dc1325789db1a992ca1bf35363057566357f34fc360d28237090d00fafd621253cf86036ea6075d96252b7 SHA512 60be00e5a729c3bb3a6f778025e2422268986645bcb461a81db457cb8e4c94b86d7215d7725f0bc9dd1ea1dfaa16a879760c53dd6824fb398d02b7dc8979c3ef
-EBUILD pynotifier-0.7.0-r3.ebuild 749 BLAKE2B 3036a0caa9218894823dbfc1aa4abd5d9a2470c22caa14c0c222683156b7c262dd87820a80436b0b2e696006139abc5f265c9d251f332c2887daacb3355e391f SHA512 5bb287402dc4bf10545ceff3cd89a384db13d086d8c844f23694ca130f14b5e46830cd3e63fa6280478543da130dc49c5097458272e17c01efc3ef3a7166589e
-MISC metadata.xml 438 BLAKE2B 3cb57b4366901fbb51f4844d596f42ba3adb5c49fe0ea2225ed3253ed73b9aaf3c405c8d23ff61c7784f071a2f4b62b8573c6719c732cfe9d377ab550b61e06d SHA512 7c76ac9bad501f1bf9bad003d7a30c68c70e8e6515f859a953f7176d3749087fb9f342b22ef0587ec01b810b96c0081371a772f8a0c5114ea20e7348526e41d2
diff --git a/dev-python/pynotifier/metadata.xml b/dev-python/pynotifier/metadata.xml
deleted file mode 100644
index af88d08ae16b..000000000000
--- a/dev-python/pynotifier/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>
-	<longdescription>
-		pyNotifier provides an implementation of a notifier/event
-		scheduler and is capable of wrapping other notifier
-		implementations of GTK+, Qt and wxWidgets.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild b/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild
deleted file mode 100644
index af5e1cea7fb1..000000000000
--- a/dev-python/pynotifier/pynotifier-0.7.0-r3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="pyNotifier provides an implementation of a notifier/event scheduler"
-HOMEPAGE="http://www.bitkipper.net/"
-SRC_URI="http://www.bitkipper.net/bytes/debian/dists/unstable/source/${PN}_${PV}.orig.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="gtk"
-
-DEPEND=""
-RDEPEND="
-	|| (
-		dev-python/twisted[${PYTHON_USEDEP}]
-		dev-python/twisted-core[${PYTHON_USEDEP}]
-	)
-	gtk? ( dev-python/pygobject:2[${PYTHON_USEDEP}] )"
-
-python_prepare_all() {
-	if !use gtk; then
-		rm notifier/nf_gtk.py || die
-	fi
-	rm notifier/nf_qt.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index fba0a982a660..3c8725c489fb 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,4 +1,4 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
-EBUILD pypax-0.9.5.ebuild 1084 BLAKE2B 22f5d5dcd12da3b52b141b1ac0a52bdfbe3fbcf029cf1b50db485cde4a38aaf4ca8c19bb79cddf900e28d6116487c2078b188efeb0f3a9bd3010e76a087871f9 SHA512 d2469c37fb74c197d8e98da4e573c985813855e51a1e8009736b63323b4b1ab45bc7bc1d88ebe6ad35b76375145381bd3ee3ecdf9e25d6c20209778bd7267f9e
-EBUILD pypax-9999.ebuild 1093 BLAKE2B 8d9f6d3d872d560c0ca923e2084d6d85f3850c10ed8e4575302c4720085d317d5fd5100400a0d387158d3948a137d4127532493e85d0fc6507ec57ab1f1a76dd SHA512 57cc2b464980f581e9beeb74fea8309f60fed4d74540b36edbdfe96740317d58f8ac70372519120824dddb4b06255f6c18ca802058dd8edfb3da529294c4a0d4
+EBUILD pypax-0.9.5.ebuild 1112 BLAKE2B e8e74556bb8fff391fd6d8e4284e8f6067880530423a7530d9a9a0e2698fbfb110d8556560f1ee0bf17efa9f13b057b77bf0e444705b6f019dae0dfcb7b0518f SHA512 0e35a3bea49c2c4287031bfe8ad2df87013a9f4c4532e5d972ea93fb771dfcf3972f5b110a1c1763628eb8dd8d7ef1240d7102b1750afa96c741258ebe9ce8d6
+EBUILD pypax-9999.ebuild 1121 BLAKE2B a9889738d827e4de55be27b76f91f3612de104e22284552ecb97cf824cc3962eb77d8d1e1ee03315a464ea37c18fc3a953d62600283cdfb982d2073b9a4dafa5 SHA512 47a0bf465daee50bbbaf2b80f6959f1da393b1b2a4f22c46d0a924721b02e128aa49cb3d236e7ef05ddfd545a5231f0d4b5a0a784b9c502feaa879963259f1e4
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index de8e8a439b15..8cac86470156 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
diff --git a/dev-python/pypax/pypax-9999.ebuild b/dev-python/pypax/pypax-9999.ebuild
index 59f54d7dee4a..16ff1966bb47 100644
--- a/dev-python/pypax/pypax-9999.ebuild
+++ b/dev-python/pypax/pypax-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=6
 
+DISTUTILS_USE_SETUPTOOLS=no
 PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 
 inherit distutils-r1
diff --git a/dev-python/pypeg2/Manifest b/dev-python/pypeg2/Manifest
index 2bd4bf486b5d..df1366ee4e4e 100644
--- a/dev-python/pypeg2/Manifest
+++ b/dev-python/pypeg2/Manifest
@@ -1,4 +1,5 @@
 AUX pypeg2-2.15.1-test.patch 399 BLAKE2B 64afae813084e2bcceb3354d6a9819425f5454d7febbb3df12d7b7f73329bfeed1a93fd7bbd046c69899f26757d984fd70964e13809ba9bb30305b80d35cdbc8 SHA512 20428aa41858da3b73a262ec2f36aed0df8626999eae27438a6bad1908b1dc79056ab33069c273aae56eabc02dfd0c080daaf42fee7e7c92ec32b95244ba41c4
 DIST pyPEG2-2.15.2.tar.gz 40334 BLAKE2B 7a171824da4c0ccc3bfaef4e429efb16f5c8c4e03dd47c5cd59656a51fe37c9d0b3940e58e2f321a4d9976f66935fd5b9d526d24bd1e0342ef15a3a1341e77a3 SHA512 f78e3b1294169167809c5fe05f2a69af2bd6c7c4c1bcbebafb4aa6b8ae6ead181a46b051e41193bc31f49c4b4fa7b1ef231d172217c11d301d0ee21d8e411b6f
+EBUILD pypeg2-2.15.2-r1.ebuild 654 BLAKE2B 5c6b0894589384e1a829d80bbe0ee46f15f925172341079c727f3dbc7d8473a2d1b3e861d47bfbc96e0ff7f3799288895b73a449900c3a3edc7e2c86b561f47e SHA512 c5d78e16b7d135a4e233566bb321b7a80bc45b661935b5aa3381e13447cfab324d58d544ea8b0804f99909a5ffb512d6a2166f4ec1cb9af6add50bcb197f496a
 EBUILD pypeg2-2.15.2.ebuild 704 BLAKE2B 68cff1a7d878efe63c5b54caeee65fbb9bd6b5710ef75c77d691fd9fe874554bed08f028b9cb3595bd49046b9c6f5d08158bc76132d51739c3dbe5628755428d SHA512 6908501ffd1f74d8764d014fa9c7164dd90ae8ea59064dac0eb04c1afc39c9cb86aa73ff65d730f661c027babeeedb9a594d1070dd8a034004e5149073717597
 MISC metadata.xml 362 BLAKE2B c34e5f667750e99f16f44361c62c79d138767c94e664be039f81f7b7fb6f295e6610aeca962ece7097dfbc1372e92e697ad99572c036910352362379eb3ab4cc SHA512 7eb0a3fbe48ee8f34bb9f697aa951faece1ce5da90319a5bd8f9958d569eebd2c91539d0d1bd46c51cdc77ddb5c858bb6d158be7268666af668a935e1c4998e7
diff --git a/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild b/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
new file mode 100644
index 000000000000..f4105ac5d90f
--- /dev/null
+++ b/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+MY_PN=pyPEG2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="An intrinsic PEG Parser-Interpreter for Python"
+HOMEPAGE="https://fdik.org/pyPEG/
+	https://bitbucket.org/fdik/pypeg/
+	https://pypi.org/project/pyPEG2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}"/${PN}-2.15.1-test.patch )
+
+distutils_enable_tests unittest
diff --git a/dev-python/pypgsql/Manifest b/dev-python/pypgsql/Manifest
deleted file mode 100644
index 2d14fb38f32f..000000000000
--- a/dev-python/pypgsql/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyPgSQL-2.5.1.tar.gz 152840 BLAKE2B 8166d7e2acdda5c9f16f316859507ff37e50dd5f058ff771336c57bea7df1a96823c1941984e5d65700a0f2b4dea93fe4200d1a8065f800059b9e27bae911ae7 SHA512 50fc6f9e44f17e116a9122ab010642850d6dcdcbecf8e0ee4c32182eadc593cde2b03aa3cc353cdcc5f79f6e4f7337e6b1250f3b98977b208a98aad282763ab3
-EBUILD pypgsql-2.5.1-r1.ebuild 766 BLAKE2B 774402c1d82a49b30682bc304a8fd7ba53bf611f9d6c15855197d37fc0e3070b4989cfc0e7ee3898555c516bc166459304cd9807cbd975fe6c5f8b461c55882c SHA512 7bdca78bf51f31100e9efc49d4668e66939236789c5e6b9f1f01180fb783fb2529d6bf40062c33dccc05da74ee89c377f7a7eb5a3509f48b42f3fa6a833feb0d
-MISC metadata.xml 317 BLAKE2B 85faeddbccb26f733133610d1259e30b59bea521842af946ca4c4d2b1d6ee7d69ccdb5601b14e64171744d446de8b4868083057b47eff2cc66efe0b64a30e855 SHA512 4c87753458843cedbcde5e646f90d9bece70bdbc0cb3773522fc8fc1ebb2daa6827ef5099ef9883124205930fed6bc7b39f3e05f40c23f09dd36d9608fd55a1a
diff --git a/dev-python/pypgsql/metadata.xml b/dev-python/pypgsql/metadata.xml
deleted file mode 100644
index 3e856604578d..000000000000
--- a/dev-python/pypgsql/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="sourceforge">pypgsql</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild b/dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild
deleted file mode 100644
index 6907d4c1970b..000000000000
--- a/dev-python/pypgsql/pypgsql-2.5.1-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="pyPgSQL-${PV}"
-
-DESCRIPTION="Python Interface to PostgreSQL"
-HOMEPAGE="http://pypgsql.sourceforge.net/ https://pypi.org/project/pyPgSQL/"
-SRC_URI="mirror://sourceforge/pypgsql/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ia64 x86"
-IUSE="examples"
-
-DEPEND="dev-db/postgresql:*"
-RDEPEND="${DEPEND}
-	dev-python/egenix-mx-base[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index d9b5edf6ace8..4c26ffd1b084 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -1,4 +1,4 @@
 AUX pypiserver-1.3.1-no-internet.patch 3125 BLAKE2B bf6d0891897d1a7cfea6151df1ad274cda77dde74d85e355a2fb00815513cd612c1af393b4397ce5fa946634397980127545fba3a657e5a9def9eb50136ed12f SHA512 7775abae4f70e45888450a4dce6f55858b7d48d4c7bdfc9f1653319a65608fdc26010040b0beb781a5aa9e0804f016fb56405290426b85724e29177a68658b06
 DIST pypiserver-1.3.1.tar.gz 504875 BLAKE2B 18089a1d18ace55038fb2b114a3402ce1352139a858a2e32399ad36ef0cbe5dfcf9bbdb865807ea84330405bdd4da1c00265e095b7299fe2b9f56150d573f7d9 SHA512 425a557eb74111fb07911cacd275dfa35b8e8ba5e9f230ca5f86500c10b2ab33235eb3376150c75972de3d8ebd85b03ecdf935753b0af46936a78311d5f174a7
-EBUILD pypiserver-1.3.1-r1.ebuild 978 BLAKE2B d789c003cf7d7671fb34b6b30226b7cb68c6caee8ed056fc0ca1b9647373aa54e53e427b0fd048b839c41da595968affb03b1bfe7e8b0331b7cbd0be62dfa857 SHA512 dbba118cb295e3e30faedd487d19809db05c82c889c4505ca12a9fe37f1f1bd37a9df4c479612849299dec3102d8d7fffd3f9c095f3e54404cb15364d1485f1c
+EBUILD pypiserver-1.3.1-r1.ebuild 984 BLAKE2B 227c1c6d4f7bc490b51e44e324a8b66fb99aebaa2956635999c75b97862cdf96858c79b8998de150d229df96d481c01e3772da66a5cc13c24d83da3cabb5fdbe SHA512 51667499c7e8e631d368a57c75c2f5cd868ed7e6877be57d1ed401bfe55031c7e3a52c85e93746faa456bb0345bfd0c701df213ae58d16ff1f3a48bb6decd560
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
index 8aabc6bf36a4..75d145630ce7 100644
--- a/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~hppa x86"
 IUSE="test"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pypodman/Manifest b/dev-python/pypodman/Manifest
deleted file mode 100644
index d706ab9a01a7..000000000000
--- a/dev-python/pypodman/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST libpod-0.12.1.2.tar.gz 5987875 BLAKE2B 11381c53e768c94bfadcb2013a028f64058b0001cd985ef289d1618163225cdf10bd608cff0cd6f7fc1c094497184fc6d0cedea32fde54f3581ebb51eb5eabdd SHA512 9abb46d7880c4577d22b48aed01baeae29662dc3dbbdbc297f1eebe8324fb734d9bac6cd105dc93f7600753874c0fa581142d1b16f7490175cea80b8f62b34ce
-EBUILD pypodman-0.12.1.2.ebuild 815 BLAKE2B 980f8fe3b90ca76df8268fa4c02a9b2d066ba86210b31b951acce9675682550f25f5d8794bba3302c578467953ccd2886e31e26a71e502b9d5793f1547197518 SHA512 e784b590c6027a4a1e3544c05239eef849cf54a892fbddee7128cb3163d4fa14b4fae9a2a880753801e647f2eb40ec60a2326a068dfa882dfba217a54d45db8a
-MISC metadata.xml 326 BLAKE2B 77218bd50d76e0dd8ffbeb168b7e08d7cea7f8768f9d552865fa85f7ae78b9e4654fcb672320776b28b013e592117a4289522bdb0a62f03f40523b78d36f6171 SHA512 2d777f25c03c813cd1ec96215d91dd793350d48ba396de9c544a53412401b313ee5270311612e4a13a2b1a318591ba7fd96db686d639e241c13ac432808f219e
diff --git a/dev-python/pypodman/metadata.xml b/dev-python/pypodman/metadata.xml
deleted file mode 100644
index 7d1075feff13..000000000000
--- a/dev-python/pypodman/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>zmedico@gentoo.org</email>
-		<name>Zac Medico</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">containers/libpod</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pypodman/pypodman-0.12.1.2.ebuild b/dev-python/pypodman/pypodman-0.12.1.2.ebuild
deleted file mode 100644
index 53645e0709f9..000000000000
--- a/dev-python/pypodman/pypodman-0.12.1.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="CLI for podman written in python"
-HOMEPAGE="https://github.com/containers/libpod/tree/master/contrib/python/pypodman/"
-SRC_URI="https://github.com/containers/libpod/archive/v${PV}.tar.gz -> libpod-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/humanize[${PYTHON_USEDEP}]
-	dev-python/python-podman[${PYTHON_USEDEP}]
-	dev-python/pytoml[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-39[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-RESTRICT="test"
-
-S="${WORKDIR}/libpod-${PV}/contrib/python/pypodman"
-
-python_test() {
-	esetup.py test || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 635ac03836ff..6538116149a1 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,3 +1,3 @@
 DIST pyproject2setuppy-2.tar.gz 7589 BLAKE2B 21abc62707b590e5676b53500094887f7768082ea3c6d89b2d447461c219cda726de59aa299ebb960a0767935ece06abdf4729e4dd22d3bb003370d95ce19858 SHA512 684b292a6c2880f756ee7a4ba34a674bdb12f27952673cda9bc488f90101b2d1cd134e240b924148044fb6d02c5b7a5068fb7a857fef3f0c3f65f91e14c0ca4a
-EBUILD pyproject2setuppy-2.ebuild 621 BLAKE2B a4d8358d4ca2c0f83999f5b97b8f927273a90d8410d03ead51ad765423ae0b909e8e16ef8361d6aa00d41e9b0e71d81a805e1f227458164b8152bc6d92ada0bd SHA512 1b7f3068e3bb6779afc71ea7d717735322686d6f0d08cf63c6e7722e0713bf9c05a90cb2b75a63509ac28675b2750e2ac3e141af3d1f301527f2508d6c59b598
+EBUILD pyproject2setuppy-2.ebuild 635 BLAKE2B 52687ba965f92197db75edc5d06c80074bc311ae9fe304795852040ae20864dfaea0e45ecf70a2423725636062d9f4d5adc7088f9019c8e7b8b5f5254f889fc9 SHA512 c12e31f61b8b8e0ec1baf443aad2542d7c8a24a2f44e06bf296d41688563c32e87671b364a794ed987da5c0947055be56810b6462b58dbf99e5aa97c345924c3
 MISC metadata.xml 326 BLAKE2B 465cb8f46170cfced4ed1ba3af61210b58fba1c1fe0af7f5f9b5d498f1a32993ff19f860231ac84b5f6661a67cc7837aa8a19b81afc108cd44e5d836f3fb93e3 SHA512 19656915996f8905a7c2ea398da098d5ae704445273471730c82c3bc391d4662a6e7fe8bf9b416ce23d3c171008d93bd6b462fe278c7bef64b304b2e467d894a
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-2.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-2.ebuild
index 8f1cdd4f6e3b..8518dd5dff85 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-2.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index c0507c760159..1083872c1cca 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,3 +1,4 @@
+AUX pypy3-exe-7.3.0-gcc10-fno-common.patch 1083 BLAKE2B c0601013dd4eb62df0eaef45b64d91d3a9b5d055b69fe754cef8157e1a0f03d28184d09d00137d170ddcf4aa7d3ece20071586d2fe998fd13150dd2c8eaa3159 SHA512 a4c797c31b2a7ead67c4c0b3e39bd3ab51ddf1554e33526057447d9d2eefc57425a536ba84aac060082f5eb24d6c6de40f82b5bee53ba4b12f5985cf27fe1814
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
-EBUILD pypy3-exe-7.3.0.ebuild 3465 BLAKE2B 8b54a96879f9e63db7eaa74cb4e22f1c098c78e19ab5be764fd42cb38e02b7ccf9b50c526df121b61a8ef7b11d3364a0578d9d6f48d9b4501f6a9015c30f5c2b SHA512 4424d4f9a9abc2d5ae765183482420206be9ddf982cdf5fd3e31764fefd78f200e387e2f0c39f32fb8d6713a435cbd27c638b7879db14284b3e8c69bc55a90ef
+EBUILD pypy3-exe-7.3.0.ebuild 3562 BLAKE2B 34805b6eb7684edd37b1426665597c978328622c3073a391c04508cc6bca55245f543deacc0c51fb081a465a345eee813502b056081c16ec970ca2c37ee3b9e6 SHA512 f665919e6c3e39ce0bf28fe0bd78c38e4c0bcd4145e294899e52af375aa400227927aeed651424ca317263499ade0fd5bd456d464097b5ce302ed6933920cce9
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch b/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch
new file mode 100644
index 000000000000..b072ee4c1e60
--- /dev/null
+++ b/dev-python/pypy3-exe/files/pypy3-exe-7.3.0-gcc10-fno-common.patch
@@ -0,0 +1,25 @@
+From 455e1f635110df4bdc2981a3a0abf02e3d4d21b2 Mon Sep 17 00:00:00 2001
+From: Matti Picus <matti.picus@gmail.com>
+Date: Wed, 26 Feb 2020 13:06:29 +0200
+Subject: [PATCH] issue 3163: the constant is defined both in vmprof_common.h and vmprof_common.c
+
+---
+ rpython/rlib/rvmprof/src/shared/vmprof_common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rpython/rlib/rvmprof/src/shared/vmprof_common.h b/rpython/rlib/rvmprof/src/shared/vmprof_common.h
+index b52ee5f..1b2278b 100644
+--- a/rpython/rlib/rvmprof/src/shared/vmprof_common.h
++++ b/rpython/rlib/rvmprof/src/shared/vmprof_common.h
+@@ -89,7 +89,7 @@ int opened_profile(const char *interp_name, int memory, int proflines, int nativ
+    result is NULL. */
+ #if PY_MAJOR_VERSION >= 3 && !defined(_Py_atomic_load_relaxed)
+                              /* this was abruptly un-defined in 3.5.1 */
+-void *volatile _PyThreadState_Current;
++extern void *volatile _PyThreadState_Current;
+    /* XXX simple volatile access is assumed atomic */
+ #  define _Py_atomic_load_relaxed(pp)  (*(pp))
+ #endif
+--
+libgit2 0.26.0
+
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
index 3555bbb629dc..16932248fb99 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
@@ -38,6 +38,11 @@ BDEPEND="
 		)
 	)"
 
+PATCHES=(
+	# https://bugs.gentoo.org/706760
+	"${FILESDIR}"/${PN}-7.3.0-gcc10-fno-common.patch
+)
+
 check_env() {
 	if use low-memory; then
 		CHECKREQS_MEMORY="1750M"
diff --git a/dev-python/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index 3bf09c4de822..4ae7312c874e 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -1,6 +1,4 @@
-DIST pysaml2-4.6.3.tar.gz 316979 BLAKE2B cf393075903269ce93dd219bd23479949ce8e39383d8150f8ee30185733569fe79c7421b87b3439b95e707f17d5f513abfa2610be76441b8f18d8f75a5a9fdd3 SHA512 259f7395afad44caac32453a03bbdaf8c464adeeb856b78786b665281dbe75b37e8054efaf945a7d10333c0b09d9f516d606e95b157aed34c1cd0821b7255b9d
+AUX cve-2020-5390.patch 15871 BLAKE2B d5c129683e60d27c692669f71955bae111579c92fff19750b4c08117371020185a2925a480cabcfc3164b737a16f84447679d05d835726fb864b1c2eff3369ab SHA512 b338a795664d3d0917ca3dace6c0817ed4445e1fa720f8eb1da6c8d4a6c0fc7985495af8d82fa4994c75b1a0dd29d1048c461214f712163829079c0b94bb8f27
 DIST pysaml2-4.6.5.tar.gz 319131 BLAKE2B d2b78d00cc5e65717bae267fbe88c781d4583996025eb4a9602030215f842a29b625ba41905e867d887e4564bbacdb1251170af46e5f00cc0f9d202c7741418d SHA512 da9cd23f9bef37da1079bba539f91df6a79190fcf8ab20b4c025fd8eae9b147799623dcc1376acfb6ff06c8566a58d478f8da7765195fe058d54007a2ebe79bb
-EBUILD pysaml2-4.6.3-r1.ebuild 1219 BLAKE2B 5909b42219923f06b23f2ac16998745d46735d4a9f632d9a21ca47ea6accf080d2a980e4584bbb6a733c7a3eb55f1d6c31dc2f0e68395c0af2b712a9bf92fe42 SHA512 ddc2ec9df857b4625593eaac22ed3cbab90aa85153d3c6a8ac7800855bbe86b029ca16dce6ea7ebd08f06095d0fac750d75a31f44a0ecc618faff791877ddac9
-EBUILD pysaml2-4.6.3.ebuild 813 BLAKE2B 04fe2029b78a53fd2d3e71f3a06ab446b258ecb8c0ce5723c4fe7682bb57bc162427b61d4703722e049e45d75fceda3a55668193b8440223bf03d71cb6a81af3 SHA512 bd919956051b7be294896fbbee561c75c12327b8e0b344ea45dfebb2d4338d01aa93679402cdd599076932f7bf77b3ff34b778773f782314c146d4e7cee06e06
-EBUILD pysaml2-4.6.5.ebuild 1221 BLAKE2B 0e95b864ec534adbcd1ab94f4f717330c81c1ba7030fea8d66e08f4aa08089c339f8275fb1b9c503fca8d36b954ca16b94ffcbe910d0c6c5c2c7be1ba2507337 SHA512 77a64a723be5db3c1a62cc104ca5c790a65fcddd9d116be264eaad38503e808f37e5e14ef68a924dd5d5031de25e2d77abd2b0416fa39c84efe5c3d61f2cdc2b
-MISC metadata.xml 606 BLAKE2B 5262e7d7a6f2ff32547ab8570f3aace4dfc3af9d667fdaac6ba2eba77ffd562524a136154eb7b96d4f1f7dfb316b72ee7a0311efa46153afff150c3956151b32 SHA512 7b4facbe3e25898488fffb7b39f9ff7eedd12492f668fa294952711efb3ca9549f2653ab6bc2a948286deff5f45116b0b8bd9a5fc796e99413acc9334eade348
+EBUILD pysaml2-4.6.5-r1.ebuild 1268 BLAKE2B 1c31dd21e6051e584d50092201b838f82bec8df2bfb35a9c3d49dbff9557ae8a8290a370c3ca8f6887e1b80152d46f39273cd1aff964d3b438b96bfc1414f95f SHA512 2ba2b8734393cff3aea052dcaad5ebd7210ac2c572d5bcfd8059c2a29af727958469c3153b03b7f72dd7470ba66be53e6ed5851fae7065ff02f3ff0029d6b84f
+MISC metadata.xml 860 BLAKE2B 3291896b3fcfd7b513f0772b7f5716b56a38b25b0d51cb391e704102bc0875e1b7b5a2844bb468e2c7eed61c85356d2a6497c304cf192079e47387e88bb2d41e SHA512 a6370907aa8f3c2b07b938c66fd17af3014881c22eebe4a8d5db95c17b6cf41ad6614c9159a94a5688512dd22923d180f07bc9fc1bf465556b7c951f3df20ff5
diff --git a/dev-python/pysaml2/files/cve-2020-5390.patch b/dev-python/pysaml2/files/cve-2020-5390.patch
new file mode 100644
index 000000000000..bef46808d920
--- /dev/null
+++ b/dev-python/pysaml2/files/cve-2020-5390.patch
@@ -0,0 +1,189 @@
+From 5e9d5acbcd8ae45c4e736ac521fd2df5b1c62e25 Mon Sep 17 00:00:00 2001
+From: Ivan Kanakarakis <ivan.kanak@gmail.com>
+Date: Sat, 4 Jan 2020 00:39:47 +0200
+Subject: [PATCH] Fix XML Signature Wrapping (XSW) vulnerabilities
+
+PySAML2 did not check that the signature in a SAML document is enveloped and thus
+XML signature wrapping (XSW) was effective.
+
+The signature information and the node/object that is signed can be in different places
+and thus the signature verification will succeed, but the wrong data will be used. This
+specifically affects the verification of assertions that have been signed.
+
+This was assigned CVE-2020-5390
+
+Thanks to Alexey Sintsov and Yuri Goltsev from HERE Technologies to report this.
+
++ + + + + + + +
+
+In more detail:
+
+libxml2 follows the xmldsig-core specification. The xmldsig specification is way too
+general. saml-core reuses the xmldsig specification, but constrains it to use of
+specific facilities. The implementation of the SAML specification is responsible to
+enforce those constraints. libxml2/xmlsec1 are not aware of those constraints and thus
+process the document based on the full/general xmldsig rules.
+
+What is happening is the following:
+
+- xmldsig-core allows the signature-information and the data that was signed to be in
+  different places. This works by setting the URI attribute of the Reference element.
+  The URI attribute contains an optional identifier of the object being signed. (see
+  "4.4.3 The Reference Element" -- https://www.w3.org/TR/xmldsig-core1/#sec-Reference)
+  This identifier is actually a pointer that can be defined in many different ways; from
+  XPath expressions that need to be executed(!), to a full URL that should be fetched(!)
+  in order to recalculate the signature.
+
+- saml-core section "5.4 XML Signature Profile" defines constrains on the xmldsig-core
+  facilities. It explicitly dictates that enveloped signatures are the only signatures
+  allowed. This mean that:
+  * Assertion/RequestType/ResponseType elements must have an ID attribute
+  * signatures must have a single Reference element
+  * the Reference element must have a URI attribute
+  * the URI attribute contains an anchor
+  * the anchor points to the enclosing element's ID attribute
+
+xmlsec1 does the right thing - it follows the reference URI pointer and validates the
+assertion. But, the pointer points to an assertion in another part of the document; not
+the assertion in which the signature is embedded/enveloped. SAML processing thinks that
+the signature is fine (that's what xmlsec1 said), and gets the assertion data from the
+assertion that contains the signature - but that assertion was never validated. The
+issue is that pysaml2 does not enforce the constrains on the signature validation
+facilities of xmldsig-core, that the saml-core spec defines.
+
+The solution is simple; all we need is to make sure that assertions with signatures (1)
+contain one reference element that (2) has a URI attribute (3) that is an anchor that
+(4) points to the assertion in which the signature is embedded. If those conditions are
+met then we're good, otherwise we should fail the verification.
+
+Signed-off-by: Ivan Kanakarakis <ivan.kanak@gmail.com>
+---
+ src/saml2/sigver.py          | 49 ++++++++++++++++++++++++++++++++++++
+ tests/saml2_response_xsw.xml |  6 +++++
+ tests/test_xsw.py            | 44 ++++++++++++++++++++++++++++++++
+ 3 files changed, 99 insertions(+)
+ create mode 100644 tests/saml2_response_xsw.xml
+ create mode 100644 tests/test_xsw.py
+
+diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py
+index cbeca41f..c3d298a9 100644
+--- a/src/saml2/sigver.py
++++ b/src/saml2/sigver.py
+@@ -1476,6 +1476,55 @@ def _check_signature(self, decoded_xml, item, node_name=NODE_NAME, origdoc=None,
+         if not certs:
+             raise MissingKey(_issuer)
+ 
++        # saml-core section "5.4 XML Signature Profile" defines constrains on the
++        # xmldsig-core facilities. It explicitly dictates that enveloped signatures
++        # are the only signatures allowed. This mean that:
++        # * Assertion/RequestType/ResponseType elements must have an ID attribute
++        # * signatures must have a single Reference element
++        # * the Reference element must have a URI attribute
++        # * the URI attribute contains an anchor
++        # * the anchor points to the enclosing element's ID attribute
++        references = item.signature.signed_info.reference
++        signatures_must_have_a_single_reference_element = len(references) == 1
++        the_Reference_element_must_have_a_URI_attribute = (
++            signatures_must_have_a_single_reference_element
++            and hasattr(references[0], "uri")
++        )
++        the_URI_attribute_contains_an_anchor = (
++            the_Reference_element_must_have_a_URI_attribute
++            and references[0].uri.startswith("#")
++            and len(references[0].uri) > 1
++        )
++        the_anchor_points_to_the_enclosing_element_ID_attribute = (
++            the_URI_attribute_contains_an_anchor
++            and references[0].uri == "#{id}".format(id=item.id)
++        )
++        validators = {
++            "signatures must have a single reference element": (
++                signatures_must_have_a_single_reference_element
++            ),
++            "the Reference element must have a URI attribute": (
++                the_Reference_element_must_have_a_URI_attribute
++            ),
++            "the URI attribute contains an anchor": (
++                the_URI_attribute_contains_an_anchor
++            ),
++            "the anchor points to the enclosing element ID attribute": (
++                the_anchor_points_to_the_enclosing_element_ID_attribute
++            ),
++        }
++        if not all(validators.values()):
++            error_context = {
++                "message": "Signature failed to meet constraints on xmldsig",
++                "validators": validators,
++                "item ID": item.id,
++                "reference URI": item.signature.signed_info.reference[0].uri,
++                "issuer": _issuer,
++                "node name": node_name,
++                "xml document": decoded_xml,
++            }
++            raise SignatureError(error_context)
++
+         verified = False
+         last_pem_file = None
+ 
+diff --git a/tests/saml2_response_xsw.xml b/tests/saml2_response_xsw.xml
+new file mode 100644
+index 00000000..3671eb48
+--- /dev/null
++++ b/tests/saml2_response_xsw.xml
+@@ -0,0 +1,6 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<ns0:Response xmlns:ns0="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:ns1="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:ns2="http://www.w3.org/2000/09/xmldsig#" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Destination="http://lingon.catalogix.se:8087/" ID="id-vqOQ72JCppXaBWnBE" InResponseTo="id12" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns0:Status><ns0:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success"/></ns0:Status><ns1:Assertion ID="id-SPOOFED_ASSERTION" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns2:Signature Id="Signature2"><ns2:SignedInfo><ns2:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ns2:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ns2:Reference URI="#id-Aa9IWfDxJVIX6GQye"><ns2:Transforms><ns2:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ns2:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/></ns2:Transforms><ns2:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ns2:DigestValue>EWBvQUlrwQbtrAjuUXkSBAVsZ50=</ns2:DigestValue></ns2:Reference></ns2:SignedInfo><ns2:SignatureValue>m4zRgTWleMcx1dFboeiYlbiDigHWAVhHVa+GLN++ELNMFDutuzBxc3tu6okyaNQGW3leu32wzbfdpb5+3RlpGoKj2wPX570/EMJj4uw91XfXsZfpNP+5GlgNT8w/elDmBXhG/KwmSO477Imk0szKovTBMVHmo3QOd+ba//dVsJE=</ns2:SignatureValue><ns2:KeyInfo><ns2:X509Data><ns2:X509Certificate>MIICsDCCAhmgAwIBAgIJAJrzqSSwmDY9MA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNVBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwHhcNMDkxMDA2MTk0OTQxWhcNMDkxMTA1MTk0OTQxWjBFMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDJg2cms7MqjniT8Fi/XkNHZNPbNVQyMUMXE9tXOdqwYCA1cc8vQdzkihscQMXy3iPw2cMggBu6gjMTOSOxECkuvX5ZCclKr8pXAJM5cY6gVOaVO2PdTZcvDBKGbiaNefiEw5hnoZomqZGp8wHNLAUkwtH9vjqqvxyS/vclc6k2ewIDAQABo4GnMIGkMB0GA1UdDgQWBBRePsKHKYJsiojE78ZWXccK9K4aJTB1BgNVHSMEbjBsgBRePsKHKYJsiojE78ZWXccK9K4aJaFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNVBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAJrzqSSwmDY9MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADgYEAJSrKOEzHO7TL5cy6h3qh+3+JAk8HbGBW+cbX6KBCAw/mzU8flK25vnWwXS3dv2FF3Aod0/S7AWNfKib5U/SA9nJaz/mWeF9S0farz9AQFc8/NSzAzaVq7YbM4F6f6N2FRl7GikdXRCed45j6mrPzGzk3ECbupFnqyREH3+ZPSdk=</ns2:X509Certificate></ns2:X509Data></ns2:KeyInfo></ns2:Signature><ns1:Subject><ns1:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" NameQualifier="" SPNameQualifier="id12">ANOTHER_ID</ns1:NameID><ns1:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><ns1:SubjectConfirmationData InResponseTo="id12" NotOnOrAfter="2019-12-20T12:20:16Z" Recipient="http://lingon.catalogix.se:8087/"/></ns1:SubjectConfirmation></ns1:Subject><ns1:Conditions NotBefore="2019-12-20T12:15:16Z" NotOnOrAfter="2019-12-20T12:20:16Z"><ns1:AudienceRestriction><ns1:Audience>urn:mace:example.com:saml:roland:sp</ns1:Audience></ns1:AudienceRestriction></ns1:Conditions><ns1:AuthnStatement AuthnInstant="2019-12-20T12:15:16Z" SessionIndex="id-eEhNCc5BSiesVOl8B"><ns1:AuthnContext><ns1:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocolPassword</ns1:AuthnContextClassRef><ns1:AuthenticatingAuthority>http://www.example.com/login</ns1:AuthenticatingAuthority></ns1:AuthnContext></ns1:AuthnStatement><ns1:AttributeStatement><ns1:Attribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">staff</ns1:AttributeValue><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">ADMIN</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">HACKER@gmail.com</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Derek</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="surName" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Jeter</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">shortstop</ns1:AttributeValue></ns1:Attribute></ns1:AttributeStatement></ns1:Assertion>
++<XSW_ATTACK>
++<ns1:Assertion ID="id-Aa9IWfDxJVIX6GQye" IssueInstant="2019-12-20T12:15:16Z" Version="2.0"><ns1:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">urn:mace:example.com:saml:roland:idp</ns1:Issuer><ns1:Subject><ns1:NameID Format="urn:oasis:names:tc:SAML:2.0:nameid-format:transient" NameQualifier="" SPNameQualifier="id12">ac5b22bb8eac4a26ed07a55432a0fe0da243f6e911aa614cff402c44d7cdec36</ns1:NameID><ns1:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"><ns1:SubjectConfirmationData InResponseTo="id12" NotOnOrAfter="2019-12-20T12:20:16Z" Recipient="http://lingon.catalogix.se:8087/"/></ns1:SubjectConfirmation></ns1:Subject><ns1:Conditions NotBefore="2019-12-20T12:15:16Z" NotOnOrAfter="2019-12-20T12:20:16Z"><ns1:AudienceRestriction><ns1:Audience>urn:mace:example.com:saml:roland:sp</ns1:Audience></ns1:AudienceRestriction></ns1:Conditions><ns1:AuthnStatement AuthnInstant="2019-12-20T12:15:16Z" SessionIndex="id-eEhNCc5BSiesVOl8B"><ns1:AuthnContext><ns1:AuthnContextClassRef>urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocolPassword</ns1:AuthnContextClassRef><ns1:AuthenticatingAuthority>http://www.example.com/login</ns1:AuthenticatingAuthority></ns1:AuthnContext></ns1:AuthnStatement><ns1:AttributeStatement><ns1:Attribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">staff</ns1:AttributeValue><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">member</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">foo@gmail.com</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Derek</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="surName" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">Jeter</ns1:AttributeValue></ns1:Attribute><ns1:Attribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"><ns1:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">shortstop</ns1:AttributeValue></ns1:Attribute></ns1:AttributeStatement></ns1:Assertion>
++</XSW_ATTACK>
++</ns0:Response>
+diff --git a/tests/test_xsw.py b/tests/test_xsw.py
+new file mode 100644
+index 00000000..9978c4d3
+--- /dev/null
++++ b/tests/test_xsw.py
+@@ -0,0 +1,44 @@
++from datetime import datetime
++from unittest.mock import Mock
++from unittest.mock import patch
++
++from saml2.config import config_factory
++from saml2.response import authn_response
++from saml2.sigver import SignatureError
++
++from dateutil import parser
++
++from pytest import raises
++
++from pathutils import dotname
++from pathutils import full_path
++
++
++XML_RESPONSE_XSW = full_path("saml2_response_xsw.xml")
++
++
++class TestAuthnResponse:
++    def setup_class(self):
++        self.conf = config_factory("sp", dotname("server_conf"))
++        self.ar = authn_response(self.conf, "http://lingon.catalogix.se:8087/")
++
++    @patch('saml2.response.validate_on_or_after', return_value=True)
++    def test_verify_signed_xsw(self, mock_validate_on_or_after):
++        self.ar.issue_instant_ok = Mock(return_value=True)
++
++        with open(XML_RESPONSE_XSW) as fp:
++            xml_response = fp.read()
++
++        self.ar.outstanding_queries = {"id12": "http://localhost:8088/sso"}
++        self.ar.timeslack = 10000
++        self.ar.loads(xml_response, decode=False)
++
++        assert self.ar.came_from == 'http://localhost:8088/sso'
++        assert self.ar.session_id() == "id12"
++        assert self.ar.issuer() == 'urn:mace:example.com:saml:roland:idp'
++
++        with raises(SignatureError):
++            self.ar.verify()
++
++        assert self.ar.ava is None
++        assert self.ar.name_id is None
diff --git a/dev-python/pysaml2/metadata.xml b/dev-python/pysaml2/metadata.xml
index e06acc272e6a..34133f9748f2 100644
--- a/dev-python/pysaml2/metadata.xml
+++ b/dev-python/pysaml2/metadata.xml
@@ -10,7 +10,7 @@
 		<name>Openstack</name>
 	</maintainer>
 	<longdescription lang="en">
-	Python implementation of SAML Version 2 to be used in a WSGI environment
+		PySAML2 is a pure python implementation of SAML Version 2 Standard. It contains all necessary pieces for building a SAML2 service provider or an identity provider. The distribution contains examples of both. Originally written to work in a WSGI environment there are extensions that allow you to use it with other frameworks.
 	</longdescription>
 	<upstream>
 		<remote-id type="pypi">pysaml2</remote-id>
diff --git a/dev-python/pysaml2/pysaml2-4.6.3-r1.ebuild b/dev-python/pysaml2/pysaml2-4.6.3-r1.ebuild
deleted file mode 100644
index 4a56f65c6b89..000000000000
--- a/dev-python/pysaml2/pysaml2-4.6.3-r1.ebuild
+++ /dev/null
@@ -1,40 +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 SAML Version 2 to be used in a WSGI environment"
-HOMEPAGE="https://github.com/rohe/pysaml2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-PATCHES=(
-)
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/cryptography-1.4[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
-	# Work-around for bug 675824
-	# With older setuptools, version = file:... is not supported, see Note 1 in:
-	#   https://setuptools.readthedocs.io/en/latest/setuptools.html#metadata
-	# In such cases, hardcode the version
-	has_version ">=dev-python/setuptools-39.2.0" || \
-		sed --in-place "s/^version = file:.*\$/version = ${PV}/" setup.cfg
-	##
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pysaml2/pysaml2-4.6.3.ebuild b/dev-python/pysaml2/pysaml2-4.6.3.ebuild
deleted file mode 100644
index 2ebbc1fd51bb..000000000000
--- a/dev-python/pysaml2/pysaml2-4.6.3.ebuild
+++ /dev/null
@@ -1,29 +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 SAML Version 2 to be used in a WSGI environment"
-HOMEPAGE="https://github.com/rohe/pysaml2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-PATCHES=(
-)
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/cryptography-1.4[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pysaml2/pysaml2-4.6.5.ebuild b/dev-python/pysaml2/pysaml2-4.6.5-r1.ebuild
index a3f675d0b813..9d807ccf40e8 100644
--- a/dev-python/pysaml2/pysaml2-4.6.5.ebuild
+++ b/dev-python/pysaml2/pysaml2-4.6.5-r1.ebuild
@@ -28,6 +28,8 @@ RDEPEND=">=dev-python/cryptography-1.4[${PYTHON_USEDEP}]
 	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 
+PATCHES=( "${FILESDIR}/cve-2020-5390.patch" )
+
 python_prepare_all() {
 	# Work-around for bug 675824
 	# With older setuptools, version = file:... is not supported, see Note 1 in:
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index ccf2be5a48ac..ed0436972896 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -2,5 +2,5 @@ AUX pytest-httpbin-1.0.0-pypy3-hang.patch 1099 BLAKE2B 4bb8dd686aadc35aab144a646
 DIST pytest-httpbin-0.2.3.tar.gz 9498 BLAKE2B ad41f72c80430eeea8c7f48185daf63c6adddfad36798179df27677aacc8af85419a678ba6f3df5281ca7f7ba0b3ee721cd97e5fe86eb5117417be53332f98e8 SHA512 f3c4eb67d1b02c27d8edb42622793fa3604e3f0bd5086e4986b8f0402a9fb8d7969a466be92fc6a7e301e829dbeb300183b40dccc9ec5da1d158cb4d08274f8b
 DIST pytest-httpbin-1.0.0.gh.tar.gz 17813 BLAKE2B b7e0ad9f131e4d236161b66b1d6d8e6087285a6d52df1accb044b30bcdac6c5f3350e9dbfe1cf33ab64b6d6aac6b463de81c31fd12dd950426b6ed8ef4eaf289 SHA512 2794134cc005cb969752e0c1119459d3f1e106f679942880a6b9ff507f2ee31c8ac4146a9c01b9a920368ea516443954b1b7044f7b1c270fe251f7d36adf7661
 EBUILD pytest-httpbin-0.2.3.ebuild 861 BLAKE2B 1595922b3716998743d8651eb5c9568c1707cbc1b41104109563077de6563a2c0eb0110eb51238345f46d0347efffcbc4f691e15e91252dda439ebf91ee776e9 SHA512 f9f14a91746be8072b8b6546679a6cae77a382c51dc5ef27b957bd3aecaee8e8c744d777d8e217f94ecc510ae98adb46c69188e829ccbb83c0b20d8ffd6c02fb
-EBUILD pytest-httpbin-1.0.0.ebuild 768 BLAKE2B 0bf7e46ee54e1464913b05270b72ec66ad36d40ea364f039d3bedab064e807d8b8ecd37feede9d27c0bfe5781b72fbc08f70639302c753f65aa14ec1c08c30dc SHA512 f50eae49938b3fbdfd06c564e594af2bb4545f91e8a5e416dd5d774dd7d7140fb5ce276f1b26cc435b097d97ef818e4b3475268d1ecb4aec40f674fe1c11ad32
+EBUILD pytest-httpbin-1.0.0.ebuild 758 BLAKE2B d19b26498718341f583f8a265a6654a1c892420ceb92a382e3af530c339eab33b3d6251e6d410ca37543b518fdf1b34ebed643e7db9605054306cedf59e4d704 SHA512 3252e3d5a1e4a7d46286ff11e8549f76e4c5aaf2de13a3e9a4e38479ef03ef721e4480006775ba081584a6d6282835c7357e0a0891c53428fc36852d9e3a7f0c
 MISC metadata.xml 521 BLAKE2B f3135defad3eccac1a8f9a7188de8e375a970fd3b6c665395fad1d4ed570aa4a3a90728644fe45f13af527d5c51216e04631ddec670cb6ce5f026b508eb5f58f SHA512 19e78d9a8706ad253eb0f7873f0e8bf308065d4cdcafc6d2ebed792f31f526c1d4c45bd2f7aecac338bd30c4ebda33b301b056f3075c11231b8d0d5ad4e77d2e
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
index 6caf54c29902..d2dbd01e477d 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -14,14 +15,12 @@ SRC_URI="https://github.com/kevin1024/pytest-httpbin/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/httpbin[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 PATCHES=(
 	"${FILESDIR}"/pytest-httpbin-1.0.0-pypy3-hang.patch
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index df9c6c629e3a..67d9296eb8d3 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -8,5 +8,5 @@ EBUILD pytest-3.10.1.ebuild 2440 BLAKE2B 1387677713282155a15b2f24e5ed62c070cfd00
 EBUILD pytest-4.5.0.ebuild 2087 BLAKE2B 5885f2b8e0b1d7954c0bf7682cd8ee8dd94d09a3d1b6f151ebb543a0ac17b84b9822d3497f7c89699011f250221ab440b5de73049c80974ef4332550f091dc9d SHA512 b4cea619b2f9ceaeb5b3411aff6d8d802ab831ac7c56fe5f244938043b514af84820fb0589800d971caa8674efb5460a98d0963259e45b4007cc715e813d3bc8
 EBUILD pytest-4.6.9.ebuild 2276 BLAKE2B 151a17641bf5fc248566da939c9cc7d46095474a79b7b0fede67238a8b9455591921df75ff1a02475464f3a37c7b16c371d0d9ddbe0f75fb5374039eee7bf0b6 SHA512 a4a12294731d78a407ae208fe1cd85d70b2f67d6efdc14a9282724692b32d224635859ae75c8726b2efa2c9716fc89cf997ba387d885748e9703e8bd8e1a3450
 EBUILD pytest-5.3.4.ebuild 1779 BLAKE2B b037143c812281a7e0d3bbead01e6d281580497830eab33d88eba888172be6f41d1845751daaf251026527bedeee1d1eb6bc1016135898b506d615db2464fa59 SHA512 d18e1f22ec79987883035e843ab601e6633dc614d02d0681b4da4cd6601528fec12782a3eae9ad9e5bee91017ac6fe45f789ab3496a7b362b52e8dfd49c0e77b
-EBUILD pytest-5.3.5.ebuild 1785 BLAKE2B 972536114ee0e21d3c1bc8bd26e8787df175cdbe2b41f7937c1199b62114b07afadc5bc1f11adbda476862d721a92df05c547d5dce8adb71ba3bdd81fcd7a1b6 SHA512 211e0398d2f25d9d5ebb6d836549e725dc27cc4ba32637218924fe5c13a3f45809954187e89a7c4151b2e25b438608acc1895b837888acb6e58ba2ff1a9d0e47
+EBUILD pytest-5.3.5.ebuild 1791 BLAKE2B 6af1e7ea1e9736644f19e3b73971b1c1b5918ea7ff599bbd0705eae0a2f5bc5c1ff9d17897c6fda59c07fa4d5a2faadb3fa9899e6d99bdb0c85dc606786d9c76 SHA512 c69de2f12d30e85b932d337fe5a3ff89eddcbe7dab0d184a12675801a6c68deb6dbe7c69e9bb1ba5d7612a6e4a30edde4d9653cae15479465fe3e01ecbd945c0
 MISC metadata.xml 309 BLAKE2B f29391c5f96f44f6329d3665346a5d46ecb4a86d103ae8008769af86126756e76bfa89cfe462e9c219e5f70b64013f662d020c7a2f6015d8cadd0eb25a7614eb SHA512 ba53c13ac716488e3e5dadf5dcfcb697dc9bb13f89e9d0fb98b9a5a6e36cafeeb64d1348008f42497117bf46fb6f3bc288c10a68c4d5ab53c9c02a3ae61b594f
diff --git a/dev-python/pytest/pytest-5.3.5.ebuild b/dev-python/pytest/pytest-5.3.5.ebuild
index eb0ee3e12587..33a14f2edb10 100644
--- a/dev-python/pytest/pytest-5.3.5.ebuild
+++ b/dev-python/pytest/pytest-5.3.5.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 ~hppa ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index cd3380f95663..f4fa7bc49971 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,3 +1,3 @@
 DIST python-language-server-0.31.8.tar.gz 65064 BLAKE2B 8d63d9f7761391fe3c099ea6f3f78530418dfda8450109a95e24957858ad9cb46080fcdc0f4b553fb007130ede7e6e607f272988e303f5c37a6bf0a3f7235a8c SHA512 36be790c5eac819558a82aba2787c36f41ff90e5c8b8d878b70531c0b6d996a279e7cd8bbe10c22187417ae5bd05566299a93db5e40d1a8ceb65a1c0f2eb1ce5
-EBUILD python-language-server-0.31.8.ebuild 2122 BLAKE2B 44cdf1294167d36eebc88bb528209b9a15ad1e463d9626f3cd4f4ae57b2dce3ea17d948030efdf5d4fd573207c8a407c0e8d2c538d01f60239046624a32568da SHA512 5cbfda5c4333a80a3034544888db05be5ea5ddecfbd0bc036d2787574b229e0edb3ceabd193b4943aeb7dd326ae4466a4b63428b170f7e5756b6eabd065ef2d9
+EBUILD python-language-server-0.31.8-r1.ebuild 2191 BLAKE2B 3c06aa48618acc1fb898100a9a33ea578973355376f6132d0056b4a556971677e48477b04284108bdcaf779c0397af5523b9d2d6afb5d7fae49f823574e067d8 SHA512 143bee436cfbd8c6db57af2f7e78a80f3613dd6dff74109d9a520e03b656d7d2aeb2be6718155415deb51cd31b4858c19f1b6a6347ff34a085effef410fae26d
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-language-server/python-language-server-0.31.8.ebuild b/dev-python/python-language-server/python-language-server-0.31.8-r1.ebuild
index 0ebc9ebc1a90..53b3086f0cdd 100644
--- a/dev-python/python-language-server/python-language-server-0.31.8.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.31.8-r1.ebuild
@@ -19,10 +19,12 @@ KEYWORDS="~amd64 ~x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
 
-RDEPEND="dev-python/jedi[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/jedi-0.14.1[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.16.0[${PYTHON_USEDEP}]
 	dev-python/pluggy[${PYTHON_USEDEP}]
-	dev-python/python-jsonrpc-server[${PYTHON_USEDEP}]
-	dev-python/ujson[${PYTHON_USEDEP}]"
+	>=dev-python/python-jsonrpc-server-0.3.2[${PYTHON_USEDEP}]
+	<=dev-python/ujson-1.35[${PYTHON_USEDEP}]"
 
 DEPEND="test? (
 	dev-python/autopep8[${PYTHON_USEDEP}]
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 943e94729138..0ea5a9d3f6f6 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -2,6 +2,6 @@ AUX python-magic-0.4.15-fix-buffer-test.patch 2817 BLAKE2B d8eb024f3e2e3d5e5fa22
 AUX python-magic-0.4.15-fix-gzip-test.patch 768 BLAKE2B f97629ea04b4b9ba191087fd1eb3dbb0ed10deb81428754a6edfbd48ac48e0b8ae208b7e9c16e31876d050c9935eaf48165cd97ed58eb5cb72949d0fa221a32c SHA512 790c87209c131c4e394f605669297262b91ca6034309d910902dc19e28691102df0b66cb2392fc8c21727bb16c8af9baf6a316c0b6ca29c9ba542fdb49580e2b
 AUX python-magic-0.4.15-fix-jpeg-test.patch 1768 BLAKE2B 64899d227643a8a09d27e0f7cc5c80ac366cd8e0d70d4ccc076df51794cf0fac14dd1f6e4f5426fe84600bbfdf35fc8e1ea571bab7839f753720fceb575d4658 SHA512 5e31ae71c01334af8e781b2aaeb98da38a68a7772d39e5eb7b231623cb4ac66652a66888a3eae5d35b07cac3024944176a52c4ebf1336b976d68f9c558cbdef5
 DIST python-magic-0.4.15.gh.tar.gz 75476 BLAKE2B dad4973f69a21d08972e1e29bc92a51bc92f405907cc28f18eb9357029afdf9f1ba68010ce651acd821140d60dc10eb2e04138627fb19d132f185a2831fcea28 SHA512 004d6bfde52d58a9d3019ef4ff8c5b18b6a4206bf89820d3a0ae0ed78813f80dfba422aee9685528f88c990526ba65fa2153ac3b95b8863ce6cb3ebe925bd780
-EBUILD python-magic-0.4.15-r1.ebuild 1069 BLAKE2B b807f3feff379fdb5c24464b791792636b944f1d30e99ca39a88296ae224eef2d1ab1e1cfbc09813c9e02be3a1057c83e56148d502acc6721a751a736e9b5d95 SHA512 2a148b6f061abab42884336910d871092f4f587d963964beab1e7449a46fbc0cf2eae9b3ccac41729d4ccb05db786f6c193c10ea3c876c7ba764ffed348c593a
+EBUILD python-magic-0.4.15-r1.ebuild 1067 BLAKE2B cb48ffa9a345986798c368c955d5e667bca3cd5efc0e88a0ee792507c3fbafa9700a2e8b180a30ec63ee86a93e425b08c571c0443b07ac54c910dc639cf92bea SHA512 920fc9e0aab54f6e39043da8257684a79cea5408fd647ea2064c70707c790df8f7815c7d0dfd670af52b24b69313e33618cd483ad2b30fbec4e1af5d0a4fd809
 EBUILD python-magic-0.4.15.ebuild 620 BLAKE2B 14c8efa6b1daabd27660bfffe24ca5e6dd4b9c8e74e2ea7c4c07c85551510714912a369cdda75aea25b6208d5302fbf11d1ad578fdcb110beadd98bc344f6da1 SHA512 ab297382df0432ef7f4be3166e361211883c294ad8ff75d0bf2f49ec3aa03a0baf2904dded9e0f8b1078d4b46077ca2404640dca65c208a2b9a018cfeefaa3b2
 MISC metadata.xml 495 BLAKE2B 416789755f00235cc92891f85c214cd6f21751fd4c65df5d73199aac39b73245505b5fbba4b151bc03e92967859facaf8875aa4431e77af8cc9766bb2bec67af SHA512 014c7f81cb02bc8e06ff0f0cebbe15954f48715bcbb2fb34a0d9ab7291447a18359597592f026ac3d5b2082381cc9487257351dbde1bb7a2ed0ed7066563bdfa
diff --git a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
index a5016091b129..8f25dcdad7e6 100644
--- a/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.15-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ia64 ~sparc x86 ~amd64-linux"
+KEYWORDS="amd64 arm hppa ia64 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-markdown-math/Manifest b/dev-python/python-markdown-math/Manifest
index 59644191e9ed..67fcf3c9f81e 100644
--- a/dev-python/python-markdown-math/Manifest
+++ b/dev-python/python-markdown-math/Manifest
@@ -1,3 +1,3 @@
 DIST python-markdown-math-0.6.tar.gz 6406 BLAKE2B 43172ba4b36b697f196bd569c93d56d1a3a05aaa306b1f149f3b70372e624e35fc0d3f3ea3c58c6b86e00c68408a5ebfe9fcc6562fe5065c7f8a7aa8683ee084 SHA512 af5773dc5b6d8968d811487a86fd027042d381b8b5b37683b519f03f21097bafd3d174881d8201cb6524e0975cd6868781e116cec6406fa20ffd3c6b9f9d4e87
-EBUILD python-markdown-math-0.6-r1.ebuild 879 BLAKE2B 74445c26886e48cffe0d857336480cfe770f78694798b0e4491a431cc92229f2fedd792b78c499b126abf6d118557a3d33151f39becab2c0a297a24ea5e7a46e SHA512 04fb803415ec616e1ecc57b0a7682e6e20b8dcb6dbe0687e340102f6746659b021d054d103573b0d84f8a2675d65367f712026394f764e4ce0801389108b52cd
+EBUILD python-markdown-math-0.6-r1.ebuild 880 BLAKE2B 10826ea731911c3ee9a738d657a8b70782b4cb69cf8b7ec2f5b0f4ced04a8fa71f36a8926a4b6a5a07e9dc708f5489676bc6556a26f280fa1db21f791e38d8f7 SHA512 8015a0539d943f83d0ed0e84c37451e894d758da8a50af0b98afb4f48899105405fba3a936c69ad9d68c52f425b175d6631179ec389f84f9675da6b2cbc4170d
 MISC metadata.xml 618 BLAKE2B 38507a41b254385cc67fc807c7bc9597c22f65bf7ccad19a128d619d1b1ee86aeef3244fa01c90ab652179a9999146f02ac5bed4f57fec308f82c03356bf88a1 SHA512 cfdc0f283f5351aa12165bf85cd9e428f8d1d4c80eda12bacacbcf11d2b195d6306bc406b64ddd7dbdc3b086c7d2fbde70a424e0169751a9b92ae48e02544802
diff --git a/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild b/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild
index d24a7ff6c08e..353480e805e5 100644
--- a/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild
+++ b/dev-python/python-markdown-math/python-markdown-math-0.6-r1.ebuild
@@ -35,6 +35,6 @@ DEPEND="
 RDEPEND="${DEPEND}"
 BDEPEND=""
 
-python_test(){
+python_test() {
 	esetup.py test
 }
diff --git a/dev-python/python-musicbrainz/Manifest b/dev-python/python-musicbrainz/Manifest
deleted file mode 100644
index 32331b4b7f1a..000000000000
--- a/dev-python/python-musicbrainz/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-musicbrainz2-0.7.4.tar.gz 76939 BLAKE2B ab41027a0219659e7e03a43d3d5cda973284afc4c1a1560074e252992f05fa5913724847af6862ec9cc3599f8165a0d6451c00240a93a767c6f409c7db33097c SHA512 dbf72a6f2dfa945398f390f20cbf75a5099ea69075b419ece37f1994c816ae36a62c1bf1d7490110e446b3ce441a7d486002c1e91ea4872aba3f4cc183bbf88e
-EBUILD python-musicbrainz-0.7.4-r1.ebuild 1007 BLAKE2B 5d2809c83bf441323cd6e5b23a90c6f70009ab05a080ee1c48dfc04e31ab1263ed9050c5e790d9edbbc9468d5d2bf3b005cd6c8250dc1887505f85837c1b8eb9 SHA512 160670b80e97121392833060b643c709013d6b4dffbd12f9a2fecff4a4a2ef877e3bfc60fc1d089d706ef9853830f3349248ad52267dd365cb0d43acb28af8d4
-MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/python-musicbrainz/metadata.xml b/dev-python/python-musicbrainz/metadata.xml
deleted file mode 100644
index d0913ee5d1cb..000000000000
--- a/dev-python/python-musicbrainz/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="project">
-		<email>sound@gentoo.org</email>
-		<name>Gentoo Sound project</name>
-	</maintainer>
-<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild b/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild
deleted file mode 100644
index a981d645af2c..000000000000
--- a/dev-python/python-musicbrainz/python-musicbrainz-0.7.4-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="${PN}2"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python Bindings for the MusicBrainz XML Web Service"
-HOMEPAGE="http://musicbrainz.org"
-SRC_URI="http://ftp.musicbrainz.org/pub/musicbrainz/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE="doc examples"
-
-RDEPEND="media-libs/libdiscid"
-DEPEND="${RDEPEND}
-	doc? ( dev-python/epydoc )"
-# epydoc is called as a script, so no PYTHON_USEDEP
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generation of documentation"
-		esetup.py docs
-
-		# remove cruft
-		rm -f html/api-objects.txt || die
-		HTML_DOCS=( html/. )
-	fi
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc AUTHORS.txt CHANGES.txt README.txt
-
-	if use examples; then
-		docinto examples
-		dodoc examples/*.{txt,py}
-	fi
-}
diff --git a/dev-python/python-neutronclient/Manifest b/dev-python/python-neutronclient/Manifest
index 6eb4b44fa065..39af42294291 100644
--- a/dev-python/python-neutronclient/Manifest
+++ b/dev-python/python-neutronclient/Manifest
@@ -1,3 +1,5 @@
 DIST python-neutronclient-6.12.0.tar.gz 290025 BLAKE2B f863826a531708fda1b9ddb43f8bfd8f66fbba99ce3fe4afc1135d20fe4718dc7f11789c3e75cf52089690ce0286bf5339c9253d1e7e35916befb52ed905448a SHA512 c7e69e263b37aa14b59b08ecc12f13210e1bd6f10cde10d8b4d5b8b9f912d604e23ff41eed684baf09bb6dc278393a55ca87d6e41e0986235cd3366d321dd85f
+DIST python-neutronclient-6.12.1.tar.gz 290511 BLAKE2B 046de903c30539183c5650e3f666ba1f24c311d0a9848cbc7c79d64f0d35a0c380917453bf7c8251a1099fc13a15da2ecd5facacde26ec46d859510ba4203dff SHA512 cae17fbffb4f0e78aeff07e90a1d08e5f2aaa3221192be8bf66ad8ed108ee01b0307f7a9a862c685061c77ceb831a7eac4c8343a8b5a71d1380277cdddd90b07
 EBUILD python-neutronclient-6.12.0.ebuild 3080 BLAKE2B cdf730cf18c27953d8e12bf491b5c852b6d8b39ae1d0456e987964f64966bb9044f8fd1229070809041587341d805f744a9f0405de4bce467b2b0105a2776674 SHA512 5ccc371f54a932706b5218a9fa3b8e9872f36c5567cf553827d7217f3f52d7ac0ab502987951be7ab9c2bf2406a14905e7843e2261e6c389741aa16b7b60a52f
+EBUILD python-neutronclient-6.12.1.ebuild 3082 BLAKE2B 3fa13a376bf027d460d2144271419914584a6d8ae1e80240b55d9d035a49b21df103d2d5e0a16f3b7cb2d9cbe90b8f3a48d4938cbb727d9dd31bd61a3e90c399 SHA512 43884852cb10fa0075f1493f6f2507b557d719e0ac0aece740de0dd3dd71f0b21b348af3c6fd7d2af0fcf520430764d50d1af4277cd31d7f965f3a7a4e0edf53
 MISC metadata.xml 619 BLAKE2B 441c1d5a2f0b4d0cd6469cf8626e6895fd4dc36dae8db594a2f2364abcd1ea77c9f51f0c85b2deec8ae51a8464eddb00f71c57d2d11558523720caa8fb317dd3 SHA512 d99562185b29417c559143d8fe8102a062dfda0cd7c07f9f01d1c5f11a75eac521e98c9048a23ce74ed34e198ed06bbe2a40990651caf7f9ecfa98975a8fb91f
diff --git a/dev-python/python-neutronclient/python-neutronclient-6.12.1.ebuild b/dev-python/python-neutronclient/python-neutronclient-6.12.1.ebuild
new file mode 100644
index 000000000000..e6783c8e132e
--- /dev/null
+++ b/dev-python/python-neutronclient/python-neutronclient-6.12.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Quantum API"
+HOMEPAGE="https://launchpad.net/neutron"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/mox3-0.20.0[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/openstackdocstheme-1.17.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
+		>=dev-python/osprofiler-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/python-openstackclient-3.12.0[${PYTHON_USEDEP}]
+		>=dev-python/subunit-1.0.0[${PYTHON_USEDEP}]
+		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/cliff-2.8.0[${PYTHON_USEDEP}]
+	!~dev-python/cliff-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/osc-lib-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.18.0[${PYTHON_USEDEP}]
+	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
+	>=dev-python/os-client-config-1.28.0[${PYTHON_USEDEP}]
+	>=dev-python/keystoneauth-3.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/simplejson-3.5.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# built in...
+	sed -i '/^hacking/d' test-requirements.txt || die
+	sed -i '/^flake8-import-order/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	testr init
+	testr run || die "tests failed under python2.7"
+	flake8 neutronclient/tests || die "run by flake8 over tests folder yielded error"
+}
+
+python_install() {
+	distutils-r1_python_install
+	#stupid stupid
+	local SITEDIR="${D}$(python_get_sitedir)" || die
+	cd "${SITEDIR}" || die
+	local egg=( python_neutronclient*.egg-info )
+	#[[ -f ${egg[0]} ]] || die "python_quantumclient*.egg-info not found"
+	ln -s "${egg[0]}" "${egg[0]/neutron/quantum}" || die
+	ln -s neutronclient quantumclient || die
+	ln -s neutron quantumclient/quantum || die
+}
diff --git a/dev-python/python-nss/Manifest b/dev-python/python-nss/Manifest
deleted file mode 100644
index 8319378b7a82..000000000000
--- a/dev-python/python-nss/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-nss-0.16.0.tar.bz2 208535 BLAKE2B 99afa955c56862a10da950ddb638730762f12de47c347128373d2bdfa374af15f8df810433e60ef6200c3e2b296e1c057880d0ee91cb8ade2dea36a0fa4bbfdf SHA512 3ff7d29f10942f4d36be8e223b518e046b5502f15029aa684b925cbd131bbc2041f7860abd50ec1344479b6e5594735cc9b7fcd801d7c4d1025f68e11a57cc3f
-EBUILD python-nss-0.16.0.ebuild 1748 BLAKE2B fca3be894e9536c90f78fb151693e82e83fb6e48a97a262b772744a02470dff2f3c55596b56b0e96ee6586431dff103b3bb6eb48ac26d3c916950e4d02e5a11f SHA512 a9f0eafaba59c27dfc08e02d7cd2a7c460579bc990bc6454a8872e3a314f8decf746cd6d81ed0f12d0ea49cbf4ee0612deaaa8e582702a6c1da105f53a1d7fd3
-MISC metadata.xml 505 BLAKE2B 6dbaf8d336138a9baf33e62ea3ba72073e9bfeeee4862875652bd1c6b4c335f5e014a2c6c3b455e01d62554262110c11eea28133240fa0d13bcfb4aece853a75 SHA512 9b4ae01e2612f9e20b48b279a55b50e98edeca8fd0a22edae789f24e7ac02c31a44986cf281f5acae7d18a443742019011f62151f5eb85ee1de5dd0e22b771b1
diff --git a/dev-python/python-nss/metadata.xml b/dev-python/python-nss/metadata.xml
deleted file mode 100644
index 0a19f527e50a..000000000000
--- a/dev-python/python-nss/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-		<name>Maxim Koltsov</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<longdescription>
-	This package provides Python bindings for Network Security Services (NSS)
-	and the Netscape Portable Runtime (NSPR)
-</longdescription>
-</pkgmetadata>
diff --git a/dev-python/python-nss/python-nss-0.16.0.ebuild b/dev-python/python-nss/python-nss-0.16.0.ebuild
deleted file mode 100644
index 96a715862032..000000000000
--- a/dev-python/python-nss/python-nss-0.16.0.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )	# still only supports py2
-
-inherit distutils-r1 flag-o-matic versionator
-
-MY_PV="$(replace_all_version_separators  '_' )"
-DESCRIPTION="Python bindings for Network Security Services (NSS)"
-HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/Python_binding_for_NSS"
-SRC_URI="ftp://ftp.mozilla.org/pub/mozilla.org/security/${PN}/releases/PYNSS_RELEASE_${MY_PV}/src/${P}.tar.bz2"
-
-LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2 )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-RDEPEND="
-	dev-libs/nspr
-	dev-libs/nss
-"
-DEPEND="${RDEPEND}
-	doc? (
-		dev-python/docutils[${PYTHON_USEDEP}]
-		dev-python/epydoc[${PYTHON_USEDEP}]
-	)"
-
-DOCS="README doc/ChangeLog"
-
-python_prepare_all() {
-	append-cflags -fno-strict-aliasing
-	# Remove test file using a dep, called nss-tools, unavailable in portage
-	rm -f test/test_pkcs12.py || die
-	sed -e '/import test_pkcs12/d' \
-		-e '/suite.addTests(loader.loadTestsFromModule(test_pkcs12))/d' \
-		-i test/run_tests || die
-
-	# exclude tests due to absent shared lib file, libnssckbi.so
-	sed -e 's:test_ocsp_default_responder:_&:' \
-		-i test/test_ocsp.py || die
-	sed -e 's:test_ssl:_&:' \
-		-i test/test_client_server.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		einfo "Generating API documentation..."
-		mkdir doc/html
-		epydoc --html --docformat restructuredtext -o doc/html \
-			"${BUILD_DIR}"/lib/nss
-	fi
-}
-
-python_test() {
-	"${PYTHON}" test/run_tests || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	use examples && local EXAMPLES=( doc/examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/python-poppler/Manifest b/dev-python/python-poppler/Manifest
deleted file mode 100644
index 30fd19e0d9e4..000000000000
--- a/dev-python/python-poppler/Manifest
+++ /dev/null
@@ -1,8 +0,0 @@
-AUX python-poppler-0.12.1-75_74.diff 1814 BLAKE2B fc503bd35f9f0f2384e49b8805b90d2467324efe40950e2363edd4cf04e3383ea49ddf78943e39e4b0f77c2d1571de1765349124e41fd698e71d403d801af277 SHA512 e9882f399f45dd0ce59cac91a36719dc88246abf2fd61736bc1be742796e5dfae85ca51d171388e04fe2f16065f5485f6a91ec16697ab1000904295562cb300f
-AUX python-poppler-0.12.1-79_78.diff 1434 BLAKE2B ab9e7e9209e0252432d2f1b7e7e6b1223c9899726d2047878cb371c3ad5d7ec1077602485acef867199deaa5e28e8fa1d20cc634b57ca8d1e4ea3b5c2499b8a2 SHA512 0951d34b751d95d7d38ccfdc1ac4f788486d202ca4a4663cf7ecb8d7f9e27260b026258ac5b26f8fa021f12ce2a168f83442118ee6c4f8c35d2a925417df55e3
-AUX python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch 1667 BLAKE2B 3c8c28b53111033643da297941a9396964bc268d27b3ea0747fec63825a5e4fd041a9af5db7e0ea7a3af5ea2124a99c963b40fcbbc9ebc557799a2bf7b5893a1 SHA512 4117f99441ff88a1e77892ba959003d6a5540760222d387e9067c4fc99afcd68dae5043ff8827787a3082f9bc62e779c91ea7f09c576ee9bf94af24017f22023
-AUX python-poppler-0.12.1-poppler-0.39.0-changes.patch 542 BLAKE2B 2cadd23024d6b9ba2b247d4ee6c70501113ea24218202bc45d26850d43a5e957cc7ffb86e5672625c3aea3fbed633535a0a5cf53bd1c929347bc7a4707afb74c SHA512 ac38068df3db8dc92c981e9e7c5f7de8c2e4fb47a39977b9bbb8e735a686a2e64a750ccb27158cc97b060d3c878be300b750505094e9cdf3c7e465b2cdfbf39f
-AUX python-poppler-0.12.1-poppler0.15.0-changes.patch 1415 BLAKE2B 8a5a00e1eaa26520935aa166784db400dc708270bb5f56885512373fcd7deed1f3d96fb6277a470e2068a7fe59e772866fe070c4cacd276854108ae270d77e59 SHA512 932cad26447a8f8e03199eb91fa2cf422a91575543ad39066f8850f22e80c8ab8f42568d58975fdc73008ed4b2ca1b64cad1b84a1a9dcdf2414772daaa1e2906
-DIST pypoppler-0.12.1.tar.gz 318142 BLAKE2B 4279ed148cb07269620f7faf117e8c03e3a6b781d727c726c97dc1f48f4332749b267e48aedbfc1935205954e2267228a490661b9c0adbcd299e18fc723101cb SHA512 04055411adc19f6af499a7cba0d6c5abb51e0802dd28962f833da3da1caf6ff274ff67d082f9c47548dac7a4ceb1bccf9860cda71fe48b8b7df74c0132498d20
-EBUILD python-poppler-0.12.1-r4.ebuild 1466 BLAKE2B 4bc36dc7fd6313259f048e17bd9eb5e7f42089f4d39ff87d5abe2396ab90ffeadd72fa4ceedff22627e66b2525d796fa76fb187c086ab8771d06982a70c79f12 SHA512 9f802566ed3a1e554096b0bac402f3a72b84bb4f3369e7b2af6d5cf756b4813a0539121b7455c4d3f7d30ce8f1c13f812366fdc82738db4097fa80ac2796cffa
-MISC metadata.xml 322 BLAKE2B ccbc6df338eceaf75e074ea8c7c9fb8db3bb7b7f945dab4c224be11e2e3871c0ea7bc4cf2b1151a5ca40a20a863613bccb13e32a8cbede30c5210ac1c59a9571 SHA512 7e1f819e4edfb2783ed2acb264c9d1b2e93c400920d8130b76d4a6a3261f5b7a9b6edb010d4358adda1aff55ba6c751ff8b00c741a742fad4d7c129339dd5ac5
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-75_74.diff b/dev-python/python-poppler/files/python-poppler-0.12.1-75_74.diff
deleted file mode 100644
index 47b7a678e3df..000000000000
--- a/dev-python/python-poppler/files/python-poppler-0.12.1-75_74.diff
+++ /dev/null
@@ -1,73 +0,0 @@
---- poppler.defs
-+++ poppler.defs
-@@ -1642,6 +1642,7 @@
-   (of-object "PopplerPage")
-   (c-name "poppler_page_render_to_pixbuf")
-   (return-type "none")
-+  (unblock-threads #t)
-   (parameters
-     '("int" "src_x")
-     '("int" "src_y")
-@@ -1657,6 +1658,7 @@
-   (of-object "PopplerPage")
-   (c-name "poppler_page_render_to_pixbuf_for_printing")
-   (return-type "none")
-+  (unblock-threads #t)
-   (parameters
-     '("int" "src_x")
-     '("int" "src_y")
-@@ -1672,12 +1674,14 @@
-   (of-object "PopplerPage")
-   (c-name "poppler_page_get_thumbnail_pixbuf")
-   (return-type "GdkPixbuf*")
-+  (unblock-threads #t)
- )
- 
- (define-method render_selection_to_pixbuf
-   (of-object "PopplerPage")
-   (c-name "poppler_page_render_selection_to_pixbuf")
-   (return-type "none")
-+  (unblock-threads #t)
-   (parameters
-     '("gdouble" "scale")
-     '("int" "rotation")
-@@ -1694,6 +1698,7 @@
-   (of-object "PopplerPage")
-   (c-name "poppler_page_render")
-   (return-type "none")
-+  (unblock-threads #t)
-   (parameters
-     '("cairo_t*" "cairo")
-   )
-@@ -1703,6 +1708,7 @@
-   (of-object "PopplerPage")
-   (c-name "poppler_page_render_for_printing")
-   (return-type "none")
-+  (unblock-threads #t)
-   (parameters
-     '("cairo_t*" "cairo")
-   )
-@@ -1712,12 +1718,14 @@
-   (of-object "PopplerPage")
-   (c-name "poppler_page_get_thumbnail")
-   (return-type "cairo_surface_t*")
-+  (unblock-threads #t)
- )
- 
- (define-method render_selection
-   (of-object "PopplerPage")
-   (c-name "poppler_page_render_selection")
-   (return-type "none")
-+  (unblock-threads #t)
-   (parameters
-     '("cairo_t*" "cairo")
-     '("PopplerRectangle*" "selection")
-@@ -1779,6 +1787,7 @@
-   (of-object "PopplerPage")
-   (c-name "poppler_page_render_to_ps")
-   (return-type "none")
-+  (unblock-threads #t)
-   (parameters
-     '("PopplerPSFile*" "ps_file")
-   )
-
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-79_78.diff b/dev-python/python-poppler/files/python-poppler-0.12.1-79_78.diff
deleted file mode 100644
index 161ec588e178..000000000000
--- a/dev-python/python-poppler/files/python-poppler-0.12.1-79_78.diff
+++ /dev/null
@@ -1,52 +0,0 @@
---- poppler.override
-+++ poppler.override
-@@ -266,6 +266,12 @@
- import gobject.GObject as PyGObject_Type
- import gtk.gdk.Pixbuf as PyGdkPixbuf_Type
- %%
-+ignore
-+poppler_page_free_link_mapping
-+poppler_page_free_image_mapping
-+poppler_page_free_form_field_mapping
-+poppler_page_free_annot_mapping
-+%%
- ignore-glob
-   *_get_type
-   _*
-@@ -359,7 +365,7 @@
- 
-     item_list = poppler_page_get_link_mapping(POPPLER_PAGE(self->obj));
-     ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_LINK_MAPPING);
--    g_list_free(item_list);
-+    poppler_page_free_link_mapping(item_list);
-     return ret;
- }
- %%
-@@ -372,7 +378,7 @@
- 
-     item_list = poppler_page_get_image_mapping(POPPLER_PAGE(self->obj));
-     ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_IMAGE_MAPPING);
--    g_list_free(item_list);
-+    poppler_page_free_image_mapping(item_list);
-     return ret;
- }
- %%
-@@ -385,7 +391,7 @@
- 
-     item_list = poppler_page_get_form_field_mapping(POPPLER_PAGE(self->obj));
-     ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_FORM_FIELD_MAPPING);
--    g_list_free(item_list);
-+    poppler_page_free_form_field_mapping(item_list);
-     return ret;
- }
- %%
-@@ -398,7 +404,7 @@
- 
-     item_list = poppler_page_get_annot_mapping(POPPLER_PAGE(self->obj));
-     ret = _glist_to_pylist_boxed(item_list, POPPLER_TYPE_ANNOT_MAPPING);
--    g_list_free(item_list);
-+    poppler_page_free_annot_mapping(item_list);
-     return ret;
- }
- %%
-
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch
deleted file mode 100644
index 2099e0af11f8..000000000000
--- a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.18.0-minimal-fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
---- pypoppler-0.12.1/poppler.defs	2011-10-24 11:57:35.000000000 +0200
-+++ pypoppler-0.12.1/poppler.defs	2011-10-24 12:01:28.000000000 +0200
-@@ -1646,62 +1646,6 @@
-   (return-type "GType")
- )
- 
--(define-method render_to_pixbuf
--  (of-object "PopplerPage")
--  (c-name "poppler_page_render_to_pixbuf")
--  (return-type "none")
--  (unblock-threads #t)
--  (parameters
--    '("int" "src_x")
--    '("int" "src_y")
--    '("int" "src_width")
--    '("int" "src_height")
--    '("double" "scale")
--    '("int" "rotation")
--    '("GdkPixbuf*" "pixbuf")
--  )
--)
--
--(define-method render_to_pixbuf_for_printing
--  (of-object "PopplerPage")
--  (c-name "poppler_page_render_to_pixbuf_for_printing")
--  (return-type "none")
--  (unblock-threads #t)
--  (parameters
--    '("int" "src_x")
--    '("int" "src_y")
--    '("int" "src_width")
--    '("int" "src_height")
--    '("double" "scale")
--    '("int" "rotation")
--    '("GdkPixbuf*" "pixbuf")
--  )
--)
--
--(define-method get_thumbnail_pixbuf
--  (of-object "PopplerPage")
--  (c-name "poppler_page_get_thumbnail_pixbuf")
--  (return-type "GdkPixbuf*")
--  (unblock-threads #t)
--)
--
--(define-method render_selection_to_pixbuf
--  (of-object "PopplerPage")
--  (c-name "poppler_page_render_selection_to_pixbuf")
--  (return-type "none")
--  (unblock-threads #t)
--  (parameters
--    '("gdouble" "scale")
--    '("int" "rotation")
--    '("GdkPixbuf*" "pixbuf")
--    '("PopplerRectangle*" "selection")
--    '("PopplerRectangle*" "old_selection")
--    '("PopplerSelectionStyle" "style")
--    '("GdkColor*" "glyph_color")
--    '("GdkColor*" "background_color")
--  )
--)
--
- (define-method render
-   (of-object "PopplerPage")
-   (c-name "poppler_page_render")
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch
deleted file mode 100644
index dd3ee52ad46d..000000000000
--- a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler-0.39.0-changes.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- poppler.defs	2009-09-27 16:07:59.000000000 +0700
-+++ poppler.defs	2015-12-22 16:36:14.000000000 +0600
-@@ -579,16 +579,4 @@
- )
- 
--(define-enum Orientation
--  (in-module "Poppler")
--  (c-name "PopplerOrientation")
--  (gtype-id "POPPLER_TYPE_ORIENTATION")
--  (values
--    '("portrait" "POPPLER_ORIENTATION_PORTRAIT")
--    '("landscape" "POPPLER_ORIENTATION_LANDSCAPE")
--    '("upsidedown" "POPPLER_ORIENTATION_UPSIDEDOWN")
--    '("seascape" "POPPLER_ORIENTATION_SEASCAPE")
--  )
--)
--
- (define-enum PageTransitionType
-   (in-module "Poppler")
diff --git a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler0.15.0-changes.patch b/dev-python/python-poppler/files/python-poppler-0.12.1-poppler0.15.0-changes.patch
deleted file mode 100644
index a480cfa437a8..000000000000
--- a/dev-python/python-poppler/files/python-poppler-0.12.1-poppler0.15.0-changes.patch
+++ /dev/null
@@ -1,66 +0,0 @@
---- poppler.defs
-+++ poppler.defs
-@@ -1760,6 +1760,12 @@
-   (return-type "int")
- )
- 
-+(define-method get_label
-+  (of-object "PopplerPage")
-+  (c-name "poppler_page_get_label")
-+  (return-type "gchar*")
-+)
-+
- (define-method get_duration
-   (of-object "PopplerPage")
-   (c-name "poppler_page_get_duration")
-@@ -1805,9 +1811,15 @@
-   (of-object "PopplerPage")
-   (c-name "poppler_page_get_text")
-   (return-type "char*")
-+)
-+
-+(define-method get_selected_text
-+  (of-object "PopplerPage")
-+  (c-name "poppler_page_get_selected_text")
-+  (return-type "char*")
-   (parameters
-     '("PopplerSelectionStyle" "style")
--    '("PopplerRectangle*" "rect")
-+    '("PopplerRectangle*" "selection")
-   )
- )
- 
-@@ -1895,6 +1907,16 @@
-   )
- )
- 
-+(define-function poppler_page_add_annot
-+  (of-object "PopplerPage")
-+  (c-name "poppler_page_add_annot")
-+  (return-type "none")
-+  (parameters
-+    '("PopplerAnnot*" "annot")
-+    '("GList*" "list")
-+  )
-+)
-+
- (define-method get_crop_box
-   (of-object "PopplerPage")
-   (c-name "poppler_page_get_crop_box")
-@@ -1904,6 +1926,16 @@
-   )
- )
- 
-+(define-method get_text_layout
-+  (of-object "PopplerPage")
-+  (c-name "poppler_page_get_text_layout")
-+  (return-type "gboolean")
-+  (parameters
-+    '("PopplerRectangle**" "rectangles")
-+    '("guint*" "n_rectangles")
-+  )
-+)
-+
- (define-function poppler_rectangle_get_type
-   (c-name "poppler_rectangle_get_type")
-   (return-type "GType")
diff --git a/dev-python/python-poppler/metadata.xml b/dev-python/python-poppler/metadata.xml
deleted file mode 100644
index b062753424c8..000000000000
--- a/dev-python/python-poppler/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="launchpad">poppler-python</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild b/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
deleted file mode 100644
index 1584fde7bbe8..000000000000
--- a/dev-python/python-poppler/python-poppler-0.12.1-r4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools-utils eutils ltprune python-r1
-
-DESCRIPTION="Python bindings to the Poppler PDF library"
-HOMEPAGE="https://launchpad.net/poppler-python"
-SRC_URI="https://launchpad.net/poppler-python/trunk/development/+download/pypoppler-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S=${WORKDIR}/pypoppler-${PV}
-
-RDEPEND="${PYTHON_DEPS}
-	>=app-text/poppler-0.15.0[cairo]
-	>=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/pygtk:2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-# http://pkgs.fedoraproject.org/gitweb/?p=pypoppler.git;a=tree
-PATCHES=(
-	"${FILESDIR}"/${P}-75_74.diff
-	"${FILESDIR}"/${P}-79_78.diff
-	"${FILESDIR}"/${P}-poppler0.15.0-changes.patch
-	"${FILESDIR}"/${P}-poppler-0.18.0-minimal-fix.patch
-	"${FILESDIR}"/${P}-poppler-0.39.0-changes.patch
-)
-
-src_configure() {
-	python_foreach_impl autotools-utils_src_configure
-}
-
-src_compile() {
-	python_foreach_impl autotools-utils_src_compile
-}
-
-src_test() {
-	python_foreach_impl autotools-utils_src_test
-}
-
-src_install() {
-	python_foreach_impl autotools-utils_src_install
-	prune_libtool_files --modules
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}/examples
-		doins demo/demo-poppler.py
-	fi
-}
diff --git a/dev-python/python-recaptcha/Manifest b/dev-python/python-recaptcha/Manifest
deleted file mode 100644
index c16a5134f01a..000000000000
--- a/dev-python/python-recaptcha/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-recaptcha-2.0.1.tar.gz 5439 BLAKE2B e985affe7d008f0dda270c9251315cbe381fc2a72514a219f422a1405c41e3d621326cfa32285588d4b5785c0e21251370546847695815b77ede81812d8eddad SHA512 103c0cf65d67fe3e4d4ca5bb0a208ea221642b1a6c11ad1997e3f1cfa56360c81665fc593354f6ea776deea43cbf72c97f3376e2b77fc275332cddee8b3a9739
-EBUILD python-recaptcha-2.0.1-r1.ebuild 655 BLAKE2B 86ae7e1ac9ae8ef8859dc4e67b397d1b39ba245f0c7aab2ce629ecb8279e67a93d971e79d79b7396cb1c5d9e014d76f657085bd70c90e5d8f31da7e2acd7099f SHA512 8d90b07d3e06c193f59905cd81fa4776df43e4e60f1a3fe3e5459bf2d6b101df0dccce1245b6988db95991d8d6d6b5e22f4cb32ba11354d9cb867631d3ee26b2
-MISC metadata.xml 320 BLAKE2B 09f14b8fe8d79184aac3c0f51099c9875e9c92accc720bfa6252fbceb59ddcdbebc62b8e00a842d4bd3378165327dd96200b805667c18df1725510c4a3db2ca8 SHA512 f8025b47914eff959d322d87070e00597b839a84a0b2d052cc172c34451450fb232a9a5cf4781c6e570ff5fa13c8b29fd9eefb2ffac7147720aa8885f48c4c6b
diff --git a/dev-python/python-recaptcha/metadata.xml b/dev-python/python-recaptcha/metadata.xml
deleted file mode 100644
index 9f3dd846fbed..000000000000
--- a/dev-python/python-recaptcha/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 type="person">
-    <email>hanno@gentoo.org</email>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">redhat-infosec/python-recaptcha</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-recaptcha/python-recaptcha-2.0.1-r1.ebuild b/dev-python/python-recaptcha/python-recaptcha-2.0.1-r1.ebuild
deleted file mode 100644
index ab63a2563b07..000000000000
--- a/dev-python/python-recaptcha/python-recaptcha-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A plugin for reCAPTCHA and reCAPTCHA Mailhide"
-HOMEPAGE="https://github.com/redhat-infosec/python-recaptcha"
-SRC_URI="https://github.com/redhat-infosec/python-recaptcha/releases/download/v${PV}/${P}.tar.gz"
-KEYWORDS="~amd64"
-
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="|| ( dev-python/pycryptodome[${PYTHON_USEDEP}] dev-python/pycrypto[${PYTHON_USEDEP}] )
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	!dev-python/recaptcha-client"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-scw/Manifest b/dev-python/python-scw/Manifest
deleted file mode 100644
index f5f6bae3f11e..000000000000
--- a/dev-python/python-scw/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-scw-0.4.7.tar.gz 337703 BLAKE2B eedd3c3650946b30fbc044d9cc295e2ec5a7a700e1e1b24b669200318bc40ec0099a2dd0078b12d46ef7d3e9d0594cdb7f77811ef2a4cc8fb7889c8e228a0c37 SHA512 c731527ed1c3372440a428335f2f318307c970b6ee4a09af9c4eeaf89e681a335130ed855a3bb239bf5f44bfee1f0772d3f19afd07c7bbc180c586646fdd9a07
-EBUILD python-scw-0.4.7-r1.ebuild 522 BLAKE2B f1a5f08a3684e42bf7d361c5ee2fa46f7a36f6cefd9f99b106cf69b6ee45077ab9199ccbcd11e2910fc6f6f1e9c94c445d01a1908554967db4353d377568fd11 SHA512 b2af6a3c316b459480d74b9669c308d0fc93a50aeff4498e1caf98d2cb072e998052bfb282fb518a72d465daad218800d9d722e0e2bea5460db23c8dd5780059
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/python-scw/metadata.xml b/dev-python/python-scw/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/python-scw/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/python-scw/python-scw-0.4.7-r1.ebuild b/dev-python/python-scw/python-scw-0.4.7-r1.ebuild
deleted file mode 100644
index ed30a025fd78..000000000000
--- a/dev-python/python-scw/python-scw-0.4.7-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Python binding for Scw"
-HOMEPAGE="https://sites.google.com/site/scwwidgets/"
-SRC_URI="https://sites.google.com/site/scwwidgets/${P}.tar.gz "
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	>=dev-python/pygtk-2.4[${PYTHON_USEDEP}]
-	>=x11-libs/scw-0.4.0"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/python-tvrage/Manifest b/dev-python/python-tvrage/Manifest
deleted file mode 100644
index ccc55c5ddac7..000000000000
--- a/dev-python/python-tvrage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-tvrage-0.4.1.tar.gz 10646 BLAKE2B a2d48fd8042fb7d59ca5401eb200e4936e1764e84404c2db20131cc5b7b8c144bb9c3d06a08662954360e78a3177b193a8128b69a115b2e7c91af2561b4ef262 SHA512 cabee676e85206b8c052b79b0f5fd039719ede104607795fe8d1947f2fd810fd9fd08ba8c6e94d1fa68dd5e51060e10fb9c12349f21b752242f7eae2b4771009
-EBUILD python-tvrage-0.4.1.ebuild 566 BLAKE2B 5a6547ffad4668f605c7b1f1ffba448a3de24c6265497b7ab70066b574d131859dec63ba0650d5e5fe6dbf01f37ffdafa0bcdb3c107e8a428286ca14ebd679c7 SHA512 e74e9682ff8d4eccddcd25a431a39f2acfc223f9bda5235d02429b85334249fcbd270f31dff21096a6e5d0693857c33804592a8ad1c88b18e3879e4bf630cd23
-MISC metadata.xml 391 BLAKE2B 35dc04efa7f2405a58e1aeba8f4cfb11da9e5b51e524644424aae4325343fbec02b5a7e32c646663dedf3fb16b5a068b41e2421e2be40f86b2cc51a1b3b87c93 SHA512 1cae776c246c2337ef4f117db05bc36b5ec362be64a43e1ba1046c0d94d8da7962d58ba5c72ae376774376638cd1fef1a18eba2fdb77b298ef4c64622f605e33
diff --git a/dev-python/python-tvrage/metadata.xml b/dev-python/python-tvrage/metadata.xml
deleted file mode 100644
index 9f173cf4616f..000000000000
--- a/dev-python/python-tvrage/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="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">python-tvrage</remote-id>
-    <remote-id type="github">ckreutzer/python-tvrage</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild b/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild
deleted file mode 100644
index 1d2ec3e7dc67..000000000000
--- a/dev-python/python-tvrage/python-tvrage-0.4.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="Python client for the tvrage.com XML API"
-HOMEPAGE="https://github.com/ckreutzer/python-tvrage"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_test() {
-	"${PYTHON}" tests/api_tests.py || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-python/python-xmlsec/Manifest b/dev-python/python-xmlsec/Manifest
new file mode 100644
index 000000000000..91d89da69777
--- /dev/null
+++ b/dev-python/python-xmlsec/Manifest
@@ -0,0 +1,3 @@
+DIST python-xmlsec-1.3.6.tar.gz 51174 BLAKE2B e6571d16268450c5e144aae8da5be42a6aa20f239859c0a5a85f5e20f361d5d85b85772cd5cdd296f2fb9da5f3dffbb869d537bd96fe68b7d4495bb378471d07 SHA512 ccfbe4c8266a5340f67331eac35174ae2cc175ce32ea8482c8b9757275466f058a5977ce62f39bce3c3abeda28988455c93302362c7f219d7b88b44ef245e972
+EBUILD python-xmlsec-1.3.6.ebuild 741 BLAKE2B 077da2efb037b9071874c4b2d61e851f72ba8185432d5e2dc7deee5f02445e956292e69e394bfc3bd3587e51a65a8580a33a61bd00125ead9d7ccb0380e3ef35 SHA512 ed4ebad1def01f14118df2326f8a220403467ec4aabe7b5d743dc5043a625fe1bc6ce2edef86fb164a8e80f72fd62182b372fdf9ed6719819442c4f79853ad56
+MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/pSQL/metadata.xml b/dev-python/python-xmlsec/metadata.xml
index e24dd86faa2a..56cae167d372 100644
--- a/dev-python/pSQL/metadata.xml
+++ b/dev-python/python-xmlsec/metadata.xml
@@ -1,8 +1,8 @@
 <?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 type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
   </maintainer>
 </pkgmetadata>
diff --git a/dev-python/python-xmlsec/python-xmlsec-1.3.6.ebuild b/dev-python/python-xmlsec/python-xmlsec-1.3.6.ebuild
new file mode 100644
index 000000000000..1604a70c861b
--- /dev/null
+++ b/dev-python/python-xmlsec/python-xmlsec-1.3.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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 bindings for the XML Security Library"
+HOMEPAGE="https://github.com/mehcode/python-xmlsec"
+SRC_URI="https://github.com/mehcode/python-xmlsec/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	dev-libs/xmlsec:=
+"
+RDEPEND="${DEPEND}
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	dev-python/pkgconfig[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+"
+
+# tests fail, has been reported upstream
+# https://github.com/mehcode/python-xmlsec/issues/84
+RESTRICT=test
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-yadis/Manifest b/dev-python/python-yadis/Manifest
deleted file mode 100644
index 7b0f042b2b33..000000000000
--- a/dev-python/python-yadis/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX python-yadis-1.1.0-gentoo-test.patch 3153 BLAKE2B e19df48735fcdc9cd163fb8c49ee376e445915f92d02d004356af79543b5f0895b8bfac7a01d563975ca9c12e44840a6256f4113d234130581fed6f00b83f62a SHA512 fda698114472b569031a2d9c6fe2c85d856f9fa7b1118aefb282bda10dc53f20727581f3b9a1fb535cec535cae2b3253c851de7d64ad0e0ce60cbfabf1df9186
-DIST python-yadis-1.1.0.tar.gz 192569 BLAKE2B 2d2f16779bf7f53069f0b2450cece681acc01475ce0688d10cf90c213c863d99713253f605d77cd9978cf51abc859133bf5ac5cbbf547b25b1ea0013241a68cb SHA512 955efbcd13f02c8e112e0f5dfd4ad8a7fb56e0d5d55a2c409ed044f4ac99d5496b9d641916a7af1ddc18628d83cef1f3907d787afd468ceb7573ec192de1e02f
-EBUILD python-yadis-1.1.0-r2.ebuild 838 BLAKE2B b3af4fb58f14107e597a1f527ce8ca4501e87cb4605dbf354c742ff66b9258fe3fd88d6933e47199ed4f32bfcc274630bb76244f8a4a648e800d51d217789f02 SHA512 c125938ebc5a757c9729641a834a729c6bb60e32dc6ce173ceaed4144189e000449fa3d5c9f80f29fefe8c8d58fcec23a094720f2f59491804af731f451a3d5a
-MISC metadata.xml 308 BLAKE2B d98cf54d35a62aaafcadc116d5f46816311c7d32b0bed219e4b57e44bebed1ea344cb90e77b8b52eb573663d5942c8a2e0699eed5c5f2691d7bfe946ebcbf3ac SHA512 c4cc94efed57dfcce6e258fb46a67b2c49d7575b7cd17da7b95b04451d2180241ec34fa697514bc1f65f2fa5c9de5e841d3ae24ffd4f7e62de37e7c5d7c002a2
diff --git a/dev-python/python-yadis/files/python-yadis-1.1.0-gentoo-test.patch b/dev-python/python-yadis/files/python-yadis-1.1.0-gentoo-test.patch
deleted file mode 100644
index ae6a06c9012c..000000000000
--- a/dev-python/python-yadis/files/python-yadis-1.1.0-gentoo-test.patch
+++ /dev/null
@@ -1,82 +0,0 @@
---- admin/runtests.orig	2007-05-31 11:30:01.000000000 -0700
-+++ admin/runtests	2007-05-31 11:31:26.000000000 -0700
-@@ -1,7 +1,6 @@
- #!/bin/bash
- 
--ADMINDIR=$(dirname $0)
--YDIR=${ADMINDIR}/..
-+YDIR='.'
- 
- declare -i errorcode=0
- 
-@@ -17,13 +16,6 @@
-     echo 'Install pyflakes. http://divmod.org/trac/wiki/DivmodPyflakes'
- fi
- 
--if [[ $1 != "darcs" ]] ; then
--    echo 'Checking docs... '
--    if ! ${ADMINDIR}/epyrun check; then
--        # Who knows?  Epydoc --check doesn't modify the return code.
--        errorcode=$errorcode+2
--    fi
--fi
- 
- echo -n 'Running tests... '
- if ! python ${YDIR}/yadis/test/runtests ; then
-diff -ur python-yadis-1.1.0.orig/yadis/test/test_xri.py python-yadis-1.1.0/yadis/test/test_xri.py
---- yadis/test/test_xri.py	2006-12-09 06:17:12.000000000 +0900
-+++ yadis/test/test_xri.py	2011-11-16 22:03:07.254992928 +0800
-@@ -44,11 +44,6 @@
-             s = u'l\xa1m'
-             expected = 'l%C2%A1m'
-             self.failUnlessEqual(xri.iriToURI(s), expected)
--    else:
--        def test_iri_to_url(self):
--            s = u'l\xa1m\U00101010n'
--            expected = 'l%C2%A1m%F4%81%80%90n'
--            self.failUnlessEqual(xri.iriToURI(s), expected)
- 
- 
-
-diff -ur /mnt/gen2/tmpdir/portage/dev-python/python-yadis-1.1.0/work/python-yadis-1.1.0.orig/yadis/etxrd.py /mnt/gen2/tmpdir/portage/dev-python/python-yadis-1.1.0/work/python-yadis-1.1.0/yadis/etxrd.py
---- yadis/etxrd.py	2006-12-09 06:17:12.000000000 +0900
-+++ yadis/etxrd.py	2011-11-16 22:26:21.386992510 +0800
-@@ -22,12 +22,8 @@
- from elementtree.ElementTree import ElementTree
- 
- # Use expat if it's present. Otherwise, use xmllib
--try:
--    from xml.parsers.expat import ExpatError as XMLError
--    from elementtree.ElementTree import XMLTreeBuilder
--except ImportError:
--    from elementtree.SimpleXMLTreeBuilder import TreeBuilder as XMLTreeBuilder
--    from xmllib import Error as XMLError
-+from elementtree.SimpleXMLTreeBuilder import TreeBuilder as XMLTreeBuilder
-+from xmllib import Error as XMLError
- 
- from yadis import xri
- 
-diff -ur /mnt/gen2/tmpdir/portage/dev-python/python-yadis-1.1.0/work/python-yadis-1.1.0.orig/yadis/test/test_etxrd.py /mnt/gen2/tmpdir/portage/dev-python/python-yadis-1.1.0/work/python-yadis-1.1.0/yadis/test/test_etxrd.py
---- yadis/test/test_etxrd.py	2006-12-09 06:17:12.000000000 +0900
-+++ yadis/test/test_etxrd.py	2011-11-16 22:29:00.896992462 +0800
-@@ -40,9 +40,6 @@
-     def _getServices(self, flt=None):
-         return list(services.applyFilter(self.yadis_url, self.xmldoc, flt))
- 
--    def testParse(self):
--        """Make sure that parsing succeeds at all"""
--        services = self._getServices()
- 
-     def testParseOpenID(self):
-         """Parse for OpenID services with a transformer function"""
-diff -ur python-yadis-1.1.0.orig/yadis/test/test_parsehtml.py python-yadis-1.1.0/yadis/test/test_parsehtml.py
---- yadis/test/test_parsehtml.py	2006-12-09 06:17:12.000000000 +0900
-+++ yadis/test/test_parsehtml.py	2012-11-08 20:42:34.248733469 +0800
-@@ -3,6 +3,7 @@
- 
- import os.path, unittest, sys
- 
-+@unittest.skip("Recently broken test")
- class _TestCase(unittest.TestCase):
-     reserved_values = ['None', 'EOF']
- 
diff --git a/dev-python/python-yadis/metadata.xml b/dev-python/python-yadis/metadata.xml
deleted file mode 100644
index 85d4aef0b6da..000000000000
--- a/dev-python/python-yadis/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>
-	<longdescription>Yadis service discovery library</longdescription>
-</pkgmetadata>
diff --git a/dev-python/python-yadis/python-yadis-1.1.0-r2.ebuild b/dev-python/python-yadis/python-yadis-1.1.0-r2.ebuild
deleted file mode 100644
index 571bae4a83f7..000000000000
--- a/dev-python/python-yadis/python-yadis-1.1.0-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Yadis service discovery library"
-HOMEPAGE="http://www.openidenabled.com/yadis/libraries/python/"
-SRC_URI="http://www.openidenabled.com/resources/downloads/python-openid/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-RDEPEND="dev-python/elementtree[${PYTHON_USEDEP}]
-	dev-python/python-urljr[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( >=dev-python/pyflakes-0.2.1[${PYTHON_USEDEP}] )"
-
-# Fix broken test
-PATCHES=( "${FILESDIR}/${P}-gentoo-test.patch" )
-
-# Tests are broken.
-RESTRICT='test'
-
-python_test() {
-	./admin/runtests
-	einfo "The pyflake output about XML* redefinitions can be safely ignored"
-}
diff --git a/dev-python/python3-saml/Manifest b/dev-python/python3-saml/Manifest
new file mode 100644
index 000000000000..6428c7a813a0
--- /dev/null
+++ b/dev-python/python3-saml/Manifest
@@ -0,0 +1,3 @@
+DIST python3-saml-1.9.0.tar.gz 497106 BLAKE2B c3b282be835dcd0590125563ed0380bbb5d486aeffd60fa0d6a1e7d22b25ffaa03a1bea555520b1465b27b352df0936d21b919ce73a3671d63f07a52b3efdb37 SHA512 a5171258b917c02f10a0c420a19fe6829a034df1dfd87135351b9c187314dca2f973012f49056f391444aba76306adfd48cd77a859274d5cbd2a8c23a00af78d
+EBUILD python3-saml-1.9.0.ebuild 737 BLAKE2B dfe2a322187209c39ded3053130418f2ee03830239c33aa82838e755caa1318881b8ba93071921284380761e672f38a54390a7652c8b6ba06f112a13189be5a7 SHA512 a62859afaaa19b10c09f045e47655deb57ab7ecd11fc0fc39770893bf0b78df9019cc41fea4d85e6afae92bb12544e58cb7b492c45dba82014ed3bae2c73d291
+MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/pythong/metadata.xml b/dev-python/python3-saml/metadata.xml
index e24dd86faa2a..56cae167d372 100644
--- a/dev-python/pythong/metadata.xml
+++ b/dev-python/python3-saml/metadata.xml
@@ -1,8 +1,8 @@
 <?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 type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
   </maintainer>
 </pkgmetadata>
diff --git a/dev-python/python3-saml/python3-saml-1.9.0.ebuild b/dev-python/python3-saml/python3-saml-1.9.0.ebuild
new file mode 100644
index 000000000000..dfaa71d04c5a
--- /dev/null
+++ b/dev-python/python3-saml/python3-saml-1.9.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 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="OneLogin's SAML Python Toolkit"
+HOMEPAGE="https://github.com/onelogin/python3-saml
+	https://pypi.org/project/python3-saml/"
+SRC_URI="https://github.com/onelogin/python3-saml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/python-xmlsec[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="${CDEPEND}"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pythong/Manifest b/dev-python/pythong/Manifest
deleted file mode 100644
index 5a98660cc315..000000000000
--- a/dev-python/pythong/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST python.pdf 2547987 BLAKE2B 2f8d6baf3d94fd4072d2c482e934bbe168269d48e5ff7ea35c61c29b826269388e75669fb8f3fff0cbf1d113f84cf0c547ec21bad032ddba6ead06a4b473a3ed SHA512 9d16eb39ff5996be70aa41cb758e73adf1fa72a7e83613626cf6f519def99fd30169a87b1e918902e1aecfb75d925cb7e49d9ad5733dd5274b9a351adaaf201e
-DIST pythonG-2_1_5.tgz 397754 BLAKE2B 88480558274384cf8cac8c9423949b80ac5c022b3e404af4cc732efb8393c27b2f6957fcb630ba7d5455bb15d508117516e02ed4fc1c6c20326abf19768ebbcb SHA512 8a8c3ada425a1d7a0565e495494a8edfcf8b4224cb93ea843669e4d0b2ca9e122d038c728ff8242885e0b320caa6db8ef8f721f99c423b7a8f87a83a4e6f51c6
-EBUILD pythong-2.1.5-r3.ebuild 1280 BLAKE2B 7f6f0d2b73bd76ce9af0c4a13c726bf084f79f152bb4e0a951896a6414f2e81398a344d1cfdb1615a487e5eec3cca081a693ff38241e59df991794df728f0233 SHA512 5a651577b178525f4ca3a87c51ae52a58e9b2af5f8d21ce9edc33062fb4976c735ed28211b7d3728d5cb1e9a500dca3e81baf649c8b5ea8b919ff1991987d67d
-MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pythong/pythong-2.1.5-r3.ebuild b/dev-python/pythong/pythong-2.1.5-r3.ebuild
deleted file mode 100644
index 3e649b8f4557..000000000000
--- a/dev-python/pythong/pythong-2.1.5-r3.ebuild
+++ /dev/null
@@ -1,55 +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 python-single-r1
-
-MY_PN="pythonG"
-MY_PV=${PV/_/-}
-MY_PV=${MY_PV//\./_}
-
-DESCRIPTION="Nice and powerful spanish development environment for Python"
-HOMEPAGE="http://www3.uji.es/~dllorens/PythonG/principal.html"
-SRC_URI="
-	http://www3.uji.es/~dllorens/downloads/pythong/linux/${MY_PN}-${MY_PV}.tgz
-	doc? ( http://marmota.act.uji.es/MTP/pdf/python.pdf )"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ia64 x86"
-SLOT="0"
-IUSE="doc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-lang/tk-8.3.4:0=
-	$(python_gen_cond_dep '
-		dev-python/pmw:py2[${PYTHON_MULTI_USEDEP}]
-	')"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_prepare() {
-	sed \
-		-e "s:^\(fullpath = \).*:\1'$(python_get_sitedir)':" \
-		-e "/^url_docFuncPG/s:'+fullpath+':/usr/share/doc/${PF}:" \
-		-i pythong.py || die "sed in pythong.py failed"
-}
-
-src_install() {
-	python_domodule modulepythong.py libpythong
-	python_doscript pythong.py
-
-	dodoc leeme.txt
-	dodoc -r {LICENCIA,MANUAL,demos}
-	rm -fr "${ED}/usr/share/doc/${PF}/demos/modulepythong.py" || die
-
-	if use doc; then
-		dodoc "${DISTDIR}"/python.pdf
-	fi
-	python_optimize
-}
diff --git a/dev-python/pyutil/Manifest b/dev-python/pyutil/Manifest
deleted file mode 100644
index d3c1327e7c32..000000000000
--- a/dev-python/pyutil/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyutil-2.0.0.tar.gz 125079 BLAKE2B cac7ce94671dbb2b4070aac76da2d9f8b3a48640a2422e8f9fd0dbd6a61eee43636b9b8a003ee3c528ffa7e866baf0254c4a2369ba8038c63aa072e2df9556ac SHA512 3704c028fdc3894ae635dabd2bace1af1e805f4158dc6d67eac0c38fa8e7959cd093ad39cb2f539e59dd74e957947464cc8c7aed727835e127311062ed27e60b
-EBUILD pyutil-2.0.0-r1.ebuild 685 BLAKE2B df03ebdc4fe510006fddee5ea968ab475d63fbc23ef711ca2c15a9b7fb0e022cb573a9b7a67166c85622cb2eb26e9d0aea6c17e6b837d9712bc252c99e5e5a4d SHA512 00c693b035f2e0b35871e428f88f20c741693561a2a9dff4a7695d36d6f899452c1bf824a7ca78956c309e778453562c4a6534e69171f37395241eab71e62dd2
-MISC metadata.xml 744 BLAKE2B 92a7150e6ded208271a22f52fcee0d6402006ee4a71e97236652485aace07d35eaeb4094e6ab9ed6ae197fa91d4f5f6236f4e591ffb1ee3270e22bbbfce1e641 SHA512 a23c7e3e981737b2a5952cf4ae5fb5017e68c68ded1d2e2dc534cfe630aa95dbe8b32c6fc784cb2a5744d66e91131f97a5c201029df04122cb1ac230a0bd0746
diff --git a/dev-python/pyutil/metadata.xml b/dev-python/pyutil/metadata.xml
deleted file mode 100644
index 5d4021ab5e7d..000000000000
--- a/dev-python/pyutil/metadata.xml
+++ /dev/null
@@ -1,22 +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">
-		pyutil -- a library of useful Python functions and classes
-		==========================================================
-
-		Many of these utilities (or their ancestors) were developed for
-		the Mojo
-		Nation, Mnet, Allmydata.com "Mountain View", Tahoe-LAFS, or
-		SimpleGeo's
-		products.  (In the case where the code was developed for a
-		for-profit
-		company, the copyright holder donated the pyutil code to the
-		public under
-		these open source licences.)
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">pyutil</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyutil/pyutil-2.0.0-r1.ebuild b/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
deleted file mode 100644
index 1e1608682b1b..000000000000
--- a/dev-python/pyutil/pyutil-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="A collection of utilities for Python programmers"
-HOMEPAGE="https://tahoe-lafs.org/trac/pyutil https://pypi.org/project/pyutil/"
-SRC_URI="mirror://pypi/p/pyutil/pyutil-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/simplejson[${PYTHON_USEDEP}]
-	|| ( dev-python/twisted[${PYTHON_USEDEP}] dev-python/twisted-core[${PYTHON_USEDEP}] )
-"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	rm -rf "${ED}"/usr/share/doc/${PN}
-}
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index b72bf1c38962..4512a48481a7 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -8,5 +8,5 @@ EBUILD pyyaml-3.12.ebuild 1038 BLAKE2B 24c55fde60111c5e55b37ff88443c03910d15dc18
 EBUILD pyyaml-3.13.ebuild 1042 BLAKE2B 8b199cbe733740a43ea2f14896aba490b35a9b3598bbe0261d3f7c6a599b041618b0c69834dc07282decbab583f00299814d13616e4efd4db5db0e6979df3989 SHA512 63d1df5910ea8c9cc9b8b43a3f8bc1ba1492fd4be069b0ee8f2cb0967cb00480e424dd0685d2f3bd8bd70f41bd481aa8c81dc03b8ff83bd431a4b299f8cd04d3
 EBUILD pyyaml-5.1.2.ebuild 1186 BLAKE2B f17711b03f88e4e2523dcd69df0da08bb9e956a76574ef7e3b62984d3b6b44a76b8e72b35d323c6d4bc2b9331d54951e1d411342aa6edeed070f239f8c2095ca SHA512 fa0350c39f5a4b4bc3474df58f7698a956b04eac5c814a57ebc1b94fca30164ad3eb31f01356913781ca7a868cd4e2d732d9a03aa8fefd1b002e1c45309a8067
 EBUILD pyyaml-5.1.ebuild 1123 BLAKE2B c691fb9e289ba23fec8836ac225974bd3efe8d5e554467c88f7d8d0ea96cd42c4c9f5dad1cd6569582d0e756ba86e58621fb7036241f31a4befe84129e41ab1a SHA512 57b9f6dca4a6566b0ef7b2eabcd4ce6d64944b94bb095da8027250db135bebcf3be1e0c661efcb1c4666738b2cf6b13d487527c2eb554362f3d812856b7e5945
-EBUILD pyyaml-5.3.ebuild 1186 BLAKE2B f17711b03f88e4e2523dcd69df0da08bb9e956a76574ef7e3b62984d3b6b44a76b8e72b35d323c6d4bc2b9331d54951e1d411342aa6edeed070f239f8c2095ca SHA512 fa0350c39f5a4b4bc3474df58f7698a956b04eac5c814a57ebc1b94fca30164ad3eb31f01356913781ca7a868cd4e2d732d9a03aa8fefd1b002e1c45309a8067
+EBUILD pyyaml-5.3.ebuild 1177 BLAKE2B b1f4bdfc454561b84428b820997f67acf69445a97a86445f76b30f679eb2764753a4f56f4a98a92d2908f35792615f46468c6f2d975f2c0b5486fbb6c8497fa6 SHA512 d67976b9958104c63440d6f3ace5bda2fd9d67e157ede507e6c3b320d732f0fac5ddb4f98e3bec208550e9a1b22742d287cb4f9ba6c4c2fb9f5cfc1c28a13490
 MISC metadata.xml 345 BLAKE2B 8c26b8b05b08ed9abab5ed2cb36552dc9af33ee2b30cf3ebe551576d7ad44908b3dff195cd7f1a3f5af9323d17eadee407e42bfeb99150be2a0ac4b48653c1eb SHA512 1fdee5219c989b3edf11bdb63264c6ca6bd54fb1f44907bf20ce7ee6b1968c9c6f2c94363698be87d92eb6cd07a034acca7dbcffaeac40d2add8d57a240772da
diff --git a/dev-python/pyyaml/pyyaml-5.3.ebuild b/dev-python/pyyaml/pyyaml-5.3.ebuild
index b63569118b84..cad8d097574b 100644
--- a/dev-python/pyyaml/pyyaml-5.3.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pyyaml.org/download/${PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="examples libyaml"
 
 RDEPEND="libyaml? ( dev-libs/libyaml )"
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index 302074bc0fde..e33600b2ecf2 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,6 +1,6 @@
 AUX pyzmq-17.1.0-test_message.patch 725 BLAKE2B c756ffc65b1091f5581c1a8b60c5108c736a6cbe0eed6e5420900b39e0b8b4d656ec82851ad35cb734744486f90325c6bde9e5234735144b19c58a94214e0913 SHA512 4b97ec70740a03e28bd21bc50af145c69b3546e2c5c01b5e7db4b577facd3d1f01d84c5539aff7e6ac44549f90c86be52a09bedac3e2c027cc792b4dbed0da20
 DIST pyzmq-16.0.2.tar.gz 1026531 BLAKE2B b276fea116d56595ff2aca8a00b2b8918c0170cf1522c4bb457f6bb0d44a13e63de18e4d4f53238a1a5b515986e029ffebdded269f191d62eb36d988b328b402 SHA512 40eaf8ce39db86ab3866890d74b92bd6f20d4ae827828a8772003656d899d10ffcfc222d21f344d9daba390824e6c43b9f34e31beb604ec5ee1ec199165f4b96
 DIST pyzmq-17.1.0.tar.gz 1082716 BLAKE2B eed059cad8cc37e9315d16a43768f531ada1274b46bdf91d2ebe83cd0b4c269ea99a8532e3db6d0ea68be31600cf7d29ea4c4e894aa6d04c61534b11fb816d54 SHA512 7f1975c4d02e7d47577049da8df84753905d01672d5a244cef2e5b05e0b6fdb22e88cbb36f2e59831e95a8224819183d9a82baf1f9d7f599da61bcbfe2fc23d3
-EBUILD pyzmq-16.0.2.ebuild 1547 BLAKE2B 74a351145907472b6746c22b8d8f6aac3f7a28de500618c131d00b58d8c0647708289eb99f3905d30d1d0109760837f95399ef72c839c7cb59601b1cfea2bf16 SHA512 7fdafdd04bb9cb150e14da28c08ec017a177f65afae67e306fdd6d3eda37bc101183b5e12d381efffed96e8eab2a9e105acfb7728a37bce3090d3fdc55a0ead5
-EBUILD pyzmq-17.1.0.ebuild 1620 BLAKE2B 5176058a5c46503ad9d56ddca0eb98d4ae19a4015081e5b59a3436cfa2672d27b09977a2a351e49e9be591fad384f49781bbd177e94704ad38b975d3b0b70301 SHA512 9e86bc1839d657fb3302bcbcee992178fd8861acc738960cb4a017b098a746fecb48686c2fa13e05d01f0da6b9c5ad8ea206671c9b5f1f2d7fc78a4964a107b9
+EBUILD pyzmq-16.0.2.ebuild 1769 BLAKE2B c17a052f1873a15ce9dfeeff85f3cc1df49e39eb8fea26821fd04cdebf34d2879f0318b3ad16c2603f078be0b2fbf6ba0c1281198aafc4f21b4e1f67fc33f9ee SHA512 9ef86b6adb8fd2eec0733e76be3da99e6cad72dd9f3647f0e0882a4220702cd9ef1ed6b0d919e2f118fcde6a4988d25604b95b5ced691ded5f4924be8b8e4887
+EBUILD pyzmq-17.1.0.ebuild 1842 BLAKE2B 5544284ec6dbc4b104b33d92b8435c85f74bde623a5e059508f5dceaf33f95920f19b81a1a407d3a8bebf1abd1fa0ffed4557db51a5794256736208dc64fb42e SHA512 2894ea32204d9dbca93a31638ef223900ba821ba4223856cbf92936d597c446ffd787dae597aed5367041f548c55c9177214c99c8eaa182fb5002f4f4f1eabd5
 MISC metadata.xml 318 BLAKE2B 332c15a9f2501968cf1ef1f794c6ffe69c196b0d1574889cf90cbffe394e01aeeb869d4644d3182bfb4fd6f1fd1b08e4d73bfdeca401e7071f547311fcebdab5 SHA512 82430ca9ef38b198825652b6a35b18070c4dbfbe9e662311755c6436e98d37b83c44c1d1aa9ade477b5eefadef85390ca1e6c3d035150a850ec08e8134b4f03c
diff --git a/dev-python/pyzmq/pyzmq-16.0.2.ebuild b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
index c6f982a73c26..914737e0cb2b 100644
--- a/dev-python/pyzmq/pyzmq-16.0.2.ebuild
+++ b/dev-python/pyzmq/pyzmq-16.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit flag-o-matic distutils-r1 toolchain-funcs
@@ -22,11 +22,13 @@ RDEPEND="
 	>=net-libs/zeromq-4.1.2:=
 	dev-python/py[${PYTHON_USEDEP}]
 	dev-python/cffi:=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
 		www-servers/tornado[${PYTHON_USEDEP}]
 	)
 	doc? (
@@ -51,6 +53,7 @@ python_compile_all() {
 
 python_compile() {
 	esetup.py cython --force
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
 	distutils-r1_python_compile
 }
 
diff --git a/dev-python/pyzmq/pyzmq-17.1.0.ebuild b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
index e7d8b211d806..90216948f4ff 100644
--- a/dev-python/pyzmq/pyzmq-17.1.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-17.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit flag-o-matic distutils-r1 toolchain-funcs
@@ -22,11 +22,13 @@ RDEPEND="
 	>=net-libs/zeromq-4.2.2-r2:=[drafts]
 	dev-python/py[${PYTHON_USEDEP}]
 	dev-python/cffi:=[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/gevent[${PYTHON_USEDEP}]' python2_7)
 "
 DEPEND="${RDEPEND}
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
 		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
 	)
 	doc? (
@@ -53,6 +55,7 @@ python_compile_all() {
 
 python_compile() {
 	esetup.py cython --force
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
 	distutils-r1_python_compile
 }
 
diff --git a/dev-python/pyzor/Manifest b/dev-python/pyzor/Manifest
index 9b39b0d5daaa..bef5b63ee8dd 100644
--- a/dev-python/pyzor/Manifest
+++ b/dev-python/pyzor/Manifest
@@ -1,5 +1,5 @@
 AUX read-stdin-as-binary-in-get_input_msg.patch 2751 BLAKE2B c348d28eeb703ff9b257c915ba6c6ac62e95a1f389173ff2fcd034dbcfdf8b9d9fd075365b9033fe13a3f5ec6a24dad5110c468f54dc5417241cf5cb95e5933f SHA512 424d7b640e4f297bde5e98c92b7fec48c79998b07a710f685f786c673ef10981efc71647973fdd05ac84879387ab5eb97d5c734bf5b03827dd998cf292948d5b
 AUX unfix-configparser-compat-for-2to3.patch 1210 BLAKE2B 1ad8b2528cbf723d46d18c25163f68738281c48638b86c8809b5dab8f6f3c0058f17b1e2232d7c704b4aa777aaaf43c63170478da95272e75492bbbaec696789 SHA512 d9f5308d1f9280db5a0556fcaf3927e261b6cd1d01ff42c05a912335c6f9343f78096eed645aab5c741c221adf5ece00137aa3ae6f950cafbeb77db1908949b9
 DIST pyzor-1.0.0.tar.gz 126276 BLAKE2B c60f26c53bf118c88dacbc49ddd414473748af1868b383a9c937ecf3cfe426ecdd60f64388fe7e555bd4641ef445769600e40879279dd544ef9ea32bd0dab6b9 SHA512 b3fb8b2c5261e187a2ab3a5a3b12d221df7de08766c6bb2ad9990c0f23517534871ecc9d5ad529e79b0d0aef8b2b800728320c57435a8c0d8c3f80a4ba0f7e4a
-EBUILD pyzor-1.0.0-r1.ebuild 2016 BLAKE2B a11a7481c4a305edd7c88c3440f4dbea598f793c29700468fdbf091b8b7dbd88285e9460a1aff66947ab20d6a9814db8ce5cbdeb3c073c977ceb30b598077fe7 SHA512 888a56df98be4a11758d224ae0287cf9d88663009522389385e5ff7b4704ce31f1d79103f81dc7eaa5d995cb7666175ba224a8667e3b69181d2e33a3fad65188
+EBUILD pyzor-1.0.0-r1.ebuild 2015 BLAKE2B bcbd30619b39d43b93ce6445cf986bff42dd1e7d4d1afd1f0c24aea1dc7a456de2840280c5455cacca55c90fdec80ca61fc36091676a800cf3a61b20fe975d88 SHA512 e2a0e1cb9be39ce9f3c1e44ee6de79ecb62d1ac66fd32e75c0b340ffaa5de842f945203fb58fb5723ebb8c12392d07567971d37fcbd744afa92d9e89dc2e8466
 MISC metadata.xml 887 BLAKE2B 5a399af14ad9aa5eefe9f37da9b43addf24e6c5416827721f110a5cceb44eb9f03c78ac0b149f31468e5206a10c93c98d3940783c39ffa8f04b840a94c3fa850 SHA512 c3967f9f0e2c64f510f04e7ce01f89a2c03a7e1f260ca25a3d29b6c7821dbcded3ffa4b16f640693b08f3763793c733689c30ef8710305a4bf0b706605eda138
diff --git a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
index 97c8955e5be8..1cf021784362 100644
--- a/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
+++ b/dev-python/pyzor/pyzor-1.0.0-r1.ebuild
@@ -58,7 +58,7 @@ python_install_all() {
 	distutils-r1_python_install_all
 }
 
-src_install () {
+src_install() {
 	distutils-r1_src_install
 
 	if use pyzord; then
diff --git a/dev-python/qpid-python/Manifest b/dev-python/qpid-python/Manifest
deleted file mode 100644
index 1744ee907877..000000000000
--- a/dev-python/qpid-python/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST qpid-python-0.20.tar.gz 226543 BLAKE2B 5722cad8f181677c4b78a15dae68dc0292b66595ed94076133fb2e956323efd5afad583399f638704673d7eb7a34546ee7fd3b216bd5ca7ca61f10b15ab7835f SHA512 c3cc466c3b1e13443c9ac1e04d8dfab8fbdb4460fcc828b91e9d520cacdfa69589ccd1928d8d0cb4012c4d0a22ae9e6dc2803488863ccc53bb568e97f8251b44
-EBUILD qpid-python-0.20.ebuild 1190 BLAKE2B 1ae791ffb748edbc2d978d7aaccb9747b121183363da4dd98ebc66a4b33f0bd01d73ac42618096c7ac856a73556022a6882114084d6bd7fa5bf2ef65ff8891c4 SHA512 0689ba4ecc6fc2e742177dbbff9fde9296c6dbc13022d1acc552d2aef40a72323b04b5c0d86312b5db99ae8dbe5cd2e86b05cd5e28c15b83ecf5af3ee9844b4f
-MISC metadata.xml 330 BLAKE2B 4b5f6bc1038253c6a3ec052f7499b14d247f35d88a785513e648bc12e32f4477f95f459306c17ee7b79a0eeec05b602299bd50202f2a274a89ae25b165c855b6 SHA512 cbe9b9519505842e97e787edbefe2b6b7c46d25784030834dec9b45e53bc8002a84122b987dfd5a7f677888972e9ab9e93dd0ff6e33cc946f2c59ae533aa6ff9
diff --git a/dev-python/qpid-python/metadata.xml b/dev-python/qpid-python/metadata.xml
deleted file mode 100644
index af4614a39307..000000000000
--- a/dev-python/qpid-python/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">qpid-python</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/qpid-python/qpid-python-0.20.ebuild b/dev-python/qpid-python/qpid-python-0.20.ebuild
deleted file mode 100644
index c7d229bf2153..000000000000
--- a/dev-python/qpid-python/qpid-python-0.20.ebuild
+++ /dev/null
@@ -1,44 +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
-
-DESCRIPTION="A high-speed platform independent enterprise messaging system for Apache"
-HOMEPAGE="http://qpid.apache.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/epydoc[${PYTHON_USEDEP}] )"
-
-python_compile_all() {
-	use doc && "${PYTHON}" setup.py doc_option
-}
-
-src_test() {
-	# For now rm failing tests requiring making a connection, ? via a running broker
-	# Seems 'we' need figure how to start a broker
-	sed -e 's:def testReconnect:def _testReconnect:' \
-		-e 's:testEstablish:_&:' \
-		-e 's:testOpen:_&:' \
-		-e 's:testReconnectURLs:_&:' \
-		-e 's:testTcpNodelay:_&:' \
-		-e 's:testOpenCloseResourceLeaks:_&:' \
-		-e 's:testReconnect:_&:' \
-		-i qpid/tests/messaging/endpoints.py
-	./qpid-python-test
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( ../"${P}"-python2_7/doc/. )
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/reflink/Manifest b/dev-python/reflink/Manifest
index c9d3c76de999..75cb18ad6177 100644
--- a/dev-python/reflink/Manifest
+++ b/dev-python/reflink/Manifest
@@ -1,4 +1,4 @@
 AUX 0.2.1-correct-test-deps.patch 325 BLAKE2B 33600ee1ffe704b26ba310dcdf4bd75850a6c8805e184f0aa90194600cf1bc6bf3005978ad957dcf2b8f14ea5de31e35f902c6304974f644c755013e4c6451fe SHA512 bafdd031a205891dc171a0ec0f8f62085c15ab7909e405444e88c6fede2f8640bcacc3e9c7f5e99244320770fcbcbf9009fc9da06d838905f7a388f7af124894
 DIST reflink-0.2.1.tar.gz 14638 BLAKE2B a6449ebb27619ead9ff8452df6c48f3617e5f06eb347fbbe14ab00b9a43c01de8e101466288ac6fb73602165d4d4e9315f941c2f28dffe245ed2c39a10a61cf1 SHA512 5995ed787bda93cb46d99a603110768087420edd72c01d5f3f7f08a3f8f63b4629b900a3c173dd7f3119a892ac19ab1a9c3000ddd83810b22a52dfb5fb892a28
-EBUILD reflink-0.2.1.ebuild 1013 BLAKE2B 8060c5a0485c439aee5ee0ce4af7867d2d809f808575f97b8900bccd5dccb5d05d51b5d23f4f02f84265b5a3717911b4645f8bd04b7986d08e6caea547b81906 SHA512 ef040a35c25d8a742139dae83b1e414b372d54afa9c80a9ea8b17d980ce03259ece1ea23bf9b8d23f2d096c9d50aed78036d9460d213ceed95003812b0e7173b
+EBUILD reflink-0.2.1.ebuild 1002 BLAKE2B 79b11b0085cf23300391b46619b4de00e32cfd7ece60d0b651cc9b55f61038b65cdcdc8f45c32cfa6042512199821adc0e1e9662008ffc5d65fb782e171e580a SHA512 64c98430658d65dee82ac922a0560dc3a9879f141b8b06bb6bf0533cb7dbc9ddf5abb6c89f9ced3171780a2dc02ef311532a9f0a72b365f62e28af8d3f333a95
 MISC metadata.xml 493 BLAKE2B d7e0d0236537a68ada8c267aa6a2d6803a4f88e82938a73a7bcd0cf9cb5567177745f5fc2c1d81e92f17501672a430439845be6c63b7853cdf927302259bbec5 SHA512 8a4c8db0dc28f8ee0d6bd855554e8cf1f7661f5625f37ee04483fa918ac78d238487f1246dca1c96f647ccb6e9a35bd22b171d659ff06cd616c369d01bfba221
diff --git a/dev-python/reflink/reflink-0.2.1.ebuild b/dev-python/reflink/reflink-0.2.1.ebuild
index ec1fcbfd5d2c..c3df5d3b75bc 100644
--- a/dev-python/reflink/reflink-0.2.1.ebuild
+++ b/dev-python/reflink/reflink-0.2.1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
-DESCRIPTION="RFC-compliant FQDN validation and manipulation for Python"
+DESCRIPTION="Python wrapper around the reflink system calls"
 HOMEPAGE="https://gitlab.com/rubdos/pyreflink"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/rencode/Manifest b/dev-python/rencode/Manifest
index 3ade0d1ebac5..062e953d49a1 100644
--- a/dev-python/rencode/Manifest
+++ b/dev-python/rencode/Manifest
@@ -1,4 +1,3 @@
 DIST rencode-1.0.5.tar.gz 24530 BLAKE2B c650bf7befd62c8654bd0496f12f15a242a304ab9333bdf258222dd333081bd23715accdabbc55a271e8e869ca96f6aa0b43b335c6758be5b03073ebc05e3bb6 SHA512 809d7070b746fe77419e7b4d2eed274e1e0b3b4f15bcddb466806478a90f89965b0b456443b390cce6d1ca9df409367f336dd659f4481cd442e3cc459bd63c18
 EBUILD rencode-1.0.5-r1.ebuild 500 BLAKE2B e5553e82054806d558dbab0c2b6918a98fda93ea9550762f08747499862fee613f6c33b800ed1001bd2f90b8d6ec7fa62033463b7485b541b1166898d91c5c3e SHA512 a96b74e222e6324c8aed1f0d76064b25a89c7be42215df8c95ade44e68d5684c1866df7088a1ea79ae7e5e02717f739eb3562176f05d8b3f3a4c26382402c72e
-EBUILD rencode-1.0.5.ebuild 496 BLAKE2B 7abba3cfc5d364b95c1ca5b3a1569358d24009a552edbd6ba7e0177b62c5ab8d36c866f8d6fcca78c3033e8c1f4fb9bdc12e9d836b1ed1b2fd538ec72439f57e SHA512 9fc45d9f2e67a2c2351729342b31575360f7e53fab03740e729c568f9df640212c8d340ac2b10ab1b158f9fb74e132f08f017cf8d722116ea029671e1c5e1135
 MISC metadata.xml 666 BLAKE2B e4047d25b3bebfa106936f105ed4fb8ed1c07aaad32b42f5bb2645388028baf30b8fff228fd32737c2716c5273f6872c5290a6e132b850d4640fb1d44e257683 SHA512 026950a9462b1207463f2bf923c40bbe310c63ecf73676f935c9d392fcb7673b4150de82e7654ea0914c0fdbd6b1a110f00e57fc92b931a98a5e9ab032918971
diff --git a/dev-python/rencode/rencode-1.0.5.ebuild b/dev-python/rencode/rencode-1.0.5.ebuild
deleted file mode 100644
index 49f14f940bfc..000000000000
--- a/dev-python/rencode/rencode-1.0.5.ebuild
+++ /dev/null
@@ -1,19 +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="similar to bencode from the BitTorrent project"
-HOMEPAGE="https://github.com/aresch/rencode"
-SRC_URI="https://github.com/aresch/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/repoze-lru/Manifest b/dev-python/repoze-lru/Manifest
index b095477b6c94..c117620ab2b3 100644
--- a/dev-python/repoze-lru/Manifest
+++ b/dev-python/repoze-lru/Manifest
@@ -2,5 +2,5 @@ DIST repoze.lru-0.6.tar.gz 19814 BLAKE2B af86797daf286daa709556194d9aac5d72151b1
 DIST repoze.lru-0.7.tar.gz 19591 BLAKE2B 839cd757ab51943b46cab22190c4e3bb829f7a94ad66647aa99072d535b7366778b57aedc556c8c91f012534154e6e2ef7608b2d4db2b64e7ba54486404a183e SHA512 c4d8b015931c4265fa8559f99c9d5016835574b368ebe0d49fe503afe908020b2bf29836606134e00c6c0aa436d52a00bb73d6ab80e98d0802f54bd2e4686476
 EBUILD repoze-lru-0.6-r2.ebuild 521 BLAKE2B 6135845f1f4172765bc469097c12d531c3ed44a2ca15364c3eea4975ee93cef7e1c3c85be3be5c192f183f691c4edc720abbb96ce8a89609c30c6e28db872d6c SHA512 534c10f49ed387ec4bca1a76186e00b32d35cd08ef40632d8cc64f2234ce0f5d5496c4c2e61cf93c7f0fa94f13ff14a9fc78c760595beb8dece884f7c122a435
 EBUILD repoze-lru-0.6-r3.ebuild 681 BLAKE2B eb25f2d2202d1889a4624e022177ab884fb43dccc0a7666b27bdc05d3f1274152bb04bc58e272aff73b15b8b80817eb0c51c9d12f3e68f39d5ca910f3a41ab77 SHA512 0dd2a29e4417f8cb3be44668267341d19b93100697035286a66a50902afedc20400c86401dce6bfe4ccd0445df060e5a9a32b799dd24b845c3f559c05e0e9056
-EBUILD repoze-lru-0.7.ebuild 684 BLAKE2B 3f037a9c32a065415350cd0b716f73634cca02f95b36103ca83a461f7d4864211a311a369ac9ed48a531ab0be6e7352c31d41618b0d807c57af4bbecfc5f467c SHA512 b88886b3f5b3789d6d03fc38b4e52952061c998624a90fba4187fdf96bad43379b63d7142e8f52058c59fdd6784473f5515ff07fa00fe5371f0043d5bd112b45
+EBUILD repoze-lru-0.7.ebuild 691 BLAKE2B 957bae860ce61d5dc92d2e4a0da50366e1447391226ca008c8b5c3c3a7173f30254696eafbe5e539b569fae86e4b15423e3eabc4bf8b3d631139e18fc13c1258 SHA512 2774b9d8f8c0c02d18863b36258996a03307c9d8bd8d53ae633f5fb6bb890e3134404218bed85e498a5698d09e1247cfb76832d3805c886e2c8f15c55cb467d7
 MISC metadata.xml 323 BLAKE2B e5e3343e9f27fdf721439dc80ca3704efa0bdf76a1c13b5d7d872c2541540cffa8ce4efff0ca2f5469af4130d2d37c52bc2dc3f0c535438a96e3dc2b7b3a41bc SHA512 cfe029f7e7fa262fecbd930ffd1f08e615e9f746678e28253bb0402bb3036858574595dbc03235e18b02ba08b7288a4f4f663d107f7f900e669d2b502b34e49d
diff --git a/dev-python/repoze-lru/repoze-lru-0.7.ebuild b/dev-python/repoze-lru/repoze-lru-0.7.ebuild
index 4746ba1b286c..cbd7534ded4a 100644
--- a/dev-python/repoze-lru/repoze-lru-0.7.ebuild
+++ b/dev-python/repoze-lru/repoze-lru-0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="repoze"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index cd14dc837750..713666a2fd53 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,5 +1,4 @@
-DIST requests-kerberos-0.11.0.tar.gz 10742 BLAKE2B eaf764ae8f5c897db43cbb931952062d4aaf33c04dfa0bbae2cfd3b44326240f80435d0b69c7f8bfa3567d0d16532796d009f0436f3ff5956a87998b825f98a3 SHA512 8700a7a305e0e42823bbc87c95ecfd404a76807459ab8a87f3105e817ebd9954fd41d7a2bab421bb5e21c0ec1b62a589c93cccb1f926a3ba66d6adbffe5db265
 DIST requests-kerberos-0.12.0.tar.gz 21579 BLAKE2B 297cbecb0fc3508f5f62440c5860dcd94eeb077e68757c0646e7e3bec65cd34e19212b9992dad491ce0adeb91234db533528936f740599e42ff439f78af103ba SHA512 b925b5f9f6753e87368dce451927df09568d0d6126d4ae8514bbd99a794d983e32298b92b6239be9f95595483e2682259cf165c6997d17d9cea64a81d4af1a06
-EBUILD requests-kerberos-0.11.0.ebuild 601 BLAKE2B f6d0a19d15ce6c2afa6c309eb586a4b12780e19259b52dacefe768281ef09993b7cb376c442b53b6c76924d66f65aa529c6ced188dd6916279a1e13097ce8a32 SHA512 f1e6685d1c5ed62742bba0ccf439a8a55f4560fd86fb21b3b13487bc4788d3081acb2522e165dded8420a934191aeadd548236a50936a31b830d2a6f0b7c5ff6
+EBUILD requests-kerberos-0.12.0-r1.ebuild 784 BLAKE2B 0f96fdc848e32f05046d39bc5a687ad647c7aa2662a8d651dce3bfbbd00064d6268d3d0a43ce403fa6f445389b638f86998ca7cdf0ff42ff34b3b48cd597fcd5 SHA512 83c0ebba39d2caf0cc8a38e2dbc78e80588d6ac21e792d34e4a0d23bf6c7702b61c2555ff7b31f89eedafd023e6ae989c64bff926ccb220e8a8fc25d2f808849
 EBUILD requests-kerberos-0.12.0.ebuild 780 BLAKE2B 7d41791e172263b32d101811be6398a8f463cf4a1870214b5a31a2677c337d9fba4c9cc2631281ba21d6680636554b27fa04421f271f8223e1b1182fbb68ccc1 SHA512 2fa2b97ce5e27c94c4e96f99be2523d9a2f993785e1b728e4807130ef721dfb8d9d643a087b7837be424cb0d55d7af082f7705884db29e93c10137718806b794
 MISC metadata.xml 320 BLAKE2B c58268e9df73385438694b43f3784a58d11f003adcebc306d70ddeea26789cfa22f709484a99902326074d16072563011c07f09eb071a9c141e4ee6ded7dbd56 SHA512 a33854d5f3c9a4d077d51a4254d18045a4fb0a50c223e809ea0a7415c869152e30122c3d7e005b25c7e07bd660678db5613449688c086582c172a77d19a9e540
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
index 0698fafaf9e7..4db0e05852db 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.11.0.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
@@ -1,21 +1,27 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
-HOMEPAGE="https://pypi.org/project/requests-kerberos/"
+HOMEPAGE="https://github.com/requests/requests-kerberos/"
 DESCRIPTION="A Kerberos authentication handler for python-requests"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/requests-1.1.0[${PYTHON_USEDEP}]
 	|| ( >=dev-python/pykerberos-1.1.8[${PYTHON_USEDEP}] <dev-python/pykerberos-2[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )"
+
+python_test() {
+	${PYTHON} tests/test_requests_kerberos.py || die
+}
diff --git a/dev-python/requests-mock/Manifest b/dev-python/requests-mock/Manifest
index e101ca8b3c8b..a10b5a9adfa4 100644
--- a/dev-python/requests-mock/Manifest
+++ b/dev-python/requests-mock/Manifest
@@ -1,7 +1,7 @@
-DIST requests-mock-1.2.0.tar.gz 40219 BLAKE2B b5ded6c97d920bab0c610c1be1c80f299e56cccd393c824b5c9ab3e0c298491b8be0b285c440bc8ba32eb1eec2eca14ec363d0f188c5b095192a56d01383c322 SHA512 ed24d1809aef597219ae2b0b376156a0760040795ccd660ee38f84cd1ceed58cbc5009764d7a365d31f941ee16e2b537b92ddcff92bcd8d47b7e95c67dc8d82c
 DIST requests-mock-1.5.0.tar.gz 47824 BLAKE2B 90d540e2372430c70b0ada0bc48a3a8085452e062e9ab57a232d080df8312c2a722c01d61fb399fe2a6bc31a2d6d61914d8d0e2c912a2e439062b27bb31914cf SHA512 21838017ac4d3066e2240b40b27bbe16f3bd989f37eba90f0a0d0cdb997e7e65c6d9dc63b31f64daaa6146cc3c6bccbba86382eda3f2ca72eb7cc8381969af36
 DIST requests-mock-1.5.2.tar.gz 47581 BLAKE2B 46beefc45e01355939a76b85e43a5b57cb1a870666eab7f610cad3e8a04a17da6a0864f9776a0f09028c847e8a4f7d0d2389a36f9a0431ed733a364d0f712c0b SHA512 206c91e892df84e38dcdf1264559128cfece76be2ce43b9c98238dfd438795d8c4ce3fcd43feb30246fbfca2d78832a23430ce1c9d3a7dc6e4417df5d65a8d3c
-EBUILD requests-mock-1.2.0.ebuild 1011 BLAKE2B d91a71608fa41fc0349486cd010fe7668c637f9e63b2bb83e6be592e5fe6d62c847ede85cc8764cacba970ef2a38168f19be8a7f2b8a275b2c3bbd2f67f0ad52 SHA512 9b3650afa9e8b6ca36e8a07d6d8da39ac9d8b788ff0f6cacdf34989109e34cbe4d03c39d60c3d4e36b973675b632ee2ed4799d72416d43268871108adae8d086
+DIST requests-mock-1.7.0.tar.gz 51705 BLAKE2B 1104422ab28678ee9e964fd853e7d61c23bc2f0dfb3861c2829578d1f91d533d195ce687fbc8596aba32da4b369050398d891125dc894e55fcb73ca81268b30c SHA512 6ad71fb87519f93812e8ae0d058a4b65a4492e86f05cacc37f95be1a6f0239a2c3f3d20a7e6f44bcc21f009574e4e78c2149394c2570d305efbdd68ec07b24a2
 EBUILD requests-mock-1.5.0.ebuild 1670 BLAKE2B bed4d761f1c37209818483fd670b512e1f128d571bc74f06fa013daf3c87733497b0c8d250b7d131d7e0436a9ea4b9ffed88cb622e9a753c83f3d6fa8657c6b0 SHA512 7d10c71598a1603a0d7bc910429f4c64c0acec8ed98a983d3943f59ff33d1811dd7c67193d1a03525d6a33b4162520d498622c830f641324d857f4546c37a86d
-EBUILD requests-mock-1.5.2.ebuild 1672 BLAKE2B 5dd50358a45d9af532454f3e8668fd2ee9187d7a352a9e8f8fb843626047f535459a5c3d3eec4b1ca73edaf14539c782f988c6eba5d221e491155f4a9cffc694 SHA512 3c9acc866bcec797347ef9c01373eaeafb1028f43da5c4d90125df56fa346d6d1dc4e5ba6e89c41f1f039cb7976afa6fe0154dc1e75a96e6b7d3fe30d488dfea
+EBUILD requests-mock-1.5.2.ebuild 1679 BLAKE2B 173e105d21ec53273dcb07cda38a23dd214903687440a4164e041e94c2cbf96c6e213bad399ca8f4bc655db58e217bdf92347c75b75a14cfc460ead42059d249 SHA512 642a4bee85b971086436841a53b170c4d965c3d74eb62eb62752b34fdf4d72aaf30ece942014f7ea403cf96d8212a2344168a29c9f3b17d9c6cb4cd0cf1eee97
+EBUILD requests-mock-1.7.0.ebuild 1240 BLAKE2B fa413f9527a15fd4b432b81d062c6eba6ba5ca399aaf2af5307e3f1ff328ac7987df5ed3da856df5c2502be6a58d145795f779f89e81eb8c25c900321ec1ab02 SHA512 f8460225e6316cfcba55b886694f1e33db89e390c2e238bf9e3dcd52d7db8521b0bbd17bcb057606c4ff9065f45af84168a35c89c768e21ecce13bf65fecb4fb
 MISC metadata.xml 454 BLAKE2B bcadca6cd81b333dff341a15c22e548336cf6cf8fc342ec147783d516d72c1168991b61b9038979923e92cc3304c86021b2a38b39e5d55469b9cdfe95170a23a SHA512 9eb41db434308c8b293b881364482e08da91881266ae4d5b45dc79fa12b0187e5aabbd82d771ad7c5fe4e2840d581f9a8ce63658f0f3124a19e26a35c5f25119
diff --git a/dev-python/requests-mock/requests-mock-1.2.0.ebuild b/dev-python/requests-mock/requests-mock-1.2.0.ebuild
deleted file mode 100644
index cd6180ff47cd..000000000000
--- a/dev-python/requests-mock/requests-mock-1.2.0.ebuild
+++ /dev/null
@@ -1,40 +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="Mock out responses from the requests package"
-HOMEPAGE="https://github.com/jamielennox/requests-mock"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
-	test? (
-		dev-python/fixtures[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-		dev-python/testtools[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_test() {
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPYTHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/requests-mock/requests-mock-1.5.2.ebuild b/dev-python/requests-mock/requests-mock-1.5.2.ebuild
index 668faaec8646..73c0133756ad 100644
--- a/dev-python/requests-mock/requests-mock-1.5.2.ebuild
+++ b/dev-python/requests-mock/requests-mock-1.5.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 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests-mock/requests-mock-1.7.0.ebuild b/dev-python/requests-mock/requests-mock-1.7.0.ebuild
new file mode 100644
index 000000000000..7c051fe73391
--- /dev/null
+++ b/dev-python/requests-mock/requests-mock-1.7.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Mock out responses from the requests package"
+HOMEPAGE="https://github.com/jamielennox/requests-mock"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+	test? (
+		dev-python/fixtures[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/testtools[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc/source
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Disable reno which only works inside a git repository
+	sed -i "s/'reno.sphinxext',//" doc/source/conf.py || die
+	# Remove the release notes section which requires reno
+	rm doc/source/release-notes.rst || die
+	sed -i '/^=============$/,/release-notes/d' doc/source/index.rst || die
+	# Disable a test which requires purl (not in the tree)
+	sed -i -e "/^import purl$/d" -e "s/test_with_purl/_&/" \
+		tests/test_adapter.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/requests-ntlm/Manifest b/dev-python/requests-ntlm/Manifest
index 17a171ae77a8..a6379e8b8532 100644
--- a/dev-python/requests-ntlm/Manifest
+++ b/dev-python/requests-ntlm/Manifest
@@ -1,5 +1,4 @@
-DIST requests-ntlm-1.0.0.tar.gz 7786 BLAKE2B ed223722c3ef6d0434e62016c97f82214ec3908e82deb96e3aeb0b77b7b799418d0bd9de23276c418547e13bcfa43ca351a8b59de637305fa04d8460aeb01227 SHA512 62c8dcb674240944b8347b4d82802977755bdc871bf37c8054c6cd7d11421c32bb92d7d0765d60c4bc219e769176b709ef3bdc7355eb8c71f3745e0895c9f30a
 DIST requests_ntlm-1.1.0.tar.gz 5183 BLAKE2B 190a75d3f82ae2216e05295f855aa072f98908ef8a0d4dda68d6e39239655ccf175c707af137290cd78cf622c0a3d1741a0afbb1363f8b170f408c34a2682fa6 SHA512 9a74ecd6e4ed5c5e4381d2ee3fb9ff233352b49baa5fae4e0ecc30aaad12fc7a5c1b9dd936f35d4a3815ae7f6ec5bb8581e84128d63ff0e961181408daddb807
-EBUILD requests-ntlm-1.0.0.ebuild 526 BLAKE2B 4a3c19fda92194d80214310472b12a6052fd08c4550d70950a0b6f67dd5304acec0a7ae10a6499f11afa86d64a13a290699121d954bd99636928d05ef991239c SHA512 9caa0a3c59be3c207c0e4fbb538bd8c4875a6462bdca4a464e89db9d8b28d74abe5f951e2a9d817fe2df5b787bd8fcc8ab2a284377e95dbe49c5f007132274b5
+EBUILD requests-ntlm-1.1.0-r1.ebuild 565 BLAKE2B 815908662e286fb595bcd7a032389281bbaa106479453932d7d891d1834756feff0aaa11f33d8d55c32309e25eaa99304e6b1d200ab24a32548553b5b7818654 SHA512 07e0709942dedb1dfb17a1fc41e19659b920f32f61f1cbf5af1122a9eb26277ec77ca5aea226a1d50510401f8af9216a723cb7c04a119ebb42ae8fad4926ad1f
 EBUILD requests-ntlm-1.1.0.ebuild 561 BLAKE2B 3ab2eec2d00ed65ed13f0974d641b5fffaffe57ca9ed3a229ebbd949269450888ac9ac553c49e9aab9eac56a88b866d2c4b00765ff2d9388155effcaaddbbacb SHA512 d70cb54da3d6cd3097909cc13254c5dd2e50f8c4203aeee8ce99d62bf4087b18b079e44e917892b81902010ae457274c949e91323bead317f67458ff0d85edb9
 MISC metadata.xml 429 BLAKE2B e6f1e928cec0f1fdf663d132370e26df8fcd5169e8d36db83f5fdfdb63aba79ba479547237b982d33db81e65b0c2bff182cbb316c5e9208e0bd018e89931e6dc SHA512 ccb4016446f637c44fcba7446a7d3e3f0521164e76b6f7f5a52873fac8f14728100b67d853e7b96589c1f46f2ecbabcf67c33101a2c43e71f0d8fb2f8fe2f70c
diff --git a/dev-python/requests-ntlm/requests-ntlm-1.0.0.ebuild b/dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
index ad31142955d7..c0761e977887 100644
--- a/dev-python/requests-ntlm/requests-ntlm-1.0.0.ebuild
+++ b/dev-python/requests-ntlm/requests-ntlm-1.1.0-r1.ebuild
@@ -1,15 +1,17 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
+MY_PN="${PN/-/_}"
+
 DESCRIPTION="HTTP NTLM authentication using the requests library"
 HOMEPAGE="https://github.com/requests/requests-ntlm"
-SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 SLOT="0"
 LICENSE="ISC"
@@ -19,3 +21,5 @@ IUSE=""
 RDEPEND="
 	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
 	>=dev-python/ntlm-auth-1.0.2[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${MY_PN}-${PV}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index e8157c01a46a..a36a3ca96872 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,6 +1,8 @@
 AUX requests-2.22.0-pytest-4.patch 1076 BLAKE2B 2631f9b2e0586072e3a16e132099bab467ccbcd2020ea41ca49299688e2f88127e0b7e67545eb62659ac2729ca02b46d1e5a8c015c1d6cdd6a5ee0f8170cd483 SHA512 1de7c78c51be49e4004decd28d40e183a44c15b1e321c41595abc114ddb829ad54fc02dfb573a620cfe71f0996b78c822cb37cd68b3fb2d8e395b5f829227496
 DIST requests-2.21.0.tar.gz 111528 BLAKE2B 7b40f9f572a8efde41c177fb5d1e1eaf29ca60cad0661fa28ac0085f3700348380d619f68c0082f24044d1af82b16d6b1e7d5dd2c2a2329f85fcee7141b1fbf6 SHA512 385e1d80993a21c09e7c4682500ca8c24155962ba41ecd8e73612722b2ff6618b736e827fc48ad1683b0d2bc7a420cfe680f5107860aca52656ef777f1d60104
 DIST requests-2.22.0.tar.gz 113406 BLAKE2B 36e1fa106f30af3d560c11edab3cd8f7e79116378c6f4d505052c8b19021846a22b4631567859b23331e7c9413896e77d7fc3288cd3af586f5f99da21c9181a6 SHA512 8b8e9da8a0c816fb4ff39be89ac7e1a9d5a99503ed93e44a0d78b28818f1c0eb253b151972a144151a616ba1b4bc5595245458a8268c5161391db54f740ac9a5
+DIST requests-2.23.0.tar.gz 114327 BLAKE2B 75bdf83e117e9f67c2032609ed5c20582f743519ab8364dd6b12685efd6b6e438f1c155fe9d3df87e48608747f59df6d99698d1f68e5df6c0cbced9e7d1a9b37 SHA512 a0f7db5cc9ce67af9f6f81b72e41491735a102f2a1da2fbde98e279846e2140cd26b6370aa5ec79c148c397885a7ae2bbce45c4587215f510dd02b8ac57cb46e
 EBUILD requests-2.21.0-r1.ebuild 1424 BLAKE2B bfa096c5f523924543070a8f000318f57884deb297aa55796bf1d53acaf778e20d96138cda8deea9eb321272e11490c0cf28b9dcee7115f6e835d9067cc754a4 SHA512 76b59f87f7941979a7dfe6054648bd5e948a2521f9053b38a2c2a8f792dd18147a54e0d6b18f0fbae08a4474d296969390bf7e954418dcdf199d1e47b3a7706f
-EBUILD requests-2.22.0.ebuild 1871 BLAKE2B a15133d80012d22b6337168f77c6f8ccb811f51ce45221cec9c88dfc4494e8d6acd41b668297a78bd36125249b6e8596fea0a36b609588aa9087a4e3c1bdc95f SHA512 e816a679c4d05823e5a12755ad97944e9190dbc6f489b61c038862fd7c764ef44dcf35c21e5fa9bf66765d959fa76695e9b717eeee8afd4c6271dd929ad776b3
+EBUILD requests-2.22.0.ebuild 1878 BLAKE2B 987f8cec0ec5a5f5c20b69cd1df554386538a146f63b8ced41afc168db095868a48a09e3b12d3d3e7e3757f7cad914d466e50f57828f9adbdb1bba26bda4fab7 SHA512 61caba256516f985dda08409e1be12f7f74c21c46d323e1b067cd75d17eda857d55480fb93c380a34d68536f4403fbd81a5b9baaae0e638b8c8879f7d06af638
+EBUILD requests-2.23.0.ebuild 1745 BLAKE2B 3eac32a42bf1247a9adbcbebec638fb10e019eeb6a54aeaed95951e6e108e73c7f37160d02d8b854acde726fad507d2d58c10c8012cf39cba5d78bf8767ea4ab SHA512 f8af1a121fded338b1104cd562a812b6d0cb61cb124f0d8928835277828c2925b1b94f790e68a74bf1b32237650321b9930b1f52b4584a490bb8d6f83f210da5
 MISC metadata.xml 674 BLAKE2B 8670395eb334921eeaa21367eaf1c7d3770c11a166dc680bcb9b99a05da91d797baec8ef3c0596c40143f732e427c322a75ea75da1a2e7d99e56426be077b35e SHA512 7aa5c27d949a076b09b4c2b9e905124047d9ececc40d9c3fd225c6405aa084db96cab585956db9885b115cd24c6c153ae853187872e77e7d44ae5790c323bac9
diff --git a/dev-python/requests/requests-2.22.0.ebuild b/dev-python/requests/requests-2.22.0.ebuild
index 6ce120594e8e..aec03d0cc4d1 100644
--- a/dev-python/requests/requests-2.22.0.ebuild
+++ b/dev-python/requests/requests-2.22.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="socks5 +ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/requests/requests-2.23.0.ebuild b/dev-python/requests/requests-2.23.0.ebuild
new file mode 100644
index 000000000000..e07f05359d86
--- /dev/null
+++ b/dev-python/requests/requests-2.23.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP library for human beings"
+HOMEPAGE="http://python-requests.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="socks5 +ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/certifi-2017.4.17[${PYTHON_USEDEP}]
+	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
+	<dev-python/chardet-4[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	<dev-python/idna-3[${PYTHON_USEDEP}]
+	<dev-python/urllib3-1.26[${PYTHON_USEDEP}]
+	socks5? ( >=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}] )
+	ssl? (
+		>=dev-python/cryptography-1.3.4[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-0.14[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
+	)
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# strip tests that require some kind of network
+	sed -e 's:test_connect_timeout:_&:' \
+		-e 's:test_total_timeout_connect:_&:' \
+		-i tests/test_requests.py || die
+	# probably pyopenssl version dependent
+	sed -e 's:test_https_warnings:_&:' \
+		-i tests/test_requests.py || die
+	# doctests rely on networking
+	sed -e 's:--doctest-modules::' \
+		-i pytest.ini || die
+}
+
+python_test() {
+	# tests hang with pypy & pypy3
+#	[[ ${EPYTHON} == pypy* ]] && continue
+
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/robotframework-selenium2library/Manifest b/dev-python/robotframework-selenium2library/Manifest
deleted file mode 100644
index 9b66c3f33562..000000000000
--- a/dev-python/robotframework-selenium2library/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST robotframework-selenium2library-1.8.0.tar.gz 118945 BLAKE2B 95f760668471caac3fb5a24ecaab80418c924541fec5472f6d4463612cfa392808b39496daab48a284c29da87d11005805b6701bea6260bb770fc8534a35336b SHA512 22afab929ed4553cdf804aa0dd85b0700fa3be769d1ca2c023d14d2538472b7fd7f581e549e266b1ec77f5eedd72dc45a74c653b7a8d281b7018c164358c618f
-EBUILD robotframework-selenium2library-1.8.0.ebuild 947 BLAKE2B bdeb68a495ca597457b95be4d0f114940bf270363927ac2c6b2d6ba8b5bd87339a713a4013c4e035ae6f53751805e793b80d6ba094c13dbb0ec5640559668bdb SHA512 a9ebe1deae5d5bbebee53955896af789d023b29bf00fc0191025402b795054ec893e913100915867ad200af77a1d4f0ce26331dae3998341f3d1c5fcb15cca89
-MISC metadata.xml 417 BLAKE2B fa74a8cbec326b557d2d5a1a5a22b7bc03b8e57e500b911f4256b37c724997245673b5763757cd540fa401ff6824d6c68e6381ae342eb3e8dde542a4f23d10a9 SHA512 22889df955840adee04977741c49698aa55eff8a7f56e33ac2921242c8451d9570688511b65a95c8af0d27322fc13868e3d0fb8e2f975e5060443391df07d167
diff --git a/dev-python/robotframework-selenium2library/metadata.xml b/dev-python/robotframework-selenium2library/metadata.xml
deleted file mode 100644
index 9ab31763e738..000000000000
--- a/dev-python/robotframework-selenium2library/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="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">robotframework/Selenium2Library</remote-id>
-    <remote-id type="pypi">robotframework-selenium2library</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild b/dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild
deleted file mode 100644
index 46600e7104cd..000000000000
--- a/dev-python/robotframework-selenium2library/robotframework-selenium2library-1.8.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Web testing library for Robot Framework"
-HOMEPAGE="https://github.com/rtomac/robotframework-selenium2library/
-	https://pypi.org/project/robotframework-selenium2library/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/selenium-2.32.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.3.2[${PYTHON_USEDEP}]
-	>=dev-python/robotframework-2.6.0[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	default
-
-	# don't use bundled setuptools
-	sed -e '/use_setuptools()/d' \
-		-e '/ez_setup/d' \
-		-i setup.py || die
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst )
-	use doc && local HTML_DOCS=( docs/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/robotframework-sshlibrary/Manifest b/dev-python/robotframework-sshlibrary/Manifest
deleted file mode 100644
index c42d87ac9f15..000000000000
--- a/dev-python/robotframework-sshlibrary/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST robotframework-sshlibrary-2.1.3.tar.gz 92733 BLAKE2B 00b898a4f994f050b27b565cf787fef6192f3aea832fa70983724ee427d10bd1d3b2d6c2b7f383266ee2f1b0cc0feb9c9a10827c6dd1828239ce05d9105927a7 SHA512 3159ea396757341ce5b37fc3db41db4dd052327750cea3a463e5109013a72fa285c1d3c33b9c43a017fc4c180042e32e957a24c9962f5de385a262562cacc52e
-EBUILD robotframework-sshlibrary-2.1.3.ebuild 557 BLAKE2B 68650cd6df33419b104c8440030508c3e157832163745ab51fb1d88a2820556602a8bd7e04af9fde451cb366eb519339088801d7cdad9a2ebf47aa550c5f8974 SHA512 8378186072a50933ce3d91ded9ee6489878d023cd91b909a6ad7e5a61e3aa1e612e945a337aa7e15f2a50c1730e09e7bc1774af971c483cb8cd5e6e644028779
-MISC metadata.xml 405 BLAKE2B 5e145a2e2b1d9785b533908e9453af0b37bddb2d9d0636b9357e7d51d42f2dd81e29b475a734dbf9c7426695e3fd45c9d84d4cf27dbe84fa7a542f34892ce80f SHA512 c7cb26875948b6d67dc5a381060ed36c1127f9174eab2001c6c96a3815d04663eb631cd8525e8929c0357bca9bb54779016e2ad64d02f614aff73b26e359fd24
diff --git a/dev-python/robotframework-sshlibrary/metadata.xml b/dev-python/robotframework-sshlibrary/metadata.xml
deleted file mode 100644
index 1ab302fd90e9..000000000000
--- a/dev-python/robotframework-sshlibrary/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="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">robotframework/SSHLibrary</remote-id>
-    <remote-id type="pypi">robotframework-sshlibrary</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.3.ebuild b/dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.3.ebuild
deleted file mode 100644
index 0bd225bc339c..000000000000
--- a/dev-python/robotframework-sshlibrary/robotframework-sshlibrary-2.1.3.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A test library for Robot Framework that enables SSH and SFTP"
-HOMEPAGE="https://github.com/robotframework/SSHLibrary https://pypi.org/project/robotframework-sshlibrary/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-python/paramiko-1.8.0[${PYTHON_USEDEP}]
-	dev-python/robotframework[${PYTHON_USEDEP}]"
diff --git a/dev-python/rope/Manifest b/dev-python/rope/Manifest
index 89eb0a7b20d9..99b7b9b810dd 100644
--- a/dev-python/rope/Manifest
+++ b/dev-python/rope/Manifest
@@ -1,6 +1,7 @@
 AUX rope-0.10.3-doc-syntax-errors.patch 1207 BLAKE2B 2eb81ffc507c532feff64a09b04e9c098e0d52f702048b2e69abf53b0099454edcb82d866b8b7e83a77e493495a15e3e944f376aa2d1a0e3ddeffebb2435745e SHA512 6bf617e20ef8810496b92cb5e55240622ea7285c435b090254cd9211a29f0c8d103322ed772424cdaeb528dabe1a606adea95647480fed9609e71c29584faaf3
+AUX rope-0.16.0-python3.7.patch 9140 BLAKE2B 911b730957faa7828252f3e4c58ff9d3dfee41c1d2ed841f7df95ba9fb890207a57b5e44ad641f75d5a14ed03112c0fb5c6202d7d5c3fb29e679fb5356fac4a9 SHA512 629deb4f13c207afeb570dfde81c28d8cf623d83dd8b9b004627e50b6634834f308ac7bb450c37d4ffa416b4c5f01d20ba6f071a567b82a4a7647204257f7c59
 DIST rope-0.10.7.tar.gz 244089 BLAKE2B aebc1eaa3715aa4f2423490790f53040ad256fca35b3ad7b516e6b1f0af051b79f812f7b701ff5ac2414dbf2d1cba319da0f4cf241041329c0c750ae63e0ec33 SHA512 80343b8b7af883afbd04734b0fe4dbdab114301234654cbd95b3ae8be8dff40878105b7647209f5e899b981ab6a7ecb987d9bdf942b32ed083c745128c22ef95
 DIST rope-0.16.0.tar.gz 243304 BLAKE2B 2c41572687ef245eb20abfccebcc9f12ecaa177be313cec59c85be5102b7358566570730a7140f952b0a1c515b479c3d21740d32d4678e65c4c572acf86f4e27 SHA512 33ba57b246337e413126309a521c54e861899b03fd250e148b97d9789cddf6eceab36609ea6e36e84ad1ac514bc3363f4937b01bcb96b6103c2a33bec1d4fb75
 EBUILD rope-0.10.7.ebuild 1113 BLAKE2B b2604b27be6546a38eaff0afedc8ba2cc02fbfc25037374be85bd5c0660b02e2d594c9f7eeaeaa35b3045c7b1bbadedfba9f8a2e7c2ac0a552c8037155a420b8 SHA512 9cb3ab0f5d1695bd1c7dbf4bb85c7b14c25f587693e9e75f19f6c54333704185f982e43155446fa472cb5b51dbaa649f28ecca201b110869fc0ee4ab99eb0e44
-EBUILD rope-0.16.0.ebuild 982 BLAKE2B f4cb03afcfdb72051ff4f7cf481f995cb223f795c9e361b229639c00b587e7ceaa529da59bf47786bdac0c4b6f55049069dc70a9a78bb79485c611ebfbac2137 SHA512 d4b1107782253fd0ead95fdb3ddf709b5efc844b1e86154f2bf300a13261ce20b6ba9634f67d8ed17b5c861719ad8edfdb984e2a7144f7a8029a275171ca90dd
+EBUILD rope-0.16.0.ebuild 975 BLAKE2B 89c9f51d3778b6489640f0d4511392cf86443fd1f2b0213eed77977e60dffa1d586e38ba03b9fdf6f4781385aa18d9015313344718e0bc1f410cdad38d8ece7e SHA512 10cb6f677aa258cf00853fa75564a6166e093579cf7ee6f3054a213428810379760e6ee2fa87adaf25b47fdd9685037aafc1e63a1aa1fb05ab4ff518022e2dea
 MISC metadata.xml 517 BLAKE2B 165eea4dc0b2ee1244b9b94f3763c90692c6483d4c09b6535197b34ace789d364c2b63de1dc9d50645ec01cc2975c6f20a95d7756c2bac78a40733e343b7968c SHA512 6289b55677d1e26372017042042229865bad64a396952c21a7d5a1f25322c2ccfed11c0a9ea0c0896573dd1f04dc3263dc3eb28ff7b0b804c2bddf231e924630
diff --git a/dev-python/rope/files/rope-0.16.0-python3.7.patch b/dev-python/rope/files/rope-0.16.0-python3.7.patch
new file mode 100644
index 000000000000..d120a8ecc514
--- /dev/null
+++ b/dev-python/rope/files/rope-0.16.0-python3.7.patch
@@ -0,0 +1,251 @@
+From 5c38f7c8ba23813b475dcb24fa66ed3fc52d1658 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
+Date: Mon, 13 Jan 2020 15:07:46 +0100
+Subject: [PATCH 1/4] Use .is_alive method instead of a deprecated .isAlive in
+ threading.Thread
+
+---
+ ropetest/type_hinting_test.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/ropetest/type_hinting_test.py b/ropetest/type_hinting_test.py
+index 7cc02bb1..afb98e19 100644
+--- a/ropetest/type_hinting_test.py
++++ b/ropetest/type_hinting_test.py
+@@ -198,18 +198,18 @@ def test_hint_parametrized_iterable(self):
+                + self._make_class_hint('collections.Iterable[threading.Thread]') + \
+                '    def a_method(self):\n' \
+                '        for i in self.a_attr:\n' \
+-               '            i.isA'
++               '            i.is_a'
+         result = self._assist(code)
+-        self.assert_completion_in_result('isAlive', 'attribute', result)
++        self.assert_completion_in_result('is_alive', 'attribute', result)
+ 
+     def test_hint_parametrized_iterator(self):
+         code = 'class Sample(object):\n' \
+                + self._make_class_hint('collections.Iterator[threading.Thread]') + \
+                '    def a_method(self):\n' \
+                '        for i in self.a_attr:\n' \
+-               '            i.isA'
++               '            i.is_a'
+         result = self._assist(code)
+-        self.assert_completion_in_result('isAlive', 'attribute', result)
++        self.assert_completion_in_result('is_alive', 'attribute', result)
+ 
+     def test_hint_parametrized_dict_key(self):
+         code = 'class Sample(object):\n' \
+
+From df3567f2afac8b5c5b50f8b7a01e21259e397f81 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
+Date: Mon, 13 Jan 2020 15:29:14 +0100
+Subject: [PATCH 2/4] Direct import from collections is getting deprecated.
+
+---
+ rope/base/utils/datastructures.py | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/rope/base/utils/datastructures.py b/rope/base/utils/datastructures.py
+index 0cb16cf2..3790a6e1 100644
+--- a/rope/base/utils/datastructures.py
++++ b/rope/base/utils/datastructures.py
+@@ -1,10 +1,13 @@
+ # this snippet was taken from this link
+ # http://code.activestate.com/recipes/576694/
+ 
+-import collections
++try:
++    from collections import MutableSet
++except ImportError:
++    from collections.abc import MutableSet
+ 
+ 
+-class OrderedSet(collections.MutableSet):
++class OrderedSet(MutableSet):
+ 
+     def __init__(self, iterable=None):
+         self.end = end = []
+
+From fa5626ea99a6cac4780184d708108a98bd7e6095 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
+Date: Mon, 13 Jan 2020 16:36:01 +0100
+Subject: [PATCH 3/4] Don't use underscored _ast, but use ast instead
+
+---
+ rope/base/ast.py            | 15 ++++++++-------
+ rope/base/utils/pycompat.py |  6 +++---
+ 2 files changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/rope/base/ast.py b/rope/base/ast.py
+index d43c83c5..d24524e7 100644
+--- a/rope/base/ast.py
++++ b/rope/base/ast.py
+@@ -1,5 +1,6 @@
+-import _ast
+-from _ast import *
++from __future__ import absolute_import
++import ast
++from ast import *
+ 
+ from rope.base import fscommands
+ 
+@@ -18,7 +19,7 @@ def parse(source, filename='<string>'):
+     if not source.endswith(b'\n'):
+         source += b'\n'
+     try:
+-        return compile(source, filename, 'exec', _ast.PyCF_ONLY_AST)
++        return ast.parse(source, filename='<unknown>')
+     except (TypeError, ValueError) as e:
+         error = SyntaxError()
+         error.lineno = 1
+@@ -32,7 +33,7 @@ def walk(node, walker):
+     method_name = '_' + node.__class__.__name__
+     method = getattr(walker, method_name, None)
+     if method is not None:
+-        if isinstance(node, _ast.ImportFrom) and node.module is None:
++        if isinstance(node, ast.ImportFrom) and node.module is None:
+             # In python < 2.7 ``node.module == ''`` for relative imports
+             # but for python 2.7 it is None. Generalizing it to ''.
+             node.module = ''
+@@ -42,7 +43,7 @@ def walk(node, walker):
+ 
+ 
+ def get_child_nodes(node):
+-    if isinstance(node, _ast.Module):
++    if isinstance(node, ast.Module):
+         return node.body
+     result = []
+     if node._fields is not None:
+@@ -50,9 +51,9 @@ def get_child_nodes(node):
+             child = getattr(node, name)
+             if isinstance(child, list):
+                 for entry in child:
+-                    if isinstance(entry, _ast.AST):
++                    if isinstance(entry, ast.AST):
+                         result.append(entry)
+-            if isinstance(child, _ast.AST):
++            if isinstance(child, ast.AST):
+                 result.append(child)
+     return result
+ 
+diff --git a/rope/base/utils/pycompat.py b/rope/base/utils/pycompat.py
+index 1214658f..de7cf2e4 100644
+--- a/rope/base/utils/pycompat.py
++++ b/rope/base/utils/pycompat.py
+@@ -1,5 +1,5 @@
+ import sys
+-import _ast
++import ast
+ # from rope.base import ast
+ 
+ PY2 = sys.version_info[0] == 2
+@@ -15,7 +15,7 @@
+     str = str
+     string_types = (str,)
+     import builtins
+-    ast_arg_type = _ast.arg
++    ast_arg_type = ast.arg
+ 
+     def execfile(fn, global_vars=None, local_vars=None):
+         with open(fn) as f:
+@@ -34,7 +34,7 @@ def get_ast_with_items(node):
+ 
+     string_types = (basestring,)
+     builtins = __import__('__builtin__')
+-    ast_arg_type = _ast.Name
++    ast_arg_type = ast.Name
+     execfile = execfile
+ 
+     def get_ast_arg_arg(node):
+
+From 431d35d3e7ed2286bea2d13908cd80a0e42a9b13 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Mat=C4=9Bj=20Cepl?= <mcepl@cepl.eu>
+Date: Tue, 14 Jan 2020 15:00:36 +0100
+Subject: [PATCH 4/4] Work with deprecated types and using aliased ones.
+
+Fixes #247
+---
+ rope/base/oi/type_hinting/utils.py | 50 ++++++++++++++++++++----------
+ 1 file changed, 34 insertions(+), 16 deletions(-)
+
+diff --git a/rope/base/oi/type_hinting/utils.py b/rope/base/oi/type_hinting/utils.py
+index aec82ac0..ce90dfeb 100644
+--- a/rope/base/oi/type_hinting/utils.py
++++ b/rope/base/oi/type_hinting/utils.py
+@@ -1,8 +1,12 @@
+-import rope.base.builtins
++import logging
++try:
++    from typing import Union, Optional
++except ImportError:
++    pass
+ import rope.base.utils as base_utils
+ from rope.base.evaluate import ScopeNameFinder
+ from rope.base.exceptions import AttributeNotFoundError
+-from rope.base.pyobjects import PyClass, PyFunction
++from rope.base.pyobjects import PyClass, PyDefinedObject, PyFunction, PyObject
+ from rope.base.utils import pycompat
+ 
+ 
+@@ -66,33 +70,47 @@ def get_lineno_for_node(assign_node):
+ 
+ def get_mro(pyclass):
+     # FIXME: to use real mro() result
+-    l = [pyclass]
+-    for cls in l:
++    class_list = [pyclass]
++    for cls in class_list:
+         for super_cls in cls.get_superclasses():
+-            if isinstance(super_cls, PyClass) and super_cls not in l:
+-                l.append(super_cls)
+-    return l
++            if isinstance(super_cls, PyClass) and super_cls not in class_list:
++                class_list.append(super_cls)
++    return class_list
+ 
+ 
+ def resolve_type(type_name, pyobject):
++    # type: (str, Union[PyDefinedObject, PyObject]) -> Optional[PyDefinedObject, PyObject]
+     """
+-    :type type_name: str
+-    :type pyobject: rope.base.pyobjects.PyDefinedObject | rope.base.pyobjects.PyObject
+-    :rtype: rope.base.pyobjects.PyDefinedObject | rope.base.pyobjects.PyObject or None
++    Find proper type object from its name.
+     """
++    deprecated_aliases = {'collections': 'collections.abc'}
++    ret_type = None
++    logging.debug('Looking for %s', type_name)
+     if '.' not in type_name:
+         try:
+-            return pyobject.get_module().get_scope().get_name(type_name).get_object()
+-        except Exception:
+-            pass
++            ret_type = pyobject.get_module().get_scope().get_name(
++                type_name).get_object()
++        except AttributeNotFoundError:
++            logging.exception('Cannot resolve type %s', type_name)
+     else:
+         mod_name, attr_name = type_name.rsplit('.', 1)
+         try:
+             mod_finder = ScopeNameFinder(pyobject.get_module())
+             mod = mod_finder._find_module(mod_name).get_object()
+-            return mod.get_attribute(attr_name).get_object()
+-        except Exception:
+-            pass
++            ret_type = mod.get_attribute(attr_name).get_object()
++        except AttributeNotFoundError:
++            if mod_name in deprecated_aliases:
++                try:
++                    logging.debug('Looking for %s in %s',
++                                  attr_name, deprecated_aliases[mod_name])
++                    mod = mod_finder._find_module(
++                        deprecated_aliases[mod_name]).get_object()
++                    ret_type = mod.get_attribute(attr_name).get_object()
++                except AttributeNotFoundError:
++                    logging.exception('Cannot resolve type %s in %s',
++                                      attr_name, dir(mod))
++    logging.debug('ret_type = %s', ret_type)
++    return ret_type
+ 
+ 
+ class ParametrizeType(object):
diff --git a/dev-python/rope/rope-0.16.0.ebuild b/dev-python/rope/rope-0.16.0.ebuild
index a60999bb3c8d..7854b2c3f39a 100644
--- a/dev-python/rope/rope-0.16.0.ebuild
+++ b/dev-python/rope/rope-0.16.0.ebuild
@@ -21,9 +21,11 @@ IUSE="doc"
 # setup.py, using standard docutils builds docs successfully.
 DEPEND="doc? ( dev-python/docutils[${PYTHON_USEDEP}] )"
 
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib:." ${EPYTHON} ropetest/__init__.py
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-python3.7.patch
+)
+
+distutils_enable_tests pytest
 
 python_compile_all() {
 	if use doc; then
@@ -33,7 +35,7 @@ python_compile_all() {
 		for i in ./*.rst; do
 			rst2html.py $i > ./build/${i/rst/html} || die
 		done
-	   	popd > /dev/null || die
+		popd > /dev/null || die
 	fi
 }
 
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index 527750ef53b4..7b80d59cb0fc 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,3 +1,3 @@
 DIST Routes-2.4.1.tar.gz 182403 BLAKE2B 21a079616e1533af8fae44b0ad428b3309e5e8d1e27dddddbf3632cb3e1f5286225aec73246012a8c7c22d59d755be27f10fa09ab6ee6b34f71c6c540dfd36e4 SHA512 b0566f10ca83af0459e9c59fa2217bdc5ebf349d944396bcb21ffa731ad189c642e409381979cb5da3153630c24f20aa974a99711f16aca9f91413976af2bb04
-EBUILD routes-2.4.1.ebuild 1547 BLAKE2B b2a31ea7e24c2f71f36a45652d6702e52f6a4664d39c1655456237816455ab223f3c42f3966d25e678a7234708b900c21fb97c5e376b81f7d56a297210e7d2a7 SHA512 746fcb675c94e1822defa4e5c0c1dbbb98e3d4abc8d00139aeeca8251dda9e14f53fd102d12313c84b3d58e880c1e48cba62d2881f5b782a25a6f36a80c1bc55
+EBUILD routes-2.4.1.ebuild 1554 BLAKE2B 1bd301929542cf5594a12ebaad58e41fdb98699d91aba2b9c3d75d569f86e467dbaccb62e531df411dfe94ea763fc63f2ef83defc28f4d22a9e57d1aedd9a2b4 SHA512 8bc1d9a44fa2411276972e1627af73f46c1e23b02d66935d93c0148fea8be21c55db0c2a2ed022533c17c9f95e0dcedf0a6615df10756eb7767f3bd8128f2376
 MISC metadata.xml 309 BLAKE2B 58e1b02098e87fe7303e9a6ce962897750493b957d3b30f78feb58b9cbec84b5fcf80acde66da35caa71989b628a75d232ea567e679f891fb4b81d1c49f61d06 SHA512 6daa7dcc2ae185c198c2630961d68c19498e98bce96ea3b1390a4c159fb591a89af796f2ac90e00994bda52c36138792797a38975c772d6fabce09cf0536722a
diff --git a/dev-python/routes/routes-2.4.1.ebuild b/dev-python/routes/routes-2.4.1.ebuild
index 4b17f617e2ba..fed9cbe23a3f 100644
--- a/dev-python/routes/routes-2.4.1.ebuild
+++ b/dev-python/routes/routes-2.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/rtgraph/Manifest b/dev-python/rtgraph/Manifest
deleted file mode 100644
index ad8cef604593..000000000000
--- a/dev-python/rtgraph/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST rtgraph-0.70.tar.gz 16141 BLAKE2B dbcb4449842507e14fc45c6ad69f98564d3f826027d31644ccf13ac938796fdf2c09a2ec71668bcc908cd7180c35fa66090473df8e78bd27d7468f4ec24bf873 SHA512 73d226ba09a658f6957fa82e4956de967ef7b02ca08ac1e33a16c1c0ffe1426afef35e7c720342524c6389e42d994db9ff3404d413ddec5168980e2e1982ea34
-EBUILD rtgraph-0.70-r1.ebuild 846 BLAKE2B 421bb565f8a0b60899de4e64c5328139e9faa369299312f17fcf91d9baab7848196825a6bbbaea6330602c79e327f6dbc9f9ff29ba76e430fa9137b6dc369a8a SHA512 9dbb6e27861accc493a85a53f6c10031706d1ffa726ef0af2aa67d97988f537e9baa9662596decfce97aff2dd25f6d5baadbd86542e3179a650ec05cc90bbe60
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/rtgraph/metadata.xml b/dev-python/rtgraph/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/rtgraph/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/rtgraph/rtgraph-0.70-r1.ebuild b/dev-python/rtgraph/rtgraph-0.70-r1.ebuild
deleted file mode 100644
index 2b082cbc1d23..000000000000
--- a/dev-python/rtgraph/rtgraph-0.70-r1.ebuild
+++ /dev/null
@@ -1,32 +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
-
-DESCRIPTION="Widgets for graphing data in real-time using PyGTK, and UI components for controlling the graphs"
-HOMEPAGE="http://rtgraph.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rtgraph/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
-IUSE="examples"
-
-DEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_prepare_all() {
-	if use examples; then
-		mkdir examples || die
-		mv ./{cpu_meter.py,graph_ui.py,isometric_graph.py,line_graph.py,polar_graph.py,tweak_graph.py} examples || die
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ruledispatch/Manifest b/dev-python/ruledispatch/Manifest
deleted file mode 100644
index bd5a5bc8f0fa..000000000000
--- a/dev-python/ruledispatch/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX ruledispatch_as_syntax_fix.patch 1650 BLAKE2B 00d2f5879bb602b24a2632b4fe02a2b72dff7f214e2e8092161cdd371ecd01b230cf1c88f26ab6db11a825e09cf4eef9d8468492119c54b51636c7c54d7e3bda SHA512 c8ba8d570f82975195be4478c8309c62372ec1f3693bfa9b1fb5a208a56f0984c62d0f2ad9f27751197f144acf9795d1cc0d1b599bcd494a3ffe017aa9fdd89c
-DIST RuleDispatch-0.5a0.dev-r2306.tar.gz 186405 BLAKE2B aad8d7546ff7b26506b39e60e073aeab9f70df96dc2f41a80bee0dba100ab64376a231671168e77eb36b3e731854061699c5678085189bca416d3da9ce4e0484 SHA512 5ee5f22b6ba755e79c108925d321ade10c6a2e06c309e753650385d2dfbeb2830eaeccee6b71338ec38598c877625b95acf21b6059faf91e9f6119e533b133b1
-EBUILD ruledispatch-0.5_pre2306-r2.ebuild 1333 BLAKE2B 680c01b3464ecdac46d069a3c9cf980370089a2c49925600b3296662d1098a8ba805975e164c6369f0ceb466e36491449d358ca63ceb57e9725693b4b98580ac SHA512 0205352079acbcae91822cb2f523aaf8f9de483f8fe1d9d87eac87f47a531e5c2c01622263f3ad4bf37008fcdaefa2f966759b851c24e30f1dbf9b9729042005
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/ruledispatch/files/ruledispatch_as_syntax_fix.patch b/dev-python/ruledispatch/files/ruledispatch_as_syntax_fix.patch
deleted file mode 100644
index 47960b3c23f5..000000000000
--- a/dev-python/ruledispatch/files/ruledispatch_as_syntax_fix.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Added by: Jesus Rivero (Neurogeek)
-On: 25 Jul 2009
-Per Upstream bug: https://bugs.launchpad.net/ubuntu/+source/ruledispatch/+bug/342916
-
-diff -uNr RuleDispatch.orig/src/dispatch/__init__.py RuleDispatch/src/dispatch/__init__.py
---- RuleDispatch.orig/src/dispatch/__init__.py  2009-07-25 13:25:08.000000000 +0000
-+++ RuleDispatch/src/dispatch/__init__.py   2009-07-25 13:27:19.000000000 +0000
-@@ -95,7 +95,7 @@
-     return decorate_assignment(callback)
- 
- 
--def as(*decorators):
-+def as_(*decorators):
-     """Use Python 2.4 decorators w/Python 2.2+
- 
-     Example:
-Files RuleDispatch.orig/src/dispatch/__init__.pyc and RuleDispatch/src/dispatch/__init__.pyc differ
-Files RuleDispatch.orig/src/dispatch/interfaces.pyc and RuleDispatch/src/dispatch/interfaces.pyc differ
-diff -uNr RuleDispatch.orig/src/dispatch/predicates.py RuleDispatch/src/dispatch/predicates.py
---- RuleDispatch.orig/src/dispatch/predicates.py    2009-07-25 13:25:08.000000000 +0000
-+++ RuleDispatch/src/dispatch/predicates.py 2009-07-25 13:27:58.000000000 +0000
-@@ -236,7 +236,7 @@
- 
-         return or_, (EXPR_GETTER_ID,)
- 
--    [as(classmethod)]
-+    [as_(classmethod)]
-     def immediate(klass,seq):
-         for item in seq:
-             if item:
-@@ -260,7 +260,7 @@
- 
-         return and_, (EXPR_GETTER_ID,)
- 
--    [as(classmethod)]
-+    [as_(classmethod)]
-     def immediate(klass,seq):
-         for item in seq:
-             if not item:
-@@ -278,7 +278,7 @@
-             return get(argIds[2])
-         return ifelse, (EXPR_GETTER_ID,)
- 
--    [as(classmethod)]
-+    [as_(classmethod)]
-     def immediate(klass,seq):
-         if seq[1]: return seq[0]
-         return seq[2]
-
diff --git a/dev-python/ruledispatch/metadata.xml b/dev-python/ruledispatch/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/ruledispatch/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild b/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild
deleted file mode 100644
index 1c538b5e6057..000000000000
--- a/dev-python/ruledispatch/ruledispatch-0.5_pre2306-r2.ebuild
+++ /dev/null
@@ -1,45 +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 eutils versionator flag-o-matic
-
-MY_PN="RuleDispatch"
-MY_P="${MY_PN}-$(get_version_component_range 1-2)a0.dev-$(get_version_component_range 3-)"
-MY_P="${MY_P/pre/r}"
-
-DESCRIPTION="Rule-based Dispatching and Generic Functions"
-HOMEPAGE="http://peak.telecommunity.com/"
-# http://svn.eby-sarna.com/RuleDispatch/
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
-
-LICENSE="|| ( PSF-2.4 ZPL )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-python/pyprotocols-1.0_pre2306[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES=( "${FILESDIR}/${PN}_as_syntax_fix.patch" )
-
-python_configure_all() {
-	append-flags -fno-strict-aliasing
-}
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	# parallel build makes a salad; einfo msg lets us see what's occuring
-	for test in dispatch/tests/test_*.py; do
-		"${PYTHON}" $test && einfo "Tests $test passed under ${EPYTHON}" \
-		|| die "Tests failed under ${EPYTHON}"
-	done
-	# doctest appears old and unmaintained, left for just in case
-	# "${PYTHON}" dispatch/tests/doctest.py
-	einfo "Tests passed under ${EPYTHON}"
-}
diff --git a/dev-python/runsnakerun/Manifest b/dev-python/runsnakerun/Manifest
deleted file mode 100644
index 8d3e0505c889..000000000000
--- a/dev-python/runsnakerun/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST RunSnakeRun-2.0.4.tar.gz 447278 BLAKE2B ea5d8adc37249ff9338f319fe9d9aed4cbb9cf0f78d12266ce02bf47010c543f0f245b98091dc59164333a41983865a6d5b4d51e0db23d4329f119285885afc7 SHA512 2338d44ea57e7e9610e85dda5b2d806795d259e4e33e57e15f0ff8c938ba3dbcfc6df46d69f2fff3558879dd3b14725fdb7e0da939bf803776dc6bc95618ec24
-EBUILD runsnakerun-2.0.4.ebuild 561 BLAKE2B 29d791fef3e6bdf960035c3b3bcf519c75e03f5a4c9e7147e0c010e325786391442408ed78a59be88fe704816a6cc2a44de7aafa20f9bb6a4234b4d51d15fe20 SHA512 9268f185fdc510723424e00c5ec9f0277cdf706da602a64c7471353401d36740060506995b846cb2c3288b49b35c9162c3a161f1b88fef733ec31da02d86b704
-MISC metadata.xml 438 BLAKE2B f4942e9e7f6229a67d034ff203df14e9fca5ca811f4310c0f41d0306e65b3c0507828b1341965141b8e736b5a06ac62a496055c24b71a9ca811b02e44c1b4e3e SHA512 1c42c0f4bb37c94af1675e60392efa46284a89e381372e26f7038b2c782882caf4edfa2be2f836e36708fe3f838ffa7152db637d161191d80e1b94362e1291ac
diff --git a/dev-python/runsnakerun/metadata.xml b/dev-python/runsnakerun/metadata.xml
deleted file mode 100644
index e64fa8d0c00a..000000000000
--- a/dev-python/runsnakerun/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>swegener@gentoo.org</email>
-    <name>Sven Wegener</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">RunSnakeRun</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild b/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild
deleted file mode 100644
index 4638198dacf3..000000000000
--- a/dev-python/runsnakerun/runsnakerun-2.0.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-MY_PN="RunSnakeRun"
-MY_P="${MY_PN}-${PV/_beta/b}"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="GUI Viewer for Python profiling runs"
-HOMEPAGE="http://www.vrplumber.com/programming/runsnakerun/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/squaremap
-	dev-python/wxpython:3.0"
-
-S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
index d923ed6a7693..6467466f592b 100644
--- a/dev-python/semver/Manifest
+++ b/dev-python/semver/Manifest
@@ -1,5 +1,3 @@
-DIST semver-2.8.1.tar.gz 15000 BLAKE2B 71fee2372713cefd11778fb223d58cc1e41909cc8adb8b5b3330770eb1ebcaf45c3250c553c40b85c54a59b1427308e7c143e1cfadf6276d7652df339263c65d SHA512 a457b1a170b309ee563955e4c506de56a061acd4e7e92a58fd8bd78801e33207fbc5e0e026fc0ea243301bf9ecfe0b219c0d95681aa10066480cbd3974e17d3a
 DIST semver-2.9.0.tar.gz 24767 BLAKE2B 5fb9eda8c5ccc6b02997292eb6f7be0080480b21bc38bb629fa48af674ec7a356f2b9952459680281a187243acbde17968060c48e4c1af70d10f3bbdf984fbe2 SHA512 5ae9a4a66474fc82cf7e4612796a6c0e0280ad9969ff8c509e99cb266154f39a2c03c68f6167f8e17fda1ac16ce17a838e63d81bc2e78debfd07adbb7cbc098d
-EBUILD semver-2.8.1.ebuild 670 BLAKE2B 6ed66e3ec1da6db0bacb23acefb6b7f5be7c88ae40214fd022c4695d555cbda5f4713330785e2a699c6ea03a45cea5571521c386d61cd35352b7d6ca5c01e440 SHA512 c147d0c9cc363a6a2dbd3d089286a4779453999699749657b637ef42f1ed5e1b719c2026b6703fe71a96feae1a70787c04383be899e6eba99883cb060a2b6c19
 EBUILD semver-2.9.0.ebuild 728 BLAKE2B 279d3a6383dbac3100c5497ef3eadfda49909841d06c567b21a5e537f55e493003e8e339232f6d0d8c26044717769d6fd12c8ef67d52029da7d9c94c8b6a1ce3 SHA512 7fb89a6223eef6be3b5c5217537b7117cb68d6d0bd35c58dae54e68599775a535a292a19f05ca527b39f7f43a5e5d3d97a4330deee12a38cd8437f2db74748c4
-MISC metadata.xml 501 BLAKE2B 09ad734b4d8f01e46f57b531eb47f27ce9ff18843e1796b96dcb664a23ca1a675fbfdcaf687452fb702811daaef61e1f3314d88d239cda37db75dda9764bbc21 SHA512 24204b5aece1f9f750ab0d6b0ffccd0d46aa33bfe87020866c4e82f5e3939028fef305b39a1b5536efb521e838a300972b755295b772348569f0b6cd8f30a763
+MISC metadata.xml 378 BLAKE2B c5a9b5c47963a1816ac261fb13f94438d4c3e55a7c7d1ef69ffac63ecd141e63b7b87d90dde26550d521615ea81f40e045ae0e61c9af111d10fbf89abb93284d SHA512 7622874a382b49f80d9565b77ea4c279e560e207c8b149b4b5f386f969c74e92f68b1687de306dc453231c36be3f6a1b9d526d175b555e17d00f467d86dbe41d
diff --git a/dev-python/semver/metadata.xml b/dev-python/semver/metadata.xml
index 6ddccbbf5f06..f6192cec3f7d 100644
--- a/dev-python/semver/metadata.xml
+++ b/dev-python/semver/metadata.xml
@@ -5,9 +5,6 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
-	<longdescription lang="en">
-		A Python module for semantic versioning. Simplifies comparing versions.
-	</longdescription>
 	<upstream>
 		<remote-id type="github">k-bx/python-semver</remote-id>
 		<remote-id type="pypi">semver</remote-id>
diff --git a/dev-python/semver/semver-2.8.1.ebuild b/dev-python/semver/semver-2.8.1.ebuild
deleted file mode 100644
index 6e1047be334c..000000000000
--- a/dev-python/semver/semver-2.8.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module for semantic versioning"
-HOMEPAGE="https://github.com/k-bx/python-semver"
-SRC_URI="https://github.com/k-bx/python-${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}]	)
-"
-
-RDEPEND=""
-
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/python-${P}"
-
-python_test() {
-	pytest -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/serverfiles/Manifest b/dev-python/serverfiles/Manifest
index 7bbdfdd7c980..9b487551525b 100644
--- a/dev-python/serverfiles/Manifest
+++ b/dev-python/serverfiles/Manifest
@@ -1,3 +1,3 @@
 DIST serverfiles-0.2.1.tar.gz 10506 BLAKE2B b653248261f05b20fa65a566e29065e97679383e44d3e8c05d10d1601376de2c39e1690a7ec1b1b3c680f407086294ea0769e030702fd01bff8833cc32889b8e SHA512 80512dfd8381f12aa143a88fb656bc7dca99fbc3c07a0b6cd9c7be8477de984a5121ffdb2f4cfe0f2150b83100b68ee478cfa7f26ea2f29e4a6fb7fe4eb0c18e
-EBUILD serverfiles-0.2.1.ebuild 738 BLAKE2B f0852bb615e616d6e6086c137c72d881ffd9d6bf7011048cc41faa03a2756dc2e6141b8dbcf09cff71a8fd42a9409b4854d7c946583e12cde3e1ee6039b8dad3 SHA512 789ec0e643d203a7b9e668876f0ccddfc118eeaddd8c64dc51be00eb33e96ec0b65ce60f108f82ada14e28e7585ed798940e16fe9bc2579496524c8f08e768f3
+EBUILD serverfiles-0.2.1.ebuild 739 BLAKE2B 23c19f274cbf6bc4448f503aef091a4e455168233a6a199d357fb5e657f4cd57210b969588d0c34ab0b1ae4aac303f5cd89251add6f4593a290d96d372b5e7a0 SHA512 692d00538dbe795ffed1dd819371790f5fd77d69c0271044cd8f9e3d4fb1572ac7698221463d1ba03dc40fd6dff503fd683a79f4d9260c59370be85abea2fa85
 MISC metadata.xml 214 BLAKE2B ee4a28a5b07deecdb0f59f382551a5f75712aac4c44a3f1b6086bdc520a5dc1cfaf67982ddeada2044128fcd551b40aba54d463d91142a3c35236cb09e119416 SHA512 e38be8dc636f8d2db14dbf8a5d673224ed83adc030db673cc59ef4c2db90884de5f4e61c3247524d12015486769ee984d1c188acb7488826e659fb36de1b46e6
diff --git a/dev-python/serverfiles/serverfiles-0.2.1.ebuild b/dev-python/serverfiles/serverfiles-0.2.1.ebuild
index 8908696f8582..6fc585fcc3a0 100644
--- a/dev-python/serverfiles/serverfiles-0.2.1.ebuild
+++ b/dev-python/serverfiles/serverfiles-0.2.1.ebuild
@@ -22,6 +22,6 @@ DEPEND="${DEPEND}
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
 
-python_test(){
+python_test() {
 	py.test -v || die "Tests fail with ${EPYTHON}"
 }
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index 098b6951c710..f3f292613741 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -4,6 +4,6 @@ DIST setuptools_scm-3.4.3.tar.gz 45549 BLAKE2B 89d6438d8edc5efe2a2c435a85f0bf513
 DIST setuptools_scm-3.5.0.tar.gz 46272 BLAKE2B 132711c8312dfbe48f9e2d3d7fcd0a86b057bbcf9a5f6b2e61afe018e116a4df96c3bf5cddf067bc92b96915f70182013749ce65b8fa5feb92ccef903859ee3f SHA512 f7e2cdae7a8a3d5ef3d12effcda5ce7f362c426e11aecaef69ef604bede9abbab2aa1eee6f5310cdd72a9bf11a927dbd1f42671e28bd467ad7b15f2dba5b81d9
 EBUILD setuptools_scm-1.15.6-r1.ebuild 1361 BLAKE2B 4dc0cbeded29fcfefeb35907a9b521b08ac86098d6d76a2c9cc7f6b11a0d6489d9d28f8970a4daaf9d5afffa5c132f7c4763ee65ccf45fe9197b77203caa3f78 SHA512 2080ab20a2054a40d35056f7b635793c013dffb195cde5fe3f9423fd4a97bafe65f9e32ce5e34a7db01078f2ae0eb2b992a5fe78c6906a521dc0ae6a017d7fca
 EBUILD setuptools_scm-3.2.0.ebuild 1288 BLAKE2B 2f42bf2144b45a5dab3032e1d34bbcda38c3f91bd99dbae2d02ee2494548b1d35c836e1c1c28790c42ddc206535b891213b92d6f81310aaf2a33e10a0dff3076 SHA512 8032f383b785ceaaccf4679c0a598535381a83d551a783dd5b7c3389d061d9dc193e63d1c2df6d845023b787e31d29ddf3dbb7a311f31f66402cc88171a6759e
-EBUILD setuptools_scm-3.4.3.ebuild 1092 BLAKE2B 11fe9066c0348d42526a111a48f7cec3417eac33f55062fe95b165bc221940311b130981bc583d889e402cbb860b45e6546085e2ee5b624439aa75f394055236 SHA512 b2466ae88084251882de4dd3033022fdfd37dcf6529462380e9283d279bc08491e594f243da60a226f2d53c9aad0fb1225384bcbed9002048cf7de98911d7d77
+EBUILD setuptools_scm-3.4.3.ebuild 1086 BLAKE2B 7a1da61807b7a2e9a101fca7843b9cf74815ce8863f8ed35d141c305626b7b5690fd58bef3610a3df39adb3dd27d7e8ee0d4828872657b4fec616e20bbc8018c SHA512 e3f696ca2f91e6ae8fca7ba5b7a2dd2ee064996bfd115d90c8924fc583b5a777f31cd54de122d0ce96f986c01864c143d0aaa619740582532b3d8698456eaaa7
 EBUILD setuptools_scm-3.5.0.ebuild 1095 BLAKE2B bd6fd2761f7bcee78b563822ee62860a2bfd0e79c32ec2a63c9579482f5e612a7fe02964a4d55556ad70e2768926c31e9c0f63339b7cbfaf7f79dc5097006332 SHA512 8e91c5e55e85bc03b4c6f8ccd1268b349a2d0c8a32d5f236a18fae24f0e4ee01e3e8a1b395e5957674ab0b91b94c569e56820bb614b838d15479125bfb29ac28
 MISC metadata.xml 511 BLAKE2B 7ee7b4fe4bb93bca13880e9f6f2e0ae90a27fa79f1bb99395d234322a61de1b2f13906069bde898ad6a3f83e8dc03302cae1fe24eed92e1b7fe6e349b98ed957 SHA512 cf1e97d13c127fa92e8bc5e5d41bb308761c6b75f267969662162f50a4a1a9d9f80bd2cb037711d2f5c7204204ddb9873f21cae5d6831a3127f3cddee3878a31
diff --git a/dev-python/setuptools_scm/setuptools_scm-3.4.3.ebuild b/dev-python/setuptools_scm/setuptools_scm-3.4.3.ebuild
index 170f52581dd1..342b97f16036 100644
--- a/dev-python/setuptools_scm/setuptools_scm-3.4.3.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-3.4.3.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx-epytext/Manifest b/dev-python/sphinx-epytext/Manifest
index 1c7d9c39164a..518c53d17199 100644
--- a/dev-python/sphinx-epytext/Manifest
+++ b/dev-python/sphinx-epytext/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-epytext-0.0.4.tar.gz 3590 BLAKE2B 28e0243a65c3c6e31e5cd3ddb3fce22c2930f8cde564713585e097f55e30a96ab5a16970f57bed6df5cef6f5d12957b7162d036968a467e0aa658a8c5de1a5e8 SHA512 ba56bfcc7d299c6b5498b0823bedab75875b750a596f69a17d4ee278b33f4b51716dd2ba9c5766903af99d9701ba37069b3748fb57ec0697c6871138a7f57638
-EBUILD sphinx-epytext-0.0.4.ebuild 583 BLAKE2B 23e1a45f4bd0c1c648bb659d1969f49d7159905076166ac23590c41ae44c32e38dbfde2098c48ecf706a3dde10ba161a249fdef69c7b23f33167af628413ccf3 SHA512 4b138e7e71b8f92bda1a2cb681d20e58b7c25e975d682855ef338ddee610d397ae18e7efae25552c305eb653a54103d97e84b6edb5879c31b24d031d77a688cd
+EBUILD sphinx-epytext-0.0.4.ebuild 582 BLAKE2B e10751334e582372ae5bd09e83926ff5c12fd3aa971c18eb70254465880ad6d64c6cd65a6e59f8a8503e120f3a7d867792aa96d267c25f0cbcbef4ea6e6e9ee5 SHA512 d66ebea393da1c022e78e00c94788d9249cd0dfd9d7574e3ba701942971f6bae27a2e357bfc789025b5335af0a055df640f6d92734e756179635fdb35321bfa9
 MISC metadata.xml 356 BLAKE2B 4ce928f87d2f4d479a2e942bd4b3c9b9a57d3ec2560335680345447406352d6ca27e56a3b5ef93329b7a07baa560747d86bcdb1fecee4f2a8a0ec61aba5c5490 SHA512 138f3bf854d2d4883dd4f5f2d1beed68c7822d30db5a79b899addb874555104cb875c980020f9bf924127fc10ac512c00ca5f9b62b04031790dea66174146038
diff --git a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
index 48596d30f526..6bc1ccc7db95 100644
--- a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.7.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-issues/Manifest b/dev-python/sphinx-issues/Manifest
index 9c7a3428373f..fbcf6756906b 100644
--- a/dev-python/sphinx-issues/Manifest
+++ b/dev-python/sphinx-issues/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-issues-1.2.0.tar.gz 8051 BLAKE2B 2f17738719f92be1e4ef2d7e2e0b7c123f6f924e4bfea82e2151ed96b9fdbe2cf676bddc5c009a947e1172a84131a1a58a3bf0758f045a636bd4cb7ec496fa68 SHA512 8814e910b111f0b241bc40a93de8b6ff1acd24437f1b014b24691b3bbaaadaadaded82175067d8992bb482f4bfcdec570cdd26b4c6858d7af60d5dd3f0638b64
-EBUILD sphinx-issues-1.2.0.ebuild 713 BLAKE2B a85ba67817b30c3360946b8f4fef76f0fc5eb6ebaab8c44d7aa6a527a0759185a8699ff01f9338ec4ceea23f40907d5eb5460ffc54ebc7c5cc220ed352f36918 SHA512 73caa5d96af19b34661690a540f451bfaf2b47f2d87fb75e6ca181b9e5ec8a780441ef663f7960683db2f326972fe5028a20eb2beb4bd130695a36ec807d5371
+EBUILD sphinx-issues-1.2.0.ebuild 706 BLAKE2B 23d8b0b5fd7e5f5e7df819d44b616e838a6b1f4c30b7259631b2a31b2241f646d2548351324c7beeaf3d6f136412a9588346c495e109cb96a5840f27389755fa SHA512 5b68acec10d41736d433153df9bbc255cd05115b961d2ee624cd1f9df693afbb6c6cbe63f77144ba496351cd6ebc6f99513a4a6bc9a6e4134a2ee814b16c8920
 MISC metadata.xml 388 BLAKE2B 192707563103236482cf5de03630e3b39f6827f446ba6e058e29c384d6e989e3b96b3f54b5e353426022328f81596ba3c70c61f3f84f69b3c20f34163836b74c SHA512 3b29ce4fbde49727c8dfd8f7f28f3baea1ca5feb60a1ab21b8ac0b597326e702941cb0190903aa930d55358c092bb5ba6b31d27f9acf8940380557c562ea659c
diff --git a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
index 89ef9f180d3d..f80adc9ad393 100644
--- a/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
+++ b/dev-python/sphinx-issues/sphinx-issues-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sloria/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 03ad6ffe189e..3e6f59265ed9 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,5 +1,5 @@
 DIST Sphinx-1.7.5.tar.gz 4726802 BLAKE2B 8d828dcae1f3ebb813c5f2de8c096a3fac4ab88b424955c27592349c544b775a21703c904a54efa7f86e1967198f4950804904a82a7142a3499f33c5343506e3 SHA512 db2a8df2cdb2ed78ce2341175575c2b04a149451b2bc8a4f74ddc73e308a19d505874fdbae4e370ce48a9b1cdb4de47cdab489bc57c1b378e857d5b8d04a07b8
 DIST Sphinx-2.0.1.tar.gz 6017030 BLAKE2B a446aab8c7f5a4adc93477f4f60ca975690cb4c507d6e51393a4b2c4c56563b9a12e3ea3f85d214c6bdbc7834be107384fe9029d09a73da207fd9699c4b77ab8 SHA512 28430912917a8e3eb6efe6b69268e2a5ae06795c261f2a18ef62f781e365396832c4e4bcfaad7704b1c5f840e98a9dfb82e3b438a491a13cea5c10bee66bf23b
 EBUILD sphinx-1.7.5-r1.ebuild 3274 BLAKE2B 8cb9e111804cf3ccb4119214e6e6636769bd231fcfe9ffeed590b02a93b441e7c63eafb1e70e69125833b63ee1414243844e9ea7e87f814f33c469b40f71d736 SHA512 d7ffb502c0f57d5c8efcbb10948ae1c9ae9d2f5a3d4a19c3432e9bf9aaac97e4b905918038f1f0735d0412dbfbc00171a59242ecd1cd8d7e435f1b4f839fa921
-EBUILD sphinx-2.0.1-r1.ebuild 3505 BLAKE2B 72bfb9e21680995baa95326f8b6483554affc9aa3eff0ba80f14415763aeff773f1429d897d86cfb9ad76dfa294d28a303808007d75d83678ea4934e2a8785e5 SHA512 197ea992faa181a7ac0062fb9dd9966433cb7016ff5f3ced6facb9e9fb770a16ea266cca3a4a00ef9b40c204b573c97c595a5c937d320f03d60db3dc11c4faaf
+EBUILD sphinx-2.0.1-r1.ebuild 3500 BLAKE2B 8e6034201fb89158236edfb08ec952949d1d4c895308abe34595c89a38a5bae009aeaccafe7c76825b80bd93072de9dd07f7f9f6170e73bce8b1a984646bd134 SHA512 25ecd0285c453f19cf6c297d91b57a8e73609129097589fc2d209bb1756cc56fbdc46fda00ca048b70a6b0fc6e88f9246c4417b863f29c4f9bedcd2e15df0c08
 MISC metadata.xml 556 BLAKE2B a2689efbe3d569fa878296875f4145fdb4d83b4c4821aa636d4006b1823e5646b9cebd5341b4bc02de30985191b83461363cc892aca638e678f86a6e314dcef3 SHA512 bff6813bf9c5110c2e4f5764f911309325923cb58300c19c079d1e6de3d6c4c0bcaf4e206fa4bc11ebf54b961c7e09217310b5647029350d4f9602da6325db0c
diff --git a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
index f6d36e4910de..3d4f0e641fc9 100644
--- a/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
+++ b/dev-python/sphinx/sphinx-2.0.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 IUSE="doc latex test"
 
 # Tests automagically use latex, bug 667414
diff --git a/dev-python/sphinxcontrib-applehelp/Manifest b/dev-python/sphinxcontrib-applehelp/Manifest
index d3a973239a73..42943fdc12c2 100644
--- a/dev-python/sphinxcontrib-applehelp/Manifest
+++ b/dev-python/sphinxcontrib-applehelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-applehelp-1.0.1.tar.gz 22086 BLAKE2B 6e10329a1712cfcb1f29a3b4c23be5169507398a43f800623f2b24fd350f7e2ad16a887e87a3b68253dc348337342d3d4397d3a9d81a460c389a77ed4bdc973f SHA512 a6500bc2899f25c0b04c8649e86a6f688823e573a3f58f2b786117768e8b415acffbe79b99cff8aeb6ae3c74dd244254de120b82b7432cf61c5fabdd38f21603
-EBUILD sphinxcontrib-applehelp-1.0.1.ebuild 733 BLAKE2B 53bbc4890f32274ea468d9adca73bce6d4f6357f4f0e2b35fe6e26edeac6c7bad013b89dec54a1ccb682e3a3b9591641aa1cb65c3d2089a42d72796398353e1d SHA512 0556ac7df5bc63f00a3d20b6c5e08a993abe18a387e0cf2411efa1b12715a5076b7070227f262a293ece3cbcea617d6803b87fd6dd67804a9e4af1d6437ad120
+EBUILD sphinxcontrib-applehelp-1.0.1.ebuild 728 BLAKE2B 3dfefd591524cabc0065465e5e54d6a137744af138a786c7ddbca6c0eda744b9b98826b8d0661f7b27655e01db1e83dd955b782503352bbae74611ad065e204d SHA512 a38c0fcb56e0d74a0b64d71bb23a4fff445fe0e3b8876e5f66e21a973449bed3110e05333af8fbef3a9d140d059982a9cbcc3979c0657e36a83444488276a281
 MISC metadata.xml 326 BLAKE2B ad14acf80a55c014b396340b6f42885185c7059c9b2159662d0291c9fbc4b03b9000b612d53fd2d95eb861b410d35ca301cf00bde26ea3344219923ba1fbf3b1 SHA512 55187b429105dff1f05c80cf935da48c02fcf8b00dccd572a562d75fdba50b73183d2781d67c498c2fee181707eb32e09e7e5dc12a88e7bdfa7212f916c45543
diff --git a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
index c3c409d04600..3ae3cf171f6f 100644
--- a/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-applehelp/sphinxcontrib-applehelp-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-devhelp/Manifest b/dev-python/sphinxcontrib-devhelp/Manifest
index 82df316418bc..67f80b4098ee 100644
--- a/dev-python/sphinxcontrib-devhelp/Manifest
+++ b/dev-python/sphinxcontrib-devhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-devhelp-1.0.1.tar.gz 14016 BLAKE2B 4b8c079773d65f5fb752870dc728d8e90e03fdd2f8a4b01324838928ef2deaf2c724c0b149697a61624ea7382445e81fe261ec2b726fa3cfb5547bd053286e4e SHA512 135d6405e330cc245391646d4055988cf762d82f6473e58c64a76f3a88e7f33a66baba366e7f29e1378320bd0c374af92b0f972bceeec8c05ad0fe652a81e984
-EBUILD sphinxcontrib-devhelp-1.0.1.ebuild 735 BLAKE2B ce6a294f93b5d1c103b637a5a0959eab1dee09b0b1e0334bb94942f06ecaed6d7e054f69bc41fe44bf32d9d51b82cb81a9a528900e525746f29773aabec14ca9 SHA512 d2c74b77343b73691e089a800aa215e50d63c839600985dc32deb0c6515f738e169c3334577360e360bc161237926d89343936d550aff0b09f94b81d22198a02
+EBUILD sphinxcontrib-devhelp-1.0.1.ebuild 730 BLAKE2B 89731464f4de39f87403ed398ab414cfecf746766bd1e20238ad5bfa79eff77dd13d8bef805b94efbd4413542de1c3721b7bba25c7291f181817cf288b1e80a4 SHA512 e2688e46327eb2a96d8120cb30ab6a0ce60b24f1dc1a24c4126217d5506f367dc36d9429bb1cccfd12d792e22b6ed4e74caf6d102c7b9de73d1945851881f677
 MISC metadata.xml 324 BLAKE2B 986204c86559fccc9a83332d2a443367be0d3f6d58ee2f50d5119688db2c3bf979aa14ad41979bfe0cabab649594e6d69e83c592a4d883e6d14b4840d3dcdf4d SHA512 d4f768df06e1c208502e7f87ec3ff4481f07ff84fd77721a5afc8a7c3bb7804a17a6a5798bc056e384d2ce433954790403c0d5d5cbba459ce835659bf8072a53
diff --git a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
index 64f610892278..81c466b6ecf7 100644
--- a/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-devhelp/sphinxcontrib-devhelp-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-github-alt/Manifest b/dev-python/sphinxcontrib-github-alt/Manifest
index 9fc81a8e43a6..401eebdc0098 100644
--- a/dev-python/sphinxcontrib-github-alt/Manifest
+++ b/dev-python/sphinxcontrib-github-alt/Manifest
@@ -4,5 +4,6 @@ AUX sphinxcontrib-github-alt-1.1-setup.py.patch 598 BLAKE2B e740a7a90e6e158a7c88
 DIST sphinxcontrib-github-alt-1.0.tar.gz 3213 BLAKE2B b2449c0b635769735a23187f422f05c21c52098bd25057f4dfec5412040992417451ba21bd85dcdd71c75fe2d0ac935f745b6595bf5c77bb3facf91d48a39cef SHA512 57f5ab3a5d679634ce0c2ea8c78069f37ed5a5d3c32fe6cf61851ed4a9e8b6b9b6c882f486eb84914153b4121dacc25fd4b11edee111630001ae9bc324f2250e
 DIST sphinxcontrib-github-alt-1.1.tar.gz 3312 BLAKE2B 4665c873bff44a65b0aaac4ea853ac4edc3447850f6c18a8c7b717a84e158c6cf0c16116bbfdff8f3419b8448272a180c57283c324ab5052359da4522937abbf SHA512 b7af74e3762d51663bcc8a33d10bb63ae5fd24e220919719de5ff9421ec2ae854b84bb9f17f379fa174996edc2160580fb49b0030bab4cadbdfbcbf0a0cd509d
 EBUILD sphinxcontrib-github-alt-1.0.ebuild 904 BLAKE2B 2d7a4552fd0428367ac575851b5e6539641cf8d9c1f5f78b296018b962357dbb4a6c4d22337ab988f3b3f5f090e34059bbb7bc826633051d5c0987d9ec6295cc SHA512 fc9cf996014d2bc6367b84eccc7d2fbeb9cf3644e3efd1232186ddad961d53d52e9181b9992c99ba802e0a9d16a21c9f5b9249eab9be17e58a4ae6eaa826152c
+EBUILD sphinxcontrib-github-alt-1.1-r1.ebuild 622 BLAKE2B e82ddec60ca7172e7e0f9758dede9f87755be7e3e0a950928f1e7e7926dc6628a0a55ba2b363c61c25393a3d864a6eaaaa76616b18cfbd1dff76448530b6cea1 SHA512 f8756251e80b5bf3aa59d01428ae1fecad4d06fe872d71bd2d986aeb6f4b3468dee96244f384f0187fbdee53f5287f06ce3e16e64536f241c72e9b86a5e15581
 EBUILD sphinxcontrib-github-alt-1.1.ebuild 874 BLAKE2B 2cf478b03ceaaa5e01f65566d4501f0d838aa6d76c8ce457bfbb1869e86c7bbf066a39472cbef3873b08edd4bb3034f7925c711ea6127a42c16fed126654da7c SHA512 fdbe1db6ddaeb565be9c216ca12d9be5dc7a5cfe34c72959e015687cc4de88db9ef21191227a718ed280daa7fcf2ec113f996c8e42e0a3518eb42a3216ca58c7
 MISC metadata.xml 412 BLAKE2B 2cd07799a32942d97bbc9aaca814d37fa7a02eb748ba60da3740f6d9b37ede1abcdda4b7d36f68c5df26e9af0befa1741b0e55a3b7289e986aedafba98ec703f SHA512 6453593682ebdefbf75a1818ce26347827e3be0819bdaf7d6f407eec24394e45275d3bfec3e1cf254216b17fb6f642b2ddd06b5d92d3488706dab78a03d632a6
diff --git a/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r1.ebuild b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r1.ebuild
new file mode 100644
index 000000000000..e2c50ac186d1
--- /dev/null
+++ b/dev-python/sphinxcontrib-github-alt/sphinxcontrib-github-alt-1.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit distutils-r1
+
+MY_PN="sphinxcontrib_github_alt"
+
+DESCRIPTION="Link to GitHub issues, pull requests, commits and users from Sphinx docs"
+HOMEPAGE="https://github.com/jupyter/sphinxcontrib_github_alt"
+SRC_URI="https://github.com/jupyter/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+BDEPEND=${RDEPEND}
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/dev-python/sphinxcontrib-htmlhelp/Manifest b/dev-python/sphinxcontrib-htmlhelp/Manifest
index 7a7e3256caaa..56251135bfd1 100644
--- a/dev-python/sphinxcontrib-htmlhelp/Manifest
+++ b/dev-python/sphinxcontrib-htmlhelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-htmlhelp-1.0.2.tar.gz 25417 BLAKE2B f5f13cebf0bdeb8065fa37b12d90dcb4cf4775377b2290517105bfdcfcd7a168d10b0c84a90cdcbefa95f0d40b6bb644532e75b5616562cc37c04e103ee7bc4b SHA512 2ee6c8a91095d8f87208ea509153edc5495b9ef78231add39880e133413b1fa95e152264e5c9dfe6afc89afcb107acacc241754e7b5d86137bb5c64a851702de
-EBUILD sphinxcontrib-htmlhelp-1.0.2.ebuild 732 BLAKE2B 53517f78f8b7097800f578d877ae6f309178b64e8dbf8ed9d690b4868dc7ee26406e4d611b55548497450c260532b80dc4cf2d73a14956ba4e3175b884870d40 SHA512 43ff316f0772a148fe25314b0af6b197f96555fbc6994b9ceac5a997f7c7f6e8e5e76bb8e9a9be99a24e80c232fdaf77b37ee257e58de610888a528cb1569fbc
+EBUILD sphinxcontrib-htmlhelp-1.0.2.ebuild 727 BLAKE2B a4a4692394a7ba7ceeb96d413cca6f8fcaf237327aa0f225f57503b9eb719598db3da28a9f170614d1a7d305588c1b68051853612ff8c891acb1eddde299559f SHA512 347d2b7d8426b98168d60e2bd226a147a25180eb8e4d2f9917a17c62b9921ba494914edf275c668a7b3fc1effb87b9b3b97d877de084e44f89b2dc4c7ee4a74e
 MISC metadata.xml 325 BLAKE2B 86b320327210716251580bcde7ca53cece58e22f07973de023d09bb7a6b68cc4e4c4cace4c9b8ba73f15482332e3b94e38650468fe790e8f6c123c77b9f2ad48 SHA512 700c19351b017fed0536e0e57728b410052b2c34bf06912aedc754e4f931614f3f4b31a10bb67381134c9bd5f61f9af23f204641e8e531ec0ff9a6c1cf9eb41f
diff --git a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
index 30a1b31d4e56..24b418e45eb1 100644
--- a/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-htmlhelp/sphinxcontrib-htmlhelp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-jsmath/Manifest b/dev-python/sphinxcontrib-jsmath/Manifest
index 01eb59532140..171769b504b0 100644
--- a/dev-python/sphinxcontrib-jsmath/Manifest
+++ b/dev-python/sphinxcontrib-jsmath/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-jsmath-1.0.1.tar.gz 5787 BLAKE2B 055ff298e11678d7d30975e4bef509ece0128be30ca0c5fd2be1323c2eb4fe92f861826ea5ddfcbd2d3e3a80535b374d2b1a13446c2604f3e448d5a8982b9881 SHA512 c1e6488f5c0ca4567c27ec7c597c9db321ac32ce354c4ad62fea534b2ae1c0acb183a921f46216bbc3891f14acfaac05ddf324b8fdaf99828df07bc91aa7e5c7
-EBUILD sphinxcontrib-jsmath-1.0.1.ebuild 753 BLAKE2B ec8b71a1da80a827d70cd181dfb445d6f25b8493b7c086cd85f6db602712543c9632a733d0219b67b354c66b467356ece9a94f5a1e44461448cf1a58ed603e41 SHA512 cccab973f1233cdd1d11a57e4ccd175b251bf0d1717c8b0d7b5c31f580dee6e3c62acdca34d1ba4da6247bd7e8805c32889f088b4f8fa989b9a72f8c7faa0890
+EBUILD sphinxcontrib-jsmath-1.0.1.ebuild 748 BLAKE2B 1f13e7352899767e5f9f0b9642ca4db4e01692a8231600f09fe38f1cfaa70dc7124967260700cb2be3936bf17149c7ef86fa224459e5695adf6d24ef7292c2b3 SHA512 4c9b45cfb500b5d3132eae38ef56309cc839aa7c8747b35eb52bef49970623d07b38314641f3ee1014054321bea8b3f7fadb9479f3a682bf60d958c1b49e85ce
 MISC metadata.xml 323 BLAKE2B bae56c440e079dcb99602f6e513fb9bf5c2415292f4c058e9da93fca5c14e0048789b1f9c1000b4d83cc37bc08d2fb3008898c2417a819c1128d1efe19e46414 SHA512 03745eb2d0defdb73cfd778eb7ab217cd839f9f94ce7cc1ef70c75c326cc0ba94bbc745624f8adca19e9049a332ca57c0951b0249f8a21b95ef6015ed6f545d0
diff --git a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
index 8824725e831a..35274be34180 100644
--- a/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
+++ b/dev-python/sphinxcontrib-jsmath/sphinxcontrib-jsmath-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-qthelp/Manifest b/dev-python/sphinxcontrib-qthelp/Manifest
index 7764e7d4e1ca..220fc6d3309e 100644
--- a/dev-python/sphinxcontrib-qthelp/Manifest
+++ b/dev-python/sphinxcontrib-qthelp/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-qthelp-1.0.2.tar.gz 17804 BLAKE2B f3d6a67469c82e2a6e90b75d506ee3faa896d8ec408d60f93f74c8cc4bafb22772f85e36c286a96cecf2d7808338da233910055404969ef311f935173f06f376 SHA512 8fe840e011fabd596194f539d27a502b77ae8a6030ae1a7646b1af9f203d3578b7420ead655297b2a752f0cb0e6803247c7a79b2ccd2d4662ed9f58398947864
-EBUILD sphinxcontrib-qthelp-1.0.2.ebuild 734 BLAKE2B 5506c77d410f8ce9c2834b4b96935fe57dd79a1f08bf64f2ee9096d82124b7a40d906544f63c261c6906683179fc1ccd81bb54f7061034a9f1885640de6f4f9e SHA512 c419cb9b056a79be305ad2ef1c5d8cc5e5ff62dd0cbfb44679e23c9191cd3ef94d231708cee82b6a357c8b0c9e8aac014d22e985ee5390a308c6bc3e78690452
+EBUILD sphinxcontrib-qthelp-1.0.2.ebuild 729 BLAKE2B ac86c9d6223b6267bc8a5b76394235bb6bccb477c71d17f362f886f5212bb3ee52b139939bafb47003d402acea0f5929d23e70010a6a695e24a8af837900e6b2 SHA512 c5d22c13b9d072b4ee5301acd6f7d052627641d58f5a42ea57982a83f110a84c01abcbb76f3d1867ee4132340cb34870f03146bfddd0399b1ce8d8440e294c3d
 MISC metadata.xml 323 BLAKE2B 958abf4a10551f32a30bf4a103bf38f001d827dad8f8b7c0d737cd8d6cd5a1a7bd4bb0de765ef457875bfedc913a9303fbb94d4f8f796dd6114b1c15a3849b3a SHA512 5b1be7c4599df98adaf5c3b08b078cd15c207957c5e8e7025181be66f09cfe3331b0e1c53404c10041612c34e3cb0af388f1b1c34e3e508b609721c617dc89d6
diff --git a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
index 9abca49452c9..2a85ec64ced3 100644
--- a/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
+++ b/dev-python/sphinxcontrib-qthelp/sphinxcontrib-qthelp-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/sphinxcontrib-serializinghtml/Manifest b/dev-python/sphinxcontrib-serializinghtml/Manifest
index 5e6aa5fb81cb..89c1f805917f 100644
--- a/dev-python/sphinxcontrib-serializinghtml/Manifest
+++ b/dev-python/sphinxcontrib-serializinghtml/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-serializinghtml-1.1.3.tar.gz 15799 BLAKE2B 92771e87c61658cadfd6c1b07b7537ddd26866b94efed26af968e92929ddda5ada37cfbebd06a3ac14854a3831715ff67cd6f5401c317bbfbd5bf2d014d7356d SHA512 984d1760c61886408fe16c717aa1daea6591721928291267d519ea9c6eeab65d8a46d018a7c57aa8508ca408c9e919b7094d2580d30141ce7bacf5a18504cb55
-EBUILD sphinxcontrib-serializinghtml-1.1.3.ebuild 747 BLAKE2B 88ac9526187f0a79b3b17eb4ff8dbf3e3286544a65a0ec6f6b0e0d19046150bfd41d3b14a52be96df985e4d1113b008fe78adc5f5792dc8214ac489ef63782ac SHA512 b6863ac587c8b434509a2b86e19c6442467343b30912201651b03fb257871aa89e7cac06283df0fecab89278e85170db4f941f1cbf7d5a7bb467637061bb666e
+EBUILD sphinxcontrib-serializinghtml-1.1.3.ebuild 742 BLAKE2B 6481654a18e6a4a9eafaeb7ca6a93070610656625fc41dd70c14b5de3d7d4ebda81d0e34a83a0969a66b06883eea12bc54727ad18b1e44b1200d1a9cd8555dde SHA512 29170a29621c33dda2a1c8b6c8b57f1e9a18034fc91419259607dae819af42736319d025442e2c69d1c3719a1109ebbf025c0d6c5be0e5dc51b9966a891ba1ab
 MISC metadata.xml 332 BLAKE2B 899af9aa52c89389d9e459271ba959cef6ef3fc63701e3f0926fcc9bf93c548364cdd2f0b821e167e64ddbd0149d36b75faeaa40abb53bb83d0cab1a8d08247a SHA512 f50027d55de1b3fdc6afc87b99b2f043378cfd2e6993accd208019a84416f7d32824bd0849a18a185db739f0bf77beee794a7b3a7e6430cfd2af71f3c011e235
diff --git a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
index 094b1df36c11..eed787e62085 100644
--- a/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
+++ b/dev-python/sphinxcontrib-serializinghtml/sphinxcontrib-serializinghtml-1.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD-2"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 
 RDEPEND=""
 PDEPEND="
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index 6db6f42e9af3..08e46395d332 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,7 +1,3 @@
-DIST spyder-kernels-0.2.4.tar.gz 35750 BLAKE2B 85cc767dc1ab8e071a6c08993b3d8d383e7b9bcf85be704fcd1bc3b321ff7ec532a7ecbb6a30dc2bce2fa7fd8d74812fae07dea5e10eff6309b3ca13fb16e6d5 SHA512 d5b8af3e0b8c5af9e29864912ecd27ee27a605938f36c0a7681167fb782e4b7fb79d5ffb4ae9b77fb82676301be664a1e1dd64f2f206fee2bf047f0ef9e05941
-DIST spyder-kernels-1.0.1.tar.gz 35936 BLAKE2B d3e572ba04823869bf8a602e96195a95c39da3c0e29d6bf17eeb305e21d60d72fb8c6bda9f111558468655759f1319e2d69d12b7a3c4011c18d22570d394d64e SHA512 05a4124e44cf1ba1d56927295dc9a2fea315ffe107d0f835a36d29b0727c2d7abe35e41974d62ece23b2d5ef78baa18c1d29910c0359b6fea900216e8f093d97
-DIST spyder-kernels-1.8.1.tar.gz 52588 BLAKE2B 50cdc515da8b489d4cf3027e85a5c0e65f6ca715244eeffd4b5c8000f81a2eb8c34e64f221ff02d1a613b48ae0aaf8fbd6aa51ee78bf3f590bf3b70d786091b0 SHA512 c2bdbe862450a4c881cedfbdeb7c8a117b3d20a0faa593439308e9f52ed4d4576b32151f8edb0b1df460e538894e31971dc7dcd792b4c999b0ef9dedee654d6c
-EBUILD spyder-kernels-0.2.4.ebuild 585 BLAKE2B 71f1f3ed4344613fa7416a49d191de416bf4f968624067eedd0d1cea0c268085112dd82ef38a7b0f524dfd3c584f1e9137bf247b50a9e23d01d631f1c0beb09b SHA512 4759fa11afad501ea96af17933695c460de7b05403a2298dbc0bf7bdfe2a24fbfa443a1cae27b4f44eaefdb9b78e42f0564f6f4cf2f578cd0ece0baf1faab3e8
-EBUILD spyder-kernels-1.0.1.ebuild 585 BLAKE2B 71f1f3ed4344613fa7416a49d191de416bf4f968624067eedd0d1cea0c268085112dd82ef38a7b0f524dfd3c584f1e9137bf247b50a9e23d01d631f1c0beb09b SHA512 4759fa11afad501ea96af17933695c460de7b05403a2298dbc0bf7bdfe2a24fbfa443a1cae27b4f44eaefdb9b78e42f0564f6f4cf2f578cd0ece0baf1faab3e8
-EBUILD spyder-kernels-1.8.1.ebuild 661 BLAKE2B 4bfc86496eba4ae9bb6ad27857f4018929545edff21a3c7b9e9b7e72043ccf9521686d4cf9b80fb627e44ce7e8cec5d59273dec6329b08a09a67bd5dc7a96fea SHA512 c7c44e2c28fcc02c53548a6e00f1426d5a00820fe913eb1d3ade08e2e182ffb92813163076bbb82de7ed2b4df51d2f0b397127a963fb65cd53f68aeaba8395d9
+DIST spyder-kernels-1.8.1-gh.tar.gz 68622 BLAKE2B dc8bd62b94d392026c810a038d7e4076e6b6bcf97dce79197617666be1316935b55345d6378f15d66bd37dd4b2595afe5e40ce75857e8807ad1f1708092222f3 SHA512 aad8a641f801989bf458591f2b938fff178d04d3ae028b18ed5b6926556da840f27e1febc18cf4df9f8fcacd6ac993a5ebd192b5f9d922a16c2dbd63c2059750
+EBUILD spyder-kernels-1.8.1-r1.ebuild 1287 BLAKE2B 5d5488a7601a78a6faccb4a2449848f86b4448a855865a6e7b88bd593dd82c1f873d542b54bd8e19780063dc932e2bcc53056fc71b0ba875fe6cfcbabc945150 SHA512 b62d8b15f5483057a0b0fbb90f74128b9299a40fb3880e3e13fd7586160612d882bfebee25f0432447de7c3f2f796782a7c922f407c903d9daf42fb33e175880
 MISC metadata.xml 648 BLAKE2B 571d097dacb5bff623fac2098059d24dfe73241f2dd75f77a451859479779b945d478c13e22f4f69716de473437576bc6db870a01002a66e046d5219ab052af6 SHA512 13b2c212ea44acd0a21b30386e84f6ca2b0fa49e9ca5bcfb952d951215abd5bce5d14441cad0bfba0b39685c8e5f5e2fe1a1659101f48cb6787d17a8403231b9
diff --git a/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild b/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild
deleted file mode 100644
index 9d258220b017..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-0.2.4.ebuild
+++ /dev/null
@@ -1,24 +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="Kernels used by spyder on its ipython console"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild
deleted file mode 100644
index 9d258220b017..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-1.0.1.ebuild
+++ /dev/null
@@ -1,24 +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="Kernels used by spyder on its ipython console"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.8.1-r1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.8.1-r1.ebuild
new file mode 100644
index 000000000000..1d6aba4a10bb
--- /dev/null
+++ b/dev-python/spyder-kernels/spyder-kernels-1.8.1-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Kernels used by spyder on its ipython console"
+HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
+	https://pypi.org/project/spyder-kernels/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
+	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/wurlitzer[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	sci-libs/scipy[${PYTHON_USEDEP}]
+	dev-python/xarray[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	if [[ ${EPYTHON} = python3.6 ]]; then
+		# this fails in py3.6 for some reason
+		sed -i -e 's:test_turtle_launch:_&:' \
+			spyder_kernels/console/tests/test_console_kernel.py || die
+	fi
+
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/spyder-kernels/spyder-kernels-1.8.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.8.1.ebuild
deleted file mode 100644
index cc6a13af51d7..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-1.8.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Kernels used by spyder on its ipython console"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
-		>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
-		>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-		dev-python/wurlitzer[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder-line-profiler/Manifest b/dev-python/spyder-line-profiler/Manifest
new file mode 100644
index 000000000000..00e7a5a672e4
--- /dev/null
+++ b/dev-python/spyder-line-profiler/Manifest
@@ -0,0 +1,3 @@
+DIST spyder-line-profiler-0.2.0.tar.gz 70556 BLAKE2B 0f00c81b5598830a23df10ecbd23060e46218b39edfca80c06458da05a5b5f06ad644444f6876b5379a8cd2c4e590361c6061e22c0d70592fb8601e472a3b12c SHA512 302c5527834aae3ee940783170db08e436a311c4dee7bbbd51177c08ba8768af1c7b2d3a8af322d70dcfdb48f8e9ef86b0ccee4777ce4566e8579be98561eb94
+EBUILD spyder-line-profiler-0.2.0.ebuild 751 BLAKE2B da621337bb2d6db49ce473a1135bc7c1eb838d9c067c7983126b54a8fe277abc9bd0afc94c2072e38ba438dbb22c254b10340af14a04f61137d8f70b04038889 SHA512 f2cc7686fece03a4c04fae3a06cb6b72a2ea56e48a5bb54ecb07a0cc411be7e7f17be6ffc8d18e6062e58afd63b1868dd3555284d27e8fbfe0b6ac5455137d12
+MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-line-profiler/metadata.xml b/dev-python/spyder-line-profiler/metadata.xml
new file mode 100644
index 000000000000..8fc11184ab00
--- /dev/null
+++ b/dev-python/spyder-line-profiler/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/spyder-line-profiler/spyder-line-profiler-0.2.0.ebuild b/dev-python/spyder-line-profiler/spyder-line-profiler-0.2.0.ebuild
new file mode 100644
index 000000000000..0845ccd887a6
--- /dev/null
+++ b/dev-python/spyder-line-profiler/spyder-line-profiler-0.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Plugin to run the python line profiler from within the spyder editor"
+HOMEPAGE="https://github.com/spyder-ide/spyder-line-profiler"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/line_profiler[${PYTHON_USEDEP}]
+	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx pytest -vv spyder_line_profiler/widgets/tests
+}
diff --git a/dev-python/spyder-memory-profiler/Manifest b/dev-python/spyder-memory-profiler/Manifest
new file mode 100644
index 000000000000..59ff83df5558
--- /dev/null
+++ b/dev-python/spyder-memory-profiler/Manifest
@@ -0,0 +1,3 @@
+DIST spyder-memory-profiler-0.2.0.tar.gz 16939 BLAKE2B 305cc1b7eb0887dfa07273fd69061c55f59e31f829a751809d066569a3c48e2b10b952d9065480572a7f7ef57ebfd9a0d6ca5f50582d4f6ea040900c950abb63 SHA512 b47e6c9aa57ed1a1f9453db7c82ce4d2028c6472100230f50cf89c2f172bb05be7f49c7e6c7a664b9e45debcf273afbfc46ef3d0f0afb3bdbf90cdd4fff1e402
+EBUILD spyder-memory-profiler-0.2.0.ebuild 757 BLAKE2B 07054c8115bcd802dbdb2413cc0ff3f832796545dc99b96a157589278e4df68b2dc0a838384f580e7a98264965f3b8422948e75dec7ac46bbc0a3766b8050a3a SHA512 fe3b888b0c4b0c9fc572427f4154c1e841491dabd84dcc7a606bce076f138c6bc612be3e5a73270a1e67659dac97c6d6a8dd8d6de8aabec004af01cf9fbdef53
+MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-memory-profiler/metadata.xml b/dev-python/spyder-memory-profiler/metadata.xml
new file mode 100644
index 000000000000..8fc11184ab00
--- /dev/null
+++ b/dev-python/spyder-memory-profiler/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.0.ebuild b/dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.0.ebuild
new file mode 100644
index 000000000000..f995d4f20eeb
--- /dev/null
+++ b/dev-python/spyder-memory-profiler/spyder-memory-profiler-0.2.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Plugin to run the python memory_profiler from within the spyder editor"
+HOMEPAGE="https://github.com/spyder-ide/spyder-memory-profiler"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
+	dev-python/memory_profiler[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx pytest -vv spyder_memory_profiler/widgets/tests
+}
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
new file mode 100644
index 000000000000..9ba22144ef9b
--- /dev/null
+++ b/dev-python/spyder-notebook/Manifest
@@ -0,0 +1,3 @@
+DIST spyder-notebook-0.2.2.tar.gz 3691495 BLAKE2B 255df807c553f0d1e1ed9d8e7326e23702e900d15c139467e7e236c911d1412c71a959b5756ba5c538ccb7dbef5c75bbbd744ff2d6acbe701d51d3def9ac0ee8 SHA512 3c76beff7b709b39d1a00bb2a3391f9ee7f0439bfe2a2c49834c4e373488cc7cd690360966ea9b11d2f06cb577f3a62951aa85b00419de3dd3ef276bcbd13597
+EBUILD spyder-notebook-0.2.2.ebuild 988 BLAKE2B ec71e34cd2197e1309ca424b137a0aa7a995cd94e01e4501aef3743ae92878a0217d5a6d98e72e513c57712abe8b5b76c1a1d326095ae5eb5085f2cece8d0d66 SHA512 d3bfc0ee093e155e2e3a436da5c41d70a48346315042c36c64ad489401608b845274e749a9b0de8b949bc7cbc427680116de00fd8ea846067da6f50dbe6e3c13
+MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-notebook/metadata.xml b/dev-python/spyder-notebook/metadata.xml
new file mode 100644
index 000000000000..8fc11184ab00
--- /dev/null
+++ b/dev-python/spyder-notebook/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/spyder-notebook/spyder-notebook-0.2.2.ebuild b/dev-python/spyder-notebook/spyder-notebook-0.2.2.ebuild
new file mode 100644
index 000000000000..2b00297233bd
--- /dev/null
+++ b/dev-python/spyder-notebook/spyder-notebook-0.2.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Jupyter notebook integration with Spyder"
+HOMEPAGE="https://github.com/spyder-ide/spyder-notebook"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/notebook[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/pytest-mock[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+DOCS=( "README.md" "RELEASE.md" "CHANGELOG.md" "doc/example.gif" )
+
+# Tests do not work inside virtx/emerge for some reason, core dumped
+RESTRICT="test"
+distutils_enable_tests pytest
+
+pytthon_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
new file mode 100644
index 000000000000..c74f1831fb1d
--- /dev/null
+++ b/dev-python/spyder-terminal/Manifest
@@ -0,0 +1,3 @@
+DIST spyder-terminal-0.3.0.tar.gz 8396164 BLAKE2B 6fc185501f9a462f1a05f105394d13a89b669366e71bcce50984c90e3aa21d964fd2f19a56f7f33a1a80b5ff1f591d9d654d28df89a3dbc766557cea98e88c61 SHA512 88ff85c5cea984b54250bfe722c34d3c7008dac2ecb03aca219a127b9bd08352f8e467e09794b0ec3243f31ffbd7c5c51dc4b47ef277e0b5f78f3362a2f2a5ee
+EBUILD spyder-terminal-0.3.0.ebuild 993 BLAKE2B d31639f8a0ebeb6651ea2dc5fed317f232afce51814c64f6ba37b48672eb1149b18e3a338243525a2dabded15c4f82941ddc31b532381d836dea350e8d7eef5f SHA512 b810eb55e1813a0d79d128e0de517b47a238937ac8b071d985496b6009b7951406c179683702c561bda20d118ab878af6bfc0cce2a6cf860609e393d8fa850b2
+MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-terminal/metadata.xml b/dev-python/spyder-terminal/metadata.xml
new file mode 100644
index 000000000000..8fc11184ab00
--- /dev/null
+++ b/dev-python/spyder-terminal/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/spyder-terminal/spyder-terminal-0.3.0.ebuild b/dev-python/spyder-terminal/spyder-terminal-0.3.0.ebuild
new file mode 100644
index 000000000000..80feafe7ea82
--- /dev/null
+++ b/dev-python/spyder-terminal/spyder-terminal-0.3.0.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,7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Run system terminals inside Spyder"
+HOMEPAGE="https://github.com/spyder-ide/spyder-terminal"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/coloredlogs[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	>=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
+	dev-python/terminado[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# This works as regular user, but not inside virtx for some reason
+	# core dumped
+	rm spyder_terminal/tests/test_terminal.py
+
+	distutils-r1_python_prepare_all
+}
+
+pytthon_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
new file mode 100644
index 000000000000..f4d304a754d2
--- /dev/null
+++ b/dev-python/spyder-unittest/Manifest
@@ -0,0 +1,3 @@
+DIST spyder-unittest-0.4.0.tar.gz 74408 BLAKE2B d1d8d3b331fefda5c918deb811052518109592919bce07006b49a533f85bc82e8a6efcb0eb4c9b799ef736eb1a5744bd637fdc1bf4f123b0ad5d742ca9c41027 SHA512 fe402b19bb7c2350cd27d1b5786840ed10736db042ee0b630d29a78aaee1e6cdfb3588eb8bd9bf9e124fdcaaab253e0c67e75480d26f41a16f678a7176db53d0
+EBUILD spyder-unittest-0.4.0.ebuild 996 BLAKE2B a2191561f19b1af5e455ab326ecdb56b38f4c0a588eb6f982f3f3879cd00d217488a48a87989db1e6269f7448e11e494eb58d46a126ff17579debfde3f8009e1 SHA512 ae41704e05b536646dcf46580df8cd302114c8a5a15f4dfd4baf0b8a3d48964838fd00000a4f51255250591425079c182727bb8233a5c69262b3fa1c2e5b480f
+MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/spyder-unittest/metadata.xml b/dev-python/spyder-unittest/metadata.xml
new file mode 100644
index 000000000000..8fc11184ab00
--- /dev/null
+++ b/dev-python/spyder-unittest/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/spyder-unittest/spyder-unittest-0.4.0.ebuild b/dev-python/spyder-unittest/spyder-unittest-0.4.0.ebuild
new file mode 100644
index 000000000000..e13f6bbc8f2f
--- /dev/null
+++ b/dev-python/spyder-unittest/spyder-unittest-0.4.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Plugin for Spyder to run tests and view the results"
+HOMEPAGE="https://github.com/spyder-ide/spyder-unittest"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/spyder-4.0.0[${PYTHON_USEDEP}]
+	dev-python/pyzmq[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/nose[${PYTHON_USEDEP}]
+	dev-python/pytest-qt[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	spyder_unittest_test() {
+		# fails to test in ${BUILDIR}/lib
+		# test do work if executed directly in the extracted tarball
+		local PYTHONPATH="${WORKDIR}/${P}"
+		pytest -vv spyder_unittest/tests spyder_unittest/widgets/tests
+	}
+
+	virtx spyder_unittest_test
+}
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 96429eb62226..6785d1d2171c 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,16 +1,6 @@
-AUX spyder-3.2.4-build.patch 5706 BLAKE2B 60eea8e3dcb3bd6a5b80e2b30322ad7d514ca4011a6edefb325e468d692f790beadb8598f2d24b20d2015e77c9eb10388c3354b3417c96a5a2bdc5e02f4a0c38 SHA512 41fa116652af0b2a93e25e1c39c450c9bc5cc7bf76afde75e8b53845d7fa8be822c6763ca48ea4cbcb64e72cac927c832233bb681c9950a272da517234464123
-AUX spyder-3.2.8-build.patch 5652 BLAKE2B f4d9fca3670d8c2f3e8dc3e58b00ffe1bb49bdb9ded28db865e1005a8cc86755b32bbf53dcb618e759f116c2cc3a13b58b7c501d9dfaf2723e564372934a4d1c SHA512 e1d758be7b9c5221ec317b9e254e959bc0d6ce6bc01259c4291dcffbc0000fbaaca7660cc3b18a7ee14ea49f2addcde2e00bfdf251dcadb34b6cbb35984f95f1
-AUX spyder-3.3.0-build.patch 2228 BLAKE2B 915d17e7e61d37e1556f6de8aa594a2c338988223e3fc153ddbcbc13509e9b9459b52f1da786a2a0da5537e6ca66bc1ec99359308266c5afe8e78c99bcd307e2 SHA512 f65d34701fcdc4548ae8791c6aa63562dc5048fef7365fc50524e462b55b4e99ad5e71926d760dc326787355357116a89b5db040af59c6651a158593b3555f2e
-AUX spyder-3.3.1-build.patch 2207 BLAKE2B 74e44757aa6e5c9466b9fd49be6ad3d5527f60910de98248d61ca5af85535fd1a65525a849d57d84f807f72a4b178c04427838abe58d035b1bf74b4b5b03536c SHA512 8483c386c4df251661dd871f51c1ce0abdb499528261c1e0c157b14e1c4022b843ab916518abe072d4a48dfa8316de13e83b587815188310f584e765105569d4
-AUX spyder-4.0.0_beta1-build.patch 2215 BLAKE2B a556684e19cd204670f12364f4b0c6da6444c7b0f95af15115d760bdd244de6180610337e0cac79628dd26e06085dd1bbaf4dcba8c012afa26ea44e4794b6b18 SHA512 9c41203efbaf4ca83b61eec27719499b29fe69cbd32d5fe16fb934bc8d8a89af5dee521c526b058f68925a82912451d67cb6d2e88e8eaa0700c3042ef508b174
-DIST spyder-3.2.4.tar.gz 3345797 BLAKE2B 2df946f257fee7e87dd922b6ed3b3c0fa02438560cb7fa4087f25498eb134bfc8c342a0a928be37f08448dfea2917380a8521ead13954091b1854616012ace91 SHA512 46e89c68545695d1e64aaafdd2ed724b152a41088f1bfa645b8c66d8ae6bcc2d86e9830cd3f16edfb8027aad5786dfb67f2a8371839dd515df8ebe34446716e6
-DIST spyder-3.2.8.tar.gz 3414627 BLAKE2B 95f85f719eba20eb9fed5183cfac582b040abc93724df512188d14167a1663c5be9906dfc499feda9f8b0d7a713c093dbf98e4f20f732e0e9669397e1b7c8482 SHA512 03dea90632af510cfc8c4cc684068213a54dac9eef671f04c83663dd40eb480a4b818e2d040efa7a78a0d17044018aa76f2931abbf344eb684094fc7a86ddf5e
-DIST spyder-3.3.0.tar.gz 2782654 BLAKE2B e85ef52109c723d6b1b011f0e81ab3a46d3e0e6ba72fd34a1eda9ed650c9e03532e8fd72e05365367f62035a6f03d6ec32d35314c54438bf639070c7bebfb4d6 SHA512 53a2b438afe245092eda4d202d2453b5b93d6682aafcdb00bf251ddcdb30cee2d81d8adadbe23fa36f64fa5f917b327690cb8f9e2cf5c0da2841b5eda648a26f
-DIST spyder-3.3.1.tar.gz 2786730 BLAKE2B d906b5750cb620db41aec514a64d132b9ee5a992047828faffe11af5abd22d0cec7b876dfe79c6d378804373e8db5c661214f5730833e7599bf13b80d4dc16d6 SHA512 91d648a2717b5d5386115ba800fdd98884e609b213007dbaa09c7d16335f1b9ec3d0bc6b32d1677db8c2704e990e70eaa04d6d1efc800008cddfa511105e9c68
-DIST spyder-4.0.0b1.tar.gz 2986758 BLAKE2B 7fa918a569ed26d1d71ea7bce725f1b7d5db54badf3fb7bad1265d93f2ebdf25b1246acefb4f8517a6f34968bf8f12331958afcf72fc3c162e0d06d9dc4d4c72 SHA512 5751434b7ffac4d1e0c535f8a842656c3a306ed3d8a275a06a0eb57d3cd9bb36d01341723159292cba8616fcadc7157387fdb334b2ab0efbc1bb6b920102015a
-EBUILD spyder-3.2.4.ebuild 1658 BLAKE2B 555e0c53bfb8a5e036d4b6a243c82c724e9db332cc619702d430402140eb557d5a7d5569b8d57ec55634d50455d0167599f636f44e4efabcebc5e77b8ef52f65 SHA512 6078fb492ebada12f02fb7fde976f71e630a5170e7b2d857ab670ce975ea56033c1fbd3506ae9e61ac154273e45d435561be8fd9fed7129733a474bd64e9068e
-EBUILD spyder-3.2.8.ebuild 2516 BLAKE2B e08a262255f8833e0e59733fdccd7c931ce570859c6045120b90cfa6f67e6ffdae463dee54397f565fca2efd8cbb6b8797f8219c3e5039983d69ff4fc62999e7 SHA512 a8cc91c90aa9a2cd0a3289b42bc7133b4010fe26cc93560cff7240d5d2f58f534c552c7f7602dfc6da09b42a96d2fb571d578349b61f484ca86fc943ebf71cdc
-EBUILD spyder-3.3.0.ebuild 2398 BLAKE2B ab72c384cd51bdbadb87bf96e3be91088f7aa1d96ff1e74499d980326d47cf57b3e5284fb9c2771aad843c25edf7e83806beb06788e80ec3dc9a9b894b059c69 SHA512 b4c7922fc340e05aad0b99ddcdc08218797f664bca6e9a54b6dc398f47d53107548249e83a4b957ebb6a3918e2be6a706fd66ae10c4de9114b7ba0ee68346378
-EBUILD spyder-3.3.1.ebuild 2398 BLAKE2B ab72c384cd51bdbadb87bf96e3be91088f7aa1d96ff1e74499d980326d47cf57b3e5284fb9c2771aad843c25edf7e83806beb06788e80ec3dc9a9b894b059c69 SHA512 b4c7922fc340e05aad0b99ddcdc08218797f664bca6e9a54b6dc398f47d53107548249e83a4b957ebb6a3918e2be6a706fd66ae10c4de9114b7ba0ee68346378
-EBUILD spyder-4.0.0_beta1.ebuild 2453 BLAKE2B ea5096e533b650d279c803e083cc26716378d9e59434e75a51c310116d3faf7e3040467a227bb8c4baff532a7ce2c946ae603345da88c1f78adca9ef5e14f5ac SHA512 a3cee247168990dbf67f3f9a2c8d7f5cf0e9e10d16e6ebb91cd178ac044ed2e3357195462cd08af374ad68e9319e401dfc7616934f87836273630722ecd53617
-MISC metadata.xml 1371 BLAKE2B 1b79aa84224554c57dc9ba4cfb888a9d18ed1b5fc99b6912de2603ac9c7866a4abb0a43a8a86df516b2b5ef3c4a0cdb18c20ea648e59002635affbdc813e2589 SHA512 8af58f099e6a7d97bd266c2d09b44ef51ec71a3ae51d61caf49968d6ecb8d830e4003171080011d390e9a27fd3010f95f22e9555a702f26e6635a4e1e02db537
+AUX spyder-4.0.1-build.patch 1503 BLAKE2B 06d768f741703df74bf9183c6a80e4507a6e0afaf6eeae3cbf8f5f00dbf5f07a02d7f0f7639f5e91f412b1d08c7de58347b2a336b262ab2dd2bf0982978a1ee4 SHA512 ee372db7b1dfa4c77feaee6b9def35c4238df00cc8cd7de1ba5a309672ce1b60b2e84f9e9eae552d08f26dd73cd3cd1789e65344bd8e13e87764413340d7a480
+AUX spyder-4.0.1-py3-only.patch 2182 BLAKE2B b14e63a4bbde01aff8f629ec7fea5ca61790ba1ceecd858700f705baddb94c77083377fc980c4f5e95c315d2b1c7bdf6f700829848b36fd90ca0d69e17b33c36 SHA512 9abdd6e8f02ecb32fd7def4f6825920d4e5650a22d78cc98171af805d0cd5510a328632f43b44c234fcb4f35cb4efa538b5c716e2cf1029ead585b40e16b9903
+DIST spyder-4.0.1.tar.gz 10783565 BLAKE2B 5d264991b9bfc8118ef91f929269a300932cb0078b70c54613836c4337dc41214aa4ab81dacb4a535aaa6dea6b1eb591e25c7071664dc102e218373a0d7f8824 SHA512 9249a3b4a73ebe7a485d75fe2bea68bfa106c8ad0710120a6e05a43e3e2a65f9076904d1104180e925ab282b1d9da712c3509e0a5a7cfe3bd5ea8a95a1617bdd
+DIST spyder-docs-7c0b590.tar.gz 2257637 BLAKE2B 7e9528fde453631227ece3bd8c9163a0b3daadf3a83160b5475f943c49e7a559ff33dfe03531240b99571c535887ecff8459116d566dd7c739c74c4165e00060 SHA512 4d9548cc69db85ae6e93cac64e680460da6f9e76bf8b1265b31fbd4925786d29427de40bf06fd52ba807b0bb8f6c224e35b809c0e015a77013deb383e6d666f8
+EBUILD spyder-4.0.1-r1.ebuild 5912 BLAKE2B 2eb84c632488e71d4f34e4cc8f8e17d49cab93c36db86641b9c2b9961fc3932e8f5b8b9344c0ba7f22637da47d938a0df41d0dae4e82918846d88c3e854f3448 SHA512 502fed93839653e2036ae93b6477d1a88cc919f2433400da8ef5a43363a40a594066b9b4f4882d3d72346683746b1f9a109239a208b14f24baa870721d61f302
+MISC metadata.xml 1526 BLAKE2B 2a2231f8512f9681558b1e53ac7a9bec850a210a82cb9771baca1088763b22cdcecdc0b0f2f5f9d93241cdee3ccbe3a71a7dc92a1772b53c1e8c499be432893d SHA512 3ff5cc8b66cb53ea1fb30076ca1e0c83b71f844f99d46f7bc7e6f95d3bbe33d44d3b0564be1ac85e76449bf20b6b3672a8757c6774445472ed386253e91cb9b7
diff --git a/dev-python/spyder/files/spyder-3.2.4-build.patch b/dev-python/spyder/files/spyder-3.2.4-build.patch
deleted file mode 100644
index 2a1fee52131b..000000000000
--- a/dev-python/spyder/files/spyder-3.2.4-build.patch
+++ /dev/null
@@ -1,130 +0,0 @@
---- spyder-3.2.3.orig/setup.py	2017-08-29 00:42:56.000000000 +0200
-+++ spyder-3.2.3/setup.py	2017-09-16 20:57:08.610147911 +0200
-@@ -77,13 +77,7 @@
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/pixmaps', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
--                          ('share/pixmaps', ['img_src/spyder.png'])]
-+        data_files = [('share/pixmaps', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-                                    'img_src/spyder_reset.ico'])]
-@@ -106,102 +100,6 @@
- 
- 
- #==============================================================================
--# Make Linux detect Spyder desktop file
--#==============================================================================
--class MyInstallData(install_data):
--    def run(self):
--        install_data.run(self)
--        if sys.platform.startswith('linux'):
--            try:
--                subprocess.call(['update-desktop-database'])
--            except:
--                print("ERROR: unable to update desktop database",
--                      file=sys.stderr)
--CMDCLASS = {'install_data': MyInstallData}
--
--
--#==============================================================================
--# Sphinx build (documentation)
--#==============================================================================
--def get_html_help_exe():
--    """Return HTML Help Workshop executable path (Windows only)"""
--    if os.name == 'nt':
--        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
--        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
--            if osp.isfile(hhc_exe):
--                return hhc_exe
--        else:
--            return
--
--try:
--    from sphinx import setup_command
--
--    class MyBuild(build):
--        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
--                       + build.user_options
--        def __init__(self, *args, **kwargs):
--            build.__init__(self, *args, **kwargs)
--            self.no_doc = False
--        def with_doc(self):
--            setup_dir = os.path.dirname(os.path.abspath(__file__))
--            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
--            install_obj = self.distribution.get_command_obj('install')
--            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
--        sub_commands = build.sub_commands + [('build_doc', with_doc)]
--    CMDCLASS['build'] = MyBuild
--
--
--    class MyInstall(install):
--        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
--                       + install.user_options
--        def __init__(self, *args, **kwargs):
--            install.__init__(self, *args, **kwargs)
--            self.no_doc = False
--    CMDCLASS['install'] = MyInstall
--
--
--    class MyBuildDoc(setup_command.BuildDoc):
--        def run(self):
--            build = self.get_finalized_command('build')
--            sys.path.insert(0, os.path.abspath(build.build_lib))
--            dirname = self.distribution.get_command_obj('build').build_purelib
--            self.builder_target_dir = osp.join(dirname, 'spyder', 'doc')
--
--            if not osp.exists(self.builder_target_dir):
--                os.mkdir(self.builder_target_dir)
--
--            hhc_exe = get_html_help_exe()
--            self.builder = "html" if hhc_exe is None else "htmlhelp"
--
--            try:
--                setup_command.BuildDoc.run(self)
--            except UnicodeDecodeError:
--                print("ERROR: unable to build documentation because Sphinx "\
--                      "do not handle source path with non-ASCII characters. "\
--                      "Please try to move the source package to another "\
--                      "location (path with *only* ASCII characters).",
--                      file=sys.stderr)
--            sys.path.pop(0)
--
--            # Building chm doc, if HTML Help Workshop is installed
--            if hhc_exe is not None:
--                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
--                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
--                if osp.isfile(fname):
--                    dest = osp.join(dirname, 'spyder')
--                    try:
--                        shutil.move(fname, dest)
--                    except shutil.Error:
--                        print("Unable to replace %s" % dest)
--                    shutil.rmtree(self.builder_target_dir)
--
--    CMDCLASS['build_doc'] = MyBuildDoc
--except ImportError:
--    print('WARNING: unable to build documentation because Sphinx '\
--          'is not installed', file=sys.stderr)
--
--
--#==============================================================================
- # Main scripts
- #==============================================================================
- # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
-@@ -261,8 +159,7 @@
-                    'Programming Language :: Python :: 3',
-                    'Development Status :: 5 - Production/Stable',
-                    'Topic :: Scientific/Engineering',
--                   'Topic :: Software Development :: Widget Sets'],
--      cmdclass=CMDCLASS)
-+                   'Topic :: Software Development :: Widget Sets'])
- 
- 
- #==============================================================================
diff --git a/dev-python/spyder/files/spyder-3.2.8-build.patch b/dev-python/spyder/files/spyder-3.2.8-build.patch
deleted file mode 100644
index b21c77d660be..000000000000
--- a/dev-python/spyder/files/spyder-3.2.8-build.patch
+++ /dev/null
@@ -1,129 +0,0 @@
---- spyder-3.2.8/setup.py       2018-03-23 14:00:00.000000000 +0100
-+++ spyder-3.2.8/setup.py       2018-03-23 14:00:00.000000001 +0100
-@@ -77,12 +77,7 @@
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-                           ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-@@ -106,102 +101,6 @@
- 
- 
- #==============================================================================
--# Make Linux detect Spyder desktop file
--#==============================================================================
--class MyInstallData(install_data):
--    def run(self):
--        install_data.run(self)
--        if sys.platform.startswith('linux'):
--            try:
--                subprocess.call(['update-desktop-database'])
--            except:
--                print("ERROR: unable to update desktop database",
--                      file=sys.stderr)
--CMDCLASS = {'install_data': MyInstallData}
--
--
--#==============================================================================
--# Sphinx build (documentation)
--#==============================================================================
--def get_html_help_exe():
--    """Return HTML Help Workshop executable path (Windows only)"""
--    if os.name == 'nt':
--        hhc_base = r'C:\Program Files%s\HTML Help Workshop\hhc.exe'
--        for hhc_exe in (hhc_base % '', hhc_base % ' (x86)'):
--            if osp.isfile(hhc_exe):
--                return hhc_exe
--        else:
--            return
--
--try:
--    from sphinx import setup_command
--
--    class MyBuild(build):
--        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
--                       + build.user_options
--        def __init__(self, *args, **kwargs):
--            build.__init__(self, *args, **kwargs)
--            self.no_doc = False
--        def with_doc(self):
--            setup_dir = os.path.dirname(os.path.abspath(__file__))
--            is_doc_dir = os.path.isdir(os.path.join(setup_dir, 'doc'))
--            install_obj = self.distribution.get_command_obj('install')
--            return (is_doc_dir and not self.no_doc and not install_obj.no_doc)
--        sub_commands = build.sub_commands + [('build_doc', with_doc)]
--    CMDCLASS['build'] = MyBuild
--
--
--    class MyInstall(install):
--        user_options = [('no-doc', None, "Don't build Spyder documentation")] \
--                       + install.user_options
--        def __init__(self, *args, **kwargs):
--            install.__init__(self, *args, **kwargs)
--            self.no_doc = False
--    CMDCLASS['install'] = MyInstall
--
--
--    class MyBuildDoc(setup_command.BuildDoc):
--        def run(self):
--            build = self.get_finalized_command('build')
--            sys.path.insert(0, os.path.abspath(build.build_lib))
--            dirname = self.distribution.get_command_obj('build').build_purelib
--            self.builder_target_dir = osp.join(dirname, 'spyder', 'doc')
--
--            if not osp.exists(self.builder_target_dir):
--                os.mkdir(self.builder_target_dir)
--
--            hhc_exe = get_html_help_exe()
--            self.builder = "html" if hhc_exe is None else "htmlhelp"
--
--            try:
--                setup_command.BuildDoc.run(self)
--            except UnicodeDecodeError:
--                print("ERROR: unable to build documentation because Sphinx "\
--                      "do not handle source path with non-ASCII characters. "\
--                      "Please try to move the source package to another "\
--                      "location (path with *only* ASCII characters).",
--                      file=sys.stderr)
--            sys.path.pop(0)
--
--            # Building chm doc, if HTML Help Workshop is installed
--            if hhc_exe is not None:
--                fname = osp.join(self.builder_target_dir, 'Spyderdoc.chm')
--                subprocess.call('"%s" %s' % (hhc_exe, fname), shell=True)
--                if osp.isfile(fname):
--                    dest = osp.join(dirname, 'spyder')
--                    try:
--                        shutil.move(fname, dest)
--                    except shutil.Error:
--                        print("Unable to replace %s" % dest)
--                    shutil.rmtree(self.builder_target_dir)
--
--    CMDCLASS['build_doc'] = MyBuildDoc
--except ImportError:
--    print('WARNING: unable to build documentation because Sphinx '\
--          'is not installed', file=sys.stderr)
--
--
--#==============================================================================
- # Main scripts
- #==============================================================================
- # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
-@@ -261,8 +160,7 @@
-                    'Programming Language :: Python :: 3',
-                    'Development Status :: 5 - Production/Stable',
-                    'Topic :: Scientific/Engineering',
--                   'Topic :: Software Development :: Widget Sets'],
--      cmdclass=CMDCLASS)
-+                   'Topic :: Software Development :: Widget Sets'])
- 
- 
- #==============================================================================
diff --git a/dev-python/spyder/files/spyder-3.3.0-build.patch b/dev-python/spyder/files/spyder-3.3.0-build.patch
deleted file mode 100644
index f6037237e0c0..000000000000
--- a/dev-python/spyder/files/spyder-3.3.0-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -r -U3 spyder-3.3.0.orig/setup.py spyder-3.3.0/setup.py
---- spyder-3.3.0.orig/setup.py	2018-06-27 11:28:24.000000000 +0700
-+++ spyder-3.3.0/setup.py	2018-08-07 23:26:17.609046673 +0700
-@@ -75,12 +75,7 @@
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-                           ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-@@ -104,21 +99,6 @@
- 
- 
- #==============================================================================
--# Make Linux detect Spyder desktop file
--#==============================================================================
--class MyInstallData(install_data):
--    def run(self):
--        install_data.run(self)
--        if sys.platform.startswith('linux'):
--            try:
--                subprocess.call(['update-desktop-database'])
--            except:
--                print("ERROR: unable to update desktop database",
--                      file=sys.stderr)
--CMDCLASS = {'install_data': MyInstallData}
--
--
--#==============================================================================
- # Main scripts
- #==============================================================================
- # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
-@@ -178,8 +158,7 @@
-                    'Programming Language :: Python :: 3',
-                    'Development Status :: 5 - Production/Stable',
-                    'Topic :: Scientific/Engineering',
--                   'Topic :: Software Development :: Widget Sets'],
--      cmdclass=CMDCLASS)
-+                   'Topic :: Software Development :: Widget Sets'])
- 
- 
- #==============================================================================
diff --git a/dev-python/spyder/files/spyder-3.3.1-build.patch b/dev-python/spyder/files/spyder-3.3.1-build.patch
deleted file mode 100644
index 1561dbdcc1e1..000000000000
--- a/dev-python/spyder/files/spyder-3.3.1-build.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -r -U3 spyder-3.3.1.orig/setup.py spyder-3.3.1/setup.py
---- spyder-3.3.1.orig/setup.py	2018-08-10 10:46:02.000000000 +0700
-+++ spyder-3.3.1/setup.py	2018-08-14 19:16:10.921323804 +0700
-@@ -83,12 +83,7 @@
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-                           ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
-@@ -112,21 +107,6 @@
- 
- 
- #==============================================================================
--# Make Linux detect Spyder desktop file
--#==============================================================================
--class MyInstallData(install_data):
--    def run(self):
--        install_data.run(self)
--        if sys.platform.startswith('linux'):
--            try:
--                subprocess.call(['update-desktop-database'])
--            except:
--                print("ERROR: unable to update desktop database",
--                      file=sys.stderr)
--CMDCLASS = {'install_data': MyInstallData}
--
--
--#==============================================================================
- # Main scripts
- #==============================================================================
- # NOTE: the '[...]_win_post_install.py' script is installed even on non-Windows
-@@ -210,8 +190,7 @@
-                  'Intended Audience :: Science/Research',
-                  'Intended Audience :: Developers',
-                  'Topic :: Scientific/Engineering',
--                 'Topic :: Software Development :: Widget Sets'],
--    cmdclass=CMDCLASS)
-+                 'Topic :: Software Development :: Widget Sets'])
- 
- 
- #==============================================================================
diff --git a/dev-python/spyder/files/spyder-4.0.0_beta1-build.patch b/dev-python/spyder/files/spyder-4.0.1-build.patch
index 2b0f9bc699f3..7463550fc165 100644
--- a/dev-python/spyder/files/spyder-4.0.0_beta1-build.patch
+++ b/dev-python/spyder/files/spyder-4.0.1-build.patch
@@ -1,20 +1,6 @@
 diff -r -U3 spyder-4.0.0b1.orig/setup.py spyder-4.0.0b1/setup.py
 --- spyder-4.0.0b1.orig/setup.py	2018-08-12 04:35:49.000000000 +0700
 +++ spyder-4.0.0b1/setup.py	2018-08-14 20:25:32.827148778 +0700
-@@ -83,12 +83,7 @@
- def get_data_files():
-     """Return data_files in a platform dependent manner"""
-     if sys.platform.startswith('linux'):
--        if PY3:
--            data_files = [('share/applications', ['scripts/spyder3.desktop']),
--                          ('share/icons', ['img_src/spyder3.png']),
--                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
--        else:
--            data_files = [('share/applications', ['scripts/spyder.desktop']),
-+        data_files = [('share/applications', ['scripts/spyder.desktop']),
-                           ('share/icons', ['img_src/spyder.png'])]
-     elif os.name == 'nt':
-         data_files = [('scripts', ['img_src/spyder.ico',
 @@ -112,21 +107,6 @@
  
  
diff --git a/dev-python/spyder/files/spyder-4.0.1-py3-only.patch b/dev-python/spyder/files/spyder-4.0.1-py3-only.patch
new file mode 100644
index 000000000000..df5f0c4ad1c6
--- /dev/null
+++ b/dev-python/spyder/files/spyder-4.0.1-py3-only.patch
@@ -0,0 +1,56 @@
+diff --git a/setup.py b/setup.py
+index a492549..b77f758 100644
+--- a/setup.py
++++ b/setup.py
+@@ -31,13 +31,6 @@ import shutil
+ from distutils.core import setup
+ from distutils.command.install_data import install_data
+ 
+-
+-#==============================================================================
+-# Check for Python 3
+-#==============================================================================
+-PY3 = sys.version_info[0] == 3
+-
+-
+ #==============================================================================
+ # Minimal Python version sanity check
+ # Taken from the notebook setup.py -- Modified BSD License
+@@ -87,13 +80,8 @@ def get_subpackages(name):
+ def get_data_files():
+     """Return data_files in a platform dependent manner"""
+     if sys.platform.startswith('linux'):
+-        if PY3:
+-            data_files = [('share/applications', ['scripts/spyder3.desktop']),
+-                          ('share/icons', ['img_src/spyder3.png']),
+-                          ('share/metainfo', ['scripts/spyder3.appdata.xml'])]
+-        else:
+-            data_files = [('share/applications', ['scripts/spyder.desktop']),
+-                          ('share/icons', ['img_src/spyder.png'])]
++        data_files = [('share/applications', ['scripts/spyder.desktop']),
++                      ('share/pixmaps', ['img_src/spyder.png'])]
+     elif os.name == 'nt':
+         data_files = [('scripts', ['img_src/spyder.ico',
+                                    'img_src/spyder_reset.ico'])]
+@@ -115,10 +103,7 @@ def get_packages():
+ # platforms due to a bug in pip installation process
+ # See spyder-ide/spyder#1158.
+ SCRIPTS = ['%s_win_post_install.py' % NAME]
+-if PY3 and sys.platform.startswith('linux'):
+-    SCRIPTS.append('spyder3')
+-else:
+-    SCRIPTS.append('spyder')
++SCRIPTS.append('spyder')
+ 
+ 
+ #==============================================================================
+@@ -246,8 +231,7 @@ if 'setuptools' in sys.modules:
+ 
+     setup_args['entry_points'] = {
+         'gui_scripts': [
+-            '{} = spyder.app.start:main'.format(
+-                'spyder3' if PY3 else 'spyder')
++            '{} = spyder.app.start:main'.format('spyder')
+         ]
+     }
+ 
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index b6e901261f71..46303e6157dd 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -9,6 +9,14 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <maintainer type="person">
+    <email>andrewammerlaan@riseup.net</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
     Spyder is a powerful scientific environment written in Python,
     for Python,and designed by and for scientists, engineers and data analysts.
@@ -20,9 +28,6 @@
     including NumPy, SciPy, Pandas, IPython, QtConsole, Matplotlib, SymPy, and more,
     and can be extended further with full plugin support.
   </longdescription>
-  <use>
-    <flag name="webengine">Build bindings for the QtWebEngine module</flag>
-  </use>
   <upstream>
     <remote-id type="pypi">spyder</remote-id>
     <remote-id type="bitbucket">spyder-ide/spyderlib</remote-id>
diff --git a/dev-python/spyder/spyder-3.2.4.ebuild b/dev-python/spyder/spyder-3.2.4.ebuild
deleted file mode 100644
index c3313327ca4b..000000000000
--- a/dev-python/spyder/spyder-3.2.4.ebuild
+++ /dev/null
@@ -1,62 +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 eutils distutils-r1
-
-DESCRIPTION="Python IDE with matlab-like features"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-	https://pythonhosted.org/spyder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc hdf5"
-
-RDEPEND="
-	dev-python/QtPy[${PYTHON_USEDEP},svg,webkit]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.3.0
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-# Courtesy of Arfrever
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build doc doc/html || die "Generation of documentation failed"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-	doicon spyder/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-}
diff --git a/dev-python/spyder/spyder-3.2.8.ebuild b/dev-python/spyder/spyder-3.2.8.ebuild
deleted file mode 100644
index 21993629d5f4..000000000000
--- a/dev-python/spyder/spyder-3.2.8.ebuild
+++ /dev/null
@@ -1,81 +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 eutils distutils-r1 xdg-utils
-
-DESCRIPTION="Python IDE with matlab-like features"
-HOMEPAGE="
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-	https://pythonhosted.org/spyder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc hdf5 +webengine webkit"
-REQUIRED_USE="webengine? ( !webkit )"
-
-RDEPEND="
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/pep8[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},svg,webengine?,webkit?]
-	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-# Based on the courtesy of Arfrever
-PATCHES=( "${FILESDIR}"/${PN}-3.2.8-build.patch )
-
-python_compile_all() {
-	if use doc; then
-		sphinx-build doc doc/html || die "Generation of documentation failed"
-	fi
-}
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/html/. )
-	distutils-r1_python_install_all
-	doicon spyder/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		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 "Run Cython files in the IPython console" dev-python/cython
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-python/spyder/spyder-3.3.0.ebuild b/dev-python/spyder/spyder-3.3.0.ebuild
deleted file mode 100644
index 300204dd1e12..000000000000
--- a/dev-python/spyder/spyder-3.3.0.ebuild
+++ /dev/null
@@ -1,74 +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 eutils distutils-r1 xdg-utils
-
-DESCRIPTION="The Scientific PYthon Development EnviRonment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 +webengine webkit"
-REQUIRED_USE="webengine? ( !webkit )"
-
-RDEPEND="
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},svg,webengine?,webkit?]
-	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/numpydoc[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-1.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Based on the courtesy of Arfrever
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doicon spyder/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		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 "Run Cython files in the IPython console" dev-python/cython
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-python/spyder/spyder-3.3.1.ebuild b/dev-python/spyder/spyder-3.3.1.ebuild
deleted file mode 100644
index 300204dd1e12..000000000000
--- a/dev-python/spyder/spyder-3.3.1.ebuild
+++ /dev/null
@@ -1,74 +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 eutils distutils-r1 xdg-utils
-
-DESCRIPTION="The Scientific PYthon Development EnviRonment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 +webengine webkit"
-REQUIRED_USE="webengine? ( !webkit )"
-
-RDEPEND="
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	dev-python/jedi[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},svg,webengine?,webkit?]
-	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/numpydoc[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-1.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Based on the courtesy of Arfrever
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doicon spyder/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		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 "Run Cython files in the IPython console" dev-python/cython
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-python/spyder/spyder-4.0.0_beta1.ebuild b/dev-python/spyder/spyder-4.0.0_beta1.ebuild
deleted file mode 100644
index 7800f95826ff..000000000000
--- a/dev-python/spyder/spyder-4.0.0_beta1.ebuild
+++ /dev/null
@@ -1,77 +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 eutils distutils-r1 xdg-utils
-MY_P=${P/_beta/b}
-
-DESCRIPTION="The Scientific PYthon Development EnviRonment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hdf5 +webengine webkit"
-REQUIRED_USE="webengine? ( !webkit )"
-
-RDEPEND="
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/cloudpickle[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.11.0[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/pyflakes[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	dev-python/pyzmq[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.4.1[${PYTHON_USEDEP}]
-	dev-python/qtconsole[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},svg,webengine?,webkit?]
-	>=dev-python/rope-0.10.7[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-	dev-python/numpydoc[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.0"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-# Based on the courtesy of Arfrever
-PATCHES=( "${FILESDIR}"/${P}-build.patch )
-
-S="${WORKDIR}/${MY_P}"
-
-python_install() {
-	distutils-r1_python_install
-	python_newscript scripts/${PN} ${PN}${EPYTHON:6:1}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	doicon spyder/images/spyder.svg
-	make_desktop_entry spyder Spyder spyder "Development;IDE"
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-
-	elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-		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 "Run Cython files in the IPython console" dev-python/cython
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-}
diff --git a/dev-python/spyder/spyder-4.0.1-r1.ebuild b/dev-python/spyder/spyder-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..43bba250f2c4
--- /dev/null
+++ b/dev-python/spyder/spyder-4.0.1-r1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit eutils xdg distutils-r1 virtualx
+
+# Commit of documentation to fetch
+DOCS_PV="7c0b590"
+
+DESCRIPTION="The Scientific Python Development Environment"
+HOMEPAGE="
+	https://www.spyder-ide.org/
+	https://github.com/spyder-ide/spyder/
+	https://pypi.org/project/spyder/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
+	dev-python/intervaltree[${PYTHON_USEDEP}]
+	~dev-python/jedi-0.14.1[${PYTHON_USEDEP}]
+	dev-python/keyring[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
+	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
+	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
+	>=dev-python/psutil-0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/pylint-0.25[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.31.2[${PYTHON_USEDEP}]
+	<dev-python/python-language-server-0.32.0[${PYTHON_USEDEP}]
+	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
+	>=dev-python/qdarkstyle-2.7[${PYTHON_USEDEP}]
+	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-4.6.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
+	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-1.8.1[${PYTHON_USEDEP}]
+	<dev-python/spyder-kernels-2.0.0[${PYTHON_USEDEP}]
+	dev-python/watchdog[${PYTHON_USEDEP}]"
+
+DEPEND="test? (
+	dev-python/coverage[${PYTHON_USEDEP}]
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/flaky[${PYTHON_USEDEP}]
+	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	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/sympy[${PYTHON_USEDEP}] )"
+
+# Based on the courtesy of Arfrever
+# This patch removes a call to update-desktop-database during build
+# This fails because access is denied to this command during build
+PATCHES=( "${FILESDIR}/${P}-build.patch"
+	"${FILESDIR}/${P}-py3-only.patch" )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/doc --no-autodoc
+
+python_prepare_all() {
+	# move docs into workdir
+	mv ../spyder-docs-${DOCS_PV}* docs || die
+
+	# some tests still depend on QtPy[webkit] which is going to be removed
+	# spyder itself works fine without webkit
+	rm spyder/widgets/tests/test_browser.py || die
+	rm spyder/plugins/onlinehelp/tests/test_pydocgui.py || die
+	rm spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
+	rm spyder/plugins/ipythonconsole/tests/test_ipython_config_dialog.py || die
+	rm spyder/plugins/help/tests/test_widgets.py || die
+	rm spyder/plugins/help/tests/test_plugin.py  || die
+	rm spyder/app/tests/test_mainwindow.py || die
+
+	# skip uri (online) tests
+	rm spyder/plugins/editor/widgets/tests/test_goto.py || die
+
+	# skip online test
+	rm spyder/widgets/github/tests/test_github_backend.py || die
+
+	# Assertion error, looks like an online test
+	rm spyder/utils/tests/test_vcs.py || die
+
+		# No idea why this fails, no error just stops and dumps core
+	sed -i -e 's:test_arrayeditor_edit_complex_array:_&:' \
+		spyder/plugins/variableexplorer/widgets/tests/test_arrayeditor.py || die
+
+	# Assertion error, can't connect/remember inside ebuild environment
+	sed -i -e 's:test_connection_dialog_remembers_input_with_password:_&:' \
+		-e 's:test_connection_dialog_remembers_input_with_ssh_passphrase:_&:' \
+			spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
+
+	# Assertion error (pytest-qt), maybe we can't do shortcuts inside ebuild environment?
+	sed -i -e 's:test_transform_to_uppercase_shortcut:_&:' \
+		-e 's:test_transform_to_lowercase_shortcut:_&:' \
+		-e 's:test_go_to_line_shortcut:_&:' \
+		-e 's:test_delete_line_shortcut:_&:' \
+			spyder/plugins/editor/widgets/tests/test_shortcuts.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	virtx pytest -vv
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "To get additional features, optional runtime dependencies may be installed:"
+		optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
+		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 "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
+		optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
+		# spyder-autopep8 and spyder-vim do not have a release (yet)
+		# and are not compatible with >=spyder-4.0.0 at the moment
+		# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
+		# optfeature "Vim key bindings" dev-python/spyder-vim
+		optfeature "Unittest support" dev-python/spyder-unittest
+		optfeature "Jupyter notebook support" dev-python/spyder-notebook
+		optfeature "System terminal inside spyder" dev-python/spyder-terminal
+		# spyder-reports not yet updated to >=spyder-4.0.0
+		# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
+}
diff --git a/dev-python/sqlite3dbm/Manifest b/dev-python/sqlite3dbm/Manifest
deleted file mode 100644
index c515e95ad0b3..000000000000
--- a/dev-python/sqlite3dbm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sqlite3dbm-0.1.4-git.tar.gz 18962 BLAKE2B 464c6b7f295969e507249e8a20527a44b25e77868e6a59c7387e7a1eefc77c0fcc521cc6f425b1dfc27afbd9f73f31f375228ba6e2201276da0175c7f78ff556 SHA512 1b420839482cf5881b744855393afa9eaa1cd0ea2195d03c6576f97804851dcfa5b5fe6a80d9d77eb00b9ee49ebb7cdb7ba7b86f57e4c700178a0bf46d598bab
-EBUILD sqlite3dbm-0.1.4-r1.ebuild 993 BLAKE2B 0dc34fee629c0a9da63e0e6a60f99b529d883554c9127a416d186a6370b54d48e02691a5feb997734ae53d3d350144850f76994ee65d8d2ec23f566db40ac508 SHA512 b2b1077dab4b74771a2fcfb3b4d5726abc2744f4f6eef43e5dcf70f91cd0d8984b649c1027472dd5042410a0c25cf9cf2fddf6f01e9bbad1e043f50851e065d2
-MISC metadata.xml 330 BLAKE2B 7794213f637f2f801569bf46389da327ccaab742e5a5726732bf5c34dae0a7c4a40918e37ebbc7faaebad00ea1b34ebec81e0e1e8dbf1d59f13e83e4ee87002e SHA512 77d26c5ca1d907bc82caff2060b73ebf58d4de60466e2415a8a4f1010653865a573aad75a76a0f610b3ab7af738efdc592a0031e0f523f78560075d47f566809
diff --git a/dev-python/sqlite3dbm/metadata.xml b/dev-python/sqlite3dbm/metadata.xml
deleted file mode 100644
index 26e280528171..000000000000
--- a/dev-python/sqlite3dbm/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-  <upstream>
-    <remote-id type="github">Yelp/sqlite3dbm</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/sqlite3dbm/sqlite3dbm-0.1.4-r1.ebuild b/dev-python/sqlite3dbm/sqlite3dbm-0.1.4-r1.ebuild
deleted file mode 100644
index 3de881942ef0..000000000000
--- a/dev-python/sqlite3dbm/sqlite3dbm-0.1.4-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-# TODO: strip the -git at some version bump, introduced to avoid clash with
-# earlier tarball
-DESCRIPTION="An sqlite-backed dictionary"
-HOMEPAGE="https://github.com/Yelp/sqlite3dbm https://pypi.org/project/sqlite3dbm/"
-SRC_URI="https://github.com/Yelp/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx )
-	test? ( dev-python/testify[${PYTHON_USEDEP}] )"
-
-DOCS=(AUTHORS.txt CHANGES.txt README.md)
-
-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
-}
-
-src_test() {
-	testify tests || die
-}
diff --git a/dev-python/sqlobject/Manifest b/dev-python/sqlobject/Manifest
deleted file mode 100644
index f3de441c0d29..000000000000
--- a/dev-python/sqlobject/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SQLObject-3.4.0.tar.gz 1269199 BLAKE2B d44712c72f18e3b13d81087926039ede842df8939eb116cc5fc4df39aa0dc8293a4737fc2de3f2843a11e9775a57a4ab39a939867e48496ef0aaf10e64f26ec3 SHA512 f10e2b950d5e404aec57442acebae06e2a95adf386de57f73339f62fadd627965667b462055f12586cbfa9be485cc1ab46a21b8fa43da9d6696489d058421aca
-EBUILD sqlobject-3.4.0.ebuild 1062 BLAKE2B dca1c07c2de840e650a5946662a2ef628170364214efed97a12bc66a94f7c65364fd58647ef3d2243fc74d8af681ad4c71bd28765945321c10d73a022283863b SHA512 6c4a343d912d6ff65dd067d19176e8009b48050e1475770c43571e804bcbe546c63ae7a7217dda4114798aea8d768347a1c4e8d8497b5dfa60fa73210da4b7eb
-MISC metadata.xml 820 BLAKE2B 6663aabc7c9ab7a2d03c72a139a4858ea5bec9f51525ea0ad50f9b8f9cfdd2732ed98efda6ca990ac71015def1914aa1abc82eb9150555e5fd54fdf12067fe9a SHA512 7003895fa358feb4534bba81f634cd8eda7b3ddb94ab129da2b431ed0a44f0e7507fbf29059abe04908c217e8d342a7a035393e869b367b130a1405e41475601
diff --git a/dev-python/sqlobject/metadata.xml b/dev-python/sqlobject/metadata.xml
deleted file mode 100644
index 57cf8e8ce055..000000000000
--- a/dev-python/sqlobject/metadata.xml
+++ /dev/null
@@ -1,15 +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>SQLObject is an object-relational mapper. It allows you to translate RDBMS table rows into Python objects and manipulate
-	those objects to transparently manipulate the database.</longdescription>
-	<longdescription lang="ja">SQLObject はオブジェクト・リレーショナル・マッパです。これはデータベースの操作を明瞭にするため、RDBMS のテーブル列を Python
-	言語のオブジェクトとして操作できるようにします。</longdescription>
-	<upstream>
-		<remote-id type="pypi">SQLObject</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/sqlobject/sqlobject-3.4.0.ebuild b/dev-python/sqlobject/sqlobject-3.4.0.ebuild
deleted file mode 100644
index bd5b64529964..000000000000
--- a/dev-python/sqlobject/sqlobject-3.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1
-
-MY_PN="SQLObject"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Object-Relational Manager, aka database wrapper"
-HOMEPAGE="http://sqlobject.org/ https://pypi.org/project/SQLObject/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc mysql postgres sqlite"
-
-RDEPEND="
-	>=dev-python/formencode-1.1.1[${PYTHON_USEDEP}]
-	mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
-	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed -e '/..docs/d' -i setup.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	if use doc; then
-		HTML_DOCS=( docs/html/. )
-		DOCS=( docs/europython/. )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index 80d5984625bf..52535d278219 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -1,4 +1,4 @@
 DIST ssl-fetch-0.4.tar.gz 11663 BLAKE2B c75173f40367d1e84a0ed3e13dbc7e6b8270302bf64168487061195cd1d24a593630ca650bfac4ed867d4146e8bad438cac8bfecca86180d2ca23d9ccafa9e5d SHA512 6b31a5dc5d3a566eded6ca284a3edac8c308596dd5a1971d13223e55abdd2ddc4d3e1eca5f369c1c05540bafcb6c273e5ef1eae627a7a9170bc262a0cda06696
-EBUILD ssl-fetch-0.4.ebuild 1198 BLAKE2B e47c4687232f3345c45307e0860bef8172f57e6b77eb579a3711e0ad03960bd2bea6a240a986e4d5f017ff6c5c72e873d949918cdbbca83e4215459e5687350b SHA512 48654b3de25504b5fb7686fa4dc709dfc9b090986af69f0d510566751406943137d65bbd2674ee8eb90f1c1ec5aafaf78f576c326b001ddca1c77db534952648
-EBUILD ssl-fetch-9999.ebuild 1078 BLAKE2B 98ec73d1f51af732bc1c3584085916d2cc87f9d555620664a9d2f33f90b8d2c6e093d38a4a6df4ed0d02c4d8529e6452adb1fd6fa100ee6604d9a583d6bebd0c SHA512 35ca6befc9754abb12e3e5beaf152a95cb35bf20c7cc257ca59cb2e94f43813c2e051e9529ff210a67c8f33fce29b166a4f68603fdccfb14db4f4855311a35db
+EBUILD ssl-fetch-0.4.ebuild 998 BLAKE2B b80aa72f50d0ad83fc90570101872ac0ff772b36b7f833e65814544f55a19a5c3662132e146b4f0550f17c763cae805f8156644d47cada97c79fd9f2e5c7bea1 SHA512 44af694a4a8a91dfd093e44fbe846f30a3fb46a53dc4ffc5d5439c5a73613a6700e1a0e2d357e904bf27c368b8492c52bf072fbcb30ce43eedfa0fc74f14548b
+EBUILD ssl-fetch-9999.ebuild 878 BLAKE2B 398623de4ae8d0ba93f7f91e212e11d5b7615a45b798cec4dd457d4411d9385e72f2e387e3ea36ae96c592d1199783b918203ac33001efe74f307f5dda6afefe SHA512 106daa23aec3030cea55cce38da485673a09e042bdefa763b477eed931107394c14261bdb8dd83aeac063cb20fb1fa1c24d9f260892ccec23d53f1eabeeee1d4
 MISC metadata.xml 473 BLAKE2B 5b8b4e2ce1dd31802946dbe506e7423f0b134d1a1cad24c33b7f005c20a8adeb4a89319c3b47f4637c150ab96ab4b4f44eb7d049faa0cf5a79f8b45e11b1b269 SHA512 832ff018c61d870c30ea89ccf300b4ede17e5a2b03b079a14d1b53a2ee95224e48e9f0091e07f8a79703190fceb77646458c3d760c53de08d29339143724c447
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index 4711b10e72b9..01158a575ba1 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
@@ -21,11 +21,6 @@ DEPEND=""
 
 RDEPEND="${DEPEND}
 	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	python_targets_python2_7? (
-		dev-python/ndg-httpsclient[python_targets_python2_7]
-		dev-python/pyasn1[python_targets_python2_7]
-		>=dev-python/pyopenssl-0.13[python_targets_python2_7]
-		)
 	"
 
 pkg_postinst() {
diff --git a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
index 052b8b73862b..bd7d61998dfe 100644
--- a/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 EGIT_BRANCH="master"
 
@@ -24,11 +24,6 @@ DEPEND=""
 
 RDEPEND="${DEPEND}
 	>=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-	python_targets_python2_7? (
-		dev-python/ndg-httpsclient[python_targets_python2_7]
-		dev-python/pyasn1[python_targets_python2_7]
-		>=dev-python/pyopenssl-0.13[python_targets_python2_7]
-		)
 	"
 
 pkg_postinst() {
diff --git a/dev-python/steadymark/Manifest b/dev-python/steadymark/Manifest
deleted file mode 100644
index 9fbef00794c7..000000000000
--- a/dev-python/steadymark/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST steadymark-0.5.3.tar.gz 8180 BLAKE2B 64fdf07adcec72a575699c7df7fa067368304847ba21a1e7a1e2dbc70e888b947bef65818c91c96e885027405633b4199162d24551e5e723fca9c67027ad86b1 SHA512 c30971675216f2afcb9f59fba5239fd6f37bc0d570b1ab34820f2fb83388330886a53ff3a31bf96e07b455ccfa8df3fda5bcd3d2212360419ec2b7290d1ddbaa
-EBUILD steadymark-0.5.3.ebuild 476 BLAKE2B 3208bbdae1f6c249b782b23518d31fe188f7605a97f6873512d157ba2b35597a451b8e7bd003b4b5f14c466d3ce25502ff8cfb70a54351cf50d22d1ca80fb5af SHA512 fca58d69bb0e3004d49d35e4dbd4e2ce223ef8ed4d63789114fb3b9f8af9a4dc9252d9c35bbba6a397c189ce1c9659a42ed1c160e30d65fe8da3f3fae8ad7ba9
-MISC metadata.xml 395 BLAKE2B e348661c36208b2f9f84229d75325a8f402b3c7d480c99746956d8cb0fa0d6d247e35cb8067a1de1d971920aba268c16dd83bc09b1b13ba066042b5e2507b43d SHA512 8f256e4d6dc743b0857228749adfa8fabc7cc103e883838d673a2104e1a24977481062a874243d3260a013b7c60a50246ff50a57ba81a4b1753e4b528fb5b744
diff --git a/dev-python/steadymark/metadata.xml b/dev-python/steadymark/metadata.xml
deleted file mode 100644
index ce982d426fa8..000000000000
--- a/dev-python/steadymark/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="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">steadymark</remote-id>
-    <remote-id type="github">gabrielfalcao/steadymark</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/steadymark/steadymark-0.5.3.ebuild b/dev-python/steadymark/steadymark-0.5.3.ebuild
deleted file mode 100644
index da87828d93d3..000000000000
--- a/dev-python/steadymark/steadymark-0.5.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Markdown-based test runner for python"
-HOMEPAGE="https://github.com/gabrielfalcao/steadymark"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/misaka[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/storm/Manifest b/dev-python/storm/Manifest
deleted file mode 100644
index d634f4c00ace..000000000000
--- a/dev-python/storm/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST storm-0.20.tar.bz2 213069 BLAKE2B 746fe55e720fe52369778390e2b748b297911be7631b2a29c6372d384907cc195d0e3b3627a736baa81e6852a762a80d9a4a66de318de3d3c0375939e686ad08 SHA512 7a22c6a6fa45f7bbeeb5c6f934d6f889a6d90d78a6d3e3b9c6a6825485ec35301f573d08c619693a2587e795582db633254631c0be7cd8f1fee6b03a88378a8d
-EBUILD storm-0.20-r2.ebuild 2063 BLAKE2B 7c89cda6a2e9885bda9356b6b40ac9363563e5943d099e60821714f61b472c07cb8b7d233647ddaaec02b566548e0f5c30977c0e5d6f16af8df6d85a5e6636c8 SHA512 952ade9e04ff3e6b83586ae17c522f870107003a07565dc2496c37cdf38a2c12ff91bb74301aa9343853830d2f8195274e81d793c45e9405608eecdf3a930a27
-MISC metadata.xml 313 BLAKE2B 9d6de35e080e5aeaf397932fe30e7d7221f3ea06ba1be383e0b3661fdb955af6beb64492d7bc709479c05a2cf689024ec47f781b2dd0b9e3e9e438d678c476d6 SHA512 ea41959e22a82110ac4c87551d1f41b02b6f190da6ca140335c085137db32af3a56abcfb517f5086af12990a289223fd920f1ddd4a60b59d81cc3dcdee630965
diff --git a/dev-python/storm/metadata.xml b/dev-python/storm/metadata.xml
deleted file mode 100644
index 5ff1e589f865..000000000000
--- a/dev-python/storm/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="launchpad">storm</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/storm/storm-0.20-r2.ebuild b/dev-python/storm/storm-0.20-r2.ebuild
deleted file mode 100644
index 5bfc5d440906..000000000000
--- a/dev-python/storm/storm-0.20-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_REQ_USE="sqlite?"
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="An object-relational mapper for Python developed at Canonical"
-HOMEPAGE="https://storm.canonical.com/ https://pypi.org/project/storm/"
-SRC_URI="https://launchpad.net/storm/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="mysql postgres sqlite test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		mysql? ( dev-python/mysql-python[${PYTHON_MULTI_USEDEP}] )
-		postgres? ( =dev-python/psycopg-2*[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		test? ( dev-python/fixtures[${PYTHON_MULTI_USEDEP}] )
-	')"
-
-DOCS="tests/tutorial.txt"
-
-pkg_setup() {
-	append-cflags -fno-strict-aliasing
-	python-single-r1_pkg_setup
-}
-
-python_prepare_all() {
-	sed -e "s:find_packages():find_packages(exclude=['tests','tests.*']):" \
-		-i setup.py || die
-
-	# delete rogue errors in setting exceptions
-	sed -e '/module_exception is not None:/d' \
-		-e '/module_exception.__bases__ += (exception,)/d' \
-		-i storm/exceptions.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if use mysql; then
-		elog "To run the MySQL-tests, you need:"
-		elog "  - a running mysql-server"
-		elog "  - an already existing database 'db'"
-		elog "  - a user 'user' with full permissions on that database"
-		elog "  - and an environment variable STORM_MYSQL_URI=\"mysql://user:password@host:1234/db\""
-	fi
-	if use postgres; then
-		elog "To run the PostgreSQL-tests, you need:"
-		elog "  - a running postgresql-server"
-		elog "  - an already existing database 'db'"
-		elog "  - a user 'user' with full permissions on that database"
-		elog "  - and an environment variable STORM_POSTGRES_URI=\"postgres://user:password@host:1234/db\""
-	fi
-
-	# Some tests require a server instance which is absent
-	"${PYTHON}" test --verbose || die
-}
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index f30cff93b148..84e49bd85761 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -2,5 +2,6 @@ AUX testpath-0.2-setup.py.patch 944 BLAKE2B 4a65d8a99fa04115e4e24f91be2b32a5f26a
 DIST testpath-0.3.1.tar.gz 91333 BLAKE2B 86787b9677e8baa6d45fb5e6f047f2ab448e385201f20af3a3a9f33d6edd6c67e4eec09c178e815626096ad77d417ef99ddee562bf0fd7947b3f7ae1862f8156 SHA512 ab826cfb76d9a3ed6f1b178240f6bf61439bd792be26b5ad407b5c3efaa455b48965ceaf17e4ca6a4bc706465a8ed1c6c31a1572df5beeea2bb8db7814dc04f0
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
 EBUILD testpath-0.3.1.ebuild 1110 BLAKE2B cf610a2cc0a3b6f03e04fa6d5f36333b7253f8ac23ef4b3956fcb5d47dfcd18a62c9fc0e9ca863b64b66b4eb91ce8f7e23c8ac8daa00756c5cb741285d5c0c34 SHA512 adc56e47ba88f4e4275540ca2aca4c674a6ad6e61a491b8e2e523f52cf6fb45e5a7d56a9a661255490dfc5ff95e5ac44969748f27327688b057f550f759ec515
+EBUILD testpath-0.4.4-r1.ebuild 670 BLAKE2B e8d8d1bee5179468cb3c97d30aa088422c8a4eaff62c66430f3a0e0e94d2e45d2acba32951a824c1f50a9d10daaca4de665e55ae25d1d537c6cf54fed055f12b SHA512 ba1d3fcb8d2f8518b2aced57be575a5bab2a0888e0e9f61b0712b60a338714ac18d1abc00ec8ff30a04210dabafb9744766015353f5f21f61598d7ba218b14dd
 EBUILD testpath-0.4.4.ebuild 894 BLAKE2B 859bded92743726b496c0a1ad6080a57ee3195aa4f0cdfb2f83d175e586b4b62f1e7f15e5030164a298b6cf95667aa7a0c9bc6ca1d70193861b04c5bd2fe871f SHA512 4380fccaf0aabd2da030ae83876fb9336647e0ba94dd80214a54592fa522056b7a8773608b2680a06de096a87bc492e31aead737e075e6001b805a6602695abf
 MISC metadata.xml 613 BLAKE2B 46ccd59fa5e42a573ba9fe1219a5e5a103876ef3e73363b3e003f76fce1138b7f6a9ef3a023be5b695bbbc1244c047d3f70b23b553b3412695a9791dac83c540 SHA512 c251993ded801317c638b460520800bc7fee9390a3c581c01a463da661eda3c7348117aa98c19efd7eb577666dfe580fc690e2f30d2001bd98e49f2baa33248e
diff --git a/dev-python/testpath/testpath-0.4.4-r1.ebuild b/dev-python/testpath/testpath-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..820dc67fae48
--- /dev/null
+++ b/dev-python/testpath/testpath-0.4.4-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Test utilities for code working with files and commands"
+HOMEPAGE="https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+DEPEND="
+	test? (
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
diff --git a/dev-python/timelib/Manifest b/dev-python/timelib/Manifest
deleted file mode 100644
index 75e858d7a380..000000000000
--- a/dev-python/timelib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST timelib-0.2.4.tar.gz 295951 BLAKE2B aa543f8ab9ad18107e6caf4e2eff7471147b0ea100533f456cbaa77a0ab318a97b02d0b38777ebe01384e43a70edc0f55acdec08e95a4b6d8ec438140e94ddaa SHA512 b19ef411f7a6d4f9e43e4de2a4c57f1f430b5c16ec88f7c3f72e8a2f6950a2e94c1ce3792203ba3add07994d1a8eaec4172aa09315b39df4494430e30ebd880b
-EBUILD timelib-0.2.4-r1.ebuild 722 BLAKE2B 8f74f16308429a2aac1cea8af380b5ea61289f30e0066b28b03098d5d6550df92e052a47229c428daf2445210b5019a1c316c80b91576732432f45a3edfea5b8 SHA512 ed4ade6404c0526b680108290497fef9f0a8b73c442923c0ce40c715cdb49bd2cbf68a981f041094a498a4ca34c33d1feefc04f3086a5a9bc0cb17b01082ccf8
-MISC metadata.xml 310 BLAKE2B 008750cf1e8caee9e525cbfa194a3c6090cf6c31fd6cfdb471c4e2210344d198f8a475c656d80b872de008e544203fc3b8f09e9b399634b8fbaad74d9ec9200f SHA512 10849bb8c428f8a211ce1902dbeb3da74922aac33ec7b95df5b2b3dab4cb60e64e399eabeaba48f62455dcea808dfea43daea4593e0529c6d3d58402be06cb46
diff --git a/dev-python/timelib/metadata.xml b/dev-python/timelib/metadata.xml
deleted file mode 100644
index 0a112a630eb1..000000000000
--- a/dev-python/timelib/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">timelib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/timelib/timelib-0.2.4-r1.ebuild b/dev-python/timelib/timelib-0.2.4-r1.ebuild
deleted file mode 100644
index 4467adb1fca2..000000000000
--- a/dev-python/timelib/timelib-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="parse english textual date descriptions"
-HOMEPAGE="https://github.com/pediapress/timelib https://pypi.org/project/timelib/"
-# pypi zipball lacks tests; also it's .zip
-SRC_URI="https://github.com/pediapress/timelib/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="PHP-3.01 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index cc9d65d602aa..64be7c7d66dc 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -2,6 +2,6 @@ AUX toml-0.10.0-depricationwarning.patch 586 BLAKE2B 6da04c9641095a4d0cd2b45ac09
 DIST toml-0.10.0-1.tar.gz 20396 BLAKE2B 3ddcb4cadfc68239cfcb34938a785b27326991ea89966aa6ba3ff2c8a430099664dce1474adf453f2d372b0d149c43584bce9c7abee4c8cbec3126adb3d2ab95 SHA512 ebad9d87606cf66f3db5abb2b0abd333d5536037446df131bda3f8138c33a6495a8923fc583328c27632d39448790e0e6788745d8acd7d600ea3ce57cb7dbd45
 DIST toml-0.10.0.tar.gz 16719 BLAKE2B f7863e9cf0ca5185a59d64010346b4b960c40bc3711d4cbd1ad907d15da823319b748df1a5536465e9f36428bf1599624ede3b1fa68cb420684a52ba137227c9 SHA512 26f26c38ce9cd48305218c2c34c5a5407b00aefc25a933f044bb7be22c23cfdfa3b8cf2da952d17760c4b9038df62e405fa039cc7b63dd3e94c9c312f04f9182
 DIST toml-test-39bb76d631ba103a94b377aaf52c979456677fb1.tar.gz 19304 BLAKE2B 5bb73ff91146ee85f6844132cdfc06673cdb384810c6c978cfc9f8ce6ba8b1607a0dc2d03aa868791d5fd33d00ebac96a4cd57a98948a3ef9318a52417904eda SHA512 931ba91b77da576979bde290c99f6cb1a2eeec3aee55b5041b0216094c584934d560487d329df21caa64b405ec50b4dd417dc910bbe4f15b1440686efc58da29
-EBUILD toml-0.10.0-r1.ebuild 1170 BLAKE2B 0926543a526c3d8bedcd4d439f77fdba495efa30f1bbead4bdf701cd0e5f09354e3a80b8ab4c6200cbf320b0b2eab1563259d366f044afb7b0914e8b141daf3b SHA512 664ca4a392e972f64366fabc55cfa6afd2ca8661a57ad77a1d661f7a1fa08fba0489da95de7045d051f8f2093c875d1ba81a5dd809a2510c68e3d938c83b4c8b
+EBUILD toml-0.10.0-r1.ebuild 1170 BLAKE2B 0aca8934a0a9c0e16373ebe5fd2412765b4040b7745619905427bcda8a110045fe94433194d749e87d2886112e4b4c3b4163a1a6b8448360ccaf66c643ac9f5e SHA512 c6ce56b16dc017c6b60dcae66624181146076ad0e07cacbcaa49e8a824cc76dc802a30088e38365692ffc60093ca143496d1560b8a74370716eac05f0d7db450
 EBUILD toml-0.10.0.ebuild 589 BLAKE2B c45241f49e20b07b97e85659ba76e609df70115d0c8e1221ab44c9cafbf095793c8d189c3d4175b5f1ed2bd793910774a05e613601cc19017cf4fa420c7d5a8f SHA512 4d28037aefd93828b83a36bd69cccf77dd14760ce1d3d0bd041187cafe781d9416b2a97585738ca17f9761ad21ec46198ebe51205686bed4aaf8bcf17355d4cc
 MISC metadata.xml 324 BLAKE2B d9ee23ed157896fac55ab5bddc1cf299572ad05d4b1de97749c0ae196f01515272feea6cbb3e93a71ad908cfb1cdac70a702b2d94b6ef2a74ebc25b044b5c049 SHA512 d5578a5e1e35bb8b263dba80e0f56ee663bfc6fafe052a82889e3d1551a5143345645fcb09107b5115f78a1d40dd4b2a50609a2df096cf870ec6409764d7715a
diff --git a/dev-python/toml/toml-0.10.0-r1.ebuild b/dev-python/toml/toml-0.10.0-r1.ebuild
index afa4ad96da39..957fda0cb85f 100644
--- a/dev-python/toml/toml-0.10.0-r1.ebuild
+++ b/dev-python/toml/toml-0.10.0-r1.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sparc x86"
 
 # peculiar testing depending on https://github.com/BurntSushi/toml-test. Not
 # particularly worth the trouble.
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 3c4153041ac0..32b6cadb8882 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -4,10 +4,12 @@ DIST tox-2.9.1.tar.gz 1855982 BLAKE2B 3e2f5fd3d3e45e54f96b0a6fc8f9e98bfba3b48540
 DIST tox-3.12.1.tar.gz 283964 BLAKE2B b7cb2394a721f281552d1f614a6059f7025390a4ea03fd970c85330dffb97f601f0c3f8c9c9b05f86b5b92e87ef80fba48676201550581562b8cf3f1b2afa34b SHA512 d7ed7ce17b03b5c8e3ba95e14f547c8dbb9a04ac38b98fb24c09261b5087ffc83b05e9a03607fa53ce61340a3ba69fc4121622f7fe338ce8ed402d25d59c7e6a
 DIST tox-3.14.3.tar.gz 288938 BLAKE2B 1a7d6cb8446b83648b67814fb3413da1a9da93e76a508c1fff134c7738feb2a1a5e130201cd7c9f1229c2c05349139bd54aeae1183fdea9c1735ccbde82bcd5a SHA512 5ac912c4f1db7fe23dd6dad68bd15127d3db97498ca58f7b8573f1857634bdf41eb7fdb4cf8d22afa14547363b91a7b52fdd5ad80af5d60ef4dd95c1d103f8fb
 DIST tox-3.14.4.tar.gz 289600 BLAKE2B 413782a524b70b4e301f5a4bda9c763dc7e670d7fe7785ce288b54d8a4940db0b8fed5f075c3f2cdea1d2242e35fa50765de1cd5ea544d1f433faa9a31894d61 SHA512 94e71d06ea62c275651e574359ffa224702eb4062398b44dff9504ce9e55df94d9227fc7cdbf02bc3d44244c29f29b8d3bdef3a66d94ad2dba6971860444ae7d
+DIST tox-3.14.5.tar.gz 290075 BLAKE2B 7e412e85981fe11cba4dc6a4ab3df824678b11fe59bd7d909361029f30e407ffe62a24967e5a447cc643500dfb61326d47fb276bb669311780ac49aa2075fe09 SHA512 cbd0e4c53bb82a302016f380a246e9a9630b8f0c6631195af2dfa12c090cc76c3d9da8362e11c42e74bacbb3f9be504eb67e07de1d2cbac7b5f05341ea2970c4
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1283 BLAKE2B 2b406622044831eaf4ede7d01feae7a19ad781f7afdf53caa79f758ad26a374363934bf241b183c499792d0bb251e9179bd796cb6809cc1a018947ef94780bcf SHA512 40ad403cc7e5a7e5fb43d31aeb070dd38015f63d355f19cabce481eb555f8ff3375578d23b471f7e698045ff9475163c2240e610ba98ed38db264297ea90e008
 EBUILD tox-3.12.1.ebuild 1464 BLAKE2B dc081935636ae04e3d4c9ea74341441c6eb6c127d07eafe852aad8484d74af0d4780e4956f91da9b946fe83469716c3c8c3e45261d15ecaf831ea968fad4e1ce SHA512 3705a537cbf6f97edbeaf8b91fd5e9a5e5ba78c6120d0c5b8fceb854addf23cbd1088ca768c2b9cce1936cb9f26c2dd05d748469c4189f2500854932332113db
 EBUILD tox-3.14.3-r1.ebuild 2243 BLAKE2B de600ab3a842f754231322072b3ebb22a2ac3f585b155473cc1f92f12fd80eabff8a0ec8cfc9603631dd058760aa0ed95f2c8ba68d4b7c6af67967c69ef51cc1 SHA512 e39b5ae961bab697d14d09d2606db23f70059b3c3c49e491dc3f8c7f11bef482b773fc2d9f8b2ac448426f45653cd907434bcca2b4697c99438997b17ba335c0
 EBUILD tox-3.14.4.ebuild 2253 BLAKE2B d0416073a1a0139b0417617da436ecdea6b774ac22e3f484e8f409d33a3d595136bfb129bc69ace67e3de3677626cae9d8a263e7629367e010bfd2072534a0dc SHA512 994d6d9bc693ce9a2a469ce24b074b9bea54e5f7d127a87b90d4f6fe78c7e0ad937b398e33313edce8b1ca213b38e33e9b77cddf90ee4c3303063c888de3e240
+EBUILD tox-3.14.5.ebuild 2253 BLAKE2B d0416073a1a0139b0417617da436ecdea6b774ac22e3f484e8f409d33a3d595136bfb129bc69ace67e3de3677626cae9d8a263e7629367e010bfd2072534a0dc SHA512 994d6d9bc693ce9a2a469ce24b074b9bea54e5f7d127a87b90d4f6fe78c7e0ad937b398e33313edce8b1ca213b38e33e9b77cddf90ee4c3303063c888de3e240
 EBUILD tox-3.2.1.ebuild 1969 BLAKE2B 20c9b07cceda854b8ecf10ffa1c75349cbf35c6deed3cabea04d8530be46e175aa311d7862108dfd575e1e4e27fea54f9f6c70fe710855a52ae660a37fcd6d85 SHA512 74c107f3fed79053c9e9339e50037aceb233215af2704a5c176b8fa27b735e7ce09eb56f3fcb05d00a48d5fc3c95837dfb7767971062402db19389fdeb84964b
 MISC metadata.xml 357 BLAKE2B bdd98bc9f7cc557df1218d1d6c6dd6c0b77fe41ac2e7133728cec5e0709059b60d778fcc958c6932996dd6776c89aeb2e5d1059ee92e8aa824296c512145a2c7 SHA512 8955a371491a0ec5c85704134be03aef40584281a4c7cc74b3d63a0820050692ac7ebeca042b8847fe415170d83dacb27bb51a1d545da0ee28e77c7e405e59c3
diff --git a/dev-python/tox/tox-3.14.5.ebuild b/dev-python/tox/tox-3.14.5.ebuild
new file mode 100644
index 000000000000..95ccb119c8b0
--- /dev/null
+++ b/dev-python/tox/tox-3.14.5.ebuild
@@ -0,0 +1,74 @@
+# 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_{6,7,8} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~sparc ~x86"
+
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		<dev-python/flaky-4
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		<dev-python/pytest-mock-2.0[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.9.0-strip-setuptools_scm.patch"
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# broken without internet
+	sed -i -e 's:test_provision_non_canonical_dep:_&:' \
+		tests/unit/session/test_provision.py || die
+	sed -i -e 's:test_provision_interrupt_child:_&:' \
+		tests/integration/test_provision_int.py || die
+	# broken with our mock version (?)
+	sed -i -e 's:test_create_KeyboardInterrupt:_&:' \
+		tests/unit/test_venv.py || die
+	# broken with Gentoo Python layout
+	sed -i -e 's:test_tox_get_python_executable:_&:' \
+		-e 's:test_find_alias_on_path:_&:' \
+		tests/unit/interpreters/test_interpreters.py || die
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/turbocheetah/Manifest b/dev-python/turbocheetah/Manifest
deleted file mode 100644
index c077c13773fb..000000000000
--- a/dev-python/turbocheetah/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TurboCheetah-1.0.tar.gz 4335 BLAKE2B 0dbc31123aaeae0860e85f05b88d02c43202d2d67fd79025e079f60edd4a48593b32bd0b4eabb2cfb8364ef37ac60835c8339278c1f0325b94909e386e2acdc9 SHA512 7f231ee1e9f09c2c73a6a3c3be04643e6a13f2e488329d086cba759a75bfaf6c3f5b1670d21dec54bf3df8f2a449faa365c600ae47705295e13727ea4fccbb92
-EBUILD turbocheetah-1.0-r1.ebuild 783 BLAKE2B 8addc529b683b5cff95364994a197a79121cecc290c83934dc904c5b64f0cf1e245f2ca669d4daea7ba71df821ae3130759c855559e33855b77e00a262513e3a SHA512 98747935919a31f92a09cb06952697b8eee2b3452e2f82a3a8d14c31121036563f26b288444cce6af8f3847eb381013660b89ceca34369aaf77c3c555b3563bb
-MISC metadata.xml 315 BLAKE2B 9d39c9790ef51b5f80248c33d682dfadc95b68316e7e3be40bfa363cf605f231c8f770ac3b6773b42ecec54cee844621879e9e4b13b4a65fae9663d8e70ca9dd SHA512 1b66608b1169844feb4a221c46701fb8865ff533c077cb9bb62eb23fce4c359808f21b0d055499c859f06c5ab1dca7a3fc3ac8f9dfcf402995a86f18dd2843f7
diff --git a/dev-python/turbocheetah/metadata.xml b/dev-python/turbocheetah/metadata.xml
deleted file mode 100644
index 0f1912de75ed..000000000000
--- a/dev-python/turbocheetah/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">TurboCheetah</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild b/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild
deleted file mode 100644
index 9551732a6011..000000000000
--- a/dev-python/turbocheetah/turbocheetah-1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-#DISTUTILS_SRC_TEST="nosetests"
-
-MY_PN="TurboCheetah"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="TurboGears plugin to support use of Cheetah templates"
-HOMEPAGE="http://docs.turbogears.org/TurboCheetah https://pypi.org/project/TurboCheetah/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/cheetah-2.0.1[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	nosetests || die "test failed"
-}
diff --git a/dev-python/turbojson/Manifest b/dev-python/turbojson/Manifest
deleted file mode 100644
index ad230ff369bb..000000000000
--- a/dev-python/turbojson/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TurboJson-1.3.2.tar.gz 6613 BLAKE2B 0ea98ef43b1984b3bf5311fa0a8b7898ff7b3ad9d0b2f6b8da70038e55e7a2052018820c4adf8a7c8b2c36d11bea2b5e3922566c09f91585afe2f45cbfee5ec7 SHA512 5c3a2382f764ad42629b3f992f0fcef61b858a9ade4084b86d96c16efbf398a6ea5f8d04c3cc5618c681fe1a111877aa64777748535e9830495aaf59e53d11b1
-EBUILD turbojson-1.3.2-r1.ebuild 724 BLAKE2B 4b100064bfae3c3b4fcb50786f6063affdf694937b287607417d9243cd371cc1a90c8e5e666ea338729a37a66eac56dc799b0eb991a13c4f944571253ba99e6c SHA512 cd75f25515cd592b6ff466ae2ae58d28659d370e3ff48a3038fdb729a0d222fc1b53daf6c2d9285419fd35dc2f9e1165f19682396774a71d8b65a9f1192d8f5f
-MISC metadata.xml 312 BLAKE2B 5e928b3a8ac4e726007e95adc0cb82829621a10bd765f14828254f48fc5af8efd93822f1fd4192da07930749e9882b4737fbd9b6cd68f38d8290a40b8540d085 SHA512 80643b876c5d02c364e0105039a339f8a7b49da7d4fa815b335c04a4e38552d35566941621f12ee6ac1a5b64ceb3df4738e4cf45b66c692fe325cac65e53f195
diff --git a/dev-python/turbojson/metadata.xml b/dev-python/turbojson/metadata.xml
deleted file mode 100644
index ca5fe0e76d7b..000000000000
--- a/dev-python/turbojson/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">TurboJson</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/turbojson/turbojson-1.3.2-r1.ebuild b/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
deleted file mode 100644
index 339e25c7424b..000000000000
--- a/dev-python/turbojson/turbojson-1.3.2-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="TurboJson"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="TurboGears JSON file format support plugin"
-HOMEPAGE="https://pypi.org/project/TurboJson/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=">=dev-python/simplejson-1.9.1[${PYTHON_USEDEP}]
-	>=dev-python/peak-rules-0.5[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${MY_P}"
-# Testsuite requires a package of peak not present in portage
diff --git a/dev-python/turbokid/Manifest b/dev-python/turbokid/Manifest
deleted file mode 100644
index 9d1f93d33b40..000000000000
--- a/dev-python/turbokid/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST TurboKid-1.0.5.tar.gz 6878 BLAKE2B f461edc56f7747eb30d58c3b04a783902100585127ce07e1836bfcfaa046e35167d8a48cc890c57516957903087e88c3f826a07f555d37c55038d5f600100b8b SHA512 13a7aba4773ceb5c591c9b5f33b585161a6b6bd92f13169291c20e2cb77b10fe97e3f2d5596d0498add34728a36f6e0968f236fca87f1091a92eee68704222a4
-EBUILD turbokid-1.0.5-r1.ebuild 679 BLAKE2B 3f521def07cd312e3abea52fc7435e33829bf8a15c27a9d812106e9ad7a9426094b7571feb04296b4553f733f49c4323a446b480029a3a5326f837fbca402d47 SHA512 a9083f57039e750fe6ac7beae188955def7cabb671b39ee65576f2b0551a9d279e4e21d5b360fbe0b9b4ab8dd0d337fc055cb6d7b200468510b523046e7fe253
-MISC metadata.xml 311 BLAKE2B 2a1d712d98242f60a8f6cf7d0dfae762e0e90e5e39258a133ac65bb6a094f6aac4fec1f789bad7a786ea294f15eee628ce51e0aa20514f8c1a27ec9f0b96cd9d SHA512 9c0295108e16679f57d44e69093133509177eb18cba5ff242efd2a38feb25386146ce9a3845cbb5ad3f9ed79e4838eee875202997a315e9e41ab1a098ca2801a
diff --git a/dev-python/turbokid/metadata.xml b/dev-python/turbokid/metadata.xml
deleted file mode 100644
index 7f0ee32d148b..000000000000
--- a/dev-python/turbokid/metadata.xml
+++ /dev/null
@@ -1,11 +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>
-	<upstream>
-		<remote-id type="pypi">TurboKid</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/turbokid/turbokid-1.0.5-r1.ebuild b/dev-python/turbokid/turbokid-1.0.5-r1.ebuild
deleted file mode 100644
index 32970473dfd7..000000000000
--- a/dev-python/turbokid/turbokid-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="TurboKid"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python template plugin that supports Kid templates"
-HOMEPAGE="https://pypi.org/project/TurboKid/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=">=dev-python/kid-0.9.6[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND}
-		dev-python/nose[${PYTHON_USEDEP}] )"
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/twisted-conch/Manifest b/dev-python/twisted-conch/Manifest
deleted file mode 100644
index f2eb354408e3..000000000000
--- a/dev-python/twisted-conch/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST TwistedConch-13.2.0.tar.bz2 243977 BLAKE2B 96e11e1777b32b71dc7fc2c0af444ccbee0a7bbabc33cc45ea844818a3270bfb6877eee8442d4388530fbd55494d54d07b5e78759c8ae37f830a16b27c283e9d SHA512 3e9cfe76b5fdd8e18732d554721d493bed70b757b21029f8e126d486011b41da26a34409062cb5ffe4283a57b6d342434c84959b78b2781f069e22d2da610043
-DIST TwistedConch-15.2.1.tar.bz2 222736 BLAKE2B c4de3ffff523b8bb12918a5eab0b662e32f3e08985c0698b5a70167f9d655bbfb63e1c0c58e35be8e4042df4ea041c25bf421162220005caff369490b42c5d49 SHA512 d21879801e3cc925345e6528a84fa031f5cc1c8a2b5aebc5d3540fdd356d9743fe827ab8060db13b462a6d8986ac23307feaf78725950cef462f06b4edb93df7
-EBUILD twisted-conch-13.2.0.ebuild 786 BLAKE2B 04297670295cfefafd1f847bd595f88e8db5ee2db2997889560dcbc3853957df3769dc3c79ff40e62b6ac8ca911804ad6c4d9185b2c11bb6129682517450a7fc SHA512 15a150e86c0862444674db0fe77b9967f9fb48d84ca8bb0991237eeb3dbd12524e8dee80e85ab21bdbf3218f1508a6fc24d09dd2266f4c51071f0f9825cdd90e
-EBUILD twisted-conch-15.2.1.ebuild 484 BLAKE2B f0cbe69e0fd05fdd3e54ffb07545bf61023dcb2725b660447e51fd6f0618ed3dad8477c9edc478259f03ce3f381297c809344edc5e7d2d19fbbbc615a434e3b6 SHA512 859e14bdabb4d74c1449d9c0767a3a659f9f2ba89c12e83b8dd7c3fbb4fa1495664595f72b59322d0664f6be1a23014758391c45d221bc7df917c430ba576a11
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-conch/metadata.xml b/dev-python/twisted-conch/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/twisted-conch/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild b/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
deleted file mode 100644
index f2f060717e4f..000000000000
--- a/dev-python/twisted-conch/twisted-conch-13.2.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted SSHv2 implementation"
-
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycrypto[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed -e "s/test_checkKeyAsRoot/_&/" -i twisted/conch/test/test_checkers.py
-		sed -e "s/test_getPrivateKeysAsRoot/_&/" -i twisted/conch/test/test_openssh_compat.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild b/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
deleted file mode 100644
index 8e8991d4a234..000000000000
--- a/dev-python/twisted-conch/twisted-conch-15.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted SSHv2 implementation"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/pyasn1[${PYTHON_USEDEP}]
-	dev-python/pycryptodome[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-core/Manifest b/dev-python/twisted-core/Manifest
deleted file mode 100644
index adec7d42c2cc..000000000000
--- a/dev-python/twisted-core/Manifest
+++ /dev/null
@@ -1,10 +0,0 @@
-AUX twistd.conf 277 BLAKE2B 78ca35b410a6597c9afe6a9c8d3dfb1de113411634901f936794e8a59c0644233d0673e710bd0870ecf4312d079c46f62f43928605700559134f1fb62490559a SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb
-AUX twistd.init 563 BLAKE2B 24488118b025bf2068bbf07af900064ff6a7ee99106c3da30f15f2b3f85af7443212afebc6b52a12645488b85656f87b653df9263fc2be6bd09707917899f252 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129
-AUX twisted-core-12.1.0-remove-tests-conch-dependency.patch 459 BLAKE2B c6657e1840e532ac9eda3bb15035c755bbfca8b80dd93cb8cedfa8e549c8631b7354970cb478903a99bda69af59027baa79d9ca276aec8408b2957df1cd8757c SHA512 bb68becc92aabb539658b0435f12c03612fc825eee1d1b63873d008f1b8fd18806d3dc00987931aae4e3cc86e5f57b94c17e1c1227f1019e17bbce9930f919d9
-AUX twisted-core-2.1.0-echo-less.patch 269 BLAKE2B b4f68663c7485a9ac247415aede69599023475db9ba2c2e0a186448969d50dcc5e26fce56f5906e9555b7469990d7aefb4b39b52e9e5f775ba4e985312a32ac4 SHA512 74e8ab5de6545a09159cbaeae63688e0bb3fe1bf7c78fc14945cef0c8d017ee5157fdf41e0730bdf2bb47d2405978fffea1c2c6c660e3838a659b523e6ef0f2d
-AUX twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch 419 BLAKE2B 674b63a74ed134596d21d384737fb510f4a26f6c4770c1feb7a612901c8b7bebf9f8e2cbaf9bd6e18a1c7e11f24d47e0b32b2ea15204cb37ee70d5b1625bb9ef SHA512 b77cdc6f7df5a283075f1bde7f974482cb5c5f49c9189b0f3fc3a39da18fbb7ade30a115cd76cc4241d5bc8727994cfcc1e96aaa835c68f753b6ac3523438a63
-DIST TwistedCore-13.2.0.tar.bz2 1496299 BLAKE2B a7034a23c4ad890a8591e7ef1de1c3ba1dc486ac6f3d1987cfc280756323d3e968a913bc4291ef8dede295a12c02b8e166a27f665ce7f4a1c536e6e7a6991e53 SHA512 90cf2019f0d5b125c7bbb5a9e3e7d2dedcd8efd5f9b2ab057e0b41f899d394b995fe599128223c82b1a634fb881ad7ae8ddc5b86b26adb28a3834c05da45f2c6
-DIST TwistedCore-15.2.1.tar.bz2 1179442 BLAKE2B 39c9d3646fbd31225dca1a4888ee177c9547b7a9809c57e2e9577c90c02f2b64e74cfa3b8410513b7645312d39ebb292fdc8dced26a9dd29abe95dad24a8b870 SHA512 c5923d71903afac7dec15d130ff3bd247dc1a6cdeb35cc642912a43f1e5640088971ddfc7abe3e18ca1853e59ba6a417d4b465fb422aba1a052bc156d7c6e820
-EBUILD twisted-core-13.2.0.ebuild 3609 BLAKE2B 0356f6e37221b54c12f3b9aff0117a8c2fe31207f339a63cb7bf7eb86a4ba8833f9624c549fccbaf1bb8bb28d202fa3f8dc0093027641c7023fc1ae3e1e4ac0f SHA512 59e0486c79843df90de4389201753b598aea14cceda451ddd142fa5180309959047d2f97dc386497de41d2e5de6562e72be5247c4fba1620281bdf097505d19b
-EBUILD twisted-core-15.2.1.ebuild 4129 BLAKE2B 8a62be9cae53a415487f713e48fe3f8e820667d7ccbdd29746cf22d9843d3bc2d6a51060d2df740056a535b3c6c440a92146a72230dee7a56513a3822bb955b7 SHA512 6c0e009788cf2be7eb0464e4c4d9d770377e807552499b51de6e5ec7e96a6fe8bbc003936636f7ce50bc077e1328e5e887ebe8af5fe57395a1c1bb6362cf0512
-MISC metadata.xml 596 BLAKE2B bbf2d93b3f599494e0913ae0068a5aaf6d0c972959eb5fa80231f247fd4988515aefd978d25d023ea6a66a9edf036a794599088931dd098223fa9951c567dda8 SHA512 acb4690541dd747cbee28993ec56a422149ef02150505b4b1ee1ab0418745dd074344a8cb2d3dfc76f7027229f921e8eb25738bfe4b829243dc4530c96a41440
diff --git a/dev-python/twisted-core/files/twistd.conf b/dev-python/twisted-core/files/twistd.conf
deleted file mode 100644
index 53788cd0017e..000000000000
--- a/dev-python/twisted-core/files/twistd.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-
-# These are passed to twistd.
-# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -y /etc/twistd.tac"
-# TWISTD_OPTS="--no_save --logfile=/var/log/twistd -f /etc/twistd.tap"
-
-# Make any additions to PYTHONPATH the twistd needs here.
-# PYTHONPATH="/path/to/extra/python/modules"
diff --git a/dev-python/twisted-core/files/twistd.init b/dev-python/twisted-core/files/twistd.init
deleted file mode 100644
index b031b0020c6e..000000000000
--- a/dev-python/twisted-core/files/twistd.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-
-depend() {
-	need net
-}
-
-start() {
-	if [ -z "${TWISTD_OPTS}" ]; then
-		eerror "TWISTD_OPTS is not set!"
-		eerror "You need to configure twistd in /etc/conf.d/twistd."
-		return 1
-	fi
-	export PYTHONPATH
-	ebegin "Starting twistd"
-	start-stop-daemon --start --quiet --pidfile /var/run/twistd.pid \
-		--exec /usr/bin/twistd -- --pidfile /var/run/twistd.pid \
-			${TWISTD_OPTS}
-	eend $? "Failed to start twistd"
-}
-
-stop() {
-	ebegin "Stopping twistd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/twistd.pid 
-	eend $? "Failed to stop twistd"
-}
diff --git a/dev-python/twisted-core/files/twisted-core-12.1.0-remove-tests-conch-dependency.patch b/dev-python/twisted-core/files/twisted-core-12.1.0-remove-tests-conch-dependency.patch
deleted file mode 100644
index db2e2454bbc6..000000000000
--- a/dev-python/twisted-core/files/twisted-core-12.1.0-remove-tests-conch-dependency.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: twisted/test/test_strcred.py
-===================================================================
---- twisted/test/test_strcred.py	(revision 34525)
-+++ twisted/test/test_strcred.py	(working copy)
-@@ -352,6 +352,10 @@
-     except ImportError:
-         skip = "PyCrypto is not available"
- 
-+    try:
-+        from twisted import conch
-+    except ImportError:
-+        skip = "Twisted Conch is not available"
- 
-     def test_isChecker(self):
-         """
diff --git a/dev-python/twisted-core/files/twisted-core-2.1.0-echo-less.patch b/dev-python/twisted-core/files/twisted-core-2.1.0-echo-less.patch
deleted file mode 100644
index c180a111021d..000000000000
--- a/dev-python/twisted-core/files/twisted-core-2.1.0-echo-less.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-=== modified file 'twisted/test/test_process.py'
---- twisted/test/test_process.py	
-+++ twisted/test/test_process.py	
-@@ -76,7 +76,7 @@
- 
- class EchoProtocol(protocol.ProcessProtocol):
- 
--    s = "1234567" * 1001
-+    s = "1234567" * 11
-     n = 10
-     finished = 0
- 
-
diff --git a/dev-python/twisted-core/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch b/dev-python/twisted-core/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
deleted file mode 100644
index 2fe22f1640b1..000000000000
--- a/dev-python/twisted-core/files/twisted-core-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- twisted/plugin.py
-+++ twisted/plugin.py
-@@ -174,7 +174,7 @@
-             if pluginKey not in existingKeys:
-                 del dropinDotCache[pluginKey]
-                 needsWrite = True
--        if needsWrite:
-+        if needsWrite and os.environ.get("TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE") is None:
-             try:
-                 dropinPath.setContent(pickle.dumps(dropinDotCache))
-             except:
diff --git a/dev-python/twisted-core/metadata.xml b/dev-python/twisted-core/metadata.xml
deleted file mode 100644
index 28680e22a671..000000000000
--- a/dev-python/twisted-core/metadata.xml
+++ /dev/null
@@ -1,17 +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>
-	<use>
-		<flag name="serial">include serial port support</flag>
-	</use>
-	<longdescription>
-		Twisted is an asynchronous networking framework written in Python,
-		supporting TCP, UDP, multicast, SSL/TLS, serial communication and
-		more. It is used by most of the servers, clients and protocols that
-		are part of other Twisted projects.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-python/twisted-core/twisted-core-13.2.0.ebuild b/dev-python/twisted-core/twisted-core-13.2.0.ebuild
deleted file mode 100644
index f78ea7e26866..000000000000
--- a/dev-python/twisted-core/twisted-core-13.2.0.ebuild
+++ /dev/null
@@ -1,120 +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="threads(+)"
-
-inherit eutils flag-o-matic twisted-r1
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt gtk serial"
-
-DEPEND="
-	>=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
-	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}] )
-	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-PATCHES=(
-	# Give a load-sensitive test a better chance of succeeding.
-	"${FILESDIR}/${PN}-2.1.0-echo-less.patch"
-
-	# Skip a test if twisted conch is not available
-	# (see Twisted ticket #5703)
-	"${FILESDIR}/${PN}-12.1.0-remove-tests-conch-dependency.patch"
-
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-)
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed \
-			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
-			-e "s/test_deployedMode/_&/" \
-			-i twisted/test/test_plugin.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see http://twistedmatrix.com/trac/ticket/5701 )
-
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	# NOTE: on pypy a couple of failures (refcounting, version-checking) is
-	# expected
-
-	distutils_install_for_testing
-
-	pushd "${TEST_DIR}"/lib > /dev/null || die
-
-	# Skip broken tests.
-
-	# http://twistedmatrix.com/trac/ticket/5375
-	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py \
-		|| die "sed failed"
-
-	# tap2rpm is already skipped if rpm is not installed, but fails for me on a Gentoo box with it present.
-	# I currently lack the cycles to track this failure down.
-	rm twisted/scripts/test/test_tap2rpm.py
-
-	# Prevent it from pulling in plugins from already installed twisted packages.
-	rm -f twisted/plugins/__init__.py
-
-	# An empty file doesn't work because the tests check for doc strings in all packages.
-	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
-
-	# https://twistedmatrix.com/trac/ticket/6920
-	sed -e 's:test_basicOperation:_&:' -i twisted/scripts/test/test_tap2deb.py || die
-	sed -e 's:test_inspectCertificate:_&:' -i twisted/test/test_sslverify.py || die
-
-	# Requires twisted-web creating a cric. dep
-	rm -f twisted/python/test/test_release.py || die
-
-	# Requires connection to the network
-	sed -e 's:test_multiListen:_&:' -i twisted/test/test_udp.py || die
-
-	if ! "${TEST_DIR}"/scripts/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# create 'Twisted' egg wrt bug #299736
-	local egg=( Twisted_Core*.egg-info )
-	[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
diff --git a/dev-python/twisted-core/twisted-core-15.2.1.ebuild b/dev-python/twisted-core/twisted-core-15.2.1.ebuild
deleted file mode 100644
index a209312861f5..000000000000
--- a/dev-python/twisted-core/twisted-core-15.2.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils flag-o-matic twisted-r1
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="crypt gtk serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
-	crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}] )
-	gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
-	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
-DEPEND="
-	test? ( ${RDEPEND} )
-"
-RDEPEND+=" !dev-python/twisted"
-
-PATCHES=(
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-)
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed \
-			-e "s/test_newPluginsOnReadOnlyPath/_&/" \
-			-e "s/test_deployedMode/_&/" \
-			-i twisted/test/test_plugin.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see http://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	pushd "${TEST_DIR}"/lib > /dev/null || die
-
-	# Skip broken tests.
-
-	# http://twistedmatrix.com/trac/ticket/5375
-	sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py \
-		|| die "sed failed"
-
-	# Prevent it from pulling in plugins from already installed twisted packages.
-	rm -f twisted/plugins/__init__.py
-
-	# An empty file doesn't work because the tests check for doc strings in all packages.
-	echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
-
-	# https://twistedmatrix.com/trac/ticket/6920 6921
-	# Just re-exposing them to list a full list of deficits
-#	sed -e 's:test_basicOperation:_&:' -i twisted/scripts/test/test_tap2deb.py || die
-#	sed -e 's:test_inspectCertificate:_&:' -i twisted/test/test_sslverify.py || die
-
-	# Requires twisted-web, twisted-lore and twisted-names, creating a circ. dep and fail even if installed.
-	# test_loreDeprecation and test_exist failures appeared in version 14.0.0.
-	# Possibly due to over taxing of the distutils_install_for_testing function
-	rm -f twisted/python/test/test_release.py || die
-	sed -e 's:test_loreDeprecation:_&:' -i twisted/test/test_twisted.py || die
-	sed -e 's:test_exist:_&:' -i twisted/python/test/test_dist3.py || die
-
-	# Requires connection to the network
-	sed -e 's:test_multiListen:_&:' -i twisted/test/test_udp.py || die
-
-	# Appeared in version 14.0.0; https://twistedmatrix.com/trac/ticket/7422; known failures
-	# Upstream somewhat unreceptive
-	# The last of these invokes a hang or a long delay
-	sed -e 's:test_dataReceivedThrows:_&:' \
-		-e 's:test_resumeProducingThrows:_&:' \
-		-e 's:test_resumeProducingAbortLater:_&:' \
-		-e 's:test_resumeProducingAbort:_&:' \
-		-e 's:test_fullWriteBufferAfterByteExchange:_&:' \
-		-i twisted/internet/test/test_tcp.py || die
-	sed -e 's:test_logPrefix:_&:' -i twisted/internet/test/connectionmixins.py || die
-
-	if ! "${TEST_DIR}"/scripts/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# create 'Twisted' egg wrt bug #299736
-	local egg=( Twisted_Core*.egg-info )
-	[[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
-	ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
diff --git a/dev-python/twisted-lore/Manifest b/dev-python/twisted-lore/Manifest
deleted file mode 100644
index 0c02f3ff1773..000000000000
--- a/dev-python/twisted-lore/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST TwistedLore-13.2.0.tar.bz2 88616 BLAKE2B 9505d0bdbb61f2ca1bc852e49a6d46a41cb921443d10c3409f91d793cb4f68c3e15363caf022eca9d5782bf250e42f2b855abe31005834e6a98c52dc8bc6e5e4 SHA512 a05752e2854c404da30562062e1d72d0376ebd5b82c3371183023936851bb6394dc3ff95160efc3e7e7781624ac48485d7c102e4487cf3bfda2a086bcc596ff6
-DIST TwistedLore-15.2.1.tar.bz2 54070 BLAKE2B cc99513a90e07793f91741d4ab43ff5ced78b3df5b9f686799eef6aec54b9833604b25c2de509d170c95449f02c90f03fb2b807f4a036c2f689afd07287dba12 SHA512 9d9c45443f702e527f82dd25b7ed73af24b1ff16d266eb0cb6cb5be230939ed2ba07dfcd9d7b02d48823043b64b33df916b58dd1d1280d3f4e4f7c3cec851d7a
-EBUILD twisted-lore-13.2.0.ebuild 444 BLAKE2B fdd60a231609d33a38b952b4bd9ef95904ac2eecbb5b00d1ff617af2c41520a8b4936225cf82bea96d906202f2715a45f26ec136696c0e73fd991df18ff53f7c SHA512 14fded2f49b3ed0ef8ae5d6da899add0f5d67cbbec485513929273414148e23bff26531040c26c4243bdad1cbda33a877308b7dedcac1ece28083688d071e148
-EBUILD twisted-lore-15.2.1.ebuild 451 BLAKE2B 84191221fa7b9e644d30a8c5ac04fb08b45bfd2b663aeb2d268e3f67201b94828bac152174ca5e994a69360147195a8ef5ee4654226c409b835c6a68f5c3ba84 SHA512 a93c44151a5d4e46af861002ab57339f0d34d55aae35bb253ac0ebc0e4c0183d919a93b0d1a2ffafe25d0bb12c6968b25e8c8da17f7b36e02f7f1997c9569d8d
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-lore/metadata.xml b/dev-python/twisted-lore/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/twisted-lore/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild b/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
deleted file mode 100644
index 7f7a75d8b582..000000000000
--- a/dev-python/twisted-lore/twisted-lore-13.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted documentation system"
-
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild b/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
deleted file mode 100644
index 5338dc85639c..000000000000
--- a/dev-python/twisted-lore/twisted-lore-15.2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted documentation system"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-mail/Manifest b/dev-python/twisted-mail/Manifest
deleted file mode 100644
index 6ded2805458e..000000000000
--- a/dev-python/twisted-mail/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST TwistedMail-13.2.0.tar.bz2 160046 BLAKE2B d13c04c2544f59711de980bc3902e65997f02aa389ec2b59cded133dbf931f1cb24f3d1b7bf100af7ac91b7a39b02d87959fed32ac218486918630afe911096d SHA512 399e34dbf674e3e30acf49769fbb9c188f1dfc00187b82e67865490b5a9f2847ad1d70fc1bb930a50b4b77b3e017212590c93f3077a8464d9e1f662750f37314
-DIST TwistedMail-15.2.1.tar.bz2 161891 BLAKE2B 5ca48f016ba7fa5612b6a0dcc2d5244ef0bc87c312840f641ec62a78949fa4519c3ea246030da656a663d044bfe58cce9d720093471baa5b07848ec8a0c2bbc9 SHA512 d3c29ad842610dde6697e76456125716a8657f9e7938ac6e66fd3c226fc339e04551a2074c8af8627882c2a761414d5f856fe647b3900ed4eae0fbe7fb5bba23
-EBUILD twisted-mail-13.2.0.ebuild 588 BLAKE2B 2018cb8eccd0b527ad129edbc91add0a93912e441942371b43121f33dbb3d19ab140f3f9fbd06466db95c52eef2ccb3efd74d49859de9ba6b7a8a28bb9e9b045 SHA512 4488d892e8e643ea220d6b13e15696ec66275dc2c1b6ebabb436339ca4cb55322ca081f9fdc3d2aeb6903f075b9d996a7d88a7b006851710cf48175f6e0ddfc7
-EBUILD twisted-mail-15.2.1.ebuild 592 BLAKE2B 1f554e84fe43ccd046178d89a743c2436e165e71903345cf1c8f21624b944e7c98a2b2ddac293fc9de8fab4eb24f4eb3291b0f9a2267fbbdce2cc4775b547da6 SHA512 2925b6fef338346e0f04a9012d42890f357c19a61268988f76a6e11fee398f086fba9bd74e0a5c08e5bdd07ac41f8fac0dd79c96b3ca5a0fec1e8781330cc83c
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-mail/metadata.xml b/dev-python/twisted-mail/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/twisted-mail/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild b/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
deleted file mode 100644
index 2f357a596a64..000000000000
--- a/dev-python/twisted-mail/twisted-mail-13.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="A Twisted Mail library, server and client"
-
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild b/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild
deleted file mode 100644
index 31dca25f16f2..000000000000
--- a/dev-python/twisted-mail/twisted-mail-15.2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="A Twisted Mail library, server and client"
-
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-names-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-names/Manifest b/dev-python/twisted-names/Manifest
deleted file mode 100644
index e55bda3066f2..000000000000
--- a/dev-python/twisted-names/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST TwistedNames-13.2.0.tar.bz2 71127 BLAKE2B bf84c95a42b3738c5764d22acd259ccd443e236fcb8c87f383a2de46cdd5c9859b09be57630a11595be125ed74ce5fe4dd0783af2dc76dfc802a873dd17e55f3 SHA512 1dc7ac69f51a41f3fa6472ae633649d61935ca0c64233a86c69755e8a53100402842712beb2b555dfbf493696bcb4a0fa7d70fa2d3450fe0448b680f85eb9fb5
-DIST TwistedNames-15.2.1.tar.bz2 88688 BLAKE2B d6256bda4c674f0aedd5fe871c1ce3d2c6780c7d8c32c26598b47e1840d9061323e925a44aae4f02ef2537a20ec947a54eaabc4daf7d45465843c48b76132ab7 SHA512 2ca2c4e4e9a49e82246f781f2fd1eb86a85d78236251e085dc88a8b52b7b58964cac4ff2db75a97ea652350f650bc06fcc4d4964747b7e9c5a6631c2ea6aed80
-EBUILD twisted-names-13.2.0.ebuild 510 BLAKE2B 951397487b8b1d9a95b7ec8b1b1ed09e8f93f22acdbd2033fe654021a2ec06aa3dff1d3276e7f2b5b3a898698c5dc121ae9ac2e3dceec9a70c6ff04eb4e29f16 SHA512 fe029f7e8c984e60930915b43899361664b915cfc8592ba1909e1777847acd1bd4e4ea43e266650b3bb395b8852b1f89979e2a091e0ace4e9d24b9b252d2f080
-EBUILD twisted-names-15.2.1.ebuild 521 BLAKE2B 84022bbfddbb69d59323b514636cc550fd4f974cbb55215d81c075f6def6e7fcc7c38a59abbe513f979b92cbada6f5f7b56e8a4390d7aef3c9ae7dd8c4ecce47 SHA512 f6193ffe4a5f1acd91b515d7c771a3d954ebebe2136e5d08a6e45a85d33d22db23659b07a4f6a80d47b99389a1c491c47a2eab1bd2b1720046332f8b2ead4934
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-names/metadata.xml b/dev-python/twisted-names/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/twisted-names/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/twisted-names/twisted-names-13.2.0.ebuild b/dev-python/twisted-names/twisted-names-13.2.0.ebuild
deleted file mode 100644
index cdcd519f4d49..000000000000
--- a/dev-python/twisted-names/twisted-names-13.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="A Twisted DNS implementation"
-
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-names/twisted-names-15.2.1.ebuild b/dev-python/twisted-names/twisted-names-15.2.1.ebuild
deleted file mode 100644
index faf83b7a046c..000000000000
--- a/dev-python/twisted-names/twisted-names-15.2.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="A Twisted DNS implementation"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-news/Manifest b/dev-python/twisted-news/Manifest
deleted file mode 100644
index f91dff6253c2..000000000000
--- a/dev-python/twisted-news/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST TwistedNews-13.2.0.tar.bz2 19706 BLAKE2B 42969d66d60d5bb228e4565c775b8d3e10acd2fd833d3b48e08d773b72bd01dd9d71d5fbdf1d4db767219d5d7f9949214bf5dda0d487c76434db3fc8c9dbc124 SHA512 439f35b882f28be1fa466fabe93c06cd688662a44dd21f58a3c2d9670f95910c038bb30b79c88f661f50be7eb9bb820f6d89a94fbf61bde2d8bb46af574c9274
-DIST TwistedNews-15.2.1.tar.bz2 19889 BLAKE2B 4043b76752dfcc8205f8b978cd87267d1fb31c1c794c65678e3a1fec1aac3b8131dd55550acf69909149873eaf55fc69f232083cebb46224ab2b23d95374188d SHA512 faa3a2b7c6acf2d9f8a63ef79bf36fecc2d48101b701bf679b4837e54f8327e5dda75e207ac2cb03a35671781c9221f62f60885a0459e970f15d660d214e7342
-EBUILD twisted-news-13.2.0.ebuild 471 BLAKE2B f7697be9e80a20c0ae7e54fe0f9c571aaea5e3edfa5fafdf222d0b774890156fe1f5c011dbf99629db2572727fbb9e84157c3526b33030e12f9569a5123f9528 SHA512 4a2435707994b0faec8c408533da4624c401eb0a3c4ffcfca07d9b71c4842a286dd87522bba01f1b66e05d3e4f134d2a751747a036adec0fc3e68895d022aad8
-EBUILD twisted-news-15.2.1.ebuild 478 BLAKE2B ceb4c3a60c6eef449891ded0b016ea5e71e4fb7fb4c0f5123b0cee00b2485fd5090da25aa70f8b9cee3e304fd505aea3a62bf21f3b9c7d2fefddc3a20f4a7af9 SHA512 cfcbe37e18555f9b3344e0669b2e3c98aa3d30a26965d4968b95f8c4e9711646a682087bc9959f7ad0dd7f5fe1ae7bb55fb1fd3815ab8bdcd7acdc7bb2f2b3d6
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-news/metadata.xml b/dev-python/twisted-news/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/twisted-news/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/twisted-news/twisted-news-13.2.0.ebuild b/dev-python/twisted-news/twisted-news-13.2.0.ebuild
deleted file mode 100644
index 04532e3e2cdf..000000000000
--- a/dev-python/twisted-news/twisted-news-13.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted News is an NNTP server and programming library"
-
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-news/twisted-news-15.2.1.ebuild b/dev-python/twisted-news/twisted-news-15.2.1.ebuild
deleted file mode 100644
index 8e0abf2fd8eb..000000000000
--- a/dev-python/twisted-news/twisted-news-15.2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted News is an NNTP server and programming library"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-mail-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-pair/Manifest b/dev-python/twisted-pair/Manifest
deleted file mode 100644
index 5c4270607a15..000000000000
--- a/dev-python/twisted-pair/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX 14.0.0-tests.patch 1123 BLAKE2B 199f563ae287a0f3e2f3b1adde2406901d0e88506076b07346599476719e310a4a7ab0adf85d6e139fd19f345e32f737c5345e60ecaf876cb2eea9b89609cc81 SHA512 be807a3360e0e8807ffdc0ff571f2e5729935e16f8eb94cf97f50200465a17f72de8a8d50b9470967b6c04ebb6b559544d7ce8af82604104b3cd962d9a8c4f81
-DIST TwistedPair-13.2.0.tar.bz2 9251 BLAKE2B 6aeb447bc9adf890829ba4341e6ed33dc0d08be2e431a2d0cbc5d28019701b42086189ddd8b69926ace2ea8a8c1099d78ceea8649e2fe481594ff116c265c627 SHA512 931b2564e66d5056ce10695e7d9884b55d42c1081feaf9edc011aef9dff21f40e628312a89970f83619611967f155f26f4bbd9d1a325d30670e245e00f47e2d0
-DIST TwistedPair-15.2.1.tar.bz2 21755 BLAKE2B 4e006c24e5daa77188dc72e9559f86b6acda10a3b843acc8f312285d299f22a86f29ee946d709c63160e39b38312e612ce88d306ab3a37ad91f4e94bc7835c6b SHA512 e7e9c8d88ca490c5e9f41ade6aede36dc23ea935f7c1658355bf685e21000e4e20ee1a3ccc3ebdba312fe026a8b7b25f2bcf51c3761668c2c3ce86b37ad3c725
-EBUILD twisted-pair-13.2.0.ebuild 394 BLAKE2B 521699c59c6c538b4d0b8f6db7421a0df56f1c937d5ec51316bbfff8c59df39dfd99d92180878f805909b53188ac792edfcd13f1c76143a634a7a88a43814b6e SHA512 b6f386a10af848bbdff709a3caf443805f925037f7a030edfda6741789daaa49b2be3ee9ed226f5da40b3afa4cc2b10b150c19c92c7d37749d8a9e9cf56933da
-EBUILD twisted-pair-15.2.1.ebuild 499 BLAKE2B b9d74c6f45122f9f841c47bc3bd69efa7756fbc4fb079c6c56dc13277b75f47b50ab7efc9c0895561923ac70587b3e4fc94f589a1eadf120fb4b4eda3232827e SHA512 246eea4dab203efd4e5c9177a733692b376b81c00fccd1f5c22558e1089300fcf3fce8f926bc2f465253f6e3f03a3a10bd520ea6993b6190c94cd058ee91b7fd
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-pair/files/14.0.0-tests.patch b/dev-python/twisted-pair/files/14.0.0-tests.patch
deleted file mode 100644
index 0ec7a032eb71..000000000000
--- a/dev-python/twisted-pair/files/14.0.0-tests.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Allows user to access /dev/net/tun
---- twisted/pair/test/test_tuntap.py.orig	2014-05-27 22:55:56.230232748 -0400
-+++ twisted/pair/test/test_tuntap.py		2014-05-27 23:30:02.769956742 -0400
-@@ -10,7 +10,7 @@
- import os
- import struct
- import socket
--from errno import EPERM, EBADF, EINVAL, EAGAIN, EWOULDBLOCK, ENOENT, ENODEV
-+from errno import EPERM, EBADF, EINVAL, EAGAIN, EWOULDBLOCK, ENOENT, ENODEV, EACCES
- from random import randrange
- from collections import deque
- from itertools import cycle
-@@ -582,8 +582,11 @@
-         except OSError as e:
-             # The device file may simply be missing.  The device file may also
-             # exist but be unsupported by the kernel.
--            if e.errno in (ENOENT, ENODEV) and filename == b"/dev/net/tun":
--                raise SkipTest("Platform lacks /dev/net/tun")
-+            if filename == b"/dev/net/tun":
-+                if e.errno in (ENOENT, ENODEV):
-+                    raise SkipTest("Platform lacks /dev/net/tun")
-+                elif e.errno == EACCES:
-+                    raise SkipTest("Access denied opening /dev/net/tun")
-             raise
- 
- 
diff --git a/dev-python/twisted-pair/metadata.xml b/dev-python/twisted-pair/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/twisted-pair/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild b/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
deleted file mode 100644
index d5057737aa8d..000000000000
--- a/dev-python/twisted-pair/twisted-pair-13.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted low-level networking"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/eunuchs[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild b/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
deleted file mode 100644
index 3e67a014357a..000000000000
--- a/dev-python/twisted-pair/twisted-pair-15.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted low-level networking"
-
-KEYWORDS="~amd64 ~arm ~sparc ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/eunuchs[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-# https://twistedmatrix.com/trac/ticket/7433
-PATCHES=( "${FILESDIR}"/14.0.0-tests.patch )
diff --git a/dev-python/twisted-runner/Manifest b/dev-python/twisted-runner/Manifest
deleted file mode 100644
index 69f4a837bbb4..000000000000
--- a/dev-python/twisted-runner/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST TwistedRunner-13.2.0.tar.bz2 12944 BLAKE2B 98060e134cb928897c4a49a66928be645c4dd48d6581792fb699900599d653882b96dfab91d50480928473b5f33eec21f891663f5eef520e43b45119b5c424e0 SHA512 1ede91957ecf349164fb63e284896f8909c88e54c032c6c326aabe2efa3058b5b9ba232e5ca60e71776dff4514a6c23483d9720e815f07c48c10232831741489
-DIST TwistedRunner-15.2.1.tar.bz2 13041 BLAKE2B 212c846c0aa6ecb1e8cae8f13dd016addba200575b13d58b028277d91b95e311d47ae30b260be05ae8404bdd6558119a785a1d3f16535537d0ccd04415ce92b8 SHA512 9cf94b62cf978f0a11dcba7ee18632d94dbf27bf629f5632f6bdbfa21096a4a8ff5298df9e7e42f03469cf3b89dccc537b983cfb198e35ba01e0ef530baa3867
-EBUILD twisted-runner-13.2.0.ebuild 421 BLAKE2B 8f7678be564c90cc40175f9c33804727a784288670df88b81fa38ec883c5005230f8095b2315b186caa7070ff64b9498e77372ada62d7437aa6a4821872190dc SHA512 644d35dca3e3cd55e577408f7231210b044bc2f0aa61a0343d70694d39227a2a09c70a775dd31e27fbd376491ba095fc9617579c323ba8393fd8e832b5a18f39
-EBUILD twisted-runner-15.2.1.ebuild 428 BLAKE2B 0d86dd5fca9596bcdda2796507c1ac85e4becc575cad006cad29bc1a7c50ca14c8cfdcd999b47eb59bde649b915e997d36305e6a741e202a6a8ec2e715adb457 SHA512 3c72076553f76e97f9f43f953ead87c0abf8422f2aa78d8c2117265049fb4d3245f476ec5a551af8cbea9a9bb6773f19750c9c5e0558174577b6453a9c28d164
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-runner/metadata.xml b/dev-python/twisted-runner/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/twisted-runner/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild b/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
deleted file mode 100644
index 95a51a89b390..000000000000
--- a/dev-python/twisted-runner/twisted-runner-13.2.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted Runner is a process management library and inetd replacement"
-
-KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild b/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
deleted file mode 100644
index 65c836eaca72..000000000000
--- a/dev-python/twisted-runner/twisted-runner-15.2.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted Runner is a process management library and inetd replacement"
-
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-web/Manifest b/dev-python/twisted-web/Manifest
deleted file mode 100644
index 7aee8884de99..000000000000
--- a/dev-python/twisted-web/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST TwistedWeb-13.2.0.tar.bz2 403931 BLAKE2B b003889c566b9063ffbef9eeb3f98af22eff4ba1b10cf2db1eb76ff3da08ac45d3892790943348c0d1cf4a28d8e66050aca9281409b47e48df42ec036a25e1af SHA512 69e721ec456214d000f88268340b7cf21186073af11e7f906bf95c9a1bfaf49fdc5832b4e39586ebdddd3f1378bf823ab147de58d7aa9e8491a2561a54389a1f
-DIST TwistedWeb-15.2.1.tar.bz2 231092 BLAKE2B 2bd561f973f0ce8ac67c1ee947f07b9b4fb82f7cff6e543ad324d8ef3e60d3be28b6290abd173362d49d824d4d4c23223361d30d94702176c385f5b9a7c048f3 SHA512 e2b155deed9b240f92f173e0fb188c1538ef2275cc6564b838dac8a5ac4c460e664791623cd3e3cde996b63f1619eff8d62636c2813e8b81da5054b8eea365e1
-EBUILD twisted-web-13.2.0.ebuild 1109 BLAKE2B 7462d2c87b8d79401da1ba825ae703f51392a47dc6db103c069e61095a6ab5272af8d9d721a669036520f590cbaf73e9ee199a03c0eb5ca81f38576dec21ac59 SHA512 888a5e842d21abf8676fc9992bd036b5e1b95548653262c9b6d167f861d3d540e187e0e63227fbe8cbcc215aeca10537bbe5ab807384d5a4d33712084557488f
-EBUILD twisted-web-15.2.1.ebuild 1114 BLAKE2B 3e00237256a307ad2ace477a21c42760238b5674d91ae689073f6a8fe38e6aaeff5ca30abfb77ac69ec76955ac46030dfb6e28fdf2153a83b0ab99b7960e082f SHA512 05c64b97c4e5bf7f87b4bc2057702dd789ec6a769c264bb80e16bfee7861636c577405d3749880ec8828c3ab44d76a726770f396f7653607a6963e521a1e7995
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-web/metadata.xml b/dev-python/twisted-web/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/twisted-web/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/twisted-web/twisted-web-13.2.0.ebuild b/dev-python/twisted-web/twisted-web-13.2.0.ebuild
deleted file mode 100644
index 4761ea14b8ce..000000000000
--- a/dev-python/twisted-web/twisted-web-13.2.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-MY_PN="TwistedWeb"
-DESCRIPTION="Twisted web server, programmable in Python"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="soap"
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
-		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
-# testsuite has a PYTHONPATH oddity, currently appears to require a system install to effectively import,
-# putting in question as to whether it is a testsuite
diff --git a/dev-python/twisted-web/twisted-web-15.2.1.ebuild b/dev-python/twisted-web/twisted-web-15.2.1.ebuild
deleted file mode 100644
index b4c867d94319..000000000000
--- a/dev-python/twisted-web/twisted-web-15.2.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-MY_PN="TwistedWeb"
-DESCRIPTION="Twisted web server, programmable in Python"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="soap"
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	soap? ( dev-python/soappy[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
-
-python_prepare_all() {
-	if [[ "${EUID}" -eq 0 ]]; then
-		# Disable tests failing with root permissions.
-		sed -e "s/test_forbiddenResource/_&/" -i twisted/web/test/test_static.py
-		sed -e "s/testDownloadPageError3/_&/" -i twisted/web/test/test_webclient.py
-	fi
-
-	distutils-r1_python_prepare_all
-}
-# testsuite has a PYTHONPATH oddity, currently appears to require a system install to effectively import,
-# putting in question as to whether it is a testsuite
diff --git a/dev-python/twisted-words/Manifest b/dev-python/twisted-words/Manifest
deleted file mode 100644
index 3001bbbe5648..000000000000
--- a/dev-python/twisted-words/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST TwistedWords-13.2.0.tar.bz2 176411 BLAKE2B a8972dc504fd03a5d3eda5a6c908989ca6561124617b12cca5b1379fb1cf5ee37aa52c798b08023d1e381e4738c784091188c2f07952bb2192ba25d027907b4c SHA512 84ff45f86a0c3d7074fdfcd01159833b461780b75c5135d7a1cc2b3c4c918ad2299c217e8f5ef8e9a71f87a005ec1037fcf870e56601fcee50347ac2e1c39105
-DIST TwistedWords-15.2.1.tar.bz2 168483 BLAKE2B 55d83e146b83212ad42d25479fe59b88f885e948127ee7f52afe69da9d5513ee709c7ad8bcc564e1e77cdcfd63f3f1592624e7dd7d957bc18a753a94a4ef76aa SHA512 aca278a69f5c4deceab0e6f1c6461186131e4b9e7558970175cd5a70232eb7096c3c10fd300a9d22612e97dceeba71765118af45eed7a610678f66d9036452e7
-EBUILD twisted-words-13.2.0.ebuild 503 BLAKE2B 02438f1fd75f6a5b5aa675e70f16b781498afa48571f7718883d1215dbd77264625ee1faff2d18bb318d745fe6b220abc4c46f54cadd90cc463d3a0bb71b877b SHA512 86d3b60072b9080948b92dee64a0b53d880265d0c707aab4654bea1a7718ddf930e73b3e3c4498018451fcfeccf17fb2ed0735d718245e4fc9e519e731b2bc09
-EBUILD twisted-words-15.2.1.ebuild 505 BLAKE2B 594e0685ed44c0956261489557532545dd284459bd426e945e2eb1defdcb682a7cc1876ded9b943c9bf15b801864bbdfbe17819008cb8d2d1f74df377e3d4cdd SHA512 0be3a1b8121cb6aeb821baddf9a156c849ad0f9ae2de6c30139e00915b181f1a69aab61222f6ca879c29dec3f9bf0a91643c4cfb49e64f382bde9132a0de9170
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/twisted-words/metadata.xml b/dev-python/twisted-words/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/twisted-words/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/twisted-words/twisted-words-13.2.0.ebuild b/dev-python/twisted-words/twisted-words-13.2.0.ebuild
deleted file mode 100644
index af46094d46c0..000000000000
--- a/dev-python/twisted-words/twisted-words-13.2.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted Words contains Instant Messaging implementations"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted-words/twisted-words-15.2.1.ebuild b/dev-python/twisted-words/twisted-words-15.2.1.ebuild
deleted file mode 100644
index df635df64b35..000000000000
--- a/dev-python/twisted-words/twisted-words-15.2.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="Twisted Words contains Instant Messaging implementations"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE=""
-
-DEPEND="
-	=dev-python/twisted-core-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]
-	=dev-python/twisted-web-${TWISTED_RELEASE}*[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!dev-python/twisted
-"
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 3bad1a8ce5ba..3d7b7581106c 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -9,16 +9,10 @@ AUX twisted-17.9.0-python-27-utf-8-fix.patch 1630 BLAKE2B c70f3223b66a9372e07df7
 AUX twisted-18.4.0-Disable-writing-of-plugin-cache.patch 853 BLAKE2B f2f4f3906266199856056d4eae062aafaa8d5b574858bd494d6a51512ad3f27ee0d813de8a760fbd21bdf479fde0bb1c3e724e13bddceb0d3af83bb8ecb31aa6 SHA512 e27a61855523a64c27e7adfe8ec917fae60149b1bfe0fc555694dc4321669665116046baa8f293d75b4bf68ec19743850062132aa05fed5feab4f582cc75219c
 AUX utf8_overrides.patch 2288 BLAKE2B 450f921f6a07cd56d9311c15c9f2bf342ec82c807325ebb5b5c2fd61572d489ac7f1c8978892530016a343b7284c580def705127c57ce947a2698835e447b8ce SHA512 b495268282e0233c570655b2b3d42ecc90116b22c36cdec4ebf581ce1019abedb7ee301d860ec161b4b5e691d1b747ad45257966b5f510de8dcce8271021e7e8
 DIST Twisted-16.6.0.tar.bz2 2979747 BLAKE2B 898e0a0fa3ae8547a801b09118423ec8ad80727dd6d034e3f8a151f084eff5a3fc560f2eb9e76c452a14ec90b36d93e14d3bbb388010c3c5c01fd1c4d5ca16bb SHA512 0b8de0ec7f64457f76c396fced64b366b8e63c6e000a5edc6c6388cd917fb2f95711918cd8edda39e0aa77e2cd32b5d775d23630a5ad10fc013c18f8316300cf
-DIST Twisted-17.1.0.tar.bz2 2997334 BLAKE2B 54bd9813fb265f3561be7bc42a3ca6fc36aa5f8553ff0f40fd4ba7939947015632ef91c011a088b511d9f3f262aa0a785467ad3e4fab00cc97cb85bdbd93a726 SHA512 e5eedc9a70b7e4d0ec18dddaa82aa9a784e96fd517db65c278d822d15e8bdc65a35307a5a0474eb68dcb73fcd5508086bec605580a9f2f767bcbe27d714b4966
-DIST Twisted-17.9.0.tar.bz2 3019243 BLAKE2B a79fade6c84a99303df803ad80f02c63562e7064d5b79db39c08bd0ac9a62d61f1388932b36348aa106aa409a51b2d49dc0eb5b1007ce10f196a34c2f963b8e5 SHA512 0fb854db1044bfdb208594a379a0f8df0193326a9974e193266e82113488d49220648d4a50b323fa144654e94976f5848e1d60efed13ab2668b02cc795720345
 DIST Twisted-18.4.0.tar.bz2 3037019 BLAKE2B 6fc32f7591493ccc4fe03233307b566899b82cd035ba3329b3faaf950339a6653de697ba3873b37b22f9d7f8a66109694b80496917bf61e79c56eeb7e351ac87 SHA512 3733a6df0196ea580187da3576f5fd08f287437528a4e19813056d019cca213c61b62d879d80a12eef38661d3505ba33aac9a4fc956b19afa6da7d37a6465c83
-DIST Twisted-18.7.0.tar.bz2 3063847 BLAKE2B a71e7f0f2888eab2849b90405350194091731730e8507172744212b9af73ba440a0c21d5c5a45ae987752c813c07c4dbb06e0e27a8c8e436d7ea6f7c3026137e SHA512 feefa578bc1787648df07e4a53bd6fe29b43c4357472e4fba37526f075be9263e8c671b6781ce6ad3569c1b1666cb702efbee903f597714a749971695018f826
 DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-16.6.0-r3.ebuild 5781 BLAKE2B 903214191b0fe8095060db2c972f6a64f50d3610da00f50f627811405342e878cafd726964433187e3d66fd000443b81db55348a62e8a30fb984634366959089 SHA512 e8cce4249cb0c9f4afd788bae0dfa7d88bd4faacf59f93f5267d317332d4d578107e7bb3aa686a64b896426b2117499c1110153d27bab54a22ae83c2e057b443
-EBUILD twisted-17.1.0-r2.ebuild 5806 BLAKE2B 4f226dc0edf4c316d641fbcf9d0686ea5e432c7c9dd1ed9798e121d5194c7ca3479a793286d08e3b6f6f4d16152ddb82bb6e3d1a9184841c34fef0cda964da50 SHA512 d486b29ff87b1c3fb839bc1d9b1e52b6ca73a5070fd7a7ad2562575d402b18f5e565888e35d772db7b276c7db9d15e169ea3d535af8fbb26033e5e257513090d
-EBUILD twisted-17.9.0.ebuild 6083 BLAKE2B 4ed1d5d980a8bc92ef97d74ad26454bd00bf9107c8743e73984e5d76906c20aae55236089ca74e73758e137e820965c8500c951b835a4503d88b816d66c25dae SHA512 784f4db11850b14bc44e3411bef33a9822a2e9a4a99f354c31842f71734723148a0707be4bb04cf3a7a908aaccd0a3de5e6d0f6a8d5cf3829a1f4c4b785a5414
-EBUILD twisted-18.4.0.ebuild 5947 BLAKE2B 73f6fe468ff8e9013d1377ac717619d92896c316fe3f97ee22cf277f64d2b61ee8b3273439bc51ab336250ddd0b33a0d7b82f0e85374b220a4f053fa0791070f SHA512 584091121d2158f864609a7f9756f29712aa888c87e485a3b9c5f20a29c7fbca9b9430197f0774dba6255f8f190d77f54e5045da0aad320e88264dac04c863dd
-EBUILD twisted-18.7.0.ebuild 6037 BLAKE2B 2ef5b50717467ce159b864d53d5c5158a31a46199e97b4612ca95c806c8699050ce4b8f934d74531ae1430b43dade1686a1833c2bb1254a6abbca8e40cf441d8 SHA512 f460f276071bc0dcc3cfe36f518f9ea3a20bcb92495685bee0b2daace09d0c7f2a5a78527a2ca0b17671f22462246eade0ec74331e88eaef1681c37de15d1f31
-EBUILD twisted-19.10.0.ebuild 5205 BLAKE2B 8760703cd71726d240167264ef89460605e81d184540ea5082fce773ba88c6ac77bc3ec173d2a25d887df2a3af7c9a1e77b08b33c9bd6311814633068eb81bde SHA512 ba5f10f6fabd22388791e46a3b0a6cedb42c8c7fd2496dcbd2045899b2c7e40b7f4165a7a53c488feffef423ff6b35a61c8ba2cbaacf22ad369a36aa4f9a542b
+EBUILD twisted-16.6.0-r3.ebuild 5782 BLAKE2B 195b14f325f3ea57fc7a22e06ca6f9f7cc2c4b63ae3cade5f6fdee31923c6b0a15160f60825102d58453c7834e99c5fed9e362795bc1a2c6ae29a81548d76b95 SHA512 4a62f9cf9344eb0594235a06e3c20f0f22349c93bbedbb94ed32b78c3bb340ed2d4bcd63c0fbb6d957341ebb6f99cc57ce0c5fe0514ef5beabdace80ae6dd7fb
+EBUILD twisted-18.4.0.ebuild 5948 BLAKE2B 5b0fc4f2220a614c50d559c64ba476f7d89e0ecdaf5b8ff78c02dddf80ec6bac7bd589614752c976c8b88452bc79421ce7253f1c12f4ffddf58a8b360c01de0a SHA512 ef25479cfc00a25c4327d231dd91e10923a53ebf4b5dae9eb6e072b3082d1c58bc0766dc6bbe8e847f76fa2f5b26075c2df126b2456e0f15ed2056289d97c47a
+EBUILD twisted-19.10.0.ebuild 5205 BLAKE2B 98c2e0138fc5b3f10214ff71b051641f170875ab8daaf668615a8c1855934953ff2bbdf0634e61612ddf9c6782e1cc0351a291051078e1327ea976f7b6f9411c SHA512 e65169fc2590dff170256a1881a06784695f269650ac7b34c8992108bfcd4f7c6dbc4bff53ad0cd6f3a30c4c1864d5a2850d40b55bcc8106ea02f59df741c972
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/twisted-16.6.0-r3.ebuild b/dev-python/twisted/twisted-16.6.0-r3.ebuild
index 0a61f63c5bec..0f38422e1931 100644
--- a/dev-python/twisted/twisted-16.6.0-r3.ebuild
+++ b/dev-python/twisted/twisted-16.6.0-r3.ebuild
@@ -177,7 +177,7 @@ python_postrm() {
 	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	# if we're removing the last version, remove the cache file
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		python_foreach_impl python_postrm
diff --git a/dev-python/twisted/twisted-17.1.0-r2.ebuild b/dev-python/twisted/twisted-17.1.0-r2.ebuild
deleted file mode 100644
index ab705a4c5a0c..000000000000
--- a/dev-python/twisted/twisted-17.1.0-r2.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6)
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils flag-o-matic distutils-r1 versionator
-
-TWISTED_PN="Twisted"
-TWISTED_P="${TWISTED_PN}-${PV}"
-TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}")
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-
-# Dropped keywords due to new deps not keyworded
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~s390 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="conch crypt http2 serial +soap test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
-	http2? (
-		>=dev-python/hyper-h2-2.5.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-DEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-	"${FILESDIR}/test_main.patch"
-	"${FILESDIR}/utf8_overrides.patch"
-	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
-)
-
-S=${WORKDIR}/${TWISTED_P}
-
-python_prepare_all() {
-	# disable tests that don't work in our sandbox
-	# and other test failures due to our conditions
-	if use test ; then
-		# Remove since this is an upstream distribution test for making releases
-		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see https://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	export EMERGE_TEST_OVERRIDE=1
-	export UTF8_OVERRIDES=1
-	# workaround for the eclass not installing the entry points
-	# in the test environment.  copy the old 16.3.2 start script
-	# to run the tests with
-	cp "${FILESDIR}"/trial "${TEST_DIR}" || die
-	chmod +x "${TEST_DIR}"/trial || die
-
-	pushd "${TEST_DIR}" > /dev/null || die
-
-	if ! "${TEST_DIR}"/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-	# due to an anomoly in the tests, python doesn't return the correct form
-	# of the escape sequence. So run those test separately with a clean python interpreter
-	export UTF8_OVERRIDES=0
-	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
-		die "DaemonizeTests failed with ${EPYTHON}"
-	fi
-	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
-		die "SafeStrTests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-		einfo "There are a few known python-2.7 errors due to some unicode issues"
-		einfo "which are different in Gentoo installed python-2.7"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm(){
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-17.9.0.ebuild b/dev-python/twisted/twisted-17.9.0.ebuild
deleted file mode 100644
index 6ac90e335a4a..000000000000
--- a/dev-python/twisted/twisted-17.9.0.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 python3_6)
-PYTHON_REQ_USE="threads(+)"
-
-inherit eutils flag-o-matic distutils-r1 versionator
-
-TWISTED_PN="Twisted"
-TWISTED_P="${TWISTED_PN}-${PV}"
-TWISTED_RELEASE=$(get_version_component_range 1-2 "${PV}")
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-
-# Dropped keywords due to new deps not keyworded
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~x86"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="conch crypt http2 serial +soap test"
-RESTRICT="!test? ( test )"
-
-# openssh-7.6_p1 test failures: bug https://twistedmatrix.com/trac/ticket/9311
-RDEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.0.2[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
-	http2? (
-		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-DEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		<net-misc/openssh-7.6
-	)
-"
-
-PATCHES=(
-	# ${PN}-17.9.0-Fix-test-on-Python-363.patch"  <== version specific from upstream
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-16.5.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
-	"${FILESDIR}/test_main.patch"
-	"${FILESDIR}/utf8_overrides.patch"
-	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
-	"${FILESDIR}/${PN}-17.9.0-python-27-utf-8-fix.patch"
-	"${FILESDIR}/${PN}-17.9.0-Fix-test-on-Python-363.patch"
-)
-
-S=${WORKDIR}/${TWISTED_P}
-
-python_prepare_all() {
-	# disable tests that don't work in our sandbox
-	# and other test failures due to our conditions
-	if use test ; then
-		# Remove since this is an upstream distribution test for making releases
-		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see https://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	export EMERGE_TEST_OVERRIDE=1
-	export UTF8_OVERRIDES=1
-	unset TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE
-	# workaround for the eclass not installing the entry points
-	# in the test environment.  copy the old 16.3.2 start script
-	# to run the tests with
-	cp "${FILESDIR}"/trial "${TEST_DIR}" || die
-	chmod +x "${TEST_DIR}"/trial || die
-
-	pushd "${TEST_DIR}" > /dev/null || die
-
-	if ! "${TEST_DIR}"/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-	# due to an anomoly in the tests, python doesn't return the correct form
-	# of the escape sequence. So run those test separately with a clean python interpreter
-	export UTF8_OVERRIDES=0
-	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
-		die "DaemonizeTests failed with ${EPYTHON}"
-	fi
-	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
-		die "SafeStrTests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D%/}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT%/}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm(){
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-18.4.0.ebuild b/dev-python/twisted/twisted-18.4.0.ebuild
index 91d876f3ed1c..16b017e9f050 100644
--- a/dev-python/twisted/twisted-18.4.0.ebuild
+++ b/dev-python/twisted/twisted-18.4.0.ebuild
@@ -182,7 +182,7 @@ python_postrm() {
 	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	# if we're removing the last version, remove the cache file
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		python_foreach_impl python_postrm
diff --git a/dev-python/twisted/twisted-18.7.0.ebuild b/dev-python/twisted/twisted-18.7.0.ebuild
deleted file mode 100644
index b8e44fd29607..000000000000
--- a/dev-python/twisted/twisted-18.7.0.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-TWISTED_PN="Twisted"
-TWISTED_P="${TWISTED_PN}-${PV}"
-TWISTED_RELEASE=$(ver_cut 1-2)
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-
-# Dropped keywords due to new deps not keyworded
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~amd64 ~arm ~mips ~s390 ~sh ~amd64-linux ~x86-linux"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="conch crypt http2 serial +soap test"
-RESTRICT="!test? ( test )"
-
-# openssh-7.6_p1 test failures: bug https://twistedmatrix.com/trac/ticket/9311
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	soap? ( $(python_gen_cond_dep 'dev-python/soappy[${PYTHON_USEDEP}]' python2_7) )
-	http2? (
-		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-DEPEND="
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		<net-misc/openssh-7.6
-	)
-"
-
-PATCHES=(
-	# ${PN}-17.9.0-Fix-test-on-Python-363.patch"  <== version specific from upstream
-	# Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
-	"${FILESDIR}/${PN}-18.4.0-Disable-writing-of-plugin-cache.patch"
-	"${FILESDIR}/test_main.patch"
-	"${FILESDIR}/utf8_overrides.patch"
-	"${FILESDIR}/${PN}-16.6.0-test-fixes.patch"
-	"${FILESDIR}/${PN}-17.9.0-python-27-utf-8-fix.patch"
-)
-
-S=${WORKDIR}/${TWISTED_P}
-
-python_prepare_all() {
-	# disable tests that don't work in our sandbox
-	# and other test failures due to our conditions
-	if use test ; then
-		# Remove since this is an upstream distribution test for making releases
-		rm src/twisted/python/test/test_release.py || die "rm src/twisted/python/test/test_release.py FAILED"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		# Needed to make the sendmsg extension work
-		# (see https://twistedmatrix.com/trac/ticket/5701 )
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	distutils-r1_python_compile
-}
-
-python_test() {
-	distutils_install_for_testing
-
-	export EMERGE_TEST_OVERRIDE=1
-	export UTF8_OVERRIDES=1
-	unset TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE
-	# workaround for the eclass not installing the entry points
-	# in the test environment.  copy the old 16.3.2 start script
-	# to run the tests with
-	cp "${FILESDIR}"/trial "${TEST_DIR}" || die
-	chmod +x "${TEST_DIR}"/trial || die
-
-	pushd "${TEST_DIR}" > /dev/null || die
-
-	if ! "${TEST_DIR}"/trial twisted; then
-		die "Tests failed with ${EPYTHON}"
-	fi
-	# due to an anomoly in the tests, python doesn't return the correct form
-	# of the escape sequence. So run those test separately with a clean python interpreter
-	export UTF8_OVERRIDES=0
-	if ! "${TEST_DIR}"/trial twisted.test.test_twistd.DaemonizeTests; then
-		die "DaemonizeTests failed with ${EPYTHON}"
-	fi
-	if ! "${TEST_DIR}"/trial twisted.test.test_reflect.SafeStrTests; then
-		die "SafeStrTests failed with ${EPYTHON}"
-	fi
-
-	popd > /dev/null || die
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm(){
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
index 6de8b0c43fb5..2a31d16311c6 100644
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ b/dev-python/twisted/twisted-19.10.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
 SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
 
-KEYWORDS="amd64 ~arm arm64 ~mips ~s390 ~sh ~sparc ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~mips ~s390 ~sh sparc ~amd64-linux ~x86-linux"
 
 LICENSE="MIT"
 SLOT="0"
@@ -165,7 +165,7 @@ python_postrm() {
 	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	# if we're removing the last version, remove the cache file
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		python_foreach_impl python_postrm
diff --git a/dev-python/vertex/Manifest b/dev-python/vertex/Manifest
deleted file mode 100644
index efbf2dc4251a..000000000000
--- a/dev-python/vertex/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST Vertex-0.3.0.tar.gz 84997 BLAKE2B 8f6a2955c4674888f7608590390f4cfbf5063e08281fc2a49a4cf9543a7b769df6e355bd87044f6eb23009ab50e7efbbbf5d0a471627780e9869008c764f0e8b SHA512 206d142cc72b2d77ed8c8fe222770eabc1a8c179238f46554abc5d833669f27bd286565e20ccaf5594d456b23b54455b23ab0eca5b8b4f72a7961924e7167676
-DIST Vertex-0.3.1.tar.gz 89909 BLAKE2B d26b73c5079f0401185e534aa9c35f7fd490eae9b27cd36915e3f2508b1ff6feda3a900bc3230d7f24f563546d6a966441b8618d066f28f647878597df4b9df7 SHA512 7e9b96a7ba493254ff58e8f75da6517c09c4502c21702a96c29525a78569ff7d988cd7278dd87983485b6da30a607820a7edb28375e37d5e059d6f0638a1b1c9
-EBUILD vertex-0.3.0-r1.ebuild 666 BLAKE2B edb58633a503f0b69d1c1e3367a660584c9316f46e2a82f42d87b163b285cc9f57e4d11e6ff1cfc41bc864c95fc4dc8b4d81ffd449982149b754a84b1b51ff88 SHA512 ee5e703ccc514d8d9dfd42db074ca471f3974c867058f4e6a6403dee85ad6c0fb38c5e6da4888e2313d8e622d3de37c40cf2b082c9e56a50f13fdeb79decb030
-EBUILD vertex-0.3.1-r1.ebuild 856 BLAKE2B ab3d6c714e00be030c8fa30c161fd1e7efdb770c1c8537199e69be9bd28e45e42f3840c4dde030557e9181168b51cd34a9e0506a20d8065f77263817dc376341 SHA512 0503e9ee1c7eef9215d99a9128b2d53509f5026fc2af04da29d35e72d1bed17ac3ad3e4b93bf03dd71b8f101afe86df9c9bb88ea41780478148adc0ae44e8986
-MISC metadata.xml 896 BLAKE2B f97fc09b3dcb3c78d457127762d33c2822c91ef1e8ac5e7bc254452ac443e8cd8bc01d3e90dc90de4060c426f2f8238ea9423dec9532d2d52200ec0953938252 SHA512 71c0e6e5ab8584a10daf920a7cf7d2b1a05ca6c6ec8c8b82bf589897fe85ebd652ad41e4b2b44f0ce345111b83c44f263ffc7eec93225cd96b0479b7548255e3
diff --git a/dev-python/vertex/metadata.xml b/dev-python/vertex/metadata.xml
deleted file mode 100644
index 903c836f7a27..000000000000
--- a/dev-python/vertex/metadata.xml
+++ /dev/null
@@ -1,19 +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 lang="en">Vertex is an implementation of the Q2Q protocol (sort of like P2P,
-		but one better). There are a few moving parts in Vertex: PTCP is a
-		protocol which is nearly identical to TCP, but which runs over
-		UDP. This lets Q2Q penetrate most NAT configurations. JUICE
-		([JU]ice [I]s [C]oncurrent [E]vents) is a very simple but immensely
-		flexible protocol which forms the basis of the high-level aspects of
-		Q2Q. vertex is a command line tool which exposes a few features
-		useful in many situations (such as registration and authentication).</longdescription>
-	<upstream>
-		<remote-id type="pypi">Vertex</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/vertex/vertex-0.3.0-r1.ebuild b/dev-python/vertex/vertex-0.3.0-r1.ebuild
deleted file mode 100644
index b550fbcaed83..000000000000
--- a/dev-python/vertex/vertex-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="An implementation of the Q2Q protocol"
-HOMEPAGE="https://github.com/twisted/vertex https://pypi.org/project/Vertex/"
-SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/openssl:0
-	>=dev-python/epsilon-0.6.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13-r1[${PYTHON_USEDEP}]
-	dev-python/twisted-core[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc NAME.txt
-}
diff --git a/dev-python/vertex/vertex-0.3.1-r1.ebuild b/dev-python/vertex/vertex-0.3.1-r1.ebuild
deleted file mode 100644
index 63a926e81a05..000000000000
--- a/dev-python/vertex/vertex-0.3.1-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit twisted-r1
-
-DESCRIPTION="An implementation of the Q2Q protocol"
-HOMEPAGE="https://github.com/twisted/vertex https://pypi.org/project/Vertex/"
-SRC_URI="mirror://pypi/${TWISTED_PN:0:1}/${TWISTED_PN}/${TWISTED_P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-python/epsilon-0.6.0-r1[${PYTHON_USEDEP}]
-	>=dev-python/pyopenssl-0.13-r1[${PYTHON_USEDEP}]
-	|| (
-		dev-python/twisted[${PYTHON_USEDEP}]
-		dev-python/twisted-core[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	test? ( dev-python/pretend[${PYTHON_USEDEP}] )"
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dodoc NAME.txt
-}
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 908c7c9ac830..034ac5a1983e 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -5,5 +5,5 @@ AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014e
 DIST virtualenv-16.0.0.tar.gz 1968312 BLAKE2B efc25f7c12335bb8619c3de125af3693d73afc5e7ff4edf1afa95227360ab4d0eb2ffb574b9bb36de26a2bda65b1f06009308fef48b12a81050bbc1f4ab852e9 SHA512 aed6eff9b85107072c321b37c1725987d474caf615734ab40d8d1fa60f2635be1a1919a47fbd211127e38cf1c4002548c778df29fc56d45a4570b31906c0ee54
 DIST virtualenv-16.7.9.tar.gz 5116740 BLAKE2B 10b77c4d74d3b1be60d567caf60b48274893777313d7151350df1d8a7d86d7cbd299c6c04734cbad134512e2ea05f5bc694648b6e9307019ffd9b91f7d0cdaf5 SHA512 d7379941e299c44beba30eaab68d5f1a6650f767b24f95d5e8abd05c1529dca4c1423113a41ff42690bb2b2bd4fe05c3e47a8fed4f9df0972188f6c77034436b
 EBUILD virtualenv-16.0.0.ebuild 1232 BLAKE2B 9821b7f4a1b039623d354ae0bfe3321302f12fca35adb039410be92af540aecd30867d5331e87c2e37f0a0b6d3c1e2c679a46535522413af08a8ac28fd49dd12 SHA512 21fc397b502911b217ae347f84a40c54d6c35791229fc69c0b7ef3c9d85694080fcc9ef19aaabb17138248ebc7deb129034ca3f28175a195fb11e4ff760f1808
-EBUILD virtualenv-16.7.9.ebuild 1755 BLAKE2B ea1ff6e852a81c2faec6d4c7b183b5567cbea9bd63f0c6ddd6d837113dea6f775014a0c67aa02d333c470cfb0f9ab73939d61b8a47e5e18c969d38392b5b521b SHA512 c1bda0869dca2302ff1e1cac6e18af290af5f4a651381aaa9c244577dac417c6db739bf79a8cfe5f06fc7a6da7b47dd3930f58e06c9ceee1757b3ffd75173fe2
+EBUILD virtualenv-16.7.9.ebuild 1761 BLAKE2B 2fb4aa6ba2d1c03d78e31c438e00ab28b5ac7e852db9a8b5fa425d8ed7abe1e69dd36cf4e363530142f9931431cf5ce5be8e9b20c3c8be1aba0f96ecb403565c SHA512 e6aa8e5bc78a566509120386c15a202483c0667151c45178b750336c826e8ac471dbef8b949acd4c061f69270827986b14c65c008d8f9cb1d12bdfadce7fa598
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-16.7.9.ebuild b/dev-python/virtualenv/virtualenv-16.7.9.ebuild
index 3102fedaf9c7..56cd7faf9da0 100644
--- a/dev-python/virtualenv/virtualenv-16.7.9.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.9.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="amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/weakrefmethod/Manifest b/dev-python/weakrefmethod/Manifest
deleted file mode 100644
index 234232c6cc29..000000000000
--- a/dev-python/weakrefmethod/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST weakrefmethod-1.0.3.tar.gz 7472 BLAKE2B 44e8250275156ee88b95c8b308b1b18fd7899d028c8ef893f2defd2c71f44a94c416a1531bf0d4a71012f44cec69814bdc8e244c0349abb7dd1e5a3e76c89908 SHA512 c68dc806904eb954319984003506eb9b552005ce04722c6a3eb123ecde8f4413f9f9d114f0923c6f6ae2e25b4dbaf8c225c070a1720a6563cf1517f2411a60d5
-EBUILD weakrefmethod-1.0.3.ebuild 462 BLAKE2B 4bbe90284a39546a6eda28024186f664be406e2bee6a39099a8c3785db0e4cabffa2b8dc1121b4cd372fc2b4b1f54ea5f42f8070b304dd258ec5eb41285f0760 SHA512 e57ff1f8639eacef353c98d5729b2dc6ac1c370ee5d9d2cef8e761f600506e6c985e7451f3f3d762fbb1e4c95db1151f441b2c6bcdfcec9e0ccdd96d75a39eac
-MISC metadata.xml 603 BLAKE2B dbb3d2f2f42f78b2a59b7ebadbb481575e4e21de81dde4b443136f38d5babccf5a05eb33c61b8e1777cc1483fffef547870dd42c9a903f6333de08c920769795 SHA512 97e9f0da46bbec178b6ba2fd9dfd99189f1a00bbad2b26cef5307c3dc0ec5dbb651b325d6ec7ae1cd429a8b23d1b654e1bb2fbc5960aa8d9752b593eac990fd0
diff --git a/dev-python/weakrefmethod/metadata.xml b/dev-python/weakrefmethod/metadata.xml
deleted file mode 100644
index a40778af57c7..000000000000
--- a/dev-python/weakrefmethod/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>prometheanfire@gentoo.org</email>
-		<name>Matthew Thode</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>openstack@gentoo.org</email>
-		<name>Openstack</name>
-	</maintainer>
-	<longdescription lang="en">
-	Backport of WeakMethod from Python 3.4 to Python 2.6+
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">weakrefmethod</remote-id>
-		<remote-id type="github">twang817/weakrefmethod</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild b/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild
deleted file mode 100644
index befc420d0a79..000000000000
--- a/dev-python/weakrefmethod/weakrefmethod-1.0.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backport of WeakMethod from Python 3.4 to Python 2.6+"
-HOMEPAGE="https://github.com/rholder/retrying"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND=""
diff --git a/dev-python/webencodings/Manifest b/dev-python/webencodings/Manifest
index f2d934b6a369..05b64cee98de 100644
--- a/dev-python/webencodings/Manifest
+++ b/dev-python/webencodings/Manifest
@@ -1,4 +1,4 @@
 DIST webencodings-0.5.1.tar.gz 9721 BLAKE2B f62ee91cf0230f55bfbe9973a621bbaf3aa250f511b2e1e2c0c6db00bf52760bb058957040600cb33d6f9208987302a70783b04325be4ff344c428a43664290a SHA512 b727b01bac6ec79bca517960d27b4c0668b295f25559471b9641c2c33dab55db6dac9c990952177964c6418382c22831b14d57df5e632d51d7abf97b61f24326
-EBUILD webencodings-0.5.1-r1.ebuild 767 BLAKE2B 67c663cd64ee433add73e65e576fa93d1b26be4dfdf8fbf5fa224c5ddbbefa4c33da4b2c2a4c0ac27d4f91b909ea9d57f8a5ac00d974bc58da695eaad72b3e67 SHA512 2d2401d2b713cedb31c1fd040951436bbfd38fe75b708673b52a43b91b9e9f87196075ecd3d6b0615b3df5fef4d113138e2dd16e1d50ad08f166a3a0bcfec599
-EBUILD webencodings-0.5.1.ebuild 863 BLAKE2B f7a1bafdcd453bb40d012bcd1bf0a82a85837bf859c3beb16901400ce25a8ddd7a62b7568de8f041bfc962d3c0ad5f37a3b0b1898ba83a7a3ffe61e947adf590 SHA512 649c98ed6a4dc8c33d3327f641947c7e22de266e7a5c28fc8a1504bf39c766532aaecff4c2f0cb7a09ddf5ee25ffb77e688d4084201028bbe1248720ae31c075
+EBUILD webencodings-0.5.1-r1.ebuild 768 BLAKE2B d3ffdd459d6a0641bf0bb25d8828a29bfea20517f5d8088bae262bdc8310f4aa440f9200bd053562dcb8a45502a63b086012e1ce679503df4d414977836434e1 SHA512 703351d4f4472379d2d59bbdd4ce45031d7aeb167d3498aeeaf9441ea497ec106b83a5f447011372b8956c35fe38e3342197f3d3eb1c9657b51b0861800ede3b
+EBUILD webencodings-0.5.1.ebuild 864 BLAKE2B bbc3335c91123da8836078995de04c9e6b9f3916232348251915d84f8caa5be9982a55eb126aeac37d5312a5bfc25db60de136b0d1a45e9d93bfe29ba6fa88b6 SHA512 31d9734e228f62759ebba1299bd8a4a5f9de31b02ff3e41a66880efb47212f6a626480ebc877784ddd664e5acf69f30765adbc860857f43cc4b5c6d6973f16b3
 MISC metadata.xml 575 BLAKE2B e04ef356f2e32b91dcfcf94b1f02c86782491f811d71e45b19731f9e0262d42d2419a152b99c52f575db57f682d7a6820a2a2d1e4ee79ec1beb810c238907578 SHA512 c734aada8a2ab7aa8cc6f25fdab99d9ede6be164d23acb8dbda9f7988aadf9d12b6e3043f5adb050cef277523b4a0c84d770ad1f2f75ff7d21d774c403d960ce
diff --git a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
index b7b75476ffcb..a73dcd4537c6 100644
--- a/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1-r1.ebuild
@@ -21,7 +21,7 @@ BDEPEND="${RDEPEND}
 
 distutils_enable_tests pytest
 
-python_prepare_all(){
+python_prepare_all() {
 	cat >> setup.cfg <<- EOF
 	[tool:pytest]
 	python_files=test*.py
diff --git a/dev-python/webencodings/webencodings-0.5.1.ebuild b/dev-python/webencodings/webencodings-0.5.1.ebuild
index afed61e0f237..aa11ec87a6d7 100644
--- a/dev-python/webencodings/webencodings-0.5.1.ebuild
+++ b/dev-python/webencodings/webencodings-0.5.1.ebuild
@@ -25,7 +25,7 @@ DEPEND="${RDEPEND}
 
 RESTRICT="!test? ( test )"
 
-python_prepare_all(){
+python_prepare_all() {
 	cat >> setup.cfg <<- EOF
 	[pytest]
 	python_files=test*.py
diff --git a/dev-python/webut/Manifest b/dev-python/webut/Manifest
deleted file mode 100644
index de40255b0c04..000000000000
--- a/dev-python/webut/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST webut_0.1-0.2.tar.gz 11142 BLAKE2B 8f3c9b68f1f3d78173e6ffff2f987a582be5e2014928cb862123a5768198395adbceb9b257c3aaa9c9254e9b4b57c93dff58ec22cd04d1fd9f3e60ca5bee5d7d SHA512 14801e3546e17f07328faee1df6708050702de75454e4eb2ad1fca2d72faf9a3228082f3d82a01a2810ba0fe15dacaee8fb556adff811596a1349eea61faeaed
-EBUILD webut-0.1.0.2-r1.ebuild 832 BLAKE2B 846005a2185f946ff870e9082eca98b4f0841a9c53f6e8eb7a73b8e143a6c768589f3054085ccd6e7e3033a6ac82cd92053a07e69c5d36c8f4b6efc9970b5092 SHA512 0523bfb7c8c6b393e94b33b5dc438610c953e0168066bf1f66c87c95b05eaf3e033ed983a98152a928edaa6cb602bdec8922bb3c78b72065c3e2b806cd1cacb4
-MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/webut/metadata.xml b/dev-python/webut/metadata.xml
deleted file mode 100644
index 7f4f33c6dbc9..000000000000
--- a/dev-python/webut/metadata.xml
+++ /dev/null
@@ -1,8 +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>
-</pkgmetadata>
diff --git a/dev-python/webut/webut-0.1.0.2-r1.ebuild b/dev-python/webut/webut-0.1.0.2-r1.ebuild
deleted file mode 100644
index d23a2a1f83c4..000000000000
--- a/dev-python/webut/webut-0.1.0.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 versionator
-
-MY_P=${PN}_$(replace_version_separator 2 '-')
-
-DESCRIPTION="Miscellaneous utilities for nevow and twisted.web programming"
-HOMEPAGE="http://www.inoi.fi/open/trac/webut"
-SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ia64 ppc sparc x86"
-IUSE="examples"
-
-RDEPEND=">=dev-python/nevow-0.9.18[${PYTHON_USEDEP}]
-	>=dev-python/twisted-core-2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.0.1[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 1-2)"
-
-python_install_all() {
-	use examples && local EXAMPLES=( examples/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/wehjit/Manifest b/dev-python/wehjit/Manifest
deleted file mode 100644
index ca9f801ac880..000000000000
--- a/dev-python/wehjit/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX wehjit-0.2.2-SkipTest.patch 648 BLAKE2B 8dd41cdd67e3cf90b93e02d98e7a0bc30c591600cd058951233d8d315ce78397d3a93347ea74d7ed7c2e224de0c9d8889139a0f9fc5a5dd2c91348c4295534dc SHA512 56c7cd048f9faa71f0fbcf77e894c064f9c4428e165a0fd470d417c9bdde631e4594ddb9dcaa060f3c438d98b2007e5fe815fd949d62aeb58b6161b608abcf78
-DIST wehjit-0.2.2.tar.gz 100515 BLAKE2B 2eddf7ce81583080b051ecfd07d108a2e72dbcaba3616359d463e5c4f92d11463a03197ba372476cc5ab1523cf58614db3cb8d8a72586359a7d95620bd578d7c SHA512 f8fb2edeeb9e90315d3c8f1e9e7d73d556fcad780c4dea637599291b2094e292a42b6f3671407f3d9d88733894501796484fa05ac52f3c1f3e1cb29d376a87fb
-EBUILD wehjit-0.2.2-r1.ebuild 766 BLAKE2B 22bffdeb62afa7fc68cecf649ad75cdedfa2d0abcc8dd232e0b013efbb8f19db3bc315b71d57670575b93c99c5003a9855c135808686b76bf06697dcd3109373 SHA512 a02fec6455b40b4c966a6dc25f6eed7e71495f7ec5ce1c135af80de8a6db73d5dc233cee604d73490b1eb7d7cfc43d8d1381a7a82804e80e02e56cc4893ee3aa
-MISC metadata.xml 578 BLAKE2B 48514e174995072e4e89560d31aceb0440a4cfd22230ded9298fe3b1e70ac9c699367dba2282e6e3e347375040d5891631d172255a5fd98fb8d5db8dfc5ce5e8 SHA512 cb9f24891df1a9c13cc0c165514b63d4877947a0793bd81c98fe7735b4afd7e9620e1dc742c6cc01a7f82ba9dc19f3770bd289ba15343a0324eb23a5cbe9a4e7
diff --git a/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch b/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch
deleted file mode 100644
index 057d70747e74..000000000000
--- a/dev-python/wehjit/files/wehjit-0.2.2-SkipTest.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ur wehjit-0.2.2.orig/wehjit/collection.py wehjit-0.2.2/wehjit/collection.py
---- wehjit/collection.py	2010-02-11 16:26:14.000000000 +0800
-+++ wehjit/collection.py	2012-11-08 14:24:40.326482713 +0800
-@@ -22,6 +22,11 @@
- Collect widget plugins together in a `Collection`.
- """
- 
-+import sys
-+if sys.version_info[:2] == (2, 7):
-+    import unittest
-+else:
-+    import unittest2 as unittest
- import inspect
- import os
- from os import path
-@@ -130,6 +135,7 @@
-         """
-         return name in self.__plugins
- 
-+    @unittest.skip("Plugin not in gentoo")
-     def __getitem__(self, name):
-         """
-         Return the plugin named ``name``.
diff --git a/dev-python/wehjit/metadata.xml b/dev-python/wehjit/metadata.xml
deleted file mode 100644
index e84e225efc41..000000000000
--- a/dev-python/wehjit/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>maksbotan@gentoo.org</email>
-	<name>Maxim Koltsov</name>
-</maintainer>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-<longdescription>
-	wehjit is a Python library for for building XHTML widgets for web
-	applications and web pages. It encapsulates the XHTML
-	(a Genshi XML template), CSS, and JavaScript for each widget into a plugin
-</longdescription> 
-</pkgmetadata>
diff --git a/dev-python/wehjit/wehjit-0.2.2-r1.ebuild b/dev-python/wehjit/wehjit-0.2.2-r1.ebuild
deleted file mode 100644
index 246e57dcb6ec..000000000000
--- a/dev-python/wehjit/wehjit-0.2.2-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python web-widget library"
-HOMEPAGE="http://jderose.fedorapeople.org/wehjit"
-SRC_URI="http://jderose.fedorapeople.org/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/genshi
-		dev-python/assets[${PYTHON_USEDEP}]
-		dev-python/paste[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		"
-DEPEND="${RDEPEND}"
-
-DOCS=( README NEWS )
-
-PATCHES=( "${FILESDIR}"/${P}-SkipTest.patch )
-
-python_test() {
-	if [[ "${EPYTHON:6:3}" == '2.6' ]]; then
-		nosetests -I test_app* -e=*getitem
-	else
-		nosetests
-	fi
-}
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 766d5de70494..207069b2fed1 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,7 @@
 DIST xmlschema-1.0.16.tar.gz 278082 BLAKE2B 284f71536f86475fbfccefe1130fbea9319282e34ec11a1ca13c6ddd0f8aad2747d66c8cc6443885982c6f98fa074778f2757d012d1380ae46136dc3e5df4a69 SHA512 5dd79e608036995d70b4da627f89c86cd8e7a66f80c2cb87d701395229daa920759769bf7efad34c33dd28ca14971eb155a654f8fec12fb6ace8cb5ecf979650
 DIST xmlschema-1.1.0.tar.gz 285006 BLAKE2B 9369726c6a6680b9a6d9f317ae96df2db68c1cfe8a1024c141bee2211f5ec176898bc147a9597523c872bee6e7519bc9e57972710fe8f983fdeac7ac7984f901 SHA512 6f5e163969ab06a38cf5b36b6b3f6ba31c98753fc5b364e94889b02b5b2c1b2a3bcae8b5c2b809a9c35c1a2cd855f1b98c68723c51ec2b12998db1a4d1c114c9
+DIST xmlschema-1.1.1.tar.gz 293535 BLAKE2B 563552038f4c07b183ac60ba5d477ab68f9dd81f8f2b93733054adb83dc0b7d892f8ea1bd487c1e8404b6d4ee78e258791ddfb6d99cdb8a63501e13fd204969a SHA512 c2acb1b624173f61fa68b022d205183097c652f7d5389277d23a35fb16a2de5db37d4fa36cdaa9af860f4f6117b5d2f8740f541914f65f951ee24659f3fd4611
 EBUILD xmlschema-1.0.16.ebuild 778 BLAKE2B ebaa8b2d12b8b56caf5e09b2524b71929567178fc8aaf8bb28c952c2f8ef681e2bbfd9a72101bfa3313fa64d889e4c102b65950aff185242aa4c93a989b05c88 SHA512 f457c83f85f917579e058dfb4a3b5597dbb64ed5082c5c3bb8b83a1c8e57ab9e03ccbea2b324f547d03d8a79c127bd3cdac47c703ce173002e711ac1b8ddeb2c
-EBUILD xmlschema-1.1.0.ebuild 780 BLAKE2B d3b94f8bd5e388d8f0a913d97b658723567e9efb5ce314b81c8b8fa411395abe69a399f60e9af02207d802feed9fb7b637ca734bdffc0e98b0157b55473b027c SHA512 90061b3aeb1ede74baadc6f7ad3b3e194c6d1cfff61c966b3c33612fc081133cbae542c060d0b8b13b991c0c0d95ff7d85849d5968dd613e7ee63204409dde69
+EBUILD xmlschema-1.1.0.ebuild 793 BLAKE2B d562f5384f1305893a05c090f5655f7fa4b256b1c898a2ad2eced43aa5223a1894ff50edf5c9fe5e71ab7310f94f5d0e37b0e715aa057e5be47f832ed0c9025a SHA512 509fceb25308b427e53ed338ee44de05226f3787e5e9622a3b529eaded8866cb0bec4ffb19d47226dd9fb84b7007832ee6097f48ad6312c053a634fee880bf68
+EBUILD xmlschema-1.1.1.ebuild 786 BLAKE2B 5194c7ebf58f131e2fdc72c684de4ccee164198d82199b7f3cb144f237bdf04f13827a13220838a982017c260a242ba2dc7a00f57041c910a29026298127f703 SHA512 9f428f3b96bcdf6b8b21212d6e227ad8e6581b06727de56cf9b92532c4d3105d2c441994381975dac932a39e1affbbd77d0b2d6b90b4ddb09ccecb772b3081fe
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/xmlschema/xmlschema-1.1.0.ebuild b/dev-python/xmlschema/xmlschema-1.1.0.ebuild
index 7bdc2f6a6a93..2d082689db3f 100644
--- a/dev-python/xmlschema/xmlschema-1.1.0.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/xmlschema-1.1.1.ebuild b/dev-python/xmlschema/xmlschema-1.1.1.ebuild
new file mode 100644
index 000000000000..8ea796fb40b0
--- /dev/null
+++ b/dev-python/xmlschema/xmlschema-1.1.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="An XML Schema validator and decoder"
+HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	=dev-python/elementpath-1.4*[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
+	)"
+
+python_test() {
+	"${EPYTHON}" tests/test_all.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/yaswfp/Manifest b/dev-python/yaswfp/Manifest
index 23a7eb4de959..bbb083be996c 100644
--- a/dev-python/yaswfp/Manifest
+++ b/dev-python/yaswfp/Manifest
@@ -1,3 +1,4 @@
 DIST yaswfp-0.9.3.tar.gz 29845 BLAKE2B 2c5961b79d8378b707a920a4c6a1d75cf8cb09cc6a689035c7118758de3fc1f6fddf6a23e91f4cddea5f7370e4b558b40dfd4a05b16d7fb5f881c5ca74beb4a5 SHA512 06fb5d38c92f418fff77d812507621236b3fc74cf75786031bbd81ac1e61767a29647c7f1d0ffbb25d2f6f1a8749e5a732896ad66956e16c886e24e85915f72b
+EBUILD yaswfp-0.9.3-r1.ebuild 397 BLAKE2B a94188c00421472c81131adb5c005be260232b7c92ca4cc767688a72c12ff91aab147bad07852cd5d8a8743ee76bcb98cfcef0e2423fc4ad4d2932da99c2c8d3 SHA512 a0260293ff09e294b255303a8864ac6b8f8b905cf0820d301ca44dc090efa2764fc565d9dd37455b85f96abf4d717944dd30a341987396aed93cf1e9f01218b4
 EBUILD yaswfp-0.9.3.ebuild 393 BLAKE2B b61c014020825a972975bafcdec8a4e37a16f22629741ca3d1d57325f3e91372b2b67dfd717f91b25e580eacb4abc292fd23c9cb2c98edae859f79bcdc1a3903 SHA512 dd0ad46986273faa853068ae648b4e32d30e2ac37f0b43242c04b716262f3bb2cae8248d1c8129297be19b4cd7e78acdf6b222f0b29bccf2900f364812a1f758
 MISC metadata.xml 422 BLAKE2B 0fed51023c52483d2d3eeba60346b73a868edd674560a780d3922f6fb1d71f0298dd9bb7dbcaed7db391f16256760bd6f62d6466d145a0f1e23d628bc097d023 SHA512 9d637b30376341d6d3f781b96d899021d78b29035ac41b4e33653ba50856dda8cb3764304899a9048f32ad459e651f31d1d83b18bbc0258038ccd09b8415bdcb
diff --git a/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild b/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
new file mode 100644
index 000000000000..b1468f473944
--- /dev/null
+++ b/dev-python/yaswfp/yaswfp-0.9.3-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+
+inherit distutils-r1
+
+DESCRIPTION="Yet Another SWF Parser"
+HOMEPAGE="https://github.com/facundobatista/yaswfp"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
diff --git a/dev-python/zbase32/Manifest b/dev-python/zbase32/Manifest
deleted file mode 100644
index 94fd4ca5df50..000000000000
--- a/dev-python/zbase32/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zbase32-1.1.5.tar.gz 21745 BLAKE2B 42813eaf21da0b486e43dde3999d0f9bc04f28dc9f465ce5bf4ba5526dde70c85203c8c3341ba9ae49d4d54d91cb81fffbd5004fe08f2b73c5abc514d814ea09 SHA512 b2b049cdbc312cb56656b611d726527cdb0f598e5c8e0a646d1a144f863698404d8784d477f64402b0e3efd2d0ef5927a74ff0370a1742c1b7a5ad257bdc4f11
-EBUILD zbase32-1.1.5.ebuild 429 BLAKE2B ef5ace310d6115b675988aca1b9bc189d7d722ea21d1928458d1f3084a0fdbe7b791fbbcaa4b750f2b38e01cdb314c13923bbd9f258d184420bec282f2c66bbc SHA512 8008388a27c5063877de110d2daa44d915e6a94706a7e21ad1e820d5eb8281ae4b2523641055623103aa20ca7d4458bad6d75861a0217c8f2d42b741b853ea01
-MISC metadata.xml 237 BLAKE2B ed5ace69c4d43bab24397a6dc71a30532b0a8e1aefb06a0a5e64777457861257d48bf2aabfd510aeb799b62f603e7cd7b9d7539246536b01a5c2b16b3723263e SHA512 02479954b39c0b0ae9a8a030532c28700c396c46b42aa0eebd307ef0e23ca2a3bbf64937aaf892beddbc0d724d5ef2c96361774607a23a8b0c3fdf1e9f880ac7
diff --git a/dev-python/zbase32/metadata.xml b/dev-python/zbase32/metadata.xml
deleted file mode 100644
index 97a9d1ac26d2..000000000000
--- a/dev-python/zbase32/metadata.xml
+++ /dev/null
@@ -1,8 +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">zbase32</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/zbase32/zbase32-1.1.5.ebuild b/dev-python/zbase32/zbase32-1.1.5.ebuild
deleted file mode 100644
index 0eaf7ba10da1..000000000000
--- a/dev-python/zbase32/zbase32-1.1.5.ebuild
+++ /dev/null
@@ -1,19 +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
-
-DESCRIPTION="base32 encoder/decoder (not RFC 3548 compliant)"
-HOMEPAGE="https://pypi.org/project/zbase32/"
-SRC_URI="mirror://pypi/z/zbase32/zbase32-${PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-python/pyutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/zfec/Manifest b/dev-python/zfec/Manifest
deleted file mode 100644
index ce8aa5fb470d..000000000000
--- a/dev-python/zfec/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST zfec-1.4.24.tar.gz 175884 BLAKE2B a11821e26a1ce60bd4c669e522be12f470ccdaea902eee2dccdc1953f4c812241102b2bbba44d7075ff9d531d189b3410e6bcaf77449063db4989b8d985447a3 SHA512 ec213912eea054c954ddda67a401b1538fb2f02c2b56cdfb610df5f4852b79305ef72e9919c578d46a268ea4c5912a60422117326f633c7e9b8a7977561fa1f5
-EBUILD zfec-1.4.24.ebuild 660 BLAKE2B 927996882909320a26423eed482d974a4110faf919739dcbd3893bad9ae8d1228e97b42fd6a0d35409f77fabbc22cf48279f67cced85429e2ae565ec3ad423ea SHA512 7091c79311f54f3f16ab02d2ca1f0fdd7800bf59183b9762b4fe664641f3305ab5fa8f29a001173365bc06d73a9d698c3fac9f7992fb4d2c10c99d313bcac21b
-MISC metadata.xml 518 BLAKE2B 21d4b7f5a259ad7d99b42cb55df28493accd4ad0c122ac3783e034ed00cdd07e05d3f9ccc26f7141143d7bfaa54245b3fb04e1f0c650ba3cf3bf33f57b47084a SHA512 86c3ca260e3b58e78998f03160b4dc8e9e5c4c53875b247f6f029bfa64e95cb9cdc590ed7044c3c3245d5b572f69461f73863d83c1509918e08c4bfca7c9a44d
diff --git a/dev-python/zfec/metadata.xml b/dev-python/zfec/metadata.xml
deleted file mode 100644
index e6b25093cee3..000000000000
--- a/dev-python/zfec/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-needed -->
-	<longdescription lang="en">
-		Generate redundant blocks of information such that if some of
-		the blocks are lost then the original data can be recovered from
-		the remaining blocks. This package includes command-line tools,
-		C API, Python API, and Haskell API.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">zfec</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/zfec/zfec-1.4.24.ebuild b/dev-python/zfec/zfec-1.4.24.ebuild
deleted file mode 100644
index c123900063fe..000000000000
--- a/dev-python/zfec/zfec-1.4.24.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-DESCRIPTION="Fast erasure codec for the command-line, C, Python, or Haskell"
-HOMEPAGE="https://pypi.org/project/zfec/"
-SRC_URI="mirror://pypi/z/zfec/zfec-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND=""
-RDEPEND="${COMMON_DEPEND}
-	dev-python/pyutil[${PYTHON_USEDEP}]
-	dev-python/zbase32[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-
-	rm -rf "${ED%/}"/usr/share/doc/${PN}
-}
diff --git a/dev-python/zipp/Manifest b/dev-python/zipp/Manifest
index acc7feb561d0..c89ef97ae957 100644
--- a/dev-python/zipp/Manifest
+++ b/dev-python/zipp/Manifest
@@ -1,9 +1,9 @@
 DIST zipp-1.0.0.tar.gz 10821 BLAKE2B f5e0476cb0ca01054abc0c56f1a9581a6f537c002791c4a363238555ce9a211fe13114041374c1bfef426544545e3c654e5b0a7e0541c30b775757c43df6d756 SHA512 dbfadfedd30ca4cb31ac4163f367134d96e57405ef00d5f4c19c0af7a141f78487dec29a0ba94975584fcb462d22c8b536bf29c67b7e298368072e897b0e9d82
 DIST zipp-2.0.1.tar.gz 12790 BLAKE2B 107079d2cbe73c4d0d7053696181d99636192374eac4598a8f2007b8197c007e90ef39a56d193052d484b36247d73d5712d878ea35d222895e5b3ff21963ba13 SHA512 ac49f0c0aa83398ad0892932b1f067df94e2108691338c80400235053834bcbcb1a58b2b7b5807f398088a09e9d1cb591d94153a2a44ef3ef96506271d817e05
-DIST zipp-2.1.0.tar.gz 13758 BLAKE2B 1e1c0e0a7d6b7116c12c8f2af8ba9e807d203920450e1673fc0137ba4f47390ae5fd9c677876b582ed2c91cf33677913ada5fedf20f7c8cdd48c38646d3a4afd SHA512 24829aea6f76bf277e2bef9f039f253d5f7cae5830ca7fb0ad9140ba48ad02bb5848b0f5eccb5e72c5282da1f8e18083b98868aea2ca4f7a41d478a03d012235
 DIST zipp-2.2.0.tar.gz 13850 BLAKE2B 22596eb8428358c70c2ef233a30121c89f327b38941b9b688bf99de4eef1d5748eb6184c5b954cd70d192ee6987966ca487785bdd93e18a0e42d914ae7c96c84 SHA512 33e715d65df93cd9343a663f93e3cb5d120d4bb5ca2cdcabd78e6c19199554351618b685f7b2146f722a4924a9681f94ca129fbb2df37fb0f44358da507828cb
+DIST zipp-3.0.0.tar.gz 14501 BLAKE2B c0dc7534a3b1dd59e9f275e2dda95119061b26b0426964b7f01ef6721db108255e2ca9734097380e87d19449284d9335405357650f0a69edb87dff1e2223bbe2 SHA512 16ea46ee456416333ab4d25ae0d6099fa30eb93ad9a3485504ac3448c8669dc6020e0ec19830b8204af8ba6851e8336827d238c87cc389e4f2b40345c2877ff2
 EBUILD zipp-1.0.0.ebuild 1174 BLAKE2B 205255bae18e580668df8b3846b0afa55b335354539395dfa82fae4280c369b4262dba4b41c473a3f062f2dff7ff320b7684ad9416f8a844ad7469961975509e SHA512 a56049b22f5f50283fe43688f05702b95bfd54de25d2e2fdf5c076e28a4dfa65d057c52ee99a685f39af9ae0ae8e3b3f15173030f8f06e82b42deebee8ccbc72
 EBUILD zipp-2.0.1.ebuild 913 BLAKE2B edda049af7d5ab070af46d8462496fd14d8ac4168bfd43c3b0a1f804d45370acb97248c84ea66a412554354321b522b8b47f03e37fc7eeb637b9fc23ab9dd72f SHA512 abfe9bf84a3e07145769ebb30fe35d9229daba3783a4eef482f89c5bf3dfd5e1e2d39761f841f4587495af796e6af4c01c4b31c82a48a79dbcb3e2efe471af13
-EBUILD zipp-2.1.0.ebuild 882 BLAKE2B 2a288ef0353fde3a521cd370a3ae0fd9ee613c606d9d9be249dd0386824d465f7166c182e23f1be2967649d381c628c35721d1507989d7274b4318aa916c79d3 SHA512 ed4650c30a0f1a685c8bb7674f62757f67202462a9567ea5cea72969b68e2b659182e0764ce969abbee0da37904ed09f6ab09f31ead7153138bfc09f000ff42a
 EBUILD zipp-2.2.0.ebuild 882 BLAKE2B 2a288ef0353fde3a521cd370a3ae0fd9ee613c606d9d9be249dd0386824d465f7166c182e23f1be2967649d381c628c35721d1507989d7274b4318aa916c79d3 SHA512 ed4650c30a0f1a685c8bb7674f62757f67202462a9567ea5cea72969b68e2b659182e0764ce969abbee0da37904ed09f6ab09f31ead7153138bfc09f000ff42a
+EBUILD zipp-3.0.0.ebuild 1123 BLAKE2B 9e5f68482d8f8335baab33a92f585081c2331f1d7a9f8fd18f11fab0e11c8434c760e505292108cfa4e943feebd5107e3b82da26b34af25044cd82aaf324005c SHA512 b7fcb7dacdd58e061ff66596c2abc10edbb2257fbc518cac0fe0b4bbd388d59ee1392ef25cbdad0e1fbe3a3a9f0c1d170a0aa28ee6854d1ce6990a2192c61697
 MISC metadata.xml 523 BLAKE2B b2c729977d84466557f0fae273e5463a41fded78780842e4a92899cc79ad8cf2843fe9c397a70f1d7cab8a7ca317a6723b119047323e0be8862b7294afe96b33 SHA512 82b88eb00bb385c47ebf5c5cd560de25e4f865086983fd9a5767b7fb286406dd06273e8a596df31aba57baaf051b7c353f50f445753541de5b15e6a439132381
diff --git a/dev-python/zipp/zipp-2.1.0.ebuild b/dev-python/zipp/zipp-3.0.0.ebuild
index e49c6c90fb83..be47ab9ecb17 100644
--- a/dev-python/zipp/zipp-2.1.0.ebuild
+++ b/dev-python/zipp/zipp-3.0.0.ebuild
@@ -22,11 +22,17 @@ BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/toml[${PYTHON_USEDEP}]
 	>=dev-python/setuptools_scm-3.4.2[${PYTHON_USEDEP}]
-	test? (	dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
+	test? ( dev-python/jaraco-itertools[${PYTHON_USEDEP}] )
 "
 
 distutils_enable_sphinx docs \
 	">=dev-python/jaraco-packaging-3.2" \
 	">=dev-python/rst-linker-1.9"
-
 distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Skip a potentially flaky performance test
+	sed -i -e '/^import func_timeout\|^ *@func_timeout\.func_set_timeout/d' \
+		-e 's/test_implied_dirs_performance/_&/' test_zipp.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/zsi/Manifest b/dev-python/zsi/Manifest
deleted file mode 100644
index 892b4f07d6b6..000000000000
--- a/dev-python/zsi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ZSI-2.1-a1.tar.gz 932958 BLAKE2B a0133c2d2febc3be64d738a38304a0148fd6895333a48c940752af4ca25019f1cb26d606b3da86c2d386e117f081a83d47a52fd0ec9cbb12393f9397806f73cc SHA512 13f8734a5b09caa83786e776bc1104061812d05543b1412cda02dd904d6cd926042a4a882ffac71081a5275879d79927ea225ae2753936e0d026aee074f07974
-EBUILD zsi-2.1_alpha1-r1.ebuild 1049 BLAKE2B 382cd4c416c28cd96a9703aeb223d0bd21b4fdb74bbeeac8669b3c2077a265faa381c7ba246acfc4b493622fe43aca3e829661825b9f15daf2287f65acce54ed SHA512 95d0fcb924e0638c7f5fc95dba85450325b8bdcb36fd85b052d201d9bedc0860d17fadd75925c556f19dbe7206b9f0d3f72e91b1c596da6fe4a873968b32c247
-MISC metadata.xml 483 BLAKE2B fd435132167885ba839652da2cb28f7baa2c19838b10a60b292a4e9c870051370ab5cbd8e83768be271acc6fe033088a47e1590488905cce6f34d40a9e03af16 SHA512 18ed9802e4fea851659f7020a5aed0f61c25a22fe30aab9ccce3c711454757b48f520fb6ca0237c6134e090e4d2f8b781dab3793e422023622dd417ed1a6712f
diff --git a/dev-python/zsi/metadata.xml b/dev-python/zsi/metadata.xml
deleted file mode 100644
index 5a758b8ad8f3..000000000000
--- a/dev-python/zsi/metadata.xml
+++ /dev/null
@@ -1,16 +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>
-	<use>
-		<flag name="twisted">add support for python-twisted (needs 
-			<pkg>dev-python/twisted-core</pkg> and <pkg>dev-python/twisted-web</pkg>)
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">pywebsvcs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild b/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
deleted file mode 100644
index c4eee8e2d0f2..000000000000
--- a/dev-python/zsi/zsi-2.1_alpha1-r1.ebuild
+++ /dev/null
@@ -1,54 +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_PN="ZSI"
-MY_P="${MY_PN}-${PV/_alpha/-a}"
-
-DESCRIPTION="Web Services for Python"
-HOMEPAGE="http://pywebsvcs.sourceforge.net/zsi.html"
-SRC_URI="mirror://sourceforge/pywebsvcs/${MY_P}.tar.gz"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc examples twisted"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	twisted? (
-		dev-python/twisted-core
-		dev-python/twisted-web
-	)"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	if ! use twisted; then
-		sed -i \
-			-e "/version_info/d"\
-			-e "/ZSI.twisted/d"\
-			setup.py || die "sed failed"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dohtml doc/*.{html,css,png}
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r doc/examples/* samples/*
-	fi
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-29 18:01:47 +0000
commit	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch)
tree	9f47ee47c31a0f13f9496879cd88a1042550aa81 /dev-python
parent	53cba99042fa967e2a93da9f8db806fe2d035543 (diff)