gentoo resync : 04.07.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-07-04 14:05:23 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-07-04 14:05:23 +0100
commit: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (patch)
tree: 43b0410e62aba677b4b256bc3ffe3fd333d28dbe /dev-python
parent: 90c88731bd036e5698b281fbc0a5f3aa4c9983ac (diff)
277 files changed, 1669 insertions, 1682 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4084c2eefd88..b3cb61a9bf63 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 210b60c754cd..7547f075935d 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -2,6 +2,6 @@ AUX argcomplete-1.11.1-fish-xpass.patch 1195 BLAKE2B 9ae2e5803359f2abca0b168e009
 DIST argcomplete-1.11.0.tar.gz 50555 BLAKE2B 7029b2bf442362f3dca804b75c32e000bf48e1ccee1e8e4e0e3c484d883a95f4c4774f7367b51f6310b653be457f3ad1ee5e4907cf9566c97a12ca85fbcb177d SHA512 30a594d7f3a9ad31b4a7c537bd81e6cc23bcb3861a9d2b9999c654c0f04b4f330bcb7dbab7fe7191d4b8bbbbecdb2ad3c1b8ab812c16bec880fe83733f75c5b6
 DIST argcomplete-1.11.1.tar.gz 50773 BLAKE2B 15c92929fc20a10a1f1e29cf8714b74dd9ab0ce11e7f77acd4b15a907ad885f944f8540a8b37fef13ea67ee8eb76107e1c72746434f2710ded7331830494ff50 SHA512 523d542cf1430d8ad7b056e3b9c52769847c6e0bb9e266d71cc961e56816b7811f488a5c412f89b8de0d022a321d74733af87a50b3c0d698e796fb5e322d16ce
 EBUILD argcomplete-1.11.0.ebuild 836 BLAKE2B 659835d8d5bd7656717849047d09a67b45b203159873a800ee38d0779d5852d965389a040f50d281559fcfeedf1a5fc554ea138bb61cc8586c34a77e68333a97 SHA512 f882eb57a2c9e4b7008f40ecf1cb0a354f36cbbd8f59a786036539dc75f288335ad83fd51011dc48daa134c7c3a18c4bfbd9b17bc1ad5309bcb480d79d1be8d8
-EBUILD argcomplete-1.11.1-r1.ebuild 899 BLAKE2B ca6391d1e844fbe1a46c00b5e4b8d2d1e257e7507ea731f0c5aafcbad91b2d18f1dc97f63ab369610522304f90998ac622e6a79fff64c45bd86c463431c41c3b SHA512 9381849961c660c5bb12469ccfa2e94e3e920c0b56e65d0dde191a187a2aa83e4a4a03dd8d150da5dbe9c67b834899cf632a9d37f0cfd2392947acaa1bf85cbc
+EBUILD argcomplete-1.11.1-r1.ebuild 898 BLAKE2B 742f17949c4a59c2b630c20afbca518f73252334cd70eb8b0e273674aa9d3e89b6396c9dbb7b762eca3bbe4557a34c11eb90da8fcda9d785999bd4a42163a127 SHA512 25cd4c71319a0a5da418dce52f53961b4d26a663c0b56c409bdcdc0af5403116419c308a73c007fc2bb98bdca89cfede211512b1c646d4b153d4896cbbb978f4
 EBUILD argcomplete-1.11.1.ebuild 877 BLAKE2B 1447f620cf4b54262454de2f128b3e74e82b41b805ae4f50656c314d02030b868c6b02d70facc2f7e0de5304a94e8cf892abfb4dd84621bc1bb443b0eaae94cc SHA512 bb33d42173aedcc74bdb8ee41c144b22e7214dc71e10c42a66ec6f23c4e5e176387c449cb1e3d3093e166f0766eca6c5836be6e609e6255a5212bbf7fa90b483
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
index eefc33c78356..036d621fad96 100644
--- a/dev-python/argcomplete/argcomplete-1.11.1-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.11.1-r1.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 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 68ed3a76f623..93eb4c8c6d99 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -3,7 +3,7 @@ DIST asgiref-3.2.7.tar.gz 25350 BLAKE2B a92d573330b1d10ba9c8d963c0824bce93151f0e
 DIST asgiref-3.2.8.tar.gz 25469 BLAKE2B c6c3510159aa3a5a35f5d16b427d074b72973576cc4747076caf43854567c628eb37703bb5916cfda9d9dac45c700f881957cbc6a991ab13731c54ef2f6aca53 SHA512 895a0ff28a7d11facc0a41ae603099afb49c2e01ff2d912655d27fff2e2aa0ee8d84fcba45fe873260b39de0e3dd225ca5218100d4bb96c83e63d1fe36f4683a
 DIST asgiref-3.2.9.tar.gz 25482 BLAKE2B 0bb99c8b207bd384e7c691696fd64dcd08d02037da98c76d6e401d6d37db432443a10d08a3908fd17908d991455d1ac2faae82726062271a3dd17e4a68e7a2e4 SHA512 1810b19bb045fdb4bf47ec7e5caabd0f8869410a6f81503de2148fd024a88da40ed93cce1b47905d7e99f7e89f08a61a9980b88ab738e783664520c6f27e346c
 EBUILD asgiref-3.2.10.ebuild 550 BLAKE2B 0d0bf126de1cc7f0b48f42081f593b1f7b11eb3af2b0f274a1e8bd5c7ad6f5cb4730031f68211c7d69d81059d1f5790871ae5d9d860b3ae13f3e991625916e66 SHA512 b2325e2b744ab37d871b97b98c8fa92ae3c289d35ef3c7d899dbec4c7cab8c2cef8e2f7e429abf41b8b6a9c03b4bbbc508c1407e90d28aa020b77cebbc667939
-EBUILD asgiref-3.2.7.ebuild 551 BLAKE2B 940603a6fca7eb90892cc81c038d128f9959060fc073647bb7edd94fd64d58751ba3c71e714da2fa1a6f7f17e27f0c4a4689f40af5963d7608baa24587d2e266 SHA512 c1c490b01a23328484e6a416aa5314f48bba151b52064e79e16ef1efc902d6b6e18df7a687c0319c6bc61042c77c8219e7d3bf7abeea308f5496d20c32988033
+EBUILD asgiref-3.2.7.ebuild 550 BLAKE2B 4d9b62d01f03f0d78042eec0b19749d1ab7bc1bcf5bcba9f9a2c3e524e9c0d9ebd303a699d46ef7980bf1c3b77f228485f09fc928d38f302a25dab3e879f3edb SHA512 09ba3fd1cf10fc34b63005fe6b7ea551b89797a90162e81323103ce1635d88a7b12aef3122aa0b93c323a13cf09bf6cbabdd2163b4adaecf40b135fd29752044
 EBUILD asgiref-3.2.8.ebuild 550 BLAKE2B 0d0bf126de1cc7f0b48f42081f593b1f7b11eb3af2b0f274a1e8bd5c7ad6f5cb4730031f68211c7d69d81059d1f5790871ae5d9d860b3ae13f3e991625916e66 SHA512 b2325e2b744ab37d871b97b98c8fa92ae3c289d35ef3c7d899dbec4c7cab8c2cef8e2f7e429abf41b8b6a9c03b4bbbc508c1407e90d28aa020b77cebbc667939
 EBUILD asgiref-3.2.9.ebuild 550 BLAKE2B 0d0bf126de1cc7f0b48f42081f593b1f7b11eb3af2b0f274a1e8bd5c7ad6f5cb4730031f68211c7d69d81059d1f5790871ae5d9d860b3ae13f3e991625916e66 SHA512 b2325e2b744ab37d871b97b98c8fa92ae3c289d35ef3c7d899dbec4c7cab8c2cef8e2f7e429abf41b8b6a9c03b4bbbc508c1407e90d28aa020b77cebbc667939
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/asgiref/asgiref-3.2.7.ebuild b/dev-python/asgiref/asgiref-3.2.7.ebuild
index 520ccd29acf5..5a179cf49004 100644
--- a/dev-python/asgiref/asgiref-3.2.7.ebuild
+++ b/dev-python/asgiref/asgiref-3.2.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
 
 BDEPEND="
 	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
diff --git a/dev-python/backports-shutil_get_terminal_size/Manifest b/dev-python/backports-shutil_get_terminal_size/Manifest
deleted file mode 100644
index 3eec3cea9a2d..000000000000
--- a/dev-python/backports-shutil_get_terminal_size/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST backports.shutil_get_terminal_size-1.0.0.tar.gz 4279 BLAKE2B 8f4772c8c9b7e80c4d1402ef9cf3fefaa7ab61a1baed26b87fa0d347bea6ad704f5ae7d9379cd266bd949509eff9e89cda9d87ecedc9832c5cb332c5ed6496d0 SHA512 b74341c6616f9aace5abcc7fd657fc33801b558b6227c533002ccaf588734490b465a4a27d2bdc8047a385771afdcded610edef832dfa5ef24632f4541729050
-EBUILD backports-shutil_get_terminal_size-1.0.0-r1.ebuild 895 BLAKE2B d50f4002c6b03f65dba8bf774da375f6e586a299ce3cbae0179fb44f467a16e0b4ff7ea01b4af4c5db2ca816f1cab41ce54bd39de99f2bd919a9d40bcbf1c354 SHA512 66b13cca097422ef4e67d9555d9e4b8406466f1d5578a2d97270a31baddfc048d904447d05e6fe2babc601446e96b5105f1963c7d10dc833a936cfed2df074a7
-MISC metadata.xml 419 BLAKE2B 91d54cfdf48e9e865b6c0328c92f0e5f5150fab4245f84b4abd6f2f4f88881fd77b248729cd7f777f85d8fdab5c1ec8116c783b3698a768e977f2f9c33f2a2d8 SHA512 2ca1f74cae2287c693693808d870f7f78724b5ad532b2c8ce838f69323e219efbcea21fc53bd0b257014c435e6f65f2ffbc50c8cbb4bf9b712668e46e59ecdea
diff --git a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild b/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.ebuild
deleted file mode 100644
index 1e2ab25acb17..000000000000
--- a/dev-python/backports-shutil_get_terminal_size/backports-shutil_get_terminal_size-1.0.0-r1.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
-
-MY_PN="backports.shutil_get_terminal_size"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A backport of the get_terminal_size function from Python 3.3's shutil"
-HOMEPAGE="https://pypi.org/project/backports.shutil_get_terminal_size/ https://github.com/chrippa/backports.shutil_get_terminal_size"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_install() {
-	distutils-r1_python_install
-
-	# main namespace provided by dev-python/backports
-	rm "${D}$(python_get_sitedir)"/backports/__init__.py* || die
-}
diff --git a/dev-python/backports-shutil_get_terminal_size/metadata.xml b/dev-python/backports-shutil_get_terminal_size/metadata.xml
deleted file mode 100644
index f9b37db2f8db..000000000000
--- a/dev-python/backports-shutil_get_terminal_size/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">backports.shutil_get_terminal_size</remote-id>
-		<remote-id type="github">chrippa/backports.shutil_get_terminal_size</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/backports-shutil_which/Manifest b/dev-python/backports-shutil_which/Manifest
deleted file mode 100644
index 139bbc093459..000000000000
--- a/dev-python/backports-shutil_which/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST backports.shutil_which-3.5.1.tar.gz 3020 BLAKE2B 9df216cb71d0af039ddd38dcd3a9e4de311afff742fcdd1a91e2d29520d3f9c2f8dfd44d2b8471cdb76b54d7cae3ba81c02c77d92fba617936dccfa6e79387e1 SHA512 066096f6cde0d245f2a8ff27b8e99bcec7088a2c9667c6b3dc73dd8866ea98acfb32c63222e8349eb906460b8ade864b18cf88a627070e20e28d5c00aded3ae4
-EBUILD backports-shutil_which-3.5.1.ebuild 807 BLAKE2B 6aee91f012d7e93fd92a0a8896772e323d983d36ec71e948ea9f46aa1cbd5ec524193477ec8a0d7e50d93cbbe90d8568710a5119d729d0425a8b4a3d1b36e267 SHA512 359be6402cab2dc25156593d6d60253d211c47c3227f23c3f2c684a581de32ac488ee2d6594c810c2a37df2bfc9007c0e27488fdafb2d36f73acc0af7e6d034d
-MISC metadata.xml 393 BLAKE2B 21642aeb6b1e7354a29a3ee34a84987017ad8125ec87f06796eb456edace5a522b7c6765a24d8daa47b2cd376cd074feb2af69c8518e8f4dde81df194c9a4329 SHA512 4f7226cd237eba03096ef2e45113c0d38a65c66fe45f81c2aa0063c590b9c5a426bc9291b436fa9d21d658fc6ab854116968825c4f5431c9dd954ba8b5090079
diff --git a/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild b/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild
deleted file mode 100644
index abe245de1db7..000000000000
--- a/dev-python/backports-shutil_which/backports-shutil_which-3.5.1.ebuild
+++ /dev/null
@@ -1,32 +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
-
-MY_PN="backports.shutil_which"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Backport of shutil.which from Python 3.3"
-HOMEPAGE="https://pypi.org/project/backports.shutil_which/ https://github.com/minrk/backports.shutil_which"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_install() {
-	distutils-r1_python_install
-
-	# main namespace provided by dev-python/backports
-	rm "${D}$(python_get_sitedir)"/backports/__init__.py* || die
-}
diff --git a/dev-python/backports-shutil_which/metadata.xml b/dev-python/backports-shutil_which/metadata.xml
deleted file mode 100644
index bb2287b53848..000000000000
--- a/dev-python/backports-shutil_which/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">backports.shutil_which</remote-id>
-		<remote-id type="github">minrk/backports.shutil_which</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/backports-ssl-match-hostname/Manifest b/dev-python/backports-ssl-match-hostname/Manifest
deleted file mode 100644
index c5f985555f5a..000000000000
--- a/dev-python/backports-ssl-match-hostname/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST backports.ssl_match_hostname-3.5.0.1.tar.gz 5605 BLAKE2B b9c346cc7414fbda97c2b1646ec406942ab5527b6537338a9fe0ed60d62d8515cd03fdeb68cfed10862c23f1d6e37ffc13bd479e55f6a9310abb4be14e3de83c SHA512 414c2b6f302a4655c3db3ef09e1dca4916ae4e8c4aa69e43c63bbb920303ea4b2618150c2c35d8a2e1e1283b1d65ccd10a350888fd771addda533c19c20b7e82
-EBUILD backports-ssl-match-hostname-3.5.0.1-r1.ebuild 1050 BLAKE2B 3dd7a11893d2d24536d818705a4ecea1768d21f85cd8df3ddedc12f077bcffa9e285d267519100614077251f954f332fd3cce5436ad75a50e82615bba321690a SHA512 55e869714079395517b4b313f4f698e9b0ad0bac607eeb23a39fde5a498ac22f650b443d22a51c86ebe197ab33c336efb276e3b3565aac5fc0c31a039f596ce3
-MISC metadata.xml 331 BLAKE2B 048adbe9d02c7be8d4d0a40aa2f496015a2225ef8ac7f745dd0b8c60d8adbcc44920fe1bf08e0bb5e0eea329b521c549f2218132a96cd29a6a3ff52368602f04 SHA512 e536e9be47c0b879e669145ca18650e86ac94375d9c9451e7b54cc9e9b8aa1f854611f5e427c13970e6735cb59bea7515a0f7bbcd6c5dbfafbe72d02d64101df
diff --git a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild b/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
deleted file mode 100644
index 744d6bb51f76..000000000000
--- a/dev-python/backports-ssl-match-hostname/backports-ssl-match-hostname-3.5.0.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# This is a backport from python3.5+
-# Do not add python3.5 or later support here, there's no need for it.
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_PN=${MY_PN//-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Backport of the ssl.match_hostname function"
-HOMEPAGE="https://pypi.org/project/backports.ssl_match_hostname/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/backports[${PYTHON_USEDEP}]"
-
-S=${WORKDIR}/${MY_P}
-
-python_install_all() {
-	local DOCS=( backports/ssl_match_hostname/README.txt )
-	distutils-r1_python_install_all
-}
-
-python_install() {
-	# main namespace provided by dev-python/backports
-	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
-	distutils-r1_python_install --skip-build
-}
diff --git a/dev-python/backports-ssl-match-hostname/metadata.xml b/dev-python/backports-ssl-match-hostname/metadata.xml
deleted file mode 100644
index 3a0e0db9e926..000000000000
--- a/dev-python/backports-ssl-match-hostname/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">backports.ssl_match_hostname</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 8e178ad58abf..c3e868edd69a 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,4 +1,4 @@
 AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
-EBUILD betamax-0.8.1.ebuild 1193 BLAKE2B 69ed66261a5610e2510e47d3433c1962f3b05ad114a2d3d0dd6439f2111c8e9952861d291f4800a9478b35cd295a2fdfd7b11c736c366fc7c5dfea0ebadcc882 SHA512 ea2d379c8241fa0e89e06f8db277f6965a02c6494bf6e288f3091fffd981e1994d20c1c3b8caae189819a707937ca7e261e9df20888438020b843f50a552d54e
+EBUILD betamax-0.8.1.ebuild 1191 BLAKE2B 322e0e82bcb20a224f8bf78149cfb46ba5d6ff9c6036c0f4674cd4b8e6d2dc6b1f3031bb7d1391b127add5d75ffb33f61db77fd3704ffd7dc42831df45527f56 SHA512 886642777b5aa44dd04d3cdf92304739aeebd153a5d35823a094415fe32e4b5c501caf5f0df2b688aa7bbb8b3e9cc16277663ddeee136bddad2acb6a6169a064
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index f134539c79b9..6fd86ef812c5 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 37895c5f7985..9e9b1bbadd34 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -3,6 +3,7 @@ DIST boto3-1.12.48.tar.gz 292124 BLAKE2B 0baf8fb4cfa040ba05b296d15a523a5de326776
 DIST boto3-1.13.26.tar.gz 296782 BLAKE2B 117bb18679fe3ae8c4feee1a5fb2d1df1923764bba3dce72040ccc802d10bb88263744a0491195f414761b6755353775a8a413a121a5a0fc42373a4e9b8aac1a SHA512 513ea4b39a5af4ae8e45f6b8b315a19d5184998fa881782bf2e6074aee36a709b51813fc9fe403bb8dbfb9b51ead50367af18f0918a1c88a37eab263ccddd11a
 DIST boto3-1.14.0.tar.gz 297008 BLAKE2B 7f5eaf4958395b47e936596b385b5a4daa20dbed6b777a407b6c2f70d3004d89fb963f479a1a3c8be22a3cbbfdb21f59a1f3c3ea4b967fce4799fc965899bcf1 SHA512 12ce4765f22e848aac0c29d1f95ed7b63964868f18c14073f93c74e442babf8708aa69cb6c17bd7c3aa5dacda6beb67bb4a4afe86fcd298308c70abfb77802d4
 DIST boto3-1.14.11.tar.gz 298578 BLAKE2B c78ba0957c4252adeaefb7ac3e335e3db6044752cd06731b6f7367bbfdbbb2db25d717ddf8954eabce745bca07d2980445a725977d3f12a5914e8620502e7f88 SHA512 069e21ca8aa5b7d30ff7ea9f94bb4d939495f0ce30a831e985687eafe4cd22ce830af2427b645df16ddcd51126c366ff61243bb7251a2aecbef46b8573d2e124
+DIST boto3-1.14.15.tar.gz 298869 BLAKE2B 24e55039ac4a7ecb97eb2e5f61a7991422df30e089bdf1d716a5daab81df0cfec5b8fd4c543a22d4bf208351cc77c88dff2e50949d006d93a523e8287c000d40 SHA512 8f082ee1062caa38dbf4dca28a7b48125d5938f7fd1d09bb01f31bef129fcd346e99f2f18d11a67e9733d674c3c263c809800bb8e58bbe70750dcfbcaec6c731
 DIST boto3-1.14.2.tar.gz 297730 BLAKE2B 174bc2435247db4421ffbf1ca0ef2cb772a9b6f357cbb438996ad635fca8ae5cd1005df3f8fdc6c63607797115c2379bb10c43edcfaf8393394f241b1e7a1ca1 SHA512 6ad539e568fe90c2f7408f37d28f194ac7094f6393858e487bf2afa73b8b53c90c8ab489bbe56f7c594351b24aaa82bfc9f81c9d68fadaecaec5acc3352fad5e
 DIST boto3-1.14.5.tar.gz 297919 BLAKE2B 9428ddfa1a5549bfb8319cc91292dace9245a9db94eec373f571342808cdda7c1bf2b683ccddbcae532aca79666971b5cff7646756dff7baa24e291b348ff0f0 SHA512 7c65b1a1b6070b8954b7a705b1473543be6a4939c8594327cdaf8c91ff557bfdb49611e18f2bc6b0213fc13ef4cdbf57da7e632ac93dacf6d887f7a18889ff59
 DIST boto3-1.14.8.tar.gz 297922 BLAKE2B e71a74155a6e32b310063c6c80ceb960db816898271f01066099d9ef162e90c5c446ea29b7164d957cc4d02e546eec59eb62f9168aa7e5f6e149c2d97fa14928 SHA512 a5c1c63664c406dc6b923ee565d30572173084b43a4539605cfc36a959d5d8fbcf0864720732128f26ba84fe8e4aabb31842d656e6e189860a41b365955e63ae
@@ -12,6 +13,7 @@ EBUILD boto3-1.12.48.ebuild 1290 BLAKE2B 6e86e0733eb5c8477e9e3e4da68db82582831d1
 EBUILD boto3-1.13.26.ebuild 1233 BLAKE2B d5e4817534127c58a74846722b6b1251eaad1c040ec3bb87ffeecfaa71611367d589231b0b33f1d443bd4daeca4d830abfee1b6cf41236a0ff57b0286f82f8c4 SHA512 406144934c025d1901d9a5d9886622f0099749a5c729d4da945d7b95e1d6a3c3f4d2a2574f22bc57b3bdd03d6ef215787069524c0a9ce5ebf4cebe22539537b9
 EBUILD boto3-1.14.0.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
 EBUILD boto3-1.14.11.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
+EBUILD boto3-1.14.15.ebuild 1231 BLAKE2B 07ad972860be28d29f38f230b00869d93a67d3ab3434b75f81c2fb520a9fb4679823ec2d29f7f9ddef32ef66b72d6afd1eb7f6290e1a9a4b940aff39b2f19d7d SHA512 de7235c3adc687aa16c33235a246d1f3dea161a65901b3ea2b088d0b9c09f2d62788adcdac2ff8c08e41c541a85864359c0f331486d950ff3b10f6d5a5014459
 EBUILD boto3-1.14.2.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
 EBUILD boto3-1.14.5.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
 EBUILD boto3-1.14.8.ebuild 1232 BLAKE2B cc6b7806a735f16a45f1f5ae6d5f17156fd1df95bf42e376e6120ef7941c884c172e2db1b759c11b274ab15c93c7181e1de4649f5f73f023ee8ea37f5fb066bf SHA512 c9afac98c0e91ad48a4cd9218d702a007a6fe917923ded672253322064082ed9caca85a32ce62621585adb22df118bb72eafe91c10e78ddb41f9778e80092fde
diff --git a/dev-python/boto3/boto3-1.14.15.ebuild b/dev-python/boto3/boto3-1.14.15.ebuild
new file mode 100644
index 000000000000..bbe6631e26ee
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.15.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit tests/functional ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 1ce96b80cf6f..cc2ef58a9307 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -11,6 +11,7 @@ DIST botocore-1.16.6.tar.gz 6386032 BLAKE2B e909e2fa021d5b1be333a31758af408cdc6e
 DIST botocore-1.16.7.tar.gz 6391893 BLAKE2B 19a8770ef1058e5601a1c292e2e17e1625e4d5d0d1845b59bbd403a2c285da1a774935e9d1e1fa7ca26a1e3c4703b29fcbb2f021a7251aa3ca756c80b2ba0461 SHA512 0ab2b4ff4096049cd92b96c710a38867a53b2dba0f07a319ec1a2f9b3cbce60776026c62e3eaaebe571b6ad26eb5c1c258b2dd350a444d30e54b342bcd675768
 DIST botocore-1.17.0.tar.gz 6478558 BLAKE2B 761ff2d57079a52ce38a6d56639fb0771d1fc4fb6a3494badecaacd4cea1ef74a69fe23d9fe62827993a3b6c33b963a2a199300f37fa3e7dc42433135c00f035 SHA512 a43b2f99e44ef9de3cf740b8fc1d74976d9ff6831639229a704f9300011405861789c9af26ea657f64244f5d67cff19aa94f95e5d2df73ee4f2dc10ccdeabae3
 DIST botocore-1.17.11.tar.gz 6508848 BLAKE2B 91e38db3868fb2cba9ffa6a1dfc95bd6557bb5ed8844a148b99603fb8557dc269fd652bfac3132d0b0b07fbb9063ed2762ad461cb75280cef7570bd251268029 SHA512 7ae6129985b58d1f24d0892a4506681af23d45d68be217aa5ddd06cdc2e8440edab3983f3f7dd0bb1993275d2ae0cfdd5406aaa7643f807dca4ed3ed71bf9eee
+DIST botocore-1.17.15.tar.gz 6530455 BLAKE2B d402845e3c0f434e39b1c1ab80378eb2d5f113b99be83471b89cc7264a2c696cfb38b25960f8c0eb3d721147c706f43c1db02287c8ef4ae4ae33394f2fc82473 SHA512 7a8ff75e83fa8df17d79cb3ede9faf2a7eb4c2bfa338411f0186d6c30946aaa247c14ddfc91c9d7ee6d1639696ca5e808bf4131ad2182608ecd99ef0e97175c1
 DIST botocore-1.17.2.tar.gz 6481390 BLAKE2B 009f8857be93c2fccb52e83176614401ae89835ea32fd0043248f7f66765d06e44df72ed31b5370cc1ed106cf45b531f4e4e7e7cbc3dc1d6e1524cb7914654d4 SHA512 ff19b1708686cbb574b01c9924a6acb7eaf7607b5f19a759d5c1dc1f7a7efae960e0c81d26d384101da5aaddc3bf0d8b4800d8908af34392d23779d4b9064487
 DIST botocore-1.17.5.tar.gz 6491397 BLAKE2B e6d45050e0f9d9919edff7dcea0866c9360fc8b8a09a82bcb6636621b49d7c9d06025639d8acf8740bf6d272371cabc9afff51e48214d240f1e81cd76abcab65 SHA512 2cf87d79a50f10d386907a0ef5b0e427b299b342d3661dfa64860828a0854dcd7f2ef3e0febdc30772aabf93efb39f4f35d52d3f28aec641e886fb5c05e30a3a
 DIST botocore-1.17.8.tar.gz 6499259 BLAKE2B bbec0755ac5c96f8b86d9391db36b58c28a2eff61b69ddccbbfcf0d7b349e1b5c99a2ab3619e50c6eda6a781e5361dd11f674126a596e23f505fde81a9b77949 SHA512 3f0c06e5fb335cc33ed589205ca378d4270d26dfb7f4b6196953205d24de4f71bf09c47b722449e51325d7643be6767f7a542d79765649ea3581247bc219f88d
@@ -25,6 +26,7 @@ EBUILD botocore-1.16.6.ebuild 1508 BLAKE2B 8320c38de9ccccf6cdd688aa704cfa23d031e
 EBUILD botocore-1.16.7.ebuild 1478 BLAKE2B c590fd3fefb93eaaff4d07bcbb7863f7c60f563ed9d8a8bf8b0ad7d0ed20bafe0b79288710b2821105a6f13a809d49572af5352b1c95d1cc28ef4dbb5ca3a0ae SHA512 b5721a4f2924d2bcb0c7501f762f3b8d1a6de664ae9f66dcd044931637420c74766248ebf7232d0de4857731e630537afa0d9bbe22c4f4f3941b9ad9bcc4a3cc
 EBUILD botocore-1.17.0.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
 EBUILD botocore-1.17.11.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
+EBUILD botocore-1.17.15.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
 EBUILD botocore-1.17.2.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
 EBUILD botocore-1.17.5.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
 EBUILD botocore-1.17.8.ebuild 1599 BLAKE2B ef0223905ba41457491b4a3343609b18de201e82e0c88589caf93ce9acc132a471672a6fa89b587b0eda34309c6755299e6e4a44c737a2399658b96713cf4969 SHA512 79a7d7c90b7404b1041cdd592052e6fbc79e960ffade799a20e6ee1d0b55b42e6e5f9f57d6f3dc032116146ddde7953934505e6ace0e513dbf06909045c38de0
diff --git a/dev-python/botocore/botocore-1.17.15.ebuild b/dev-python/botocore/botocore-1.17.15.ebuild
new file mode 100644
index 000000000000..c08c6f6ff899
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.15.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index 53269dd091f6..8ca09c6a4fbd 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,3 +1,5 @@
 DIST brython-3.7.3.tar.gz 10403156 BLAKE2B a30c957925149f1b7eb736c1fcacd171dffb5846f6a343227596e759820c794c265befbb04137e797c1eabe8d9f0a3faa93fe425e4b0c13fda4c78b4c4bb1ecd SHA512 f234c7bc67d935e5bd5bfa8e473bccf90245ab4dabccd363bc5e9e01e1c9ea9d95989c5f8b323c158e286ac4a66106eb07722d1fcc82353ad036e35b4fda5669
+DIST brython-3.7.4.tar.gz 10473351 BLAKE2B c457498d7f9b61ef416d6ec0ccbf86e3fdc7cc55f90fd8a853005285cab814d054319a5437cc24d22d6088af6f5b58da5311c6f68721d7b243fe31ef450c38a1 SHA512 70959debdd0a3e7f7e533f17aa2149802454bee23598d844156756ee6aab697b75337a26a341e6408966036f419696d0f8b073cb5383f32a9f6de65cde2fa40a
 EBUILD brython-3.7.3.ebuild 761 BLAKE2B 35236dc8fac0d6f47e8cd45855538098cd50bc2de66467c552c55885237264913dab68a18671b0a83973c9716e5155fee029f7201863178a56ce889713fcec8a SHA512 ff84dbf08200f19b806d9e109772d7318dfb32fba4e1643023621af992f798e3eafcb1f6a676e5a2b982efe82630bfac73b3406ec051d5c365c96182100a3049
+EBUILD brython-3.7.4.ebuild 761 BLAKE2B 35236dc8fac0d6f47e8cd45855538098cd50bc2de66467c552c55885237264913dab68a18671b0a83973c9716e5155fee029f7201863178a56ce889713fcec8a SHA512 ff84dbf08200f19b806d9e109772d7318dfb32fba4e1643023621af992f798e3eafcb1f6a676e5a2b982efe82630bfac73b3406ec051d5c365c96182100a3049
 MISC metadata.xml 345 BLAKE2B ab7c78390c35a156fed3a3507ab979347fef95259f4083a28ba2c925356907158a0e7249cc4e6e46cc9117e418a07a3f91a67ba34163aa5be657ca37bf11b318 SHA512 ff1357bc421a8f96fe10ddc253035271616da444fb6cca11d3b263629c12abfbfc17324d06e744c95c319fe525763ff752db69aa3439edaa3fdc3e7e56c5bb05
diff --git a/dev-python/brython/brython-3.7.4.ebuild b/dev-python/brython/brython-3.7.4.ebuild
new file mode 100644
index 000000000000..ce838901b946
--- /dev/null
+++ b/dev-python/brython/brython-3.7.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit webapp python-single-r1
+
+DESCRIPTION="A Python 3 implementation for client-side web programming"
+HOMEPAGE="http://www.brython.info"
+SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}"
+
+need_httpd_cgi
+
+pkg_setup() {
+	webapp_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	dodoc LICENCE.txt README.md
+	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
+
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_src_install
+}
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index c09dced00520..e0c7c55b7e24 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -3,5 +3,5 @@ DIST cheroot-8.2.1.tar.gz 89470 BLAKE2B 57515ecf6e047ea67599631a98c15307ea5f9929
 DIST cheroot-8.3.0.tar.gz 100557 BLAKE2B f5f2fd8a11a1a8660fc37030d501e93787be46dbb79cae89cb4f6915cbf3975453c0ced6ec3bc0ebfc7dc77d555f7d86ed01bd751df6b0227cac3b1b11a82ab5 SHA512 29ff39f043b1a08b9ef653a41761ac4b97de4141cf15c5394f95736d28f7fad4c501d666fe7ff61f40c55b087d022784c7fe09c995c901040b7f2a8ed16b7d14
 EBUILD cheroot-8.2.1-r1.ebuild 2249 BLAKE2B 75bb493262711a58088d4539c27157dd37638e521e89c7e2f2675421d38346a62332dc9b71c183d56a7560f491636f05c894d01aed0a8b10c63cd5d08e5ab006 SHA512 8ca74fe3a2a5160b228cd7009550a8d9f59dc6c85c3614167716c4d1188aeece0c774ab4d711e76615476ab5315f2b4c9133e6d4b1a2df967e120d05717a99c6
 EBUILD cheroot-8.3.0-r1.ebuild 1414 BLAKE2B 68c9dd50562bb0d7a872497e53272dbff24024859ee4a8ce25f79968ebfdf9236b3fb8a9d6be6b66d54f7c383dd62e7b87d7863482a3d1cc3a50017570a78193 SHA512 fd4d32399fa25060947a7e244d1b7b199da923a519256403a16d58113701441769f6f84eaec77d15a826102f0507fa7084d1e7f0426627adbdf8b4a133d1dfd5
-EBUILD cheroot-8.3.0.ebuild 1183 BLAKE2B 755a757906b89f04c200528c28695378feea8672e1e9edf7a35697e110c3d4e357346999a961e1aad31c0b314894e1152bd080fb99f281ce966a570e78f150ed SHA512 11c3c0c8015195ca04c295c3aaf29b1e588dc9987f57e64a97db206800147de0a22e3c342f628474d44b2779f80b75dab5ebfadf73dd0710ec8a231afe74ffed
+EBUILD cheroot-8.3.0.ebuild 1182 BLAKE2B 1b1582713afb603c4eab37fdfe7e7c1fdc6569f56694caaefa6629e847b71578ca8f6b256aa6347d114c5d42e09d678771cacd9a217625d416b93e573eb40cce SHA512 2ffa8686cb0fa46bdddf9277467558c8a16bae879b0a80fe6f31fe58e413f6249117068f66b7a83c2b9c4ddfd7809a9753b9eb426cae44aa63300ac9438567df
 MISC metadata.xml 471 BLAKE2B e623692550af72f63a0df84767bfadcf9ee16beafc4f467cc6bd83d7a0deca6a66d73f9041e3e37a967a4d7451eebe0d9f7974e43ce90b2dac24134ed7aa6496 SHA512 19c39b453a668408550b250a96af25ea12c8a46285070aa4a1b1d7c3e6b4ee36ac287ead410e6b798d4fa607543d58c5cc8bec0f00992206d2a231de983b5976
diff --git a/dev-python/cheroot/cheroot-8.3.0.ebuild b/dev-python/cheroot/cheroot-8.3.0.ebuild
index 0785fecc4cf2..0124db04df17 100644
--- a/dev-python/cheroot/cheroot-8.3.0.ebuild
+++ b/dev-python/cheroot/cheroot-8.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 # Unit tests are temporarily disabled for this version, see below for
 # what needs to be done.
 #IUSE="test"
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index 480bba996f1f..9c308e350f33 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -5,7 +5,7 @@ DIST CherryPy-18.6.0.tar.gz 686804 BLAKE2B dae7f0ac403084acdf611e4a9e75f15235549
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
 EBUILD cherrypy-13.1.0-r1.ebuild 1323 BLAKE2B 2d56bf87bf3b6179eec66a8b02c66f98f35c3c129fed2a31cdcc4163faa2658bcc53b72284ae0b82cca529b9abbb7677f9964241808047bd22d712cc77329eea SHA512 a53f1c3734d389d784ac49419f289bda1b8576f6d066c0b5d0c80aa0075ab2587874e875121882337938cf799af2415681976e8c1960e49de6bab2d9799c5f89
 EBUILD cherrypy-18.1.0-r1.ebuild 1879 BLAKE2B e6ca418791d306d45ce0f9d4a189e1c4675027dc14e5ad099a139195e3dd40365daea4ffa03f59e3433e464b4ba80c9c1186c24969d50293db6e836ac9408c1a SHA512 7ba691e2b421503f881930f1a829a4335e1b85037924510afa09e0c0583f879bc92d44e080091f54a82714a61694868fbd66ac42625ddc9b8228e736e4dbae51
-EBUILD cherrypy-18.5.0.ebuild 1918 BLAKE2B 0ea7694c961ad79c8c2ca8dcecd224037f9b0c6480eb59798d49697a13e428000e9329c3bcc2a15c5b47c104b2865b5ef69743c5040fd0b46100e1c24bbcac36 SHA512 2a786fc2cae7de0535073a6fdf1f34c62162b6aa532c3d1e2b74f1af3a2522e049eb997f0ef3929ee87d6c03ebb5552e93fed320885ee92df4d0373f6f052f82
+EBUILD cherrypy-18.5.0.ebuild 1917 BLAKE2B fd12521b4a8effdcfb6ad89308d857fa9505c5c60d76a56d052d31cf09a8e4a8f46ee51a3026ea59b4132f43bcafcc93f354d976298bb4d18042317dd47f0596 SHA512 60eb40a5925b4d34d0bcf84e9be769554f348896e77c857aaab6dd7b33bdf4a58829d4fe60354abbe3413a6bb270fec75f7167479d677b0b27aad86a07073924
 EBUILD cherrypy-18.6.0.ebuild 1919 BLAKE2B 6dec6f120773cc5051c066354ab4f55cad213fd989e95dfeb90df15938e324c283e8f16fa5a2289b0d7df095683381af560ab26a3acb98a453741a27391e617c SHA512 9ce886bac48d1de8c4a298c2e3f26443569bb741f77962bb5de568c6652883d1e3d1f3b4d80bc8c46d2d0c28347a66ef46271231ec5f569f6a345aebaa340663
 EBUILD cherrypy-3.8.0.ebuild 1639 BLAKE2B 404e81cf1f8e8752663409c02e3aad85d3e0088a6af5238fc745cf96fb81070ffb355a06d08e458a9de66f2d1753ebf753b6bc974b3972b7acc582d80b88d876 SHA512 3dbb263af36b1243536446022750e8f30f4bc629cee442bd39263d3d86658fe3aade5094929a469a43bca44cdca4bcbf92312e3f5f9a4d72f0688653553642df
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-18.5.0.ebuild b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
index 1156d983160d..0cdaca1585c5 100644
--- a/dev-python/cherrypy/cherrypy-18.5.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-18.5.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="ssl test"
 
 RDEPEND=">=dev-python/cheroot-8.2.1[${PYTHON_USEDEP}]
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index c8f42c6ee0c2..c8715b4a3134 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,10 +1,12 @@
 DIST cfe-8.0.1.src.tar.xz 12810056 BLAKE2B 88cee0b6daa477ca0473c76efc45beb634f6194ecd3f45aaec3791e26b203c5dbd33c649435e0d97924096a72c727d76915bffc0b7ea305f24d5e5f06389c4a0 SHA512 1227b2d32052c70b4b494659849000188fce46fc31a71f3352ba8457ac0b0b17e4bc7c8589874c8586d55aa808ee6c1fceb7df501aafa33599f8df7bfd2b791d
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD clang-python-10.0.0.ebuild 926 BLAKE2B 9234b7b3e5159f7f9e9d99148a6b784be909d9241484200c6578d877e4b1f1266df92c16034e8758bbd0280a1b626b5a5f914b94b37b0fa1ad60306f1c09b215 SHA512 2afd8a595225835e276a62edfec73d0834a5b3d5d4fedf8416ce115db9208da87cd3f3ec5675fb46a4205001e5d734c7479ea5eef86571d1e2a54377fa14e9ad
+EBUILD clang-python-10.0.0.ebuild 925 BLAKE2B 568441c53509035117143a7c74f9fe2671299f9dc0771f4090efac7dfb50a16c1ec6083bc1c87cac95e6281fe9b0c7ed5eda2b0e82e51dee05dbf7e24b643104 SHA512 b74a1e9980aafcf8c253cdd0c3a6aa8e455d207f9ff7b4d3a1d3bb3e4bfa986edc2bb6f89c6ef55091deba4fe9c163fa821ed6e78b616796f141ab4903bfb0bb
 EBUILD clang-python-10.0.1.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-10.0.1_rc1.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-10.0.1_rc2.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-11.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-8.0.1.ebuild 1110 BLAKE2B aa66d47aef5cad5d7819dc064d618a70e1b38fe6b6cf7c8ea15ac3a6b814770e95abd86a482f5fc874f4bdaf230c3330c0fdb39df1afd88e2c40ae9a6349b49b SHA512 a5b3aace7ab68a0bf9e8624e2b1b23f83dc79a299090479ddde3794f2ff7e344459e8c7167b256748a57ce73099272c2eeb8d8778901c710ccbb08d2c6c12a35
 EBUILD clang-python-9.0.1.ebuild 924 BLAKE2B 8a666866e1c2fa2806c29ae6c6787cee7dd7bbb33ac8d2d99e9072d13f8fd0b1a98388de9f655b9f26bc43085269af402592d62c29dd1ff3f2e1564c2e8a4c39 SHA512 c0c164894497d871a3016ec8dc19e09142f5f77d194dfe27d9ad12043daf22df7abaacefaa2294e7355aab2d45fe7f578e80ff7df87af6dcc0c75e8128f885ca
diff --git a/dev-python/clang-python/clang-python-10.0.0.ebuild b/dev-python/clang-python/clang-python-10.0.0.ebuild
index 789c9ee28d9b..55385ff45617 100644
--- a/dev-python/clang-python/clang-python-10.0.0.ebuild
+++ b/dev-python/clang-python/clang-python-10.0.0.ebuild
@@ -13,7 +13,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/clang-python/clang-python-10.0.1_rc2.ebuild b/dev-python/clang-python/clang-python-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..6d7cb294e651
--- /dev/null
+++ b/dev-python/clang-python/clang-python-10.0.1_rc2.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..9} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/click-default-group/Manifest b/dev-python/click-default-group/Manifest
index 9c1385334520..f846a6d35219 100644
--- a/dev-python/click-default-group/Manifest
+++ b/dev-python/click-default-group/Manifest
@@ -1,3 +1,3 @@
 DIST click-default-group-1.2.2.tar.gz 4753 BLAKE2B 919e3921ef3c6723b92cab8433032237af4e5583084badb6cc53d82971d81aa910ae6553deefea2ac46067d2618bb8f6d2003f0b2c4ced04acc5b46588012614 SHA512 6f296d154813e0c3dbf8e435c4c1b4394f51a000320c5585aeb78b81f30fe15bd27a8aad0fdbb71fccb88dc3083682519f1dd06572c8d5c35639fb9c3acf73fa
-EBUILD click-default-group-1.2.2.ebuild 635 BLAKE2B 5aec16896106ba8504b1cf63758dffbc4b112443c62d2250acccaed1e6d6d5e69261733a66d032266f76f93882ac6a653db4a03110ceda9492775445a18ba618 SHA512 032c0a29d680bea4cb25d03e8bea65226d5e13ba5bc97959df5f668cbf6395fb24e2ba46a7cc38a9b69bc820c52d1aa8f4178c72c42fa527a92facc6eae06ff3
+EBUILD click-default-group-1.2.2.ebuild 633 BLAKE2B 24c424c7d01f29898d56be30b73cb2d3f650e265da80cd1e30a408bd9dab101550113f8cc216f785df3980e5adbf82bbd6ad0b4c4ec512219b32a86c99cfce58 SHA512 2d100365515cb45ee9f6f42eff4929db1ed628d5ea2626dfaa6ccd87cd914ef5543e15a54178bc71e791336ded19ebbfc07f77ca56f038bf552910a463636087
 MISC metadata.xml 322 BLAKE2B 8a78490ccdc4b51ba871eac8ca74b0e342ed41d8d91f8a4b7c0c824b6447be791604c71f1f59d5151686931a34160b5f5d1979b2760e4aa533b45033ce3d09c9 SHA512 c90048e0f2c412a4d44e289cada3350df7a74a8d87f09b1568085183a37fa6895163fa913f4a3917c34e314a81fedac06d8c24304b1cf619c3489275a2ef1417
diff --git a/dev-python/click-default-group/click-default-group-1.2.2.ebuild b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
index 53e65996a52e..edf62155eec3 100644
--- a/dev-python/click-default-group/click-default-group-1.2.2.ebuild
+++ b/dev-python/click-default-group/click-default-group-1.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/click-contrib/${PN}/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/click[${PYTHON_USEDEP}]"
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index 1523430f578b..11d3f889101c 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -4,6 +4,6 @@ DIST click-6.7.tar.gz 279019 BLAKE2B cc1e59d0a34ccb4ce50c8a2982b308d23cd525ceb44
 DIST click-7.0.tar.gz 289077 BLAKE2B 0e180eeb1d7d9da34c33f95398c2b53dce124317bd2777ad545c1d4b4f3a96da0e281fac46c8fe6446848f25f7b705d2348d3ab6f5786219b4214650424ab260 SHA512 7ed2bf677f4a56f120deb61318675679a8f09c152af618e8808d24a20cc8537b0691c18b0de2e25b814c59e34b47d6f4d71191856422fc3be206de7669d78f3a
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
 EBUILD click-6.7-r1.ebuild 1429 BLAKE2B 2c45c292df5a62a6db72be4210300eb6e599aa86f6df7add0f2f855490538c077940e45ef0b5f384b75340891aa5393732804c0e2d11fc05e89cc85780663956 SHA512 4a0a8b36db424d172d8f209c24047be29a8b48d94add0127b3adfaee7f91a7c56e9546cb2711f7871bd262b7d1add94624ed4e03c98c5bbab68ad10d0cc0e012
-EBUILD click-7.0-r1.ebuild 755 BLAKE2B 1f5891aca429c8c483c17e2c172e4a4488e60f89670ebcc869677f66b619431a2297c891ab002b2cb3d6beb2699a0bea4d3326472eeea05e6b9ff392df301a86 SHA512 bc0e051d5f7a6148ec909a974aabc2258b80ec8cac64fb52b0baf450e6554304bb114955959185ee0ebfd34514e92258a0c79be278561c4df62273a02cf05bb8
+EBUILD click-7.0-r1.ebuild 754 BLAKE2B 676d984143a33f3817f9e58a5aee811572cd4655b85654949ca9bd10ab77e9f2ea5cd903c989c66a34a4eb3ac0062e0fe3e44f0ba29ab616f7928f9e91dbfebe SHA512 296e06a3c9ab4886629b3ed196915ed576afdb9ce441012662338f9a842e98e21c71b20bbf60e56785e72d67b64ef436c3ca220096d5226cb6f6e3802d3fbcab
 EBUILD click-7.1.2.ebuild 762 BLAKE2B f26ed2d12cf90b5f5794b628c615653d0322529e4a3edb99a8672dde2a881519c5e12806c2b5c596e1a48f0ae77075958d50dffe9a67090e8aec09e2c127caa9 SHA512 0cdef45df4250458e81e5a6b690678b35af4e65b1ccd6b9bf1511cce20d65b8fb985922815ef4f89bd942f5a2d9f418ef3802422af3862301fb31245baf76ba6
 MISC metadata.xml 332 BLAKE2B a41bc7699360c666ce286a0d9a44779fab5afa6e6ce99efec2ee65a5d8d534bf3ccd65d4b23a2f5d40fc3b1c04c3c7e078a8889a3030909e7cc3992eabecfcb3 SHA512 de78734678a4bafe5175228f6df58210c65eaf016efec93e65441109b280725c4994406d0f21f2ee22ca0f9e1e27e27f76b3a1db724dbbd5b958fc8d8410126f
diff --git a/dev-python/click/click-7.0-r1.ebuild b/dev-python/click/click-7.0-r1.ebuild
index 4703f5476147..6f2551df5b41 100644
--- a/dev-python/click/click-7.0-r1.ebuild
+++ b/dev-python/click/click-7.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index 04613fb10f60..03655ebb72e4 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,5 +1,7 @@
 DIST cloudpickle-1.3.0.tar.gz 46220 BLAKE2B a7ff773a38aae3b4a404ba7e931de06756ce95d5e45e4c204ac7ed93a3d2e7171667aa1995434f249971b2774658d1766935a7d7d3675cd4c727180221adb299 SHA512 b128a9088b36460bf3cf4edf4876ea768291de3c10c9cb6919507c4493a808136edcb819a98eb69de610e7162a96f859bae2f5c5616b558d9fea102835df611f
 DIST cloudpickle-1.4.1.tar.gz 47459 BLAKE2B 642cac2244060ccde18c31f0047d5d957d69d396901ea31e04d28c5d7d55cd8f58fcf199054752f1a644667a5fd73a1ccc2e33b20bdfcbc4e71450aeeb832ce3 SHA512 3232dfdf91141179be510282a1fc60fa5891fffd1f012998c6a622957eabdf9deecc7431196ae70de01b2e498c97981c83ed22ac1ed6f3db8ba68ee0a9a26bd9
+DIST cloudpickle-1.5.0.tar.gz 50992 BLAKE2B 8536362d455c5688134ce22d0bb2c5786da17336c8a907e8cf9e39833df03a6061ac901e45e85907a54e8d9b404f21132d4d944adf925a9056f0334eaca50904 SHA512 75356e3e5ade2ee5941b4cea576f1ffbab5d9b1a86eff23dc9275974f592c947d0b3b29d335b4dc38be16e36c89c8fc65b2883ae90923960e605502c777d9816
 EBUILD cloudpickle-1.3.0.ebuild 784 BLAKE2B 9a57005675a0e09d52d7d789b40ece4b0dbb809845e63ba77a0e7b3e36e4842c53a6c0fbc4b62697ef726cd5040fe100175da26cdc3252eb761e94eb189e6219 SHA512 a464a28cd1bf0be663feff4a65b46a9a753d37e4dfffbe51a896e3c9737ec17fe7069b6994ce609d9c8bd874807b284e46b45481eba36c72c7327223518d97be
 EBUILD cloudpickle-1.4.1.ebuild 739 BLAKE2B b6eaf566b05b41b8b78bf03a2ef052425942b62bc03d12b4f8e7df83cd9783aaea8d3b81422630f5143de6c7af1d811a2309611d32b18bf915341844925a4821 SHA512 8a9ed92bdb11c01799ffa475aaa0dd5742a740357fd72dc630106860a2f1f9667be24d8c037a5cf51735848e70640a24bb84b8a48cf6f66de42616a836cdba38
+EBUILD cloudpickle-1.5.0.ebuild 800 BLAKE2B ad415d4fd2ea3aea1a8a0068e25a2b5c7b41a96e71599b99892222577f7b53fa112ef3ed1f41fc8c6d17632cd6123e8614b82b69bc977213b3d7b15dfb3171b7 SHA512 e18510a08be7ceb10878810ac7d3f263f8e17f0752617e8d65b60888509483db45ca112f2d7ca8a360693c5e98a9f8c9aae45f31a9721f07f5a5131f7c8a15d7
 MISC metadata.xml 324 BLAKE2B 1c37428b4d95b58077885d0a53a7f016566b0c1f3b6f6f1304f5f70c4ff3e175e4d4e2f5d1c940c7f231cd143f8592af96136fb303c47cd6762108fb393289b1 SHA512 2f331643b833ea7d97a6e24c21c6583e590204a38cb9ce77361ed7833e35e8c23dfc2b1b430d0e0cf2e45c0781b624f31deb4df6df8044b8dd34a5be16c3b3be
diff --git a/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild
new file mode 100644
index 000000000000..7d44be58f1b3
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-1.5.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="
+	https://pypi.org/project/cloudpickle/
+	https://github.com/cloudpipe/cloudpickle/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
+	# -s unbreaks some tests
+	# https://github.com/cloudpipe/cloudpickle/issues/252
+	pytest -svv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index ec020db2ad39..a3999ebd481e 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -3,11 +3,15 @@ AUX django-3.0.6-bashcomp.patch 2060 BLAKE2B 6bff228193b4cfe4f0f4c3d727146dffdb4
 DIST Django-2.2.11.tar.gz 9010479 BLAKE2B 9df126f62368c43a64fcdbf9d3831c78dd37e41eb88670517eeec84043083cc437d95301d86798b5945313b515d63bd12cba8484e74b6da2311af2e86ce87adc SHA512 b33ece4606e5a23626caee121018522166a0e1f32bd41ea4eb3d4c1f624943990a07e04c5a4f5d52958e733790178474e9314d346ce1e4d5d6e49ac2a700c857
 DIST Django-2.2.12.tar.gz 8877061 BLAKE2B 7d92e7f871606aaacc82528f3d7c26d134a7b1216ae983a8da93cde20eac65729eaea1de8d3a7a598df8f9f228c3d20a5da9cb53a149d1064c58824626fd8aaf SHA512 3c01b606e34dd0abe5a03bc55bf7d9328a0da370c22bac4d15c3468512b26ad57fd07d942a2a34129ce18bcc5e86c67e163d0f4d5b7ea47e3e899ba7617ab28c
 DIST Django-2.2.13.tar.gz 8879757 BLAKE2B 4a7986805c6a3674d47aa82b97f31ae63968dd7c0f12db672207cd1d97076acb681fe44e730147122911684b36d7f1e9d5ea18c054d4c40c68b460300fd9294b SHA512 6daf3486d2f19eb159193df77a7525e5173ba5889ad5c587a6ec6bbf02c4ea94fa90b9a30a5310932fc9353a22c413208ab724c05740f844eccfe610da3ca68a
+DIST Django-2.2.14.tar.gz 9022051 BLAKE2B 397f1de35f645da9964581d494d933ce2327915315049997aaed238f27214e4fead8c50e779052eafb3d237e065ef47f2d3f151552f712b6348ed23b75d25e52 SHA512 48ad065df161300920abe0c28c3f79cebe536de00fe60c8a7633caee149e0632aa564a848172bad0f254f2a98194cb625a5c169e51a89f3cab95c1213cfe485d
 DIST Django-3.0.6.tar.gz 9070990 BLAKE2B 9f918f64baecc5fe18ec08293da0f81a5e6ba9dc034b7e43f11ac9e67fa8d16c155878342babad9fca8ed30caf5ec3335756e2e0312c463b46a23b4db92fd4a0 SHA512 4c92c51386919c389037d6c6d1de3cb6ec443bd1f216f20797fb20fb24ea8d021701a03805ba693deadfa82b1aee38ae0d7fc03cae94cd744b1d1fa47ddc46ad
 DIST Django-3.0.7.tar.gz 8947502 BLAKE2B c26752f41f04f23ea1db9863d0919c17ed27b75133e22cc342e453e40077f05f6458f8edd290bfdcf828a181e38d89a1b4faeaa9cb44176ff0f7d67910d6b9df SHA512 566a78c3686baaea2ea8f2db2c1762a78ec5e5ae44f0be43f49c83899c2a0a9d1b2297a05ce8f4bc6bc580c494dde66bb2be47a8269cce3e1b007fedd857e5d3
+DIST Django-3.0.8.tar.gz 9080731 BLAKE2B b3276527c9c5eba18b380204c498ebd5724e5211640ead9e05284eb013f907ce6799125b29e2030bc37ecd5a1022e6eb3f193eca5e2c6520adef630d6d2114a9 SHA512 92d169fb37883355f1898fc13b54b6732ec14d71f77e4b91db30dd9bfb5df8b34c1c9566af6ddc37e00a9e3eadd38b6a51ff604a4da4285167f66b55215be301
 EBUILD django-2.2.11.ebuild 2344 BLAKE2B 124f5e9dd4fe7c19439ffa3f5586525499a1e02ebea738f2a515f2ee9c6a11efc909c56d556418a5a0a0f491c6c37d07c406576a69d012aea686c6d16047155f SHA512 629706bd162f4c45f80e4d37abe32d7ad99fb37ae34a25e76ea89776e7d3b76fc7ce80eaffbda2c48688d2f69f453ffef1c0a59e63ae4fb154b1f87709d8aeeb
-EBUILD django-2.2.12.ebuild 2358 BLAKE2B 14e5c853767cc003c733c94d58486c7371d93f961f34372296354ad89d023eeb6c8887aae4bb6b6c36da8ca42b232c749c2179bde0133821a031a92707dfe277 SHA512 701b220cd48ec6d3957cde5a57192553e0c158657fe94d26b5eb1d50a12c44ec8e5445e69f842c5f88ed2fa313872ee9a64d2c23448c8003f717d79afe094c39
+EBUILD django-2.2.12.ebuild 2357 BLAKE2B 42d33daa2c3ebf5c776f79617fb943a085f3f1965daf40033add0689634d25f16972cb5efb545416a3add02e7d13bc337e6a9de43a830a3670124dad93a4a8c5 SHA512 8627be383807f5820991ee57fca3aa3c213b13c751f57313e5148ab8eac1fed002b46bfdf5523b1e907f468202390b9854373e2522cba6be71f58b3be493ea56
 EBUILD django-2.2.13.ebuild 2357 BLAKE2B 42d33daa2c3ebf5c776f79617fb943a085f3f1965daf40033add0689634d25f16972cb5efb545416a3add02e7d13bc337e6a9de43a830a3670124dad93a4a8c5 SHA512 8627be383807f5820991ee57fca3aa3c213b13c751f57313e5148ab8eac1fed002b46bfdf5523b1e907f468202390b9854373e2522cba6be71f58b3be493ea56
-EBUILD django-3.0.6.ebuild 2348 BLAKE2B b4bf267890cc8ac02c653fb21ab7db9f63b8d3631a050244af1f561df91de9723f80319a7e72026330f2f3badf5b49e857c2ffd17f53408a2774a0d37d3f90f4 SHA512 79414bb07684ba02db7197e6f177b4986b4cabe647abdea46bca87d0a10ba4f6804547f36b1206c2515cb6e4211d60484fa1d5116a946cc84a92f111e54d8add
+EBUILD django-2.2.14.ebuild 2366 BLAKE2B 8796ccc566d580e69f6c12c663a7a34311f9cb11c3d9a9045c32396523c1c33e2a5c73aedf52e177bbf09526c0435533dc7ea8b85b6c3ab2cc5d41afd65b6023 SHA512 2733ecb9d91cba09b97a223c049d9f84b6bd228da4936177abc5dc3e0a50b97074071e120ac357c4c87f7d8893cd123d164f010d7a453ca18c96f253ccd56f2f
+EBUILD django-3.0.6.ebuild 2347 BLAKE2B fe755453ac26d0338267614611745d956bbd65f0d4128152be72ba38b708fa5fe905610fd2003cf8f3c8d578a29e5bf708cd72f3d5067244ca7d70c0b67a66d6 SHA512 b272418b4f2f349d41896408a257e55805f5d0cdfe427ac5a517314bda81828e15c53f10e1eb72fba83f7b4265b26d1cc779d38b737fcc44d94fbbf5b9f6e20e
 EBUILD django-3.0.7.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
+EBUILD django-3.0.8.ebuild 2347 BLAKE2B dc296dee8bdb25be233fd02b686e1b3e34d46055ef9194ec2a0c3cadb751fcbe05e17cdd2793233b7657b0cd01a593f3770b805c6fbb4af3514212bfb853ef7b SHA512 c2a32dc0e7c29d6eda9e106d1a1444034a7fe826a5e8dabe96e39d6c818ea28416fe88f73dbfb8d8738d9f1745339ed92fa967b91e5eb5b19fc0d753160d304b
 MISC metadata.xml 374 BLAKE2B 79d646d66b955dfbc419783bcfe7677f92472872292dbe726e55bf873d066be9365664e14ff1d190578b0294fe14dcee1c43e648bf2508cb2ceff4000b6002b8 SHA512 9aa0b388987c115e18e0aaa8747605e67fc8c8b5125d2a634dfae2ba8c6627963029fe913401a0647026adaa4d0037d91075a46d20f924f4d4f8d45bff195cff
diff --git a/dev-python/django/django-2.2.12.ebuild b/dev-python/django/django-2.2.12.ebuild
index 60543908ceab..5b85d6f488d8 100644
--- a/dev-python/django/django-2.2.12.ebuild
+++ b/dev-python/django/django-2.2.12.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-2.2.14.ebuild b/dev-python/django/django-2.2.14.ebuild
new file mode 100644
index 000000000000..f2f8b34c1441
--- /dev/null
+++ b/dev-python/django/django-2.2.14.ebuild
@@ -0,0 +1,78 @@
+# 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..8} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.0.6.ebuild b/dev-python/django/django-3.0.6.ebuild
index 68d6de70d162..7e80304959ab 100644
--- a/dev-python/django/django-3.0.6.ebuild
+++ b/dev-python/django/django-3.0.6.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/django/django-3.0.8.ebuild b/dev-python/django/django-3.0.8.ebuild
new file mode 100644
index 000000000000..fbc688b75cbc
--- /dev/null
+++ b/dev-python/django/django-3.0.8.ebuild
@@ -0,0 +1,79 @@
+# 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..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/asgiref[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 3f9258dc29ed..566cc8417e03 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,6 +1,8 @@
 AUX docker-py-4.2.0-fix_splitnport.patch 1662 BLAKE2B 3e29288b0cbe5c410ba8b9d338237d0b4cf54fd26524eb241b84806ae62ddf10d6d2f90872d949d4321d9b543575e5ac46df4faae54c561cf53724eeb5913e94 SHA512 ab9c780d7ed79370325e684c0358e196de72916605f343680398a9058ba115afb52ec6a69ad51da1b32389d2b90a7911b62097ca9523e946d671e82c8a799a91
 DIST docker-py-4.2.0.tar.gz 234304 BLAKE2B 385f7fbfaabd4732a2f3bb074094b9f286ee9c6a543432f9a15fc6a78a595f44e4ddebcb3037ff1df54cb4b8d6aec40d8961fb4f62710a0a3245eb886d830c80 SHA512 df5a450355f11d580568ebb0e80abc967df35f2ae10ce83c4ece85e4cf3e97d9cd15e5f14a2d9a43650a844d9402a8d97370f6e5f615c186b12968379e52fa38
 DIST docker-py-4.2.1.tar.gz 234562 BLAKE2B 4b554199f3675340602be27395e0194e827ad81dab48500bca0d4858c699e79ac5108f46eae09c3ac6ae1b580498fd5c78f026ecfd8549b938bb5c6e6cccbd94 SHA512 46ab02d4c247d41efa0ca75d3e13f8aef2d3fe4e6d8624c5a98a728f16c58d0dd8de742be710dc2b2f616dc2cc14a7a8796899e94a4b71a00554baeab105330f
+DIST docker-py-4.2.2.tar.gz 234729 BLAKE2B 06ebe27582ab6a8a61fdf655d01b01495724e03178c2b8291d38425f2678a3d1f826a836a5926ccf65b07c232fba38251cf8f0b1c644334d1b7611adb9d49e84 SHA512 d81f5a6d1cc15dd6d65e65c9e4f24fcae172ce41c8244e13c99adaad8627c9f0eece923d66108951b5e9aaa134e668f317481684b3c2bd51802321d1c4adbab1
 EBUILD docker-py-4.2.0-r1.ebuild 1228 BLAKE2B 074d94d5cb6378ca1d202286eca77dd0732a3e30cd41d667ecadd78468127ea9d78e77d1e32d09ad1825e54c3f3c3d023d09289315e20e576434600bee71dcdc SHA512 aeeee6eea4871077688298dbbd76a9fc92ada64fcb6f39eaea7de8d3b3e58526d0cc39cf5fe8c301ce31e40518f7feda618f2c70949c60b7c90dca14af4143a4
 EBUILD docker-py-4.2.1.ebuild 1111 BLAKE2B 524ab20e9b5e7e915a8735bce04b3b2bd89b8d60bcec67cbc808b2f4bb72bcc95a2546850fa70e0d2d1fd15bac1dd933f69488f0f52c9790cdf1ce84ac0a90ee SHA512 dbb866c7604480bde41981675fe1da3f3896b01d6d5928af923d84d7155245c785da4da45dd2607bc10c7389cf95ca0dd2f0079d44c4ce067feeeb8291a99f80
+EBUILD docker-py-4.2.2.ebuild 1111 BLAKE2B 524ab20e9b5e7e915a8735bce04b3b2bd89b8d60bcec67cbc808b2f4bb72bcc95a2546850fa70e0d2d1fd15bac1dd933f69488f0f52c9790cdf1ce84ac0a90ee SHA512 dbb866c7604480bde41981675fe1da3f3896b01d6d5928af923d84d7155245c785da4da45dd2607bc10c7389cf95ca0dd2f0079d44c4ce067feeeb8291a99f80
 MISC metadata.xml 398 BLAKE2B 40d5a5305a062cdb348ca447eb5f50ae9a0ca7a80c9460ac33af87bd78dcc552ba089f465294214cb4c0d9fcabed0f696875d47ba67e19ee14d3dbbc7c2e7dc5 SHA512 f991f94b167947549e0a2a152cd52e3fba6a95d54297559602b01a90e39ab6f675bba5d002994bd824cb6b284506aa3dad655461ef5f130f225ca13143e3eaa0
diff --git a/dev-python/docker-py/docker-py-4.2.2.ebuild b/dev-python/docker-py/docker-py-4.2.2.ebuild
new file mode 100644
index 000000000000..ec7b5cd81787
--- /dev/null
+++ b/dev-python/docker-py/docker-py-4.2.2.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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Docker"
+HOMEPAGE="https://github.com/docker/docker-py"
+SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	'dev-python/recommonmark' \
+	'>=dev-python/sphinx-1.4.6'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# localhost has a better chance of being in /etc/hosts
+	sed -e 's:socket[.]gethostname():"localhost":' \
+		-i tests/unit/api_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	pytest -vv tests/unit/ || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/editobj/Manifest b/dev-python/editobj/Manifest
deleted file mode 100644
index 77ca71d632bf..000000000000
--- a/dev-python/editobj/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST EditObj-0.5.7.tar.gz 39802 BLAKE2B ab1ddf8b393007fdf08fe379001d2a5ff5978e6269d020ac433880920457d9988f1d456a1cd936e2c1516d89034f4c43e8e2593bcd4224f840a8d8c843d94f77 SHA512 0b7603b00a09942d1ebd2b50203b698598b54a2334d5b69b638d5f4b0ff7273afeab5f4e0dbccc3eecc3349fc08dead1a6e056b858f419faecc7837a5af2df03
-EBUILD editobj-0.5.7-r2.ebuild 696 BLAKE2B 0847175d17d491e12e8b3b571276a8853c003e37dbeef04f1012f0b965a5b2b5ef0ee8497f377591a2e566bd777a81b30637f290758df3a345c386306e58f3f1 SHA512 768f6dec084c558c7c5b4f9c9c3981c665ef0551caddebc9a079e82b55f7a4f65cdeb63c26f7b790ae9792e767e7fa37c4e1084cf8ef554a12f4db67a3da7f0a
-MISC metadata.xml 413 BLAKE2B 3aaa4ea4c95124a738c644e68940b05b964155130c4230843dced16028ac772ffcedcba65ead709488a838a6f2a2e4a5bd0b4a7b18aab21c4b9fef4e1d1c71f5 SHA512 f8ddd93355d727bad3f2ff6df36b25fc72aff8214ebefbb3d718ceeed1842e5af47706409b5cf803290a4d6523c24ff4c831321af7062b48b8a05fab6728b5ee
diff --git a/dev-python/editobj/editobj-0.5.7-r2.ebuild b/dev-python/editobj/editobj-0.5.7-r2.ebuild
deleted file mode 100644
index 5b276b8b9da3..000000000000
--- a/dev-python/editobj/editobj-0.5.7-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="tk"
-
-inherit distutils-r1
-
-MY_P="${P/editobj/EditObj}"
-
-DESCRIPTION="EditObj can create a dialog box to edit ANY Python object"
-SRC_URI="http://download.gna.org/songwrite/${MY_P}.tar.gz"
-HOMEPAGE="http://home.gna.org/oomadness/en/editobj/index.html"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~ia64 ppc x86"
-SLOT="0"
-IUSE="+examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_install_all() {
-	if use examples; then
-		docinto examples
-		dodoc -r demo/.
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/editobj/metadata.xml b/dev-python/editobj/metadata.xml
deleted file mode 100644
index 0b1b7bdd558b..000000000000
--- a/dev-python/editobj/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>
-EditObj can create a dialog box to edit ANY Python object. It also
-includes a Tk tree widget, an event and a multiple undo-redo
-frameworks.
-</longdescription>
-</pkgmetadata>
diff --git a/dev-python/elasticsearch-curator/Manifest b/dev-python/elasticsearch-curator/Manifest
index da432360dcfa..351d9f5f3c38 100644
--- a/dev-python/elasticsearch-curator/Manifest
+++ b/dev-python/elasticsearch-curator/Manifest
@@ -1,5 +1,5 @@
 DIST elasticsearch-7.3.2-linux-x86_64.tar.gz 285050383 BLAKE2B 730d8550f5887facae3075ce3b0bdb96b49350782fe7e687b8f4477bb363ce7c1595f2b1ece2b7d59d18539886b6e4806f56b0f5674bc417528232a92f1c00a8 SHA512 08e89347797ec6f008fb76cda17ec3e0dbc553fc992d07f4944fd99d17d5bc934849d9e534724d1541432c9844d3da57d875bc08a0c4cd95ba4251e2b03f833b
 DIST elasticsearch-curator-5.8.1.tar.gz 231233 BLAKE2B d2369c18be69cc5c8e17a6d7a72660bd7165c349cdb06c740c8db9dd2b583f181a09ba7d53ee0f4692cb6e31d373274f0610f2a654ba4a6da2d0ca0ff22c7c97 SHA512 500767967f423629f34d42ee088a9c007e193216c42f5590364ffcacc9e1efeba65dd4d333f806250e3b7fe0bea8b5501d1e6f3bf6fb0b8c46a46954e92c4a65
-EBUILD elasticsearch-curator-5.8.1-r1.ebuild 5017 BLAKE2B db5eba6e650ab974d1d35dcd284a995cf86e7c844f51aa56cc8eb4cbce9a51360c2faeb5d065d492e95a3c221f2285b5943b23a98ad21c0960e74ce2947a7e5c SHA512 63bb279d44ecc43fdfe9aec29b9298ba4862725ae6d1210e198f8f3a1db3de38d3855b1f18ed023f13669a9b1b024215d3267e211473236bdf6201a78d7e569b
+EBUILD elasticsearch-curator-5.8.1-r1.ebuild 5016 BLAKE2B 5ec14b65a62887d4323c6999262a8c7fd5d378a548eb33acc5309d825183f033378fb4561f3cd2a12d4086931f8138be590ef819fb1b6c33500f9503e5d9f02f SHA512 ce1372e0b8045c464149aeaf1fa8e71db1bbf86a651d02b361819602cfe2a145bf94a55d651ca1727ce0a08d810c1fb2facfd250775b3affbdf149dabc983ae6
 EBUILD elasticsearch-curator-5.8.1.ebuild 4897 BLAKE2B e2bcd6433f815ec7941e68d7871d6655906eab4051f5a07244601904ecba7b926869326adeffc24852ba045a74a514e2e5bf57adb1e00ef2c54ee1bcd7ceb35f SHA512 b23d7730da40b55b84e160c5a98454c2b9e6a8c5218e5bf2bfd20117db5ab74fda450c697a1438525ebe15947b0df316090eab1cf92530791aae0579292197d8
 MISC metadata.xml 469 BLAKE2B 7c08e8c5ee97bee865afa27423349bf1998d868fea946d5d61b3eab77094a782d151677bac74f1b8c7ebbc4d88d323c3806251b463627994fcbda2a812524224 SHA512 38e98a77a6da51e077ac9a0dc77059276c58f56f8e26ca45a26df3ec16641dcb46ca9bccf85fd0dc9a358de1ac1424bfffd4cfc3d8213272ec6193663c89860e
diff --git a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r1.ebuild b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r1.ebuild
index 3807417be738..06dbb51b1e7b 100644
--- a/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r1.ebuild
+++ b/dev-python/elasticsearch-curator/elasticsearch-curator-5.8.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/elasticsearch/${MY_PN}/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 # tests fail in chroot
 # https://github.com/elastic/elasticsearch/issues/12018
 RESTRICT="test"
diff --git a/dev-python/fastparquet/Manifest b/dev-python/fastparquet/Manifest
deleted file mode 100644
index 6f68275a1b2a..000000000000
--- a/dev-python/fastparquet/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-DIST fastparquet-0.1.1.tar.gz 119573 BLAKE2B 16bd05061b64768278201acbf08fe13228d058b223d2050208b73e6af6ad3bb800a6d7edc1a15abdf02d8b508a75ed52962fb4b0c44a073b80451cfbf30915b5 SHA512 f8f052202ca095596870e6a10e2ab05e3c55289cd0ef3dab0502dff26052c9970f65f6b826d4d073c6c221827f6b18ddc83c47c04e84e08491f5237358f5860a
-DIST fastparquet-0.1.5.tar.gz 136350 BLAKE2B 2719a5da55c99ff6aa71792045f6622b7a1de81b6ec33804cfd36b0907cb44e68a7a5dcdec467c2e8c45790c062ca1d130fe3dc5c95e286bc437d449fa5211b0 SHA512 2d8f5375072125f68f086f316af87acf41e65479324828f7eeea244796311604425bbe53b9e2e67cc68b1eb89e390d9fbd5e201e5165aa22dd43604ac5441f27
-EBUILD fastparquet-0.1.1.ebuild 886 BLAKE2B 8fe71d69de1b4598711596978b405a292db0b453701b7664ff27d8755dcc8364dc89decf49a35743399fe1614297e3239a9bec064edd546deb2278b3f725b466 SHA512 d48572ed6c2a2bbb9ba803e20b26f8ecc8a436a77a3b823018d6a28ddd7caa0c5089d3e5f2259943c76de316a6a8c61f09bddc1cc5aafb10e08d8596e53020c7
-EBUILD fastparquet-0.1.5.ebuild 1239 BLAKE2B c31fa3125efac8cf9317cb0d1f860f9365e0e5b54c36d2b8efc61378c8b3ee386b83ab80d767c6d42b7852bbb589b75bf28448c2543c37f3e364fc89d2379902 SHA512 a6f2e0079d73c575b494b788b135088677099536f641b8c25e9e40edd48c9633a5553431ac9f1a71d723651998a055820746fb84f14fa81a0f8475ead83ed4e2
-MISC metadata.xml 892 BLAKE2B 959a41c003cc11f7309b421a3e86dffd5d64a88d220256f316712fd0d938befcc12904e0dae632f16cb4cc267894d0848a56d2b879cc4ce6f5c3cfe7b045b719 SHA512 30d0424dcd09b89804496aeed151d37d3791b42c83b1f66798051ede9c6b3c4963018f2a3cc621af817bf3b653fb53f1dce8f88dc7f7d23db5f8db586215b3dd
diff --git a/dev-python/fastparquet/fastparquet-0.1.1.ebuild b/dev-python/fastparquet/fastparquet-0.1.1.ebuild
deleted file mode 100644
index f5fed712ef60..000000000000
--- a/dev-python/fastparquet/fastparquet-0.1.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the parquet columnar file format"
-HOMEPAGE="https://github.com/dask/fastparquet"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="brotli lzo +snappy"
-
-RDEPEND="
-	dev-python/numba[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/thriftpy[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( app-arch/brotli[python,${PYTHON_USEDEP}] )
-	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
-	snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/fastparquet/fastparquet-0.1.5.ebuild b/dev-python/fastparquet/fastparquet-0.1.5.ebuild
deleted file mode 100644
index 460571dba349..000000000000
--- a/dev-python/fastparquet/fastparquet-0.1.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of the parquet columnar file format"
-HOMEPAGE="https://github.com/dask/fastparquet"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~amd64-linux ~x86-linux"
-IUSE="brotli lz4 lzo +snappy zstd"
-
-RDEPEND="
-	dev-python/numba[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/thrift[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	brotli? ( app-arch/brotli[python,${PYTHON_USEDEP}] )
-	lzo? ( dev-python/python-lzo[${PYTHON_USEDEP}] )
-	lz4? ( dev-python/lz4[${PYTHON_USEDEP}] )
-	snappy? ( dev-python/snappy[${PYTHON_USEDEP}] )
-	zstd? ( dev-python/zstandard[${PYTHON_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-"
-
-src_prepare() {
-	# this causes setuptool's sandbox violations, Portage should have
-	# taken care of this, so disable it
-	sed -i -e 's/setup_requires/disabled_setup_requires/' setup.py || die
-
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/fastparquet/metadata.xml b/dev-python/fastparquet/metadata.xml
deleted file mode 100644
index 09db6ed20735..000000000000
--- a/dev-python/fastparquet/metadata.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    fastparquet is a python implementation of the parquet format,
-    aiming integrate into python-based big data work-flows. Not all
-    parts of the parquet-format have been implemented yet or tested
-    e.g. see the Todos linked below. With that said, fastparquet is
-    capable of reading all the data files from the
-    parquet-compatability project.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">fastparquet</remote-id>
-    <remote-id type="github">dask/fastparquet</remote-id>
-  </upstream>
-  <use>
-    <flag name="brotli">Enable support for brotli compression</flag>    
-  </use>
-</pkgmetadata>
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index 09a123e3b5b2..fd5a17d0f891 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,3 +1,5 @@
 DIST flask-login-0.4.1.tar.gz 43679 BLAKE2B f30df1cc84289bc2dd1e59a30284d7152cee0731daf8b6e58b8203007c0ba74eb512bf9f2e41608d9656138038f5b5c752509ef5a203ef1e8bdba9182912b133 SHA512 c87a2948ac37439ddd76f3f11584bdd5910cb00e96a7400343cf4dadc5a0f9bc84d40bdc068d2e8c05bd5a510046e18473e9ad71502c5039a5f05b371ce9bb4c
+DIST flask-login-0.5.0.tar.gz 44961 BLAKE2B a780a3ca1ced7f01cbc1f99e3d92f57819c73982a4098330be7b9b4dce88e5fac577d15b2989b99971c4b2f7e6c9f02a54aeab9f7fa1c101f409cbdcfa3c6942 SHA512 8ffecd2a512738f81ec3901ad30d356b1d63355268f7cf1b427e463d0a271a4623723255e139bbd0f88845d73fa4aab051418b5f68aef0b4576c30294f6207b3
 EBUILD flask-login-0.4.1-r1.ebuild 1352 BLAKE2B 9dc724adc0f52fa28a76f79cf8d51ea56833529ef01d4a0593a33fa4a8840a34d99d7366f0a67e5d7b2f656f62ab4595da92c4da7c03ce75d80fa7996b3179a3 SHA512 f862b535f22dba61154148c837a043309223ec5067ecf89f4f35845f7f6dda756f4854d722dea6ba5e5ceb874dc940f0d41bd63c7f81b76ca78d604ac1a5a6ae
+EBUILD flask-login-0.5.0.ebuild 929 BLAKE2B c77ea08c700741b4e4123681094ebd79cdf9af40c54e334718002443a4f09030a6c1a8d74cc07da4085ccdc382e6796587811de3d431d690f3557afc3e02bdeb SHA512 6e82f306797ceeada47eb75a3b282374a0d703d204922ca4c59ddbd69afba1d811bc706e8c4c762cc3e84c5ad4880005c15cc9d0eeed338d790c2fa599c0341f
 MISC metadata.xml 379 BLAKE2B 0dd211944ab3c15c51198cfbd6a6bebfacbe3cc84c3f5bacb9d942c68ab1567399c5dac987bc8ba2e6c9a96eba063168689edd67563dec49946df346c38bc4cf SHA512 fdce43f3694a2e027fd12ca87bd0c964e243dac37a2d31a93c034cf7881097985402f9dc6ac45f02a157914705ddeb77965486506e94f67e0f868cb77a81f6fe
diff --git a/dev-python/flask-login/flask-login-0.5.0.ebuild b/dev-python/flask-login/flask-login-0.5.0.ebuild
new file mode 100644
index 000000000000..8e7912b379c7
--- /dev/null
+++ b/dev-python/flask-login/flask-login-0.5.0.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=( pypy3 python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Login session support for Flask"
+HOMEPAGE="https://pypi.org/project/Flask-Login/"
+# Should be replaced with the PyPi URI for the next release, if possible
+# See https://github.com/maxcountryman/flask-login/pull/393
+SRC_URI="https://github.com/maxcountryman/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/flask-0.10[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/blinker[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv -p no:httpbin || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/flask-mongoengine/Manifest b/dev-python/flask-mongoengine/Manifest
index b250ff6595cf..5f2ba33aeb3f 100644
--- a/dev-python/flask-mongoengine/Manifest
+++ b/dev-python/flask-mongoengine/Manifest
@@ -1,3 +1,5 @@
 DIST flask-mongoengine-0.9.3.tar.gz 111690 BLAKE2B f94f057bb416715d877154bb2816308324d3f0bb41dfe2002b80ed2f078ab2bffeb62fc7bd53344b7d995111122d0b59a09dfe7700975e151e61fe60f2bdad45 SHA512 15b8031e4f8a9275fa6a602aed8466533fc9e6eb408d8f3316fc8814cc785feeee59dae25f40c1c30371e7e33bcc8727bb866bd99dbee0dc75cf15049576fb3d
+DIST flask-mongoengine-0.9.5.gh.tar.gz 120281 BLAKE2B 454602e7e7f26db731379b01492c6cb1adf01369fd268236407c57753aeb68f17ce62d4c2e665e493d3c7c632e4f263af02b59e6580893afcc7b8659247fb42f SHA512 3588ae25e2f3643f5e240990f424b4f3754cea2f880b7b454c98afb3ea98fd81b783d74a45cf685fe59cfa8159b1ac39e840071f364ce98fb1a25cc9a09e0d5f
 EBUILD flask-mongoengine-0.9.3-r1.ebuild 1154 BLAKE2B 9e7bd0576d65e60b10d085708193c5d75cdcebc11acc1aa9f25659e33a5ea8e9bc8f713259eb9ecd126fddbdb2b475ef32102f2cc48d97d70b0adb82152e07fd SHA512 80f0a291e4945628b5dd7085c32a32df5aa31a136bfbb887f8ce30c0b54669f42e6ee78cb4551d08e5fdfd24f8cc56a148053692913ce2991f035963ad68f8bb
+EBUILD flask-mongoengine-0.9.5.ebuild 1113 BLAKE2B f75df16c8482477e8277a55ccc3f6fb75f9c946e5f5e1ff5d229ea4cce88575cb069d722eb24ebc817e1ef93cf46d500ef8f5fdd5ca64863791993e15f58c221 SHA512 c0f3fc48259708bc675ce48528add14c8c00330d05f5e80c003e4dbdbaf005feb55ba89b4a5b2a400af7d4d36073fa8b28c2d339a89c4316c389ef5b99d19e50
 MISC metadata.xml 330 BLAKE2B 590f7ce9feffc4646a100469830bd4db174302fe419eb50ebc227fa9e7ae543b4d2a2da0d74b333ee4ea9db3c54a2ec9858f9f3cad7e6e063a4609ba11d18f00 SHA512 02da72329c4df28bb5298edb25f2a79117214feda68a264f7885406e8b8a5287ebad89c31f110ef2a409e1d3ecca525155ff2b6a7b2d2ed798342f02224b8b66
diff --git a/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild b/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild
new file mode 100644
index 000000000000..b135ef5e0f36
--- /dev/null
+++ b/dev-python/flask-mongoengine/flask-mongoengine-0.9.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Flask support for MongoDB and with WTF model forms"
+HOMEPAGE="https://pypi.org/project/flask-mongoengine/"
+SRC_URI="
+	https://github.com/MongoEngine/flask-mongoengine/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: make it spawn a local mongodb instance
+RESTRICT="test"
+
+RDEPEND=">=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/mongoengine-0.7.10[${PYTHON_USEDEP}]
+	dev-python/flask-wtf[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests nose
+
+python_prepare_all() {
+	sed -i -e '/test_requirements/d' setup.py || die
+	sed -i -e '/rednose/d' setup.cfg || die
+
+	# TODO: investigate; new pymongo, wtforms?
+	sed -e 's:test_connection_default:_&:' \
+		-i tests/test_basic_app.py || die
+	sed -e 's:test_unique_with:_&:' \
+		-i tests/test_forms.py || die
+	sed -e 's:test_mongomock:_&:' \
+		-i tests/test_connection.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/flup/Manifest b/dev-python/flup/Manifest
index cc560381e90d..10befd5dadfb 100644
--- a/dev-python/flup/Manifest
+++ b/dev-python/flup/Manifest
@@ -1,3 +1,3 @@
 DIST flup-1.0.2.tar.gz 49051 BLAKE2B e3acb1c1a4028ed8eea5381c55d25f2cebb050a5ce9e18f74612d50453238338aa52b268059581a56438a1a0e42ecaaa0d747bc3bc2779ec0646daf1df3ce02c SHA512 65c610f9ddc3df6ed6deb6753b2b15ce4f4579efd9dfd25166d3b6803e5d7058fee6617388c9c67c39f7db54da5c918181dcbddfbb7be4a78cf8b65501af4c4a
-EBUILD flup-1.0.2-r1.ebuild 534 BLAKE2B b899c4c68f4d10a1a65acf441115a92f10a50b26fb057b6c61057dd371fe4047864bbc45d853da4f34e32ade806b05ebbe7bed380051ea261e4ab7a9888392b7 SHA512 29d992bf5fff6f58c7e491e47485457ec5cdceb2a7e06fa264d8790e4ade1ab5e1305e4ddff35818287cb76ae757af5f6bda358c6c3a902310111ea143091ed8
+EBUILD flup-1.0.2-r1.ebuild 533 BLAKE2B 7a7be9c4aa76c5e22711676eca1bc32f706d7159620684767f200edf722c45cdfe5cdd403f13dd3f23c145f2bc3686736eed4afebc57613b13a348f8c0fc6d93 SHA512 8a360dd821003e639443813372882fe544958b10ab55f372db3440f32570d1a46e67f5fbaa6a64408e579abb94ce7612ef5a3f327982c61bf1d75ab03294d704
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/flup/flup-1.0.2-r1.ebuild b/dev-python/flup/flup-1.0.2-r1.ebuild
index 91a82030c391..858d8de998e9 100644
--- a/dev-python/flup/flup-1.0.2-r1.ebuild
+++ b/dev-python/flup/flup-1.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.saddi.com/software/${PN}/dist/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/frozen-flask/Manifest b/dev-python/frozen-flask/Manifest
index a6329a758193..3021d6a5f8ed 100644
--- a/dev-python/frozen-flask/Manifest
+++ b/dev-python/frozen-flask/Manifest
@@ -1,3 +1,3 @@
 DIST Frozen-Flask-0.15.tar.gz 477516 BLAKE2B 1f9ecc59cabc547f7c4358c5fbbde0c57264a6c8e45bcf567c00f5c20eef288b8d261edf878e1295ef702d863c16dd605b59982abfe4daf9f073b29787b01921 SHA512 8cb80ccb5018abdaaf53a43c219504d57f2630af3d8d5c7bd6bee44c7cf483f50530bc00ff49fd674d54c0e1f6a5e0caa004bff04e95dec7f58a8bb443a36241
-EBUILD frozen-flask-0.15.ebuild 1019 BLAKE2B f3e181c747bf187aed048b5d85c881adf7588a325447011c75023d447dcfadcda9422caf1187b283ba0ce428f2dd83ac61f70b6036d459e7ec9fd05b89a53e50 SHA512 c18fbc65440234b4d5441707d1a94152b49a381f3842860f76fe3e085179ce75396373d16a11902d4b1d102e93b9e247066b207ecfe66ffcb7cabf144680c2cd
-MISC metadata.xml 390 BLAKE2B 596dd147a24653b5cace2a55534505dd497afe299a31962db838e5b9333e84a6cc28f5b933886b78f4cf082b17430cbf0cb5131350da1bce501ff2a9acc85d2a SHA512 d8c13cff6277121723990211a23849cedef64a6571ec745233d65ee8fd11f9e3499436a9ca7fd2f98ff47f65de0147a7df870ff23455fcdbc684ae7c6bda0857
+EBUILD frozen-flask-0.15.ebuild 1021 BLAKE2B 82e285c96f720b3137f30dcce88e2588d6c9c28113230ca9e3dcdfd0a6fc0d58df3e7e7c33deceaef20350c5bca9e9192ab37f47f0eee05f5c676fda3d43d327 SHA512 12cd13bdbd5f07f4423181f47251a83c1870d8f7d83a8bee91e5872a5d3e9849bb3bf85f182ee695f020ef49bdf4278a3f1d90a8f19eb4c491d54463ff689ad9
+MISC metadata.xml 392 BLAKE2B 556a70b7cc4ad351b7bbea9b531e6bca52f954e09b4c5846a14ea9be59760a2915f6e6e62c3206987789948e4cb5055ddf2ad24bd54d6bbcea7863c037f7c50c SHA512 e5e9532f9339c004a62d717717381eecf0dc858114295feae3461a77db767a8354d2e6ede388e5b98cb695f1407b150bc282eddbd5f17d076b371f3ed452bca3
diff --git a/dev-python/frozen-flask/frozen-flask-0.15.ebuild b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
index 7c56458ab8b6..bf4745f067cd 100644
--- a/dev-python/frozen-flask/frozen-flask-0.15.ebuild
+++ b/dev-python/frozen-flask/frozen-flask-0.15.ebuild
@@ -10,7 +10,7 @@ MY_PN="Frozen-Flask"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Freezes a Flask application into a set of static files"
-HOMEPAGE="https://github.com/SimonSapin/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
+HOMEPAGE="https://github.com/Frozen-Flask/Frozen-Flask https://pypi.org/project/Frozen-Flask/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/frozen-flask/metadata.xml b/dev-python/frozen-flask/metadata.xml
index d142ed38f2cd..7a2661fc5876 100644
--- a/dev-python/frozen-flask/metadata.xml
+++ b/dev-python/frozen-flask/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">Frozen-Flask</remote-id>
-    <remote-id type="github">SimonSapin/Frozen-Flask</remote-id>
+    <remote-id type="github">Frozen-Flask/Frozen-Flask</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index d68d4c2fba67..1b772f141e1f 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -3,9 +3,9 @@ DIST gevent-20.5.1.tar.gz 5566653 BLAKE2B 1d9a474681573ec2e9d3c0d40fbae8a91b8cfb
 DIST gevent-20.5.2.tar.gz 5567755 BLAKE2B 9cac45f92c7c1841cca4eb52a54f71406beb3e83136170610bba326a32722de3c5ebd3b777a45b73ab5e1012eb0dc49d861b042bab0c6194e61f44e6011ede2e SHA512 24f00a599f26d673947f0ed5582f8b55d1b214677578d7c5c2f8d8c106f89a98951db523597c470bcd788de9f6b7abcd3f25f7aff27788227f6d8c7ca7c183c1
 DIST gevent-20.6.0.tar.gz 5803237 BLAKE2B 97b988964ef80fcc1c3238718b6802016fb46742c94e7e56b5196139181ff82ce60816e0a8ccc5c3e1c3b73ec11cc705884b5ac5524dbd5116dc0d8722ccc7a4 SHA512 28ee030934d3c379577c9f86b76838e5d76c7ea7c0880cdeac9dc5ead497ae0600fb02b2984c7312fd42319142200c674b75da2e93b58fd4a99882d601a95108
 DIST gevent-20.6.1.tar.gz 5806150 BLAKE2B fb75e440f31ad2952d1395780a66ee673c55e62b635a2c6757efe9706c404d126c38a613ac08cd088900c0b10913fe9ce9d57cec8a7cb252ae87912142cfafce SHA512 b7ceb5251b01972a11e3d51e1ebcaaca7c08d36b6ba7b138bee57f0d5da4553539a0ad538e8a433321bdac396788acbfb0ac294191e829df3f066d00816310bb
-EBUILD gevent-1.4.0.ebuild 1714 BLAKE2B 004653a06d92f0668aaca427663197f4839c0c9fd5b0bc11e55e873215d26a3699205f91e8e71189ee40a7264867ad4deeb6e3b7d985a64a9f8b5dfa7ebb0e8d SHA512 66fb5a52bf63c00b39f071b3407ca179f41ae8e3180bac96133e2bd836dbe3c7c19d5b4db6ed27aba8dba339cbbb34daee526e1db286f7d00fbc465af7cce37c
-EBUILD gevent-20.5.1.ebuild 2277 BLAKE2B 172fe82a89a3e3c1f36f66f2c4ee88f173071acb56e57542fb5da5ae24e92911dd52b6d7e0e3ce060acb47238fc4ab55edf81c365334760bc44887331594f77a SHA512 a93d813e7dc7ef05cb3b802f0bbff8853068c3cd962b399cd7013e24c2c40a6c5ac4d68797f2001334d446c6de1355616eb15032a1c3b406c2393cb8f6361873
-EBUILD gevent-20.5.2.ebuild 2299 BLAKE2B 4b5cd18ecc84a9e8c52459a14121a021e831e9f22d74efeb00d21cb23cf1071638cbe125cadef8cd339d421512ef17b36b2a28f1d03df18e7013db71ef53d6db SHA512 e4144cf9cd0fc2863663c089408f3c3f223cf0663dc854c677c7585052716b5829ba76cfcf72a208832aede39369b356e0a0141f59343565c24dd36ba8ab1205
-EBUILD gevent-20.6.0.ebuild 2299 BLAKE2B 4b5cd18ecc84a9e8c52459a14121a021e831e9f22d74efeb00d21cb23cf1071638cbe125cadef8cd339d421512ef17b36b2a28f1d03df18e7013db71ef53d6db SHA512 e4144cf9cd0fc2863663c089408f3c3f223cf0663dc854c677c7585052716b5829ba76cfcf72a208832aede39369b356e0a0141f59343565c24dd36ba8ab1205
-EBUILD gevent-20.6.1.ebuild 2299 BLAKE2B 4b5cd18ecc84a9e8c52459a14121a021e831e9f22d74efeb00d21cb23cf1071638cbe125cadef8cd339d421512ef17b36b2a28f1d03df18e7013db71ef53d6db SHA512 e4144cf9cd0fc2863663c089408f3c3f223cf0663dc854c677c7585052716b5829ba76cfcf72a208832aede39369b356e0a0141f59343565c24dd36ba8ab1205
+EBUILD gevent-1.4.0.ebuild 1719 BLAKE2B f933f4b4d229f0b8db7a02babee639ce18b9a44f9390b2ded21b0ba6ec13ba1c13baa2a412ea50ec10bff84822a839ad711dea20bca3fd9e821e7d6a057d6569 SHA512 b28a51f9be4ae39bcd8b41e30adc5b5cfdb959758f6437c5dfa017588730bc50fbb8205552edd5de7b90792da021a55b92d3ed027ed7181f5467e3dc62f257eb
+EBUILD gevent-20.5.1.ebuild 2282 BLAKE2B f52fc8d73a974b29cab3b1d356ab9f90c8f00179fbbe14b4837fc93310ca8a5f62cc6c2d999c506fc1f1ce8a6e0e285a519f5cbc0ae59c8c34bf9a01c2450695 SHA512 aad4f67e2f49b2f887328f74f0d6d12e8d0fa79e3f2c934c1cd721aa706e903ada017f2352297b0259ecee9ee6564d3e1337053d9a942e47b84233d1d54e3110
+EBUILD gevent-20.5.2.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
+EBUILD gevent-20.6.0.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
+EBUILD gevent-20.6.1.ebuild 2304 BLAKE2B f2b330589cdbe511c08100a4628db73db079b34e73eec44491beb21133179ba6220310b8cd6b1d77f299bd781574081f1be9596fdd072a78d6f81d0d01eafe70 SHA512 b58d012753b4de9dfcadf74977f7f1988c01c32f498323e09377602fa0745c54d1ad2f2dfe0759f3dd54e5b4a900db66d5036f684ef8a459c0de0c545347dec5
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-1.4.0.ebuild b/dev-python/gevent/gevent-1.4.0.ebuild
index 51c761bd8a9e..3f87f8d3fe59 100644
--- a/dev-python/gevent/gevent-1.4.0.ebuild
+++ b/dev-python/gevent/gevent-1.4.0.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gevent/gevent-20.5.1.ebuild b/dev-python/gevent/gevent-20.5.1.ebuild
index faeb72ae729f..9c22b6bec13b 100644
--- a/dev-python/gevent/gevent-20.5.1.ebuild
+++ b/dev-python/gevent/gevent-20.5.1.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gevent/gevent-20.5.2.ebuild b/dev-python/gevent/gevent-20.5.2.ebuild
index 0ada47ba7720..1448d3df4c13 100644
--- a/dev-python/gevent/gevent-20.5.2.ebuild
+++ b/dev-python/gevent/gevent-20.5.2.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gevent/gevent-20.6.0.ebuild b/dev-python/gevent/gevent-20.6.0.ebuild
index 0ada47ba7720..1448d3df4c13 100644
--- a/dev-python/gevent/gevent-20.6.0.ebuild
+++ b/dev-python/gevent/gevent-20.6.0.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/gevent/gevent-20.6.1.ebuild b/dev-python/gevent/gevent-20.6.1.ebuild
index 0ada47ba7720..1448d3df4c13 100644
--- a/dev-python/gevent/gevent-20.6.1.ebuild
+++ b/dev-python/gevent/gevent-20.6.1.ebuild
@@ -10,7 +10,7 @@ PYTHON_REQ_USE="ssl(+),threads(+)"
 inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Coroutine-based network library"
-HOMEPAGE="http://gevent.org/ https://pypi.org/project/gevent/"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 8c41181f9789..c0a91bd6dd25 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,5 +1,7 @@
 DIST geventhttpclient-1.3.1.tar.gz 82598 BLAKE2B 5fef20a74c431ed53be4eedb3ec7e040572ad960363d41dda8b93c8f08f3eb05ba6160676c1c3ed957d1528a12aa297400063377f3788754e9e76401bb3421ae SHA512 a50486e1485c449a821176f0aa139cb05a3c7675fb045086e086cc7bb71d6e1d75191fae6972b381e7e69dba89d23c387464503845badd29fa361e03aa866079
 DIST geventhttpclient-1.4.2.tar.gz 57535 BLAKE2B f3c17140698b1609d9953110790fb536d982782c60165c717b6cee290c0b8fa5ae99cd6935401b6b617f0bd021783dd3f836c7cff775f513b9084714da1575a7 SHA512 3252d27f07a4642ba34d449664f50451b2ca4e44dc508345133d21acf659251a66be72784bacd312c074de4025dd5e080bdf35c84d9f7d40057132184a4d285d
+DIST geventhttpclient-1.4.3.tar.gz 57541 BLAKE2B 6b28cba862eb01bb1a298c2e228eac4f4bfbf91cd138d0e77f54a91184672f089d3233b7287940b3892fd7e732c924612044abba0704054112f8c0563d9ed741 SHA512 1360a95d367b3bbf03294be916f70f8c2e655b77180a7ff44e67a40508584500e4a0017416639c0a90a974fe53cc7895dc9c3f7bf43d3a34fc4484f804793c21
 EBUILD geventhttpclient-1.3.1-r1.ebuild 1470 BLAKE2B 5c08f4e43d28890245194350a1eff9113c46b37a803510f927388c4467ee9265be75938012b1e84a581cecba909ca1e28ac09f3a982592e1566e8bb5a188d003 SHA512 84a7f80f7c5565ef21992fa8e16eeba1ca9be28cf49a3b6e8dcf281656cc23a6ecd6c9bd7199a174fe3f7ab48e66697785b87a5426cc11f82826a78a0da05759
 EBUILD geventhttpclient-1.4.2.ebuild 1531 BLAKE2B dfa676277ca7a529ae91c206f8de6438c6f9729a3e65086122adeb980f0e266d488659628e00a931f7e02b2a70b9a9141e5414a3def5a7ca426fd4af4933ad1e SHA512 c82c31c24b40299e3a4e2c395480e87fef085f6f8f317ca85ae2a5bbca8b255fc69cfddb53105fbac653383d4c75d10fc310bced6448a1dfd2fc9aa3e89e4e2a
+EBUILD geventhttpclient-1.4.3.ebuild 1533 BLAKE2B 821b0e96daf6a106197d6a75409c2766c15d7c0110fcef7aae35a4a0bf9c043a96eaa6802514190858b98f7f8009e860b2f479e5b0f0c6ae301e79c8676c1667 SHA512 a67326b5ea5ac6cc4d1e31dfa616c6e4b092d536c21fa147d76fd36b8ca9e3c121a1d6f12d9dca0b349f5cce5cc083c0d7b64435283c34b2a4d972c258d7aa16
 MISC metadata.xml 454 BLAKE2B c0c62b4bcb9e480cdbc6739010039421f139999d7df9673d260ee2365073a108479892dce53e86e1f8ec721c9a33d3967bd41e468994331970a583189aa8c0fa SHA512 1739f134e47ed32c68fce16d76684f6c2393f1e25fe0b098499b1362379cca9b7522950ef77afd9d8e063e1e0335e50dc3cd44192d91ef01adfae68c02fd9d96
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.3.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.3.ebuild
new file mode 100644
index 000000000000..4d3f4094b52b
--- /dev/null
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.3.ebuild
@@ -0,0 +1,50 @@
+# 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,9}} )
+
+inherit distutils-r1
+
+DESCRIPTION="A high performance, concurrent HTTP client library for Python using gevent"
+HOMEPAGE="https://github.com/gwik/geventhttpclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/certifi[${PYTHON_USEDEP}]
+	dev-python/gevent[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	# Skip SNI tests which require dpkt
+	sed -i '/^import dpkt.ssl/d' src/geventhttpclient/tests/test_ssl.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local skipped_tests=(
+		# Require dpkt
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_host_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_implicit_sni_from_header_in_ssl
+		src/geventhttpclient/tests/test_ssl.py::test_explicit_sni_in_ssl
+	)
+	# Append to sys.path to avoid ImportError
+	# https://bugs.gentoo.org/667758
+	# Skip tests which require internet access
+	pytest --import-mode=append -vv ${skipped_tests[@]/#/--deselect } \
+		-m "not online" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/gql/Manifest b/dev-python/gql/Manifest
deleted file mode 100644
index c72b94a45682..000000000000
--- a/dev-python/gql/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST gql-0.1.0.tar.gz 3925 BLAKE2B b463235b5c9b6af8be77340d219a60e5886389fc18e066995a56d1ae80079a8de80336ae56d068c403d62f994d17cdddcf4191b0884ae971cecd23c5d17dc66d SHA512 23e35587a61e982a017260525ba9bd5d78a006eb35aae3d1cf48ba92fe954eaf14194e8f19e99813f44386b2440cda7701c85618043514a0f75101654c9145d2
-EBUILD gql-0.1.0.ebuild 646 BLAKE2B 92a4b7e06c365903a8986e32995478e11866c7a24d1187a8110c951a70f0c92efa2cf0d868077e0b0e07e8a14eb1143d5b65626ab6b0ba5f4d22853efa17158a SHA512 bbebfed6a9e544d42dcf32b180fe85c6354a88af298fcc560ef1c4489a3a5cae8eff229f1b7b073b8b63693a4007303290dcc65cfd46d336fb641a868254ad01
-MISC metadata.xml 328 BLAKE2B 1aba0861a5311a449a387615db179898725d66ddfbd75e4cbb28ef6245d54373c6eb413cdf2b5f36a708c6db697b4d761ca961f44e58e8f8579cdcafb1e4b546 SHA512 065fcfa59f0f5bc7e5beb66b531255219a4753b92105f9d9d343238c883d1386497cfbc5bf7ba1c295c7b348dfe1ce4ef616f69e250f464fb8d214aa07921fe2
diff --git a/dev-python/gql/gql-0.1.0.ebuild b/dev-python/gql/gql-0.1.0.ebuild
deleted file mode 100644
index 95b959caa927..000000000000
--- a/dev-python/gql/gql-0.1.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-inherit distutils-r1
-
-DESCRIPTION="GraphQL client for Python."
-HOMEPAGE="https://pypi.org/project/gql/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/graphql-core-0.5.0[${PYTHON_USEDEP}]
-	>=dev-python/promises-2.1[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/pytest-2.7.2[${PYTHON_USEDEP}]
-	)
-"
diff --git a/dev-python/gql/metadata.xml b/dev-python/gql/metadata.xml
deleted file mode 100644
index b1c183a89191..000000000000
--- a/dev-python/gql/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>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">gql</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/graphql-core/Manifest b/dev-python/graphql-core/Manifest
deleted file mode 100644
index 195d9324db61..000000000000
--- a/dev-python/graphql-core/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST graphql-core-2.0.0.tar.gz 156989 BLAKE2B 8ff0d64322966dd5fadfeff586a73db770f02337f899c7326ea6e584c093ecc237624f116d31983960ed4683dd53b6813ad99ab1173857e828de98f35eaf1f74 SHA512 caaf1a32550a671048224f37f75ed2a374290d763f9594a5f0bcd102b54f4cbc491005bae102d648c6dfaa052b5bd06f939f8638d6c895d5c133710dc2b0ce67
-EBUILD graphql-core-2.0.0.ebuild 891 BLAKE2B 3afb50790dfb618679ab372ad59b7ca8b2932615c6b6fd2b5e46a94dd17b6988b9d38141983147a5ce7163282049b676001557e1dbcd545162bc503ded338717 SHA512 d29a222f465855d8ac330b4577e6b1b565618c92f382342a4ef904d94a92bafb4d5a0e3f47b85cfeb6bc04cedb53f231705ea2c8fcac7a7e8454e8de47aff272
-MISC metadata.xml 337 BLAKE2B ef6b015336e3997873eced370a205310ba3b98a9607c7f22497f3348a96dd3c2c0e404ef09ccf0106eafebc69012efc5d64a2384ca0c4fc42702c42d3947d313 SHA512 93e093015e1cf58ae9f19c625eee6f89186a91b35eae980edd70e6742c80f08e5f1c7ba9f8cd5f282ec88f13655e4baf7506e8bb990ee12cd0750bfec01ff0f1
diff --git a/dev-python/graphql-core/graphql-core-2.0.0.ebuild b/dev-python/graphql-core/graphql-core-2.0.0.ebuild
deleted file mode 100644
index 5cb4a2d3cf14..000000000000
--- a/dev-python/graphql-core/graphql-core-2.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="GraphQL for Python"
-HOMEPAGE="https://github.com/graphql-python/graphql-core"
-SRC_URI="https://github.com/graphql-python/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/promises-2.1[${PYTHON_USEDEP}]
-	>=dev-python/Rx-1.6.0[${PYTHON_USEDEP}]
-"
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-RESTRICT="test"
-# Add these to test when we have them in the tree
-#	test? (
-#		=dev-python/pytest-3.0.2
-#		=dev-python/pytest-django-2.9.1
-#		=dev-python/pytest-cov-2.3.1
-#		dev-python/coveralls
-#		=dev-python/gevent-1.1-rc1
-#		=dev-python/pytest-benchmark-3.0.0
-#		=dev-python/pytest-mock-1.2
-#	)
diff --git a/dev-python/graphql-core/metadata.xml b/dev-python/graphql-core/metadata.xml
deleted file mode 100644
index 5057a52be361..000000000000
--- a/dev-python/graphql-core/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>blueness@gentoo.org</email>
-    <name>Anthony G. Basile</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">graphql-core</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 4c1d4451274e..ab0618a4c7d6 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -2,5 +2,5 @@ AUX 1.16.2-python3.8.patch 1400 BLAKE2B 67e870a837f8fe2a2b7a5cc38ed0528a1afc5603
 DIST gst-python-1.14.1.tar.xz 405312 BLAKE2B 29be6f79b20a27e0d21f27cbf29b1881216e412c3c4ea016f3ee6bd921ec7b73139f74a20528f7f704526786347b065d246940f152d61a64e4eb926dbb44bb87 SHA512 32537e6556b69d00cb0b467239c148c0b9c282b76786be395e053a30554b84aea7c22e7fe6fc6faf77b35fca82fb799df4f52c114b282d0a6ea660f67dc40c53
 DIST gst-python-1.16.2.tar.xz 414912 BLAKE2B 016e59fc7d29047dcf49901d4ccb1ff2e96950dc723cd7e9dd31e0fe92257e881ced1c93e7e4e531320be8fb9d6cb8382d2c31e460448d5d630ec7c8a0378024 SHA512 c274591cb820a2576ca236de0d1a2c2c53a9db11afc689e0385afe3d38fadc59c9230d65198e79e4059abb90c0e5b6d71f1ee4cf1439d92feaaffd2ab5cd3a23
 EBUILD gst-python-1.14.1-r1.ebuild 1747 BLAKE2B 3c562186e3f902f20a05fb3e3dba066481ba7dbca29c727544188a4b478edc7e0a5f24de9b5e1ecdad1d886eaecf58b408985d85c272effce77b7bae1ea7d201 SHA512 ff68669724389d6e7ba1f93b44f5ab7487950b1ae26fd1bef6c9f923dbeed1de4902458112e80827c56d66d7522aed5da1f8ed2acb34a7d9898e7f52ea5686d3
-EBUILD gst-python-1.16.2.ebuild 1615 BLAKE2B 2e9ce0f435b47537d2b09d4775d1af501cb281d1492e7fc72b127c96b2a13d93e22dfe6a83340a4c108586b8ae8f50961ab7d96840c1f19af57566a417e9d5b2 SHA512 e466fbe838b709abdeda2ab586a3c8fc281f7e2dcc726b56177d72511843e4f40968fafb5ca8461d2051e25e9e0b33d0e0081d5b66b9cae756b1cc979a414ef6
+EBUILD gst-python-1.16.2.ebuild 1614 BLAKE2B 0e1e37893bed984116855d85a2d4b3f6d2550b49603f1afc25218f85b77ccbc0d68086a56a6119f932efdccba3c81f11c99218f28bc29ccdf453b14b837f99fd SHA512 2cb8ac7c357b5966a6970902cea3fcc9f2bb4bf1ac8327ca39a480e4a7356ec44aa2b482aa3c7d1204933c981c6a4743591fac3ed4dbf44ae2ae4d39e324963c
 MISC metadata.xml 272 BLAKE2B b1575d88177572e472e66c7cce4fb4c0d98aeb02edb03e800c2b2f2702b5c81c6c012c264655fce8c3170e44bfa117c81b85cdbb9f409714ab216c7a6f2b4482 SHA512 7dffa3bd729f24f9081f6b1c3db474cb26c54e95752a37140c5a9836299f26b3d0aa73e7c448e6b773478cb0112eaaf70f783d2b2f3d2868b1a2def8e6a9b8ea
diff --git a/dev-python/gst-python/gst-python-1.16.2.ebuild b/dev-python/gst-python/gst-python-1.16.2.ebuild
index 34902abc4db6..f0bc9e15d221 100644
--- a/dev-python/gst-python/gst-python-1.16.2.ebuild
+++ b/dev-python/gst-python/gst-python-1.16.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2+"
 SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index f71bb86c08c4..d95e9bedbe07 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -11,17 +11,19 @@ DIST hypothesis-python-5.16.3.tar.gz 9011952 BLAKE2B d74a68c4ee1e5aacf4be1da5a46
 DIST hypothesis-python-5.18.0.tar.gz 9013356 BLAKE2B 3863414e54e40ac5f2a45edbb57fbee058e82f04cbde9eadb99ed6b03a2a2684777b46eabdbe136aea74b835e343485d80cfe98c263afa537c7437e7566f796f SHA512 b1a1f37f1f58a6401a31f32ef0e7de452b8a8bd71fe5aeb72eeac197a23b78c3ff17b61f7940e2a2a755f7f008f0ea3df5b0f2ad5e4c0d2d316bf13dbd7cbdaf
 DIST hypothesis-python-5.18.1.tar.gz 9013452 BLAKE2B a513c19a19b3ff49c78d97839dea7d857d9a00f7d42e5e0376cd6fec9ff9a86f9b6b9471da474ec7724e41254105c0ac65fc7d772f01bfc40f6deda200f11629 SHA512 19455699ed50d30767edc5627f797992f2542aeb3ca9e38603a68ffe1108f0287baa183e4dca101f21eaea6c7c7501e135b5baf9e09117a2cae92ec1e437e8b5
 DIST hypothesis-python-5.18.3.tar.gz 9017453 BLAKE2B 85356e723fca66853e388a4a3e791dd4b1cfb80b7a4b62363a4f0d0aeffc44c051eeabd516eebd5737a96050edef978a87788c1141f87aa2e310eda9bf64a0a7 SHA512 baeb4644a90fd8694d88819a46ba1ea6c60ad13e00f07cb923a3d0f43cd4b4d61bd07bf25e45e6d1203f9db44fbe8ec7eca7e029c804659025df89a80520e550
+DIST hypothesis-python-5.19.0.tar.gz 9022213 BLAKE2B d8996cfd18d24722cd4faaf8335ce2b1c67757e3ffe973a33bd8ad087fcde513442d9fdf01f486ee07b33504e4088aa9e4c104782c3b03aa4f0d77a99ba6f672 SHA512 c26b0c9c5c7e1941c7f491e8e8165fda86a6e985204b9098c214080e508167f77f7dffe65192a4418f4958c3c6df44a20d75131895517c40c1113995ace3b604
 EBUILD hypothesis-4.50.8.ebuild 1712 BLAKE2B 95c6f8df5214b00e6c9be409c708e756024fd76ec0f56da54d92f417a26da4c912c3b20c1af086e26d3db594583bb5c9c6a8ae5ea90077d5f22dcd8c17e2da9a SHA512 0ad845bff356a4746ad94df6ae7f082ff93aa18053228622d282c244a36ffad5f167345e3a880c6611376a427e07d935c3613631b69453cd71fc3c4ae6fe4c83
 EBUILD hypothesis-4.57.1.ebuild 1835 BLAKE2B e78e8aad70d73ab036ec275cfe0a59c7ba38eafabf3e6a8273fc3a0ec88a8ae60f685d302963eea9e4e5d00c8e4b5ca05f3b5fbaeee3c822979eed460a7e0f83 SHA512 4d3ac5f3919ffac5cb5dbd134d939d71493b2fb9e8414b43185336e78a4d4a62f74c829efa512e32440ac4892e2857611f5dd1d076dd8469a477fc132e0d5834
 EBUILD hypothesis-5.11.0.ebuild 1586 BLAKE2B a4e4cf374d2432c1715b94be5690069ee808156a7fe0e6c5631068002162753ae7c3da70d875809f80c9b8be43beb586f70715c5c101f7617ad57fda5c663ced SHA512 a0b3faf6e5749ea1f20cc4ef20cc98a30ea916268bca4137707b84ee54e0c0501c32eb5e4f747a85f3fec8e5f50daf593bf0c6fdd803439d5061d84cc065d9c0
 EBUILD hypothesis-5.13.1.ebuild 1593 BLAKE2B 4f3aeb8b3378416bd0d41f817253ecdf3049367ebf1b526cde16eae4dff1a68d0cd283d52d471a1f29fb01a0932f309efba5b8e900122025d88e197d665027fb SHA512 b8c36cacf2716ca28b7b3d5acd15e338f6e5db6b9046419fce286b40a4aadae1fcc151861cdffb6ea2fa24151299b4972931423b4d01d13f941dc174409300be
 EBUILD hypothesis-5.15.0.ebuild 1593 BLAKE2B 4f3aeb8b3378416bd0d41f817253ecdf3049367ebf1b526cde16eae4dff1a68d0cd283d52d471a1f29fb01a0932f309efba5b8e900122025d88e197d665027fb SHA512 b8c36cacf2716ca28b7b3d5acd15e338f6e5db6b9046419fce286b40a4aadae1fcc151861cdffb6ea2fa24151299b4972931423b4d01d13f941dc174409300be
 EBUILD hypothesis-5.15.1.ebuild 1595 BLAKE2B 6fbaf4b3a84adbfc6eb1251ba1df555904e0bed0013df52891d3d2d9f99e97d01e3f6352ea931d30aa6f5cf340ff82a338fda1e12fd94dca22263559ac077c29 SHA512 b603470e4d701a878bf316e6678a93d32ada16ca5fa39860f3a3f3a7cb5b12e9862580a80cf30380933d03ff9a2df7711013c9a4831f5d2572df5423b6beeb72
-EBUILD hypothesis-5.16.0.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
+EBUILD hypothesis-5.16.0.ebuild 1606 BLAKE2B cf440bbe2db950770ce947a6c1dd0f6a9a3c7f304ded9c20041b8de6b5406eedd410aaaf26c91b7b2cadee11b6ed48bcda8bb213bad7483be4d00ca7f72cebac SHA512 c485e6b28f49613448a328cb2815b295070eb91761ce5ca7f49c3dc4fcf8bd1a337626c7a6f1c24268cdb01a92a7235eab29432a3bd9f6a08130e3738f97e202
 EBUILD hypothesis-5.16.1.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 EBUILD hypothesis-5.16.2.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 EBUILD hypothesis-5.16.3.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 EBUILD hypothesis-5.18.0.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 EBUILD hypothesis-5.18.1.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 EBUILD hypothesis-5.18.3.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
+EBUILD hypothesis-5.19.0.ebuild 1607 BLAKE2B e4035d40cafe12f01cc6c64381bdf1f9621c89064ea4a1979b376bdb82d60bca8faf68bfa27e2c764219eaa432b36de64de4f3b98090e4bd5b855b37570fe9b9 SHA512 d3af8aca80250ab9338310fe822553364dc8117146d5b791789ddd83a1ecd99e0c1476d99fa9f23bebc53d048d18899871fc3aa82c5e5216d5ec5628327e602f
 MISC metadata.xml 643 BLAKE2B f8871008e348f0d703ddbee0ce13928f14800f3c10a9f440e9afaa881ee8eb916aed20112469a40d6f7bd899848aa70a36de1d857374fd32fa6b127888be0cb2 SHA512 618ee045f44c096c6402a549ac2ec3abbff25aa76e511c326f8a8ea470bb33a1e5cb1bb1b7b4e149c911ccbd08f69ff72b99edcd92fe9e1237055515b19bd514
diff --git a/dev-python/hypothesis/hypothesis-5.16.0.ebuild b/dev-python/hypothesis/hypothesis-5.16.0.ebuild
index 494668bd6a8e..2455d57012e6 100644
--- a/dev-python/hypothesis/hypothesis-5.16.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.16.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.19.0.ebuild b/dev-python/hypothesis/hypothesis-5.19.0.ebuild
new file mode 100644
index 000000000000..494668bd6a8e
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.19.0.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,9} 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="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 7f227f81f333..93caac08c10e 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -7,5 +7,5 @@ EBUILD importlib_metadata-1.4.0.ebuild 1071 BLAKE2B 13d171a070a2b9c48a96c33e869a
 EBUILD importlib_metadata-1.5.0.ebuild 1108 BLAKE2B 2bfdc004450287617f23b183ac7bb52b46463b1894ad761294b2200d0de8244e00481372b7c5ba1fd3ea0472dcb1304bb29390f43b9d02ef07a44901f05dfd62 SHA512 267ad2f36025556162b81e3465b7eaf3baf383a06928b4799e044a309698c5e4196c0cd2483245fc45ee6d16fa930a1607789077fc1213b05826463a6363e828
 EBUILD importlib_metadata-1.6.0-r1.ebuild 1229 BLAKE2B 3672433212a43e40b6d7021586e6f6a09954a6a38b785463ab39fb56612faf05952100afd7b9c79e991f303c505b6deee6bf0013a9e2861e53c7bae36e575df1 SHA512 55abc3d9561efcbce67f47cca55458b268faa147c468ff788a84d263bd5e3f20eef3ea607577418b382c3dc0ac596d16871283617d327d5bc67f9b0a2126506d
 EBUILD importlib_metadata-1.6.1.ebuild 1348 BLAKE2B 71fc748ea9c04ecfb4502e07d8c209c92ce779f7775b56881474ab278e27eb94faced2c9bf32cf1e4462503341125546f0b985739da0dad2225454fb94424544 SHA512 9831f6baa508bb87d7ddeb3b675633d423106acce24e7a9d5858dcc71c80605bd7fe16d82755a5f6c435fde54f4d6372080896a14b4371f8834f8bfd585c217b
-EBUILD importlib_metadata-1.7.0.ebuild 1348 BLAKE2B 71fc748ea9c04ecfb4502e07d8c209c92ce779f7775b56881474ab278e27eb94faced2c9bf32cf1e4462503341125546f0b985739da0dad2225454fb94424544 SHA512 9831f6baa508bb87d7ddeb3b675633d423106acce24e7a9d5858dcc71c80605bd7fe16d82755a5f6c435fde54f4d6372080896a14b4371f8834f8bfd585c217b
+EBUILD importlib_metadata-1.7.0-r1.ebuild 1271 BLAKE2B bfbb0b7ca477f4d1734e0015646ee86b1e059ed36189de1d96689f3ac5a3b3c451f4fe1f6b5188a2cbdc81fe5c581eef5ace9a6afb88fd407698a8f8123266bb SHA512 8859ffe2661945376ef0d2e844f669e8849bfd3f5acc5fb5a807ca2ed533ad14ff8200316de0b5e76531d36574b418b61128d6f380a4b6fbfafab69546053ee8
 MISC metadata.xml 575 BLAKE2B fd32bd69ffa26679f44ae19012bf57e77219abea01918062e2290e48121209353d5a50eb2aa028ca8359b3c8f40a35c1cc4c48e2f05cb855a3016f2f01da41f2 SHA512 fdb2a87b50b50fd23d97c7dd9875958ad9ae6474f6e0a0e5fb8df12ed381c30e21a71ae2eaf3baf03ae1ab973c0c7827c8a84fa09c8ca52eb938439e4f66e17d
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.7.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild
index 0982cef9a7c3..9fd91e215bf8 100644
--- a/dev-python/importlib_metadata/importlib_metadata-1.7.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-1.7.0-r1.ebuild
@@ -22,6 +22,7 @@ RDEPEND="
 	$(python_gen_cond_dep 'dev-python/pathlib2[${PYTHON_USEDEP}]' -2)
 "
 BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		${RDEPEND}
 		$(python_gen_cond_dep '
@@ -38,9 +39,6 @@ distutils_enable_tests unittest
 
 python_prepare_all() {
 	# remove dep on setuptools_scm
-	sed -i -r "s:use_scm_version=.+,:version='${PV}',:" \
-		setup.py || die
-	sed -i -e 's:setuptools-scm::' setup.cfg || die
 	sed -e 's:test_find_local:_&:' \
 		-i importlib_metadata/tests/test_integration.py || die
 
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 7662fc51ba3f..296fd31751b5 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,5 +1,7 @@
 DIST importlib_resources-1.5.0.tar.gz 23660 BLAKE2B aed7a2d730f945505083812355a63d3a88e07b057cf46394f3475135143e535e33dc3ebded24d233797020c805dc35decf5c5ce53758798b093f03f2951daa87 SHA512 34d14c1ff3121cc6f9ef1d3d4417831e3476e9facfcc9b35152c28a59a2c75d7723f171f4b48852f79ec46cbf54b066580745744bc54d349e2bfe12a353a9aed
 DIST importlib_resources-2.0.1.tar.gz 26060 BLAKE2B 739cd7fd90cc12b5b586eb1bf3386b85cde2399e80cfe05cae5173ba5177fb1d15f7e44e7f78473ef03e37d563861f57b7c470782d1aab161eae4c40d530ca29 SHA512 7f62c5bb5650dd2689a41ddef2e9131f01d5edc99b284a7a4257fce18190f2e78c38a2c260d6fe5e6db122666435e079c417bd9011e68e35724932854c90a1bd
+DIST importlib_resources-3.0.0.tar.gz 26725 BLAKE2B e2517b0d1e576ce949ac05230892acbad59c09fa4b84401b3c957e83f40b50d12bc02360b135fe949d12c43f8f557006824e4e4a3e9ff2ce879c03362569a00c SHA512 cd29e268cacef3729024af6cae8394ce5aa8c1d8a28397fd8f009c7eaa908ed3775508bde86c26b0d233c25261b8509abb1e16c378c7c8a9bb0906224f3fdd54
 EBUILD importlib_resources-1.5.0-r1.ebuild 1280 BLAKE2B 16db4dff815fc1e5dd034965e42a9d22f0f7413281856c80aa7652003799c2cdb928a8a6143a5d1d3d31b7f1dddb7ae933afe3bcf30a6d838ddaa290593b5cac SHA512 3c4c2aead9af6c6f44acde1b976bd8a853993ef1813cadff7986d41f4b627f697817e65d0ec2bdee8d6fcf3b618c3b320a3b179d8df9c4445dcc1c31d21aa837
 EBUILD importlib_resources-2.0.1.ebuild 1289 BLAKE2B 199f43187b4b4dcbe438fd6d1d59dbef10712cfa389cccb3285e1589c82bfab2acc1ab2f48e0436c6e2b577a55a55287cbc6d1f0141ae166c9594756c0ce2f53 SHA512 c917897a69f256365a8ff767b810c5383ed023853d1ca914483c301729a403071efeac1e3918af71fd927ac58caf8426f7ea443cb4fd9912cef5dbc9bfd44d22
+EBUILD importlib_resources-3.0.0.ebuild 1234 BLAKE2B d325377754849aab1bd76d110ac0f86732f4c4f26096177d4c316132059353b7265b786da544a36749997d467bcb8d6a38d3f2132b3ce673998b13a615e88dd8 SHA512 7a65cc6900998459b7024c9644552043b6bf8e6644bce0919740281e632fb47be2f7822a4b5f5bf20dac2e2a72cffd7b464edf713fc3c743c47b545aa4a85662
 MISC metadata.xml 895 BLAKE2B fadc4adcee6471eb31d5a1b406c9a6a29e366a50abcee105a08456b432e9a42352afdf7d08f37c3ee6100f1f57080bce2a32770b3fda96bedebfa7958957975f SHA512 6802c03cfc8049146dbbef1ff6462cb2eb01f18048a857ff0050af8e15367bff8e40521c989fcdc68c95b2025d2b7af09015f99c279ee504d556165687d7fa36
diff --git a/dev-python/importlib_resources/importlib_resources-3.0.0.ebuild b/dev-python/importlib_resources/importlib_resources-3.0.0.ebuild
new file mode 100644
index 000000000000..39499d3eb2f2
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-3.0.0.ebuild
@@ -0,0 +1,45 @@
+# 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.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8}} )
+
+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/contextlib2[${PYTHON_USEDEP}]
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/singledispatch[${PYTHON_USEDEP}]
+		dev-python/typing[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep 'dev-python/zipp[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
+
+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/incremental/Manifest b/dev-python/incremental/Manifest
index 94cffc4e94d0..e6ddf632c453 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,3 +1,3 @@
 DIST incremental-17.5.0.tar.gz 15527 BLAKE2B a967ba891b69e91768db213a9692da10eb9987bf962bdbc3b6fe70e337322686d58901878b72934a5abc8d9b0c9884d6e03de5b8912067f07b7562427bcba38a SHA512 91443205f7c92ec8f6502f38379c5ac2fe441435ff9490af01e5420d6bb05bb1c666dd612fc45204199a34afd533fd3de1390ca482bb554dfec7d3a22958a4bc
-EBUILD incremental-17.5.0.ebuild 583 BLAKE2B fcd3a5136058dba1c7e10f1393b6d0973724bd6556467b09e0abbd5157bf78808f65e0ee14eac8fc6a22a420045440e331170c6486d343ba387c9af10e8a0102 SHA512 a53e97d3b5eb0833a4f46d8a029eb99de4f71fa78c0136028c785b54cfb69c9be3fde479f06af1cda851780ea6f3cbc676dc11a1b618bc075cb4a12b32283dcd
-MISC metadata.xml 476 BLAKE2B 0735d3636617ba9b856e46daba71508248af3f6f8f4edaf0b09fbbf14a08704876ff40d2ccd0df5f8804120f63a4869bfb9411c3f8ed2206179ebbacd21375cc SHA512 1ff0b8bca8dcb14df175291256c1c429e18799429e395230be47dde473c1541ba2e1a229513fc079ea4465e92dd82d974a65e055540b9b4cc423160ad8c1343d
+EBUILD incremental-17.5.0.ebuild 583 BLAKE2B 2dfd26c17e442b2dc686cda4c96e702c58031c57a5f05c146bd48135f39da8546d8576429b694a2b89736d94f84e1be9c37f809d08d90e85be4ee4448a6b9b7a SHA512 ea13df56a24309d386f87b83c890e836651473bb50da7a3e074dff43dca3dfbac7e5ff54a79750d343f022b595ce51fff3719fafe1a1940cc1c66f5b8c59cad7
+MISC metadata.xml 476 BLAKE2B 854207bdc5352a730881f6f6a820bed4648e839e64601274f0c249e805bd8c1aad5066ee970f2f45e8c8cf532fd4f07ab0956ac8656da5e8947246fcdb618337 SHA512 603906b5876ed9cc69aadcaee6d9443d20a2d134939ac79a41ca23f8ef010563ba3f56c012219cabb812eab0eb7e6bdc19cbe7763cb406e948713e49f1bb13c2
diff --git a/dev-python/incremental/incremental-17.5.0.ebuild b/dev-python/incremental/incremental-17.5.0.ebuild
index 4ef2d97ce5f4..3ede4a78f6f1 100644
--- a/dev-python/incremental/incremental-17.5.0.ebuild
+++ b/dev-python/incremental/incremental-17.5.0.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Incremental is a small library that versions your Python projects"
-HOMEPAGE="https://github.com/hawkowl/incremental https://pypi.org/project/incremental/"
+HOMEPAGE="https://github.com/twisted/incremental https://pypi.org/project/incremental/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/incremental/metadata.xml b/dev-python/incremental/metadata.xml
index 090da7e79e74..178cdb1dc9ea 100644
--- a/dev-python/incremental/metadata.xml
+++ b/dev-python/incremental/metadata.xml
@@ -11,6 +11,6 @@
 			<name>Amber Brown</name>
 		</maintainer>
 		<remote-id type="pypi">incremental</remote-id>
-		<remote-id type="github">hawkowl/incremental</remote-id>
+		<remote-id type="github">twisted/incremental</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/intelhex/Manifest b/dev-python/intelhex/Manifest
index 0c4ac518b096..a701598e54fe 100644
--- a/dev-python/intelhex/Manifest
+++ b/dev-python/intelhex/Manifest
@@ -1,3 +1,3 @@
 DIST intelhex-2.2.1.tar.gz 41191 BLAKE2B 2c35ec5fcc9d4fa99f7ab3c76f2d0d6055ca0b1812dbb77c6bbc33a1d48df77e8477db6cabd61afeaaa41503cb93d919b0fcb47ceb247409e2163c3f101b611b SHA512 50a08ab65d7d7d6d6aa49c92ac0c339a71d62d546cc922b006eacabb04630b74bc1538f2e461982d0ef1d613ebe43bc25a3424934d84029cd713773c08f57ed8
-EBUILD intelhex-2.2.1-r1.ebuild 673 BLAKE2B 05211b0df7b94b5368e541f81c29c538259f712dbdafd66767e217e3c9595ade18d90753e2333223bbf8c9a9bf392b0187e0d4761e1d9fc92e915902b9bf8d1a SHA512 59b05e83cbc25e2fa2b1a9487a0efe8a7a9587b46b3f8c55de47b6d7cfd8911627aa5f23612a5f7ece80f813823b5b787c1b3e326f990bf6e4e81f0c1a273cb5
-MISC metadata.xml 358 BLAKE2B 4ce62564d3b3d112f1103655cacb01b74d4c4c6b2b9a37f52166be12d40e3c8549e7dfb7fa93aa0e2c42a920b21b5a0832940cbc5d987b74f93b065514ac0c23 SHA512 1861f321df055b65260a63d65807468a38823cae9c51fb159c836333c2db3715bd75e1570b896cd0e15130811aec691a326702540055ed7dfdef5bec260fe96c
+EBUILD intelhex-2.2.1-r1.ebuild 682 BLAKE2B e93628444d1297f01dde7a444eab009db7ed009789e1bac2dcb54cd325769c4801d19fcc2f000f9af17529f634827a6e241bb355680a5b13bc28ebd548c794a4 SHA512 f320fa4023aeb485acc84715d65e6e8416ce7b853365139db706c6e60a83d9cf50dd570b1b0e3634f3493d1c8c1770ad044940c7135d7db40e4af7bd6e97e14e
+MISC metadata.xml 367 BLAKE2B 7b356120076a1c1d5f9072d78e19d2edf77bdccc200276dd3929fa340bfc4aa6d7b3b89a29674958a8f6a886511e6c50678959b6e82f0e9ba8df95c140e498d5 SHA512 66592e014b2ab9faaaaa895e8c05d7bb96f7a8055e1cd77321e8751f32f0ff6eba141225af292256a88687679f8d5b64807f3c2e9586942039607187ca822040
diff --git a/dev-python/intelhex/intelhex-2.2.1-r1.ebuild b/dev-python/intelhex/intelhex-2.2.1-r1.ebuild
index 8d8d9bcfffbc..1ff64afbdb08 100644
--- a/dev-python/intelhex/intelhex-2.2.1-r1.ebuild
+++ b/dev-python/intelhex/intelhex-2.2.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for Intel HEX files manipulations"
-HOMEPAGE="https://pypi.org/project/IntelHex/ https://github.com/bialix/intelhex"
+HOMEPAGE="https://pypi.org/project/IntelHex/ https://github.com/python-intelhex/intelhex"
 SRC_URI="mirror://pypi/I/IntelHex/${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/intelhex/metadata.xml b/dev-python/intelhex/metadata.xml
index 90caf113b01a..efa5242c52cb 100644
--- a/dev-python/intelhex/metadata.xml
+++ b/dev-python/intelhex/metadata.xml
@@ -7,6 +7,6 @@
 </maintainer>
 <upstream>
 	<remote-id type="pypi">IntelHex</remote-id>
-	<remote-id type="github">bialix/intelhex</remote-id>
+	<remote-id type="github">python-intelhex/intelhex</remote-id>
 </upstream>
 </pkgmetadata>
diff --git a/dev-python/ipy/Manifest b/dev-python/ipy/Manifest
index a24114f93546..5367318c0712 100644
--- a/dev-python/ipy/Manifest
+++ b/dev-python/ipy/Manifest
@@ -1,3 +1,3 @@
 DIST IPy-1.00.tar.gz 35324 BLAKE2B a0e04201a59c61e5cc8f7ce2837c83dded99d0d786406e2e341183a0903d43ed5496ae8ea05d1bee019007bfef7420be623ab3dc08cce33812f1720a59ca413d SHA512 94a8f26cad0d966fdf8d4e57284eadf4cfde88515af6f5aafc8f9597eb0758324b876039d1a121021ba1ac26be2e2ffa89a3f5803dddefdee03fdb5d65b07a81
-EBUILD ipy-1.00.ebuild 1151 BLAKE2B 620f5a62a5a0b364c7c9331271dd11b57e26423a318e48091307967f43f74b9eeb18661cca61291aac1355d14ca08db634902c2bee12f0294b08d57c200a65c0 SHA512 8ccb2cdf9bbe88dd28ce98e6a5a61d25ead10442b77bee342420a8812d0a38d73ef28f9ba2cf759f90d62444adbf8fa9d081d8fa05bfe45f30f3a42537d8cb4e
-MISC metadata.xml 374 BLAKE2B 89f26050a20821b1ea3b45177a02c91f3682abd65aaeb775bf6d03688a37a6fe57b8a47037ffbf1f7deea7ede60fc1e3c95b74b76f8be28afae73ec87be5bfcc SHA512 8c12c38a49ffef811e6107d003f44cd8174bc95fc71dcc3296511e3356a0203cf12479a36c7d649f1933c6a90820c3212de25166b61eac8de06728cb8cb25566
+EBUILD ipy-1.00.ebuild 1155 BLAKE2B 8e4109ba35d142f10f676513267a3fad921dd7f32b75fbb24ab7d7de860d6cdacaebf2a3ecb7783a05ac6dab3e00211b192324b1fe9b76cd2725f793f9a7498f SHA512 057f9504a19b0d4f319ad7660d77a87656768f79a53ba39e311200b89dfbfcfb66d8699bd04ec115d97dc3703f8e9aca39c749eb292ad1b166a08de56641d20c
+MISC metadata.xml 378 BLAKE2B 22a98ad93c671966a154cbc91eb6d29fd2534caded6f12574751b75e3c5289ff99a8c964145793beec687062d91cf7ded3b1cf700a943ef07ddc214b7edfab12 SHA512 c5f3834352b39b567e934f5e95ee08657b6791d0f621d8e4e6ee3f1a90d8e2e6bb390f8e70c24efe9930805695d8e48ebf9f9a5b55771b7fdd4aa4f9de3a962a
diff --git a/dev-python/ipy/ipy-1.00.ebuild b/dev-python/ipy/ipy-1.00.ebuild
index afbead463014..79f544a9c627 100644
--- a/dev-python/ipy/ipy-1.00.ebuild
+++ b/dev-python/ipy/ipy-1.00.ebuild
@@ -11,7 +11,7 @@ MY_PN="IPy"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Class and tools for handling of IPv4 and IPv6 addresses and networks"
-HOMEPAGE="https://github.com/haypo/python-ipy/wiki https://pypi.org/project/IPy/"
+HOMEPAGE="https://github.com/autocracy/python-ipy/wiki https://pypi.org/project/IPy/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-python/ipy/metadata.xml b/dev-python/ipy/metadata.xml
index 13405b9629d2..4ec74958c566 100644
--- a/dev-python/ipy/metadata.xml
+++ b/dev-python/ipy/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">IPy</remote-id>
-    <remote-id type="github">haypo/python-ipy</remote-id>
+    <remote-id type="github">autocracy/python-ipy</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index a84502356c57..b7881a7b3bed 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.classes-2.0.tar.gz 9911 BLAKE2B aa5e5c90f16c9536239ed61e6dccbc426244c98a33a944de32239bd42a0a4944e5df3529cfd525e05cf276a4a4b028edcec734006b549053ac8817032f52b2ea SHA512 83c9a570f951ef6c3708243dce6397cfbfe963db5920550ac807878a69860b34831af5f277f956fd0b327d85462676fd6386a22d6d97c7616e01ca81d7ace694
 DIST jaraco.classes-3.1.0.tar.gz 11616 BLAKE2B 5b438f7582a9a93ca4fc97a71725c1fe3275e4bfb48f5e06b549f7ac8fb6900262165b1ad0638114d3a8d11c10f449b7930d4c2d66fa928665aaff820af88937 SHA512 697d892a01c4e8ad83f57e69dcd744f976cea67fa3efcd55b10eda02f6bf1916162c0fa952d0d711e62f62fdff62740ee55a93be9fc46ebd4ab22416092f0ff6
 EBUILD jaraco-classes-2.0-r1.ebuild 1653 BLAKE2B 0debe2ad86864beccbb67d70d725a8ab4b228006cc7f63fce7981c69cc0a8ce0661c3b5bc79996f0bcb79d1e1539a393fe2847e2b97d5de0ca49dfa149c40090 SHA512 54fbd8c51e0471920e04dc42f6634bf84719a879417cb577d4634b1cb851dc5479b2a8f93f54b0ee7ff6e4b7a2a54cb0340cac4ba16f29e6aedcdf5839b35306
-EBUILD jaraco-classes-3.1.0.ebuild 1652 BLAKE2B c4a4c832a00a5e085150c24a3795d717dbcbabc97402576d52e50f4eddfe1f2a26568ec85da43801be6cc96e0b89e1d8ecbda5d35d8a340b855d6daabd2ad0aa SHA512 44db29a4fff0d6819089e1d5be5c44b5c35f424a16acb559980ea769c865b4f69bc0e78192b46f1da27b87987078689658aa5466e02efd88d402272ebca3641a
+EBUILD jaraco-classes-3.1.0.ebuild 1651 BLAKE2B 7909748684a7783d400ce90224baeabfe53fa5233ce00580b265ea689f99b24456da780a9895296a434414425f26c04968e2fa14cb0b4996d39e5f15dfe227e9 SHA512 6a1105a372012106c58ad128647d35220e4c014a1703afba519241153842979ae7ed32492757921e922a892c3ad2307e875bcba87de737e744d04081edbf8f01
 MISC metadata.xml 553 BLAKE2B f5e492cbcab83e5783cb3be7f42c48654f7dd4ae620d92029d7e51c653a1c78b7488bfb6ffaa03a08fa3aa0e99b1b2384cd15de6846ea16ff4f89d948cef5900 SHA512 03759959ae7a56bcfb92581e9586cdc5afe0a5347009a74aa4394d4f65c9b929b15572f7faa02914d376443204b693544fde85e61558688c547a58652e4d2800
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
index 35e7247e99a7..72a6f7164ec9 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 829d455ed038..b20e79efa891 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -4,5 +4,5 @@ DIST jaraco.collections-2.1.tar.gz 16026 BLAKE2B b79b57b6bac1e18b6be44ea0e5ad65e
 DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
 EBUILD jaraco-collections-1.5.3-r1.ebuild 1443 BLAKE2B a66ba6c46757c6f82a505bb3a878c628b9457f71060e82ad33fe1a29582ca5527ee915198641efce0333b099a6e27e50cee6b4aaad524652246e932c0a9992c2 SHA512 4923dc53f863e7ef112125a4ab233f858492618a3ad04a9754acec15e12f691337e429570c9ded5677553fa0eaf35ea8ccfe25d2549004e4d25ec2e8fbe5a247
 EBUILD jaraco-collections-2.1.ebuild 1605 BLAKE2B 71bcc1d73d2c0f0dc841f91af5e7f7eb52f4eee14c00ae3e4fb5fbba779f32e3fb7308e70d2633c179654e07281c0fcdeb883f853a994a6ab6d96ad20aa78d10 SHA512 727b8aecdde34c9ccbb6835d21c2e8df8824de36ce358cd5cedc914b4805f3f14eb2c1dc5aca1b7c741ca8abe53a578a733ae788dc016c16e24ae5d4516050f4
-EBUILD jaraco-collections-3.0.0.ebuild 1620 BLAKE2B f765094cecc9c8e0d05b23820d7be0b363bd9325c2a054057751c904863b7bd4e95a71eaf184e91aea25625709cef00786ff1493de460e1cd1510dcdb658318d SHA512 047fb48a1d3bd2a410c991820eb8215afd250d4c3133aae6b73b91caa00e12a160e165fb4425849c668e9f59de857752000ed654eaaed0d04c9fcd807c1e545e
+EBUILD jaraco-collections-3.0.0.ebuild 1619 BLAKE2B 874e17d4dcc31b2182d75fa0581210b349b7fe879f302b66fcc401b2df1210bb1f16d9429bf93a568daf75dc15df533217c12d98368d5f17fd5367b7e1b23e2e SHA512 1d296504d54b64d29f561b63e06860d238b19286ce41d48da8813e7b43aaf492325ab01823531e489cf8f80cf0e3fdb845e02de7f99bbc3c9fa8f7a7a38eff13
 MISC metadata.xml 659 BLAKE2B 93e69bff80e5efb51d41b24817d5aba23bf2a6cc6c45a81bd4b0fb43ae5da538f377ebc0441b14f3fdedbda8b3a7932defa5255087fec9cdf6ac4d35f86dfd1f SHA512 1609b6fb022a1880fde31a5e9c7096e373a3c5da4f8a7b2e256241bfdaa591d4247b259a7b5dfcb6c9ee06182c3b899eec468992b50a04eb3f1e1fba43f20b20
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
index 937044b5f9fc..680c710ccb08 100644
--- a/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
+++ b/dev-python/jaraco-collections/jaraco-collections-3.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index ffe2622e0d60..7112ab904fc0 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,5 +1,5 @@
 DIST jaraco.functools-3.0.0.tar.gz 15618 BLAKE2B dbf542148d18069e7e78c718f3f6b62c7a07c674c96d54dfb3c1cebded13f6e24ca579844453352d001d312e718acf58d311c198076e85217362ee1a1446dc23 SHA512 f1ec725e132477f7361f7d0a77f72b69603499c24df25c9e8e0cc9a6d34a4bd4bb10fde60dc324b8176c46035e2babde04de90fcb0aa82273bc2f8559b8b31f5
 DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
 EBUILD jaraco-functools-3.0.0.ebuild 1747 BLAKE2B 5bc3c6ec8723e01dff7b9953ce1653a77603e5bf10a913cf526cbe2546f09d05c85809e37254c7a504855c0d85d708b168b58f82710e4f1ce2e219f74ad11883 SHA512 ce4135a8607d136b7866d8c47401ed4c8d2d1c2412b8b3c3ed480963ab03f061a846ddf6bc1f54225c618e0a2594fa17f65e03cecc24eb638a59359db3437a6f
-EBUILD jaraco-functools-3.0.1.ebuild 1568 BLAKE2B 7c30bea609aa37abe807b81ebcd33d1826a41e9b365a39e77cb5872a8a4a7c9f92afc155db51f242d0e14de16800de313739e6a50b4ea7729c04d786c2a74c03 SHA512 f3926140dcbbe3bde7509e847936bfeb49ad1681a7ad6f17b48ce7ad60b1d68bdc1292b237c9d61d75dfba985457a45463e15fdc38c8c6d7c6eac94eea3f3013
+EBUILD jaraco-functools-3.0.1.ebuild 1567 BLAKE2B f02f864715762c84c70aa95cb3abc3819184cdd505dcda9ffdc03490a198c0b0f611e7b0c82cd2695453d49a8efe0027c4c7fd651e0c3c770195ef5c8b7f0791 SHA512 b327f3cae832a6c20b296085867adbbe5c4ea643e6f6c1f6672f228b892c3a0417c080a8b09745a2df7dd48ced3fc58a6f317c87097e4f6f9c9a047d36289fc6
 MISC metadata.xml 651 BLAKE2B 3b8c3e620ec97e632d9d67c336e08989f662e36cd55ed0c283f7f9f4020717e099f00a438e550d38ddde73ca2736e728e74e8110ac957c797b109aa4252503b2 SHA512 04cef990bef9e5c53188b1c5997549644588a0053c06109992ae4d1757c3cc76553b3a3bcb535f4e3a0b33d679083d4c2247a73bbe69a6b1b606f99a6c96abc0
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
index cb0e63963d26..21d365d3af3d 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.0.1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index 89d47e70c95f..b9e107e25171 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -3,5 +3,5 @@ DIST jaraco.text-3.1.tar.gz 13220 BLAKE2B f52ca11b8b20a42d2c36102d4d48cf27952314
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
 EBUILD jaraco-text-1.10.1-r1.ebuild 1398 BLAKE2B a8ddc0d90f447a17d0660aa46cf19e57895edcd96678f0d1d664055cf84996a584c7c6bb189cce39aaecc02bb4fdf7000f853a46b119a0976e97aae700f053e5 SHA512 5feda10ad31693621278217fe811596f2b2a6c40c8bd6980cfed04a45fb79cb5ff6dd51fa12bce8e6cef285c176ee4716a114b98335d105bdcb0fb351d574b4a
 EBUILD jaraco-text-3.1.ebuild 1639 BLAKE2B 7ea163dcc304213bf92afde4b9c91eb9bdec7b6fabe41befa86115f82a78d3bf7df299e9e52fc3a0a95d82bfcf066e85d86bbe7da8c8c779456ac62294f8c59b SHA512 b347c1514a3f691d69458d5f97479a132a0f47bded24ab3144df6cec45a3446c41e695637e4d6a378c31928877fd4f3aa325f98c40c9dcca4dfc0d8d6e494b73
-EBUILD jaraco-text-3.2.0.ebuild 1497 BLAKE2B 4538e68f89544e19f3a3e2605b1118f3c3ac438adef9ec82e0f831d5fc2c93f6742f9c9ada5335dff6dca331661d1ef059e672ceab59c7e67e0bb983655fc752 SHA512 b16ce3ec7bc4a492751ba43c8eaabb043a85ddbf0d24e51753abdbbd7852664903135a43223ece51065d8ce53d01720d60876e703d123057dd493601299ade6c
+EBUILD jaraco-text-3.2.0.ebuild 1496 BLAKE2B 3942a6de4f71f7b2b1c782c0b290a26afb4bb597d06004d04aa549c72d7363aebc223b05513a06a0d7851d708dcde26db5579d5fe7286db17e085d9ed2a28070 SHA512 8738b16d54585d59bd70f9353709d3c703e0b255c2cce9393c0831096bea8480ab69f26794c5168fb17be61103fdb91e4aca3b7b1333ceb2ba03652dbfa47e1f
 MISC metadata.xml 631 BLAKE2B aaa62e5e0d4cc048c1a279b16890d035cd0a60cc41e9b4c99b37876a21286248b5a00d193a2036d0c6d447ff57e635245583f571834daa5a2e994653570122b8 SHA512 84c01b2578aabd0fd5be4347ade555ca4f4ddd96e7009f7dd1b9d021465bc55f66431c72ed05a7e5633a81f3b401f8f77568bacc872198e145b5421aed05491e
diff --git a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
index 5690e9e1e5bf..9a3c00ccc7dd 100644
--- a/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/joblib/Manifest b/dev-python/joblib/Manifest
index 8e301d2adf0d..fcbee69aeefd 100644
--- a/dev-python/joblib/Manifest
+++ b/dev-python/joblib/Manifest
@@ -1,6 +1,8 @@
 DIST joblib-0.14.1.tar.gz 338930 BLAKE2B 6b84c43be8b8d32f28a3dbc3e6f4ce15574cf20571805501972d162d4b076c1fe144a9790b8132821f0acd439c8859873038813c7bdd4163d0535eca36a1a8fa SHA512 079eb4321ed95c8f05399abca2a1c46ecb7c28fe9a3a50b6eb106a2bd2f3566fb25bca59022fafbfcee5069f078921421d799eeb29a796f8f98881491cf9be08
 DIST joblib-0.15.1.tar.gz 342550 BLAKE2B c8ccf0b6d2e229a780939d9c4f39265bd18b5a452d014056001072b7daf7e46a5961c6d80f768c30ba7463aa36c5ec09959bb1e891028bf6f7862a9a265079aa SHA512 a0b0bde5b034af3eee0bce2875199fc9ac232a34a49c14daf6fbddd9bf3ad8fa0d77192827b7531704b81db7bdfbaf76c4755b8fc1035eaf73b2e08f9e6d8828
+DIST joblib-0.16.0.tar.gz 345002 BLAKE2B 0336fcbe95204141a0b04dfbf8949ba509792402eefbb86b3dc02375e7e3eb5c76d548d4ad01238307c0334ce4299fd9e763765d92722819894ea26ab6144032 SHA512 9f1f2e7f2e293e1c53e9752907f4ba25d52a5c4895eebfa423c8e3bc64146ab20a490e1db0cfa39596c9bbc47ea1cc491b0576bf8da9a1f68b58e91ba09ead34
 EBUILD joblib-0.14.1.ebuild 1148 BLAKE2B c1d2b4eae9bea3d2bd1f3f23519f7504e43f3592ddca6217fd9b936989029c2a982a79875eb32f5dc40d7087ae82cf1b5f18cc7257e753f4ec696eeb2fa48eec SHA512 210e793e79ac3d74968105278c5550ebaef4716abd4a6873e152de6f373e672ab39e4d223a4973b7730eb867945dd7242788b2b7d8c411b8c433deccef98cd88
 EBUILD joblib-0.15.1-r1.ebuild 1408 BLAKE2B 5a48b7c4e23c3a035c69230c73364cfefd07ec68b6469c676afcfe455f6a3011a3278c9d9e7e3a6c002046a95a2f0032eb0c623ccdf71488cedda979c2b46d1d SHA512 5b035c5424cc5342b0713b62f07e55f1da5630c2de162b26575b7b8d18886e0e320a22e6ff28c96cd3e5412501f5a261f5f0facba2998e4c8848466a33060f97
 EBUILD joblib-0.15.1.ebuild 1150 BLAKE2B f1c0c586328977f4953818ec205ee4d4702fc2118f64a6c60dc248d1ecf115e6b2207764243805262a998616648b4014791d467d443d5769118ab6da9a6ab889 SHA512 051ee65d697022daf61083db84c88666c3f43bdb8c2572b6440ae5d59336f32b5447f7636beddc6487f87e8592f79bed06f90f790d39ae95e8860dfdcb2f0b51
+EBUILD joblib-0.16.0.ebuild 1407 BLAKE2B a2f59b500f59a1aab4ad76ceb42ce324c7b122b6cea2075a7f57e570a1dd5fd7a161b57614a81eae0093108f7d20e996d8cfc51d4085a17d09f5a373b8ac0c91 SHA512 2885a36041aa07f0df9267ad76c74911a7a2898d597d407cbca7428a852057c90598ad1c5012e2a700acef6fc6a0837f6b2ec20d0588fb027391532b63aabe64
 MISC metadata.xml 832 BLAKE2B a05bb08a1c94c3c589a2101ddade1fb6baea3a584ffda3af9374788ebe9aabe334697e5f44700261881324448a8c91d819046785fa29e2bf39e1b944bf7572e8 SHA512 af7c23a51fa4ad666546900aca84ebd07412ab36f305ce4650df5cecdfcda3c24ff7d56322495c191a83fa99d00d968fc19284053f77620885f03bf4555f2353
diff --git a/dev-python/joblib/joblib-0.16.0.ebuild b/dev-python/joblib/joblib-0.16.0.ebuild
new file mode 100644
index 000000000000..392bb96fc6a8
--- /dev/null
+++ b/dev-python/joblib/joblib-0.16.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to provide lightweight pipelining in Python"
+HOMEPAGE="https://joblib.readthedocs.io/en/latest/
+	https://github.com/joblib/joblib"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	dev-python/loky[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/threadpoolctl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx doc \
+	'dev-python/numpy' \
+	'dev-python/matplotlib' \
+	'dev-python/pillow' \
+	'dev-python/sphinx-gallery' \
+	'dev-python/numpydoc' \
+	'dev-python/pandas' \
+	'dev-python/lz4' \
+	'dev-python/distributed'
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unbundle
+	rm -r joblib/externals || die
+	sed -e "s:'joblib.externals[^']*',\?::g" -i setup.py || die
+	find -name '*.py' -exec \
+		sed -e 's:\(joblib\)\?\.externals\.::' \
+			-e 's:from \.externals ::' \
+			-i {} + || die
+
+	sed -e "s:'_static/joblib_logo_examples.png':'doc/_static/joblib_logo_examples.png':" \
+		-i doc/conf.py || die
+
+	# tries to fetch from the internet
+	rm examples/compressors_comparison.py \
+		examples/parallel/distributed_backend_simple.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 98a0dd40092d..0b94b656dd09 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,7 +1,9 @@
 DIST jupyter_client-5.2.3.tar.gz 271787 BLAKE2B 36761e53050874c141c38f545f8f6fb53c144c30f686b3706594d124a65e410c205379b7ecbeed12f1520f0f568c7db3c802223f6fdb8f76407074beacc21918 SHA512 89b980ecc281bc1512e1fc4ba35862cc6e541f825ee07a1382d300c8088f24611225ab415d6a7c1e4209c47a74c113ec95f863e8fb0b33c6db9eb9c3521fc0ae
 DIST jupyter_client-5.3.4.tar.gz 275850 BLAKE2B a0884fb6cd2858b3ecf8353c6dc180370a53b4d59f77fdeb33c972c72857650e2e8b64ac5f6c9d223a99f30bb9ad9e06673cfe14b2d79abc0e4363104ffd15c3 SHA512 54b5206c08f5119feb50deb2d815d79a178799ad5c1231a0d03fc950ebbf6cb2f7c3a757024f788d416f808c57aa8476fcfa110f63182314bf2d5cdeb9a006cf
 DIST jupyter_client-6.1.3.tar.gz 290112 BLAKE2B 205d4fc4bee263b05a36c562db11fe9a0d39defa5d633e85412a7e6382ddc49f9875c5112c1d23108b8e8ae7e57060afebeef949d7bf685b9541dfd06ae43fcd SHA512 39756e1bd7a051092c70c5f75ff1a8b8dd308eb054b3e572d5682e832dc83e6935c3f845230908f1c3debe95977c7b7ae63c373aad4ea6c1e87674b083d5e72c
+DIST jupyter_client-6.1.5.tar.gz 290829 BLAKE2B 7029703ebf7dccafd9c90835d9ed3305f591597947dabaef3fd670c7fd595bc8a8fa5258ad07b0bbe170c134f8f50593e980c2360de2521216fc061996268032 SHA512 b289b07f1300a7aa541b15ece33340fde7dd9765a200214668ad3a124ec7fd98c742f61417c9d31d6daff9ecc1aaaca6ec516f359cc26007731c0f8d859a73a9
 EBUILD jupyter_client-5.2.3-r1.ebuild 832 BLAKE2B 1dc7d8971a00f3e0bd8aad14f7ffedab3d79a4a0b5f8132109f09a9c2d6704160302db777d7455643004337a886482175245e6ecac6876250a5260a1e8ee18fe SHA512 071de2eb4f843e0b0dd038d8de712b249d74d7ae15655b96e63b7c62f6e4df6ec89bddadb8d695e97644d64a06d21f4707e3285e52d5b8c865b23306413a4ffe
 EBUILD jupyter_client-5.3.4.ebuild 903 BLAKE2B ecd0184c24dc7820d44ce8f50e124fb3fc1f8ae1c494b2b7e6fd76f81f0eeac3815515be73285d8368feef61ff27ab553b569ab3100cd3fefda771a7ad5e33a0 SHA512 0110cfbd150b7be4b625a7d572a0aed9f4f9ecc88f2680a4b338813e5faaa21f7c8f0be92f770a311b73e2c28aa856ed2b2ba9c3d61e04fb9aa366649ebb676c
 EBUILD jupyter_client-6.1.3.ebuild 852 BLAKE2B 2c00067a4b8be34115e64df66b157574720406896ad6816f55a17e4442b15b327952d0a71fd9bdca30e0912779a6fb8d7f4b2adcabe438e511cb7d686bd1d416 SHA512 d81da4085da6a07520412c8b7dec6b0be0eaf5a00ece312412a9752e1c92c4184c1404d6edb32fd40efd8a74e77fc0ff3c0ae11641428c8acc017d1c5293780a
+EBUILD jupyter_client-6.1.5.ebuild 852 BLAKE2B 2c00067a4b8be34115e64df66b157574720406896ad6816f55a17e4442b15b327952d0a71fd9bdca30e0912779a6fb8d7f4b2adcabe438e511cb7d686bd1d416 SHA512 d81da4085da6a07520412c8b7dec6b0be0eaf5a00ece312412a9752e1c92c4184c1404d6edb32fd40efd8a74e77fc0ff3c0ae11641428c8acc017d1c5293780a
 MISC metadata.xml 779 BLAKE2B 43107b0b7e5e1316a386e41e99c482dd13eb753bcaeebf6b496d7b432b69aaee01f6777877033154b178b17bbef87cb019d4fc55302e089c69972ec7dd412c59 SHA512 4333a7a7ae831d4f12b09d3f78fea784c508ed1de502b71d5279c6574cec7808e0e13e0e9b59d3b6048788d406f617a883f753204eaa22c24218587e3e4fd610
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.5.ebuild
new file mode 100644
index 000000000000..2bf01c589f1a
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-6.1.5.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..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index 84ef378e56ff..86c1608af2b2 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,5 +1,7 @@
 DIST keystoneauth1-3.17.2.tar.gz 253877 BLAKE2B 9a8f10a5a535ee6ee02859f6a7da38777af250303d0be0feed266c677fea3f6bd465e3e14309c38f67dc5886c846a6aa9a9a7438f5e511f7a80782e29ce88b52 SHA512 6ead83db401d9bb31df87da5c9eff576f621d0b0964c9423de6cdd45777b9a2e3cef27fc20d91fc01b82c64b9b0ffcb83f270b4df7b740319809207ed0b2cb2a
 DIST keystoneauth1-4.0.0.tar.gz 256925 BLAKE2B 3ba149f9333a42c8fc2f876cf3ee4533633ed881a90f2fd944ee1c245d94dab548ea1c363f2085bc995dd588d8d355d779d9357885ecd0ee9c73115216010388 SHA512 c24d10b2ae6318c22bd62596dda952a36ec8ede8a6436aa111657a984b2b3be72e55895c009317b2ad652979701d4dca6f2c3e1764ada20d1c7b676f072f5614
+DIST keystoneauth1-4.0.1.tar.gz 257456 BLAKE2B 0903e782fcd291ba4c15ddbbec684c8f5c898062fdad0b34e8da892fb501a412108affd1d3ed7b9dc4e259b67bbe90dd361ab623da07f7ab97c32c1da6f5a1ad SHA512 b20e02dd521bb45406586f7ebdcbfe48ff22f4820950bbfa280a5fc969bc9cdacaff69678958412cd5880b732642cdd2079c228c9679e372ad76bef625e85c35
 EBUILD keystoneauth-3.17.2.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
 EBUILD keystoneauth-4.0.0.ebuild 872 BLAKE2B 788ee894117274937106f311918566d719132aed441dfc5300d3d0d0d1803961050421906173ab0ab95936ae6242b7ce9a3506b63a516804713cf3e0f71c5147 SHA512 d560113851150746871a80654730b29d5da22dc99466e6d79b0a245c174052e4871e8f9e4e39f1e2fd5ce4ba5610e04eb53ce4923c7342df12c7d06f422e7c88
+EBUILD keystoneauth-4.0.1.ebuild 874 BLAKE2B b852dec1e77179c7283a48cc45901ac57f050cec9784a54a09b4eb20196767a54652fa553c120ebdbc894134accecc2f9df07ffb76370a579c034aa97193fe3f SHA512 6377faae295670fa72ab06dc7eccd9232bd81c571e5e9e88910f09e816dc3eb3cdd53500daec2b6a4af120bab1c56614e36f3225772f55a27a746e3efe4fa044
 MISC metadata.xml 392 BLAKE2B 085c44de3ed96e035d49d57848f21ae8b2ce65c5e65fbd86e7111e6a132741fc4fdbb57eeb84ec1e2c74822ee622f62b0544be7de22f3959f0e7f3cb82a6d80e SHA512 59fc0c77222f3b620150cbca948d6978b40438bc7e410b984af58fc25ad2cab2b67e22db03b5eb1c76320a7662e02a1d0bfd1c23001153e6ef073473c883e3d2
diff --git a/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
new file mode 100644
index 000000000000..21ce2d584e88
--- /dev/null
+++ b/dev-python/keystoneauth/keystoneauth-4.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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/lit/Manifest b/dev-python/lit/Manifest
index c690987299be..e74b814c00e9 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,10 +1,12 @@
 DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
+DIST llvmorg-10.0.1-rc2.tar.gz 120883192 BLAKE2B d48f4ccb33691cd4997576a6d20b298455687515164f7d8dfa11ec32e197b58132c6bd549c1214c3b36982ef85e1018d4101e7afecee8d2ab67ad15d68c681bf SHA512 8e363d379a73e38ef570fb03d8243a21f37a48ef579a0f08118af4dac48060c0dc24e2bd8175f04241fa424e49b6c85723d2d3552bbe30dd165fe5fb43493325
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
-EBUILD lit-10.0.0.ebuild 878 BLAKE2B 547175d48388b3f2cbf56a4d43e1407e3ffdc3bbc0114f526e5a8022232af42fa8ff53ea91536c28511ae8d301bf9768fca03bad7a55a288279c3b85a4e792d7 SHA512 a2c001ea7099368852f53c488f348c92308a25a069e77b14212c7319e70a39f7a9f7c59f90b865079b3fc35435ad3632bb199e8aced8601f8bd427d1bec44383
+EBUILD lit-10.0.0.ebuild 877 BLAKE2B 5ed8f853e73c362547ea54a2326dcb427e9fb8efd7d004ba88135b351f3d752433230f970df68674c124549d199fa431c744fe7cb4b2a4f0b6a2291647cb0f11 SHA512 5de884d4c48b3db0b5d87c88bef58826bcd4b1388a19b9ef6bf717ee503c876fc7bfd3526df6c9b41eae56464bac4dfb71fdfdbf57ff95dd5ac7a63f05f3c05d
 EBUILD lit-10.0.1.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
 EBUILD lit-10.0.1_rc1.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
+EBUILD lit-10.0.1_rc2.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
 EBUILD lit-11.0.0.9999.ebuild 878 BLAKE2B 1be4b6806f763182f310c13d0d98aac1e7f8ef440384c161887c1e0b9a41a7954f4059df2196858e144650741d73ba5452d3dcd5fc0d6a315759a0c8f1d73c03 SHA512 ebb181a5875c4451c04d39372411bd296934497aeebd518cdb1aa4ee6efc13ab185ce1542926eb5e750fb09f19a2c4cf4a33fdc3bb16d33731fc66604943ae56
 EBUILD lit-8.0.1.ebuild 1022 BLAKE2B 8a84bd40ba13ff7a42357bb8a94c4589c3127f9601ca9ccd099f2ab0387319c4487a77bb1972499563e505f0ea8ffaaeb3c3952f3e1ff9a2cc63f04868ec074a SHA512 76a11a6df5516b37723818a956461f6dd303027de1f50321b581636e35c1704711266f3d2721e6846d9525bb0aed347273ce16baed2561c61be9085221fd0993
 EBUILD lit-9.0.1.ebuild 871 BLAKE2B 58a0933e8024a1dd2cf8cd09d08c3730e42a4c4480db7ac97eeb84569871df33156eda941c2965a1170be9eac7ac28950149e811d7cb75317b6b3fc6058bec8f SHA512 3d9e4a1f3348e215e9551cd7e419fdbc266a880d3ece2d0127eac5165f4b7f3089de7c188d4476666bcb525c50a8e5aff8ab4c8094b2f7aa233a4f0ea2e93e3d
diff --git a/dev-python/lit/lit-10.0.0.ebuild b/dev-python/lit/lit-10.0.0.ebuild
index 4f631b669e75..55b531a08716 100644
--- a/dev-python/lit/lit-10.0.0.ebuild
+++ b/dev-python/lit/lit-10.0.0.ebuild
@@ -15,7 +15,7 @@ llvm.org_set_globals
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-10.0.1_rc2.ebuild b/dev-python/lit/lit-10.0.1_rc2.ebuild
new file mode 100644
index 000000000000..b9123ef7bf14
--- /dev/null
+++ b/dev-python/lit/lit-10.0.1_rc2.ebuild
@@ -0,0 +1,39 @@
+# 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..9} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/loky/Manifest b/dev-python/loky/Manifest
index ab6f46db6ca0..09f8a4fbc9de 100644
--- a/dev-python/loky/Manifest
+++ b/dev-python/loky/Manifest
@@ -1,3 +1,4 @@
+AUX loky-2.8.0-cloudpickle-1.5.patch 1892 BLAKE2B c7ffea0bb50617db74d081345642ceef7044d44bbed10088fba6403fe69811957c13557dfcb80ef986337311078b02e3a97f7294075c3641fe9404327ec0a164 SHA512 aff27910cbabebc1c99e8765b11da7552ed09e9a145c841e82213304c7e3a00b028009e882e3b22471441066922a4e67feabac4bf9575f820e46b28fc3c1680e
 DIST loky-2.8.0.tar.gz 112383 BLAKE2B 5561d96c0e0d23951dff303bdb1789f200b88e74ca44ef75119112491693c5876a9a70ad3688b3af9eaf12c0000d891067c936ca984404146890fb131f8c261e SHA512 15fbdb56994e08f643b7bd5aa68d193f74ab61ef1230df9e2101fb4602a201a050e3ecf08229fc4ad61e478c893e0b34b81371ef9596733baa0e3d008125cd11
-EBUILD loky-2.8.0.ebuild 730 BLAKE2B 09a62b500925d3b7707f8f3abb06e23ea964fad1e64eccbe34d43752f108b740715f1d27794e0113987750c98addcae8c09a45f4b44cf8169920981353cd4caa SHA512 2baacd860d51f84445e1e808ebdee79b56ee1ed0896c92df6f5b45c6800525dbbc1e2c7b93d9b05117972a999135b385e6d212f3c0975b1848fb0b46c092b3e9
+EBUILD loky-2.8.0-r1.ebuild 785 BLAKE2B 4a96b47729bb985a67d882a880df82f528d23d3a7a55ca27d580322cb9fffb02b9fbc43d74a17d055ee99123d842293c17f65f1889103d99469430b90f5747ff SHA512 b61fd0a822b8b319706d0d444d2d3a2917a124b80bd1155b927193be439d71e6b24d4fdd6650bf19d5d6501fcc3afd261429439fac8d01d897ecc1efe76ceb11
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch b/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch
new file mode 100644
index 000000000000..05fb70455f0a
--- /dev/null
+++ b/dev-python/loky/files/loky-2.8.0-cloudpickle-1.5.patch
@@ -0,0 +1,39 @@
+From 0e930389f4785f9d311b090f92057563e22b9768 Mon Sep 17 00:00:00 2001
+From: tomMoral <thomas.moreau.2010@gmail.com>
+Date: Thu, 2 Jul 2020 13:37:14 +0200
+Subject: [PATCH] FIX cloudpickle customization mechanism
+
+---
+ loky/backend/reduction.py | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/loky/backend/reduction.py b/loky/backend/reduction.py
+index 0bad5f63..d87fbdff 100644
+--- a/loky/backend/reduction.py
++++ b/loky/backend/reduction.py
+@@ -189,6 +189,10 @@ def __init__(self, writer, reducers=None, protocol=HIGHEST_PROTOCOL):
+                 self.dispatch = self._dispatch.copy()
+             else:
+                 if getattr(self, "dispatch_table", None) is not None:
++                    # Make sure dispatch table is an instance level field
++                    # as it is not the case for isntance for cloudpickle1.5+
++                    # see joblib/loky#259
++                    self.dispatch_table = self.dispatch_table.copy()
+                     self.dispatch_table.update(self._dispatch_table.copy())
+                 else:
+                     self.dispatch_table = self._dispatch_table.copy()
+@@ -202,10 +206,10 @@ def register(self, type, reduce_func):
+             if sys.version_info < (3,):
+                 # Python 2 pickler dispatching is not explicitly customizable.
+                 # Let us use a closure to workaround this limitation.
+-                    def dispatcher(self, obj):
+-                        reduced = reduce_func(obj)
+-                        self.save_reduce(obj=obj, *reduced)
+-                    self.dispatch[type] = dispatcher
++                def dispatcher(self, obj):
++                    reduced = reduce_func(obj)
++                    self.save_reduce(obj=obj, *reduced)
++                self.dispatch[type] = dispatcher
+             else:
+                 self.dispatch_table[type] = reduce_func
+ 
diff --git a/dev-python/loky/loky-2.8.0.ebuild b/dev-python/loky/loky-2.8.0-r1.ebuild
index 19d795ff7893..ba05e5dcaaab 100644
--- a/dev-python/loky/loky-2.8.0.ebuild
+++ b/dev-python/loky/loky-2.8.0-r1.ebuild
@@ -25,6 +25,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-cloudpickle-1.5.patch
+)
+
 src_prepare() {
 	# docker, seriously?
 	sed -e 's:test_cpu_count_cfs_limit:_&:' \
diff --git a/dev-python/matplotlib-python2/Manifest b/dev-python/matplotlib-python2/Manifest
index b2fc4553c446..0c82e8b96f98 100644
--- a/dev-python/matplotlib-python2/Manifest
+++ b/dev-python/matplotlib-python2/Manifest
@@ -1,4 +1,4 @@
 AUX matplotlib-2.2.4-doc-fix.patch 629 BLAKE2B 61549eac0d67275117750ad11a7b4aabe9d81783b0d603039266b88d6fe42edce4ca222df4666d83b9e4ff069a4a794b836ef40c748c921c0f092b6c01ff3b9b SHA512 ebf3cf7611a6f6f819546805443e9932a4cb3c77eb0eff507e94667ec32462ac5ee99be689d6523cf7111f16776d0837c14f469f674530a36e95343b2803581b
 DIST matplotlib-2.2.5.tar.gz 36678633 BLAKE2B fb3084a2d34a920413c44a23a956ffdcf7a31d521e2d1df50a68c9f17882cb87deebb403ec47154284593b39df24dad72e6352e1427091f795058db11f1d3a1b SHA512 f4771dca4b3c936e0d47f42630759207ccfe11586b3efadb401144b014a600914a6521af4fbe060fa80fd74132c92f1d3b37cac4fea9999ca90300c1dec8391b
-EBUILD matplotlib-python2-2.2.5-r1.ebuild 5005 BLAKE2B 90e6ccc861dd0e8c10cf8caaa9b6829d52f88c27abf52c360d65c5a4ac11f4d7f7b335797080ebbda3bd321f82f9818ae8d4c26184febb921ebb7e7b3fbf0019 SHA512 3e544b56fcb02baaf67eb8d20e29b6b3dd20e3f7707597f92010e3cdd23f613723854a03bfdc0edafea1e6337baa8fed89cf27be67de7fa4e7949e04f6e20f81
+EBUILD matplotlib-python2-2.2.5-r1.ebuild 5004 BLAKE2B 7cbf086980178195a9d438a8678840d0184a5c8e54eb157d13eb8a0381d40d4b46386992bed8497655ce179e38bad5a14fbd132ec4b451a3c1383205b24a9185 SHA512 e9ba1067a0eaf7fc170e8b861b2b84964d5eecb2acb7397ef568ddec659f4a91acfc4c074938dcede3df165e008c1a4b7f86445a8dbd2400b82bb681102a402b
 MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
index 36cd1d8f6be6..203da895b9af 100644
--- a/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
+++ b/dev-python/matplotlib-python2/matplotlib-python2-2.2.5-r1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo excel gtk3 latex qt5 test tk wxwidgets"
 REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk wxwidgets )"
 
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index cb162212b1b2..ee37954791ef 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -13,7 +13,7 @@ DIST matplotlib-3.2.1.tar.gz 40325615 BLAKE2B 7fd299f7d3948987e341e4313ed82d15de
 DIST matplotlib-3.2.2.tar.gz 40295831 BLAKE2B 32fb34b95d1df928f949fd7b04909da2494b56efbe543f75bffedf1d9d85a0089a50cd27b82a28ac75361b56fe3f2a6c95b7d9e777778ce46f1d2805e5dae9df SHA512 4b8080fddc717f311a87b6ef1a279304da2931ef2d6de85688c153f14da5009351f42d9533c44695ca43ce1496bb642927aca822a7946a2d50d40a7d25224b31
 EBUILD matplotlib-2.2.2-r1.ebuild 6227 BLAKE2B 32c5311bd4ee746cb0a6df097c9a2a2b34725031cbfcde1273b22929b20cf197597502be6722923ccade763e8a690dde0683f50fdaff313465b4bbfd6f5a52de SHA512 dc4c2387720aff34780d625022ee0a0f5806e4313e27cf1885450e6b2564f923d5a73b99534721c455d777bea2d43637a5b61d45b028aa5a22ee2ef2e5642b48
 EBUILD matplotlib-2.2.4.ebuild 6299 BLAKE2B a4513d93def3dd7fe01ef4e237a1ffa7e5e1d49ebb4a4fa04c4de14d02ac28bcb2017102d44002bfe4e0cdbca8e8a8563b862fafe3d06e01de4ac58d6c154619 SHA512 bd4a7941b7807552078f05c7bcce15dc18e8df1e93291c598a5d96d25a901556c69d31a7130406b7192903e5b1f81eca001af23675a03369c5fc42cfaa2110f1
-EBUILD matplotlib-3.1.2.ebuild 5648 BLAKE2B bf5914e115a11e59aba62294131618a33db85780102def607bd794ebab07ad32b3ecdb7ea1192134bc71f0038d777498ab49c9c9040f3ecfc79d0af050e7374c SHA512 6123cd120e844b89a771dad446af7bf5496a5fa7dd24d441de6a459aefa0f49bc1346a41f44ec84552e0eb62cb89543294eecf82f3e74d6c7f22956798a664d6
+EBUILD matplotlib-3.1.2.ebuild 5647 BLAKE2B 7d6344c94f05cd4006a636fdf19dd68752c35459b01c85ee4bc8eea4a93851ac330491b9aae63c4b8c698ac7e329f579966d294143c9398058a154fc5ae9738d SHA512 3b9d297aa36cc0438d4f17e5fbee9d4a78525787cd19c3eb1a8ca1c3bf486ed899a0a427efbc11df40da3ea36de6bc149d51977aee04074be5d00b6ad144865a
 EBUILD matplotlib-3.2.1.ebuild 6534 BLAKE2B c537979c12904c6dc88f491b9e4266f1a23b26a044a00f9348c683c03afd2f6b9f6ce791b3b221772c267faef400c683dd6995b3ad42f90593797e1a311a7623 SHA512 c4d946e95769e97e40619cf6044edf27dd5a043bf2fd1cfc6b564b72d7f3eae380f426753687ee53fd545860c67cdf285d2c09698994803501908f6076a97eab
 EBUILD matplotlib-3.2.2.ebuild 6534 BLAKE2B 2b44325bbf66b1915654a045b0a1c539de9af2ac594b83b0fb2db139a59bf73d50f3e4fcfcf14e531821d4fd3b7e81d70bef94d13c7665c84e2231d097bed469 SHA512 b508b08c9843e6ffed20346363fbfb09bee7b88887160f9392dbcc12b3b4c8ad59232496cfec9a8f2b08fe0eba2f641317b34b04bf6be48fb376004aab7e0a95
 MISC metadata.xml 921 BLAKE2B 1ec6f51395f5b41747123b4b0104155defb7f881573259f57572e02ddcf986feecb9fc34bc93cbafa5498afb9549661e3491f72029487cf0eef55f2d756e7ea7 SHA512 cac60a2bdda5c3e9d3eef1a8250b09c8759294361994b8d5f4ec18389106b9aee610dc4c32634ab8e7c0c77ebe39513ce5b816002aaeb2f9037e665b46333f0b
diff --git a/dev-python/matplotlib/matplotlib-3.1.2.ebuild b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
index 91b2099a971d..eb1517ece9d8 100644
--- a/dev-python/matplotlib/matplotlib-3.1.2.ebuild
+++ b/dev-python/matplotlib/matplotlib-3.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # Fonts: BitstreamVera, OFL-1.1
 LICENSE="BitstreamVera BSD matplotlib MIT OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~x86"
 IUSE="cairo doc excel examples gtk3 latex qt5 test tk wxwidgets"
 REQUIRED_USE="test? ( cairo gtk3 latex qt5 tk )"
 # tests are fixed in 3.2.1, this version is beyond repair
diff --git a/dev-python/misaka/Manifest b/dev-python/misaka/Manifest
index eefd16b8d990..14969f95d9f4 100644
--- a/dev-python/misaka/Manifest
+++ b/dev-python/misaka/Manifest
@@ -1,3 +1,3 @@
-DIST misaka-1.0.2.tar.gz 78702 BLAKE2B a07be5c94098e716d1494c69d84c50f8a78fe3b3a1a21d9a2ecce1c7474de9e493775b50f18cbdfa7c2bfb914fc4229d281282a80523e794de846d0f947238f1 SHA512 ba3ef2e4c66e0e33e21bb554c3e317342929b3d9969aaba7e3dbd745430b3952b6bb7d3142a3049c4de3e3dede7cc68a9810cd43642e014949e4564fcb2cc74d
-EBUILD misaka-1.0.2.ebuild 514 BLAKE2B 8f2038be015dccf62c6cc5b92ccf64f8e1b2e3d2f4555aaf7b3927f4df42e368b862edce8e3e2bc14da6023f24c36db5c9f0664e6e3cee1202d7850e484ce769 SHA512 b32c21fc1245dffa1f0480575556e68fac46ec7a17338757635438a7b5f01f6c999595b3d6ad263337c64021c1f8b623e806f29461aae40ded4d22b08e3cb9cd
-MISC metadata.xml 325 BLAKE2B 5af905c4032f92ed588676973f3525d35f77df80423be95e4e5bc87272ce71c2d685bb26cc09a448716f824e51334f60c716545130a959ca2f6e5d7334760c53 SHA512 bc9e07a67003034cee777f14118c2bf840d6481b61f84d811f42fd714cf9bc08675eaade34d2ac79c8efcb31e56e607156109a0b0984e23037f5744efd045a9a
+DIST misaka-2.1.1.tar.gz 112700 BLAKE2B 0d50cfbfa127a51bc6da2abc3a91c8ce4706b6a1dbbfc4af14f85d47262ab1cca4bdca0ba7056e668570b20bed1f1a150124a2d5da45ff8866cb7007b2b9bca3 SHA512 4b9288d56ddd57e07985043acbb5a2dfec9b7c0bf385b689b17f2b062f5d7aa961e0dab8e237173e714b13aa5eabafc646833d5a78cf728035444d6fbd365bee
+EBUILD misaka-2.1.1.ebuild 567 BLAKE2B 925d9cd73b3c51d7fedb3efd3e7325b3670a77128fd0376b8e783a3006d11f24a37aca42c9849757a0c2cd5de368d480a4c763ac7b75a91b8ee9148416929ca9 SHA512 9d449f4f385b1f800940ed1e4c58ebaa0e7e3104895d20a86aa139988de60e798c47191e0d23cb6d0666477ac63c664fd36bde0d6e5c77b11e07d6cfd82f74bc
+MISC metadata.xml 377 BLAKE2B 3aeafa213198d9f896a53057f39d3100b73df03b405935bf5eb93ae7945932b89e311e73bb1a7a694e409a2dc3053c423e3b81892b161d129965117c8ece0855 SHA512 268990d497bd23ed03b1c7273fa8170dc2dfdac25cc9759679f3c9abe205593763093a384b0bc9a9396c31de1b12849bfa905570c6ce7439c5c11bf1461754f4
diff --git a/dev-python/misaka/metadata.xml b/dev-python/misaka/metadata.xml
index 028f277d07aa..8e2bffc1919e 100644
--- a/dev-python/misaka/metadata.xml
+++ b/dev-python/misaka/metadata.xml
@@ -6,6 +6,7 @@
     <name>Openstack</name>
   </maintainer>
   <upstream>
+    <remote-id type="github">FSX/misaka</remote-id>
     <remote-id type="pypi">misaka</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/misaka/misaka-1.0.2.ebuild b/dev-python/misaka/misaka-1.0.2.ebuild
deleted file mode 100644
index 0d286e7345db..000000000000
--- a/dev-python/misaka/misaka-1.0.2.ebuild
+++ /dev/null
@@ -1,20 +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="The Python binding for Sundown, a markdown parsing library"
-HOMEPAGE="https://misaka.61924.nl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-LICENSE="MIT"
-SLOT="0"
-
-RDEPEND="dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/misaka/misaka-2.1.1.ebuild b/dev-python/misaka/misaka-2.1.1.ebuild
new file mode 100644
index 000000000000..f1a7a807f3cc
--- /dev/null
+++ b/dev-python/misaka/misaka-2.1.1.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 CFFI binding for Hoedown, a markdown parsing library"
+HOMEPAGE="http://misaka.61924.nl/ https://github.com/FSX/misaka"
+SRC_URI="https://github.com/FSX/misaka/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="dev-python/cffi[${PYTHON_USEDEP}]"
+
+# FIXME: tests requires write access outside sandbox
+#distutils_enable_tests setup.py
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index 6a128620ba74..f2df58cf6b44 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,3 +1,5 @@
 DIST mongoengine-0.10.6.tar.gz 469469 BLAKE2B 3930126d64e1b43d579412069da33a96e6c525d459905d05f677a406a262a15e16d8f6460637c253ace4addbe07655d194fede19fe050f4628aa17dbb6115038 SHA512 a8d16739892c64ed408afab49c6d33a4b438af83e003844caa101cd51366038ba75121d12b4385a546cf4d946a506bc11f173355f6855e740cef9fddfd6437e7
+DIST mongoengine-0.20.0.tar.gz 311698 BLAKE2B 11bae8d342a77bcc241884beb92d67a6d4f7112d0af3a467196eb94233b003aa27d019ab346140ce7430b4019879c8c86e01f3067677254559243b6d1f0ddc80 SHA512 ef973af9893f6e53811e1a47a131989f5a057af04ab9d512059f968af89fcd23f05d910c7de03330b5f4771db8e11ea2e48060f95ed790f8d238df6c6f7b9306
 EBUILD mongoengine-0.10.6.ebuild 805 BLAKE2B 2b0f1ed8ce17db744a0a329256234cf5074379da5d4808600c104f666e30c419befda185e473911adfd79173d842729e9a5e312e6b771498f6270754e1a84112 SHA512 396446adfd0e772b325bff46158ea49921b1adf48c434c9cec1cd231c7dba2c7634a6651a0be8c78fc9f13faf9276c84dda67cb426936cfe3e54b6dbf4449e6a
+EBUILD mongoengine-0.20.0.ebuild 1499 BLAKE2B e7e1f7991a765cd0e39accac336cc42484953a90f8ac8b0ac351b434d41610f301ee09e5076421ecb04ca21cf8329ac2edc2dcdcfcab2b2a4a56509f9f8c9e4a SHA512 03ec2d70d29d93b827f17cc7742184d6be0b76cf53ec3036772a39cdb8e7374bd5f949920411a653e12345e6c85cda3b4504ae02ef7cefe8023c74293951da4b
 MISC metadata.xml 338 BLAKE2B 5ecb99b784399bb9e25c094b38e6585d5dd6dad6bade4eebd9b986e5022ef89417e11151de2528439754717c76c9601aedf24dd3295eca09bf0c59f9bc1130cf SHA512 b25628f5af0a4c32d9ec8d7bc4e39ccf6bf2c9d9bdaa60bec2a3da846a9a290944822a1d8233cda735a4cf3a801acbfa47826f6bb537ce5c7efedc669282e523
diff --git a/dev-python/mongoengine/mongoengine-0.20.0.ebuild b/dev-python/mongoengine/mongoengine-0.20.0.ebuild
new file mode 100644
index 000000000000..30844f5c2a35
--- /dev/null
+++ b/dev-python/mongoengine/mongoengine-0.20.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="A Python Object-Document-Mapper for working with MongoDB"
+HOMEPAGE="https://github.com/MongoEngine/mongoengine/"
+SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# TODO: make it run a local database server
+RESTRICT="test"
+
+RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pymongo[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/mongomock[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: investigate
+	sed -e 's:test_covered_index:_&:' \
+		-i tests/document/test_indexes.py || die
+	# incompatible pillow?
+	sed -e 's:test_image_field_resize:_&:' \
+		-e 's:test_image_field_thumbnail:_&:' \
+		-i tests/fields/test_file_field.py || die
+	# no $eval
+	sed -e 's:test_exec_js_field_sub:_&:' \
+		-e 's:test_exec_js_query:_&:' \
+		-e 's:test_item_frequencies_normalize:_&:' \
+		-e 's:test_item_frequencies_with_0_values:_&:' \
+		-e 's:test_item_frequencies_with_False_values:_&:' \
+		-e 's:test_item_frequencies_with_null_embedded:_&:' \
+		-i tests/queryset/test_queryset.py || die
+	# TODO: investigate (wrong order? bad comparison?)
+	sed -e 's:test_distinct_ListField_EmbeddedDocumentField:_&:' \
+		-i tests/queryset/test_queryset.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index f78177baee94..8e28be7b9111 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,3 +1,3 @@
 DIST mongomock-3.19.0.tar.gz 100891 BLAKE2B 3a5f31be32f209527d371a6125f930f2d9e3c9a105554e6c4e34c68e390333179198c7c54b54d4f25a6032152b71b1f62a7c393c3d958e913d222ffc1230a9b6 SHA512 591fb398917850ba4163ebbb58470e4fc51a057f9b1a8c92897fceaba3c8e4b95645dafea6f8e58d182f629ab767923c5b75fc474cf2ac6ea952ada5b9522310
-EBUILD mongomock-3.19.0.ebuild 850 BLAKE2B 47585f924268a5c6d98fa4ffa23d056c0957064f30d5812036c7ff0637ab1addb102df37617660e0e3ed39ff19f3b98825bfe854cc23d533bd7604f11e3c4af6 SHA512 b122f9e64fa9e22f62bf9e46e7f06b406bc71ddf642bdc9c0b6178e8b02bed2047f6a5945fe0f34760155f5e875e1f1ebe89add812a2aa3520f194ffefc60fdc
-MISC metadata.xml 494 BLAKE2B 874f3cd8893511a772c8f7d8991fa70911c6fccc8b7e146da429a63e07cff45f4fa0ec6eb1bf0a3946025e1d27b1e05fbb84a2aaf00d1476a980d4b9cc2e9dea SHA512 221155a7d29c4296f3026068fe2188952199848002ab66d4ba8c9f14a6e1e51aab91d7aba485002095e3c5b4355c4833e44a3d8b84cd98001645356424b7706d
+EBUILD mongomock-3.19.0.ebuild 854 BLAKE2B 41830428d5637dd3b6485d16abbd097069682bdd27e65dc3229adfbf4672400a8a6dd1064edac0b8316de34cc288c24c4c0a345dd91ded9ad3761e66f233b004 SHA512 9fcc8ca838cd7da241832cb494ecdccbf515bda504b5b8dfb7851c6393c46e33aab41f27404d661e52a84420178cc98863e854710959dc873d892cd77fa49e30
+MISC metadata.xml 595 BLAKE2B 3014a8c24d47db3840066581d8c88307f4ffbc270700dbeb8cde95b4bda3e29bd7b0833c7c5dd13dab0eb7e9a3bc6b61ff75d4e128b813fd30db1da0b00f4d54 SHA512 c844e1e8ddc89a83dc4a0ee4b41f5d08471fa1320a5e8d1c139ab5803b4a11d28e07326cb2cdeb125d24f4af218adcf15aaca3b3272b54201024d5d7a5a7f059
diff --git a/dev-python/mongomock/metadata.xml b/dev-python/mongomock/metadata.xml
index 5e0acfd7cb09..18858b768c62 100644
--- a/dev-python/mongomock/metadata.xml
+++ b/dev-python/mongomock/metadata.xml
@@ -9,6 +9,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">mongomock</remote-id>
 		<remote-id type="github">mongomock/mongomock</remote-id>
diff --git a/dev-python/mongomock/mongomock-3.19.0.ebuild b/dev-python/mongomock/mongomock-3.19.0.ebuild
index 9dec418ea7d6..fe73bdcae26a 100644
--- a/dev-python/mongomock/mongomock-3.19.0.ebuild
+++ b/dev-python/mongomock/mongomock-3.19.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 6e4c6ef815f2..aa32f83624bb 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,6 +1,6 @@
 AUX networkx-2.4-py38.patch 3170 BLAKE2B 33577a719e9f59f910b5f0284318d77a9dba2392c4a2a25a0539cb3770f8326363de7a24473cd6c7d74a96911f3b0c040056daccaff23bdfd05fc9aff76410e7 SHA512 6142474c21f3ab613256252bf688873f19a68f781690dfdee63325835a692182e10b241495b0948f4658aaf2b36ff1f051931036cb97254459974dd807cd1550
 AUX networkx-2.4-py39.patch 2188 BLAKE2B e94c8ee731642a596d0812d82dbf85379249a64660c2a35d24ec4f405b5abb46fc4d971606ffaee0637d469673f1e55840629453c57d1e3c809d5e2b02c7a103 SHA512 3474cce5a89f3011bc8715c1ee6ca64c2251dae8ef142da24edb88c6b85d4ce1bc1cf72656674387b6a75132d25c4c348f1d32fc71674c789d3c06e9cb9dc5d6
 DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
-EBUILD networkx-2.4-r1.ebuild 1510 BLAKE2B 7174aacd90741d927f8299e841a36f7ef4d7b6d9a1dfa54e2ba1ab4b96db725a8c9d1cc360b8fff3341711216d539981b149aaba5576b0efec6a4dbe6f29808d SHA512 f002f7407410cb07aa64e8c65485b268a9c58f5b52d70ff2313d788939dfdc705b7e755769ad49116899b3d9adb8f3e8853dba2419ac5e86452b4b4746076431
+EBUILD networkx-2.4-r1.ebuild 1573 BLAKE2B 295aa550d91e38a9a891c3bc3e1599e2c1585321f9d750b4bd31118e43d553f83056d86e3cb5248189d29194fc9d107d5fbb92839d713739f105e2c5c2327454 SHA512 5abab020ce2045a9f882636d40a599827169038c5ac3a4104c08ab05804b8418b05d443ee71c743972595465efba69220ecb7cdd45b1fa9b807ec6ca0f387d3e
 EBUILD networkx-2.4.ebuild 1543 BLAKE2B b3cc53f08dad66b10636bb9082b43af06eb0828031b9327a1fd04bd329613effe35817af97f546b50ae0e194f73ed4ebea56af314e1311044395ff8c02546b15 SHA512 5c5a68c58eca8beb45568d6f4fe80bd1b58b6513cf3492654db7c4f5ca23d6192a9702793fd1aa62db48f3fc71b48a80dfdc5638c37e3c89d16fd3d1db2f3ef6
 MISC metadata.xml 1435 BLAKE2B a39ea5b9fb3de886147486d8d864b6df80480ca8d21326692f214546ce57e124e310dfca274c3d9a00643ed6783efd9ff79f446d8a5c642a97a67f1015590e63 SHA512 e360b0a0f506f12424feb3b5e9b998480e504dd784b27f0a64aecd69c0f14b23468cf17ff03df47a760d24c5536ee8f454aeb6e48e2aa9644d5b29a7cbd1a958
diff --git a/dev-python/networkx/networkx-2.4-r1.ebuild b/dev-python/networkx/networkx-2.4-r1.ebuild
index 988703d38773..ef197baa3467 100644
--- a/dev-python/networkx/networkx-2.4-r1.ebuild
+++ b/dev-python/networkx/networkx-2.4-r1.ebuild
@@ -32,6 +32,8 @@ RDEPEND="
 	scipy? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )
 	xml? ( >=dev-python/lxml-4.2.3[${PYTHON_USEDEP}] )
 	yaml? ( >=dev-python/pyyaml-3.13[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? ( >=sci-libs/scipy-1.1.0[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
deleted file mode 100644
index 6be80790195c..000000000000
--- a/dev-python/numba/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX numba-skip-tests.patch 494 BLAKE2B e871220602a0e27045d2223cddb74372f9712600336d1193d79db878cf63c87b96c832e5e2ba734d07679feb0b43cbbb38c1310431035ac59a3a15969e353dac SHA512 d4f4eecd0daf793cb7b6dd8cb2c1a462e8dc726c5f8212aea5b22ae837200c70c7eb331e6018f83bc895096e0c8e93751f32fea624de157ab154122a59304069
-DIST numba-0.37.0.tar.gz 1734667 BLAKE2B 20fd765d226e6e71a0e94bbf8c6a605ef7b4cf8ba6e39667001051c642fb9b872540482e710e020c0fca6653d9ca4518ce82e48681613f28ac5b9e2346bece4f SHA512 83a4e5a28a43ed1cd6584ccd63aac38a928af48c424ed119bc86487f0a2bfb9875c34f6fe0a03446d8c8e9179be81f831200c12ff31edc22bc4741789095f861
-DIST numba-0.39.0.tar.gz 1782489 BLAKE2B 77a6afe587ce3ae0ccd782e329e626d63ab58b84a2aeb836710fc0c13dcc88e16ab36e7426c6d9ff88c6d5be854915128dc2868d7fa71511ec9c8eea9debffe7 SHA512 f9cabf39fea543495425ba326aad34a52d317ebef61e5b298588764214bb396ea43871d32875f0882a36909bb12fc2e3807c38b5fc60ff5d9e6dc9ccdd36bf6e
-EBUILD numba-0.37.0.ebuild 984 BLAKE2B 01fb1a871a731647821711477ace232e1e279c587f7b764ae32cc64c50ced7532b6687842e2004fb4737ac84afd7c37942b575c7f5d7d419f06dcf4c0472967e SHA512 85c1e455e61cb5e418835544ec36bc876a1ff5b5b43f0d6f4566a64391513db0577368a4577878803ac74bba301486b065f9a90d2d931fb63fd17b02c6de86e6
-EBUILD numba-0.39.0.ebuild 986 BLAKE2B 7f0f11f7dd96da736dc2c1ea2d65519e228440431bbd169bc7293da4a52cdd968812b0a2fcbb54c8911c4d21b7ac01db2d134dc6b75c8744b2490811397d24f3 SHA512 1daed3cbb1cebd75ba6d5afc60d9be27a2108d3bafa372f7d72afeee71069e69cbf1fa11bb352e2be8568fbcf75e1a77390a27ec239619489a8cfef4cf9f8825
-MISC metadata.xml 737 BLAKE2B 1128d5462b06936986d002e8f3bdb1109f5c51ac3e1f5a1b7026a24f7011f2b732afe5b5d94ee14a13ad319a7649fc2c58d71c78cac0dbac016595dd9572168e SHA512 888f5390288025c789b880093dfb98b8597a0989f52bc8125480126da88366d968a2f76fabe2cc5f271810c8be2fe061f83f67db6957d4208c68e3f1af86645b
diff --git a/dev-python/numba/files/numba-skip-tests.patch b/dev-python/numba/files/numba-skip-tests.patch
deleted file mode 100644
index 2c177c07034c..000000000000
--- a/dev-python/numba/files/numba-skip-tests.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/659804
-
-diff --git a/numba/tests/test_linalg.py b/numba/tests/test_linalg.py
-index 46bff63e8..53056ab23 100644
---- a/numba/tests/test_linalg.py
-+++ b/numba/tests/test_linalg.py
-@@ -1282,6 +1282,7 @@ class TestLinalgLstsq(TestLinalgSystems):
-     # Suggestions for improvements are welcomed!
- 
-     @needs_lapack
-+    @unittest.skipIf(sys.maxsize < 2 ** 31, "errors with 32-bit address space")
-     def test_linalg_lstsq(self):
-         """
-         Test np.linalg.lstsq
diff --git a/dev-python/numba/metadata.xml b/dev-python/numba/metadata.xml
deleted file mode 100644
index f9cb6d121825..000000000000
--- a/dev-python/numba/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-needed-->
-  <longdescription lang="en">
-  Numba is a NumPy-aware optimizing compiler for Python. It uses the LLVM
-  compiler infrastructure to compile Python syntax to machine code.
-  It is aware of NumPy arrays as typed memory regions and so can
-  speed-up code using NumPy arrays. Other, less well-typed code will be
-  translated to Python C-API calls effectively removing the
-  "interpreter" but not removing the dynamic indirection.
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">numba</remote-id>
-    <remote-id type="github">numba/numba</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/numba/numba-0.37.0.ebuild b/dev-python/numba/numba-0.37.0.ebuild
deleted file mode 100644
index c7708590b698..000000000000
--- a/dev-python/numba/numba-0.37.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
-HOMEPAGE="http://numba.pydata.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/llvmlite-0.22.0[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/numba-skip-tests.patch
-)
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	${EPYTHON} -m numba.runtests -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/numba/numba-0.39.0.ebuild b/dev-python/numba/numba-0.39.0.ebuild
deleted file mode 100644
index 50196a853e65..000000000000
--- a/dev-python/numba/numba-0.39.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
-HOMEPAGE="http://numba.pydata.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/llvmlite-0.22.0[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-PATCHES=(
-	"${FILESDIR}"/numba-skip-tests.patch
-)
-
-python_test() {
-	cd "${BUILD_DIR}/lib" || die
-	${EPYTHON} -m numba.runtests -v || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/objgraph/Manifest b/dev-python/objgraph/Manifest
index 963875e7dd6c..fa7bc758a21f 100644
--- a/dev-python/objgraph/Manifest
+++ b/dev-python/objgraph/Manifest
@@ -2,5 +2,5 @@ AUX objgraph-3.4.1-tests.patch 2708 BLAKE2B 2b2c78340c1be1c60fe3b43a671b1fab07bc
 DIST objgraph-3.4.0.tar.gz 634554 BLAKE2B d1e58370a50a9c9d8647c7633a780069581eec61cccef56e83b015f26a7ffbba6b872673d72dc138339b3c97a3f08c02067e203ddb1d1048ae6f3611e0837fca SHA512 f1e2b9f22dfdce56988bd40aaa865572c42688e73800bb7c188b903c67ef3726c03ba058ed30d40792133a2e2fe74d5ecda91be3de8cf7b80188ac0b9f6ac393
 DIST objgraph-3.4.1.tar.gz 634602 BLAKE2B 17424fa5b6b079e9b0dabdfb5facc88fef67bb3742252fd986b19cb0b674c40f335e0372cb08a86e89d42cce0d504830c24471e0d34483925b33d44f45859445 SHA512 174e097cd9f9b5bd2e83a389d2ce3bd05a1754c1535923cc75f59a3281a292b50014501f093ccf1b2350fdbb34757af950636819227e39cdad2f64cb7de5ebb8
 EBUILD objgraph-3.4.0.ebuild 658 BLAKE2B 1a70a174cdc6d7b43860e3006d136b8d912c9a98244b492ef1372589c7951fa01e5953d1833e0fdeadd81bf1a64a529897d56582919634d33b58ccd373f306d7 SHA512 6209380e4e502984ab691bd2525f1eb89f7b44dccd9e7a84a99c5814b8e011c0937d14b5e405b9f42d112a50650f4714eba0d69de3def539460f3a29229e0da5
-EBUILD objgraph-3.4.1.ebuild 685 BLAKE2B af7cb7f4e4a181c08dd8bb46b6718a79ec3ffe7b650132ea2d36389ed56563652af336d3f89924cbc4fc0426b11c16fd0d2741635037b507850628bd3f4d6738 SHA512 ae052b9e243a9a8f2d3fd5a0f09b895965a202a182e99639ed5678cfb1d9f05ea4379fbaf9d0d7e9ddd5a2605988a88f0f38e7f7c160dbccda646f8858b9fd91
+EBUILD objgraph-3.4.1.ebuild 684 BLAKE2B d6426f19e63f349e7fec55e4eca3f433327bc63524dd8c2c2795b19c48a0a6eef22a64dec82f1409d4124c3a9e3a8409f0809955057521b6316411227467a68e SHA512 5393bf5b1bee55852ac63cd9dc741060095dbb77525568369342f261e9f8a0734991b3a304f2fef17183825e88810060835ecaf4a2fd93b1d7cc35d7eb3eebaf
 MISC metadata.xml 323 BLAKE2B 61446164eeea15b99f003a44e0b0c3eedf83a0797401922efc0d6509c86446823201e9c7b91a11264f852ce0a56a2d6d5d5b27fe9d2205a4276c2cce5a312625 SHA512 94389cd95cc8aab6c1acd18c2135eac25566894f9d793ab8dc2af68789ee464dde409350bd4dbe9fd9a87c7f81e45723331948a7d9cfc792dfa51cb86e74ccc9
diff --git a/dev-python/objgraph/objgraph-3.4.1.ebuild b/dev-python/objgraph/objgraph-3.4.1.ebuild
index 3c4bbdb00f8c..9d9fca972a5f 100644
--- a/dev-python/objgraph/objgraph-3.4.1.ebuild
+++ b/dev-python/objgraph/objgraph-3.4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://mg.pov.lt/objgraph/"
 SRC_URI="mirror://pypi/o/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-python/oslo-cache/Manifest b/dev-python/oslo-cache/Manifest
index 9c2d12ef6356..e71ecad4a195 100644
--- a/dev-python/oslo-cache/Manifest
+++ b/dev-python/oslo-cache/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-cache-1.33.3.tar.gz 56098 BLAKE2B b3d2ab549a2b2066ffdfc5d9b680da35501818719a8c6f460be1520c2d6342f1c41f0f1aa20ffdcc45958e83e242515a3ec8bf69ce1273ab47a8a26e648069c8 SHA512 7edc1d8ceb00f2989093ec1809120f2aa552de2d5ce6176c9af56278040d652fc0d627e0f7f427b9bacaaa24cec7b0fe24568316d90a4e52054357bc9b9e30e2
 DIST oslo-cache-2.3.0.tar.gz 57209 BLAKE2B aa34c4deb0206c86181e629b1ccedaa3b0b7a503f4648b9ffb23dcba84c98658017a720701176776652a2a58447c54662314dd4853ec6ccf6c2acebb4b559325 SHA512 c3ad9c326fa71985d4546bd20bcb8aa9508808c8eae2a9e3dac1c014d148bfa8f5a847eb2ca8d1a204cce07b6d640f9541491dd41c7c6169e993e408786358af
-EBUILD oslo-cache-1.33.3.ebuild 1064 BLAKE2B 753592d05bf39a8ac6ec16c056bddedb5e99b007d57679d277dd74e598531c8388fa19f421e8c5a537cd4269e5e448f2162e6f15ea02abb01135524580e66c80 SHA512 90195588142d161bfa928a5690ac37d0fd0b125c0f44448289251e12116357e9f1bb3fa232228022a8b348d297e338aff14abc3a736f450c137a073acb9b3d90
-EBUILD oslo-cache-2.3.0.ebuild 1023 BLAKE2B fc25169df8bb81be966a7e8776bd2d3d2d690f72ab56133841ae6937f1542fba589a60d054cf974d6072aa5f59180655b5da992d1cf9406243029cb81d7e497d SHA512 4f3c9aea97dcb20064430c073553f4d927d01b6dff2895e33159f5a7eeba73ffe51fd0bd6d541aab1ca443271878acca6ad82eb50b8c0471ec269a98b6bce242
-MISC metadata.xml 457 BLAKE2B 09e44ecf9952f5bfd930616506874014a267d8622daf6c22b3da4856d9f4bbedcb3e4e72285972da026f310c47973c0bb70c222292caf877d4f9ab6d5166955a SHA512 f98547e9de8c502afabf7c53409df90ec687159b5160c8ff2166acff4d6bce0fe69c8eec78d50f52919cd75733f44f82dea5f9cde362d22ed69200d332b9d6b7
+EBUILD oslo-cache-2.3.0.ebuild 1021 BLAKE2B 45dd67c0cd2d60b568c2c6d7168f797d38a80356f3c1be453a685ca5ec4f517dbf5358d8b867eeab1486c74522c09278e02e65c0e6a21c2e38ea35ed6c0c7cd9 SHA512 032d1738c469567db402750311e45fd5f1004ad6074457705ff24107f60124f604c1fb432953a5fd618727f502371c10a02415190db36e808086e52e1f66fb2b
+MISC metadata.xml 374 BLAKE2B a37cf54f2e8f63fc48cc05b6e7aa14846e38d7d37e2d98fbc5fa8cd0898464feacfd0995fc433d601b1da5948c371d1e2bd7aa70de56ecf27d565d7c9c11feba SHA512 f4f708e9f96a376b677d0ff48955cb8194d1829ad63096d0b17af0b52718ec26103bbe1a7cc45d6cb28c1c4fb39db7b0dcb40882aa239d69fe65681d4feab712
diff --git a/dev-python/oslo-cache/metadata.xml b/dev-python/oslo-cache/metadata.xml
index 5bcc8af1ede9..22854aefb25f 100644
--- a/dev-python/oslo-cache/metadata.xml
+++ b/dev-python/oslo-cache/metadata.xml
@@ -5,9 +5,6 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		Wraps the dogpile.cache library
-	</longdescription>
 	<upstream>
 		<remote-id type="launchpad">oslo</remote-id>
 		<remote-id type="pypi">oslo.cache</remote-id>
diff --git a/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild b/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
deleted file mode 100644
index e0d9e2955bfe..000000000000
--- a/dev-python/oslo-cache/oslo-cache-1.33.3.ebuild
+++ /dev/null
@@ -1,43 +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
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Caching around dogpile.cache"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/dogpile-cache-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.30.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.31.0[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-)
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild b/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
index 617334205e5a..d4994a79e4e3 100644
--- a/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
+++ b/dev-python/oslo-cache/oslo-cache-2.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index a4b7c8fc20c1..c255b13e6897 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.concurrency-3.29.1.tar.gz 51785 BLAKE2B 4035981fcff3cb4384209f3b640b928dfacd13e324c9df1dfebb0c5230727736ff803b478e506b08ac4bd7bd405763b93bdb951b01751a5e293daa33df860c8e SHA512 f820b07dbb26be9170c7ded08ce96bebc8c8cbfa72a3be56e0cb0fd7a025160fe630ad256c8c5b1adc9059cd1608c3625513b3da311e5a611866280d2b65424e
 DIST oslo.concurrency-4.0.2.tar.gz 53910 BLAKE2B 090d9ba4b5267f63edf6cbc6f585e48019a4ac293e24914a8f7c52009b34ce9a4822a8705934c642663bd2a09be3085458868159ef041498e2085e4ccbec50f9 SHA512 ca1ef615ebe986acac853666877061bbc7a02c09bec294ec6221ae4800a561cf9f218855f7eb8b96184d645924e5c68963b47116835c7d2495de83617439d1ef
-EBUILD oslo-concurrency-3.29.1.ebuild 1815 BLAKE2B 72279de34583eec51ce337093b9b0efc24628e10a9ec07dbf981560a8cf77331d80a3b5950aa1df52034282995b441ef7317547caff41257daadbdec11799cc1 SHA512 9576baba99ea2de1b6d241fb4f2cb8537126099070cf24e08f618ab08c05d13bec23cf3c0c18005edec3d58b873fc90205ffc1dd978b4f1bc9e0383f480bc23b
-EBUILD oslo-concurrency-4.0.2.ebuild 921 BLAKE2B c70117bf079d08c7187cfd6a0a886a761b24234912fc48115101e4975d2f0e627a4d09b36f1c865f396911c31311f56ec2b64a35f754f0c56573f3a66a2f859d SHA512 5ba1207cce8e69ed2156a160b2d325b0270f54d10e713a124bf57f4e848916546861832d4b4f4edb47ded5c2ed18f11c6d6e4891df0eb8c76001d6c7fee26400
+EBUILD oslo-concurrency-4.0.2.ebuild 919 BLAKE2B bbc9d600df9f76bbaeb1b980db257b003965fa20aed85a701a4b03df4d7ac71da3607dd682fc8f64a3bf432eb8c27c651a9e6100feb6354f93116832d946858a SHA512 15100f184a59b44ea07938e8e0675127169dd0ab3455f13722a4d5b68baec5233c6fb12f129632d976842676abdceedf6251756739c999b491fdd718bfe7cabd
 MISC metadata.xml 665 BLAKE2B d648ddb783230e648e931b39640fbb9d8a68029ae87ebe48eec97e05cadafa39dde8999fd01f8fc6b05cbd8590150b1f1444263b654ab3bb4bd3cfd2baf3d13c SHA512 de8aa8ac698d88f71b8368334e2e9c5edbc559a612e8d92379400fb73d82e44f70b9e23726fef13414e36fc159f3a8bc41753c4c83daa4d31aadef942e9a484e
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.ebuild
deleted file mode 100644
index 02eb25dc688b..000000000000
--- a/dev-python/oslo-concurrency/oslo-concurrency-3.29.1.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=( python3_6 python3_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="library for running  multi-thread, multi-process applications"
-HOMEPAGE="https://pypi.org/project/oslo.concurrency/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.concurrency/oslo.concurrency-${PV}.tar.gz"
-S="${WORKDIR}/oslo.concurrency-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/oslotest-3.2.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/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.6[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.6.7[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/fasteners-0.7.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^futures/d' test-requirements.txt || die
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests ${PN/-/_}/tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
index 7d4e1b76c591..6e2470a8637d 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.0.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.concurrency-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 RESTRICT=""
 
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index cf72820f2585..f9aa7707432a 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-config-6.11.2.tar.gz 152842 BLAKE2B 9217232e11252cd59bed9ae35ebad28fe8013f5608fe45544f7fb1d35cfb0a27c1172fd2f565f812ca3d9672d30df2962ac51de551cc50c8fefaae2266943959 SHA512 47e92c14d873a127e12fa734d975032bfa560a624111625b622d1b1896ce6e786ca661312afa894176941d4e8b13a2f6f5b44a05092e23f5fe1f8f78596498ae
 DIST oslo-config-8.0.3.tar.gz 147691 BLAKE2B 9af2a1ff399b52261561d268f6b9cc673629af572faadc736e851826ccf84ea8fcb8b8846b62f85671934f5214f289301157da7197dd5a15ad6e9ec1792bdb31 SHA512 09c49b0917d20c74e59efd6b8cca0394f98c337b075f916ae21f6072ce6f28a90a701a3f63f0737e4b3161cf4795fdb2be9b01091fd00828990cbc715683b0f4
-EBUILD oslo-config-6.11.2.ebuild 1306 BLAKE2B b5487b165d8d0033e059f12e8659d65337cb5440bdb1842cdbe8a5f4cc7dc7955b35d0b903a1a3eb107c979debd205ef7de6346e21550a880536fa3a1b6f7806 SHA512 cfc567e14554504a9a4251a50cc6a6404938063868d19d5a4f9fc85d7a675c0870f4f2c50e32492400ff0a83cf1f3edea888ed4d16e528e7e9f49604a7c70893
-EBUILD oslo-config-8.0.3.ebuild 1265 BLAKE2B 3c283fc58e731e4e1de29a806bef99019966b6da3596add9434e02ac69b94a1c31064c76f011df5ec4e5c1074ceffee3277f1728532813e0aa2807b092c03c3b SHA512 43045a80be041b522081373fac8038f87f1b61103b48edc1c7f2fbbb7f63b219162571f4b3f7d557809186b996419307f57774c29a7fa51c00c3ce9a1fe13876
+EBUILD oslo-config-8.0.3.ebuild 1263 BLAKE2B 92e1af2fc8aea20e97bce64f83b2c52a1262519ca08bd36b8ae6b8c3a1fbb3e831743cd06e41279d26f2f20f5a67acf8335182567cad8e0cb67af6e1145525a4 SHA512 fae4d1e2eaec5a47466f7877244f6ca5523ab707cec6308b6416fe32b6072b9736627cc523d2f4abf5e53f770e50ebedcd4395e701cc1c5561a6cf195db2e508
 MISC metadata.xml 670 BLAKE2B 5e3551e2fb4d57226dd82ad46f361f624d1b05ccdeffc1ce86a90692a385841ed26739a3ab01e72284fd6dc47a2607ee1bf30548a2b754944a9b975629fef261 SHA512 c09cd1761655f29d25e689ec95939fa59f4fb9a3fbd48509c0a65d2d289e073b3c60faa838e4075efafe32b2caf2b7fc3ae46af556cd50f66c37ac5ed8a1d52c
diff --git a/dev-python/oslo-config/oslo-config-6.11.2.ebuild b/dev-python/oslo-config/oslo-config-6.11.2.ebuild
deleted file mode 100644
index 8bc82001771a..000000000000
--- a/dev-python/oslo-config/oslo-config-6.11.2.ebuild
+++ /dev/null
@@ -1,48 +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
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Configuration API"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/debtcollector-1.2.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/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/rfc3986-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	rm -rf .testrepository || die "could not remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-config/oslo-config-8.0.3.ebuild b/dev-python/oslo-config/oslo-config-8.0.3.ebuild
index ceaab62f1656..bb05b85eae23 100644
--- a/dev-python/oslo-config/oslo-config-8.0.3.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.0.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-db/Manifest b/dev-python/oslo-db/Manifest
index 031f8b7dda13..9cfc345d0726 100644
--- a/dev-python/oslo-db/Manifest
+++ b/dev-python/oslo-db/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.db-4.45.0.tar.gz 172505 BLAKE2B b280daf94dcdcaa21051bb1c8d611199725b7ad9017225f16ef2ae7342941a6b2bd474b1598cdb54e301f5143c985f250ec1b1f64cddf2ac3cb71a03d9acf589 SHA512 f976ff2aab1e39ce253618ed5669ee0b824ada03073028a990899784d96378eb7c5a2476e1a60ab9afa5a30fd8e34c84b0545d63a7f3c522cad9c7423208b1ba
 DIST oslo.db-8.1.0.tar.gz 171252 BLAKE2B dbf6f580d95ce06f0ab4a50cf289765a2fa55459c56b89f079cbe93b319c1ebdd4287c47a7b69e0bff1ff91149f2dc9c7b8d90769f17cca26f42a2d0a69e46d6 SHA512 3070561990c630a26c936f787be1cacc7747b915bf01178624047551891c9e44b3d17a8d818bfac259d7083a8bbadba1859ade4a15821c00316bdb3860056208
-EBUILD oslo-db-4.45.0.ebuild 2126 BLAKE2B c304a08e657950229de40bba7eb90153b62003060b96c2c98149696e9712651eefa636a8ab936008d399be25006cf1189eacf7409db0b5a19d7488800c070c84 SHA512 a3a59c744bceeac135d28f46f2edbf50a6abd68d2ef95cd644df0cb1b26585992981270ac701a23df02d173010e7855f4c606af27c6a84b05c031534cadcd93f
-EBUILD oslo-db-8.1.0.ebuild 1476 BLAKE2B 90214b1966ab90c3b90b61f4fde3b3befca038c18b6265705d5ea6b745907d20ec7301aa02d33ec811545292327a25f75858cdbdb570f9da7a3dbef3cbb398ce SHA512 1f9dce5db51c45fa7890334a54ec6416b9e7c64c28b7de541f09407ccd63422e8131bc1344f09ebc7f498e59e296d421e69639ef28f16b4d019068242bfafb45
-MISC metadata.xml 553 BLAKE2B 692d0b1168c0d7d4ab698d04351e60ee38503f2b4f429329e5b1d680f6d3498721a6bb4bf135898ddfd3aa70378a5d399d520ab026ad1b752974f572b6add628 SHA512 381c6771ca698c6d8958ecee9805e079e0194d35ad55d0ce3543428026229450689ae681e80b33cffab498537a8874b0236aad996e843ecc00d39e943ff0f7dd
+EBUILD oslo-db-8.1.0.ebuild 1474 BLAKE2B 089e81fd64cf6e1d6a6fbdc707308c712a26b7d451b0f38b99465f9b944b8caa6539575b5d7781d429b6f0fe13d7cafe4a02ad41932c1f1d1a1d0b1f2aa9b79a SHA512 bc6fea4e75861c2683421018d70303013090ead9f9ed1931f9bb818cee284517faa9578d4fa261011d75a7a82e1398cec2189947e253729645c4d82242bd84ba
+MISC metadata.xml 478 BLAKE2B 9966e5a6be6239d04de163365d9203cc2276b33de787b63258821da902d020ab1dc00214dd0120e0e0e8d4d43929a30c353d922160bb7892033649733fdaf670 SHA512 bb0a953c61b6faff8581c2e63e1c3c265bdc20a0a76e7293125b4d6fd661c14a5c8aa95b84675918eb0f201c74002172864e3f66dbba0a3e54d41293475ce2a6
diff --git a/dev-python/oslo-db/metadata.xml b/dev-python/oslo-db/metadata.xml
index de3f3bb3dae2..99c91eda97da 100644
--- a/dev-python/oslo-db/metadata.xml
+++ b/dev-python/oslo-db/metadata.xml
@@ -9,9 +9,6 @@
 		<email>openstack@gentoo.org</email>
 		<name>Openstack</name>
 	</maintainer>
-	<longdescription lang="en">
-	OpenStack Common DB Code
-	</longdescription>
 	<upstream>
 		<remote-id type="pypi">oslo.db</remote-id>
 		<remote-id type="launchpad">oslo</remote-id>
diff --git a/dev-python/oslo-db/oslo-db-4.45.0.ebuild b/dev-python/oslo-db/oslo-db-4.45.0.ebuild
deleted file mode 100644
index d4bf92584022..000000000000
--- a/dev-python/oslo-db/oslo-db-4.45.0.ebuild
+++ /dev/null
@@ -1,65 +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="OpenStack Common DB Code"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.db/oslo.db-${PV}.tar.gz"
-S="${WORKDIR}/oslo.db-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+sqlite mysql postgres"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/alembic-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		dev-python/pymysql[${PYTHON_USEDEP}]
-		>=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}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.7[${PYTHON_USEDEP}]
-		>=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/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^testresources/d' requirements.txt || die
-	sed -i '/^testscenarios/d' requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-db/oslo-db-8.1.0.ebuild b/dev-python/oslo-db/oslo-db-8.1.0.ebuild
index 216614e84cb7..faeef68958d0 100644
--- a/dev-python/oslo-db/oslo-db-8.1.0.ebuild
+++ b/dev-python/oslo-db/oslo-db-8.1.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.db-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+sqlite mysql postgres"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 39f0796e3b34..4c4995d00aba 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.log-3.44.1.tar.gz 87427 BLAKE2B 225f855c2539557d4d673c23fd58618c669864ea3d5c13f6ffdfc64b4926fd33ec45b6730671b4fe70a105aee39adea63af88a735dabbd5fe9588afb1fd9e2dc SHA512 b8c655bbe2e49b1d69ba7a68c9f115f012d75f0bc0fa1d5583d692b01e65dc17c956fc738cf8092ebb90ac9605c644989526fab4132f23ddef92835ff433e1ca
 DIST oslo.log-4.1.2.tar.gz 87095 BLAKE2B 20dd69c5002f33c288c7c04818435076ffba112b91e0f5726cb32674f10e162e378bce221278428714aa827cee81253cc21bb0588934cd024b7948b349e60a76 SHA512 f34ed66bd289fc88420d02d67ce59b498274d44f43d20b53cef1369699d715ec9706a5f62b81de3005010de1e1fa4c36aa935ee72f81160a75cbda3596a0d167
-EBUILD oslo-log-3.44.1.ebuild 1314 BLAKE2B 3210cc03011bb3a427d514033f0a65a537a5b5b672a222c38b9515b77fd4e00b86ee9fd6e7a5450722931a65030a3563207bf00d47f72ec71e605def7f14160c SHA512 e67dfb0104f968ac1859e564823d5a7b2be6633822b06599dc78648b27db1734945c520f3d86da6ae47f84ce68cd9b27ae5445d5f25fe251adb95a811340fb99
-EBUILD oslo-log-4.1.2.ebuild 1273 BLAKE2B be8e807df3640d542a0b80b5024bec7c6fcbf3fb124f2b48de90504bb6ea6801c55f3effde8d5629778e79b99fe4003c2ad5cfb3a2ae3dcfb1d583c349657150 SHA512 d8f71fce7d6fc2028f4f6371795e54aefd8fe7a501c005462d0af747e126fe61e3064ce19c6a710db80d5ef41d36c9ead5984a904e247e8a23ce3b71b692bbb6
+EBUILD oslo-log-4.1.2.ebuild 1271 BLAKE2B 611d4c2d8cf6d7199dcf9f062f40f75bc1293c2e571e9eceedfc37e7e4827f42629b69364f47db2f6c6231c88917f8b64f767b9f66fdb35faef25028bedf0d68 SHA512 1996c1e2af625923e6f6aefdf4d0087e3cdebca2b1378fe05f94dba229ec5c88d79efbb756f098b5058085aadfa1b2669208d5bf00daa67fae554f0df68813ec
 MISC metadata.xml 882 BLAKE2B 4d0b8744bc619081ffbeea3099c745d07f12de450dccbe6dd4ddb58ee6aa87c7269cdbc2bf6daac36b5a4000e5fdb94ef056a7cd0c7557d4d909359392a2ed72 SHA512 89df6a639f1b44eccb4409c95237f3b4841312b74e74d315a169b7c6faa8a457507b7c085ebbef56b8e399cf37b27ff02474491a128880e919866a6da01a084e
diff --git a/dev-python/oslo-log/oslo-log-3.44.1.ebuild b/dev-python/oslo-log/oslo-log-3.44.1.ebuild
deleted file mode 100644
index 9071f914d928..000000000000
--- a/dev-python/oslo-log/oslo-log-3.44.1.ebuild
+++ /dev/null
@@ -1,41 +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="OpenStack logging config library, configuration for all openstack projects."
-HOMEPAGE="https://pypi.org/project/oslo.log/ https://github.com/openstack/oslo.log"
-SRC_URI="mirror://pypi/o/oslo.log/oslo.log-${PV}.tar.gz"
-S="${WORKDIR}/oslo.log-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.25.0[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.19.0[${PYTHON_USEDEP}]
-	>=dev-python/pyinotify-0.9.6[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-1.4[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}"
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests oslo_log/tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/oslo-log/oslo-log-4.1.2.ebuild b/dev-python/oslo-log/oslo-log-4.1.2.ebuild
index fa80b804fb41..cb23d1034473 100644
--- a/dev-python/oslo-log/oslo-log-4.1.2.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.1.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/oslo-middleware/Manifest b/dev-python/oslo-middleware/Manifest
index b3a5f9b721fd..852aa3ad2216 100644
--- a/dev-python/oslo-middleware/Manifest
+++ b/dev-python/oslo-middleware/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.middleware-3.37.1.tar.gz 56354 BLAKE2B e9b119d2163c3949eb98b7580b4d5aa4a4427b9a8b3a841549f282358d8daefe62cc3f0588535c744aab7b77b44d38691316f50b9d60e5c974e3a0714a367699 SHA512 1864b2c25602ac7e27e2b080617f7af5f38083705735893dde744e7535d127d62ab0f29a0ef2575ec53af22969544d83e454bc5913b5719c4eb7d312764fa5c0
 DIST oslo.middleware-4.0.2.tar.gz 56678 BLAKE2B 5e548f35eccb896447337317dc68d2294c6cf9a064c8cf938c205dbea47af11107d98efdfbfa1829dd2c4f74bd6a9ab51854cdb267321c1b80dc8f9f5ccdf3ee SHA512 8be5fcd85b3afcd0115f4c700f7b2e8846d5b23f0e93765e2cf693b2e0f982a9a8feee6648e261e36890a8a57c28dc550d2d65e5ebc209a4e709b463e5f8ce04
-EBUILD oslo-middleware-3.37.1.ebuild 2018 BLAKE2B 0bb6bf29c5d9fc8580a3df64abd2a559cf0d9e2fd1df686b3fafcd3fc6dbc38322d720dbf08c65644e5dad7ad11dd5b1e469aa3e42ccb3c8cfad66a44e74d9a6 SHA512 b16ec22d46819772c88369c01941d3dbcf3a56245c64f08a714b14d5487c14cd34e1175179d9d1b1135f40b0af3390d3ace3066c01d3f776b3995350830e0fe8
-EBUILD oslo-middleware-4.0.2.ebuild 1164 BLAKE2B eab966da85c28f0091e8ddf65f338e2365bef0b1d5daa765bc2426e9fda9ce5ca862923d8bd30987b650e4b36b131675f012ffbbeed4d00c5165ce26e485019e SHA512 dfc32935b9ba31e7b070929677f4de6eb49772a5329954e298ee4b8b47cde5a08cf31d876c8f047b8c51147269ee9fb34b3842a73168fc28de1478384cdd19ca
+EBUILD oslo-middleware-4.0.2.ebuild 1162 BLAKE2B cdcd282eb49e66cadf8a79f19dd57a99cdad2834d2b681f636bff445296dd2c42fd16a18b63246427a518a00be3122debf6ad41a4b044ee204cbde06eaca52cb SHA512 c3734243136124574e66a8acf50a9057f96b08b16a18e4787f45f2cc30466e3c1534215830f7f8d4df5983cdb2006ad71d32b04c30898f2972a13031467eaff9
 MISC metadata.xml 766 BLAKE2B 09e791c996ee3e46083287243f3180ad073f53611981ef527b166c7c251401b2a3c34b8c0db8142ad77b4d4a82b92e43696b36f5fe80f7077e92928d5a825930 SHA512 38381c4dd993470e01cb5d469f345880a730b9afb3536b467a6e86243174192db346dfad58282e17d1bc0bcfb33e08b0f1797577e938c982e633cec8719d468e
diff --git a/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild b/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild
deleted file mode 100644
index 529e6b770e81..000000000000
--- a/dev-python/oslo-middleware/oslo-middleware-3.37.1.ebuild
+++ /dev/null
@@ -1,60 +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="Components injected into wsgi pipelines to intercept request/response flows."
-HOMEPAGE="https://pypi.org/project/oslo.middleware/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.middleware/oslo.middleware-${PV}.tar.gz"
-S="${WORKDIR}/oslo.middleware-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
-		>=dev-python/coverage-4.0[${PYTHON_USEDEP}]
-		!~dev-python/coverage-4.4[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-serialization-2.18.0[${PYTHON_USEDEP}]
-		!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-	)"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.19.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.33.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/statsd-3.2.1[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild b/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
index 6ad72d5e3427..2cb93036d245 100644
--- a/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
+++ b/dev-python/oslo-middleware/oslo-middleware-4.0.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.middleware-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 RESTRICT=""
 
diff --git a/dev-python/oslo-policy/Manifest b/dev-python/oslo-policy/Manifest
index 44f383569906..ea1543dac736 100644
--- a/dev-python/oslo-policy/Manifest
+++ b/dev-python/oslo-policy/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.policy-2.3.3.tar.gz 93581 BLAKE2B 50d1b45b596242b901a5b583b412c90d55b2ea9501dab29fa24be7b1c64eacf89f0f7df742f897503ab3c09399bfca25b93ed9cc3aa2377a72986f73bb96f1e4 SHA512 b4a2febe240582dbad8306e2208bfb7bd83c2783002544428b5888a8930d959919f10044eb2c30579e2fe61a6958ebefce4300f1778798b201714232a2edb88f
-DIST oslo.policy-3.1.0.tar.gz 94290 BLAKE2B 90257806c834317b509d7b7e72ed00166b71fb692c68d86ce9ef3a4fe2fa671625ba677a4b86fd2ab43f4cc04d1b7f54314c80c1baea8baf0d116689cd178618 SHA512 61f7267abb1268627ba50f2a7d4196c6a6805aa3bbb5c3bb26d8c96d2c526d24102d11fab39e7043722dbd64f32848fbc277cda7699e76334fa73afff8adba54
+DIST oslo.policy-3.1.1.tar.gz 95063 BLAKE2B 2173ab727bceb53f8a4d4babb3b4a8de47b6398ea842cff097be21446a1aef0b77bd1b4a89dadc1e48acc9f0355d378e65f8288ff559e970d3ea1da6f2163e8f SHA512 3021433d4e4dd496ee7aafdcce60e3cdc4a9a8fe64724babfb146a077c91dfe0300500c199e7e7664f89dc2430fbab47700e767db64a5d9c931d8838cdc9ee65
 EBUILD oslo-policy-2.3.3.ebuild 1212 BLAKE2B 1a0922f292a6dffc518b431f24e662edf6c006f95709c1e5a4d44b6134d97b4d897183400728d923c0b412a90fe69b8de58c47cd9e696dd00901d4dfc18ffdfd SHA512 69a0934bf19dfc1af089b18f19ea326a47326a88441e210205685bbacf2b353f1a8c79a9a543b01d785591f06de9ce22fa3e9c005e516ca06babef00d1bfaef6
-EBUILD oslo-policy-3.1.0.ebuild 1148 BLAKE2B f5daf6bb6372625486725325df48c3fdafa80705555c9dc44500385ba37bc198bfd5b9e277d502883bcba9973ebe227d67ae9c5984b204089085702c496d3e0f SHA512 36ee4e5af51fe21473ef9a663452c9f48c4f931e8294e621ff3d652eca9c08431aa8ed216517e7d19039e8422bffe080ee396637680877a265e07dcdd9200abf
+EBUILD oslo-policy-3.1.1.ebuild 1148 BLAKE2B f5daf6bb6372625486725325df48c3fdafa80705555c9dc44500385ba37bc198bfd5b9e277d502883bcba9973ebe227d67ae9c5984b204089085702c496d3e0f SHA512 36ee4e5af51fe21473ef9a663452c9f48c4f931e8294e621ff3d652eca9c08431aa8ed216517e7d19039e8422bffe080ee396637680877a265e07dcdd9200abf
 MISC metadata.xml 600 BLAKE2B 5c911411e88182db677743ddc559bdbd0695f12648a00fc6b0474535ba52493eb2dc291f51a2fd37701a17f951627fabd83c1ae3c616331c200fa231eb3c4dce SHA512 82a8956e15cd74342d77c66c47b96a5b35c9ccf7871f4f4c4c27970737f69abda5664dba601e98bd9df0bd958d2450462eda4c7477d5dd10af7b7bb11c7f4bbe
diff --git a/dev-python/oslo-policy/oslo-policy-3.1.0.ebuild b/dev-python/oslo-policy/oslo-policy-3.1.1.ebuild
index 6e917950a2e5..6e917950a2e5 100644
--- a/dev-python/oslo-policy/oslo-policy-3.1.0.ebuild
+++ b/dev-python/oslo-policy/oslo-policy-3.1.1.ebuild
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index a0a706525d1e..d659b4b1c958 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-serialization-2.28.2.tar.gz 30807 BLAKE2B ff0ee4d4215943d0fa419d0d0989c093812d354da6727f5e87a27ff0562baf5e3a22c781c686ce5156fcff065e03c7481bcf3e16041a2296366a1f297060eff5 SHA512 78305f20392348b73eca244464cd4167177cd82ea74597641ee9de60b51182e5e3d75e5d748fe2c39ddb322a08f2ee5044c846bc969022b738a0b89874451337
 DIST oslo-serialization-3.1.1.tar.gz 32180 BLAKE2B 5ce0db206732430b2553b0eb01d5df717069a07370a20ef452b77e83ed95f1cd0542eac287ba28d4fd2a3f66541823c362a925e48a3ed175abdbab2c1aa5b2f2 SHA512 5a551c33a001eeb73213dac1b4e4bc50db2ceb7dc2f9881c07abbab05cc8ccfda4d73cc9bdc673e26628aaa05c3d66f9c76ba4eb370c851990f3614b33233a95
-EBUILD oslo-serialization-2.28.2.ebuild 2076 BLAKE2B f06a95e8223ad64c4056587654ef214a73363437e0772f18f42cc6e0f6defa38feedb97840e1c8052ada654aaa88e053c6504daba9ba37c04aa43e48515b3121 SHA512 a8d776dbe338b0aa799db28d0701b073aa78239b666afbfdad1634c8a02c679c6d94b326afd5c54d29dbd0f2f1376deba2d3fb4573794a8987dd591329937640
-EBUILD oslo-serialization-3.1.1.ebuild 1003 BLAKE2B 638027c5c6ba4eb54763df3d126e915c412b132246ba622ec57e145bf214ccec16c55202c0fe05ff5ed883069ff69a7b0b60cd4ae9124e567f715f94f61293f1 SHA512 f720ee345e5937028fff4c2dc7fc1d3c5f5a4e34e8d6a580c2605301663e0918982d18922f37799d424712ec7ff1ac9afe0fb1f8c1646520c4ce04ecfd6c49b4
+EBUILD oslo-serialization-3.1.1.ebuild 1001 BLAKE2B b04a38f4b4bbf4f26be99061028e362a26c3c42562ad2f855c6eb783f3d0565e4e9f2e3f0ede72c863fa161b476ab241d03d245f84c28d33ee17fd135118fc42 SHA512 b33faa3d60129eb361d2d751fc91fcc39b6d3838f1808143e331ac11b0644b16cfde3b24960a21223bdf961d98a84ef45a741455290352f4e2fe5cd3a740e02a
 MISC metadata.xml 374 BLAKE2B dc4d16d6259d728baf0c2e3427ce5788baba2b57442d67d02dc487dce353dd993b4f306d7dcb2c1a426f88db55e2be58dfe69731819082458e6305242d07bcd6 SHA512 97704036d1f08927b8c0f96604506f2a0ca3665a939f49f0f6c3e9274afb470121f93e6281a88769bd43651b61a43ff8919291244959dc1b73956c71da3fcde9
diff --git a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild b/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
deleted file mode 100644
index 0179307703c9..000000000000
--- a/dev-python/oslo-serialization/oslo-serialization-2.28.2.ebuild
+++ /dev/null
@@ -1,77 +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
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo Serialization library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="doc test"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	test? (
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
-		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/sphinx-1.6.2[${PYTHON_USEDEP}]
-		>=dev-python/openstackdocstheme-1.18.1[${PYTHON_USEDEP}]
-		>=dev-python/oslotest-3.2.0[${PYTHON_USEDEP}]
-		>=dev-python/reno-2.5.0[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	# allow useage of renamed msgpack
-	sed -i '/^msgpack/d' requirements.txt || die
-	use doc && esetup.py build_sphinx
-	distutils-r1_python_prepare_all
-}
-
-# Note: Tests fail due to requiring installation.
-#
-# Installation appears to fail due ot the use of namespace packages but root
-# cause was never truly established.
-RESTRICT="test"
-
-python_test() {
-	distutils_install_for_testing
-
-	PYTHONPATH="${TEST_DIR}/lib:${PYTHONPATH}"
-
-	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
-
-	testr init || die "testr init failed under ${EPYTHON}"
-	testr run || die "testr run failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild b/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
index 2b721387653a..f5f4d9cb8de3 100644
--- a/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-3.1.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${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/oslo-service/Manifest b/dev-python/oslo-service/Manifest
index 294e1bb7cf77..137955ee6e01 100644
--- a/dev-python/oslo-service/Manifest
+++ b/dev-python/oslo-service/Manifest
@@ -1,5 +1,3 @@
-DIST oslo.service-1.40.2.tar.gz 80334 BLAKE2B 6000ba70c414ae6396f8be3911511b073f0f6a73a3a98e92e0c662b42a637b4cccbe684ceb1df2613aedad3fbd430ff588dca001997293563f39525efba05d99 SHA512 e412ae3d96e7e7f5f40238b3b9d9623a36347c3d8c6e06baa11133da71d4f5e55bd1ac2f43b45a2f84f725f84c59ec6870bc557fb623ab681bbeec27bffd086d
 DIST oslo.service-2.1.1.tar.gz 81030 BLAKE2B f6221d9e3d7624dccb614b2dbe6529937fd00495db80cddd9412c53fdacd4a5c5a5fe33468ab53c65e0cb741e82519de971f19d662e633f658641c978dcf0b2b SHA512 8d2beba973444eb6ef32c011928376b6ba61388837178f9043105100f05644137d9bf6ae235c4c7260b05d956bfda42890dcd5727dd4d6f9559e7206f7139f95
-EBUILD oslo-service-1.40.2.ebuild 1543 BLAKE2B c4a8cd555c697c7acf2c8d9443b3b4ed6147e2d564aebf1c7ce51ee51e2750a5540a72f7d3ee3058f6ceaf224c49c9c4c99af511804c4c944c1fa8650ac405e2 SHA512 03bf0a1d45ff7a26b3d6812eeaa5a72e89cc33f93dbb127899ab05cfca9b0f4c9da16c41d28b201a35f8f5ff958f20ae099ed2aa9657da913fb98c481df72ea6
-EBUILD oslo-service-2.1.1.ebuild 1547 BLAKE2B 14f5d5f5111908ab19e2a8768e075ce240ad2e3d22203a7b155c632bfc0b7ce7d931ab43f727467e7c028f377ce51492a9a1296db0981f724db33211925883b9 SHA512 ad23b3f405f148dd24fd6242c4b9ee9ab7074924415984ade15543a2e2906a693594f38a4fd39338d3ca3fcd64bf2ef327865c7db28b906f8c38e0e6193b2275
+EBUILD oslo-service-2.1.1.ebuild 1545 BLAKE2B 9b22ab4de3e533a7cc88426043fcb3ab266f00737abac4a4b6a1d584deb5d97632c629aec352b24979826b64b1576c3bbd7d55ab13f9e656dd1437bbaa745c43 SHA512 1ee5aa160b05cf432498546b737d8989f4d29051781aef36333f19d3f39693ac3d082a4d2c5f9630e5bc6ef94517ff153714cb38d83d88c310b53f17a20f4300
 MISC metadata.xml 329 BLAKE2B 2ef43d1bf3df7be8c2e2b08bf7cca10d1bc23235111bc74bf0b23ef6f9c5ac3ad05a1243b518c0d8b703e4815ec7fc92ad01c907baa77d9c4dbb622a1288aaf2 SHA512 c02f0b4e37e3dabe1dbc10ca6b5e08627d8e7df5fee71573cda34338249508586bf068c56711521aa20bf80a1fdcf94a1e89df5d17cb5eb21a07b996a071d1ae
diff --git a/dev-python/oslo-service/oslo-service-1.40.2.ebuild b/dev-python/oslo-service/oslo-service-1.40.2.ebuild
deleted file mode 100644
index cca69a142a6c..000000000000
--- a/dev-python/oslo-service/oslo-service-1.40.2.ebuild
+++ /dev/null
@@ -1,47 +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="Library for running OpenStack services"
-HOMEPAGE="https://pypi.org/project/oslo.service/"
-SRC_URI="mirror://pypi/${PN:0:1}/oslo.service/oslo.service-${PV}.tar.gz"
-S="${WORKDIR}/oslo.service-${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[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.4.10[${PYTHON_USEDEP}]
-	>=dev-python/monotonic-0.6[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.40.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.36.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/paste-2.0.2[${PYTHON_USEDEP}]
-	>=dev-python/yappi-1.0[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-service/oslo-service-2.1.1.ebuild b/dev-python/oslo-service/oslo-service-2.1.1.ebuild
index d318fd27e7b2..26d50d44e7b8 100644
--- a/dev-python/oslo-service/oslo-service-2.1.1.ebuild
+++ b/dev-python/oslo-service/oslo-service-2.1.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.service-${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/oslo-upgradecheck/Manifest b/dev-python/oslo-upgradecheck/Manifest
index 3dae9234b7ba..4b14489621ef 100644
--- a/dev-python/oslo-upgradecheck/Manifest
+++ b/dev-python/oslo-upgradecheck/Manifest
@@ -1,5 +1,3 @@
-DIST oslo-upgradecheck-0.2.1.tar.gz 14624 BLAKE2B 0b6e397c67df12f3162f4f05334b775e05ec253f642d707a262901b90120eedeef7aaaa3764c04620426e62031f953096cba975dc3e8dc7da3e091c7ac8f2d57 SHA512 26c771b3bc07b9d13fea6638330c785ef82781e794084088bbf46ec811a615e58123d5a42d17a9e31685308a4c1d2ccb7b839c32d9f454e3934d5fb625b73816
 DIST oslo-upgradecheck-1.0.1.tar.gz 15636 BLAKE2B 1247658ae351e11b3320415cd66bb5831bd018bced2e0440dc882d4c945dc81111544b063fb78e4b812d50c21ef7bde3eee30f8f12724d00077a32a05bb308c2 SHA512 92a8cfe51e4ddcdd7a1e8cab7296e7702a1389cbc9df17d0c5da133b21413efb5a650495d1b3bd2e2a58c376dd8c844e96ae20d2d56d387c29de635918a96d30
-EBUILD oslo-upgradecheck-0.2.1.ebuild 949 BLAKE2B 40465a982f8a25b4c8c2b5da23465ffcb2846347fc62822d7366f3c55632872154b7a5f2e73149ae8a548bcf72525dfd2026091ce3de0b597f6c83be6c1334ec SHA512 c23bbd5028e04c793b48ea37196a8bdf0bf72b4543f21e6b671cbd97392a71e7a3f0f54042f22bdec18269324905753f146c44e1dcfd0673bf6a3d2be4594f1e
-EBUILD oslo-upgradecheck-1.0.1.ebuild 951 BLAKE2B 5169a766dbdcdc2cd21518412fed13ae114a78ef685968f445361499dd457da4924d7847571dd6ad175d2cd95d807a5feab3c2b1e8314b2d09936bb11be97900 SHA512 688089daf4622f8e07d13ac154a01f521f3eb84130f3b9a8017469f6601860a1e48db9d43f871841ea2920f1249431063d4014d1c6dedfecbf7f826559f0d721
+EBUILD oslo-upgradecheck-1.0.1.ebuild 949 BLAKE2B 40465a982f8a25b4c8c2b5da23465ffcb2846347fc62822d7366f3c55632872154b7a5f2e73149ae8a548bcf72525dfd2026091ce3de0b597f6c83be6c1334ec SHA512 c23bbd5028e04c793b48ea37196a8bdf0bf72b4543f21e6b671cbd97392a71e7a3f0f54042f22bdec18269324905753f146c44e1dcfd0673bf6a3d2be4594f1e
 MISC metadata.xml 373 BLAKE2B faf870e41a823c9dc8e6829fffc6cdc1852889bf17de0ef5b93f12321d86d7cc538368cb93edc56807aca7f25e0d75255045acbc6cfa60329aaea35e78721346 SHA512 c82e432bee2d34b39fca929ba2b602d65d13167c555eb0a3b07d39c5ae864bb4d6ac459449200bd767f040307ebf854e0a99d72d5ba1f965053190eed68c401c
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
deleted file mode 100644
index ff64429a1ec8..000000000000
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-0.2.1.ebuild
+++ /dev/null
@@ -1,36 +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
-
-MY_PN=${PN/-/.}
-
-DESCRIPTION="Oslo i18n library"
-HOMEPAGE="https://launchpad.net/oslo"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${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[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
-	>=dev-python/prettytable-0.7.1[${PYTHON_USEDEP}]
-	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
-"
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
index c3202a21255e..ff64429a1ec8 100644
--- a/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
+++ b/dev-python/oslo-upgradecheck/oslo-upgradecheck-1.0.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${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/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 441400c3b59c..10f1ea407659 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,5 +1,7 @@
 DIST oslo-utils-3.41.5.tar.gz 91662 BLAKE2B 28ab74823b68cdf427396e5e357f567be5540eaf28e56416015d41ba76ddbe0970064b672c46b53bf23c2dfaae442462fa89d1e140e5f5a271db6e72e4b3e615 SHA512 0d9f9a99a48c0d6623947df6557eca24ebb2ae21d110e1c2a37e09c89fc2749d3ae480bfb534b3a2e3a6f9e7b0db126497f3403825b1272a30f532aa57795b04
 DIST oslo-utils-4.1.1.tar.gz 92838 BLAKE2B f468f77bc72124c404d4aac2b8ca9fd7f05140e45bfcc9b19e04e5d3181532fd82f941b7a00d22f1cb656ae46dc205e7da449772666a8892b8d7ea6469bb6505 SHA512 d6388af59caa7531901eb5585e1dd9eca544dd722bb4cdafb19221c33c543508306415f504b27559366eec2a9c7102acb181d8b833ee038e46e90567208daefd
+DIST oslo-utils-4.1.2.tar.gz 92889 BLAKE2B 16397708abe47946c1495adf6b91ad9db6bdef8c2f475f398b3b4d390193b800ff0b1710183732b81dde89fc24aad204854d02a0e0567046e712663eaa685711 SHA512 d6784c7e1a30690ec2523514b464c95e1d6704a8c8fef5da85b76583dfb5d4b5cbfd18eb9451a90243210e50405f7541b85b39ac09d4f487119677efeef63418
 EBUILD oslo-utils-3.41.5.ebuild 2993 BLAKE2B 9227ce9e1b4e41051590efe145bbd63463becba6a6da1808925ee88a25a4c73f3dacda976d2e30869608d0ad6386e2dec86b189d4e67231155e85e543d223f71 SHA512 93f08ce2acd34994393f33961d5b07309883cb9091dae741abab3eea5e5e11fab7ad63de6691469c86f70a5d7976cdf6bd83fc2f293224508e930dd6e28f04b4
 EBUILD oslo-utils-4.1.1.ebuild 2439 BLAKE2B 587dd08ddc8114c9192b4020f90e7a235e37138967cb4ba74bcf579bc7d7049a7663b73e31732cd0436d19a10e7bdd80057c0ba6daa2b6d2f6aa4824c725a44d SHA512 c5731b398ecf7b1adfae81ce1e595d7bb8cc48f49cf07049bc0e4fe23fccb3a07e35ea2bad98b10cbd1d423b74ff4a5d0cf87e8ed445181d96f2062c282b22c6
+EBUILD oslo-utils-4.1.2.ebuild 2441 BLAKE2B 42c56c8118abbf75815af7fb3a9c0c96855b7965a072e81444d68446f07e4afd3788bff8e764f70f110bd906b31b513871c3f1f03792351501e8aa22d2d41248 SHA512 0111114e3087b12ea316095bb3e4b91c67d76e3bb0567e0c6f9c0175c12be4e76a2e40a189574ddc93904e7b7f8c234af27d357ceca35700477950e78accf656
 MISC metadata.xml 366 BLAKE2B 010fcdab42d0fe2eccb1f10ae80b99f55bbd6aee2f8d8760512a92d4d23a81899c75496fa84e098447072ca005eb5a2d309628d6e3351370913d3e1aa2dc8e34 SHA512 58767ee794b3ff97f10711ffc71318ad02a6674731364b592f30fa95d84471fcf48fd2bacf8032c4ad28c2ec0144dd35fcbc4533d2181c7aa3b94bb2ca03d8fe
diff --git a/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild b/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild
new file mode 100644
index 000000000000..eed1c4c3fe24
--- /dev/null
+++ b/dev-python/oslo-utils/oslo-utils-4.1.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_7 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="Oslo Utility library"
+HOMEPAGE="https://launchpad.net/oslo"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}
+	test? (
+		>=dev-python/eventlet-0.18.2[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.18.3[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
+		!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-3.0.0[${PYTHON_USEDEP}]
+		>=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/ddt-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/stestr-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/coverage-4.0.0[${PYTHON_USEDEP}]
+		!~dev-python/coverage-4.4.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
+		>=dev-python/bandit-1.1.0[${PYTHON_USEDEP}]
+		<dev-python/bandit-1.6.0[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-3.15.3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.18[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.10.4[${PYTHON_USEDEP}]
+	>=dev-python/debtcollector-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+# Note: Tests fail due to requiring installation
+#
+# Installation appears to fail due to the use of namespace packages but root
+# cause was never truly established.
+#
+# Tests fail with:
+# ImportError: No module named 'oslo.utils
+
+#RESTRICT="test"
+
+python_test() {
+	distutils_install_for_testing
+
+	cd "${TEST_DIR}"/lib || die
+
+	rm -rf .testrepository || die "couldn't remove '.testrepository' under ${EPTYHON}"
+
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
diff --git a/dev-python/oslo-versionedobjects/Manifest b/dev-python/oslo-versionedobjects/Manifest
index 9e18993082ef..927984b2ec48 100644
--- a/dev-python/oslo-versionedobjects/Manifest
+++ b/dev-python/oslo-versionedobjects/Manifest
@@ -1,5 +1,5 @@
 DIST oslo.versionedobjects-1.35.1.tar.gz 150347 BLAKE2B 2b19ff4056eaa4106adb255b4ca0c3c2c4e07ee6a3839a079f6ac9891383c02b1a913833853e4c8e8c6d67f2880b9f2966b1e5d9d20e9093a8f37a1063cdccdf SHA512 f115ef300d4274cca00fac938a5f62c920a8a44901fe40d7c016498718c1e0357cf8eb745213986a89455b33e9dfbfe10b0fcb76551ad815859e7204e5532307
 DIST oslo.versionedobjects-2.0.2.tar.gz 152102 BLAKE2B 6b7d19d0a17d895e65eaa15ccf4fcbf71dab10ada019ba9c2d7701ba8d7b3111542bb5be6be9d4ebe9d659c4b74f6d406a354f9e1f5990983ad36c6576ef8e80 SHA512 0c544ef33c213f8823a7ec9c2714d3053e9db0a6bdc69f8c41654c0117a2f2b43c94bc6dcd2d6f98c8447e85694382be5df9d57fe21b4718cc811d9589582f66
 EBUILD oslo-versionedobjects-1.35.1.ebuild 1345 BLAKE2B 3a6f24e9c06a0aa63ccc2738c8ca008d4096c0434753fe6ac94f12e5ac25490868bb091dd8c3a2525c6d4f200b2983cba4db0c7b05869de4f2f7761153d9d801 SHA512 0402a890433ff23f6f790d733f5756ef07c4a7cbf2835cbf33a43f66db773a984a98b1a827a60f106f120de12cd8ec36ebc5196c0789848d87747e1232a3a1d3
-EBUILD oslo-versionedobjects-2.0.2.ebuild 1304 BLAKE2B 2cbd23c851aa83ebdd75c16455f813bbcf0677e67f34acb2ed23e528b1707e33801822b94a3d47fa5a9d7c2d72d8172adf514e37788f966362dd6f315b5adcbb SHA512 9d0e21b0f55ea706027835f5bce97529198daa9308e600026f16793f82a0d7cf27a57ce199f763126347a5639c98910e38b4908e34c16e01309b43796e51c5fc
+EBUILD oslo-versionedobjects-2.0.2.ebuild 1302 BLAKE2B dc1763bcb1c10a66d363f3868fabe0b68d2ab28cb73a37800bceb1063b509c97186dc9887ad50a9642a007acd581667ec7a55e33ee448224c3b8e1d3b8f39b9a SHA512 28f2a9f2ba4f930846249cb6a52c106c2c5000ff4777deeffd6ee79d923249b7a92b3a439c08ed77a4aaefca8f6a17b702e67d3ee4713cb9f04b3e533bf9a727
 MISC metadata.xml 338 BLAKE2B fa5249011cbd669973d70ec877cb0d59e5d8e6f25ee0e8f704024a879bf9d151d2425b8b253ba102a5290d9175816831e3423f77f9b53aa3dd95d11bd64a80b1 SHA512 6e0c4816549dd4f80d8c344f68148c2815afff2f84714cb570e4199c1bd6bfb4f9c5e27d230478e37890b0617fbd62efe472b37e043d8f8b2cfbe8912cb36fe0
diff --git a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
index f87856097ade..2118dc15f719 100644
--- a/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
+++ b/dev-python/oslo-versionedobjects/oslo-versionedobjects-2.0.2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/oslo.versionedobjects-${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/passlib/Manifest b/dev-python/passlib/Manifest
index 1f3c55188728..5cc5f9a303c9 100644
--- a/dev-python/passlib/Manifest
+++ b/dev-python/passlib/Manifest
@@ -1,5 +1,5 @@
 AUX passlib-1.7.2-py39.patch 870 BLAKE2B 87781afb87427dd78c9040babdb2c3be9f8b14099bee1d1e0cbd0a1bc0deee56b0ba0f65adaa5a9bbd81fd998152661db5a602127a74e59bc1aa07d1ce1e1c46 SHA512 a77f51cad2c460abc41b99cf59c76f33c1a15a51b4237c968185dc46c11c6e4aa1dd866082df13cd9b34f7496c9750c276c18dab8ea08056200d125e3dccb324
 AUX passlib-1.7.2-pypy3.patch 3117 BLAKE2B c68b96cddf48038198e7d5d35da33c581c2abcf1aef75e6ca556c39a87e242e9990ed17235596ffb68a4154eec9acb6fcb0d651a04856a93f79a993865d702f7 SHA512 808fc0f3067f30f23118b5222d90f86910b3e681c585d1bdb237a2b954ff99936105042f2a0fce8f4ae2b0301cd201be68905be316fed5ebfd81ccc1cf29fd1a
 DIST passlib-1.7.2.tar.gz 649654 BLAKE2B 40279113d9ff633cea47222f2d72af0abee78dc52a9b46adf66aaae213594eaae7f245cc80004f85b5055b882741b4bedfd81ee39132db23760d37a34e87ac6a SHA512 1ea0654b177b5ab2e1a7e5c3949642c34805ace6e4e4a0f82fafdb3f374edd99c667906ce598c335b668da049860648d5cbebb3e62d775898d5b0cb8cfc7bf53
-EBUILD passlib-1.7.2.ebuild 1037 BLAKE2B b00dcee17479443e2e463884308ba4df036d62e49f8c0b36f8afb0fa5ffa531f37e32b5a638c029a550768c7d32ad16110206e71fe46bc15afcc9572497774b8 SHA512 71a9e4e035aa145bbdb2834d6051e073ea289f864fa9a7ed4f2ba425639056677c4841a660c4a3fefd952358ca500e7dcfa4444293200e62e86a66a8ffc9ebfe
+EBUILD passlib-1.7.2.ebuild 1035 BLAKE2B 8186f3475fe121b6364cfe486f9b6078f6e039bf1dba9cfa122e36ce591234b451b898addf8842bf2736a10466df47416a05d3a822396efa4f7b3f839ef1255a SHA512 0820f44a42814955efb7db4469faaaea07df7e5f4269069cc81a1a5d33452346d655eaea4bbeeb4cf23423902b6cb77225086ce776aa299abe4a52b8f1a49c8b
 MISC metadata.xml 794 BLAKE2B 717057e0abe888ef6c692a0777d9c106426238d690934a852fea3084154dfa190546c1779c6da9fbda61f6b204bfb152cf391727c4225baf2f0d6030d4ad6be5 SHA512 baf29cb74e295119b984f3acc3470f63811f9ee49849e97b1808354c15be121e723fabafb053a0a7c94032faa7747d149d000b68acfccd919ea4ec9d28d2f930
diff --git a/dev-python/passlib/passlib-1.7.2.ebuild b/dev-python/passlib/passlib-1.7.2.ebuild
index 0794ac4dad0f..b73ac55fce4b 100644
--- a/dev-python/passlib/passlib-1.7.2.ebuild
+++ b/dev-python/passlib/passlib-1.7.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://foss.heptapod.net/python-libs/passlib/wikis/home"
 SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="+bcrypt doc +scrypt +totp"
 
diff --git a/dev-python/path-and-address/Manifest b/dev-python/path-and-address/Manifest
index 02879c092be8..94c65e055549 100644
--- a/dev-python/path-and-address/Manifest
+++ b/dev-python/path-and-address/Manifest
@@ -1,3 +1,3 @@
 DIST path-and-address-2.0.1.zip 6503 BLAKE2B 146e73b5b54ea536f8b94da8ebbb923441564cf2137a55f3938552493b6fffe28c4e90c908a3fef2acb55e76f320519c7f59c0b2c99f144ebb29ca90d32e590a SHA512 11b2352389662412451e1e9f3e2997e81d36acbef7ad18c50328b9e9bb395f2f5fc8bca988ef14a7d9b76f5213cbfa17bb82df0e00f6989671181b104e4f1406
-EBUILD path-and-address-2.0.1.ebuild 466 BLAKE2B 04fc642e3400840d5f32302675dd6abf74c6c5b880bd2c870dafd35ab5ac362010ddf8133fed4f98987ef999e68cd4eba6f66ef607832fb9174ef79c5e13f960 SHA512 63bef9200816aff8deeab7e17f8a6e5a0ee27044ceac6a546ad92837d0526e078de2bc0788ef6372b1613792ea2d75a736dd20f541648049f49c476168714bc9
+EBUILD path-and-address-2.0.1.ebuild 465 BLAKE2B 65cc6761b9f92a26f54fe3e41cf5abe9f7019d3ed6f56a60538349e6bdd0c2fd72ae1cc0f6d6026fd0619cdf2c9126ba5e977d2b58a631123a4584dadc116514 SHA512 808d6954d42f559ed17d68e7f24f7ca607c9aa48b21db5a398a9189753536a7475fcbb2a2ef2ff78379d543e012c61f00f9b3b573b048178248a3d21bb6b4f20
 MISC metadata.xml 483 BLAKE2B 8c9f07db6e59b3644ee6cd6002d117e0d1539b3a886840825fef835019b70d7d94d093303268046a8726f7c20d2ded1d32ba6c39db5bc4e26f4832efcb16b3d0 SHA512 3114dd2f6e876d73596501c46df4458ea5142675bec42244619ac6438f10ff05c454aa7c1f060e950cfeecd106c1fe230b8fa329521ec4f383a071afee49a1f9
diff --git a/dev-python/path-and-address/path-and-address-2.0.1.ebuild b/dev-python/path-and-address/path-and-address-2.0.1.ebuild
index aad20838d94b..f4df422f872a 100644
--- a/dev-python/path-and-address/path-and-address-2.0.1.ebuild
+++ b/dev-python/path-and-address/path-and-address-2.0.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 BDEPEND="app-arch/unzip"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 8a5afba6e9fe..75c3e617e48d 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,8 +1,10 @@
 AUX pikepdf-1.8.3-test.patch 1383 BLAKE2B 18ac2e4ad4fd2c1e6db158ecd87505ef3099a5053d3d4b5b96a2b1179eeeb77218ba0582e1f25975f5f94867220fd382c82ca960da404154ea67008cd389ff82 SHA512 6db05c94c09f5474f53bd2dd77b0ebdf6cecb4cf00ae5c344b1795bd81379f072856c7d06c05630d40c878ba2fd9b09c918d0f6fe364b54fea720638135caf0c
 DIST pikepdf-1.13.0.tar.gz 2140229 BLAKE2B 886bb9395e8fa1105385908a06d076f78bb1712186a8cb0eafbe54d22a0c95fa2bc8eba8f2e3d60ec3b1392d550cd38c6486c601eba2ef167c718fa26b472f9e SHA512 48304f85e73148dbcfae50ecc5767686b46ce9d44b13eb3f991ab3b358b99208383627abdb5ef3c17cf31a422872ea0bae7560e9c7c36130c6009563b6169f4d
 DIST pikepdf-1.14.0.tar.gz 2140844 BLAKE2B 75a408ded51e82cd7970eb94214d2e4f40ea0fa0a4915d83caace9b1fcad75fe2d7f7f1917e307d5ba8f2107dc1ae4fd46125b05d7ea175444c479945293d5a7 SHA512 bbd6a024324812f2ecee7c424fe53a2e32a6534c909cef60661faea40e58bfc067017f26d8676fb336e618e6cd7b008729cb6753202a18ed6fd86bbfbb36662b
+DIST pikepdf-1.16.1.tar.gz 2227178 BLAKE2B b872c3ecfb6ea2b26dd5a1a3135aa1ca4ce5fd373a89f48fc6fa281144d1eb98256175ed2518ce33c703bc7b14ac960a27d7f1debb8e0ca5942a5ac236de2c53 SHA512 8560153eb70e426d70c57e0980f989fd2ddf3756bbd4b10a810f47081dd69cbb34941a29ea95f332390a25f2e4a66ff716f4ee933d3a538101154f5d7bdc506d
 DIST pikepdf-1.8.3.tar.gz 1649370 BLAKE2B c655eb2a9304eb624b5f3dd3ea68ff3194f5a508b4249ef0643689945c28bbe9eaad015df481516d6cfce6768a70a34377725a7995b448f22a2eb025b4967e71 SHA512 5cb674042dca6850df7cf9476743956967d0ad168ac6bdadda03895a604f6c3670849e33ab863e7686eaa46922489d6dd1da9883d19a721c8021323d768086a9
 EBUILD pikepdf-1.13.0.ebuild 1485 BLAKE2B 617c0d51888b58058446013d346f15eb1169a3b3bf90afbac3d6d6814766d5ae3416eebf24ad13470bc10c64269c9d35ce6dfd216e668d447339eaf57bbde637 SHA512 f9fa0b061e0801a0321edd80f4a7ab28305dfaa687fedfe0f559cf96a0edbbb06b50751a32093a0712446c76eaccffd9d38a672d3b9018cf71410593c802047f
 EBUILD pikepdf-1.14.0.ebuild 1486 BLAKE2B a806be77b6a9aae8daddeca01f045c58ec97694850a2bc375e9e32179292c401c090c710465c129c72bb199faa0aeb75ef2fbd672a3416ba5635e2528b8f5d45 SHA512 7e2eee7072ea8fbfcd3090bbbe452516bb1db4eac0abc3b821fc44a97a1fd7e74b2aacc5cd6a3128163c16d7f62ce393001758a2864ad8182704e63b98d15630
+EBUILD pikepdf-1.16.1.ebuild 1486 BLAKE2B a806be77b6a9aae8daddeca01f045c58ec97694850a2bc375e9e32179292c401c090c710465c129c72bb199faa0aeb75ef2fbd672a3416ba5635e2528b8f5d45 SHA512 7e2eee7072ea8fbfcd3090bbbe452516bb1db4eac0abc3b821fc44a97a1fd7e74b2aacc5cd6a3128163c16d7f62ce393001758a2864ad8182704e63b98d15630
 EBUILD pikepdf-1.8.3.ebuild 1476 BLAKE2B a8b6d92586c808f85d173962fd138d70a0f4385ba6227ad1e679bbbaee5929c035c4f9b22b821fe7113910ee056c28ef8c96b3272edf984b51ec54d57c3ebcf1 SHA512 54281c35dedb20e9e17716d27f49690baafae3f32cbb15f35d20acb09b2e3618d7cc457bc4f46755bc6519ee946ecbe0f90515007cd71834db9580d70e915ecd
 MISC metadata.xml 579 BLAKE2B 010d66d2d00284f744a85bebf5b916e77efc7f46f880886815bc677007ae0f71b5f19b6caf6cc49c05e1e9ce13c954876e8d13b988a533af2fb68de147e6911a SHA512 3f41579208b5354e6361d6cd1f035bf0e5819fd90575e15c684cf501ca33bc14b6c4a7b70040cd5f44796a8ca58810535734787ce84ce8183d0cadc14d6c1f01
diff --git a/dev-python/pikepdf/pikepdf-1.16.1.ebuild b/dev-python/pikepdf/pikepdf-1.16.1.ebuild
new file mode 100644
index 000000000000..ea2da43b0439
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-1.16.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="app-text/qpdf:0=
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? ( >=dev-python/attrs-19.1.0
+		>=dev-python/hypothesis-4.24
+		<dev-python/hypothesis-6.0
+		>=dev-python/pillow-5.0.0
+		>=dev-python/pytest-4.4.0
+		<dev-python/pytest-5.3.5
+		>=dev-python/pytest-xdist-1.28
+		<dev-python/pytest-xdist-2.0
+		>=dev-python/pytest-helpers-namespace-2019.1.8
+		>=dev-python/pytest-timeout-1.3.3
+		>=dev-python/python-xmp-toolkit-2.0.1 )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.8.3-test.patch )
+
+python_test() {
+	pytest
+}
+
+# When ipython and matplotlib will get python3_8 support, we'll be able to add
+#
+#IUSE="doc"
+#DEPEND="doc? ( dev-python/ipython
+#		dev-python/matplotlib
+#		dev-python/sphinx-1.4
+#		dev-python/sphinx_rtd_theme )"
+#python_compile_all() {
+#	use doc && emake -C docs html
+#}
+#python_install_all() {
+#	use doc && local HTML_DOCS=( docs/_build/html/. )
+#	distutils-r1_python_install_all
+#}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index e31af55a0f7b..275b59d8f442 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -1,7 +1,9 @@
 DIST pillow-6.2.2.tar.gz 37538464 BLAKE2B dfd9b81490a8adb4e12ecbf6764e4e27573c9a087877ac37275a9fb42b89f0cd8cab8d7ca0b45c9a00bf38ca5b1d83de68f5fc35ff19031bfcc1495ee3a5f5b7 SHA512 0f2c3bfd921247fa11645eadc42e184182a401ccbdb8f10215312e96c8c28f2382f5413b56acd78fab1dffc6fa53cc8588ce960543af65c4769451874c2c918e
 DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B be940cbdced884c33f2b3979be113b1bc8974814c9532fe80203395184f90eccba1cd9a5017fec1f0c30a21ff06abc46560d5c6d67938dbf640f2e8e08b7e554 SHA512 187173a525d4f3f01b4898633263b53a311f337aa7b159c64f79ba8c7006fd44798a058e7cc5d8f1116bad008e4142ff303456692329fe73b0e115ef5c225d73
 DIST pillow-7.1.2.tar.gz 38933761 BLAKE2B b1d8cedeb0e8108af3bc5de672bcf812cb2f5ef8a9a23db45b3d5fc9d383d7d534ee63fbfce27f9ee4318982dec46e1e60eb55ce5aa14588b1468792c8188f5b SHA512 4e20f6dbc3c9d138de6270b14e85911ac5d2953328be4fd4b0754d8fe834625f914ee1f1b2f32cfb26ab57b6ea4b74d14a81a65938cbb94895c0afcd639bb38f
+DIST pillow-7.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a517b3295abd2e758941b95162cef0fb1fa2a0e6ee0ac86323709ee3af02888f6e029a1905f13698e82c1f38d5d94 SHA512 ac9c7c8f445b3f67f51bea13fad118d1612c45272c26d33bec286f3c2e198912b934378c4bf986b409aaa2a83d92ff176ee4d25f28701d61746c9cb86d0f412b
 EBUILD pillow-6.2.2.ebuild 2648 BLAKE2B 759c37375cc6e360927e58a039a3d10f4b36e177553e05993cf685ec001015d956599c1a8fd6d94cce86522cfe0f8016b0fc7c9e35b90f42ab35d6c902a1609a SHA512 ad0aafc5257de131825fffe2aa8f18be67207ab7282f27a9b443f7db457e9a4f913fc5d4ee71f5ea141b96c5250e9479f85ec36de3f6cab0593935a1ce7ccf98
 EBUILD pillow-7.0.0.ebuild 2638 BLAKE2B bc13ea32fd5b0a25aad6c976bc4776ebadddd6fd778126e0995391e684bab49aac9c8681face6a2ff9663203d820de77a9c18b895ab6ccf48862ad153cc01225 SHA512 a709259b589008d5e745b6011b10f503db7664fd9e52b858e3c45ef91e428b531bf461da9962a2807a5c0058980cbb7b70e0a22b84aa624ecf9690075c202ff0
 EBUILD pillow-7.1.2.ebuild 2695 BLAKE2B d2e93f51da0552a9fb7a2dcef8e218630ebea076b8185438f084bf77cf114293719306d9420d3f7ad6cbc0041cae19b69634350c8ea9b449aae0a1bfb7b89a60 SHA512 b4a06873c4c33143cc7f608b5ec8e3ee84f1dcb7571cff4631e2839b59ca19885fa036b0f6e72f54edc49130d64b1d2c402c2deca3935d78ab15b89c11bc4ae2
+EBUILD pillow-7.2.0.ebuild 2695 BLAKE2B d2e93f51da0552a9fb7a2dcef8e218630ebea076b8185438f084bf77cf114293719306d9420d3f7ad6cbc0041cae19b69634350c8ea9b449aae0a1bfb7b89a60 SHA512 b4a06873c4c33143cc7f608b5ec8e3ee84f1dcb7571cff4631e2839b59ca19885fa036b0f6e72f54edc49130d64b1d2c402c2deca3935d78ab15b89c11bc4ae2
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-7.2.0.ebuild b/dev-python/pillow/pillow-7.2.0.ebuild
new file mode 100644
index 000000000000..71526b251ea9
--- /dev/null
+++ b/dev-python/pillow/pillow-7.2.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='tk?,threads(+)'
+
+inherit distutils-r1 toolchain-funcs virtualx
+
+MY_PN=Pillow
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Python Imaging Library (fork)"
+HOMEPAGE="https://python-pillow.org/"
+SRC_URI="https://github.com/python-pillow/Pillow/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="HPND"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
+REQUIRED_USE="test? ( jpeg tiff )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/olefile[${PYTHON_USEDEP}]
+	imagequant? ( media-gfx/libimagequant:0 )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( media-libs/openjpeg:2= )
+	lcms? ( media-libs/lcms:2= )
+	tiff? ( media-libs/tiff:0=[jpeg,zlib] )
+	truetype? ( media-libs/freetype:2= )
+	webp? ( media-libs/libwebp:0= )
+	xcb? ( x11-libs/libxcb )
+	zlib? ( sys-libs/zlib:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest[${PYTHON_USEDEP}]
+		media-gfx/imagemagick[png]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx_rtd_theme
+
+python_configure_all() {
+	# It's important that these flags are also passed during the install phase
+	# as well. Make sure of that if you change the lines below. See bug 661308.
+	mydistutilsargs=(
+		build_ext
+		--disable-platform-guessing
+		$(use_enable truetype freetype)
+		$(use_enable jpeg)
+		$(use_enable jpeg2k jpeg2000)
+		$(use_enable lcms)
+		$(use_enable tiff)
+		$(use_enable imagequant)
+		$(use_enable webp)
+		$(use_enable webp webpmux)
+		$(use_enable xcb)
+		$(use_enable zlib)
+	)
+
+	# setup.py sucks at adding the right toolchain paths but it does
+	# accept additional ones from INCLUDE and LIB so set these. You
+	# wouldn't normally need these at all as the toolchain should look
+	# here anyway but this setup.py does stupid things.
+	export \
+		INCLUDE=${ESYSROOT}/usr/include \
+		LIB=${ESYSROOT}/usr/$(get_libdir)
+
+	# We have patched in this env var.
+	tc-export PKG_CONFIG
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py --installed || die "selftest failed with ${EPYTHON}"
+	# no:relaxed: pytest-relaxed plugin make our tests fail. deactivate if installed
+	pytest -vv -p no:relaxed || die "Tests fail with ${EPYTHON}"
+}
+
+python_install() {
+	python_doheader src/libImaging/*.h
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto example
+		dodoc docs/example/*
+		docompress -x /usr/share/doc/${PF}/example
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index a7a563b55061..1631b7e12869 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,3 +1,3 @@
 DIST pkginfo-1.5.0.1.tar.gz 34496 BLAKE2B b5a60e3fe2408283afbdebf8efa709b7b1c96b82ddc76b3fbc4d58d544c2170de1434525fe2e324af9864332c6570885b05a3d8ec2c248fbff20984d2ee80a94 SHA512 319bb403970affd5a4222dfdb3d17738630d1350ea84e51ad1bebc6c8c72e0dcfd69a4eaf5e7bd156b8e605d806357922c05cc994dcafb01b7a33c617b2df447
-EBUILD pkginfo-1.5.0.1.ebuild 718 BLAKE2B 912b22b2482fa013dfd5fe06cdf428bffd1a89e64f4ce6282cc0d3894cfbdee6d81d6a7c85e98722b116158eddddb98486ce6cd90f27546505bdea05bdf1e365 SHA512 41b9db5fb9c9778efb723bb3a20dad8a076bded5af542b32e715e9dcc546f1373b9c7b76bf5b2d906dd64ffa994a7a05b39fe2d7f39d8ef7a18cbb8899b0eb26
+EBUILD pkginfo-1.5.0.1.ebuild 717 BLAKE2B fc44d2fc324dd78e1a6170d93ce5c04d267abffedd7601dc75ed9974382551da8d4096d61f38bcc1f623f25b76f4e7db88f7c61fa2b52d6074d20312e44acbd1 SHA512 3ae7087a6ea69e31ff7aa8647057d264bd3f0239608504a2110945dec7fe43147dc16eac6f6c74056553434b5bbf717a74d0e846f4b0b50e55287d28973ff62b
 MISC metadata.xml 345 BLAKE2B bae902e9e5c7357ce7df1d26ddb2c4c81ca0dbcf4d17eeef7127a49cc4a17794ba29483049ebd5518df71e18258c4ad375a90e0bfb2052fa95a9143431095662 SHA512 f970952fd577c2baadebf824932c4e825d962a497d7f41870a6d51301a5776d22809b923efcdf2ecb38322e4c53e11dbeb5083660ff0f93a3c301a88bb807151
diff --git a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
index 056ef7dd0558..d53afeb7c882 100644
--- a/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
+++ b/dev-python/pkginfo/pkginfo-1.5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="doc"
 
 distutils_enable_tests nose
diff --git a/dev-python/py2play/Manifest b/dev-python/py2play/Manifest
deleted file mode 100644
index f66f1fe16f5b..000000000000
--- a/dev-python/py2play/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Py2Play-0.1.10.tar.gz 21436 BLAKE2B e38af47e4090de6cf7aa621ce58a2086608a71539d6239f13f66e893b2ea1eb50149a8a2b11fb4739ced9f482534cad1e037783ddc481b74e2fe7ce96e6eff0a SHA512 d600c62d20274e71678fc41c3f77fc89d71514032f5b4e98d0bda0119b4c9190c82b84a33240f498a926a6947f8bcd928493f6cbe061004eeddbd7eaef5bebee
-EBUILD py2play-0.1.10-r1.ebuild 454 BLAKE2B dfe5c49af567b396855b764d8c84648bc87e173ea325bcdade2e5938de3efdb838e8bf8dd6393bd3441fb60f345d15a74ed56250356f21d504048cf6b17576aa SHA512 290db2c82962c967f1568142c6483376650c18d4c92e7ee545de105f98617e7133ac15a400c775d3be53d31721e2787b006913a8b1bb494907022ffb54ce5b57
-MISC metadata.xml 346 BLAKE2B 953d8fcc9a4aae4f7e43e209f9ad12ef5391e32e15e873d37c314f696183ef1b11f061338264a5d5aa5ea1c4c0792c9ab14038f60adff83d9eb9e0d4be8ebaa8 SHA512 40fe1e46a4dbdc042db29d69402acdd0ae862e42d7937668f8bc063b4300bd78a4a9900261104b301ba5b89814a5e79316deaec4340258b70773d3661058fa6d
diff --git a/dev-python/py2play/metadata.xml b/dev-python/py2play/metadata.xml
deleted file mode 100644
index ba94533f5801..000000000000
--- a/dev-python/py2play/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>
-<maintainer type="project">
-	<email>games@gentoo.org</email>
-	<name>Gentoo Games Project</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/py2play/py2play-0.1.10-r1.ebuild b/dev-python/py2play/py2play-0.1.10-r1.ebuild
deleted file mode 100644
index 8e7436c0eafe..000000000000
--- a/dev-python/py2play/py2play-0.1.10-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="${P/py2play/Py2Play}"
-
-DESCRIPTION="A Peer To Peer network game engine"
-HOMEPAGE="http://home.gna.org/oomadness/en/slune"
-SRC_URI="http://download.gna.org/slune/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 4eff07a42f6e..9a6c36cc65f3 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,5 +1,7 @@
 DIST pyclipper-1.1.0.tar.gz 53916 BLAKE2B 53b7b6609d602cdcbd8c8f4ceaed999c97e155747f7daeb630333f18fd2719040d118c8fa3d0e60a1ccd92c20aecb355ec9d4f9c22f66dc07b14a919f981f667 SHA512 53371bc2e0439f72ac4ebf96f833c4451d2b1924d7f9cddcbac79a0a6d6bd95ac1fb3fb08e3ea3fcf3ffe22cd718d31c7c528016605b275a3e80642e58546d74
 DIST pyclipper-1.1.0_p3.tar.gz 53353 BLAKE2B 1e510ab97ef98b83c763d4bc1154eb32f94bb035823ddcffef09fe32861c2384ccd6ffd29e5a31c0cabf71c801dd90d0176a68e93c6c2e2c9bff03c2be3fff33 SHA512 0b3c3f18593bafedaedf8a91411ba5d3d1c2ac55c949bca21e3a527ca0930eae5ea033a0f57337573a1106e2871a50dcb0176b959b98ad8ac58636c6d45f94a9
+DIST pyclipper-1.2.0.tar.gz 53504 BLAKE2B 611a86b4173838dc0c77ad765f1ab9d08e73b147936ec60fae63308d5bb0019b40479222b80565f3d3ba5337c1a436fa63306105bb3a698592160eb8b66f3014 SHA512 2b8966a695fd7916786ab7549f8c867aad1d4879f3d20b87d7a4b6e1fff8a36871a440795548e91256ff89e574c04be4390ffbd05bab6b0bb51441c7f8acf674
 EBUILD pyclipper-1.1.0.ebuild 697 BLAKE2B eb94f08accf6b67bd82bcde3b794e49daaec73c905937bea4f31ec03446b8b4d3f72298ab1e891d79fbc260588ec47eb3e629774cb875868c22dd88688cf1355 SHA512 fd81e4272d19c9b9b67a3cd74a216ef84e9af8150b176235bfa320cca385fc9603e143b9f079591943cfd222e679d1207a11012cb6397732c8e9577ecf3dec4c
 EBUILD pyclipper-1.1.0_p3-r1.ebuild 787 BLAKE2B 467902dc039d84eda5ea972da3476ee3e7d87cee5a870cdf7b1911241ab20694ccb3d15cc83740e0baa1b88543028d0477a523ef8e03148e7e3a17f235ad90ee SHA512 e887c57691cb41f3866d7401667b6ef5a5a158d14f38ae58863d9938224e1f1bc158c1dbcc981e739380238d07e9f443fe9cb264f1ac7681ad7c2037a12e7b5a
+EBUILD pyclipper-1.2.0.ebuild 787 BLAKE2B dc824b271b64d1b045c81e8639f5a814d14c847dfaa6c5461f218fbdd6b5a8fd7fca17284f2b380a38b08e70a07637c5c40a31315e4c5da0e2df02d9306623b9 SHA512 0ff63d3385d381168d90c0641ac56e64a599b049a4c52ed0550f5a69ec72cde7477ecce0153ed88c8110ddafd66563f8d9f18d2bbbff4d67224562ad8a6a1d21
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/dev-python/pyclipper/pyclipper-1.2.0.ebuild b/dev-python/pyclipper/pyclipper-1.2.0.ebuild
new file mode 100644
index 000000000000..3efd8d8de2fc
--- /dev/null
+++ b/dev-python/pyclipper/pyclipper-1.2.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=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
+HOMEPAGE="https://github.com/fonttools/pyclipper"
+SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/.post}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	distutils-r1_src_prepare
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
+}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 588db22501fb..067ccd0da9ec 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,5 @@
 DIST PyICU-2.4.3.tar.gz 219819 BLAKE2B 5e4b9ecab9e726aa05ae4a30d3b277dec3a94a2e0393a7cd9a9f247c73f02051649f03079b3b5f6d5a1745f00d2dc367066de8e93cafe3291cce7aa09884d7af SHA512 77b81b0e9a17972696967ebc0421d05c1119a43c7e853f8d939390dddefa4a2a35dd316e08c10c10a283472bb64738016e47c5f45c7c6191d9dba296057740a0
 DIST PyICU-2.5.tar.gz 225591 BLAKE2B 0b0f61439cac355ca3ec930eea0624892ac5f158ecfc82a57f526044be486a676ac201231cf34cb2470e33bfbd2f198439462d0814959ddc25526d6408704151 SHA512 b2641c6f9956cd8026150923f0f10031712c426f45ed2b9fe468ce85917b028a6e1988ac73cd74e9eec2569601ece77018aa06863525e24df1944d4a5b762548
 EBUILD pyicu-2.4.3.ebuild 541 BLAKE2B aeff740a3137edc2947e797c527e52b6306c283aa6610f23a827f3a77f47f7801922416d7b48c2aa79032f02eb6e254663507f5470a05201d99ae76a8bedb8c1 SHA512 d9d12f2f1a1982026b2955ce9bda2b687360176e3d2ebb1d6209689964d3d6f12532957973e7ca6ea057d16a3a6ed761e5fe6e8eeb9e7af282e0837e20b8d967
-EBUILD pyicu-2.5.ebuild 543 BLAKE2B da8a39e4f4807dfff127d126fbe2b7364ce78f977a45011ff9398b085d8a99ad6bd79b1786d32054dba0599c9e34f389bde6381ef63eff88b88791f96b3fb213 SHA512 99e658752ab69dd1113a07fe1c6698b67079cf183b1e239ca07bd421f9ee7993c483b30156eff78c2c485c84d77493e10cccc7eaac2de8ce9e9eb26a2df00d57
+EBUILD pyicu-2.5.ebuild 542 BLAKE2B aebd7778668b85f90007d78c4100adaf69af61fc89c80653dfb2ed616628b7b5fc8287ab62031bb793d4c261efea73c901d274ece4e805a194fb85eb0496c9d2 SHA512 ab4e7f228c8cfa8290742720ae84c4d78cd4cac54108ff3c3b5534f8906703c3280b558e9dab6fe173f73b83053b180d09aa3d7d39bc46f73c2e8980af8d72ea
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.5.ebuild b/dev-python/pyicu/pyicu-2.5.ebuild
index b22a46704638..9c7ec0357142 100644
--- a/dev-python/pyicu/pyicu-2.5.ebuild
+++ b/dev-python/pyicu/pyicu-2.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pynvim/Manifest b/dev-python/pynvim/Manifest
index 3e9d9201a2c4..24bb11909436 100644
--- a/dev-python/pynvim/Manifest
+++ b/dev-python/pynvim/Manifest
@@ -1,3 +1,3 @@
 DIST pynvim-0.4.1.tar.gz 52340 BLAKE2B 4efddfbb8d1eb10aeb53b77f665d6ee186f697cc9cb6b3be2001468755a80b0a3bd4e105fda498e1310be9f65da3a0a8b12209c46a7122bb70f860c0a91c12a0 SHA512 78cb343ad02603a0d1c8f56079b46a9d341d8808a19112e758e5299994fe12a433cd61a4dbbaf0d5ffe00c676bcff844a53e910093efb862ad48cc4b4326f7de
-EBUILD pynvim-0.4.1.ebuild 680 BLAKE2B 14e6de7f120973b64541d7af1d94911828cfa679a9d87e025bdfbbe7f4ea35ccf4619c4c2b758e75e8f94f445897a4b4dce1fc5260bfd4f6570e6dda09588600 SHA512 f64a062ccdf17067c3cd2119bfbd2ec64f93096deeddf009a0816aae49aa34588f2baae56d5e93b0a1a51dfbdbebd2567d016f023b47bb6ceb80e7aec09f3040
+EBUILD pynvim-0.4.1.ebuild 667 BLAKE2B 0a9ebbfb2783d30ca57a161a36251b652c440fe02449515f505e43dfffd71052f5a4b11366c62739f1da9ccbc2b506ace742b6285c339caffd819cf503fb46e9 SHA512 bf989a719c18238d2a84275eb479a2f41d8884aef6f2826e5af78eeeb9a271adc86c5a9dfb9985e58137f334256d5885271973ef3d77c28f711e05cf886129bc
 MISC metadata.xml 344 BLAKE2B 0d15c0c8d8736a7622e98357e02c92eabecb22c853cba110c893b8cb681f0d7a16534329ffba68639e0a2455cd1321601dd56dabfd17b10ade3e23545aab6579 SHA512 32963ee9f09db1c9edef5a1179cdf0974b62c05d714636faf8f677db5f3205333d64eaa228ec2d35475a7efcb744759a857c6888dd055766118a19a288415e52
diff --git a/dev-python/pynvim/pynvim-0.4.1.ebuild b/dev-python/pynvim/pynvim-0.4.1.ebuild
index 8459c3eba0eb..f1b7eb1ca6f3 100644
--- a/dev-python/pynvim/pynvim-0.4.1.ebuild
+++ b/dev-python/pynvim/pynvim-0.4.1.ebuild
@@ -16,11 +16,8 @@ KEYWORDS="amd64 ~arm ~x86"
 
 DEPEND="
 	dev-python/msgpack[${PYTHON_USEDEP}]
-	virtual/python-greenlet[${PYTHON_USEDEP}]"
-
-RDEPEND="
-	${DEPEND}
-	app-editors/neovim"
+	virtual/python-greenlet[${PYTHON_USEDEP}]
+	test? ( app-editors/neovim )"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyopenal/Manifest b/dev-python/pyopenal/Manifest
deleted file mode 100644
index 88edbac9943b..000000000000
--- a/dev-python/pyopenal/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX pyopenal-0.1.6-setup.patch 635 BLAKE2B 5c0cdc4be42b317d441a99438b03c18d12233860aea260f770b7861d2e9074bd5c4a63ac93083fdf9f04a74b9ee6a6646c6209f1b8957035c1f8dda04c9165d5 SHA512 8169b55b387eadc70df6b6c9c850a010660b10410d15540d6a3e960811573b7409122b476cc58bc223df49663fe8fa14ede27b1c7a67f0c42ac4b11e990ec0b2
-DIST PyOpenAL-0.1.6.tar.gz 27698 BLAKE2B 4c74f76fd8eb3c3bda8e30a69d75c327df206c545d7e58d833e2dbb3bdcaa1b1800d7b0f5f8ecfc6d098a093111b409b161bdee305acbb8f4e5d7097899ca41a SHA512 b617781d8253e4ec81fb806709fa5cb0ca3815d11c2fe1b9a74043909bbc3fa57eb8cb0375ad5999c1a7105c5468a75cb7893e186f48e2c440d8b56bb6a87f7b
-EBUILD pyopenal-0.1.6-r1.ebuild 791 BLAKE2B 3d502fe31c1f396133428659c5a7afeef66aba4dda7ae8136617bac0cd84ef023e3574d7d490430a2484efacbcdf42466b7550511615b753875cef1a3f932966 SHA512 877a9d1204f5b8ad9d2dee132ad24f8aee912d0a003840d83a38b381d3c681dda231de88c2ad489e2c1d974c3730928911696db2f0f79fc3c62143333632cb38
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyopenal/files/pyopenal-0.1.6-setup.patch b/dev-python/pyopenal/files/pyopenal-0.1.6-setup.patch
deleted file mode 100644
index f9ef9f3c0330..000000000000
--- a/dev-python/pyopenal/files/pyopenal-0.1.6-setup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -urN PyOpenAL-0.1.6.orig/setup.py PyOpenAL-0.1.6/setup.py
---- PyOpenAL-0.1.6.orig/setup.py	2006-04-30 11:23:44.000000000 -0400
-+++ PyOpenAL-0.1.6/setup.py	2006-06-13 12:15:46.000000000 -0400
-@@ -4,16 +4,6 @@
- LIBDIRS = ["/usr/lib", "/usr/local/lib"]
- LIBS    = ["openal", "alut"]
- 
--try:
--  openal_version = os.popen("openal-config --version").read()
--  if openal_version[0] == "0":
--    LIBDIRS = ["/usr/lib", "/usr/local/lib"]
--    LIBS    = ["openal"]
--    
--except:
--  print "Warning: error while running 'openal-config --version', using default values..."
--
--
- setup(
-   name         = "PyOpenAL",
-   version      = "0.1.6",
diff --git a/dev-python/pyopenal/metadata.xml b/dev-python/pyopenal/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/pyopenal/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/pyopenal/pyopenal-0.1.6-r1.ebuild b/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild
deleted file mode 100644
index 21ef78fdc08b..000000000000
--- a/dev-python/pyopenal/pyopenal-0.1.6-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-MY_P="${P/pyopenal/PyOpenAL}"
-
-DESCRIPTION="OpenAL library port for Python"
-HOMEPAGE="http://home.gna.org/oomadness/en/pyopenal/"
-SRC_URI="http://download.gna.org/pyopenal/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND=">=dev-python/pyogg-1.1[${PYTHON_USEDEP}]
-	>=dev-python/pyvorbis-1.1[${PYTHON_USEDEP}]
-	media-libs/freealut
-	media-libs/openal"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( AUTHORS CHANGES )
-PATCHES=( "${FILESDIR}/${P}-setup.patch" )
-
-python_compile() {
-	local CFLAGS=${CFLAGS}
-	append-cflags -fno-strict-aliasing
-	distutils-r1_python_compile
-}
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 70a48043f9e6..c4fac8adaffc 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,7 +1,5 @@
-DIST pyopencl-2017.2.tar.gz 350145 BLAKE2B 12c481893158f97dec612256b36e710ab52356c8b5f644f3710b5e34d4d10df3b27137ad76f29543fe16b3da725471e206aa5f69c646a79a65246d6091c686a9 SHA512 49f2ff619d8c214a3962b8444e68ba415dda032abaf9eeab259fcd1b21fbaab10bd057035161baef7f0182995834082218a6667464c01645231a94c88aa5c18b
 DIST pyopencl-2019.1.2.tar.gz 343805 BLAKE2B 027b231231532403a5e18249bd438e1a5a67805a685e46fd9506f7286957b14068540f93a3733149aeba2a720f6c71e91db74351916ca974739374a05f2d2c74 SHA512 b2850622253f480cafacadbb9d13afea801af9d4dd52679f132fc0e5f1d4c2f4d3bdf83c9ed64c14c19ead75e6d36afa8b57ff52bbea135fc02291b1fe7b8636
 DIST pyopencl-2020.2.tar.gz 351600 BLAKE2B 47a733d7a552f5d1f69a1a9710c3262d50c26651ed9f46146829babe28962e236e2c1b9ba3d3d14207f28bdc562323a94ab4c51dbf5fcf1a0b12282b3c6aff50 SHA512 233bbf2e99507d3a832222cc8149bf7ac17332a550e4867f843fcc2b31104d961a3f0d972b0a1878d4716b2da4548f1390560141cd09cb1ba13300c541b058b9
-EBUILD pyopencl-2017.2.ebuild 1215 BLAKE2B 938e4a321eab8bf8e094f08c94cadaf199beb6e3b1e5e626c37781b74ca7715dc13a98747a751a86738eadc548ab2442d4d2dc6e0283e3be8aba9f24da030d87 SHA512 93fdd3bad38fea59c3ac2b4c33c51d42dc047cd863b4ea9773fbd7ae8e01f08476e12c61b2bcd5e5e8d54264d7a990d7b7969609874b6adefdc9f43a9f329bdf
 EBUILD pyopencl-2019.1.2.ebuild 1471 BLAKE2B 5ba33cfae14074859d9e442ec35634fd250f52c56842130cf4b6abc5bff58c944983f13052b4a30537a289cbefe0691050e871a41640cbaa2a33c84703c7c180 SHA512 90d989e8b904f2c317350817dae1c5951ae494a644741eb4cd6c532217873697c09c5a7f00f3628cc9b74ea4f6b44c13280058837cf9c07acfce97937cd9c949
 EBUILD pyopencl-2020.2.ebuild 1458 BLAKE2B 432af46ec53efafe01f85fd3526802deccefcdcdd0a77e9e15a0ae92b42c9915c93a255c693504b8f586d0f8246945ce5173a144b2dc2e7440ebdfa8ecc613a1 SHA512 3f6c952a342a9d77ecea70ba6518c6204d46bb23ce18a004d0f69042848a071df099d0b7840d3036cbc0683f80cc5b6e3b97621972291d6878e722d9516e8750
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2017.2.ebuild b/dev-python/pyopencl/pyopencl-2017.2.ebuild
deleted file mode 100644
index 3cd10cba090a..000000000000
--- a/dev-python/pyopencl/pyopencl-2017.2.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for OpenCL"
-HOMEPAGE="https://mathema.tician.de/software/pyopencl
-	https://pypi.org/project/pyopencl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="examples opengl"
-
-RDEPEND="
-	>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
-	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2015.1.2[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=virtual/opencl-0-r1"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	local myconf=()
-	if use opengl; then
-		myconf+=(--cl-enable-gl)
-	fi
-
-	"${PYTHON}" configure.py \
-		--boost-compiler=gcc \
-		--boost-python-libname=boost_python-${PYTHON_ABI}-mt \
-		--no-use-shipped-boost \
-		"${myconf[@]}"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index c3d3705c3a90..6fe985b1cf2b 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,3 +1,3 @@
 DIST pyotp-2.3.0.tar.gz 11672 BLAKE2B a3d8ca5296b5a8a7aa053b0a0556285c19f335cb1dfb4f892d40fe2d79cc52313af7b31c6ee4afc4eb8c1cd8cb8248442bd1a4868e2bb921a552332a0a283a44 SHA512 4a7a4206134e9a370f7f3c3a9b7e755b75a84e30a320084faf91af5607c4262a6aa76d7b8cefaf284e4cf01faea1df4ca92d871644a14ab56f04693b227485cf
-EBUILD pyotp-2.3.0.ebuild 465 BLAKE2B 971847c5e6620b51240c7477d587cb9841dd4cdf5b53fdfb10d9e74243724ffd11606f55bbfb197074ffd3be01419cca43c8ab2b148d104732d46e10b433f291 SHA512 d36dfed55e6907e7bb53070143876b3e65f45413ab26d31aa3bfd6ca8dc1de025985e26e09b5cf48b02d74be6435416822ded0c62b8f2f01c76a6f43c31fc85a
+EBUILD pyotp-2.3.0.ebuild 466 BLAKE2B 249e83ffa800f5381058fac73312e83ff6d13c4d20162d541ea1a13bf727fe9f8def78042b9b43d9f83546c011d84b1b83361437a56f58f626725ad008b16f32 SHA512 dcca2ffbb90c625044b3211ff2e33ae45d5cd2821b2f6c3e9ce0799e407227b1f79b8e37d8ba8d032429554f8988ebbaecd7b12fc039c68e5ed1c2b80197c850
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pyotp/pyotp-2.3.0.ebuild b/dev-python/pyotp/pyotp-2.3.0.ebuild
index f6bc189931e0..5334f2e81f8a 100644
--- a/dev-python/pyotp/pyotp-2.3.0.ebuild
+++ b/dev-python/pyotp/pyotp-2.3.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="PyOTP is a Python library for generating and verifying one-time passwords."
-HOMEPAGE="https://github.com/pyotp/pyotp https://pypi.org/project/pyotp/"
+HOMEPAGE="https://github.com/pyauth/pyotp https://pypi.org/project/pyotp/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pypiserver/Manifest b/dev-python/pypiserver/Manifest
index b37375f58450..cb7afcfe64d0 100644
--- a/dev-python/pypiserver/Manifest
+++ b/dev-python/pypiserver/Manifest
@@ -2,5 +2,5 @@ AUX pypiserver-1.3.1-no-internet.patch 3125 BLAKE2B bf6d0891897d1a7cfea6151df1ad
 DIST pypiserver-1.3.1.tar.gz 504875 BLAKE2B 18089a1d18ace55038fb2b114a3402ce1352139a858a2e32399ad36ef0cbe5dfcf9bbdb865807ea84330405bdd4da1c00265e095b7299fe2b9f56150d573f7d9 SHA512 425a557eb74111fb07911cacd275dfa35b8e8ba5e9f230ca5f86500c10b2ab33235eb3376150c75972de3d8ebd85b03ecdf935753b0af46936a78311d5f174a7
 DIST pypiserver-1.3.2.tar.gz 505905 BLAKE2B 4e62d11cf280524d532e793d3ffc4dc59f1e72c6aba2ed6bd0d70f86104162dc60377b56e08676ab03326c33885acae698dc60b435426b195f13bf9f60bb7b8c SHA512 de823376f7711bfdaff3a1acefae37e1d7528802203929b8aeb8790c2b1c466badaf5a1d5084100bc37f41636d2cdfc2038cd3ad9805d15ca42c80834760b4da
 EBUILD pypiserver-1.3.1-r1.ebuild 1110 BLAKE2B e403bad0f7cbec9f698509783fecefed3306064f1c51958891770b6eefdf7f79c314434c11e31fe4a3dea886f7c5b9b3247b694cf6e6f6de35992de7cdfdfa3b SHA512 9a35625332e2e1e33830912e339e22e2ec72bb958d9727a80c095e20f3513362b17b91f68f11c9322c931ed6ee52be73d7da3e2ab77b76a75236c641273b56f7
-EBUILD pypiserver-1.3.2.ebuild 1288 BLAKE2B faa730b7c6cb1a2865ee0a3feadd1330d19a5592cb4b895f57cfd57b8fc445511baf00bd4cc922f060515eb293e2c9dc8e80696af1fcf78a3d29a5ac677b699e SHA512 2f2e284d7ca72dca458c97b0c443cf501c060acebbb2ed64c8aaf5ee6b8cfe72d04ac0c91165ec61497b4eaa5ccded2f440ade50385970b8f85cb47bde34e8e3
+EBUILD pypiserver-1.3.2.ebuild 1287 BLAKE2B e6f7b4882004471150436ca12d5596be9249e239fa659a64fad56e1a1e2bb80979532a28d98e873ca61e32f748c61155f7f7c45e8515eb7fea92f60d4abc05e8 SHA512 3a08723d219e8e6b024fbc5c1d2c65b2436a884f3a507b16acfd86f6c93207e2071144ca64a9e70337b1cd2cc20df2db5076a2f20a36d4b2e687ec39a7f08c80
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pypiserver/pypiserver-1.3.2.ebuild b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
index 629571cc42ac..58fe52472db6 100644
--- a/dev-python/pypiserver/pypiserver-1.3.2.ebuild
+++ b/dev-python/pypiserver/pypiserver-1.3.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ZLIB MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyproj/Manifest b/dev-python/pyproj/Manifest
index 4a1e9241e912..e3e03425e6fa 100644
--- a/dev-python/pyproj/Manifest
+++ b/dev-python/pyproj/Manifest
@@ -1,4 +1,4 @@
 AUX pyproj-2.4.2-conftest.patch 803 BLAKE2B 60806213e22edaf3457046e46303c95544085d9a870692677a8ef06506a48c7f7f380f4932a5b33f1465a8a0298e15a02033ce9cd690d631bfef9687a60c06b5 SHA512 2d5222ae3a91f61994b9590b08ed513c73be0dbb39b612c1eef4ca4766bef4981b4db23be0fb1ced2a88c3de7b400f8ba5086d4fb8837ed2a43a6cb6c04899f3
 DIST pyproj-2.4.2.tar.gz 463252 BLAKE2B aa80ee3052f42f0d49d02b1dfa3d1790e02fe6aa4092319ff8e827b0a341cff2cb4779891f74919c2b14781d841b3662154882b5f218a22b55ad79397f3eb4a7 SHA512 20f0a742ea5699a6d7a621e93157512478de69ba740bb7b0df46b6d5668f6db93b07e1fc0bf4d089362275ea8edddf3100a972a533ed8b6a0bc56a04a20d4ef9
-EBUILD pyproj-2.4.2-r1.ebuild 877 BLAKE2B a3c4fae52775ec2663500695aca7056b8230d6a6b05125e2e4a44f122b92d59494131de0e4e0f0997c45973d29a175059678a10d45382c0a1e21bfa5e2c944e2 SHA512 ebbaf8b3ccaa896259fae7f44e7dd92a92ad215d2b786325ca04358a8b08d6e5ffaa44e51dd3c82fae8df88523f6f819f9a8f092bbd5cdfe0a05057f8f69d4ee
-MISC metadata.xml 413 BLAKE2B 8b30b06984a66d228b50b463a7149f95bfb671d60c3089e88ec11cab7b88fc7c0f044cd879d9e5fec5bc61840c6f35b17e22b93921e3716ce42b3066fe8dedd7 SHA512 84f84c14bce12374abb5014771c1663bb8877d7808e65fe60f698c60b4c7df17db703c6c1c55cb692b0c8f6a94847758e756d6f9bd7e69f59e915b09c71682ea
+EBUILD pyproj-2.4.2-r1.ebuild 878 BLAKE2B f464c48456fb227234c1162232afecc59ba1d8ce6bd6c2ad8f980f2c4eaa85eaa456f6f68721543ed7cb9697e3cb4f27ab27926a2f2c6fedd230722c1e2784af SHA512 58d21f6c4173e659384109426510daf8319351836663a193d6b6d6751fd11f7610cb565a7e90023be778ecf4e058a41c6250e554f50d73b8188f0535b5db219e
+MISC metadata.xml 414 BLAKE2B 37b554706874ecf474f6fde6c09e4d7e466f2a22527e2851d3766518d0044dbbd2211f291851564541394a4d8f7d37f8216ae1c50cab8f662d3335d58c1ea142 SHA512 c117112962969a1cee0a9c3c7ec86942bfca1ef3eb9859b079ebdac743b691a954d7dc55ec729e141336c253abff8e0c7fcf1625279990cb87da87d732efe881
diff --git a/dev-python/pyproj/metadata.xml b/dev-python/pyproj/metadata.xml
index 53d0d4271b5f..fe8f563aaf16 100644
--- a/dev-python/pyproj/metadata.xml
+++ b/dev-python/pyproj/metadata.xml
@@ -8,6 +8,6 @@
 	<upstream>
 		<remote-id type="google-code">pyproj</remote-id>
 		<remote-id type="pypi">pyproj</remote-id>
-		<remote-id type="github">jswhit/pyproj</remote-id>
+		<remote-id type="github">pyproj4/pyproj</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyproj/pyproj-2.4.2-r1.ebuild b/dev-python/pyproj/pyproj-2.4.2-r1.ebuild
index df41d38524cc..2a90bfb128a2 100644
--- a/dev-python/pyproj/pyproj-2.4.2-r1.ebuild
+++ b/dev-python/pyproj/pyproj-2.4.2-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Python interface to the PROJ library"
-HOMEPAGE="https://github.com/jswhit/pyproj"
+HOMEPAGE="https://github.com/pyproj4/pyproj"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 59b971e183ae..21408b9a2d7c 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,10 +1,10 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 555 BLAKE2B 4976bf66e4e96f89e64ad79910bb7b6fc7c3929cf7b7f1a0a59e66b5bb87e600864df2556f1dccf7695223121c7271382227e16cfb8fb7851cf56be25542b7ab SHA512 f2df0a67480bbe46fbb25dd06abcbc226a7034410855105012045287e662a598fae467f5bc81b3d4adb738f812bf41819aaa5827151db0d6bba573305ee88474
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 7.0.0-gentoo-path.patch 1945 BLAKE2B 15cf6008d0032fd839e91e968eeadce5b0ab633f97cc0ce17c8c838746a83bab0255d3f009dfe42f322f512b2996608963db70e936a7c4535c8533e3f80d15f3 SHA512 8d946c79b116d8912f0b68146579b7cce70adf439023678d803c0b8085d53c8409d1fe0a66e53ecde2cd1bf22154e456b62f09561f62dab13f01c3fbdd9bb901
-AUX 7.3.1-gentoo-path.patch 1558 BLAKE2B 1decdd9362637931c7719adcfd2e95cdae2073b6280e4ec6e762ac215a74d45e9175890ecc2edd3925fbad5428fe9d23e34eaecce6ac720cbb406eef1f9ef723 SHA512 3dbda421d0c2caef1b7a276da29968c4057a401ada864aee9c333e37d146704826a7b5e58da0dd5ac52fb238a707d413c57e142fb7f95bcd8d1282a4d138d1f7
+AUX 7.3.1-gentoo-path.patch 1569 BLAKE2B a4dace1ba796c984b57c50c2103649a10ca4c3e18065a5fed2851746dbef410f8b401e0c759c69199a64d087524ca9e74921711e46ea155c18eacfbe9540eb9c SHA512 8b7c7e70896305a13ae26143bfe7a46880b708b70b65338d252ee06093da0d0cca10976cf01c6d819e0e0981cf450213e09927efb602c5a60fc0336e2ccc7afd
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
 EBUILD pypy-7.3.0.ebuild 5894 BLAKE2B bec20881d6785b0b53a117f291d9a4ad369838042c0681c81b65a3d3d2da2532316d358c39a8f9fb4e10f8a86afa0bd01d32a374941037aa3a05f477cf3b51aa SHA512 5c831d1ea874862d101b54baaa7b7f15b9d22413f87650f3d330dcbd43b52028bbdd7d39cd5527a2984003bf69ffb4121f32807163c87359faa9edc42be79c1c
-EBUILD pypy-7.3.1.ebuild 5682 BLAKE2B 741c6d99f26fc870a1d07f5b6d0328367e83e5cab4ea98e67166b6edb93fd545cb5960660d4971dc2507d398d11edf1b849447b1f3ca3f7fb3db0b3552a4ca56 SHA512 cdc7777ffcb59cbb5dd6fe28a1e3a070fe90135c4926e789c10becfd66a0623da7ad06798045c447046986fd1b8094d40c8a769b94a25392a7e5abb4bd664b0d
+EBUILD pypy-7.3.1-r1.ebuild 5682 BLAKE2B 741c6d99f26fc870a1d07f5b6d0328367e83e5cab4ea98e67166b6edb93fd545cb5960660d4971dc2507d398d11edf1b849447b1f3ca3f7fb3db0b3552a4ca56 SHA512 cdc7777ffcb59cbb5dd6fe28a1e3a070fe90135c4926e789c10becfd66a0623da7ad06798045c447046986fd1b8094d40c8a769b94a25392a7e5abb4bd664b0d
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy/files/7.3.1-gentoo-path.patch b/dev-python/pypy/files/7.3.1-gentoo-path.patch
index dd2c635055dd..5281781865ae 100644
--- a/dev-python/pypy/files/7.3.1-gentoo-path.patch
+++ b/dev-python/pypy/files/7.3.1-gentoo-path.patch
@@ -18,7 +18,7 @@ index 6fe62be..a4e9f0d 100644
 +    'gentoo': {
 +        'purelib': '$base/site-packages',
 +        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
++        'headers': '$base/include/$dist_name',
 +        'scripts': '@EPREFIX@/usr/bin',
 +        'data'   : '@EPREFIX@/usr',
 +        },
diff --git a/dev-python/pypy/pypy-7.3.1.ebuild b/dev-python/pypy/pypy-7.3.1-r1.ebuild
index 1f32cc41d4b1..1f32cc41d4b1 100644
--- a/dev-python/pypy/pypy-7.3.1.ebuild
+++ b/dev-python/pypy/pypy-7.3.1-r1.ebuild
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 76f57157acdf..647893dc23ee 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,10 +1,10 @@
 AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 551 BLAKE2B efeecabe4ff7c8b0d6c845cfaab5eacc56e92da7614a0a7cfa2260a0ae93ebcd87d79c33444d16e57382bba55bdaf49f04c844c125a0a57c67119374f47e0b9e SHA512 9b6b5ede218cea96a424376677d52cbd7c23cd7f569756403849523fc79f8db27190e0bd80501a9e428688fd393397d2fa4e59a59607212993f4ac6d93b18733
 AUX 7.0.0-gentoo-path.patch 1880 BLAKE2B ff89983185c9249a91e32bf69903e139d75efeadcda3c1b4b11e3cc23091956bb08ebf9c9dea548cd5c895ef093455fd69b7273027bc9916658effae955c0490 SHA512 a332c6f8454186f774fd4a0b7f8b940facddb894a17df405d144b2707ece4393bd11695df5ad3bf1e274e59d9cd3bf81c02c4c55226480f0890e5d7318545e0a
 AUX 7.2.0-distutils-cxx.patch 14432 BLAKE2B 7c2f5a22457781c4b7d21954a3ffe7b1dfb55f12f890205cfe294316be86e7b206c4ce732f15fbf021c0fc87ed05a20aa57918cda869226efadb01e5fb2823a7 SHA512 7ccb64419d4ad90d03958bf6ddbb700a253fec75bceca7f9355f5f8496e1aba9ac72b09d0616600ebf8169d5ec705d6b058556905b032db8fb5abd23cf9b30e8
-AUX 7.3.1-gentoo-path.patch 1548 BLAKE2B 2c25223aaec565f1dad20e135ab7b2649df1dc10ac2df2ca0f066d0602d9abb045db36bddd8890c753b680bacfe2399083bf073085a1cefc2ff5382f339f3a2e SHA512 69a91588b17ab3ab764e50592fb84b6ba9b5c51cfcc70cb4916e625542311d3b63aafde79a1bc39f1e5a3ec81acba1241c50111777247a018147a20228695bd3
+AUX 7.3.1-gentoo-path.patch 1559 BLAKE2B 1c2fc14aa2b0ac65db0931b4e197ecaa4d9985e7b9fcc840858204d5b3711691493cd45120b05ab598664ebbceb52f303d0c98af5fdb5d1a0f7e6409d298784d SHA512 62043704d36b489ab99adf4ace31d12329835d15d8181d4ee2e2b69a0e53fa78019a6b78a11f4badff7f51d310fee09a116120eefd30a0e1e6d4149e77c44c69
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
 EBUILD pypy3-7.3.0.ebuild 7358 BLAKE2B bef55c6f65e06d4b49199c394edbd5485262294d9d634853fb6d216c4353d7dda427512905bf4838518f70b4b1949ad214f9fd04c942dc88e8512d657d2860d1 SHA512 18e43cd8a90a6046aa638bb3fa157342255b23e33dcb186de4f482dda9f328aad099ebe3be4967903170a58c28d7054906de1acd73a9a7581c78e5679cf0a11f
-EBUILD pypy3-7.3.1.ebuild 6830 BLAKE2B 5c97bd58a22995bb16d2a37d66188506c112dcba3ee11ee27c086586873f557bd8e137c819d41e93a09e3ef06c6a75ea9be77790e6e8891d34b51b5aaa468c46 SHA512 db90600d7ec4dc23e1628ded592ba254c9974a6b57f46a979fb4a3e33609f3e83abe8e3721c84353902af83decad8d0b61cfc1e89fed26a406c017f01d28bfb0
+EBUILD pypy3-7.3.1-r1.ebuild 6881 BLAKE2B 62979b0d96d7c36744b53ac4324317dca1ed319891307a9163bc4e1fb69021d7fab4b14d39d3fc6c36bf9f34d920c12243c0209db1596703502677279f632bde SHA512 9d66b9bb635f000e369b249c2e03592f26db3f611beeb34f5296090d413d2ddefb56130d94b925af009d164af190090226fd9868edd207561fb016c6e8c4845c
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3/files/7.3.1-gentoo-path.patch b/dev-python/pypy3/files/7.3.1-gentoo-path.patch
index fb73aec41de9..c9809f89b880 100644
--- a/dev-python/pypy3/files/7.3.1-gentoo-path.patch
+++ b/dev-python/pypy3/files/7.3.1-gentoo-path.patch
@@ -18,7 +18,7 @@ index 6fe62be..a4e9f0d 100644
 +    'gentoo': {
 +        'purelib': '$base/site-packages',
 +        'platlib': '$base/site-packages',
-+        'headers': '$base/include',
++        'headers': '$base/include/$dist_name',
 +        'scripts': '@EPREFIX@/usr/bin',
 +        'data'   : '@EPREFIX@/usr',
 +        },
diff --git a/dev-python/pypy3/pypy3-7.3.1.ebuild b/dev-python/pypy3/pypy3-7.3.1-r1.ebuild
index 693635092afb..023f8e46c876 100644
--- a/dev-python/pypy3/pypy3-7.3.1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1
+inherit pax-utils python-any-r1 toolchain-funcs
 
 MY_P=pypy3.6-v${PV/_/}
 
@@ -105,6 +105,10 @@ src_prepare() {
 	eapply_user
 }
 
+src_configure() {
+	tc-export CC
+}
+
 src_compile() {
 	# copy over to make sys.prefix happy
 	cp -p "${BROOT}"/usr/lib/pypy3.6/pypy3-c-${PV} pypy3-c || die
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 9b762704ad27..36fb2820ffa5 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,5 +1,5 @@
 AUX pyquery-1.4.1-network-tests.patch 613 BLAKE2B d9e9f2e11c2183f6759a90e35d60a96a3522790743da1d3ec21ad8006e40d98753fb90c14c14c705ab781b08143c52ecf04722d25928f3abe44ebabb59d04342 SHA512 e6ba986a24bf1adf9e1d6c5f4d59fc28a5a613062aa691f84d760c82beeb77d9198a655795e2701dec05184c4fef377cb4bb6f5cc75f49d2ecf798770cb8f86a
 AUX pyquery-1.4.1-tests-pypy.patch 715 BLAKE2B 9f0ef9cf79cddbd90fb6cac1d6297c98f495f5e258b78f4dbac92c4ce3b26e302614a424bad25b9cab2f6a08f8c8e07525d57a6c1ccfd1c4e51893768704edfa SHA512 ba78b8db4c934598de0aeb37ba76e3eda96b123ebd6a85f458dcd8e8a8d13a37935989dcdb9a282748b188267137f85fe6ad3dfa2c0670f77e76ccae47c819ca
 DIST pyquery-1.4.1.tar.gz 47983 BLAKE2B eb8d0ca59122734a4c715c33f40fd0b5fcc8edcabe9e41649ddf332feb1df603f8527a668aa7b9d78974b3d049e774355296644abd9b4d426d96e6e3c7a74065 SHA512 e2bfbbf51f99a408e9696a2b9c15f8875813847a10b5bd93c4c7a6886ac1b3ae6c7883ec4fb64e9bccab2127617843961e181044fe927f3c80c8ac363ed86141
-EBUILD pyquery-1.4.1-r1.ebuild 1175 BLAKE2B 237c078f32e5b0b69692ba13e64fba4693da0d02f7ae7052f6f283182e5f5ed0f47881792586c9c22f58c346111ce8d170034e6b5c2e2961af794150ae98ec04 SHA512 b40c58327a0d68679c906c29b47b7002069dd32d46f0199c87edb4dcf646f4a008aa086b744a441e2b4a6749fa7f829925cfd1323298cf20f9242c24b82eab51
+EBUILD pyquery-1.4.1-r1.ebuild 1174 BLAKE2B 2146e438d5aa7534e3cb2c4da4dcb4b1b9946e835f2079a0a97aaea8ec1597f1a7cbcd00d9e843f34684261c11825ade779da04163881d3333cd061753fbae84 SHA512 9aabb84383c860f350fb0e81872946c3eb8581eb7f9c8445272ac76ce7d068459200beddf052c721b2844dd1c01481d9d10591f8ec00bb094dea8af1a0d0b31a
 MISC metadata.xml 375 BLAKE2B 6b09c68dc28585cedb0d7109e174b26cdd2ca11c3e8413550f3032a7b2cd11c7745cafc530d7e18692fab76c6c6717e6ba2d92111e2e1df0cae8be73a3e833bd SHA512 ebed84e50582171d8a99f7ee1031553a6afc558f5aa6914f2aa5eacccc7efd6c87b284eec803dd81fef3dd91426fd28f93ae21f6cab1e74c9e4541df3904956f
diff --git a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
index adc9c3894e40..8e7fb742bda8 100644
--- a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pysol_cards/Manifest b/dev-python/pysol_cards/Manifest
index 2dfd3d593cde..2f00be001551 100644
--- a/dev-python/pysol_cards/Manifest
+++ b/dev-python/pysol_cards/Manifest
@@ -1,7 +1,7 @@
-DIST pysol_cards-0.8.16.tar.gz 20203 BLAKE2B cbff4eedefd42380729233a9e928fd6d8e5683716651c60292d4dd1052ba7faf071c3fe61d222313a5bd2ade3da58e6f762371b717815c5f57a479aab9a6bc1c SHA512 fb165076232f9cc62520466bec58dd29c1277de54bde448674d20b9fe00628ba4df3b6d522cc4bd6aa5e18f148f14804de41e8ca1d055ebce0b7d5a2bae3ee89
+DIST pysol_cards-0.10.1.tar.gz 20670 BLAKE2B 1183502ec0e7c070686ed5fc2972091a5bf91d55e31170690124e949bd592401daaae44cf25e3ac9b213230e27fbc90ea9e58450d75caa09b9467f0d2ba513cc SHA512 40ef02fe919f961688039667b9073913acb452d163eef1a4ef71648788676c678bf615a26b1f4d562ba072167eb3629c4cc463678edff89bfdc62b0878db062c
 DIST pysol_cards-0.8.18.tar.gz 20324 BLAKE2B 230dcb57ed5d8f75f70bb55ef339347fb7ecd9877b29fc72237fab7595b15fc1ec28b56021a66478c1d4f5f5139562b976155267b1e4e325559a74f68869b98b SHA512 86f0e110b354703745f16410d4f9f8187173a2ae06088d18e7e87b3b6e3149422b3b442e8384f3863ace34de844d9aaab4c080d3e286b4890b188621b6101d06
 DIST pysol_cards-0.8.9.tar.gz 19522 BLAKE2B 06e257f2ccb43236c311d03436d7b482df977d63c0b886c7705e4cfee4abec4eae495a5557053ba2a18a84da227cc4bd913263e98533ab3a17616843df0a35c7 SHA512 548f586c70a583812731f2273f1c57406a31667b395c4276ec94518471499e69d278d54e2910f7c64a4c52deb670b0e76eef55399af9e2b997422ecbbd9a79a9
-EBUILD pysol_cards-0.8.16.ebuild 552 BLAKE2B b28cc4dfba8d0b3981aa47221b287845d0db50e0c0a43c21340566ba9d49374a5f313dc4b8cdd90ad37438a3b0167a1f7845f30358b35bccfa50ac567376cdb1 SHA512 757e92cd7c2e2876a16a83c541f1c19feff8206c7c3d6ab5bfeda860c2b86378d8c14b8ac7265c3330357a28af69f65be1884c379a3967883e40ff0652faf1ca
+EBUILD pysol_cards-0.10.1.ebuild 552 BLAKE2B b28cc4dfba8d0b3981aa47221b287845d0db50e0c0a43c21340566ba9d49374a5f313dc4b8cdd90ad37438a3b0167a1f7845f30358b35bccfa50ac567376cdb1 SHA512 757e92cd7c2e2876a16a83c541f1c19feff8206c7c3d6ab5bfeda860c2b86378d8c14b8ac7265c3330357a28af69f65be1884c379a3967883e40ff0652faf1ca
 EBUILD pysol_cards-0.8.18.ebuild 552 BLAKE2B b28cc4dfba8d0b3981aa47221b287845d0db50e0c0a43c21340566ba9d49374a5f313dc4b8cdd90ad37438a3b0167a1f7845f30358b35bccfa50ac567376cdb1 SHA512 757e92cd7c2e2876a16a83c541f1c19feff8206c7c3d6ab5bfeda860c2b86378d8c14b8ac7265c3330357a28af69f65be1884c379a3967883e40ff0652faf1ca
 EBUILD pysol_cards-0.8.9.ebuild 549 BLAKE2B f8853c4c8395a41ba1e4f103df1a1e9d0d2092dcbb35d8002c24543ece55858d0db929384ec4a89acc0c9410049ad789e016a0090b9eb2c04a670ff0317b3e92 SHA512 714fd9150f5ab51d91e9cd19eb5245c4e0a1004f2477cb917eeacd950cb005779c87d39bb95cbc64b455bfbc24cb6165e5b34f2d28a3da34c1d4783a4cf49848
 MISC metadata.xml 289 BLAKE2B daedbd790704b3663910c8067dbf69dd886eafcac1aad5b2cc18f54a8dc74596a9a4821a945250e2ed997c754151995b675965cbebc64abf5445c1c63db91ba1 SHA512 f48ef730220d3520d2230ebb0caee8e3456c8b8b7255bc978944897c424d1338f7d7a865c37455d279fdca077fb1436233fcf085564b1d1e9802d28e35d7fc1e
diff --git a/dev-python/pysol_cards/pysol_cards-0.8.16.ebuild b/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
index 9407aad9b5fa..9407aad9b5fa 100644
--- a/dev-python/pysol_cards/pysol_cards-0.8.16.ebuild
+++ b/dev-python/pysol_cards/pysol_cards-0.10.1.ebuild
diff --git a/dev-python/pytest-localserver/Manifest b/dev-python/pytest-localserver/Manifest
index 1b56661ba0e9..5381a53507d9 100644
--- a/dev-python/pytest-localserver/Manifest
+++ b/dev-python/pytest-localserver/Manifest
@@ -1,4 +1,4 @@
 DIST pytest-localserver-0.5.0.tar.gz 20409 BLAKE2B 62376065ee1aeb698ea5e3bd2d5ea3d6b511cc6793142aad458423513b0e3b358a0d0269a78a0f5aeda44fc53757ff85da786627840ee48cbed8b78ee34c2227 SHA512 aedf1e1c9563396457070df13df228ad0ebdd19173fa2ac5a598288d3e1a1ac8b8a0c0288cba0d8478e43d2e1de4848f2393bf640705916957f12ab31171c6cc
 EBUILD pytest-localserver-0.5.0-r1.ebuild 716 BLAKE2B 0e6635efd6ebd7b961a5fb69a8cbceb79fd2f24b951a89a8afbe222b8b2f835be0ee4cdbf46c982c60af595f59457e516390a7f94a7fa28306ed1076a4be407a SHA512 d75d5c52f5693fc7f583a2757f78aa40470f0ced3cba0df2ae8714fc79c663eaa7a8b0e974bca3c116db874ed3a7594de4178d3c2c900cbca2a26f622a2f8ff3
-EBUILD pytest-localserver-0.5.0.ebuild 720 BLAKE2B 69567dda9a66186418036fcfe9bc35e45e53f4e92f41f5daa275ddcfcdd93161e11f381e13643270ff99f4ac4b4fd2290cc96fff6658d3887451ebc1bce3f936 SHA512 320fd0e1003ee031c9419d5a418a01307a2cbbd91175153c25c78a5af69c051a4c1f2d7295eac8784124acb70cbb27f4d46e78dc405db7901062b366193dbb21
+EBUILD pytest-localserver-0.5.0.ebuild 718 BLAKE2B ef763eb4fdc13f0a707423923ffb7b7011588e15cff660394e690c3cc6824ea78875adba55baae14e0d817bbecdfe460716553be3540983eabe8735eb98eab92 SHA512 5c0eb9a788cd21976f6c7428b55778b6e654eabeeca9b506a3972682c0d736ceb62482aa844270b86c985393c578bacb01ed1fe69fc89307f576149dbd55d07f
 MISC metadata.xml 321 BLAKE2B 1965ab8ae78a55b07a92b65e39549bee5e4136a133deaf3c510aa52005dd7e97a030ec30779a8d9223048b90c9146513f761d61b30b78e5f772e2ae4b98f1609 SHA512 db2e0fe334587804689d91759326ad5dabf3aad411c9046943562273f89485b1524b0f62173c9bda2daaaab2e0d09309d23896e91b3e2716e36472c87bf5f883
diff --git a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
index fd5d804e3e26..25e11c83f598 100644
--- a/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
+++ b/dev-python/pytest-localserver/pytest-localserver-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=">=dev-python/werkzeug-0.10[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index 1f360a89127a..be42e0ffa142 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -6,6 +6,6 @@ DIST pytest-mock-3.1.0.tar.gz 25003 BLAKE2B 5f12bc664c6342912e0326bc4ac20c1e599f
 DIST pytest-mock-3.1.1.tar.gz 25038 BLAKE2B 416a84af52980d6984b4a2fd63a75fc79bf27fead86e7d0950f6dfcf38bfc27befbf86bdf8d6361b19a4e45c0bf6965d7a57bea5e3fff29a361e0cdb542ef0a1 SHA512 8e55bd7dc45de2c35fbbbbf4385ea805e6546c8d894f3b351bc31fe1c6d9c790f9e14f79de01262c18634d9dfd5142be7520181f1195faccba1f0e8a06ffe675
 EBUILD pytest-mock-1.11.2.ebuild 1456 BLAKE2B 79673aaf4f03ec6c5475e68a5eb5960bea359f538af1f710daf205956cba1a6216f51656659ca17f6e2d52b64922be3c74499cfc85bc64cc937f1b3e7faead73 SHA512 77b1c578805b102cc04bb9f58273cbb238c128e2708968a3d9f27ca727a347cf3dbabf4d7e6bf7bf47f3356daa3345f62ae516f90c7f807b39e8c0a7089ba868
 EBUILD pytest-mock-2.0.0.ebuild 1112 BLAKE2B e84f9be37980feef82140399dc81f41141ce42d2b3304bbb93c31b444975a1976fadbff5ebb5a9d4a1ad5127a04172a8d88d4d2be7c176560b980cb1d20de160 SHA512 c726eccf84c8e58b34a479cc7f0741f1e80830f39f631c223399f851351426b3959293990348823e794bbe25e0c0578d9ccb0990d1d03f87947e1a457e557979
-EBUILD pytest-mock-3.1.0.ebuild 1035 BLAKE2B 36b9ee8f1dfb890c9b0962b4d83dfe94308a63c496ab57cf9322bf355af234132367705d20984de0cfae29491577de1a028d31219b3a11c02150c7ef98d00869 SHA512 2167f6644d8c63017fcac086591d0b5cc2b9669cea6b09ee5229f84b28dea6bbf3be708915c22b577cde96adf58076162ceaf1ce8bfa5d4bcb485833ff9c2968
+EBUILD pytest-mock-3.1.0.ebuild 1034 BLAKE2B faba5a4f333d031413161f90d574c49b5be57d5d13a940aa9e85c101dca4d3c54ee123061a0d0e91e05f71b5bdf9371100a15451bd94bd37f1da096fe56c4ebe SHA512 156486f9c8a47b5f3a23550f204898cda9d71ca0dde1d653d7cfe9d3c0ca48553d12a21e46fbb5edc3f52a76f68a637119ffc8980565f4be0b11c856a5a0776d
 EBUILD pytest-mock-3.1.1.ebuild 1039 BLAKE2B 8038537b64d82bace524df12da32054d46fb53cf19e3c6208bb321e131de68f5764c76d7eb628a5a465f940aec24c16ab01db24110f7b4d9c5ce92bb7224005e SHA512 dac5dd8572962236515ba15320dc6d113dc51fbb0ac2dbe6021f01daa43dea888dabc0fc7d1eb6ea210b74f8040c3f8060c627b4a7e64d29a72f7f65aba84f80
 MISC metadata.xml 433 BLAKE2B 78d844dea9620760c0766eda59e09f93248fba58778f26fb4dd53e864ece455ede7299db90bec0fe11fdf64b762e2c660c260ce10e3758bb8e25024b1bf2877f SHA512 16324c7a2ce4e3e7261b9be389d646ba8e797719b6dd6782fd66311aefa262e338bac99c09a9399d55b362b941cecfc8039fa14e53b79e214359ba6d294c9529
diff --git a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild b/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
index 816375eebd1c..4e98df61a1ba 100644
--- a/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
+++ b/dev-python/pytest-mock/pytest-mock-3.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 847d2f6d67e7..260b6c768454 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -2,6 +2,6 @@ AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
 DIST pytest-services-2.0.1.tar.gz 20386 BLAKE2B 5ec94fdd0fbc5990216fcbae112973fa8b41902a6fa666dd4c5dee2422f76e128ce3a576ec93ecb86bddff5f6bca0e1afaf791583bd275b2543d0e780e45014b SHA512 445cd5346f0c19b68014eb3c27b06376ae6699e31d8c1fee0cb3cda6e927d0ecadbffe3b0b832dd38fe63bc1fe4e3108e2ecbcabf0641af0bdbff019681f0576
 DIST pytest-services-2.1.0.tar.gz 20552 BLAKE2B 6359c419591efed553e095e267c24f78f36b152f0eefe21d46742f7c15f05e92a9e86891f99762a3716fef5284b00d07d8d6eb825008dbbbf07e36dc62a7a6b4 SHA512 54a487546a2af7996acdbcd63bfc01626832aa41683617cdd345453cf6518afdf03cb8c2465e1f5d28c88b2cc801ffb0d9d4440582865f899e21fe42ab431ebc
-EBUILD pytest-services-2.0.1.ebuild 1229 BLAKE2B ef6b0fdf6bb64443bf706514def64764cce7b5bef4819c29bc9c57da5316f967c115df766644841b49c728dfee70063a81c0a75e84742fe7a97b67062c67e330 SHA512 faca687909337b85976bf5b9a8a8fab7e57bc6cf238c722a33131aebfec30d2a92a57c7c8a3c05cea05b3fe3475873699ef8100dd224c10292a2020f7b0e02d1
+EBUILD pytest-services-2.0.1.ebuild 1228 BLAKE2B 3d933dfc11cb8259132329a6150dd7e817afa0547d81182e0b347bf1c9e99c1849dd5d61e9975927200c22c1f02fe2ba30b519a687701bbd2b1268b3a0db791d SHA512 a3bc05992dc5b07989abc3d99ceaf88448120ffa8355399adb062034f27b5851be1f054a39483b6abb160d307d755e6a812a571c0c49203b9de28c14988b23ee
 EBUILD pytest-services-2.1.0.ebuild 1230 BLAKE2B 5e7b007cd22490b6ef8790651ffe1bfe2b4fd6cd9378541fa8fee3df3955267040296a842339491bf8b915af7daaa2b89dce38ecbfd73fc4f7c270c58ffd57b0 SHA512 f1e5970a319ac54f3b5b7a19197258a1efa590acd6fc170a71f15a868216a2e2b2761d8fdf65ea059a7495656e8ca30410475f13e66d6101c0168042e0dd4e98
 MISC metadata.xml 384 BLAKE2B 3b55101f9c900a8570344ac9335687f3c505f5055022af866fe090878b2b44222a311d3166103e16be780d28a84d9142416acf2933be1a01712587910f7c5d77 SHA512 b18e80dac13f712ff61216f2b23f7c33fea7508634ad523b67f232fcb8301000edff1ca92307834878b6392ea38be8f03118abd2dc55ff6b9c03c8c4dd342e4d
diff --git a/dev-python/pytest-services/pytest-services-2.0.1.ebuild b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
index 7b9808fa2730..8875cb0a0719 100644
--- a/dev-python/pytest-services/pytest-services-2.0.1.ebuild
+++ b/dev-python/pytest-services/pytest-services-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index f08f456847af..8b2b86d13a91 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -11,7 +11,7 @@ DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a
 EBUILD pytest-3.10.1.ebuild 2366 BLAKE2B 7f7617f2d4bb90edbd0350297870c823f7525e2f18d984fe9a12cd8bbcd4dcce461e3a7f43c1d5ba8ecbb90d7606f76f0ecf336d7a0933baa6cff22417aa4efe SHA512 1104eea0003f68645660eebc1b3ca8736cea46f99de40637955169168c1efe07ca90ef8967d31bcb470f5e1aa831ed0b572b9156671bc718dc1da8d18c96a8cb
 EBUILD pytest-4.5.0.ebuild 2082 BLAKE2B d2e9edae4f7751ccdbccd6b3c98e77a67aa3aacc77eaec413fd05d1cb65eb6e48c52a181993d8e0cb83ce9d26d23ce4590d398ecddb2c6a72a15ec4d57538ffc SHA512 41dc00468a3b5f16275ced0ff703e9fe53a618a82b8da9e11a0a4a1dc5dc82c1eb666679498e1df1c7ff67540f786e8f419570a93be0d361fbf44678b7dd527b
 EBUILD pytest-4.6.10.ebuild 2474 BLAKE2B 91ab3acadcc8833e7e9b5414d20e2a55ed054563a8d4642b60065d27e6521e9817ef7d487b96ad4a88cc1ba6c9b2a58b83257a43f731b710555fa857f3ad6a80 SHA512 653f26ab3dab287537285a382b7b35b1e2fcc3383a7b06ba362bf84aaf104083ae047d0563f858470f459c804052081c04c1eadfdbd2a9023ee19927ae79909f
-EBUILD pytest-4.6.11.ebuild 2481 BLAKE2B dc1fab11ccc7c3fcbc383d75b6a4c1acf6c85d4ed577291eb2799d936ce52a0897ac5b7e4ea85e9eb8802107c45fe51b82a86adec0f8cdce75d0e5b1d992ff18 SHA512 3959a6485abafca733d5382b652ef9c053a6757cb38ed29a38f583f1f94a9b35e3ee878eac202caf7042017001105112676fce2d0e1da7175452eac3627186f1
+EBUILD pytest-4.6.11.ebuild 2480 BLAKE2B e07497464d930cad0e01a9368fd24b3b101d429bacf69555e1e3dc4eb0b5c17dacc4c14f4ee369f19c0868ae8bcf329cd5baf7f66bee0c382cc7d924fbd7284c SHA512 46fea47ec76e148a86af25434b4db9d382d14d13a1b8a6643196684eaa6604d806fe0934343562fdc24acd1ada63d975d2e2927bc1d963312fb458fad351c2c9
 EBUILD pytest-4.6.9.ebuild 2436 BLAKE2B f4bdbba1e7731e8dbfe4294acd1fc9e72d498bdb13c9cfa57c17da5f9d3aa0089caff3e32b6d68b5b66f4b48bd50f4d9310eeedb8502c50fff189ed2edc8c8bc SHA512 b4ead0e0d0d88175ee79b11af0f7e94790e0d82931defd425c71e138fec6008e6d244fa311e86549e11cc5a02c8a3df8ee9f55565a42f26855021c64f3561059
 EBUILD pytest-5.4.1.ebuild 1641 BLAKE2B 7e4fbe80e3ad011c67d7260bdef6044d5aa852bce7f4ebee0553c3699919ec69fe9da867cd000041b2cdca7443607c3adaf550e4ee5031cb339541bc56fe1b65 SHA512 c9c0eb717a245e038900b63f8db6929045686cc43df3aef51cd0d134f9e9840b05896ce5f926625eefcadaf336dca0ff7252c9143370e1e4962e3e87717f5f42
 EBUILD pytest-5.4.2.ebuild 1937 BLAKE2B 0daa6532a40c9f098d68909976723249039fafdbea364b9051e7d00596c6a99d8f1e0faf650ff4326f172e3a032c74f96bd30b98e198cd07b29ee21eb6852c9f SHA512 4f0c41aa9ba7c1029e3400786ff3b81be695ed7d0668c602324ffa41681c52ad87ad5c54361e16cdaf1d3fb22d8903e502287f796189da12700416bfa2f0ab9a
diff --git a/dev-python/pytest/pytest-4.6.11.ebuild b/dev-python/pytest/pytest-4.6.11.ebuild
index 32e713dd573d..bc5454e1edee 100644
--- a/dev-python/pytest/pytest-4.6.11.ebuild
+++ b/dev-python/pytest/pytest-4.6.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index b75695e50ba2..7eee5b5c52a4 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,5 +1,7 @@
 DIST python-bugzilla-2.1.0.tar.gz 78791 BLAKE2B 31819e04ea5627b5513c22e9cb963cdea4d1ef8d6d4db78d14bf08b8b5fb373afaad4bddb2bc0b05d4637f966bf8b4f3699ace58ceff8ea226d9ffd4aacc7f61 SHA512 40dd331e2dbb4d70ce6d356eb800d6242ef9878112310087761c8dccb7f05b259f0f5fdee6821713a84c68f1e5f9e0bb6ee45542bc385f00822b97344371239e
 DIST python-bugzilla-2.3.0.tar.gz 79002 BLAKE2B d3aaeaebf25bd56286fa1c4adcbf154ff2d84a28918bd1fd80e1f83b30bfe0f54f7418c75afc446c60046d69cf4ff6219718434158ce9cf040b0b2f7b94136ec SHA512 cd6e1c3f142ad74b8165fdd503ebaeb5e512ad8055dfc1e47e794908ac21cece6e39365544b94c123067f1d6527b65765431f2656336086e6dda940e446b763b
+DIST python-bugzilla-2.4.0.tar.gz 109556 BLAKE2B cf2c7a5a0f491e92c484f2270ab6c8cf67e4ea87419000474ee8ca80e2b406a837d699915fd3c76f62dd79e4338a7276e88ed653fd0d81efcefba5e259559129 SHA512 cbe1d735d4a733eb91d5c6f278a1b7c23a0b142a515eb8a4efed1bf0446a692afa9780f6bfd99e21a079cd4921c4b11d20f65596886b2eba3ba08abdc8593515
 EBUILD python-bugzilla-2.1.0.ebuild 616 BLAKE2B ef3d330c140e9734ac55057504d0ba6b8046b69d396927b7b333a489ef5952216877a556b04a887be37bc556fe1a1a85978c5b0616bbd6c116dd7fc472eacc49 SHA512 339318432730ae45f8e50a9487e2811aa47cadbbc44e856b9b4767969565fdef903d2bd8e9472fe75f792a9bc46ef3a65128fb3a8d6448127bba57fa9f51c5f7
 EBUILD python-bugzilla-2.3.0.ebuild 607 BLAKE2B c17c5b324a6f112fb19503a0cc47f09d78c332b2874a8ca965dbbbf42afca0f52d368abe6ab8f91497ca4b0d9aa7f07e78454d8f2b9c3a5be02ca6b5dd2a9002 SHA512 b740f012ffc724e20d3bd7d14f7b591c264406e2dc84a0271794faf0bc5dff1daf883df1918a57597dc7ce9a0718e170c203df7170be48975b67944d90ba531b
+EBUILD python-bugzilla-2.4.0.ebuild 749 BLAKE2B efeaf789c2c0a67b11093964be39d6ea59b82528c3692e10e01be691331262f3cff504fa7529343fb78625b96c72e0de14de97d3ba020a8b4e68c27146f229ca SHA512 cd8df6e3c5364822d4efc6c1fbe10373a2641b42f0e093b54e840d4236e677cfcf594563310b4aae5ad14fb6a3143a16bb8dbea6cd586c99e1e3af72b6cbb356
 MISC metadata.xml 661 BLAKE2B 71e2d61d2c3f6f68dc260f2849bcc6cc444bd1eae0ed95e0e5312ea6b362e7de644bc18573d83bde770511174f42b79d04478c8a0ab49622e66deb4d06059535 SHA512 0b31da040d6c68a84d20c171f614fecee1ebc2a01be1c6fc5480774d9ba4e47c7d8dbcb2b58ff8e2dcd56bf96a8e9b6181960173ede6e73bc9eb2355f2945ca3
diff --git a/dev-python/python-bugzilla/python-bugzilla-2.4.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-2.4.0.ebuild
new file mode 100644
index 000000000000..1f4edae4f358
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-2.4.0.ebuild
@@ -0,0 +1,30 @@
+# 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..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A python module for interacting with Bugzilla over XMLRPC"
+HOMEPAGE="https://github.com/python-bugzilla/python-bugzilla"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-2+"
+SLOT="0"
+
+RDEPEND="
+	|| ( dev-python/python-magic[${PYTHON_USEDEP}] sys-apps/file[python,${PYTHON_USEDEP}] )
+	dev-python/requests[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:rst2man:&.py:' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/python-openid/Manifest b/dev-python/python-openid/Manifest
index 44c420c72ad8..68fafa0d4816 100644
--- a/dev-python/python-openid/Manifest
+++ b/dev-python/python-openid/Manifest
@@ -1,5 +1,5 @@
 AUX python-openid-2.0.0-gentoo-test_fetchers.diff 566 BLAKE2B 01b37542799405072abd96a87f5ac52853c894ca658f6202e2dd8ba528a5e865fa527fcba463338a6685996ad68be51c4993c38accbc961c972de0b70cbcac70 SHA512 60cb8b12312b3727263808647dd592e295ead7cebb384f92a33afe71292267e0ab95196dfdb7a01ac8847c0565c5dc9ad81f3cb95c00d6e4c9d816941b71fa44
 AUX python-openid-2.2.5-tests.patch 321 BLAKE2B fd3d0daf69dc6287191bb1a7dc61523dc13f5ce95adf8e07e7bd17f37a5f27a5984e9c85c15eb5a9f394523f2be97db67583c250a5d276b05530e95eb4dee7b1 SHA512 2d0e65763ee5fa4325e03e524ce179c367a1ba3119ce55bec458ed37bee05bb655c6a4dbc0d57ad4c20ebe22246b87da458cc688eed7d10f2cd1003f0da3f70a
 DIST python-openid-2.2.5.tar.gz 300524 BLAKE2B 9431ba3947dd2d2f7717e3f64ae91e4c014b85d67e6ce9daff5541d107c35869863de79273e6f9ad433193324d44821ccf9aaf885a6541ff7a3636a31c6ee8f5 SHA512 46ffeb07dc0e94c6e1160c824dfafd4a125746a05af1541e112bc2691bf655f75d0431ea273877899abc2956bb1f82369dea75d9b54282f33875f333f5166e7a
-EBUILD python-openid-2.2.5-r1.ebuild 1597 BLAKE2B 749fb7bd535f87f17bce635ed16c421bec474477ed010b529e49c62e7e8c563794dedaae63cce72ef26faed542448cbf9dd459417f3af170688852cddb0d81ab SHA512 bd65b7ad97be353c7038df4ac95833996a89356fa7da7525420447860ca437d082606d94a7e5031fe4da32a3ac568b5b7ed08a80e0fa7be1f6687417c2c23aa8
+EBUILD python-openid-2.2.5-r1.ebuild 1596 BLAKE2B adcba5acddbffb3a7e6678ca4c6f18c377130d229e57ee8e4e293f5f5c1de04a44451562f85efd2a630deb5ab4a6eb0f4d72b1a5dacff9a6b1980d01904f03c2 SHA512 e45306f0ee66a784ee0e08a1fecb44e10a5cb3522c897d97413bab0436122032975b3dbef9bb2b2060d0e5fbaefd5d116915f5d0f2349c2fbd1ba0a8fd58d2f5
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
index 7eb9873c89f4..5279018236b1 100644
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
 IUSE="examples mysql postgres sqlite test"
 
 RDEPEND="mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index 3f212ff7f63c..0a03caaa3967 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,5 +1,7 @@
 DIST python-slugify-1.2.6.tar.gz 8439 BLAKE2B 74699bf80408e1b6a705525b0ada2612cc6224a2ac1e17ce21230ed684af144c0f72ad99b32674bf19bd716d2cfc3a2f0da6f74facc99acba16e3ebc1873f3f3 SHA512 ad45958d03892d8db75967b150f25509c05ab2a87d5ac4a2ed12fccccfe1f86d7db26c406c6de22ba759b77fe772cc0c00d0e517c71db085618f62094ddadfd2
 DIST python-slugify-4.0.0.tar.gz 9391 BLAKE2B 386e0186f9300bd00098ee534c5c5521b04b087e17a2530501291c17884c5ceb4895aa357dc0d4b573ba39aeaf4a69f60e2c110b3efede0e066f70ed9992f5f7 SHA512 a4b0da48ee887a24a022076c9b21fa5795ab104b1d382bae96fc7ba5ce6c09c0cc42e1f4c3b6874b44097d2246ea5b18302dc42386d8844fa41f495744e5ed90
+DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
 EBUILD python-slugify-1.2.6.ebuild 591 BLAKE2B 6cc4442f9861783a0b0927f675ec661e6344ef2c801c911f22c187ef8102670a4ae8ba71cde81646ceb7a2d7b96849e24822e9e7104bf15d3ad297265b21def4 SHA512 3a4e137e8073c476c7f0418b057ce50cd829cd9fd59973e5986faea0897838fd769c96bc815cd5dc5d5194bfbcf17ef1bb2b6ffe756e697fb58e27f49e87fd5f
 EBUILD python-slugify-4.0.0.ebuild 578 BLAKE2B dd9aecc487b38472b5940415ee7c07a314d7396c52f42c2f6727bfb845a0493a9534bf7ab86dabecc9a7ec7d016130fa95cb88d8771911d05e99c2eaca7b2e77 SHA512 24c8d1c8014725956579414c06100de83985464a2158b37e523ead7148e0ce46c9233d45c48758a2af2e2510f261b90f644cfaeb8e40628417fd1e4061b93879
+EBUILD python-slugify-4.0.1.ebuild 578 BLAKE2B dd9aecc487b38472b5940415ee7c07a314d7396c52f42c2f6727bfb845a0493a9534bf7ab86dabecc9a7ec7d016130fa95cb88d8771911d05e99c2eaca7b2e77 SHA512 24c8d1c8014725956579414c06100de83985464a2158b37e523ead7148e0ce46c9233d45c48758a2af2e2510f261b90f644cfaeb8e40628417fd1e4061b93879
 MISC metadata.xml 582 BLAKE2B aec9e0c331eb3b395607d2de104195cf7c6bbd88f3546420844ddd30407fa78ecfb6eb207ea208d910ec280441aac8c578b94a5cff71adede454e04f55ae60b3 SHA512 95eaa04f1332aa04a3f20e6e6d0ab4f8f86a8532d35c3e8059732febac20c8157c017d66abd1fc70b75e1f069b9ac90aa6ce64851923bd8db9efb1c219ebcb1d
diff --git a/dev-python/python-slugify/python-slugify-4.0.1.ebuild b/dev-python/python-slugify/python-slugify-4.0.1.ebuild
new file mode 100644
index 000000000000..979461ce2cee
--- /dev/null
+++ b/dev-python/python-slugify/python-slugify-4.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A Python Slugify application that handles Unicode"
+HOMEPAGE="https://github.com/un33k/python-slugify https://pypi.org/project/python-slugify/"
+SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/python-wpactrl/Manifest b/dev-python/python-wpactrl/Manifest
deleted file mode 100644
index 95ea990ded7f..000000000000
--- a/dev-python/python-wpactrl/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST python-wpactrl-20081102.tar.bz2 16947 BLAKE2B 4e3171e786e44dc7894b00016d73530612d40f197b251af16fcd7236e2f75fe0f016e3ed6b1ea8a3c9a324ed5133d25a9be8b15305aba8aea88687e6aa6d4fcd SHA512 ddb059b846af21bacd9b6bfe0b5df3661a0d29dd5f56c2343eb24c462eed4771584d7b06a239e484bb89e69376d4e5784d79628cf962a063e640e62cb3b7f588
-EBUILD python-wpactrl-20081102-r1.ebuild 446 BLAKE2B 896593f03bbb3627a21d191099efce13c157ad6a3b5adcca6c5bdd2fb0c4a8e81e9545fb9b95d2fc4c90b0901717dd78c5a0e82078997cd3ed6e5baca89dfdaa SHA512 8cc1e64a23c87ea07b31dd60ea10a32f47e92ab4eff8a6d2e20fbd532983cbc68c3601baba1c561b49defa191d5f074b62a8f422eb3ed786d1c459565e995dbe
-MISC metadata.xml 238 BLAKE2B 42382d5ebb1aa60ff6a073fdc038e223500028f83581747b85bd1d1ac43160aef294b49db65a26ab2e713ef88b2e869eb3065b0a9f0be787e32f4cead3ec8fc4 SHA512 47119affb0bb88a6fef7b2121569fa43cc30157b6aa8d1edb7374367a11ea9d422497da9bbc0bb7106b4124c90e3c980ced5ae202d96a48526ecaf875975db6a
diff --git a/dev-python/python-wpactrl/metadata.xml b/dev-python/python-wpactrl/metadata.xml
deleted file mode 100644
index a5c911a491f5..000000000000
--- a/dev-python/python-wpactrl/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-wpactrl/python-wpactrl-20081102-r1.ebuild b/dev-python/python-wpactrl/python-wpactrl-20081102-r1.ebuild
deleted file mode 100644
index 3f3978751861..000000000000
--- a/dev-python/python-wpactrl/python-wpactrl-20081102-r1.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="A Python extension for wpa_supplicant/hostapd control interface access"
-HOMEPAGE="http://projects.otaku42.de/wiki/PythonWpaCtrl"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
diff --git a/dev-python/raven/Manifest b/dev-python/raven/Manifest
deleted file mode 100644
index b7b8cbc24c9a..000000000000
--- a/dev-python/raven/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST raven-5.33.0.tar.gz 284367 BLAKE2B a66471ed09bb2afca4afe78f662fdc21464e89bb1317fdc5481f87bdca626ad2a0064e9b9681d63e6439ebecd3f25d38a0000666a0c55ace90ca51efb2ccd1c8 SHA512 b6924c36f1cf4e957e8399e757dd1f3fc8152c14af06b700d139cc93bc3dbde4186690fc6934afeda03c13a3b59e739ab3627759580b3adb890f0c1f1ddbe8fd
-EBUILD raven-5.33.0.ebuild 569 BLAKE2B a714401fc18e05771d42140cf91e90a939609e2b3dbe22ffe0c516e2047ebfca96a86169fdb2e69999f86072717df008e53dccf956570dc953498cc7d2980a2a SHA512 79d0718a3ee68337a3f3518763f49f3965516f3e52193f35c60c4cb2c934302af7957a5d4dd89bdfc9faeac8c3a9ecd9728f4eb7b373278481b055544362637b
-MISC metadata.xml 302 BLAKE2B 2948facec48fbb66ddb7c0acc7ddc49e671c9fc8d0dd82114971e1382aec4615aff364a954f9e3b2ed23285405a0e047ad0a6aaf33f4166c0253c0aac1d34a79 SHA512 d6de354f658e8eab89efec183c341052a34471cf58d339d29e511c0cfaac76771105e7b1b4f72ddc00bf95ee36a4621a7716c479b5c358fb2dbfc60d75083fe8
diff --git a/dev-python/raven/metadata.xml b/dev-python/raven/metadata.xml
deleted file mode 100644
index 4da41c046989..000000000000
--- a/dev-python/raven/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-  <upstream>
-    <remote-id type="pypi">raven</remote-id>
-    <remote-id type="github">getsentry/raven-python</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/raven/raven-5.33.0.ebuild b/dev-python/raven/raven-5.33.0.ebuild
deleted file mode 100644
index 20fe41df46ae..000000000000
--- a/dev-python/raven/raven-5.33.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Raven is a client for Sentry"
-HOMEPAGE="https://github.com/getsentry/raven-python"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/contextlib2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index 74c9baae1a9e..83adc297d5b7 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,5 +1,5 @@
 DIST readme_renderer-25.0.tar.gz 24116 BLAKE2B 978fc6cb9d92e35a618af89996abaeecb4611f0351975af44341198dc26ccdba4c0a4e32c126ce22fdbd77ca1d2dba4e11f70ea814a5084c204f4cd53d95f7d2 SHA512 2decdae26c07824c7148b0d49f58fb585fa4e78f06ea97cd7a1fe2fa4ca17601d255eea4b96dcb384c676bc6b671caa0a1bf51615223cd48081ab18da76944a5
 DIST readme_renderer-26.0.tar.gz 27068 BLAKE2B 7a58d550e792ffcbf6fedbdf0464714ac7c7a0395297d165493167947c733a29ff5cc4dd2a346c4276f52ca0516282b3049f28bdc8eb38717d1ff8d03709084c SHA512 a5e7cfa47257fd3ceaf417cc814226b5aef6aacf72ffb2eeed3e6affa4a09aa1f6c752a8c4311910c258d090d94f03e3f5c2603819f5dceb37440c9bfd9090ea
-EBUILD readme_renderer-25.0.ebuild 838 BLAKE2B bc78fd9eead45397bda6676c10ce44c131edaa0e1e0c2900f00ad1409518ee952ec77f8f0a253740d97fe22846ae2e813b3b07662d64dde40f3434a9e7f76271 SHA512 6497d3f5735c1a8cb334f2f5433782b6712446164422a26aab601b5f8a4b9c3ef9846d14c330226015124679d87c202a8d689e6b06f9e6934f59514e2f4118f8
+EBUILD readme_renderer-25.0.ebuild 836 BLAKE2B 3b353b438d980a053a8e53e2c9d912b68e43d59ff60c85a5fc8f6b3c278a0bdc90667b88f5ad52285535cfc1824a819831e4a14763353bb98a3386b7a8bc145c SHA512 69c795de5cb0a3c92f16f37de2859353fc49730ad25c2fbb4c2d3f4089158252123a1d1bfb2b0ddb6926a8aca742370369dc696df5c8ea2f6ea7dbcf5f0135d4
 EBUILD readme_renderer-26.0.ebuild 842 BLAKE2B 4092a8e2f2d59439c9723e09d47839970fefbd1268e29da0818eb75d33f5cd48bf1c01a8a5574444c5c17e762e0ec223a618e19352f69113028c3d2797b1e300 SHA512 22eec30dc8af1ce076551a0b78c51dff2b5b8f4edbc59f2a77f8e70ea9fe01cb91eca239dcffec014922cbd3f78dea4cb2c903a13d607be61c0d66418408f7c3
 MISC metadata.xml 390 BLAKE2B 2a81aedd6207fe28eafb76c0eca7ead7543282f84979e07f3b417a4fb9ed6be27a33e6e41f60c37b649cea7c8bd6977703e596760d44a734a0ba3fa023339bd2 SHA512 8594fa46429779b659f2a382d3a6607bc36476387c17c493cc7b9217c5e8600694f597ba5657e46ab7b1d3a75aabf3c113a538372b9a4db58a4b986c41bd6b7f
diff --git a/dev-python/readme_renderer/readme_renderer-25.0.ebuild b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
index 742f1a80b007..2513f39528f9 100644
--- a/dev-python/readme_renderer/readme_renderer-25.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-25.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~sparc x86"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 052aeff971e3..abc10ad98388 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -3,5 +3,5 @@ AUX requests-toolbelt-0.9.1-tests-internet.patch 1225 BLAKE2B 54af195690d8ac4754
 AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c485ada404f405413117e7451d36eefbc4f05b0073f86310e66ad4320e8ce648175aa072306acab551a50a4a516470b0beb4b981124a SHA512 540813a2d69c84d37a4a6ec5b98d2b71693ba34bbf661bb44be69c646d164134702e9fadd341d07085205b476239260167c858983978488553a07bdbf205ba24
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.9.1.ebuild 1141 BLAKE2B 65fa3786fdf156281f67d0cc32e36c2b190860f3bd9d0f3d75602b2024f6884259fb3dbce8deb9f1245c8d41fbb705fd025e81d031f93a590c70957e5b226a90 SHA512 2de54016082a95e1461b1c919436bbd3e0d995e72ca773fc00329d80be76c1dc2e007b910ce40dcb81782249366458b8dbbd8e9aac96543f9dc102052b6cb1c3
+EBUILD requests-toolbelt-0.9.1.ebuild 1139 BLAKE2B 2afc0d788d60ada5755d86e5576ecb8ce9c679f37e15a09b083cd1f8041d15b7615db9b667a65bd3e5641457a026bba93ae99f9cf8715240322cef8c24f4609d SHA512 66fa30fe16690d147f39a7bc39ff5511b1655369e29eb096f4e88235a07d2f239e56d1a78256c48c2ab116979daed818ba21fa7edb1eb03b552c909fd862a073
 MISC metadata.xml 398 BLAKE2B fcde3c429bad373cc0b0f1c155b217a69aac285add9c7ad92b50d211e36ccbed9e8d6c8b4d3cf42ce3250e614085bdc241893a6f2354dfc8b7e6a60a8924f58b SHA512 57e6affb2231a071faaa01d60bc44832eafe1ae5b927383666b230492fbfcbeb27e5ccd9d06308041aaaa1626289b5e1328fa1ba1be6d845564dac56b4fe3321
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index c6e899c5d0f1..811fe75444f0 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/scrypt/Manifest b/dev-python/scrypt/Manifest
index 54bb27fb0f27..8ef699e56b71 100644
--- a/dev-python/scrypt/Manifest
+++ b/dev-python/scrypt/Manifest
@@ -1,5 +1,5 @@
 DIST scrypt-0.8.13.tar.gz 53606 BLAKE2B 924b870d2dd5d8dc6765ab2679e71a819fb08a75cfdb0e7a6cfa9c305f35a376892e78607007013d9dc7d9a6b2bc6420019f8b27fadc7f468b3b2fd685a1c3ff SHA512 a65e24b0a7dbe02e16c0b38b52c66549f36370e267aacf348a107cb980221806ca783cee0caa95ab6af978dd2b0d8efdb6b06798bb43742d4623bd8f6535e9a5
 DIST scrypt-0.8.15.tar.gz 53954 BLAKE2B 9f9bfc6ead25f14b9b3194853cd64a7b2244685d15a7d257e2395b0acf3fb968487fffc5d5eb5a245de1518b0740483d3e6feed841282b40ecec86ce178de46e SHA512 db5f688b341f816935a0fd5a538d8633a1e43c69c7228d9fc127459c9673528f92405170339a5a43eca86eb5a2ea17b951ac16a203993e452e05f2589914a66f
-EBUILD scrypt-0.8.13-r2.ebuild 608 BLAKE2B ca8ab15fa570948247c47e0d393cf148b959f940963ecfbf210f4fe71d6ef9074dea0cdf3bdedd2824094f6d4329da20900d156931ff8a0c54df79dc0e36aabf SHA512 397deaefcd0191a88d4c3a81a70a847490b50089ece03002e5bd49b82f7ae80f82ee6231d52f345c1e06e4443d34161374239066e15547360b9e9ecb8d60508d
+EBUILD scrypt-0.8.13-r2.ebuild 606 BLAKE2B b442e0dcbf31374ac144ec6ddeee12ec62c478474436d0e6f6503fb725ac646c480d8d8d21824fb3ade6630d9cb68e245b7693085d1dd27ba7f1578583e46fee SHA512 712a4a3a29775db557302b8e8b32fe54872392ccf46461cf64d415fe6522da828379f4700f8bf468ddb7b81b4220e74c2e447b3e65d1dff2b20067fbc054cd11
 EBUILD scrypt-0.8.15.ebuild 608 BLAKE2B 2c0bcb42b4489a580781f45a7137ddad465c80335055bdf7a2a304a1fbfa8903a57b82608eff91b587f2428a8309d7e97bd5c13a0667909de4456ce469b06fbd SHA512 7bf524032a6a974e2ea05be229f522a0e4bcf2ca782beb2c0e2ec9293ebb3cf34766418ee3d594f78afd8aed8caac049162e5cf558913e63fca4996f89c63015
 MISC metadata.xml 479 BLAKE2B 699d8337f530cbac981bd6be4556e75e85874bed107100eebd605d3dbe01172b85a66712c7d20bbfb4310d5bf6d32df97bfe47132334ab2239190818b2fd3fec SHA512 43f00f2f4910b07e5f9db676cba1527b27f5ae4bcd49d59d118fe1e9656f185bb08535c1cc04f95bce6b59613c5b022440d746033efbbc3c26e3ade81fadb56c
diff --git a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
index 8c1f7764603c..d4759a77931c 100644
--- a/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
+++ b/dev-python/scrypt/scrypt-0.8.13-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://bitbucket.org/mhallin/py-scrypt/wiki/Home/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ppc64 ~sparc x86"
 SLOT="0"
 IUSE="libressl"
 
diff --git a/dev-python/sentinels/Manifest b/dev-python/sentinels/Manifest
index 82b8acb9a771..4ebe74fef249 100644
--- a/dev-python/sentinels/Manifest
+++ b/dev-python/sentinels/Manifest
@@ -1,3 +1,3 @@
 DIST sentinels-1.0.0.tar.gz 4074 BLAKE2B 5fdbe488430685e24218b4c1a2ead75272c2024f6653c5f1363ee0e1180878e91ad1e6500ce8f7199b7a95f9680f427927ffa8e573fb5c7ff45ede2894a9fa9f SHA512 06aebf28a3074d377b4257ce3e07ced51425f738b3f2e3e4c1764e946137a363c6e94b247e0eb165c6c87eb749751aac36b580b9c550fe513dc0e126738e8794
-EBUILD sentinels-1.0.0.ebuild 417 BLAKE2B 1bb897cb93c1e218a0189f62814be033319974bc99c773fbe0eafe81e5e909108dde53e4edbd78fceec38c494576cc2b0877bd87bf7f3e3d0dd042759a2579ee SHA512 3010cb4cf53cb4f15b0ebe1fae3502eda366c131fc58a002ef681bf7b80ab5df5ee353dc1e40016b7c29d3bd02fc01336bd8833f2f9d303c369d67eef50b781b
-MISC metadata.xml 654 BLAKE2B d86369aceb1394975ef3f1b5fe27fb7cb1ddc2b0c821d74cb2928612a51e0ad7c187a4987ec4a24f913e759a8d81a33f15e13f3002c444050bcf8ef91d3920bf SHA512 1e0adcf6b08aaae938c82b552ea05217b0ff432bbdc0781aa78cee928900b9f52189e3f42003dff886a71b0fc8c8b8d2249d9789e0f30897d7de47b342035549
+EBUILD sentinels-1.0.0.ebuild 421 BLAKE2B 2e5d5006c423672d13fe98a4416738d21426759e607845466e5913205a74cebb0aa2128f921d7adeeb572a177d6e9db34f8c9d477db093418791c9f9a95fef25 SHA512 7fabe2b32d39e654184a4f65eab1db28af652c4ecb32c7b383cadae84b83ff3a8aa719fb27e47d6171d25de6c58d00effa1570370601c0561389ff156031b25c
+MISC metadata.xml 755 BLAKE2B 213fb1ce0889204789436f59fc25774bcba7cacc2d51e3b7490dc913057a4b6d4a315d802421d7090239aa4706ab52b8c18c90a8c18ae101eb78d1758aef9f30 SHA512 d095b29efc4477e3f31ce24f6ca61800074bbd868ba50e891b1ce4ee7508e487d565f0d13e1b8c78b77a27c4621918baf37e1bb3d31f241dacf77e8c25f1adb0
diff --git a/dev-python/sentinels/metadata.xml b/dev-python/sentinels/metadata.xml
index 16f92bff830d..f7f50ddafafe 100644
--- a/dev-python/sentinels/metadata.xml
+++ b/dev-python/sentinels/metadata.xml
@@ -9,6 +9,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		Sentinels are objects with special meanings. They can be thought of as singletons, but they service the need of having 'special' values in your code, that have special meanings.
 	</longdescription>
diff --git a/dev-python/sentinels/sentinels-1.0.0.ebuild b/dev-python/sentinels/sentinels-1.0.0.ebuild
index 664a217c9ed5..8d4b43fed50c 100644
--- a/dev-python/sentinels/sentinels-1.0.0.ebuild
+++ b/dev-python/sentinels/sentinels-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 distutils_enable_tests nose
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 9568a27b122d..1952bce8ef81 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -4,9 +4,11 @@ DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffcca
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-47.1.1.zip 870277 BLAKE2B 0ba55f2b51011d4f98a554a959227dba83a79e7369a3cd54450a1d18cb378bf7cfaffc1aa25b0ee11760e917d6f74891f0a63e43478893ca4327e0f5135267dc SHA512 053ffd4c26bf0cf1894754b1ed922be03c6fa2cb54a41e3d28a7d8f7a2fdf2ccebbca4e0bafa16eed476923ef70cf4294ed36df6e77603b2fae0a09b684132c4
 DIST setuptools-47.3.1.zip 869963 BLAKE2B cecc4d43ce09708c2454c20064baf8b5597aff29bf069a859ec7d6a91588456455df611f962cb90650b23ba269bbedcb81dff568b4498431cfa20f46ece828dd SHA512 05d8ac5e1612f0c22d9f51b5dbb22cdd1edfd9c15e97c5f31f6dee8d660e6ca19720cee5169158d0179baa87518766fda1cd2e4d5c69f683e973a9ff08155d48
+DIST setuptools-49.1.0.zip 2170689 BLAKE2B fa5f9a8955ac4206396c653a3c6b5926aeb7f6f4052de7b67698ad39edd3d49c7bad13bc65720b5a40a906d06eaf3e6918cfbc20a2a59e100f75400c2caa17df SHA512 a5734742a6d2409f41c62f29dea35c58f480756ef8a66f70aaa607a6927a64487f92d20def6791860ee508e713b44d800e41e2cf8b5abcffd7e1ed1058374efe
 EBUILD setuptools-44.0.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
 EBUILD setuptools-44.1.0.ebuild 2241 BLAKE2B 01cc0eac39c495e27d0087f9c130bded0685753fb030992115760fb62132d7e319a530a200ba8fa65ad13d28f23ffb1428358d6d56803aee6a583221dae6c15b SHA512 6a444f1959796ea98e8c59c64ec4bec06b609b8fe425e827150626909a95fd2e461f02179bf03fc3e200bedb3274a910cf8ee816c21c8eb698a17f44817bf3d0
 EBUILD setuptools-46.4.0-r1.ebuild 2296 BLAKE2B 48222d0fbae7bcad855839b6f2434047f7acbbd3e3192d0d5125b63d4ae5f14e31210e364770903f1d617f94baa543a7cc998b055777acc634707c75e4281b11 SHA512 5ba89846ef28a7972c0a9c38e9bcfa4d54ad959fbacf3340bf4f1283c14b00db3b7d89719aa4eb6447f0406e9fed3ed4e58f1cb7e994429dfe45279b10c6a78b
 EBUILD setuptools-47.1.1.ebuild 2028 BLAKE2B 2a0313f4a65f1f17197f84aeaa3e6e621745fd9519d7e17c2129f8d4dbeca012314cc0581f6e424661b49785089227916647d1d6c74e41711dd0ffabaff09e26 SHA512 08d9dc257cc2b947064fc8cc90670017ae07de722624986fe2fc55b627397d63d0701a4beb0fec46383473b1f69f928c9b313510dca61270bb52fae4c196e946
 EBUILD setuptools-47.3.1.ebuild 2028 BLAKE2B 2a0313f4a65f1f17197f84aeaa3e6e621745fd9519d7e17c2129f8d4dbeca012314cc0581f6e424661b49785089227916647d1d6c74e41711dd0ffabaff09e26 SHA512 08d9dc257cc2b947064fc8cc90670017ae07de722624986fe2fc55b627397d63d0701a4beb0fec46383473b1f69f928c9b313510dca61270bb52fae4c196e946
+EBUILD setuptools-49.1.0.ebuild 2043 BLAKE2B a3ed7a61eebac6fd12c831d2d5f28735ba984b1522c3db39c8608615061b00e10df4601c34dd1d1cefd6870ef997afb2fa025a5ad1783dca1f50eba3bba9cfbc SHA512 985b4e11bba757e58aca75659a32fa7fe0923ff36b0437b506b6e99434ff352968e24d4e417c49464a915fac27dd6585a593de021d172112cdb84a13f484acfb
 MISC metadata.xml 443 BLAKE2B 2b923468b7dc3062ad0f95edd944ffdde6dd4a8303ce8cc9a95730fefeb211e67ea64b7a289e60009003b64731d047ab3bb47cc6c8f0805a05a3a38f57846448 SHA512 2b2b1c7a0647283b069af29be73d0aa9c1e1ec8374d15d8a3b53a44b11d4698cba57a26ef5963795eb8bdbda9602b18a02194c5741485023ffd0b3218c028110
diff --git a/dev-python/setuptools/setuptools-49.1.0.ebuild b/dev-python/setuptools/setuptools-49.1.0.ebuild
new file mode 100644
index 000000000000..3f1c94d2fb6d
--- /dev/null
+++ b/dev-python/setuptools/setuptools-49.1.0.ebuild
@@ -0,0 +1,67 @@
+# 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,9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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 )"
+
+BDEPEND="
+	app-arch/unzip
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		>=dev-python/pytest-3.7.0[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} )
+
+python_prepare_all() {
+	# disable tests requiring a network connection
+	rm setuptools/tests/test_packageindex.py || die
+
+	# don't run integration tests
+	rm setuptools/tests/test_integration.py || die
+
+	# xpass-es for me on py3
+	#sed -e '/xfail.*710/s:(:(six.PY2, :' \
+	#	-i setuptools/tests/test_archive_util.py || die
+
+	# avoid pointless dep on flake8
+	sed -i -e 's:--flake8::' -e 's:--cov::' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${PN} || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/soya/Manifest b/dev-python/soya/Manifest
deleted file mode 100644
index 11be221c5bf4..000000000000
--- a/dev-python/soya/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX soya-0.15_rc1-glu.patch 515 BLAKE2B 5d95fb91d1d3593d616bfed11c49bc80964f734e7d2bdc33a1424283e77326a3bd743ba2817ec2b1f5d28f84d43b437df2655fa05523a3fd6ffee69823d25125 SHA512 b9316c5e1514f7dff1c25a7c3864e02b29c4e8d84bde920186a53fd938680e487484af2c6541d285a595abab5a87e7547949f4eb7f6aee03988105e29fb09a07
-DIST Soya-0.15rc1.tar.bz2 910576 BLAKE2B 2ec129869cdabcdb974dbfea24a3eebda1b55f4696f978335dd7e34a813c361eec9d27aa5b395a3ced0693335b34eb8f533f049e0240f443a8f1859fff5686cb SHA512 698ad3ebb446b49dc6fb70f53cfa6b1d9f35fc854d6f5fd1dafcb1478fce01c8de694a86af02580bb2b149f086122450f1bd6fe002f87d45a5c7555911c23fc6
-DIST SoyaTutorial-0.14.tar.bz2 5223674 BLAKE2B 2cc3927a058936aa497846a300e9093f169898cf1bb13f3df88c6f75d344b689d95ea386ce50a3d93c6b14b3675211855d4515b3bcc3e297411b081007eb6784 SHA512 484bc93c2561aa1f2c8bd7101b75c8ea5d42a2bae7c0431ef1e7719bd86da2f47fb68129d60ce1923b26cce1b7915ab6576d0c5f6c8ee889736971be166b4623
-EBUILD soya-0.15_rc1-r1.ebuild 1351 BLAKE2B e3d0918df682badb25fd240c2de5f796f713c4f1bff62979d190b00db5d98e568df6b20be378d5dbf07d5e8fc9515b978bf5587abe032e71fbbb476ee6ab60b0 SHA512 d0073ca3e85b21920280d2cb715a0c8e2ee6b12ad57f105060d344f4cb09f5469e0c5df4fde5203989d9ebd61041aa534880edd6deb1002803d516b444b6602a
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/soya/files/soya-0.15_rc1-glu.patch b/dev-python/soya/files/soya-0.15_rc1-glu.patch
deleted file mode 100644
index 39463e725a5e..000000000000
--- a/dev-python/soya/files/soya-0.15_rc1-glu.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rupN a/setup.py b/setup.py
---- a/setup.py	2010-01-18 15:39:57.000000000 -0600
-+++ b/setup.py	2012-07-19 21:19:48.054609136 -0500
-@@ -109,7 +109,7 @@ if endian == "big":
- if sys.platform[:3] == "win":
- 	LIBS = ["m", "glew32", "SDL", "SDL_mixer", "freetype", "cal3d", "stdc++", "ode"]
- else:
--	LIBS = ["m", "GLEW", "SDL", "freetype", "cal3d", "stdc++","ode"]
-+	LIBS = ["m", "GLEW", "GLU", "SDL", "freetype", "cal3d", "stdc++","ode"]
- 	FRAMEWORKS=[]
- 
- SOYA_PYREX_SOURCES  = ["_soya.pyx", "matrix.c", "chunk.c"]
diff --git a/dev-python/soya/metadata.xml b/dev-python/soya/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-python/soya/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-python/soya/soya-0.15_rc1-r1.ebuild b/dev-python/soya/soya-0.15_rc1-r1.ebuild
deleted file mode 100644
index b65bea0bde73..000000000000
--- a/dev-python/soya/soya-0.15_rc1-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python2_7)
-
-inherit distutils-r1 eutils
-
-MY_PN="Soya"
-MY_PV="${PV/_}"
-MY_P="Soya-${MY_PV}"
-TUT_P="SoyaTutorial-0.14"
-
-DESCRIPTION="A high-level 3D engine for Python, designed with games in mind"
-HOMEPAGE="http://home.gna.org/oomadness/en/soya3d/index.html"
-SRC_URI="http://download.gna.org/soya/${MY_P}.tar.bz2
-	doc? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )
-	examples? ( http://download.gna.org/soya/${TUT_P}.tar.bz2 )"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc examples"
-
-RDEPEND=">=dev-games/ode-0.14[-double-precision]
-	dev-python/editobj
-	dev-python/pillow
-	>=dev-python/pyopenal-0.1.6
-	media-fonts/freefonts
-	>=media-libs/cal3d-0.10
-	media-libs/freeglut
-	>=media-libs/freetype-2.1.5:2
-	>=media-libs/glew-1.3.3:0
-	>=media-libs/libsdl-1.2.8[opengl]
-	media-libs/openal
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_PN}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-glu.patch"
-)
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}/${MY_P}" "${WORKDIR}/${MY_PN}"
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	insinto /usr/share/${PF}
-	if use doc; then
-		cd "${WORKDIR}/${TUT_P}/doc"
-		doins soya_guide.pdf pudding/pudding.pdf
-	fi
-	if use examples; then
-		cd "${WORKDIR}/${TUT_P}"
-		doins -r tutorial
-	fi
-}
diff --git a/dev-python/sphinxcontrib-documentedlist/Manifest b/dev-python/sphinxcontrib-documentedlist/Manifest
deleted file mode 100644
index d0603f77cf01..000000000000
--- a/dev-python/sphinxcontrib-documentedlist/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sphinxcontrib-documentedlist-0.6.tar.gz 4983 BLAKE2B be38fadb91bb6763894de1c1f5e768926979bcf3b4d0e87e6032289222c82682bb98b61ebc0eb585e80c12abf9396fd529866ba074daa3be55007d1195110ab7 SHA512 9d7f14400b2a3e9b96f01ac003f70c0f7112d9286b2a978495f3089fe94137b034835bd91944e5709fb22553c30c9c324558c9a38ae82b932e1f2ba7f6927dd9
-EBUILD sphinxcontrib-documentedlist-0.6.ebuild 714 BLAKE2B 420a2828730699e127e08f474fd761b81192a6447c549c1ba050f3931bff93758585f567009d5354e7b472ede6dde6f9c5fb82a8bfb20b4cd6cb8ca55a789324 SHA512 a098340ded2b039f3d14238004d31fcd12770d653480039b74813ca4f1a1778d620bfe601c0eb9ed09b30c5fe1e44d34c36285168d4448cde9eb707399de381e
-MISC metadata.xml 261 BLAKE2B 2aa2501d310c9c01b57af2ac93ddcb063a23396dd839962e495a1b4635a2c90384b74e6c51a989e978f60589839049c8f5be7b4feddd8a6157533b3d763e6d80 SHA512 a65485da3a7cef76ccdc75dc40249062ccc651592f29e97e7793b72d0d985583f982e4ec3a2e193042a4c8e3ec6fe5b76fcc9e517ca3a7971b13836806ae8a46
diff --git a/dev-python/sphinxcontrib-documentedlist/metadata.xml b/dev-python/sphinxcontrib-documentedlist/metadata.xml
deleted file mode 100644
index 95b1e458e205..000000000000
--- a/dev-python/sphinxcontrib-documentedlist/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">sphinxcontrib-documentedlist</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.ebuild b/dev-python/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.ebuild
deleted file mode 100644
index d3065debd0c5..000000000000
--- a/dev-python/sphinxcontrib-documentedlist/sphinxcontrib-documentedlist-0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Sphinx extension to convert a Python list into a generated table"
-HOMEPAGE="https://github.com/chintal/sphinxcontrib-documentedlist"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
-	dev-python/sphinx[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 770d5902e9df..48cf2c5bc305 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,5 +1,5 @@
 DIST tempora-1.14.1.tar.gz 19383 BLAKE2B f65896391e839c3da43bb42715459b9ab870a724722bfc83c129f18032e731d69b2d12635a519226ef4ce99e77a3418e7e1a05a116a80c222b4e8138f9966f9e SHA512 4ecd5430d4d90959b0985908a1e4f239a56ce0026cd315ef6b8c204b645caccb135db76bb2ca9cb95bc65bdf337b61e7c31514eb9c85036771469b6a058edfbb
 DIST tempora-3.0.0.tar.gz 21500 BLAKE2B 7bf241d5ab60c78c0ea56df6b28e33504200eb5427cdffaf9d5f34da202c3ba4550fa4dcc48874ee870345fa5a10f2b874687fe7de2bbe049b1c14d05161b0e0 SHA512 2d397c1d17bb4c502817ad0278090137fb8ca00273c63a7336200ed7e621a99cd5c954cdc2da00d06eba34ed4f079429f5ddc68b928cc83feacb2335f995e1b7
 EBUILD tempora-1.14.1-r1.ebuild 1449 BLAKE2B e9fac10aad944f8398c0acaa739d2de2b9d57d0589507a3d8df4fb9092edefde4d42f4d938ed5bc773752376c4e17d84fe288606943fd2bfcd5064019d2c3242 SHA512 653192a76817d729dc297fc52d9bf2382e5316c7f8b6d2d53675e5ab57e1e739e2440dd56312efdd856ce6c60902ed28d763dc6cb46d6b25a46064daa34a0644
-EBUILD tempora-3.0.0.ebuild 1518 BLAKE2B d806ed0e7c1e6398498035ccde4be88dca743c5df92847a3ef4d424309c240e6d16cb2974c907d7b161f63779ac21ebd5f13954e8e7204a16e0b73cc98312f0d SHA512 acfeda48de1849892bb34a48ef046c127b85d9a51890d5113b8c5d4a3b56255684d68b70d8ec1475b73e64c02dc94c356a1a0172afdf07cf09c03fbf387fb50d
+EBUILD tempora-3.0.0.ebuild 1517 BLAKE2B 0cc50c6194a608111cfe9a465b1e29bca560808063f44f049de534eb6025f5bd3e8cb5894c0864ef17073af65b051a30db37bca3f5d04890920329c31f46cfd2 SHA512 1e9eebb33b678c8af3b3defb6631f23587afe16fb9efe84571b0ea7df84f893ef06e6d3dc6012408718026793a17ee408c92082adb8e6c0b3052fe88ad13471b
 MISC metadata.xml 615 BLAKE2B d393b579842c51e2dea6da1afde0a5571d5034905a9a4d5f4cbfa70cd80e918157ffbb1f98fbcefed28ee6c1ba20dc64e7583ea7ebd82fc1b8f9d3e57dc796da SHA512 7346fb2daa80f58a819462fe96220fa85d242795e24cc2fce5be013f4f0a678e1201b2b56bdcdd2881d95f0fd93386f47e900492862ed8b54e90ced91dd27f33
diff --git a/dev-python/tempora/tempora-3.0.0.ebuild b/dev-python/tempora/tempora-3.0.0.ebuild
index 68cf55980855..bc13434facee 100644
--- a/dev-python/tempora/tempora-3.0.0.ebuild
+++ b/dev-python/tempora/tempora-3.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/threadpoolctl/Manifest b/dev-python/threadpoolctl/Manifest
index 778ef0ad13b2..fb91c4e001ed 100644
--- a/dev-python/threadpoolctl/Manifest
+++ b/dev-python/threadpoolctl/Manifest
@@ -1,3 +1,5 @@
 DIST threadpoolctl-2.0.0.tar.gz 23349 BLAKE2B d7752d862f8de5d61a95dd2e0db9a9cf5b3fde4c13cad9f654c0af4e2277b8bcc36b79028fbdf0e14af35daacee4b01a8778462364e070eaa194af65f4274739 SHA512 8ce823a6aef9f6d6af73e848c7a3bb1c7eee3f94bf480ca056ed5f435655756b9ad26cb71e392689cd8e6a34ee1ddfcf0d8510e424ac9c05bb1eda679d0f7a93
+DIST threadpoolctl-2.1.0.tar.gz 25255 BLAKE2B 3afa8e8c44567d3833dee89e761b2f384129c386c5c5b9d8084c1b301f007be7f461f1ef99738e06551f793feefa5c312dce1d608e7012215fd759866a52e2d4 SHA512 09b745b0d164bf3fc4f293bd92f1fd2e02180ec538bf3da1cdb986e31d9336ba3e1301aede72f53700d00298bae7b91b4ec8fa3212accb4cde6c3f5f88ff5c62
 EBUILD threadpoolctl-2.0.0.ebuild 619 BLAKE2B 5c9faff51172774d8296258829ae879122a85f01bff37e96bba20657cba754e270ccad837a5d40e7414c1cf31227ec517a8594659b23e8cb66fb6985c4bce388 SHA512 6ac3fc6c4cc6ab9a80380e1cb79a71cfa5618b6bbdfcf0dbd544b0a3b3e4657865d78f42a5f4d18517dd16d470ef49f93b79d8906ad04eaa97eee1b677e710bf
+EBUILD threadpoolctl-2.1.0.ebuild 621 BLAKE2B 399fbf27e2ced60041ef2a949f5d226b7e7355a2ea6b4b5b8aff39278d9e6a4046e31a9a7691e2792bcbb81fdc85aa376c414a195970a4d997242e7c590b4e57 SHA512 a15b51d0b04957348e5c833e23579cb1191a6355ee9689f068d7616208481fa27505d298b7496963de972b25bdf0bcd1f696d1e89675c5dfe2545e1cc17aaa1b
 MISC metadata.xml 338 BLAKE2B e8be381e5e42a081be3637b77a9b5356dd7d74d0352976badfca62bdf7b65c04554552703b3e12e169ec1c4b57d07cedcf75387a0fd65a8177213f0de8bffa9c SHA512 b3e03151085bcaa51e2108d7e69042523148aaba924415421323d53005c1d047103827ed99bf064cda4f02cc313b3ff4e5fc681bccb5f1f23a82b40a744ed9bc
diff --git a/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
new file mode 100644
index 000000000000..1d26d7c49723
--- /dev/null
+++ b/dev-python/threadpoolctl/threadpoolctl-2.1.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Limit the number of threads used in native libs that have their own threadpool"
+HOMEPAGE="https://github.com/joblib/threadpoolctl"
+SRC_URI="https://github.com/joblib/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+# tests require openmp python bindings...
+RESTRICT=test
+
+distutils_enable_tests pytest
diff --git a/dev-python/thriftpy/Manifest b/dev-python/thriftpy/Manifest
deleted file mode 100644
index 1aa472811234..000000000000
--- a/dev-python/thriftpy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST thriftpy-0.3.9.tar.gz 208164 BLAKE2B 5ceb0479468cf7ee88f244163a247c878decdcf54844992b839259fd5be3fc8f0453bc861336ab4f21f4dc6c218eb2dc0a0fb2efa956675885bf710b8c32a86e SHA512 ad2b7f568db47f7f26235fc5fb6180c974eb6738f154461860c7329d263252ee627b979098c3e9ffe8ed42a0fb08a9110a6842a923ac800166d80a23d4e6a3cb
-EBUILD thriftpy-0.3.9.ebuild 652 BLAKE2B 4cd2bc9436569f3217e7e8ed6dd7a903589492ff0a543ea3be1f775fb116271bc1d3b8f798377703ba5409d6367c460bca086d97ac46cfac5b9ae3284b4beeb7 SHA512 0092e09111ecb6dc0fe4b2590a40429187bfe12e0d9632439120b792906c43884d9e8a2d955669d3b32336c4820656c65f36a067d4b4ab5cf243fb13e6226560
-MISC metadata.xml 778 BLAKE2B 6f83e8ead49cbabc5532cf915cc184af1070305ed153c97cfd1df5526e5d0db5c653c29fd746ba73b27d7cecc457cc24c2e37e733ee61a42f60fe8a2fd451ced SHA512 0bf7df25d46542f335eb9473e552b4fbaef70c43ccbffe2c982aad81c3d86b80f4c78c418848d51943849f18dd57bfeb9bb71ec92a2222565608457aa96b4749
diff --git a/dev-python/thriftpy/metadata.xml b/dev-python/thriftpy/metadata.xml
deleted file mode 100644
index 33592bf9bb0d..000000000000
--- a/dev-python/thriftpy/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>sci@gentoo.org</email>
-    <name>Gentoo Science Project</name>
-  </maintainer>
-  <longdescription lang="en">
-    Thrift is a software framework for the development of reliable and
-    performant communication and data serialization. It combines a software
-    stack with a code generation to build services that operate seamlessly
-    across a number of different development languages.
-    This is a pure Python implementation of Apache Thrift.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">thriftpy</remote-id>
-    <remote-id type="github">eleme/thriftpy</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/thriftpy/thriftpy-0.3.9.ebuild b/dev-python/thriftpy/thriftpy-0.3.9.ebuild
deleted file mode 100644
index da8d82fd4c48..000000000000
--- a/dev-python/thriftpy/thriftpy-0.3.9.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pure python implementation of Apache Thrift"
-HOMEPAGE="https://thriftpy.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	dev-python/flake8[${PYTHON_USEDEP}]
-	dev-python/ply[${PYTHON_USEDEP}]
-	dev-python/toro[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/toro/Manifest b/dev-python/toro/Manifest
deleted file mode 100644
index 3f0d17b11103..000000000000
--- a/dev-python/toro/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX toro-1.0.1-no-test-install.patch 278 BLAKE2B 87ac93c1b5a70eee2995e1466b771a8d6667c209deac9c872888b970792b3de0eda32a4f62b25eeb714c6600906779e949bb3b07a52c7faa240e4846ca12751b SHA512 e1a7eb6ba8898a112603ac1bdb3eea692c3bc52931a617bc12343e7c60980a4bedab93584347777cd4869085872ca7b7f7c0c8a083d175e0e2597214680a5f00
-DIST toro-1.0.1.tar.gz 57343 BLAKE2B 2269aa9d99eda60013c695c9acbf4f808562c0d7f4a79ee7d7402255af2ff600ad292949ac789b7a7c9429009cec41587052440e64f99edb7f88646dabd3b814 SHA512 a8a498868ff32dbd8ba9a0adf62b1fa2e9dea4f34be4e2701c08c7b58ef28b8daf4eab93916855a711a557049e587e886d6ba362487c151c5db34f6135f4f3e5
-EBUILD toro-1.0.1.ebuild 784 BLAKE2B a3b7841fe0e138d7e789e12886dc99bf385e8c753dde081bab3f26ff47f26c790a32610a41a8e989d705b4a94a06abe2d16024057eca15f11d1d8348f37f7ed3 SHA512 e00ecbbd8028e9448ae5cde782b0eb2a412934250a475cb1f18ad1852a487472211dd0017328c2a719c501e2da677be29369c65ce7de888db28e7639d21dc8be
-MISC metadata.xml 444 BLAKE2B 0a6a5245f27b859a5158eb79a8729d22a5d5382ffecc50aeac2c6e290148fcc72d2ccc671469fe00457be64387598ec7c9b9cd0c4987c215ee5ee685ffa7e37d SHA512 62210a631809295df39c6a6392dc0074d342805fd36afc6014a7cb108a01f59158ee864f0919350cfd4aeb2f0f01ffa45901fd154633ce059ce8aa36be73e6de
diff --git a/dev-python/toro/files/toro-1.0.1-no-test-install.patch b/dev-python/toro/files/toro-1.0.1-no-test-install.patch
deleted file mode 100644
index 637f9091ac42..000000000000
--- a/dev-python/toro/files/toro-1.0.1-no-test-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py.orig	2017-06-27 18:38:37.256325950 +0000
-+++ b/setup.py	2017-06-27 18:38:48.896243950 +0000
-@@ -45,8 +45,6 @@
-     kwargs['use_2to3'] = True
- 
- packages = ['toro']
--if "test" in sys.argv:
--    packages.append('test')
- 
- setup(name='toro',
-       version='1.0.1',
diff --git a/dev-python/toro/metadata.xml b/dev-python/toro/metadata.xml
deleted file mode 100644
index f9ea20bf41e1..000000000000
--- a/dev-python/toro/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-needed-->
-  <longdescription>
-    A set of locking and synchronizing primitives analogous to those in Python’s
-    threading module or Gevent’s coros, for use with Tornado’s gen.engine.
-  </longdescription>    
-  <upstream>
-    <remote-id type="pypi">toro</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/toro/toro-1.0.1.ebuild b/dev-python/toro/toro-1.0.1.ebuild
deleted file mode 100644
index 63cca62f741e..000000000000
--- a/dev-python/toro/toro-1.0.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Synchronization primitives for Tornado coroutines"
-HOMEPAGE="https://github.com/ajdavis/toro/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/pytest[${PYTHON_USEDEP}] )
-"
-PATCHES=(
-	"${FILESDIR}"/${P}-no-test-install.patch
-)
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/towncrier/Manifest b/dev-python/towncrier/Manifest
index 703bc4bbe530..2a907366069b 100644
--- a/dev-python/towncrier/Manifest
+++ b/dev-python/towncrier/Manifest
@@ -1,3 +1,3 @@
 DIST towncrier-19.2.0.tar.gz 18089 BLAKE2B d1e17e707b90089b19d9eedebd898b71fcc9a582cbae0166650a6bd52a8ac6bb3921a458a6d2c10e5930b92230ddf5efc5a428646c464edb6eb4bfc06949e217 SHA512 60999446c4ae404fb54ea6282a862621d49f62a2488d31eecf8fed9dd7afa6e01f4feac6e3dd26b882ee75f747424d63d05521e33b5f6b8df7059ce32dbe5c4f
-EBUILD towncrier-19.2.0.ebuild 921 BLAKE2B 14d176c918a616af267ff8a2eee889f1c0da565e7c95635917bb9bc0f0c81242e144a4c1fb0c372c9d7b495c1e90c748337e6823f2aa3631acfedc9eb7b5395c SHA512 b8523784d3dfdc99a4252046177cfda3c4503e77a5525c63b3c740ea830e678343dc08d65b1079acdd2ed840bcc20d75d3f455d1578e91bc0a0ee833aac45139
+EBUILD towncrier-19.2.0.ebuild 919 BLAKE2B 4af531d401b899de32789737ec8a6d7c39bf7ab2ad26d1bbbae8a4f40ae6fc7a38d78227ad5911492c8f8ead784d3467e508d23385813467b8e13fea09e7e620 SHA512 d845941aff1fc2d2b844018950ae790e2e7a0ae67a9125465dedf0a1e5e9b5949f71de07ca1a808b9442a1187c130e10765968e19df0e3d773e9a4973d24053d
 MISC metadata.xml 312 BLAKE2B fb9710abb0c693626d09df383f38a85e69b165f13f76aac9ba46da772e04d2679f4898dab39ed4d383854a4338713c24a389b7ac37b797eb78388e696c8191cf SHA512 4f75330d767fd48bd21128ea81256aa5c5031e0898eb07889a5ebf4c2275e7af174e715500a0724428bf8ef5d8051d29d2a489fdcf557b19a88d294b4c85e5b2
diff --git a/dev-python/towncrier/towncrier-19.2.0.ebuild b/dev-python/towncrier/towncrier-19.2.0.ebuild
index 7c6b2b5c34e1..c907a6f75042 100644
--- a/dev-python/towncrier/towncrier-19.2.0.ebuild
+++ b/dev-python/towncrier/towncrier-19.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/hawkowl/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 208e2f71d2bb..cf7f7dc66472 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -8,6 +8,7 @@ DIST tox-3.15.0.tar.gz 291890 BLAKE2B 9c42c587332eafcfd02d2d8a42588af6253baf9f62
 DIST tox-3.15.1.tar.gz 292044 BLAKE2B eb3062fb1a2494a6b23e1c6f2c6af56be5879664ae26918e60839d2f8cff98dc6b684a27469eac81c363a3cd3e90abdafe0ab4dc601840023e5263a42301f384 SHA512 334e2129d5418d4733a25419b81cc57e794a11954c21774231e32c93e977f1a7fb71c739adabccb5cdde9428ab69772e8623a0c0a1172855957f7cbcd4a917b1
 DIST tox-3.15.2.tar.gz 293523 BLAKE2B a1a1c84a987d2b2e5194321405775ee3828b8e2c8dcd38c7e780a9d508b789a42f1880cffcecd68c50dfdc37008a4e9a117660fa2c732864c82af6c2eaf5a99e SHA512 9448554452c79039289d2d2c05c974f451647329701372c3e4b154a0161fa768245c0068cd5e3f1221b4b51a07be806f7c66ab9d4ef83a3e8e5964e18b9cde85
 DIST tox-3.16.0.tar.gz 294040 BLAKE2B 2f5ca2c1b0b839b4fe6834cba69d772b9605e6bb00b24d75867de768042cd091a8fd7f5a349867a5de578b96eaad9f59f2ad019203fc6b2c39c9efc6933d2d96 SHA512 f92accae643b01867749f10d01ba0e18ebb36071af55a21cd38ac8f14fa3db1b1e708b22f8601e4d1b172e59fb62588c1252d064be3fb6007002eeaaef716373
+DIST tox-3.16.1.tar.gz 294080 BLAKE2B 692ef3f498f78f239ecbb3f9ac5745462430a96bb67df7a732e5c5756d1b579c4ee8582d528d5eafddc7b19905057c01514cccaa42d7c1a442ac24cd531a656f SHA512 83fefc4b82fb33adbf2ece9a6fd6ffaf27771ac6076af5d2939dcbf68f1dd88b8edd0a105b0ec86dc7ee37b127d27ed46748af61423811c7435d0093d2e8e1eb
 DIST tox-3.2.1.tar.gz 268827 BLAKE2B 764835d04fb0c17f32eb8e2041b83f90d6a729b781a5b5b95e9ecb1162f1c29ed595d4a6369524b390a31853b8003485b27a3a12d63e84f49e92675f1a9bee13 SHA512 79f5a1c8f6e818fbb8444754e3767d880fc1fdfe63b46c518d37440fe2b2f3ce572865aff83d9492c24486fded49893cc31bd9b11254bac4db507260304bc76f
 EBUILD tox-2.9.1.ebuild 1284 BLAKE2B 601887c581bbd95d0c6377a4383693b4dc9956a8bfc474ce73f77b22ed8f73593a3ec7ef002e1b415798024a6451ce8f85f7c9dc03dc01b3af392babb2ef3524 SHA512 730680951dda514c0b228f7f37b06537ee44893a0fc0dd812954350f4123519514b07a7394b83243c267c1e05c5c0917efe6c8ea1b04c11418a2f997cea38878
 EBUILD tox-3.12.1.ebuild 1470 BLAKE2B 328809a7f1aac4a932586a88ac9082a83f8f5aa66b09714747584ed6d4acb8ab18480d2da58d7b74992633ccda2e223214eb871206d2a1531de97f5165f991ba SHA512 3e3f7bb27056a9e5bbaf3c699b1618bbde793518aed71acdc639e4f7692417b23e669c79f9737eff6e21ae255551f6cc296519cf85c28126e897a8dfb414f6f4
@@ -15,7 +16,8 @@ EBUILD tox-3.14.4.ebuild 2249 BLAKE2B 4a8e695a7625cfebed1fc86451ceec4459673d3138
 EBUILD tox-3.14.5.ebuild 2289 BLAKE2B 987bd969cf8477bfa0436717e70915918f1d97a2149ff1cc9f76df58d8f105ea959f8f50f2a684c09ea1613281e294694aa7f53c2992124c89e12f78261f02c5 SHA512 5e7a92de1f17558593d06f417b4d8655c20308f8d0af92ceeaf6570228835d53d3592c9183f9a6fc1f390dd3f6e2f3f63cd03b4e52677101a8166ca5efc7165a
 EBUILD tox-3.15.0.ebuild 2277 BLAKE2B 4dde45fa512c6b125f506b2ac4e2fff538e49f0c8b9b26106edfaac9bde6b0fc6025989a56dfa3e55660d0373f5cbaf65811474ad39957711fcea028881e29b0 SHA512 c9d973a77a9ad1f8b7c37af20184971bd41ce0233352dced8625f01b911c84c46d1e388cacdfdc19a7775b2ad27273e966e32515e9d671f2a7ec258eb025948d
 EBUILD tox-3.15.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
-EBUILD tox-3.15.2.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
+EBUILD tox-3.15.2.ebuild 2237 BLAKE2B c012b59b73176ca6cf9371b12a0354217fd17917bb1cddd814c97bc5dd0ea1335450cd10ba68370da2fc46a41e2b319d4db770205cd50431dd8933b84953f325 SHA512 beb0a1ecfb5cbeb4c267c9e7bfb3d61255df1034090d696f757ef8cf04d8875226c4d84002884c0c9065f68b3d2570ffa649950510f8cb70f8bfd0c90ed9d8de
 EBUILD tox-3.16.0.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
+EBUILD tox-3.16.1.ebuild 2238 BLAKE2B 1e4399495275286778ef1b8de164a6515fb7796f30964f25fcd63072d8d263931774aa0f660da6cf7ec527da64d1172d9936d1d5f355ef75e2453cc89c668f52 SHA512 bff5d72963d921f7f06ca016d2c1f53a45c73bec78c7b0d00d59541c4a8a13db1721c1ad80b58a33b53f65ff3d7fbcc14ccb6af08dd086da843cfe22603e4c62
 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.15.2.ebuild b/dev-python/tox/tox-3.15.2.ebuild
index 0365e6a79004..bc779e0a1099 100644
--- a/dev-python/tox/tox-3.15.2.ebuild
+++ b/dev-python/tox/tox-3.15.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 # doc disabled because of missing deps in tree
 IUSE="test"
diff --git a/dev-python/tox/tox-3.16.1.ebuild b/dev-python/tox/tox-3.16.1.ebuild
new file mode 100644
index 000000000000..0365e6a79004
--- /dev/null
+++ b/dev-python/tox/tox-3.16.1.ebuild
@@ -0,0 +1,71 @@
+# 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="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~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-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="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=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[${PYTHON_USEDEP}]
+		=dev-python/tox-${PV}-${PR}[${PYTHON_USEDEP}]
+	)"
+
+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
+
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv --no-network || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index d319a56250d1..4f60f8701729 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -9,7 +9,7 @@ DIST tqdm-4.47.0.tar.gz 145749 BLAKE2B 77a5efec763a8e58e071ee571077ee0db72d92433
 EBUILD tqdm-4.23.3.ebuild 673 BLAKE2B b49a8fdad4ee136a4b5149ab39a852d748c0a9f357587490fd272d37743ce530ed2b69fa8cd87a8ed657d26c0669c2e038d484afb7279ec3460562d281b0063c SHA512 2eb6fa8f796289073d92c07b6e7af8e7441d83bd32a01ac2a0d3dc8b530d1c796777ead4502cc6734b81adae01d8c0a496bff147cde268fe2d5223c4a8ad448a
 EBUILD tqdm-4.33.0.ebuild 1233 BLAKE2B 06c019bae07709c13627ec3b47c00c2745041b604d15a1f84445ab82cd82990506a61ce6c2d44cf9d84c4b1b2c5772ee6b03a4252af7035ac33fc4e6816d5ca1 SHA512 007d81a3e948d9b02e57a501d96ee8bfe8763bdbe5fa89d21332880873dc459cf184f3ffc3a9edf6b2b8b46933ae45d1e07b32b649c8d5ba15cfadf374bf2814
 EBUILD tqdm-4.40.0.ebuild 1350 BLAKE2B 27dc08ff9bdfdb52222d625e442202eed0f2673a3e4c7e2640f6ab113fb5da118616bb08b69f5050eca5c17dcd6bfd1389c4dd17b7c8b20fd137e69c22b6e5c4 SHA512 b81e0ea43e76d9d3ae9440328d69c6998a3f76f788ac68be9d4ca81051ae9b15d0ba6b3cd4af4c02144ed781e52cb28de009bf03445f6a9810039380c480dc1b
-EBUILD tqdm-4.45.0.ebuild 1357 BLAKE2B 61a3712f9a48e6fdf639f3a93e98f45d8252fddf368a10047e29c88a8041db391d6a196642b82bb5afc8bea5329e0f178dbec286b0a7b3fce9fc075ff687e9f1 SHA512 6cc9c993115b72a3e91bc0cf135d67e166de30f538a503e2901b01648805012056d4326444ff56f4fc6469b61aa1fb9a3eaa856a64c268649235945e3efc8e9f
+EBUILD tqdm-4.45.0.ebuild 1355 BLAKE2B 309811522c518dc0a6cbcd598409bd0c3d69efc9f8ed6a47ade2a9ddc6df4a99b116dd5c02de0b8a1609f07b605ac8180d34ad81fa9156a998c12864ad03c5f0 SHA512 63e1762eb5508d99acab3d6ea25a45b5f9fba1d8b04d8aa9f0e16af7a2deafeca3db3fc8dadc527466a34ced5900b931a1360dd428c19e1fd9c594ff12fe1ec4
 EBUILD tqdm-4.46.0.ebuild 1382 BLAKE2B 4c22605d67ffa9f686148c836e55d696adf92a9c8ef16e5c6aeee371b5f232996673a33f179638b429e1ebb2d6870cdc6b4332ac5ae2eb4e3b5b522c062d9d7c SHA512 312a694be69f171f8b07be4c718bdd1955c95366b3adbdc16de2694353b1d2e92b68e948add38bba57092a8bada6d25bebb90b7ad289974d86278da1d727fba0
 EBUILD tqdm-4.46.1.ebuild 1338 BLAKE2B 0cd1d07f26f209430d54ca22e7f46f7184ee2acaddea6ad537076e5254c245a36bb3463b19d2d0d8bae75b1cad9fa5e7038cf4d1059b58ad57500f61fc1c48fa SHA512 c60c54ab192bcf45d49e561c01885591432ed6d385e8ae3092039102b6771bff1a86169953a38db5cb25c1d640df51d4871de8429fdafc56c10e2ec3c17f4bed
 EBUILD tqdm-4.47.0.ebuild 1338 BLAKE2B 0cd1d07f26f209430d54ca22e7f46f7184ee2acaddea6ad537076e5254c245a36bb3463b19d2d0d8bae75b1cad9fa5e7038cf4d1059b58ad57500f61fc1c48fa SHA512 c60c54ab192bcf45d49e561c01885591432ed6d385e8ae3092039102b6771bff1a86169953a38db5cb25c1d640df51d4871de8429fdafc56c10e2ec3c17f4bed
diff --git a/dev-python/tqdm/tqdm-4.45.0.ebuild b/dev-python/tqdm/tqdm-4.45.0.ebuild
index 6ec5bce83c37..2c4a44d12e74 100644
--- a/dev-python/tqdm/tqdm-4.45.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.45.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa sparc ~x86"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 9a188a74f880..b64af84c7488 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -3,7 +3,7 @@ AUX twine-3.0.0-tests.patch 595 BLAKE2B 839f6a17293c23e3cc01bb2497b9e8402bafc725
 DIST twine-1.15.0.tar.gz 135851 BLAKE2B 5e85c30e23615e9fa7e40ed767412560b29c42ec777afbb17850781a384bc2d3787534a8114a65ac2374ab80441eb2d3b6d75dcff400e7b47a42453a9210130d SHA512 e0eae05c108e1e766a0a8ec684e3423b0537c8aa671675f30403171fd4f48ec65666d407df53f6dd9eefa0b98e5fd2fdf7dbf1f0f9150686c499de131f6f2435
 DIST twine-3.1.1.tar.gz 138692 BLAKE2B d96e207b5ef1314f547f5e8fbf36565d5cf29f0dd19438d41fcbb154a98b854c669740b533a28cd79501933f0cef57767e63a83f135fcdbc196df8865cfc4d8a SHA512 446b36a1816db6131e279bda26e62c58f9659d86178d498ebb9f7c5287b61cf969e625debe4b4cb1e32832e0eecbcedcf4913319ae0bf7eb287f56e550d33ed9
 DIST twine-3.2.0.tar.gz 145280 BLAKE2B b25fa984486a375e09705703a47994b529f6e5b48c6733c0a07b57bec6c0dfcdf4096d6ac6b0f9b7a7bfebfb32ea1cfb49c5de79f29495eb2a8fc59a5f8de4e5 SHA512 9959430913ea570d22f2d8b94e929af36b409b71691b3f66de8ddb77cfbfbe36590e21a6062db2a4a4f56ce2eb96984b0a474a93ea96b7734f53ada7a6411c28
-EBUILD twine-1.15.0.ebuild 1316 BLAKE2B f3caf2ad608b788cbf8c221a52e192d4df24441a9cc6bde46131a44a117bc0e2300e507769a79945ab5afdff9d3ed3bd3fe8afa9611fab50561b9efe2c3a72db SHA512 4f55f1e3e359064f151a5975d5d28f45eac932a87a79ef7cfc9aa6aeceb5b94ce47b7da177fd8b3f78fded784b64501061308bf02fdac3a71acd495982640f80
+EBUILD twine-1.15.0.ebuild 1315 BLAKE2B 855ab7cbe5071f1f12978c4a834a21eee84b7cb5404614f4caaae63120cfb46aadf485e363a049e3864997cfc344f607cc3a772742d05a1b12ca1ec181073d47 SHA512 fbd347002493be89cd4a5c8622ba66c95bd9f2baa09294582935434502b3935888da1de539f4c7d6b78ddd27feb652dcc8603b73574cde9c0399c68a560e2fd5
 EBUILD twine-3.1.1.ebuild 1823 BLAKE2B e46de58b7fed306291dc6c7b534bb541911cd13ed5df63ac140673a68077240f4051569853355ef8d850262c0a228400b24962ec9ff268eac99b2a3d9d290fad SHA512 a4c0ea189edf18dfd23b4d45c6f354bfb1cd458613fe18f76bd94fe7160e38df2fa37932ddd1c3101948c0d08ace0369b7372b35610ef8cf67c58d9775def9e9
 EBUILD twine-3.2.0.ebuild 2000 BLAKE2B fdb7b5d3d8e7f454658ebdba4b7047c496931936e97f71b13e9f4e0d9d7af21ab3b925a61ab38e0271dbb798835fda14218b80dbe76958cc19ff5a3020832b05 SHA512 81c68f707a4a9e5a3d36d25a05bea66ba85d2adbb2200569779e4deba6fa052b3ef68f558aec33e5b42563080f94f5b56e546c547fa99400f095e1a35ccdb5b4
 MISC metadata.xml 358 BLAKE2B d4ec540be4b2496c1067200781bb8be0cc085bb4d85f922bd1bc66cd24e4514ba2ba7e8653e3c9dabe7295e24241e4de6c22701eb40328393ada4bcbfa7d77b7 SHA512 525abc4d0649347e2a0c121172aa16b94560d549a37d81712513e39e67046748d460bf07109baa373bc261938f79456ae81f361fa0d41915edb32382bc61de17
diff --git a/dev-python/twine/twine-1.15.0.ebuild b/dev-python/twine/twine-1.15.0.ebuild
index aae10c3dab61..48fb322e6a9f 100644
--- a/dev-python/twine/twine-1.15.0.ebuild
+++ b/dev-python/twine/twine-1.15.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index d06e1305a256..766b5b561e5d 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1,5 +1,7 @@
 AUX vdf-3.2-mock_from_stdlib.patch 144 BLAKE2B 8a32644d40f90620c050b64cd80aec42d564e0b5f032b0972d2c4219b0b21630b861163bfa716e9d826451b7050cfbae74c2930417f4b0fbbedb9beb1cdfd246 SHA512 aa9226aae713472d10eabdc113e37ae80989c7b4e0b03922a4ce49d5f228ce012c05ee29353caf5a930f5b948b138b5f9ff1fe100f39f839d5638e25f0a51dd6
 DIST vdf-3.2.tar.gz 15050 BLAKE2B 62118879607462d9c205ae454f9187bb20267d5eefb3f0cf7efc5b93585b5400d565063dcacceb4dddf489371129bd4710ea2bc09db35a9739add1c4dafa992c SHA512 c9b60f6999c08b2610ea6ad1e6fd9d143ffabd6a93af65fc5ee39d775a6f9a2dccb002f19ce72a1d7de6e53188fb98bd4a0dc4074047b74ca53991294310175f
+DIST vdf-3.3.tar.gz 15799 BLAKE2B 48e12d6456f776ae7bf3a3dfec3bbe49f6089ce57720f4ab7beec7502604da290018c7af75f7bb58b1d8a25dc44daea7e028f70d75f7eecdaa9277e9f75a6fd0 SHA512 10b944ff88313001cdfd416b04f13daa7350aad75d3f790b6562cd3953fb5adebf7a0b54be24d853d68eb7ef2b8b469569ed37b3aafb0a2f4d0c6caa6816335f
 EBUILD vdf-3.2-r1.ebuild 533 BLAKE2B bb03c3b237200d7cfac66aed5517eb37c94325720c3785f8471135abb69565232a9abeebe52b35eac8fb77135c8e5d9df6a05315aaea34e33e9068e7e39d283a SHA512 70c6a034e78f07f7b21ca2d264dbc248decc84dacc222737180fb7a53dbe117b896e12b35e8e646482cb4a8f002ca634ba6abcda068013647761d753cc3242c6
 EBUILD vdf-3.2.ebuild 518 BLAKE2B 7bcc3f44c6de2eba10ab1530cb57a803a630e7876fd2072d6a86da346afe75e729c5cf3199a1b98200a2f3ccd77897edf88289cc1f60eef4b67ba0233cd93c98 SHA512 8541f1031cf1c1bb322505b2ef64c823cd24754eacfd061aff9e1cb67578a3beee929aee3dad0feefca8d3c218a693ba19636f93c2a0f287c0e650a9157d2b90
+EBUILD vdf-3.3.ebuild 532 BLAKE2B 4cdd3cb6c10a9f89364e30ac762d726748d96343fa54680f920b083bed074fb458ae531577991e239515dc4ff598a475018fd9c72fb0ddcc166887a4ee12f929 SHA512 219c51244fccb694694058c8fed219bdcea7dfc15c56f4228d29163fb07cda64b99e6e4a2276192b806af06bb2fa557da3c8ae82ecfbafa1f9586753268f79c6
 MISC metadata.xml 366 BLAKE2B df19925265c9cbb45a9e51a18c52bd72e6b544cb42fe5ce192a94a351faa38242c0d85ba0d9ba1f83371990c011ea30233960c5a0ca3349bee27d1bd94ba1b61 SHA512 2cb7d9ef5bdfc2b9ba4d991c03fe882f41cd96be13e8e5d2ef49217c7ab5962c1f02ad21aa9bb8a3d4dccecacf0a9c5ea3c7022ee2cc0c88fb42662a3f8a751c
diff --git a/dev-python/vdf/vdf-3.3.ebuild b/dev-python/vdf/vdf-3.3.ebuild
new file mode 100644
index 000000000000..573902811712
--- /dev/null
+++ b/dev-python/vdf/vdf-3.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A module for (de)serialization to and from VDF, Valve's key-value text format"
+HOMEPAGE="https://github.com/ValvePython/vdf"
+SRC_URI="https://codeload.github.com/ValvePython/${PN}/tar.gz/v${PV} -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2-mock_from_stdlib.patch
+)
+
+distutils_enable_tests pytest
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 0ba08f3b2e24..8d6622c64dc5 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -10,7 +10,7 @@ DIST virtualenv-20.0.18.tar.gz 7982748 BLAKE2B f759ff1c42aaf9229e3f8dedd7b50df12
 DIST virtualenv-20.0.21.tar.gz 8036935 BLAKE2B 63519368c951989a4112abd77bc8dbdb3548872ccd2da8c8fb8ed0d8dd2b99271df4b666dc5618eb4ccb650ecefff07d57e47ba6ce56c770de432e79f5eb1931 SHA512 168bd977bfecf98b76a20c6059fa372a3a9681e778539d962c7062a19ffdf3387c89eca50e03a4fe83ff2ae8affaf8ec3f87141d0c94240ea205df329a113651
 DIST virtualenv-20.0.23.tar.gz 8038565 BLAKE2B e11a7e36c33848fc9c8ad12fed369e6804c11a89e11cb66ff105b4e4e5758dcab15809932f88d9ddbc229d1bb862d29dead9ff2e4da655603e627887a1a2cd1d SHA512 01a56564ac09abca25cd163e7b425d8dbf1f57d6771b57e1f5fe4182f86197009e7ebdcb6f4a8640c8b8f0cdfcfdcd843f7be33848c66b0b5877cc7a8fe6ee0e
 EBUILD virtualenv-16.0.0.ebuild 1229 BLAKE2B 1471e961cb3e6eac155ad7c7aa761ee6fc3cc067f043c05f0dabcad30cee98c9689bae08e4f37a05a4a47c0627bd8d124be23f0804952b564309cd05a6e5491f SHA512 0204f47949d89816bba0295b24c076ec375f31e19071ffcccb3f0b70068c88a12fff97e292ed636ac9b0edda5bc5ba4f912d6486d30c3f3956f7456771eb4120
-EBUILD virtualenv-16.7.10.ebuild 1764 BLAKE2B d3006a8462b7ecfd27c0ba82f239e95e39973103cfbdce218fe078ea53947352e1590b66a3e8704f764f173a55afbc44b71a207f86e906d241d3c12cd0e97fba SHA512 4bbe5a62aa6bc3613800ff01ec293043d8fe733043ca5fe55bfd02105855b5a53802ce8b0db0d289e002a3319dc323049ca282de70619cb82e1445ae6f807f16
+EBUILD virtualenv-16.7.10.ebuild 1762 BLAKE2B f00d03022a30babf6278c6735ca5b9a860ea8481410539e1538ea870ff1b34f4841376bb229daaa0258b2fbe5059e976e3193b98419a604749dd7bc81fd0188b SHA512 932f0bb7e39b68a4f82485f578f63c3c2f9dd8d9ea48cf628d536b761261ea540e845221e62474aa5a428634fdd08c5adb9cef14f224a273e7dceb2b2265ba3d
 EBUILD virtualenv-16.7.9-r1.ebuild 1828 BLAKE2B a6092602da117163b2b6b7882a7e2fff1acd9334c5150b8d9f7ea37b5855dda60924d374e3b3ecc4f2426f3a0d426ec7dbb17a9c577f4285f499123ccfd39b62 SHA512 0c714cb640d21eabb8eafd0c641989b9d896748889f987b381ec137d15da79dc1caa757ef94ef1ecbdef790d9018fc8197b4337223b85eca4821770eaaf2b35f
 EBUILD virtualenv-20.0.18.ebuild 2272 BLAKE2B 0ae1219c1cb9d17e39912cd4963a3c2ee8898e71a61e894ab453e85c50926a2721be52a26652028a30decace9d4ad0eb0f30ba3d569e19d132e0472728f16cae SHA512 989f04d992e7699038ded65a15f5904fd077b6037b49711f0df91fb8b760207b2abb967fda53d2aa684371bb9dd38f30f2189be2d4d8e7de78c7098dfdde9768
 EBUILD virtualenv-20.0.21.ebuild 2597 BLAKE2B 0f6868368b0babd66fdcc7411f50bb9b3899bb75babca111e7f61610d3af7f1b84975a98f8b99ab36c1c42713931384dc3de0a7fa1b8218f91b3b201dcf12028 SHA512 b31cab9e92aa539977242293fa58392c5ef7826b85371f0357264b6e5601b8afbc9152ba365a99aee05de0728e4bdd1057d88191f06eb174b4e94394095d78d3
diff --git a/dev-python/virtualenv/virtualenv-16.7.10.ebuild b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
index b26dbd53d0df..a50edc6e731b 100644
--- a/dev-python/virtualenv/virtualenv-16.7.10.ebuild
+++ b/dev-python/virtualenv/virtualenv-16.7.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 #KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/webtest/Manifest b/dev-python/webtest/Manifest
index 42a5551c5d95..75bc14f5926c 100644
--- a/dev-python/webtest/Manifest
+++ b/dev-python/webtest/Manifest
@@ -2,5 +2,5 @@ AUX webtest-2.0.33-no-pylons-theme.patch 1556 BLAKE2B e108d05467d87aa0dcc50e8a9f
 DIST WebTest-2.0.33.tar.gz 76081 BLAKE2B 6c06d7cf6573282342ac190fe2365d041679fd9a75571a525cf0214f22a0631d5f97e94261090d9c2a372f77b005d22be5976f612c27c6b4c832c71469b33ee8 SHA512 9f5c614f8215837dc5cecc9c3e844c5e1678eb8275f9e27a0ec6a68648e9f4f09155aa72f6c731c34028b8671b7776a94235f3e54d7dbf5ff55de94840171ca8
 DIST WebTest-2.0.35.tar.gz 76227 BLAKE2B 2f10520a66a00cf61834d5ebe2b8eea469d4ca32155c9af3c0b78234607ea5443e695730a7db4476f5296f9b848f3950027d7485a4116e7d736fd9c33d8e78ae SHA512 ecad031702a9d2031d4e2230dc8213aaa6b1a3e9e6add296ee796aa2ef77d81c992dc24e481f721bc34711d1e33f3932d56cec4be3d62ee82a71fb405942c339
 EBUILD webtest-2.0.33.ebuild 1411 BLAKE2B 10c8762873ce7fb712480e3e9ce6cbcf848ed9a3db274e2306a09bb496dd223d29b40eac61604283f9fbba222579bfc8f6ba55b5a3bfc2355d561d45ded511e1 SHA512 da877093e91a7d899ca6dec376eacb2a65a9d26017b20a1c18d249ff33c498baf893d3433ca6e3c5561adbddb32d30584f9d1b99b67217c55d05ce82bcb87c89
-EBUILD webtest-2.0.35.ebuild 1167 BLAKE2B c4c4c20f74514951579f99486386e0dbaab239c34cb08bdfc8edc73b180690f586cdd868e3005b7dd0ddb32cac65fda46d8b368b6254f1b500494e605ae534e2 SHA512 c273fbc09af634c2a5fbf0ad4d0df303e26033653ea81679846e7eb16625bbbc89ac7212b84692d3760e556210cefc40ac50da35b05a1b244b93780491d740d6
+EBUILD webtest-2.0.35.ebuild 1166 BLAKE2B d89cd6d952f46789bde9be8f534ad6b9dad5552e0e9464327872b1d1e023cdfbddbecfe5270064a263374fdaaeae75e48f440a7022a631c2d5dc04284c15b9e8 SHA512 3f705e0e280b1da215d478e4b2010ad2bb6c812228cfc543767002478507d5207c989d4f564f47c4dcd0c5587eef8889abcedbd2dd0cc89b11d3e73361f70ecd
 MISC metadata.xml 334 BLAKE2B c00ab66872fd16dfbec0b6aec890b3c086a48238228928c0149854ed30cc03d28f4677a1a222ef07c0099f9fb27eb9ae8406c4080306d06fa1895a20b2ccbbc2 SHA512 fafa09470ada71c4218cbd60b579491fe9f9dbe5c2e89cdebbd1f298fd1181ec3af3f45de60afc2f4326e044008e06c58c84f2f733367a1ab4a421fa350cb8a9
diff --git a/dev-python/webtest/webtest-2.0.35.ebuild b/dev-python/webtest/webtest-2.0.35.ebuild
index 2f10b3f2dfac..2a82d27844c9 100644
--- a/dev-python/webtest/webtest-2.0.35.ebuild
+++ b/dev-python/webtest/webtest-2.0.35.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ws4py/Manifest b/dev-python/ws4py/Manifest
index fb69c2bb8c09..20e45e0b1e83 100644
--- a/dev-python/ws4py/Manifest
+++ b/dev-python/ws4py/Manifest
@@ -3,7 +3,7 @@ AUX ws4py-0.5.1-python3.7+-compatibility.patch 3713 BLAKE2B f5c811b6dce12637307d
 DIST ws4py-0.3.4.tar.gz 65467 BLAKE2B c51e338f3c65e100b55e83cd7b09fb8e4eafec3adc118a2744ea4aabc54c91efacda94cb3018550049d617b6759198cfbdb4497a024c597de942abe9e5517ab6 SHA512 32cd2eb9df7367e2bf42e354766a0ca407715a863be6b51b7701ec6e0537a2ecf7c2a59423f56ae093855b075c30a4065c7f7efe3b0227915639223b9ba7a55f
 DIST ws4py-0.5.1.tar.gz 116673 BLAKE2B 31db304800f0d3da61dc4c1a3381a8fcfcfa8f16b36d916311cc32f1d294c9f7b3627dac673edf824f529f485f825ca418ab1e1a8a2fda5583c6a6a1bd9b752c SHA512 4c90d66d37fb5bdc8f7fc9fd184b20a7dc2dae811ecf3a041477e3c26a2577008be7041799daca5b8c0de65cb2454022a6c135cf02534ca98b6946abbfce0e11
 EBUILD ws4py-0.3.4-r1.ebuild 1726 BLAKE2B beffbc7b4a6cbd1487769c4b4d55ae70f748fbd6eaf9d621abc8dbf2b92e927e9173fa3c7d982dde6cbdef4b24044fd883fadb496229dc43e28106b401fed7ae SHA512 00774d6709968c5896de6fff395fc3547d34f0cbf81a2db82201853e73609269ddf1d6fdc6ec08ab568828934521cf990aa8db21bf8490dc6e0f6c7278be9c87
-EBUILD ws4py-0.5.1-r1.ebuild 1783 BLAKE2B ea5b96741c4bacc32653533785b3780e2fe209d2354c048664b90fd44229b437b632ee6c285780080bfb4e62d99ceb8e3e61344eb1ca3df291665e67669f4c6d SHA512 e2c8bdff91ee1f1ade44111a8f137bdbc13f9b18b595b4e452d42a91ff77f4e18f6641ead014d1bc8739824c557c806f888e615532d490f264ec2f17655a32fc
+EBUILD ws4py-0.5.1-r1.ebuild 1782 BLAKE2B 2974e13ccea65faa858dc30d31033f1e6f9c4fbd949445084cd8eef9996e932e11d388690572e74568da38a9304feed0718d5795161e1a1fa79325eba6c742e2 SHA512 2e401ba6367ab0fd14abf6caafeb61f8e5e9be1af59ab34d23e9b741d09186463e9a423558835b01bce7febc21920f06e0727b8ab0573c07a271500bb5bcf16d
 EBUILD ws4py-0.5.1.ebuild 1690 BLAKE2B 44cbb9758f359bc8b5a549d312f9b77f95011852447778d7dd507b981965e476da6b852550524cee7d0cc640b268a51792fe5f2f1aafa9f3c4c8d467378f68d5 SHA512 98f64075746263eecbbcb0a1bd1690166f927a521cd6aa82128a928de3b6f597516b8878808793c2896ce7c65c2e9558b8ef854e5d18d9adf2ce2eef2809c118
 EBUILD ws4py-9999.ebuild 1784 BLAKE2B 43cf659f0e4c4c14e344dbf2f8b1f637f168233b14085ad10fcd5c96650306f5162d4bd5ba6487d366898c3f055632ea32fb2e807be4dfab1d33de62ad81ce1a SHA512 827f1ad7a9ed752a2dc2e0c0a55a83eb5f7109744134e4fb76e555e7baf97cbd059890cfa0d0d73b8b8624f420ab0a1f56c6d8778d571a8558c1285df5f85355
 MISC metadata.xml 480 BLAKE2B 464f4b1e941659251ece44c65b341bac398a73a13624f58a36113359866557789b255a4e45a23ff9305be2e7bcbd3ae9e30b11d0ab72a1496544b1e559e07a17 SHA512 f3785b920223b276874e389c7db00b20117aaa3e003ed03593490fda2bfcc4df20034a91a3e98c58ec30f52ad50bc81d91e2ea388e87e56bb91863edbdb6d231
diff --git a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
index 8fa2990a4f6a..a2d3891f3f0d 100644
--- a/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
+++ b/dev-python/ws4py/ws4py-0.5.1-r1.ebuild
@@ -18,7 +18,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Lawouach/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2020-07-04 14:05:23 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-07-04 14:05:23 +0100
commit	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (patch)
tree	43b0410e62aba677b4b256bc3ffe3fd333d28dbe /dev-python
parent	90c88731bd036e5698b281fbc0a5f3aa4c9983ac (diff)