gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /dev-python
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
564 files changed, 3004 insertions, 3486 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4e80531e7beb..467098e7ea08 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyContracts/Manifest b/dev-python/PyContracts/Manifest
index 01e5df40d198..f40d08176c19 100644
--- a/dev-python/PyContracts/Manifest
+++ b/dev-python/PyContracts/Manifest
@@ -1,3 +1,3 @@
 DIST PyContracts-1.8.14.tar.gz 92346 BLAKE2B 507fdfb313347d6650f21326b6b70b73f17cd702f25d06d97e5d84f84c9bf7f23cceb48d918727158d02081115344a4194e307caed59510265dacbf267774ab4 SHA512 95f8c76e35cc7549fefa069d9c354fc1d4a55dcab0f3fd322cb86aed92c7bfa75a06eabb7540ff991d590a90cdec781906b856291002a82ee5ab0072cdcf6ccd
-EBUILD PyContracts-1.8.14-r1.ebuild 843 BLAKE2B 0ddd8b09f7c4259c774e2e317a7cb296e686f65eb69a9cad3472599f0ad83317fc3f565052ee44101a72b08c0d6ef11a3fcb3e036bb1c0b51a4559b322ea837c SHA512 66c0dc3a5cf3eac9f9836872c69f464b99b40704eb199d5d0400768ea57bd4640ebdbd366efdd4cf11e4a98af08289ebcf201ff13c4953911e232f2d316176f5
+EBUILD PyContracts-1.8.14-r1.ebuild 844 BLAKE2B ce71d91a199ff4bca0c088bcfd694b879377de500dbb1a10792d5bfba8bbee01ae2351d16a96bda349e71daa386c9c914cc58e4c630af2fa661d68167bcb9a7d SHA512 49b6db9678ecaafcfba3205bdd4b7277b23131491dab85bd2195dba6694ceeb740fbdf5dc46af55402a2614459b86d04b382bdff69c28f24bdff2247fb24c37b
 MISC metadata.xml 412 BLAKE2B 168aead3c24da61c3e95e4d178546b196b07f4a1f5a51f3f5fe893222e209608e4f4d570a673c617085839756fbc3107e8544fa5db631429b596b6d7748eef9f SHA512 58a8491f4d6b1f1dca9c59036a0f3ecf20b71811d5696fa886452ebf5217f70ebc94615b86f16e130ad520ff39860128a801ed6c5566ac55a548985a56654267
diff --git a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
index 4699ef34f3e3..2caaee5da666 100644
--- a/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
+++ b/dev-python/PyContracts/PyContracts-1.8.14-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-python/decorator[${PYTHON_USEDEP}]
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index bac71ba9741e..128b4e5a285f 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,7 +1,5 @@
-DIST PyGithub-1.53.gh.tar.gz 3026570 BLAKE2B 7204c5934b94d5629b38e841a9c9011ea561ca8aa8d3d169915975fb02fe8db059fcb521d11bbb2350a806457d98abbfe36a19c4e5f633c82cdf06b8b7203c6d SHA512 f98d013d5fdf31ee59405c52edb35942ca5a3d2c1ff9653c71f03871bb28d0c247412bfc2593991026ddb989e1a33dfe91d19b4ebb1e89386b54493d51071768
 DIST PyGithub-1.54.1.gh.tar.gz 3117667 BLAKE2B 1cf44acf8e69674dee8440162151236eead3af78e2ea9d1c57d7c9217b7249fbc1d8ca10f15e79f8f27ae9cd5ad126376b1702ac4d9758e4f0b0acf6e85eab22 SHA512 72aecef168c8741b773560bee31b0b6159abeea97cc9f659363ff9204eed610686fdaf6461dab0c643adf00140a53aa86d70b9011b39522650aa872f02e5e67e
 DIST PyGithub-1.54.gh.tar.gz 3117061 BLAKE2B d180b9c0192ad22b84cb17ff6c9a7c4ad4d490c149549515727a0f1ab4e572461d461cdcd4138a0d9f03f26b0a689579bd7ec875896330a3c43e5cfb45411dc7 SHA512 c716df1f6dc64ea6bc56db82b0f0263dc0ec29994ea9fa967c22a0eee07c4ccd206f14168e36df7d913cfa387ecca703cd2331cd549bd42ebbec0e33ecd15c44
-EBUILD PyGithub-1.53.ebuild 765 BLAKE2B 00f5df1c6be8b6f146d7c5f27eec89cd001c2c2cdf14ff1abd4aa84c089b76e42dd35e478b1aab3583b4ed6524a21cc68d391b598bee60c791df044fc3431094 SHA512 1ba906569f5ec5c07d5c7c387024cb0b6285a7f535ca04e3396d373815a2ea342e7e6be33355cb8e6f50e5aad8f4dbc556a1d6ce6a9476da79ed7a3249f0aec6
 EBUILD PyGithub-1.54.1.ebuild 770 BLAKE2B 8d746673ab8ab0382cbddf0b11d2ba4af4d9410da04ecd92014c0ee957b2a98c4230a29be1bae85efb2778064d64e6840a96476ca8532eb4f6634661dd697ede SHA512 d546b06bccb8991b21ac13236e8be009b3a0b350c8e7a0097982d69252ec5faef75eb6315961a7ac0b6ac317f032170112fd858dcc9251d98b66cc59bcaae763
-EBUILD PyGithub-1.54.ebuild 767 BLAKE2B e06845d6d84823f891fcb5cfc2278193b625d536ba95e063bb0fe5fe99617155a2a38eca2d7e057f1d25e12752906e52096435d9de44d919d99a9a7c5bdab6a5 SHA512 a67b987c5663a5fe7b9f883e387523ccb04513ac176c2754ceae509998f1bf978b0892d87889e60baacb88033112cd1d5ba5a74e3c58cbc4f65249db6e27e6fa
+EBUILD PyGithub-1.54.ebuild 765 BLAKE2B 00f5df1c6be8b6f146d7c5f27eec89cd001c2c2cdf14ff1abd4aa84c089b76e42dd35e478b1aab3583b4ed6524a21cc68d391b598bee60c791df044fc3431094 SHA512 1ba906569f5ec5c07d5c7c387024cb0b6285a7f535ca04e3396d373815a2ea342e7e6be33355cb8e6f50e5aad8f4dbc556a1d6ce6a9476da79ed7a3249f0aec6
 MISC metadata.xml 500 BLAKE2B 54b420b2aa57e2056d12b79a352a13cda1e26e28478fd724863949c30db61df7b64f79de17c8f75562e295468146b439d43c1beb37dc42e5bf1e3733b671e579 SHA512 184b8b3570d44a06976dfa1bdcd1af1ddcc2e59d9791e0df881325c90bca711923ed19c342886cb950263129b28ff8f04fb3c41ad31423e8b9cba20bf586661a
diff --git a/dev-python/PyGithub/PyGithub-1.53.ebuild b/dev-python/PyGithub/PyGithub-1.53.ebuild
deleted file mode 100644
index ae1dba794d4a..000000000000
--- a/dev-python/PyGithub/PyGithub-1.53.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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 library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyGithub/PyGithub-1.54.ebuild b/dev-python/PyGithub/PyGithub-1.54.ebuild
index 0a466756e898..ae1dba794d4a 100644
--- a/dev-python/PyGithub/PyGithub-1.54.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.54.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
 	dev-python/pyjwt[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 5decaf5ab35a..48b34ea6d339 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -4,6 +4,6 @@ DIST aiohttp-3.7.2.tar.gz 1111049 BLAKE2B faffc582f2c72ff892862b5b782da75b381e59
 DIST aiohttp-3.7.3.tar.gz 1113127 BLAKE2B 47d95565db1184c6b55a1e7d7a6df8cda872e4fe621f653e3143608f51dde2c7d30d00835da357dd7ae33f4858ad5778074dfde5261331a3539a5d6776ea1a25 SHA512 d1dbbe3cbdeb1a460f5030a08a251a7bb7ae7ec038ca93ba5187b2da1fe21b80ed6513db647ef382d2d92a3d527a34dffbd37f51aa1e8b65bb36d517304b1812
 EBUILD aiohttp-3.6.2-r1.ebuild 6857 BLAKE2B 733c733bbdf573fd4bfc1c9fcc44b4224f5913ee886abbf1908f3ffb258fe611babb6c46cc5ace49996875140cab24286e79e961f17b1af00093862d6a37f4bf SHA512 ecef2bd9d04e3d6dcb626effce1a895da5d5cb6354d522305484f4c33f4298bcabc7b0a08cda9e3dc89545c2405a021351e62c71f755c937123d345b8b7b4f5c
 EBUILD aiohttp-3.7.1-r1.ebuild 2477 BLAKE2B 527e91b161455cbc91255adabf53e100608892eabcbb94483ead211c026165f37c50e7f0e8bdec68631df4d29bcd7c2a84c94e48b1e36a6e780a508a76b87628 SHA512 877eb53ac16bb279be2df54db3236b73374f792ccf4e09f248e87f5a771ab6c39701543d4ecb0dd160c9362797b08612fbc89852e25ccdda1efa2a531bd8db6e
-EBUILD aiohttp-3.7.2-r1.ebuild 2506 BLAKE2B eed6db56a3d93185ca0018ae4337841dd20e9d90cada19bdab7c0a7575eb1f124ec4457546c13a83886f918c37f0b056d9a3363e2b4768aa8ec0ccab8822132e SHA512 3aaf70bb8ae5d84f3e387879b590ff830df5c3db952664d32cacdb92908afd96efce76103bb74af57baf4f9c68b0217202a02fc84785e152eefbefdbef6d4889
+EBUILD aiohttp-3.7.2-r1.ebuild 2503 BLAKE2B fde5f9d4f814f92a18c6af00022560805a805e927fc66b69f00f2dc7f3920b6cb7e2a7afcc1104434ac73571a9e69115665adbb30544db733c8b41548938c23a SHA512 118f1c958a1acc40fb2ac2c5fe04b66492c20d637591ef2326a43363a1025688fdeef890ea14edf2f11bbb4bdcf8505e287034785096e40e4553752bc98eb55f
 EBUILD aiohttp-3.7.3.ebuild 2519 BLAKE2B 22a5f204da451da46facb899ff1ed3795e82fd0818e140c08a61c6cf416a64551ab0a968329a2145408ebc8130bf1b93cc09c3d329f4e962762c921f9fc63a6c SHA512 e2d95bb83dd4c3a173c9256b8e97601ab756505426e50291eb377a0c8850a50da5ca84a0f473b928ffb44ea49ac5d533e1c99d7efaa1e4df136fe8aa368fc73f
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
index 9e8be6e734f4..c3bf78279ea0 100644
--- a/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/async_timeout-3.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 2ff9c7916add..f884ffc2c93c 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,7 +1,3 @@
-DIST argcomplete-1.12.0.tar.gz 53625 BLAKE2B 29b4f620537a087629c63dc71c6a0101d40967145680518b566b9c81e3e744c5d73e1ed016795f0ea4338be4e8f20b7df1968e388e1ff09308e012ed1ba6d0c0 SHA512 5e21e3caf1dcee661c0dadf28d7b127147325475fe3ae569fae8797a762c34b55125df9f52de8d76f0aa6dd4efdac260a358b325a7659beae02b1dedab501c18
-DIST argcomplete-1.12.1.tar.gz 53677 BLAKE2B 85c5d75b59875b6fe5bb932ed05916f3af23ef64b993544c69ae431d9e6b5d8c23a9bd35d76b570538ce8e722a6ffc8cbcbfbc9209fbf29ddb000c60a809c03c SHA512 236871966361ac781c04f52c02d90c20badabad12d34bd7c5cb1cf1a74d442f9147e04b320530b55abc0490f7bcd11494cdc13ed5c339c91737f1c979010d096
 DIST argcomplete-1.12.2.tar.gz 53861 BLAKE2B 59a8472818aef4967cb978302bd98b206b206beaf37ac7743b1e3460e3f184e4fe2dccbb48e1b436dfd1127248d3fa2f10ace81ba35c744d93adb5efedd7e470 SHA512 3099507eac285b396df1c02d7e7bdedc1dd26aaf599a81147ebaabe211a97362ddb94533c9bc733d30a9fe84fcb9d6b52794e4c12f99f881b320280d0d1479f0
-EBUILD argcomplete-1.12.0-r1.ebuild 837 BLAKE2B 854f8cdceb843ad602bbf6990f87f65af2014c0db0bf22b7efd50a000e983e6da5453a5823e007d84cd1e3debf3ed4228a32969277a49f5514dddc8612bf33b6 SHA512 7a487867cc788f382f2a33fd3e870d8ebdfc1abf75cdf78da270978defa07c7b1387589c3abec343d060dba5c41fb40671f7999ea49808a4a1e16272ab4b557b
-EBUILD argcomplete-1.12.1-r1.ebuild 837 BLAKE2B 5c23f44b26c0cd7d3428a23ab27abd6ba3037d4bc51a5051f36478963059117a68f7e3458c5e8caa060a914f908a362dbec71a279186957b8179d770fdbd4836 SHA512 34cb046f79af7fb846ccbad048fe65e2b201cfe9203e2d6c56f4932e012c9461e4588ff1456c7b8be8d822413b933dc68d217ea397d4a68f473183b327b851e4
-EBUILD argcomplete-1.12.2.ebuild 845 BLAKE2B e4b5274d0ddef1cd9fc44ce31a5fe3b45efe058f6bd4afe8073a8d89a54e6242254f4ed9350609b3828f9d482efb402b94cdfd28eacd238aff7e945900166aea SHA512 9064048d5c985a95d09802ceb031a2417efa3e755e5fc4a33496fc4aabc38068d3596da2c071667ded79b5cfd662d276e31b74550f80d068d9cbe6fec41dff1b
+EBUILD argcomplete-1.12.2-r1.ebuild 837 BLAKE2B 89e44a3cacc4135f1fee6ee273a821607266b6d120f293718bb5d9bee959cd4b5998021a86452cfeff6e3e7414830aad6eab59b250736a9b93b64eeb6aefb2c1 SHA512 0584825c41ae2fd18e4bb50c891ef7fc1342b599b5e6d43b67f75d3e2d7907861d980d0fcd3eb6f8610311466da2c607ee2c0fe0e3b8ea941a97303916ec3a6e
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild
deleted file mode 100644
index 0b61d62c9123..000000000000
--- a/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-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 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-3[${PYTHON_USEDEP}]
-	' -2 python3_{5,6,7} pypy3)"
-# pip is called as an external tool
-BDEPEND="
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pip-19
-	)"
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/argcomplete/argcomplete-1.12.0-r1.ebuild b/dev-python/argcomplete/argcomplete-1.12.2-r1.ebuild
index 49c156b8da81..5f97d8fa6a1c 100644
--- a/dev-python/argcomplete/argcomplete-1.12.0-r1.ebuild
+++ b/dev-python/argcomplete/argcomplete-1.12.2-r1.ebuild
@@ -19,7 +19,7 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-2[${PYTHON_USEDEP}]
+		<dev-python/importlib_metadata-4[${PYTHON_USEDEP}]
 	' -2 python3_{5,6,7} pypy3)"
 # pip is called as an external tool
 BDEPEND="
diff --git a/dev-python/argcomplete/argcomplete-1.12.2.ebuild b/dev-python/argcomplete/argcomplete-1.12.2.ebuild
deleted file mode 100644
index 9756cbf400bc..000000000000
--- a/dev-python/argcomplete/argcomplete-1.12.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Bash tab completion for argparse"
-HOMEPAGE="https://pypi.org/project/argcomplete/"
-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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		<dev-python/importlib_metadata-3[${PYTHON_USEDEP}]
-	' -2 python3_{5,6,7} pypy3)"
-# pip is called as an external tool
-BDEPEND="
-	test? (
-		app-shells/fish
-		app-shells/tcsh
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		>=dev-python/pip-19
-	)"
-
-python_test() {
-	"${EPYTHON}" test/test.py -v || die
-}
diff --git a/dev-python/asn1crypto/Manifest b/dev-python/asn1crypto/Manifest
index 3f11f4c00f51..79f7667e4800 100644
--- a/dev-python/asn1crypto/Manifest
+++ b/dev-python/asn1crypto/Manifest
@@ -1,5 +1,5 @@
 DIST asn1crypto-0.24.0.gh.tar.gz 641322 BLAKE2B eb30afd0d2579f44ee4f556139357dc7622691bdc2067df913a4412cd3dca8372b85d84e3a3cbef6ba83648bf4ef55d7e8614992e2abb019301c92d24b15a926 SHA512 426cc380903b4dd7aadd7b831e3a11ee3442c961a33b856d4aa8d9060e829f2e0ad905a60c4d6504569718fe2cee01d9be31628c89ef030bc34281e381c898e8
 DIST asn1crypto-1.4.0.gh.tar.gz 672812 BLAKE2B 7545d424c244c04c2639df45e0bb56c50de95d0a7ee1e56933720dd7215c2be2608ac7889e2e901785592592e9ac6cb116fff3cd00536903c392a9e3912fc08a SHA512 989e4e0650252c29477d71263549b99f2c51c87f0768c20264b3de65f32edd8e7922e8af23bb1a7e29567a4ad8c4c5d596cdf7db3c766352c7f19d4f93361cd0
-EBUILD asn1crypto-0.24.0.ebuild 842 BLAKE2B 235a01eaf99cd9287798da84adc85568f6063c21e8630ca271af6cc7173a56347bccd1ed33751af9e68a069b89bfe5b3d56f23bb87f7cc725ff6249c672509ab SHA512 8d1223fdfead57bccff66c0b6a6f2518999254774ea189e65caed7f4db80ddc2a77fe7322408ae5ad703171c745aedd6e658a5581863f99e335f91c259b05ae8
+EBUILD asn1crypto-0.24.0.ebuild 843 BLAKE2B b9383ee76ea7d3dc3bbe4254dee4c208ef6c8443af4745b88e2e8cdd8590624f8c6c34ef5b9f5af872bb6e23b800853e92d5815b24e23f1feb55409bae799fc6 SHA512 1d848dda7b281c8bfb1d7ff787150abeb760814150902d612a6603f6cf55880d0d8fc91e41e5bdcf56216ebd15245f91add19c6d2ca0be6cc27196d348449fc2
 EBUILD asn1crypto-1.4.0.ebuild 748 BLAKE2B 4c4b27af4da53ae0d83ada5df21829db4b448808fb2218adb8d080df71b3710a3a4748e5ff38c94f06777841914566e66a7346533d398d9bdf03dd8ab5f98cd2 SHA512 cd7e39e83aa036d4f86a2c9fda79d5588be6e84443610656433adb30d8458da3c6719b4b7d6d15fec98f3f9c01560839ad3adb8e54fcfeae5cd3f0f3ddf9142e
 MISC metadata.xml 369 BLAKE2B 10f3c63d43c7c239c32d1d531ae9f72e584e65038c6d8206fc53f91563e1d7bd7e26dce21d7c7c71e1e1b2359f5c46e989497bbcf34bbe373354253a322d74dd SHA512 40fa02100d2e7411d5556931fd91a55b30ad4d42d460bc072ddf0bebeee5cb9559a30d23968be82e49f14f347cdfdfd9b55614e5d48182e2147cf60b23eb1fa3
diff --git a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
index f0ccd1b4b87d..901592c1aa0f 100644
--- a/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
+++ b/dev-python/asn1crypto/asn1crypto-0.24.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/wbond/asn1crypto/archive/${PV}.tar.gz -> ${P}.gh.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/autopep8/Manifest b/dev-python/autopep8/Manifest
index 0842c9549329..e32cb2ab9375 100644
--- a/dev-python/autopep8/Manifest
+++ b/dev-python/autopep8/Manifest
@@ -1,4 +1,4 @@
 DIST autopep8-1.5.4.tar.gz 121471 BLAKE2B 4d9d4d0de94757573ad56636d92983d0bedfb2c7a3f25a47d8dba9c78c4e0752aa2ea0cd43f93d9cf37e434178cf89ad6c98b2af3a07f2490147c87a95ff610a SHA512 e613295d080149028361715f748fc9db1b7fc6212ca4e117594a10c3924a67eaad6ff8d94cfcf2c3dea087e0aa1ce6bcadc1b4eb3f07915daa5b002a09913f59
-EBUILD autopep8-1.5.4.ebuild 850 BLAKE2B cdb6f0dc6d70f985469944eaea36cc50551b1f074dd5ee773c8b81fe053394069b35ae210eb08b30f13739490617c4ee583ad924718c83d55fd36d022a4c994e SHA512 5d3e656fd6691f155701d5146724d0ce22d7e4d0c1e6b1234beeb4d01bebec1b5333be169f32e7eda539dd2932cce6cb9e31b763ec69eef4f3eae039ad3c3d4a
+EBUILD autopep8-1.5.4.ebuild 848 BLAKE2B 2c480351e2f4cefd051694fe010416561edcea10390bea9eba19793d942168a946dcaf6068e7dc747e9b93476af9c41be23f1ac4d1974b53fc1d8e75ab849d2a SHA512 406c32f6799b1ba03ded8e7bda0965a18c257e8fe86fe3bc69d34f9b79713a45c533c663f757119687711bebcad83e04d2321a07077f05c8d0262b65ab54d67b
 EBUILD autopep8-9999.ebuild 852 BLAKE2B 7fa734e9fd9585863bfd1cb25110664191ffd9de2ac672fe6eb3b98dbdee72278cd737ce353ebcbeb7eb85a0138c30ec6943e865492f2707bd486aca01d265a2 SHA512 3d1df5ff2f0483332d0e9a714a77ae940b800a831b1eecd4c9578d9303032f09aba87807ad42bfdcc9dd7e24133a59249a05ace98e03b70abf36bd72cbc1cdd5
 MISC metadata.xml 403 BLAKE2B b84ac94eda3fac9977c2a936d006626b0fbc918c24d8f08f4b7620b778ea5ffec298945bbe6baf5353fc00888ee97c7f3c48493ab1c83ebe1586a9196da13a59 SHA512 7e2fd3edd7e82fa2474441a0e54ebbca38dd95f2dba7ba717fd839cf11bd21cb00d5ee56c7b8dc1b377e24a33b098d2932cc06de6c367e1c812b448a9395f18a
diff --git a/dev-python/autopep8/autopep8-1.5.4.ebuild b/dev-python/autopep8/autopep8-1.5.4.ebuild
index 5ad39ec40fb4..cbeadeb16ffb 100644
--- a/dev-python/autopep8/autopep8-1.5.4.ebuild
+++ b/dev-python/autopep8/autopep8-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 25dfc1752b41..153aebf1ceb9 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,9 +1,7 @@
-DIST aws-sam-translator-1.30.1.tar.gz 810865 BLAKE2B 2039e0724d05f7f9d8372b149f04427e0bd1a8a9b503e6dc49ee76cb4e7678d8f759317c43922d190a2bb55a446feffcbf448cdbc9343538b5c77d81b5545e5f SHA512 8fcdf0843f52c8424a78540cf2a9c3922070bcd34a2e0001a17b89b19b471dfbfc4fcd48211b80292d2f7b76eb2881152c68c4d4b56499ab38942c025226d49e
 DIST aws-sam-translator-1.31.0.tar.gz 813078 BLAKE2B ae87944bcfe7481db62c0556e1f20defbe5890bebd9b6bc8fe4f597b1ff463ec6382384832451becf5a49361149102a31316ca83e5933d12e0e7e18c9861b9c9 SHA512 fd2b775d2127cce9d78cd3c7ac4dd19f88a94be474f94e4db2486dc96bc88d9a3f621a80bd6dd0b9d70a42df32f3a9164c234a44ce69f84913aa6f4c59ae3682
 DIST aws-sam-translator-1.32.0.tar.gz 817649 BLAKE2B 34d606bb294700dac1d3385d173d737d3259f460d0ead302521eb4e2660d3781c49ce5db71e1721245068efdac03eefcfe8963d4915d1e1c60fd783880a95bc9 SHA512 e4adce238434983c56b69960fd673db88edf5b3e4f9356ca4dae508f5a7a8e6bbd3c84050ee606e1fbd578d8f58c5d8196890187e058b7ae2bc8249dbb8ac0d4
 DIST aws-sam-translator-1.33.0.tar.gz 817801 BLAKE2B 6e50f299b077f6d0240ee4db80450f766589c5349c323cd846c9ef42dc08bfcb7f8f80099c7d1ecf940d3ba1c2e4628842bf4b1f12e8fcc6c83100f5a375125d SHA512 72fadce4851d782e37e786132d98bcc364c92a1fa48addf715f0d2cf28e286e8cb8835de05fccc67c153d45ed8ba9fd3b7445333f8d96cd70b6c854b8b34c5d6
-EBUILD aws-sam-translator-1.30.1.ebuild 1300 BLAKE2B 653b444030665f83e9f4bab75995548e0438674ec88268fcb7cf7264b814aaf84f87268b955026a4adc87860d84c55a972bc00ffda181fddf6fec17b1296245c SHA512 1e458ca29205944eb9f970a715ba570fbfc1bd7993756fcc23b00a8ccdfbbab6b1d204781eb3e5891119978500e0c09cd01f74ba76ef7910ab27b0df27861d77
-EBUILD aws-sam-translator-1.31.0.ebuild 1302 BLAKE2B fc7ed0f3c8e070e6c0d43707f8cf760b06e353bc7bbbe2d04683f2bf0cd36ddabc3735192acdb929e934e22b0d883cedd802883c7c9495fbd153c7223ad883f3 SHA512 71cae066cdce8976c9efd7d0c5c764c8ebc3afc4e28ce545e1cc67172e9c53e81addca9cb0242f7b68c2e701f90c2c54a7d1e4696b07f2c090b8bda4ceedd672
+EBUILD aws-sam-translator-1.31.0.ebuild 1300 BLAKE2B 653b444030665f83e9f4bab75995548e0438674ec88268fcb7cf7264b814aaf84f87268b955026a4adc87860d84c55a972bc00ffda181fddf6fec17b1296245c SHA512 1e458ca29205944eb9f970a715ba570fbfc1bd7993756fcc23b00a8ccdfbbab6b1d204781eb3e5891119978500e0c09cd01f74ba76ef7910ab27b0df27861d77
 EBUILD aws-sam-translator-1.32.0-r1.ebuild 1332 BLAKE2B 8d6fefe0f96a5ee6749057b524020e6e72e600d2fcfe1abedce4626a5074902aa818b721bf6d92c5883b4baa22d8126a5b020b2b88255cfef13a4346a2368c02 SHA512 e52a886d455ce75d590a96f19a9dc7d0ee331f105ca4313c4799172b26800b6237c092a6f48ee7de52f81a1bffe8489bf414497ff4caa2aecbfb4109ef38d479
 EBUILD aws-sam-translator-1.33.0.ebuild 1332 BLAKE2B 8d6fefe0f96a5ee6749057b524020e6e72e600d2fcfe1abedce4626a5074902aa818b721bf6d92c5883b4baa22d8126a5b020b2b88255cfef13a4346a2368c02 SHA512 e52a886d455ce75d590a96f19a9dc7d0ee331f105ca4313c4799172b26800b6237c092a6f48ee7de52f81a1bffe8489bf414497ff4caa2aecbfb4109ef38d479
 MISC metadata.xml 602 BLAKE2B ce51fd399f69177920ab2a99807491640ee4fc4193c46279a05f442b608b420122ba8b7302b3fab1724ba2b3bad5519b51d86ff050713ad5bf9953acd843dba0 SHA512 829df35f0b222b1a3c2c17e813bcd2c8d8311e694ce0244877a9e492a91edb9597be906e7a449d7ac641787643fd355a0014e3e9ef113023066c9ccf52f32e65
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild
deleted file mode 100644
index 21f682a67156..000000000000
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.30.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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="A library that transform SAM templates into AWS CloudFormation templates"
-HOMEPAGE="https://github.com/awslabs/serverless-application-model https://pypi.org/project/aws-sam-translator/"
-SRC_URI="https://github.com/awslabs/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/serverless-application-model-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.11[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# remove pytest-cov dependency
-	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
-		-i pytest.ini || die
-
-	# don't install tests
-	sed -e 's:"tests",:"tests", "tests.*",:' -i setup.py || die
-
-	# deps are installed by ebuild, don't try to reinstall them via pip
-	truncate --size=0 requirements/*.txt || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.31.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.31.0.ebuild
index fa1227477627..21f682a67156 100644
--- a/dev-python/aws-sam-translator/aws-sam-translator-1.31.0.ebuild
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.31.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/serverless-application-model-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/bcrypt/Manifest b/dev-python/bcrypt/Manifest
index 2a5e64994040..8a7cd2c9bd42 100644
--- a/dev-python/bcrypt/Manifest
+++ b/dev-python/bcrypt/Manifest
@@ -1,5 +1,5 @@
 DIST bcrypt-3.1.7.tar.gz 42512 BLAKE2B 5e762f153a5a69c1426748737956fd370e74fcd02e82b5a634e74dbb50fc9e894bdadb4e87eb9cdc580d0853f73ef348d9523ceaf4236df565e39b714bbd1c60 SHA512 bb9a431c8de97d5615d1a7fb67f868d08d839313fd5f3e17d8db40db1870f8b624594352c24c163c6a03485217de873cd92578040350678888728885c7b749de
 DIST bcrypt-3.2.0.tar.gz 42416 BLAKE2B ff9cca995e38fe27c6f02e9770e9349dfe528a1c9c18f41c72f29dfc01e981373fc0964f3a74161f2a7dddea63c5f48708539221adcd5a8ae99b7c30d7b1afd8 SHA512 aa782aa6a725434e0b0737973e33e6c2bf4e82d39e8dfba0913da5d7dd051d55217adab8004c3eaf896fc3c3e145ba543da1b5162a667a3d82a4eb6b07430b80
-EBUILD bcrypt-3.1.7-r2.ebuild 749 BLAKE2B 616ac74130346028188c70b150c5c9095de9bfb47d5d1aab97435db1f0db8f4cd73ed6386dfafb9698fb081584d9f844e0f417633e6ee906e112c65b544bd941 SHA512 43a77dd7ef01017083875e72f41432e69ed850c260a1929444eba09aeb5ef8f0ed92c96ca30d99c6c165f45b980dd1910505a4e3897eedf37fcd8752719929aa
-EBUILD bcrypt-3.2.0.ebuild 756 BLAKE2B 44a7cc439d7eff6c01b2467cd23030405e5312817344db171df4bf1f0235ce0f31b1336f9a6233ea73016b2daf10ca5fd050a29cad547d44314466351cc076c0 SHA512 90601b4b25dcb9742303b577f2ee85dd05535975b8da2cca1d3a37fc87c3eeb56ac80d1ac42065656a3910d9c23cb79637a4797d5aa4333d1f31f27918e5e5dc
+EBUILD bcrypt-3.1.7-r2.ebuild 738 BLAKE2B 4e43210e51abf97582582bfcde64a425ce017c270a67e058a94ca5a1a199ebf595f794389093da6f9dd2d4e403f1c0744b42e4ccdd061cab6e3d3f201c8582c5 SHA512 d39b8147c650fa8d600ceb7c76d5af33479c8eaca4a4e8d7bc85a2f92778b5b999372e4c7f1fb91e799f287a11fc07d1aa1a4d1035e5951cfe0f8af26470d5ee
+EBUILD bcrypt-3.2.0.ebuild 745 BLAKE2B c96da07f163473e25ab0afae8602a1fd0d206fc68a96658b31c526b59de22516e8b3ceb14e037a3ec1bf1c20a2f6e756cc5beae77cb54751422c4a7ffcc92faf SHA512 2a99ead98affed931382b85ae6ae713f5962ee0795b38221348321829e8315b62fa3a5f233b21d557aa969beac822b7ad373e46501dd83e1d05d3c747fc104fd
 MISC metadata.xml 485 BLAKE2B 789fde3cb8c29c27778293f22f9e3a4453b743d52f5fab1dd2db6d940e4e1bff843d6ccdb4f7374b456b2cd4f80877f453205bb9a5eeee9f6e32382297ab967b SHA512 3b4fb489f9d1ecdee3dedc58dda61aa86c6bc30f29aba50de6dc4faa499276d83fe15518088e4d0e76c98ca30188b2f1b921807821fc73b5dfc592490e6fdb46
diff --git a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
index 042389cebc98..ec6ae8ea583e 100644
--- a/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.1.7-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/bcrypt/bcrypt-3.2.0.ebuild b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
index 3fdb063942f9..0275e37dae3d 100644
--- a/dev-python/bcrypt/bcrypt-3.2.0.ebuild
+++ b/dev-python/bcrypt/bcrypt-3.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 RDEPEND="
 	$(python_gen_cond_dep '>=dev-python/cffi-1.1:=[${PYTHON_USEDEP}]' 'python*')
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 955880ed19c6..281710092b45 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,6 +5,10 @@ DIST boto3-1.16.40.tar.gz 342028 BLAKE2B 6728b658ee75b76d4885e43316a58508a856347
 DIST boto3-1.16.41.tar.gz 342352 BLAKE2B 601384979c792a2e1871bd3837ca2a56e411d0f50ee2766bde33f8be1b0e1fa4078bd731b002008d98efc5ef6d2893ec3811238d45f1f6e22ba4904972aa960e SHA512 c80727d2788603db8d46e1ec9c766341a875b7768cfeb86425b784141c8854f314fcb2de1618203971eac3734f64b26523e268f4ca2039f513f9ea6a218ab8be
 DIST boto3-1.16.42.tar.gz 342384 BLAKE2B c966fb6bb645bfa513b30bc72592eab404954c2816d4e2e533af8c0753941f07b8228201f17077d252086a2d2167ef31ba11abe6154500b125ee74a1e6d3218a SHA512 0316179c0acd1afe798c3b54bfc7cde5ac3082e6747228619a72b805ae3b2a56311cdcde54ca2afa49ee62c3554b986ff2986c60ba7b5cbdad570a329b6371fb
 DIST boto3-1.16.43.tar.gz 342444 BLAKE2B 1a367fa252eab6738533c7bec2bc370dcc206f25c4290ea34632ef82a0e308aa4521af7bd2e9755782b3b66b438c528e67f55f7238183ffff2318bfb7361e924 SHA512 1cd757a2751e48b9075f99724a9980d882751542f5a7794a4cbddc46f82a1bbf00b8e0908e0cd2db16726636750d591aee26b00004a454c35d24ab79de9c80b9
+DIST boto3-1.16.44.tar.gz 342481 BLAKE2B c6241580998fe729cbb706c8d99a441fabae6199ed11d36559ba9f3d11b0ef2e41122d3cd7fb418d5e60de8cf698ccb0595c4534d708a8acaddfb752add7c886 SHA512 812b165dd28f41e126b0d728c25891adf974f641a470e0fd4270873af4499432579d77d612e2a0ad89d9c37de87ff1afdf09472445ea7aa3ebad4c9a157d5b16
+DIST boto3-1.16.45.tar.gz 342528 BLAKE2B b8e02cb656d9dc9c82ee88969443f8ba1660114a00e891b28cc40e9007e6dae735454931cf1cf9bc5ec35d8d034532e04a97dc777e5596031ff1d71684a57c01 SHA512 32a74ea5bbe3b44259f7c2dc9a9b152a9404e3ddfb924d30dbbdb0fab23267c005c31ea377e04ecee2b8830dccf3d1556ccc260e895fa43289b93c472c3bd9f7
+DIST boto3-1.16.46.tar.gz 342528 BLAKE2B 7c68c2ff006f0a8120eb049ad7dfa765e98b73338b365057a8b239e0dbc4562ef60a12d57348e0f1412206bc7530aa981885c60a08b158aa258a818085e75327 SHA512 82887b4556255eff8ab6988bbd950da006849a8eb3c3017c235064f7f9f3989d97f6ef2a2d75018c2b848d586363169f354f087f1a0b841d9f0eef3dbca05ba4
+DIST boto3-1.16.47.tar.gz 342541 BLAKE2B 956c76bc6f5f07125862ab7614da9d9d6eee1af9d0e3d39ddaeb4f130bb455a05f472a19b578ceae17211cd9e32492048af8b391bd42bc3ee8e26c947d95f08c SHA512 5a4e3d8ee6437254e8a560262531cf7a7055d5d06b530cac2d5940b39cbb3de3cae18aea4d05dec0a304ede76ebef5ed83d1cc3f1200fabfe135afc484aba5df
 EBUILD boto3-1.16.23.ebuild 1353 BLAKE2B acf7d5909ffe2c1b58d3c2438b8ce995f98e092b2a76977674ad1c0491b4e2093ea53d8a1cd45b225e3577ed28847b60319a1a682d1af74c71acde7a822c4da2 SHA512 fc2ac14ce0c1ce9e7ccac46bdc9fde2e84687a7c634a784cc0ac7e99556b84f4ef3d2d27e546c445b687b93dcc293b63a5e3716ae645b01a60d8550fda591c4c
 EBUILD boto3-1.16.30.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.36.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
@@ -12,5 +16,9 @@ EBUILD boto3-1.16.40.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44
 EBUILD boto3-1.16.41.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.42.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.16.43.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.44.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.45.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.46.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.16.47.ebuild 1355 BLAKE2B f0f3a5ce9733f47eb3be188aac00a378c8e49aa6f6b38056c13c8340d9371b5ac2df5569a94673e005cee363f69dd24ae8722db8dbe6fd3d822af9b4473e0c84 SHA512 4b286aa8fdddad64d1d03dc8921cd355bab18ba1d9b4744b94446eedc07bb19285bfde860994599022fa021b033ca5f64c78d8b674984227a85e4070ef574efd
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.16.44.ebuild b/dev-python/boto3/boto3-1.16.44.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.44.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.16.45.ebuild b/dev-python/boto3/boto3-1.16.45.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.45.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.16.46.ebuild b/dev-python/boto3/boto3-1.16.46.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.46.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.16.47.ebuild b/dev-python/boto3/boto3-1.16.47.ebuild
new file mode 100644
index 000000000000..7be6516ff810
--- /dev/null
+++ b/dev-python/boto3/boto3-1.16.47.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 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
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index a58c0fa5f0ae..87afde4ca541 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -7,6 +7,10 @@ DIST botocore-1.19.40.tar.gz 7371480 BLAKE2B afd861d013b78487ff2a6d47a531536f392
 DIST botocore-1.19.41.tar.gz 7368333 BLAKE2B d70ebbcfe4e4d44893f69214bda2341f047ef036434d37bdf3ec632745ac20c30f7321a03ecbfb8e8cdf42052e27a40e8f6c02ab57e471ca7d78ef28640d1029 SHA512 63edfaa02f8b79caca70611cb3ed16732813c072473ab39a4f7525cab882e2b1fac1b4a3664524db76d6288cdb4b6f650492432acaa38e2dd63b46baa7d6d0a2
 DIST botocore-1.19.42.tar.gz 7371856 BLAKE2B 09d0ebbb495bc590c4f944a7ca6d91d5069d4d8eac061ab6709e5f908ff6691c8148168ddbf93874acb014d96f6ed37ac260e4263bf1c7ad55b5de545ce5f752 SHA512 779eab3a31aa2572af868b0355ff25b0d0f1cc9748494fc26bf6888e90383eea2da0ca141cde60303eaf39b4ec80971dedea415a3bde5215c982618f0c475b83
 DIST botocore-1.19.43.tar.gz 7374325 BLAKE2B 7def5221bee4774a6b8a33e6499e499588ff18f8b144e669bdf9b01ae4a3e370e3aed5a3a960360123e57299da9b0293aa8da9108fe114f8ae34521b2920f479 SHA512 a1b97cbb779d8c8fe3495dd18d3d635e38c5c49e5b5fb31b7764029cf3063a7fda44711defc45783b3afb844bead46e686705af57472a7ff27af8b7e21645ad5
+DIST botocore-1.19.44.tar.gz 7374043 BLAKE2B 57548d1ccf963c1c2c33f9fdb365e04d60afc63f6112fdf689c7caab89dc242f94ae1680e69a24cb709c8b7e1190acf12e487a9289a482d7f96c02820b4b13ac SHA512 d865780c8f904b3f67c61a1e073ff4e2c6f77478168dcd98b034634a1796c07a94d8125033fc7475c7554898a73d3def8225a88eb5ec01d9064ea8737cc9eb23
+DIST botocore-1.19.45.tar.gz 7378425 BLAKE2B 868976d31dbc78e6d985734cd5dd4b6fd90e507188a85d0f11da73f222bafdf00010484917ab7537270e2e504265ce0c4fb77e6515e1b4b9085b9e787c226593 SHA512 79dbe8a3325fb2db3f52b3258a02910670ab1867c2c23c58389da2c60df89d671d716560575e450e7d218313805b1ce259b85ed59fdee668f2c2d6910fef78f2
+DIST botocore-1.19.46.tar.gz 7377742 BLAKE2B c80c6f3a21e4d460d4be198762dad44055744ca3b555d73d72f61647e585296a8748f0daa3b8f73c56a1fb6182efd904d5081d2ba13f7380c22a2be328638fc7 SHA512 5ff8dc2179394dc64b2a634eb81d8b9c1b3a7244da79adafdcb64de4347ce8820a319ca4c7ecb71f537f09ec51a9a55cabf3735e910eb8c14d2bcd663a963bb3
+DIST botocore-1.19.47.tar.gz 7378319 BLAKE2B e560a191221f6fe617ab700ac9d1f474312bcb278b1641ca1c80090288bea2aa8f9e0b5ac30607c987f409b574b02c445456835f6360fd77f1fc3403647c5b09 SHA512 06b363be4f380ba7061397f93f4f9d11f4c8302430030fd806a812d75caf7fa28c1d24abe4f06eb76e37d1ac9972bcef9231f3330c9f96e7ab66cc8f7ecd96a1
 EBUILD botocore-1.19.23.ebuild 1494 BLAKE2B 46144609fec0e6664898d9408afe9e31590c90653c092f160c4d2ec369f3b1189d49b94255dfd6fe3ed1a0390418d7109c87c6aecc341781eda27cf8da1a451d SHA512 fb88fed5c0e0f117547952237e4e097d52fb3009ccb2fad160d35061aef86ac88a6d0cd2a59ffc20c746da35685bf475f336f5a47ac55cbb625041003a486d6b
 EBUILD botocore-1.19.30.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.36.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
@@ -14,5 +18,9 @@ EBUILD botocore-1.19.40.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2
 EBUILD botocore-1.19.41.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.42.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
 EBUILD botocore-1.19.43.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.44.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.45.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.46.ebuild 1496 BLAKE2B 0eb45127ff4fac7d4993ef398b6ad1569cf2eaf8f3fcfee53a1a6072f59d6274ff54ca171015e1e04580c74ad2d4ddc60884d48218af8e2a017a6d8519e9a14d SHA512 d0482c33572812a938fd0631f8eec0f8ae42188f80d6238089d89ea49542f927146fe10f2fe15f672b79129b04328472000dc2a4ead9cb01aac7f5ffae6c80e1
+EBUILD botocore-1.19.47.ebuild 1496 BLAKE2B 8ca102a7a0953e4b60d52d61ab5de11437d7ed064b44021ee80625148278b4eda8ee84aa476c150fbfa54bbd1a0845ddbdc3f7350d073b69e35b72574feac0da SHA512 6edb749a2738a2e91d3c3f55317588e116e2bdf13bbebba47d1bcbb212d62966d8e784abd12c9696078a145fad9715fdf3a2fee617b338beee4f4b1d635219a7
 EBUILD botocore-9999.ebuild 1606 BLAKE2B 15b1624c806724dd4cf8f86099a4f9049214ab9c0afa47f0211c0a5f66fe37b6ecc03db5448bfb3b4764f8eda23e19ab9f37bbe1461837bf0dccfae7da17faa7 SHA512 b5e16cf97b370e96e814c413d80793684a1579d293bbaf16b435de83af274efb299dbe42fb824c955b28099c50841c46124c8212bd539861ff01b278e6a7ee3d
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.19.44.ebuild b/dev-python/botocore/botocore-1.19.44.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.44.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.19.45.ebuild b/dev-python/botocore/botocore-1.19.45.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.45.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.19.46.ebuild b/dev-python/botocore/botocore-1.19.46.ebuild
new file mode 100644
index 000000000000..ca40b64d111f
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.46.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.19.47.ebuild b/dev-python/botocore/botocore-1.19.47.ebuild
new file mode 100644
index 000000000000..fa25adc1c1ff
--- /dev/null
+++ b/dev-python/botocore/botocore-1.19.47.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 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 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bsddb3/Manifest b/dev-python/bsddb3/Manifest
index 51495a9b143a..bc01174f97d5 100644
--- a/dev-python/bsddb3/Manifest
+++ b/dev-python/bsddb3/Manifest
@@ -1,4 +1,4 @@
 AUX bsddb3-6.2.7-py39.patch 898 BLAKE2B 5d4c6cf6f4cdd1e65aec5d959f31cbe47a37cf4df803512b28dd4692961ef0184642abeb3d8eeac68f074c50d639d1944393785eb0ca30f5aedbdb9e0adc4de2 SHA512 584e65fef1dd7ccc8c75404fc73780db9845e7a73796dcce80e4506f0d7c51ff7234d9d2d48c8ea873e4f304d7abaf3f6fe2662ccf847c094b7e54b567969cce
 DIST bsddb3-6.2.7.tar.gz 437325 BLAKE2B ed7931a32766338c5674cc017a8528d30acf9397443f270bf93974c9ed7ae4abdc6b704d85d48f68e0c4b6d85c4ad71edf891e342e5f9b9a597453140adde742 SHA512 edd85fb697142ac152a10a299899c52b637a3b1e3d28d913c61f9de91ef292fc2055daeb18fca62242284b4189a61d5bf318aca6e2966849879043a46db000e0
-EBUILD bsddb3-6.2.7.ebuild 1705 BLAKE2B 74d0d738d50613e151ab2a58861c45b0441405203be6ef9495922bf2bfd7fbedcad9e9f833a88cbaa0c095a2e6e475ccef88b099043b881d73994513689fc487 SHA512 9b4e8b4f94a663023dc5dadb7ec04a2d09e231b2f5b14921315cd888a8aad9553f625f5262c08fba17e5d1d2e098be1ff28cf6b88199d6b0fe701c602db674c5
+EBUILD bsddb3-6.2.7.ebuild 1706 BLAKE2B c8a69f4eda3414dec90b10ee9ecec0a74613455b4a5d9b0df1c0f6986b1521ce0584e2fb40621a9bcee49721c274ef3cc3e7e6cb23e41162c67b4e218abdcda4 SHA512 6ae6bb1fd74f47c8d2186ac6a98f6b42d8f0e5106349958f3c3829f554b75cc30d3a6f7964bb8a77dd8f20ba35446da80882dcbbbc69bce1c1233f8d8f5ea325
 MISC metadata.xml 309 BLAKE2B 2a491c74fd8f64d284bbe32aea28da5790bb54ba0105fd61f477f725bb00fa729e976c20d35cfdead53483fef8d711ea0d9000cc2dd9663ec498b02e9e082083 SHA512 edf575ec4a06047d837caffa6c8c8a35d53c5236d806e6d2b4804943617000d8f745f1b94fecfe2af117be823821669e6b7e9aea2a427aa2d97b1eb6ec11eb20
diff --git a/dev-python/bsddb3/bsddb3-6.2.7.ebuild b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
index 47c88f81dcd2..27462eb4789a 100644
--- a/dev-python/bsddb3/bsddb3-6.2.7.ebuild
+++ b/dev-python/bsddb3/bsddb3-6.2.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	<sys-libs/db-6.3:=
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 5502a35252ec..5f24882e51f8 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,4 +1,3 @@
 DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c
-EBUILD certifi-10001-r1.ebuild 938 BLAKE2B 9eaabb0e1d9286b69fa318a8bfd051f146e1bdb585dd4de9f1c5ba5a6b4bcbc73cbc22bf37d4f8b0b75aeae69d5ad6e1ef18986880a14150ecbbb8a2e30f1aac SHA512 802ef5073c00a7edfccf882d3d7046ede2772a4521046c51ab8597ae99449a21cffc9bd1780923df9b88f528687413468a039d7264ea4819925f0ebc904a81fa
-EBUILD certifi-10001.ebuild 948 BLAKE2B 96903071c2d78f4fa556b36c8f2e367adc1e24face20abe6e4e872dfd94f17ebce210bb30defd61aab1b3f9937bf350c06a1f83214e83a4b6c989a436c9c9801 SHA512 84892fb0678dd12aecde7aef383d23996bea4aac62aca46bb71a4c10597e1f81391a3fce66ecbde94ce5706b549eba4b3c4e96929f521519b9dc5fdc211ddb20
+EBUILD certifi-10001-r1.ebuild 918 BLAKE2B 1d5fb8f4ece7952cbf6351e6d669aed66bac77f9308087c4e570cfeb8572ea197dea765cbd04e7b3b2fd83168b22ed6fb8cbbbbca415b5a21b00bccbcdab939e SHA512 2328bb34018e8659a94ae8468fb635cdbd630676c4981d58aab6013299d0ff519b02e7227d41116ccdb188379ccefea42d4fe4c17ec3de1dcb3999d69e521a65
 MISC metadata.xml 345 BLAKE2B 5cf437570a10505d4c41abd959ebea978c42c94d48bc28c83f6d8d707e71941ac74d6a9c11d95ff498eb0b1f6299ddc2d458da4cd1bb260c9854ed8e13d53e3e SHA512 27e9fe335402d355adbdad8adc1267903e8eed49a535cf00858b01f8ed05a07511038cdeb6841641d934b0fc5c8649d344dec7e2a5fade97d0b7fa38858cbae9
diff --git a/dev-python/certifi/certifi-10001-r1.ebuild b/dev-python/certifi/certifi-10001-r1.ebuild
index 9a81b8332522..c29ad3179425 100644
--- a/dev-python/certifi/certifi-10001-r1.ebuild
+++ b/dev-python/certifi/certifi-10001-r1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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"
 
 RDEPEND="app-misc/ca-certificates"
 
diff --git a/dev-python/certifi/certifi-10001.ebuild b/dev-python/certifi/certifi-10001.ebuild
deleted file mode 100644
index 11944fbf8606..000000000000
--- a/dev-python/certifi/certifi-10001.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
-
-inherit distutils-r1
-
-MY_P=certifi-shim-${PV}
-DESCRIPTION="Thin replacement for certifi using system certificate store"
-HOMEPAGE="
-	https://github.com/mgorny/certifi-shim
-	https://pypi.org/project/certifi"
-SRC_URI="
-	https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="CC0-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="app-misc/ca-certificates"
-
-distutils_enable_tests unittest
-
-src_prepare() {
-	sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 2e53c5d0f6a6..a2cb24380899 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,12 +1,12 @@
 AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f6551b57b89b08d7916a5a4b5c8c59605bb7dbb2393d566afc0da606103c09226b61d8a85734e124027ed81d46d405d18079778 SHA512 bffe6e2668dfb16f09ce20b784fb33a4a19cfbee832e6107601bd0bbd60c3f4e3b7debb3c3c320b87223dc584f054b6bfd1c19251ce17bf0b978d0b3e0b28088
-DIST cfn-python-lint-0.41.0.tar.gz 5192401 BLAKE2B 1f4c491446b552272cb9fea46d9d07ca559a4ac7526730663b0824d3ba631a333128ca45b2dbbe637286b0495d0198c45ce19b662bb1448125c919ab4fed57b1 SHA512 3ece6a39666dee395c78fed8e23d9228ec7e0cca67d9216b709300bccf48605903252202cb7d05e7c9b9122be11ed4ca39540aba891359633f1772af72a73fa6
 DIST cfn-python-lint-0.42.0.tar.gz 5307120 BLAKE2B f54c4ae7fcefa6b56714a0cfdf89d9fbce20078daac0784c6169dfbe1a110da699e37b526f306ed9734504fb3387c660ccb997748579b65afe01438124361383 SHA512 ce2e6a0031e3d67953da6f5dc96f0b155f1a1144bee75a8a476490eca69fdb700c8a3d6fd89b0afa4c8d724956e5f86bc48417035d7c94f3eed00abda47f9931
 DIST cfn-python-lint-0.43.0.tar.gz 5329573 BLAKE2B 94ea659e3df02fb3b269984cdf6d879d0e2719aadf3c95f15c2982606cde220493da0a7e34e16538170f96a2611e8693dbad73033bd842e91de613c8cdcb2009 SHA512 fdde4cdffd01d1e8011f44b4eaec0bfe28f2189f53bdc3054d563cf4657c5f828751d8a12e2050d8e04687fe05bf768b5db8cbd27d2ed1c5e0d8967ede70d0ae
 DIST cfn-python-lint-0.44.0.tar.gz 5339555 BLAKE2B 880f03384247f4d6af1e87850b367bdc0846e00205aa943480a3028760115e36b3f6180f536a7b16b9a1aaf9f824ceaea5ab69b7adb1da3f345506c0268b55c0 SHA512 15ee6cc0cb373f7104d9c32acb06433b5669ae89997de010f1c4f382514481f1c6b87ceb387236275299e13e63aae1a5345e71ee934f2d99c1b66e566e1ef245
 DIST cfn-python-lint-0.44.1.tar.gz 5339578 BLAKE2B 7982cba9fe422a8323c6ea270bd7ff5f41800cc16ceaa39d9fc01c2929cda5cca3b19c45de50ca8338a56aad001c834e16bfbd0ab59140381b5189e28965ba38 SHA512 b7f9ad598411d89979334aa79c7b4667ede28eef82b0b546977ba10f33f57e89366d1448e8ceeb3f28a2e53b33a409c439c3faf7d10f53fc5819f6b8693e117d
-EBUILD cfn-python-lint-0.41.0.ebuild 1339 BLAKE2B 0493cbc1361e663531bb80becb0e09edb3e5d8da4fa6258748e68061ba6765c1e324894000d8c5daa110680714d9ea045ff79bba27b3218e65a115ec1d0750e4 SHA512 75ff46b3bf5265045fbddb5fc0621b900767c999a03abcdc4bd3925b391927876c98431fd5bcb4199e261fde46cdce73dd555f795e7e37419a0ee800be461098
-EBUILD cfn-python-lint-0.42.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
+DIST cfn-python-lint-0.44.2.tar.gz 5515542 BLAKE2B 9da951dc7faa000d2abd1610595e463045079e5a2e73ad59779fb715f32fca39c1cef189484d62de3bc57a48b7776f5cebcc21c39948b7d73e394b89a4cebba9 SHA512 ca0cba19f930960711676ec285b10e0b60ff36359326098d5040bd2fd8f7ca6cfee985544c4bf94770baefa0e50eecead45c4d769ff3587031c3bf463f26355f
+EBUILD cfn-python-lint-0.42.0.ebuild 1339 BLAKE2B 0493cbc1361e663531bb80becb0e09edb3e5d8da4fa6258748e68061ba6765c1e324894000d8c5daa110680714d9ea045ff79bba27b3218e65a115ec1d0750e4 SHA512 75ff46b3bf5265045fbddb5fc0621b900767c999a03abcdc4bd3925b391927876c98431fd5bcb4199e261fde46cdce73dd555f795e7e37419a0ee800be461098
 EBUILD cfn-python-lint-0.43.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
 EBUILD cfn-python-lint-0.44.0.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
 EBUILD cfn-python-lint-0.44.1.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
+EBUILD cfn-python-lint-0.44.2.ebuild 1341 BLAKE2B ac10bcae4e7c4cca570f4fa1e66f35038fd340fbe6d69388bf6300ae7cfa275610f1a2f239cad3b6ab1bf1ca8308a0805c91db8896f5eff612e695ad179b8f6a SHA512 eb21732bf1dbd44eb434f6b056c61c04b82f67f685b62709b9ccb16d37990f9cbaccf828021fd27fdc518707c14cf7977133ba3a722376bf53220252b4695a06
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
index a83123122bcb..2ee32af274d3 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.42.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.44.2.ebuild
index 2ee32af274d3..a83123122bcb 100644
--- a/dev-python/cfn-python-lint/cfn-python-lint-0.41.0.ebuild
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.44.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest
new file mode 100644
index 000000000000..cd09b80f2c5d
--- /dev/null
+++ b/dev-python/cftime/Manifest
@@ -0,0 +1,3 @@
+DIST cftime-1.3.0.tar.gz 55668 BLAKE2B c233a3d45305476f422ca93f89348b7b3c018b10c0fa42d6649001b7bcdb4d26d230322108def41818449ec78dc531261b52d09252306fb5889ac4011af33828 SHA512 07f79e902142e8a314c9d09af08ea752454e490c3027ee44853f78c725305bf11cad90bd331edd204defded11e7f29173df9bef70ab805a28b745cc0afdd4685
+EBUILD cftime-1.3.0.ebuild 668 BLAKE2B ad6eeb51284ef86ebd8731cd38a70001d27292e03f7402325c6fd075926ff107d148136f82b4d2472517f727db3081fcdf5a8b048f863152987ad34a3cf9b315 SHA512 999a55189543014908b1ffb8288ddd47fbd81a2b3086b719b242dd3dd54d7c39878583d7d96f1dce1406fb733aab3171534c863d300f2aa8b57ed3f164931ffb
+MISC metadata.xml 376 BLAKE2B 789faddd69bc9aa985a9a8365c0a7441c83ed4d8a273644562a11cd76bbebef04f27ce5728d734993f961a3e4f1b2a69833566132eba1f18344c05ff590cf36d SHA512 1519b5aa6047dc20da5d3627d41400fc44c909cff0a9a6db585d5e3b94664c6d6eb752dc273fbfe5ff11eb8d65bcec4a8717e3bffbf5315a55f9e7920e2ba86d
diff --git a/dev-python/cftime/cftime-1.3.0.ebuild b/dev-python/cftime/cftime-1.3.0.ebuild
new file mode 100644
index 000000000000..756f757775cb
--- /dev/null
+++ b/dev-python/cftime/cftime-1.3.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Time-handling functionality from netcdf4-python"
+HOMEPAGE="https://pypi.org/project/cftime"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e "/--cov/d" setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/cftime/metadata.xml b/dev-python/cftime/metadata.xml
new file mode 100644
index 000000000000..7772129ae7c6
--- /dev/null
+++ b/dev-python/cftime/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">cftime</remote-id>
+		<remote-id type="github">Unidata/cftime</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/characteristic/Manifest b/dev-python/characteristic/Manifest
index 145a13347b2c..b6a7ad2223ee 100644
--- a/dev-python/characteristic/Manifest
+++ b/dev-python/characteristic/Manifest
@@ -1,3 +1,3 @@
 DIST characteristic-14.3.0.tar.gz 26993 BLAKE2B a24548953451da77e08678b8a204c0fc649ebff52026aafc6f80037a65f527c9a2244273420b1ce76e3ac75778f48c11bc2344296cbf34ff1e9a1e82356d52f1 SHA512 e13a86f453cd3688a74188005b82a661a9c73d9f0408d9afe9e0575e69ffe87a5327f51e2c16a9c0a653b738e7c014d5aa08e353835f0aca7897714b7ae56e83
-EBUILD characteristic-14.3.0-r3.ebuild 677 BLAKE2B 4793518f7dc738ba7b9798260b816811c437b807440139171cf83ec99fe6f94023d0d66f7b687ab832d1d0c886de99ef6eff9f1b8afc919cdf2ba2843b56045f SHA512 d30dde2aa2d1d8d51749118a3426988abdc67961a2251ed2a4184ef6a58ec1fd44d674e06ae17528d3b67c5762812abcb529c9094a7fa90349b35909a1034d78
+EBUILD characteristic-14.3.0-r3.ebuild 678 BLAKE2B a1e8266652959d27efc1ffbf41c8256357f7a1078689786ca7fe9c869b8ac1258d1e8670711cd1a32ddfc6b0c9a8547bb6e1b953a2ef30032f34574de6cd94ad SHA512 2716fa90da97f27f44889d362b26f39b2219b45ea4a99456bd3fe7393b8a9e131710f40bfdfdedd03d29b4e5ef6b34fb6504f55c9e824b4209614235b514087a
 MISC metadata.xml 414 BLAKE2B 414b0954d86e4d3d96fbfe29f0777146dc3e23fa9c06b9e834b0f902748c60799c312a24383a25d030bf301513827d159247a26bb98a2d21834c15718decf2ac SHA512 2fa4fc6b9ea7ec6f7ffbaa838cff4e39b9b00b7e87e561ba902cdf0de5f60441dba15f8918f1b864c4cfa87b9b6e9e15119bf66038c39b37d307133691737e7a
diff --git a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
index dd066bd757ab..12d36e7312c3 100644
--- a/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
+++ b/dev-python/characteristic/characteristic-14.3.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 distutils_enable_sphinx docs
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index bfabe5b2aefd..b419db916f93 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,7 +1,5 @@
-DIST cheroot-8.4.5.tar.gz 109443 BLAKE2B f8dd7a053304c6be559862028ef306c742c015e98c236f3e154f863c3abbf7d261f85b9a7e880ba9f51e6a8bf25cdf96ed6f45f7758657ecbdc4d6b7dde7f6a9 SHA512 2e8c84a67e24772dfeea7fbb397807e6553912d32392c393ec85181ccb381b1f4d3e38cc2366710a5c789869cbc6d15a79bd1b20b6d3845e5c08496b4f4b0e9e
 DIST cheroot-8.4.8.tar.gz 111377 BLAKE2B be020dd45fef980e7e7b10e19f1ff2bf076ddd30578a31371afd7b9c85a644d0fb4c4836401f17be8df3307071f3337359f611f9cb6d28b17fb5b7723d6b6f7d SHA512 fa0362d29adbcf0b06038d209e33d722ff2f0766d8f2dd46c8ca217195ef5b30bb51400a9615f11cc136683b146ab2c21c3f1974cb4e7ad55488762e31da40f5
 DIST cheroot-8.5.0.tar.gz 112163 BLAKE2B f7105f7c2d5433b90832dff6404120f153783b644b5acab72a915899fd138df1ee9ecde6d4148a66472cfb31802e58d684256524a212c65c1c42a22ab7783ce2 SHA512 3e781bfaea0b1d0b339ddb1ef871505c7eb0f4a67873f3207ec3cbb703392f579de90785c196d77f7a484b675de1438def4ad91109e70ad5894d26e55c645a01
-EBUILD cheroot-8.4.5.ebuild 1524 BLAKE2B f960b663a86ac5d31ba5966f4618c4ea378ba8261861ef5da20e237877a7a225e0dbfc9b9ec2581dfa67a3968bcee21b79d5e0316f0d43c33ac641808ed8a5de SHA512 42d487dfa1ddaaa1b054e82df553d421af770160ab7ff3f0e60d7036bb6945dc69cf590d88baac39c1c04f36867a91ce435c7e8ef6bf9a7312fb1ff2cf0f5820
-EBUILD cheroot-8.4.8.ebuild 1529 BLAKE2B 9d0e3bda85a726d08e7e5f145e4a5e814239c6d7574bc93d9f15b4c04609b542693b728f35becb45657601f17e656e26e3167807418ad13f31539be01cf211ac SHA512 17db137994110789ff496c40a0b2d10efb7913de0c9902cd4bb5498483c704eaad09d808948767c805f9c9efd1a956fbf3fb3d0641cddef4f95b62edb9874cc7
+EBUILD cheroot-8.4.8.ebuild 1524 BLAKE2B f960b663a86ac5d31ba5966f4618c4ea378ba8261861ef5da20e237877a7a225e0dbfc9b9ec2581dfa67a3968bcee21b79d5e0316f0d43c33ac641808ed8a5de SHA512 42d487dfa1ddaaa1b054e82df553d421af770160ab7ff3f0e60d7036bb6945dc69cf590d88baac39c1c04f36867a91ce435c7e8ef6bf9a7312fb1ff2cf0f5820
 EBUILD cheroot-8.5.0.ebuild 1532 BLAKE2B b1bb9a41ac047424b491eddfcba78474101c2bbce9375d6596cec6e5a60e4841ad0cc34557d2be3d5ce027f72b3acf0018efb387dfa7e060730982c7d7f890fb SHA512 09ff41f3021704044f689947787bf313aa954b582d42101ad6c581acacc21f9c6aba77a564ec56dd3644ee4fa2cff5fa2d7cf567377517dc5ab7f43501bd0f8b
 MISC metadata.xml 495 BLAKE2B 4194775afacc99b4983275505dd45471a7ca4305a6cfb37d8fe80fdc00d196da1c2722940d2ae13408de0c13c92c7a2a01ef153b35f49f8ccb9d7df2f605dceb SHA512 710108fdb8ddda277cceea3d57a3ef716e7a67067e658f9719a793f9ba7fd04e8a1e4482c68c23ba458e29e85b9b233d72ec485ab8c585703f411fc32051f256
diff --git a/dev-python/cheroot/cheroot-8.4.5.ebuild b/dev-python/cheroot/cheroot-8.4.5.ebuild
deleted file mode 100644
index 2685ff644e7c..000000000000
--- a/dev-python/cheroot/cheroot-8.4.5.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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="Cheroot is the high-performance, pure-Python HTTP server used by CherryPy."
-HOMEPAGE="https://cherrypy.org/ https://pypi.org/project/Cheroot/ https://github.com/cherrypy/cheroot"
-SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/more-itertools-2.6[${PYTHON_USEDEP}]
-	dev-python/jaraco-functools[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/jaraco-context[${PYTHON_USEDEP}]
-		dev-python/jaraco-text[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.11.0[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		dev-python/requests-toolbelt[${PYTHON_USEDEP}]
-		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
-		dev-python/trustme[${PYTHON_USEDEP}]
-		dev-python/urllib3[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	sed -e "s/use_scm_version=True/version='${PV}'/" -i setup.py || die
-	sed -e '/setuptools_scm/d' -i setup.cfg || die
-	sed -e '/--cov/d' \
-		-e '/--testmon/d' \
-		-e '/--numproc/d' \
-		-i pytest.ini || die
-
-	# broken
-	sed -e '/False.*localhost/d' \
-		-i cheroot/test/test_ssl.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/cheroot/cheroot-8.4.8.ebuild b/dev-python/cheroot/cheroot-8.4.8.ebuild
index 467ee0e31e3f..2685ff644e7c 100644
--- a/dev-python/cheroot/cheroot-8.4.8.ebuild
+++ b/dev-python/cheroot/cheroot-8.4.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 75029ecbc4e7..b39967d94e03 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,3 @@
 DIST cliff-3.5.0.tar.gz 82997 BLAKE2B f169770a0a956e6091e56eccda8d10906bee09bdb03b474f3b17837b3eda858f3afd21beae1d6945bcdabfa89fc1555d13d70ddd0454a10fe05bfb63c8de75e7 SHA512 215f22e5dd2c4c17bd0f19866189b6b247377a7d5bddeb4a07b7536af7545bd0440b5fb0a98474fc018e3b12f6695f60028c012f3e7eeb6498b20f2923939d08
-EBUILD cliff-3.5.0.ebuild 1203 BLAKE2B 4bac1690e15c736c6ca79ed940a0459811e05e6264949aae242807d266c988fc09e2c0fcd69c8606ce5c54cc260b7b50a8c40cd15234d56f70ccc6f367a902e5 SHA512 26f04001fba369a2805f3e4c33ffc69953a8e1d921e88a1c63c861cebbcd1dc42204e629a3bb34b6afeeae04fc72e196192ff6b944b387299ece48562c29e9f7
+EBUILD cliff-3.5.0.ebuild 1204 BLAKE2B c6386d66b15ed57cb82983255a1194eddb7597a8b8eea3ec842d3c12230a43edd252d74a6515e2ae8a0313057cf9b77514e4893b32af0fedfbc61084e391e7b2 SHA512 092334f6b041427cc099d9a4b091d3d8883444552de3c1fb533c4db1f62ca16d8167e79c012484d0632f7b8576660fb4f555dbf8785d665984f49066efe18aca
 MISC metadata.xml 766 BLAKE2B d1e77f1b381c58cc9d5c004cbc5062bc8b024bbd416ce4f3e44d6fc817252980193d7f3990b4f0248d23d763dc62a489fbc68093eacf8e3e7fd82cb596b6fcf5 SHA512 bdeca590929247212b707d2faf686d70102aae0fefd4904a9bd091e041d926740df1fe0556b485d0947c7ff879c190341fbc3cbca535aa0e2140104a8b618f1b
diff --git a/dev-python/cliff/cliff-3.5.0.ebuild b/dev-python/cliff/cliff-3.5.0.ebuild
index 8a9b0147ca33..cffb4beee619 100644
--- a/dev-python/cliff/cliff-3.5.0.ebuild
+++ b/dev-python/cliff/cliff-3.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index c2a69914a6e0..885577e90351 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,5 +1,5 @@
 DIST cmd2-1.3.11.tar.gz 657770 BLAKE2B 829023a4ebd2c2034dbbcd276720476ef9e19a0869bdd2dcc18f2b7cb58bf7c9874b9c56c60d6ba15f7458327d768bce5f07890054361b58574697cf8408cfd6 SHA512 bd640a38723cfb7886b74631ded288fee87026fe718db48ea71a1eb3cb61cea514dda2c4ccd1df95b5ade3c8f8a4a14be3dd9d6722c59260a5fe7c4dfba30f24
 DIST cmd2-1.4.0.tar.gz 660494 BLAKE2B 1a7d5efef704cf3011affa99303233ad9d16e09d16bbe9319324599e6d69b1a664556e9ed406f2a34bfc6021a6d1607a44fd4df9cedbd6688826e0bfe8d91b77 SHA512 1f35e9773578a1d2ea1255cd697754b126c1e90486e84319c0f86ee409ed22bfbc267ff1d3b9af1072985337c9cbc51eac4e288281146d9c20b54c8b364f1547
-EBUILD cmd2-1.3.11.ebuild 1231 BLAKE2B 94e7f09cb9e2fc73c5e831ab193be8a723cc66fba42dcbdbba7f51e2733f6b736ba6117366a81eb35fffcf80329201ad4a1280ea1dd189ee3b96c926c268c2b1 SHA512 4a746cb023b3ce7afcc383bfa1a4abae0e5be4b0bb3ea90649e474fecb2a16b7c7767b636a3c8ab7150ec75c3d2dba80a07e055720d7f900020a5ccfb6f10879
+EBUILD cmd2-1.3.11.ebuild 1232 BLAKE2B 9c1e74e3ef297bbe17d815a996dc7b633c3bad76dbaa50c4980871d94429d919838aa2457d12fcabbe3b84f8070487542ac63c1b8ddd73ca4cec1cb73bffa58a SHA512 c7260d894cc7c9dc4823803b8db5ad9a55ea2c3564f18073c7524d10ad97bd1ea9acbb6e9036a6f873ae6753b2ed8163e0dc7a357a8c851c848e25bc161666c5
 EBUILD cmd2-1.4.0.ebuild 1137 BLAKE2B c467d24e0ec9fae72f2b91f64a40752c82500e15b2bdcbeb8abaf4edae92ce5eeab2e3a23794b84d2f605af7b3d73f21258e0a7ed7918b1e014796a460ae8485 SHA512 6cbb1e031fea9e97e3414229edddbf3b6b309dd09595258a70effd7e5b2b81956368c3310b23a5a001b4e97251125d460755630c786b9c48ff2586c959f880a9
 MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
diff --git a/dev-python/cmd2/cmd2-1.3.11.ebuild b/dev-python/cmd2/cmd2-1.3.11.ebuild
index cc2ca4a9c220..088282f0f2c3 100644
--- a/dev-python/cmd2/cmd2-1.3.11.ebuild
+++ b/dev-python/cmd2/cmd2-1.3.11.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-python/commonmark/Manifest b/dev-python/commonmark/Manifest
index 2e6ca49ca927..dc0e86950779 100644
--- a/dev-python/commonmark/Manifest
+++ b/dev-python/commonmark/Manifest
@@ -1,3 +1,3 @@
 DIST commonmark-0.9.1.tar.gz 95764 BLAKE2B 1f61de784c5cf03aa5255f5fae18c48df30aab8ef135ccf85a0b7a14cfc64275476458fc0853ecfc9beee96daca31d5cccb30d218f7d5b5343844e57aa7a77ec SHA512 bacf5ef387a0c330a2128f42c42c29c1a48ae623683e6e56ad28a1621aabd72e29cd3e2d661e8207b8cc0c347d267f262a55f2145fc58f8c8aeff91e7a283324
-EBUILD commonmark-0.9.1.ebuild 1024 BLAKE2B 1747f5a9f8f5d2fc1344604eb810112221eb693627f5df6fb99c1a766861ad4f6df5b4c927683febf549d37382e093e4e44c70c6c93d98b57ebe9ba127e38e51 SHA512 73677f616ca0594cfe68adcbb55c2b520b4274124af8a2a9314fc5db07561b255edd22af3090b948a2a597a0a2adf7f4d5a3a609ca45ad80f75fb8a4bb3c76b5
+EBUILD commonmark-0.9.1.ebuild 1025 BLAKE2B 685c39c875f10bf238b92ec9dad23b332917547ddd46e94526e4390fde8713d057ab429d90227a0654c7ca94186c7d1d8a00d1dc4154428c605dff0f67b1ba86 SHA512 00455ffd1bed275a48081defae595a5ff5ef9870dba905c95a9b4e91d933d6c20c76ad5b021fb823879b71d91412a947740326736c8590fc51f359dffe326958
 MISC metadata.xml 763 BLAKE2B 9a79175d4ae0c20b1871d8f89a571e7eca9ac0788c0f3de2ba2ba9bc0fcac4616877c762beec0c75d11737e84ba9759d134f528b3c2292d2823676e8bfbb7aff SHA512 ff467de52a1e48d4c70b9b5e54e5557f4469c5c7ff75ba6e9264642f835b87862085e8ca666977bee3daff00af765248353597a41ddcc62b83c68e0089ca6719
diff --git a/dev-python/commonmark/commonmark-0.9.1.ebuild b/dev-python/commonmark/commonmark-0.9.1.ebuild
index fcfeda99868e..10b6c5c4b298 100644
--- a/dev-python/commonmark/commonmark-0.9.1.ebuild
+++ b/dev-python/commonmark/commonmark-0.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 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"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/coverage/Manifest b/dev-python/coverage/Manifest
index 04fa59f59c95..b61f324392a8 100644
--- a/dev-python/coverage/Manifest
+++ b/dev-python/coverage/Manifest
@@ -1,7 +1,7 @@
 DIST coverage-4.5.4.tar.gz 385185 BLAKE2B 9d040bff13cebd1cb7147f15c3ec03bb08648cf801b5b2bb046a6b5bcadb3d3886be8bf0a624d225f25d10a5ca82fe5fb88f55e44e92a0a3285836b837972970 SHA512 ba534e04fe35cbadc4b16735f25c08f579a49a6677ec106680f222f2dfb3d0f1e011d0962f1c2108c375173ac4588bea1619ecda05ff9ba6fd888daddfd27b0e
 DIST coverage-5.3.1.tar.gz 684457 BLAKE2B 82c8e311d85a6f758c46767957199e94099838e3c340f5da1472813a2877293245583cb190acc0139cddf3363ee5f299fb42f955c59912b80d9d1ece8cfb09fa SHA512 981ebc9f9490efe613edd68afdef83cb161b303e6de266335ffd2d1d3634bd5a088cbff249b0243071b55cb4f31b4b0c7537b5764660ccc86a7059307badd571
 DIST coverage-5.3.tar.gz 693632 BLAKE2B 9daa3a0fd7f8c3ff7c9d68603e11a0a419d3ab50e3c3fb6be5b694aa1f7566040e1212b7175dfa4f71a0a309db325c00f94a85e0e9e755ae8c4f09c499d0daf4 SHA512 f40a21c394b1a72118965f702ae2b8e09c4e0b2fe92709aedf1de4c8074cd9c2cae0ed4860fbb863e4e5479f1067ff806d7051f7683d6b324de9945c0cacfc39
-EBUILD coverage-4.5.4.ebuild 704 BLAKE2B 2a43852aeff1c2e12dcb3cdc197dc1a245e522f293bec33370da6f88b461fad3189d1fc35554d60897a34edb4ec484607a980de6b9e61df147fe150739390f36 SHA512 9cac3135fd8c6a52205ac3ae554cd6912082c78a5c500ed2edbdcf20fc056b8cfc62c84bf64f60316d5934aa82088003f78678aa9be346f0840ae56495aadb7b
+EBUILD coverage-4.5.4.ebuild 698 BLAKE2B 52054c8c33b3eae82b3465a9b9737102a322089fe88845f158950a618d0f78a0548b1e00f98499a28f98836fc22ce3b0301706252a6ad0bc43c660c34cd815d8 SHA512 7cd44c55dca1e7d39ab34b1ce6f898eeba3ff0fc981b3abd702b589d49bbadd408e3135fbaf57f6df20967aa8e96e1f2592a2630000009c31a15aa594566e53b
 EBUILD coverage-5.3.1.ebuild 1913 BLAKE2B 1b554ce2bd4c12354104acdc85f5e760e5769ff8f2a40e868d12f35a75768ffda77c7f66f695080903a7530b30631719c95360c7720e3aec6066438fbaf013e7 SHA512 3200c2528029e6f8ed5181827b5fe3894413ecb49b568f2883b46e2ab92bc6b1c8a3f6f010e9c6fc840e11bb989de68a9b3d96dfc7f87ca2e71071a3b54097ad
 EBUILD coverage-5.3.ebuild 1905 BLAKE2B c6793ec3ccc9bd65faf0e18ba76769cede60399cb2430234cc415d88d68db7c75716635ac3415b5d45189514e0fe7c3bb6789ba1817f4e8fc7fa240f9af63460 SHA512 88e6566a399ce6b6326cc22217ee9a10656f0d2a88f336a6678ceca3261a1b01be7cde4e5bebf6f98c601166819def458e783240d89c16f374dc5b4e86f9f025
 MISC metadata.xml 713 BLAKE2B af0e3d7e3b503581edb2552d0eaddcc9cf3ea5cb92db247cbae4dc66edfb1da6608f472cd2e76e1c17537b6907b991fbf2b4c250792ba6654fd0d4924da599db SHA512 d836604218fc48fd477b27744c6f97a40c3102b859b25e327cd0775ecc54390db62c9f4096c8c54af26557c38dd48ae138a8bed742aaa759572189974522ede5
diff --git a/dev-python/coverage/coverage-4.5.4.ebuild b/dev-python/coverage/coverage-4.5.4.ebuild
index 5c165c0f480f..617f99ee8935 100644
--- a/dev-python/coverage/coverage-4.5.4.ebuild
+++ b/dev-python/coverage/coverage-4.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 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}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index eba5ceb655b4..8a50ed6f46d5 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,3 +1,5 @@
 DIST croniter-0.3.30.tar.gz 18122 BLAKE2B d15e19167eabf935ca12ad2b277b9b97459248c3a47982346070b4500b45f8296beeabf76c5ceb9bbff579ab2d713392c82446b234a6f4b4f6e8317adc67613d SHA512 1e7f5da56991281a16919abbb386a20a8437604bbe0e57d12726d5f19c1c038e9b320a900471b1d4dad9f5dfd0eeb85ced17232a4907e50025592a293a5a8ad1
+DIST croniter-0.3.37.tar.gz 29607 BLAKE2B dfa466f8557e47c282cf7a7399b1364dd272a313d40b4c9a57e60de9e4bd174312cec24126679994ddce3c320b24d89db4b4395736e344e2a3df5fd13188f7b2 SHA512 733412d6263d5261e05139861465602016925716abe04b82218b370e82ca7cdf7418113d911fe693fc7242fdb686580970b60609de28b3b7f4330a91c721a551
 EBUILD croniter-0.3.30.ebuild 719 BLAKE2B 3185ad45bf9c466b9e6a57ed350f19a3428e05b2f112090ccba6b4fefbb30f4df49be238b586c2b9a6ab8e481e2db776902ed6ae88d925c294db633547e3a7cf SHA512 ab12552cfd82858e51cbdd7add9982f3734d3cdeac113170a4ea45a465ed6aae140cff98cfda790b7261c3a542783f0c92289fa0e8c0db122183994751b0e31b
+EBUILD croniter-0.3.37.ebuild 676 BLAKE2B f376370bc2f12e9e519fa45f5d5582571a7202483c2a50592720bbbe101dc900ec2d0b0916ba8d55a1a84fe7b8088e400e5498df6bbe7ea4279ccb6b16c1d5c8 SHA512 a27d4f996242b4dc226ba22b7ae892e21c64204b4007a4b25048e21cfc26bb44a89ac4f327475b44477ba793b3aedd61010ab79e88797d4716e929541252d943
 MISC metadata.xml 368 BLAKE2B 597859edda3be0b8ab9a537e79d667628aa25ff2aafe37aaa63f73ad888af2ff8995b676e6c18670ea79c0293406bea8f21a24edf5fd0072bd5eb346e1a5cbb0 SHA512 86f00f0d61cbcacb19d721d5e4637d75cc10632de0da611bdb449c808fbffa7441e114f018b3caa328952dd7f97dde63d3b7728d119f87628b2e58787e0dbd1b
diff --git a/dev-python/croniter/croniter-0.3.37.ebuild b/dev-python/croniter/croniter-0.3.37.ebuild
new file mode 100644
index 000000000000..00a17d0f40d2
--- /dev/null
+++ b/dev-python/croniter/croniter-0.3.37.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..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index b8f11c5ec6dc..74aec3c1a239 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -4,7 +4,7 @@ DIST cryptography-3.3.1.tar.gz 539756 BLAKE2B a3eb52d756565ae83d9f2e06045be1d343
 DIST cryptography_vectors-3.2.1.tar.gz 35168164 BLAKE2B 77af3be0dbd7393da7cd59600086041b78fe20339018a637fc1cf3600c7cd08cf2e565c79ccb47f4719a4b0f01cf2ab2db00c025805443b333dd7fdf3aa835a7 SHA512 44ff756a6ece9700f7657f8ba92417e95bf273cf500f1dab2141de5b2af6e61840d65c37b766abd752c76025ead1550bfc7b7340ce5774c75fd0bb8ac768cdd8
 DIST cryptography_vectors-3.2.tar.gz 35168065 BLAKE2B ebd915eee9b91bd61445bcb442d3052972b1463132b8e63343832baa27c25566e22ca9f50c9d4ea73cb12185f9228144eaac4bf5cc68a3bd79f347fe2d021adc SHA512 bb0d00c8a66fd328ef38b0008519856a14d35b6fd634a6f67ea5530775d36538fbd326326c3f0cd962b1a008c21f2aded4d733f97bc12577679ed8be67b858bc
 DIST cryptography_vectors-3.3.1.tar.gz 35168171 BLAKE2B 72cf5d79773a728c16847e3e62f8ce444526c051d7562467446d3e59c66064568fdfcbfb1fd35419fd79079ff9a02a2f3a97f870f7adef6cc9a0fd23b4edf514 SHA512 a102535bd3cf72118106ca7268d5a9921738d41f81247940c550961d61cb0d1869095b7891c39e8dc15816f7d38230622846747b4b7a3f226f09306cf86220bd
-EBUILD cryptography-3.2.1.ebuild 1942 BLAKE2B 2872701d3b66af19dc2825cee1e27f950f5cdfd4900e3ba25bde668b1a088a8968d3bb377ca67591f3275eaa2acefd0b673df3ac58e44cee039cab32bcbb9e83 SHA512 4c45006b80c4eeb826303e3f70e855796164d88e732af05052d9176d21327f14122f120cabca616b21543a725eba6a8449f431832850c5e42acdd5c8f716305f
+EBUILD cryptography-3.2.1.ebuild 1941 BLAKE2B fc08aa77f686a2dc3e9279ac1ad72d5f013eff68f043c73cac4ce4f3cfb9671e674139cff3f96ebc8e4bb8d4c5101782a7a5d94bf804335a3d39981a48a89913 SHA512 b8033cc643c989b8df86078b385e553d2ca1305c2b4497b56af6db2082d54a7115e4ed8f4d0c4822cefe6622a79d163d0f8980027b105c7bce5402fe834a5bf7
 EBUILD cryptography-3.2.ebuild 1597 BLAKE2B ce9b411af9b2e2fcad65d7f017e8b36cbb6a032451fd8c75b036af869ef1342d5fd3bf7b36faf16a4070dc2f5a3177212322c6ef32111785db4bb8103f39b8b3 SHA512 37ede133d250d4c7eb0d0044a3943d2a963f9ed2b173bb2e4bafec10f88e8dd0ef20086628fdd526af90128d08888a035876e83464686b125d0282f2ebf549bf
 EBUILD cryptography-3.3.1.ebuild 1948 BLAKE2B 5bf3fa11739316e3c65da69c4ae33a0f9e873784c27607dd6a83ce6966e89cb0a545ccb551108d5b28348e83772036998793285824a3bc6f1e89c56abb9c50e8 SHA512 267b725bcd5b8dcc247369c88e862da5c20176fa32ab4bb3afbee1d0bb548d649a78406de29af2363e8c2e234e7868c90e7f84f288722e0d328359d6373b0cab
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-3.2.1.ebuild b/dev-python/cryptography/cryptography-3.2.1.ebuild
index f6ebc6c81528..5984bf936909 100644
--- a/dev-python/cryptography/cryptography-3.2.1.ebuild
+++ b/dev-python/cryptography/cryptography-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna"
 
 RDEPEND="
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 438a60c27234..a5990fad6fca 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,9 +1,7 @@
 AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca34f39bb2c897aa50cdebf960589181a9614a50829c380a892a9013e8ec5f538d51f52475cb8d92fdb5b SHA512 dd554d0d6cc220988552b06a20337af20b847e75bee76c90eb92ea979d9c2ae9d64ffa849266ff403d857b3737981de451bf40061bea0533600476bc57661c18
 AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
 AUX cython-0.29.21-spawn-multiprocessing.patch 1096 BLAKE2B f31e9e8bdc86ab1098bfa115e60470410f41fdf4be558c6a11d0c3ea61b8a8009f6242a96e2574f525e53b6125de78c5f8dbd8f7499d8debd368e80a6d383e47 SHA512 71f2349dfee2504bffe2ce378a00b2033ad229f99c597382eafa54107fbdc56fc177e4412e6314794b5ce22d9713e535467b0ed3e36ae657a5deb9c3325eb242
-DIST cython-0.29.15.gh.tar.gz 2075879 BLAKE2B e6322656c819c6b09e235c32d2b520e8fe917c864047d028dd67041e70251025f14accbd76499b7b9290d0424989adf89321f251526e66a892bdc243ba80ba7f SHA512 bd0872359d31a41750353bb0d7f03c2a40aa2bf6e492148e693321cef15b02ae4f8d5f5a00efde7216f09a6ac06f2bb3ded9d00e27ad0cfc53605f3a9ef55af8
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
-EBUILD cython-0.29.15.ebuild 1952 BLAKE2B 6369461078d2d1c3b33b47a05911bd019751f60fd1a4bf9df14302e0b699bfa3265d5449b9f1e669303958141a38d0afcba0b94fd1809b8e94fd99ff8eb930e5 SHA512 78559785f85582572c633f75eabdc54bca756461ac94c7aa7a2771862abda2c5c114d776edc0e6efdd04bf76a8136a132c627bc77b67282bff86ad703ca87dcb
 EBUILD cython-0.29.21-r1.ebuild 1803 BLAKE2B 5b046420481ac99e04e85023b8606df8c16908e05570597bd67ce263273acd739f235ca78e0651b79da2018e5d762a0d883055bac24a98b7df62add78acae0ec SHA512 4c6adf7f19c645d8e98ba4b5b50ba21b2169932f25dc4a0b1d3445874fa7de7e6e6962f4e4dc77c681dc1950d44ce4fe29fe23c212d20314772572d1f29f57f6
-EBUILD cython-0.29.21.ebuild 2010 BLAKE2B 199e438a27dcc6d29422be23fc4310bf5f27423d3b5b5d115fa68d35bc30f03a308a5549853ab80946939aa8e37121ab0a0d173ce10fbe3097649ac8985f2962 SHA512 6f4e3edc7e117ed4fb7edbc5449acbc4da8ab75fef99cc83920fc6cb03500fa7bbdaa3cc45ba1ac519f2efa51a0329aaba07b37331dd0a7b68cf5229e5231b53
+EBUILD cython-0.29.21.ebuild 2000 BLAKE2B 7e17091430a90f16c0be18f20abe7b6948775ecc44152ed1ee69056a923637c0846cf8e03041c8707bb8b95eebf9320ec1262c6731a28dab355b8652f521d98b SHA512 a7c7fdfa383ae48f277936533b9170b78aec8c2dd8bcf9f5284e7f86ffa74352e8dcdf6be4a2f8eedd29924ab71811fad0d19161b90017bcec723228bad544f8
 MISC metadata.xml 605 BLAKE2B 900f2ffaa501d7ce5bef46115f7fdbda0966bf4ae048b4c27ac4be06e1b23de17c674e27f97627aed8d1d65b52bea01532d8a698bdbcd20b7c9fab4bad278b16 SHA512 66176bb6e00f70b610a41bfbc973bae2b4b8b9aeeeb6bdc9e14c2832d513d5452aec6509f8225daffb7e169d93311a4ccb026c935ead80ffeb35d91f1ae558fe
diff --git a/dev-python/cython/cython-0.29.15.ebuild b/dev-python/cython/cython-0.29.15.ebuild
deleted file mode 100644
index 78cd7d59ec32..000000000000
--- a/dev-python/cython/cython-0.29.15.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs elisp-common
-
-DESCRIPTION="A Python to C compiler"
-HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
-	https://github.com/cython/cython"
-SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="emacs test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	emacs? ( >=app-editors/emacs-23.1:* )
-"
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
-			'python3*')
-	)"
-
-PATCHES=(
-	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
-)
-
-SITEFILE=50cython-gentoo.el
-
-distutils_enable_sphinx docs
-
-python_compile() {
-	if ! python_is_python3; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-		local CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-	fi
-
-	# Python gets confused when it is in sys.path before build.
-	local -x PYTHONPATH=
-
-	distutils-r1_python_compile
-}
-
-python_compile_all() {
-	use emacs && elisp-compile Tools/cython-mode.el
-}
-
-python_test() {
-	tc-export CC
-	# https://github.com/cython/cython/issues/1911
-	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
-	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
-	distutils-r1_python_install_all
-
-	if use emacs; then
-		elisp-install ${PN} Tools/cython-mode.*
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
index 2a1a1e79155c..c7b1b522f98f 100644
--- a/dev-python/cython/cython-0.29.21.ebuild
+++ b/dev-python/cython/cython-0.29.21.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common
diff --git a/dev-python/defusedxml/Manifest b/dev-python/defusedxml/Manifest
index 720313379985..e94579e1f91d 100644
--- a/dev-python/defusedxml/Manifest
+++ b/dev-python/defusedxml/Manifest
@@ -1,3 +1,3 @@
 DIST defusedxml-0.7.0.rc1.tar.gz 33950 BLAKE2B d2794d0d06ca7bd1faa0b33f3fa7e02fcfb8b7bb7bfba5e0cf4119f7341a618daf80b08e0a6949cad67c5d3ceb84a5d984d731ae129b9aed383b5b583b114013 SHA512 068a6610fcb791385dc1956d1ff1e8b17b143a0138e6a10a293b8f18153d733e160e924f52c565e2df503101faa9b2c3d4718b2980f0e5652034e250b8a82f55
-EBUILD defusedxml-0.7.0_rc1.ebuild 762 BLAKE2B 2cf4df5ea372a34d3b9a17268f7b470c3496f64074ef945328758f34e4318588850942aae1cd16301998ed3f477aa95236e5bb7f88aad2276f0405804e3cf407 SHA512 28221317686de69a0419ba4e79d17f437e2634c574c560c7fd9a7a9e8c19e93c6e0447acfb0aeea0211ee0c4da80a70967190c22b8c005aefe21412082fffce5
+EBUILD defusedxml-0.7.0_rc1.ebuild 763 BLAKE2B 9fa4410d5e4ea49b6f4e39b4c9e6cf227c9d3ad07dc2167aa251fdeaad4f9a936b16da6bf9607dbfd063dcb9f997201c2d3369c645c1f00986230b152271424f SHA512 f159c7b73a6e9d161defddc09eb111b067a3315d10421143a7c3bc41674c361bc9415d40e8d5950ee832a008f44baef196b29275f345d0ec13cba4ea7016effb
 MISC metadata.xml 406 BLAKE2B 365781c65fe4cd1a48d65f80056d5ae136c8fb81e88f80e57b5832f0424a30a5c836f8b5f0645f59ffb0e22b7d0732827f96a015699b6469a211bf02935f6f99 SHA512 5185c963f9ed00372963adc8ccf5270daa902704452fa7b2538dbff3a9be51ed860bd92407daa2199be6ff0147c5916ba744cc02ad0012605cfe4d9980f8aba9
diff --git a/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild b/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
index 1bff2bbda0d4..d2bf7ecd5ab4 100644
--- a/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
+++ b/dev-python/defusedxml/defusedxml-0.7.0_rc1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${P/_/.}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index 35a014319360..746a0709780c 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,3 +1,3 @@
 DIST deprecation-2.1.0.tar.gz 173788 BLAKE2B 444c7ff688d6eab7dfcf58ad24580b5a6df39a5749341b28d6d5b9b516fd6aa7a462d7f644e6cba596bbf289be0224968f579837c6c71dbe7b36b65588da6eea SHA512 c184665d210c6eeb3f055b23e75c3714f3b18050e03bfe1384baf6c2504f1370116ae0e8c53ff818ccc54c0d633bbb3ba5791fe20b8029f3be0207b019a00275
-EBUILD deprecation-2.1.0.ebuild 600 BLAKE2B f22ef33049e250c32bc858af3e4a8ccf69891d79e77216bab4e0e8c77e16f089a9bf75744db65511c3757d0cd63f40e0b92430ff0cc653930fb7715ad625fe22 SHA512 2c29a03316a0470481a6e5c242a073772710d77041ee78e0d23f99de4a84ec6d95e761597f1a0476dc905feedf9bb24ce20613b0fc66e4c07c28d2e6e1bb432f
+EBUILD deprecation-2.1.0.ebuild 601 BLAKE2B 9cfb932c81ac7706edc737cdc29363bacd56f9030b045f568a9a2df7f6f3dcf5b35dfcf4f30be5d52472691970b05f6db726cdfd37ef30a883512aa9b0b05e8f SHA512 b280d7482f8d3478de855ecc1b01121659c619ad86664b485c5783987133ad9ab519995b803ecfc0ce60bddf607640011b22243673604b61f3cf41f0b93a843b
 MISC metadata.xml 565 BLAKE2B 007c1977dff6e93c49877fbd0a41e12f7b59e73b12dd8cbd0ee309860195ab560b9bbb3f52b861be6742d5e8f1b78564eb69f74cf53e121e7c9df2a2e58f0f8d SHA512 89374b3c32bbf7f35e585295cfd13c50019304f2620a4b8745b20f0e37b87abc04c7fa464b9277630a723a1a0d4a6a9460f85b87c902285ad4033519e6ad5120
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index 634ee7f7c47e..6ab07e7c28ba 100644
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index c2663b5d5f2f..4f94bed061c7 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,5 +1,5 @@
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
 DIST dnspython-2.0.0.tar.gz 221903 BLAKE2B 540fb5fb12791dad6bae4007a77201092c8d5e64b7d82b23d5e3d16f48b49f73c90b85a6c8a83fa056a35cf7975ea2ad4a030f2b1fb1b87948bf1703adabb9d6 SHA512 3b38850fcacb0dd25ac0345201474f297c402617e8d706f3061c42172d697103075098e62ca0ac4e0e29967e00407f32f41789ac7bf070fba5aec0af9882e0fb
-EBUILD dnspython-1.16.0-r1.ebuild 1209 BLAKE2B 2ecc9ef86e9632288441bb4d99e0bcf81ffb4bd60a1ae4aac12dab886e9d59efcefe8d21b0cf1d0c16a0c75d71bc40a0ef78dfb77b2932cacd68ede7151666dd SHA512 cd23c352b897b8e3c39193a9893a5c99ec9987897087ebda8e011e37270a8c1d7cd02dabcd350c9d44080e3714bc8cb2a1ece13ae69f81f47f99b6ca2ccfa80f
-EBUILD dnspython-2.0.0.ebuild 987 BLAKE2B 85b587cffb12cf88c54a1583a4f29c2d6d5346968a8874c8f111ed17d38f93b91848d87b9501a47b78413b6f5bd799b29fba0e7212af764f0825a4a3b58b8cbb SHA512 f82b40f23543a702c7fc42d52ea33a05bcf958f3f4c9a48a567ed722f5cf96244ca735bda5cd866c365e28f1b7a35949d317c584982232e46f16dee5bf89624b
+EBUILD dnspython-1.16.0-r1.ebuild 1210 BLAKE2B c5f5e93d3fbfc9de2ea54283afaa5a5bcc310f8c1b58a63b79b5fb884f2a3cff4b5cca084a14369afb6978c29b61a70b6ca726a3f825fb5127da8a34d8e05818 SHA512 82f6f0191dc9e92557d022ddd274e5aae276ceea1c247a7eb63d186f4d49d44980fbf8490626eb9c6818e7785d6f47e280ca442e396670552e9ef5f0dd163ca2
+EBUILD dnspython-2.0.0.ebuild 988 BLAKE2B a70026656a37fa2875cd212390fedee095a9941cbbc7f8dc735eebed94c23c5796e9314fa0ddff721e5d9cb46a75797d7877e13223ea477b7f60506c7a3e0365 SHA512 60a5d290b67c10ba3751190033be0f04a84018cc506b1eea392cb11e4ac26040fe1438aa9d108c93bf745a881f27b460cdc9a9400f8def81fd0148dca3c69809
 MISC metadata.xml 1482 BLAKE2B ff7895525a5fc62d104bf3039aa4154d0dbd5b097b5ae213c7e34713c968077b914b7a93ea881f43ea604e97b90f68b8f871a301f136de26ef4d98f0167be02c SHA512 63892286866fa85cc0a750157b3a2b98fdf4d3ef6edf61a879548c8e851cbeaa88cbfda52eaf98f1baf80e72a4ea2ffd2ceafe9794bf9a35ef3367ae5d3c2ded
diff --git a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
index e0d43deafa96..7fc701071d40 100644
--- a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
diff --git a/dev-python/dnspython/dnspython-2.0.0.ebuild b/dev-python/dnspython/dnspython-2.0.0.ebuild
index 22c1262a3a08..102007c89e3c 100644
--- a/dev-python/dnspython/dnspython-2.0.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index f12767f01eb4..0eda6698d38e 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,5 +1,3 @@
-DIST docker-py-4.3.1.tar.gz 236548 BLAKE2B 2934410e9360ac0a0ea4a038fe75728252804c3ffc2dfb614d217a1771d6c61b50c93b1848df5c34f3bf6b6ad2fb98fc5295165c6a482895b6e7c8ef29bc658a SHA512 f82d8681edc866e73dcc0557a2be7ccfcb68e6add3cfd034d62f9639646c5d396e8e2b29df2b42006ee92adc8b432ca6a80bf2a10b54af42f33fe5ea8ed4a912
 DIST docker-py-4.4.0.tar.gz 246544 BLAKE2B d19b923499bb32f85728f88e479db330f442ddc32da06cad6f56cfff3386a020e45a0ede1afff635ce3d0e2d5e9112b0a4022969f75647eb6e57c13ef1bd6cb0 SHA512 8882a6547570d64c4cf9db7e1bd5ad13dca9a5b439631f3436587aecc1ed3386b230f9b6f82c07d9614f7d29d918ec6a3733fa6af6d8784a698e1b8459d4dcbc
-EBUILD docker-py-4.3.1.ebuild 1113 BLAKE2B 981029a4ee9d66a5ac8f386e5213fc55979bb5866a6be10aa80284eca76be1ce358a81da2aa8e5d9ad27d593ac7c615b6f7c5175641a510d1b4ef8466b4d6324 SHA512 ec2a77ca17561a6f52b3ad6973761254d690e117429f9cf695a9caa7d3f1b07285878668aa3e27baed1d472f9caa9efb25516fbb756e1bd0f873b198d432a188
-EBUILD docker-py-4.4.0.ebuild 1116 BLAKE2B 1c4acd03d9f127b01a144f99c98f3b309308ecc582543556a7c9273a072a9053cad2477a07265cdcecfebec43f86c511ff4c5557b48e4f73ad3d36bb5a20bbea SHA512 267f8cad01e4bcea796f2c0d2ef9d2aac4180f2a2a78025662946f8da706c0a37f1a03893a58744b346abfb510fd5c72b4e7ed4f617dd79c4d57ff160687496c
+EBUILD docker-py-4.4.0.ebuild 1113 BLAKE2B 981029a4ee9d66a5ac8f386e5213fc55979bb5866a6be10aa80284eca76be1ce358a81da2aa8e5d9ad27d593ac7c615b6f7c5175641a510d1b4ef8466b4d6324 SHA512 ec2a77ca17561a6f52b3ad6973761254d690e117429f9cf695a9caa7d3f1b07285878668aa3e27baed1d472f9caa9efb25516fbb756e1bd0f873b198d432a188
 MISC metadata.xml 434 BLAKE2B a6fd9237a338297a004bc72f08239cc92642aba95c590bf7f2f287c5b3d196b632998dfe5c32cf8155498df1472fc84f4d41290880b14161c8d43d0a70ed7f5c SHA512 fb6af1a1021d752928bfad27313ccbba2f09ad88249ddb9cc7db4c1f1fd591035f636eb35d79f675b5fcfb984f1d201fdd7a8d4b38cb2193abbd31f2d62f039e
diff --git a/dev-python/docker-py/docker-py-4.3.1.ebuild b/dev-python/docker-py/docker-py-4.3.1.ebuild
deleted file mode 100644
index 4e9ea6580441..000000000000
--- a/dev-python/docker-py/docker-py-4.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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 ~arm 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/docker-py/docker-py-4.4.0.ebuild b/dev-python/docker-py/docker-py-4.4.0.ebuild
index 530692235251..4e9ea6580441 100644
--- a/dev-python/docker-py/docker-py-4.4.0.ebuild
+++ b/dev-python/docker-py/docker-py-4.4.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 RDEPEND="
 	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/docutils-glep/Manifest b/dev-python/docutils-glep/Manifest
index df9a36c0d331..a348be830bc5 100644
--- a/dev-python/docutils-glep/Manifest
+++ b/dev-python/docutils-glep/Manifest
@@ -1,3 +1,3 @@
 DIST docutils_glep-1.2.tar.gz 6771 BLAKE2B ecb17f69dd2edb12d81ea1bf90789564e86b921125c20913134500dd53ae04b0962141183cbcb9bd17af904196ead2228e4c80a6e256576b715ae6323afadc30 SHA512 696412447120893c198dcd9f13e042d20b35465e83ef8b488ee2f1c184b5fd3928ddbf10ed4e78886c4c72dfe1f9fa46c1f75c7997990afcc04353b5d59ebf9f
-EBUILD docutils-glep-1.2.ebuild 721 BLAKE2B 2e55cd2f5c3b72f4f725220dc3a2e27867589561ed9b84ee835a7e8e1ca9d3142feb9cc952790166d33993c2b2f69482fec39257e110357e7f72eaa7e4a46baf SHA512 5158c8c2ee3b50cc8fa02bba2a66169169c5cc8ef42d83811cd43806fde28a3799a8b282b07645951125213deb91002266f00a595e33ba9f65d5150ed2b64e96
+EBUILD docutils-glep-1.2.ebuild 702 BLAKE2B ea9a4fbae98136b4fb24f248b32f4a2751e4b1664ab716c5158af881fd099d1ccc1c8500d263862eb78b44ddba360d6f62720b503b2472e2ef45e300f5b7dc4d SHA512 1ddef925a204e0b55d4a06c8bc8aeb4939d1a632a4ba48aaadb7384e221ef013757a01d7fea679c6bc73295c4202c255b91e84275d0e42798da4fd6f2d1d0f58
 MISC metadata.xml 448 BLAKE2B c9fa61a0dc008ae6c69241a3cdcb5240f0b2814528ad309995fb5095e1233b1c9a3f11e85a30a576055316fcf91d9fef6323baab6cd9c76606e74163c132c2b8 SHA512 57d39f1dc1333568a2efade5da3cca87a94bb56cbfb23728bcfb70e56ee4e310c92cb64dcc2e39e5be5a7d9deec57f309f593d11039b9d1bb9ce4a10c47f49e1
diff --git a/dev-python/docutils-glep/docutils-glep-1.2.ebuild b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
index d75f9afbeddc..26f206a9bce9 100644
--- a/dev-python/docutils-glep/docutils-glep-1.2.ebuild
+++ b/dev-python/docutils-glep/docutils-glep-1.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-python/docutils-0.10[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/docutils/Manifest b/dev-python/docutils/Manifest
index 03d664a43d1b..23754388188e 100644
--- a/dev-python/docutils/Manifest
+++ b/dev-python/docutils/Manifest
@@ -1,4 +1,4 @@
 AUX docutils-0.16-tests.patch 2986 BLAKE2B 70c80ad50998dafe3d26ddd0afd1d8d176949ed875ddfc4ec79687f81d6ebacbd5f06355c77ee457450515e4902f56746fe72c4773cd51cba37c9109d898185e SHA512 ea0c01a37494c5e13996c2652c99cf341cfe064365ca17dbe76a0b4b21b914a59c4ca83ab8e261f80878c22f971234478951f360df5f0fa2321d8f9bc974d28d
 DIST docutils-0.16.tar.gz 1962041 BLAKE2B 64d045d43433e944686b5d9077de0b544d49d041adf398f9b66612db432860853df4a84f4c4b44461789b3039f83e3847547062b2f5bc5d2bde3a0f1ffc9ffba SHA512 4e0c6662924cac6b8f28bb77a4f50eafd637c1083990a23dbd905d8a05362a18dae96e63408ed43b595b693ca755c7961d1282129d3215ed3774af0dddcc0466
-EBUILD docutils-0.16-r1.ebuild 1865 BLAKE2B 69a191addfcdae8b57066a5c8b3e955d4b68d35f78e55f037fdd3f680bdbb17a4c779082d9881644950f093ea99c3b66d7e5bc1d3a804a9aba9ae44084cc5728 SHA512 2f160a99e2ef97a4a854b9fced36a7ec859b513faba4a791399c3e7b232d74851638ae391f0fbd905f51c379cf0918304486561fe16c490398a643cbed11132a
+EBUILD docutils-0.16-r1.ebuild 1845 BLAKE2B 38bde16c34266fa25e148725cd195c3f5c16f5364823b387552abfe95daad3c84df6d41649e9d67442b776b503b15f38a32b536c24b68ceec717dd8e7fad5671 SHA512 6535213e53136e1f7b3866973334d8631db7c74ddd06c9f4aaefd417223cb84dc74ab7a856a33bedf80ec8d8305c997cd22f67d3eca3fb246c367c419a99d7d7
 MISC metadata.xml 388 BLAKE2B 0781c1ff7eed3e16515aa155bad0f9bb80714c7297eab6840de07aea41d496f94d7c59db363518f914ce13b54cf2c038ecd05b86f6823df58ed01070b46d4775 SHA512 e977e1b753d903ded926f251b30443e07d3080bb33be1e7e66bf2a80e4d81da1fdc2bdff12e6cdb1a1746019adca4c3901f59daa816588301be42a85709995c1
diff --git a/dev-python/docutils/docutils-0.16-r1.ebuild b/dev-python/docutils/docutils-0.16-r1.ebuild
index d650f51f93f8..882cb1f63356 100644
--- a/dev-python/docutils/docutils-0.16-r1.ebuild
+++ b/dev-python/docutils/docutils-0.16-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 GPL-3 public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 569600979045..ba6ce0fc4abf 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,5 +1,3 @@
-DIST dogpile.cache-1.1.0.tar.gz 365988 BLAKE2B c21b52d23566a9d1b607374a77e2b7cc0ff0705d02cd3fddee1f6110555cf082fc9e516ba37e8ddaf7c70253dd28301cc89c3d3ef5405728859263e2a763608c SHA512 48627e4124bd25678059985c49ffde75d49d987c429d1e9a02ddd60a77b20e41899da30ae78e0f2891ff76a9c3d72a6ec782e829d659c3048cdbc921022ebb55
 DIST dogpile.cache-1.1.1.tar.gz 366464 BLAKE2B 95887bd73cce4cc8b017cee43182d94efeacdaa91ce94907e18c0e9a762065abb334866bd592f5e2010eb07fd33a049e330b4b925a4c9d8e14e22dee5f802446 SHA512 86d5620c746e48fc596137cdba85d91fb65def9f9dd13f85bbe5d9411db257edfcf119b8787673aa37efb965ce2895063906c1518c8b432af8b0ac16cec7941b
-EBUILD dogpile-cache-1.1.0.ebuild 726 BLAKE2B 94a98f15a1e87c3258165c6dd6b8b51fb09d9deaa14bba2dacfe78fcd60ccb34722d1a02a6e46656ba78999770c5cf91fb24d201075d90b30f42cbdbe1283347 SHA512 77698e77945ab4a0f06115952868110ae89e92c5188ab1cb5c85abed57c03bd8f7cc6c0d3b5cc75aa26d3c507c3a877537ace8b552abf4d2e432a0999cd5b6af
-EBUILD dogpile-cache-1.1.1.ebuild 729 BLAKE2B f77e2effa36a5532d502f70b0d1adb0d32f8751a0199e4f11b73a2524810550727ba9142f37a362694efb39f14057bea743e5115ca60c575161ce586c4dc0c26 SHA512 8ed601c58d23eb61b77aa6a0f80f768d48347906df2f1851b4fef1f3a1a0949e3da2ffb6e80653eefa8a3de8437db7df48bef7fe72cc1b2b495f37bf8aff90b4
+EBUILD dogpile-cache-1.1.1.ebuild 726 BLAKE2B 94a98f15a1e87c3258165c6dd6b8b51fb09d9deaa14bba2dacfe78fcd60ccb34722d1a02a6e46656ba78999770c5cf91fb24d201075d90b30f42cbdbe1283347 SHA512 77698e77945ab4a0f06115952868110ae89e92c5188ab1cb5c85abed57c03bd8f7cc6c0d3b5cc75aa26d3c507c3a877537ace8b552abf4d2e432a0999cd5b6af
 MISC metadata.xml 842 BLAKE2B 563cbf5028020e4afaf810c0b47b98c9e4c44cece6ca57575e91d76014f25892306bedf1812df08634001fc099d26e83288874e2f9274d09dc523d53775a9d46 SHA512 9640c0603ffeefe661427c6dda9fbb2c1633693beda0da39afcd2f8a2cbdb6206cae75228d692a1ae11352306aea3a9fdf602d0cde4324d21642825620e20176
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.0.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.0.ebuild
deleted file mode 100644
index 3fa5327b33c9..000000000000
--- a/dev-python/dogpile-cache/dogpile-cache-1.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=7
-
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
-HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
-SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
-S="${WORKDIR}/dogpile.cache-${PV}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
-
-RDEPEND="
-	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/mako[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.1.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.1.ebuild
index b7c24a92cab6..3fa5327b33c9 100644
--- a/dev-python/dogpile-cache/dogpile-cache-1.1.1.ebuild
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/dogpile.cache-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND="
 	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index 6fb876de7ce2..a03570df5924 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -1,5 +1,3 @@
-AUX doit-0.32.0_pytest5.4.patch 2862 BLAKE2B 3a3859fc2a5a2c0f533a3c4a300744d5c4b73edc9b255f54267c6018218c393478e2feb6f43874250ba931effeaa576cfb38cec5cb7f934031071744c0d3b2f0 SHA512 2f4d251970e042adc631a9912705a0f97bd693f5cdba3e89fcb912c91f881c2c57665bd32a28630053fb1e9c2ebce022b40974a303c5e808ae0d2008f07c3e8e
-AUX doit-0.32.0_unpickable.patch 1371 BLAKE2B c03d757a99e44bbf7c7dbcac84295e7514055921d2c3a12bb3fca2fbc7e8320c8be450a5c101d39b51b8f0bb7fa1b1faa3c58a455ab5c27a68f6e03a70ea9763 SHA512 2d17f32876897a6b73ba7936eade594a0a40f38a27d08e14603f3aceb9b36426d810e0dc0b13b385c8e4cab830976637ed4462014dab7202226d3bb3f745cc8a
 DIST doit-0.33.1.tar.gz 1436620 BLAKE2B be294246447d36011274d57b5300b4451847751f228622bcd5a45f91367371ed5dd9c40a2476e558be8137b16fefda4bf6f1795108d0c982990abc62db5560e6 SHA512 852efa3b770ec5de7def1fad1167b8cdce1de7435b2ba5e4af43a84c84df0cbf960d8d5c4c9f526f303d19c7536f745c2c7700daaced984ec86fb4202f894170
 EBUILD doit-0.33.1.ebuild 1284 BLAKE2B df89fc3b29adce859623eeb1078eb0cc11fd287c50da68ba45e3499ad039af97bc7463c6024fd333382bde6b1e82ab4ecf24e4848d286425a863cd46ac4c4d5e SHA512 910595f456fdd996d2a82bebf72cdf042a85baccff109fbb52442aaefc1daba4ff1149981b74af4084e036a8c069e80c65bbc06c078e0bc25cd571b1b2b261fc
 MISC metadata.xml 537 BLAKE2B 14f6b2a75d51ca56c61e5700fd7787cb6653722ace4de42510ba1c781523a2050793398d2832aaaa92d87c04ce1f30ba86d0fc2c976ac2d1cd0e0ae5fad8da99 SHA512 fe7a8bfc06411b14d6df95f79c46fc66b68a4c9db0f15a63ece8c905a5dfcc67ef0a1a5f5af09ba0bad80317b93c2336fe788cdf6d390d344e1fed6ab02db889
diff --git a/dev-python/doit/files/doit-0.32.0_pytest5.4.patch b/dev-python/doit/files/doit-0.32.0_pytest5.4.patch
deleted file mode 100644
index 58dd154859cb..000000000000
--- a/dev-python/doit/files/doit-0.32.0_pytest5.4.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 159b7baebfefeacb443f55f2d12cbf0876628cbc Mon Sep 17 00:00:00 2001
-From: Eduardo Schettino <schettino72@gmail.com>
-Date: Wed, 22 Apr 2020 04:48:36 +0800
-Subject: [PATCH] fix tests for pytest 5.4
-
----
- dev_requirements.txt     |  2 +-
- tests/conftest.py        | 22 +++++++---------------
- tests/test_dependency.py |  4 ++--
- 3 files changed, 10 insertions(+), 18 deletions(-)
-
-diff --git a/dev_requirements.txt b/dev_requirements.txt
-index 1e31e4f..f16ba86 100644
---- a/dev_requirements.txt
-+++ b/dev_requirements.txt
-@@ -2,6 +2,6 @@
- # $ pip install --requirement dev_requirements.txt
- 
- pyflakes
--pytest>=4.0
-+pytest>=5.4.1
- coverage>=4.0
- doit-py>=0.4.0
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 5c4da9f..9eab396 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -78,12 +78,9 @@ def remove_db(filename):
-     'dbm.ndbm': ['.db'],
- }
- 
--def dep_manager_fixture(request, dep_class):
--    # copied from tempdir plugin
--    name = request._pyfuncitem.name
--    name = py.std.re.sub("[\W]", "_", name)
--    my_tmpdir = request.config._tmpdirhandler.mktemp(name, numbered=True)
--    dep_file = Dependency(dep_class, os.path.join(my_tmpdir.strpath, "testdb"))
-+def dep_manager_fixture(request, dep_class, tmp_path_factory):
-+    filename = str(tmp_path_factory.mktemp('x', True) / 'testdb')
-+    dep_file = Dependency(dep_class, filename)
-     dep_file.whichdb = whichdb(dep_file.name) if dep_class is DbmDB else 'XXX'
-     dep_file.name_ext = db_ext.get(dep_file.whichdb, [''])
- 
-@@ -97,18 +94,13 @@ def remove_depfile():
- 
- 
- @pytest.fixture
--def dep_manager(request):
--    return dep_manager_fixture(request, DbmDB)
-+def dep_manager(request, tmp_path_factory):
-+    return dep_manager_fixture(request, DbmDB, tmp_path_factory)
- 
- 
- @pytest.fixture
--def depfile_name(request):
--    # copied from tempdir plugin
--    name = request._pyfuncitem.name
--    name = py.std.re.sub("[\W]", "_", name)
--    my_tmpdir = request.config._tmpdirhandler.mktemp(name, numbered=True)
--    depfile_name = (os.path.join(my_tmpdir.strpath, "testdb"))
--
-+def depfile_name(request, tmp_path_factory):
-+    depfile_name = str(tmp_path_factory.mktemp('x', True) / 'testdb')
-     def remove_depfile():
-         remove_db(depfile_name)
-     request.addfinalizer(remove_depfile)
-diff --git a/tests/test_dependency.py b/tests/test_dependency.py
-index 3fc2a14..f84e002 100644
---- a/tests/test_dependency.py
-+++ b/tests/test_dependency.py
-@@ -68,8 +68,8 @@ def test_sqlite_import():
- # create a separate fixture to be used only by this module
- # because only here it is required to test with all backends
- @pytest.fixture(params=[JsonDB, DbmDB, SqliteDB])
--def pdep_manager(request):
--    return dep_manager_fixture(request, request.param)
-+def pdep_manager(request, tmp_path_factory):
-+    return dep_manager_fixture(request, request.param, tmp_path_factory)
- 
- 
- 
diff --git a/dev-python/doit/files/doit-0.32.0_unpickable.patch b/dev-python/doit/files/doit-0.32.0_unpickable.patch
deleted file mode 100644
index d96da6cd73c6..000000000000
--- a/dev-python/doit/files/doit-0.32.0_unpickable.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From df4dc1c6a92d9f50cfe7f56d9507eca5bc56870e Mon Sep 17 00:00:00 2001
-From: Stefano Rivera <stefano@rivera.za.net>
-Date: Sun, 2 Feb 2020 13:02:58 +0100
-Subject: [PATCH] Replace recursive knot with explicitly unpicklable object
-
-Python 3.8 was able to pickle the previously unpicklable. Instead of
-relying on limits, let's raise an explicit error.
-
-Fixes: #341
----
- tests/test_runner.py | 13 ++++---------
- 1 file changed, 4 insertions(+), 9 deletions(-)
-
-diff --git a/tests/test_runner.py b/tests/test_runner.py
-index 51c8a61..a9029e8 100644
---- a/tests/test_runner.py
-+++ b/tests/test_runner.py
-@@ -577,17 +577,12 @@ def non_top_function(): return 4
-         t2 = pickle.loads(t1p)
-         assert 4 == t2.actions[0].py_callable()
- 
--    @pytest.mark.xfail('PLAT_IMPL == "PyPy"')  # pypy can handle it :)
-     def test_not_picklable_raises_InvalidTask(self):
--        # create a large enough recursive obj so pickle fails
--        d1 = {}
--        last = d1
--        for x in range(400):
--            dn = {'p': last}
--            last = dn
--        d1['p'] = last
--
-         def non_top_function(): pass
-+        class Unpicklable:
-+            def __getstate__(self):
-+                raise pickle.PicklingError("DO NOT PICKLE")
-+        d1 = Unpicklable()
-         t1 = Task('t1', [non_top_function, (d1,)])
-         pytest.raises(InvalidTask, runner.JobTask, t1)
- 
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 9bc02e20f7bd..39d0d9231339 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,3 +1,3 @@
 DIST ecdsa-0.16.1.tar.gz 126935 BLAKE2B 84e04c0afe076c009a88f7ef1a0193329e3d4945e34c752b869cbf449667c424341fae7da2e7c908b773c6f4ab495d29dd40aa3a9be35b0c03d315ac330dc3e0 SHA512 935416ff25a71b1e6fe442b11e8d2c1463b1652d539274e094112a4847c2c749ff58eb9f5ed108ed5613b7363d3f2b1c07ba3d01af8cfed4e1b4bec407d3f5a6
-EBUILD ecdsa-0.16.1.ebuild 794 BLAKE2B 4b767e77d9cdceadf2c1dd2e8c7239ea25258d6bb633e92988f1499c4a40ecb7269338203bfc38cc4652649280d55444c4c7d9a4fb2bf448161c323157301320 SHA512 691a95a7f53ab89b0d8592968858fa1dc1628f1e5480678c2e716dd9fe0864715cba0a10f31cbba5c932bfc511aa97870943d2546993a5c35c38b28c72587e9c
+EBUILD ecdsa-0.16.1.ebuild 784 BLAKE2B db709ea5a02048e9f770907a91b0281612e5337d8ad8ff150224b3be04d0af886a4df9714933563d792e1c614337f288f70d3a762137cb02837cc9e956fec31f SHA512 4c3c65af1aa05c2056f8e74857d20686b6cb9233f6cd2947af8c5cf9fd61332ae8bd9af5e5eda9f0ae7521d5c03f7422c9c51a744694b8f6eb3edd6e8ab4155d
 MISC metadata.xml 407 BLAKE2B d98041dd8990a7022e91da42ede0427fef163b3ba1635c98e3c671a4962e5ad027797ec3b843ce3699f15b38b46b55d14544a85aed17c4826fc327edd73fe826 SHA512 24ee11b3314fa4d3da1e8f0d886290a9a7c1db776b32a618a702e72f0c1f9cd13cbfd64f7699cf3209ab90621a71aa9876ead8f916507dd9128ae03e169c3770
diff --git a/dev-python/ecdsa/ecdsa-0.16.1.ebuild b/dev-python/ecdsa/ecdsa-0.16.1.ebuild
index daa308058adc..051613560de9 100644
--- a/dev-python/ecdsa/ecdsa-0.16.1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.16.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index fa67d2b6ce7a..7bfe69aef747 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,3 +1,5 @@
 DIST executing-0.5.3.gh.tar.gz 303234 BLAKE2B cb9de0492c4aa31b53310abf65d97df888278671fbf24e5dc2f3f4b00fd22d233fae2265bffe240c092c5b67bfca1e69ec1c4eaa937a0d4c90bedced1f156e2a SHA512 faf591de8e6354300fb572065bda304c3cbc529725b4044ad4f4ca1f86d892da21598ba7245059824e27894937d46e4ef9ef5962a9d7dff78e4144a3e0e6b388
+DIST executing-0.5.4.gh.tar.gz 330687 BLAKE2B 10f526dfb3a9f72dda788af97547e011425a56d1af73c30f5704fb8d348beb4e4538e118355dd415ec6125507ca9b2b015c02dc0bd81a2ef732a60aafb89f12a SHA512 3953ee1f6667c32fea28f964b395d53e99fa7869e27495a241f70179577865ec430ddfa07776995b6b1aaddd660adf6c6b61a8e8931589c0faeea94743fbc209
 EBUILD executing-0.5.3.ebuild 1073 BLAKE2B a4a3da165439df3b2c851d7683fa8a5179b39b291c3b23c3b6997c5797b72ec3964a1699f0be41016931dfe86e8f22ff901a7209920781d8cb9ae9d08b99ac4b SHA512 78b93e2537ba57f8d95c126cd907db9e556ec7b902dd648d562af503682161647ef07da2e0000813f885726ae4c8a4b335e79fc3b6140f09f53ad3a1359f6941
+EBUILD executing-0.5.4.ebuild 1077 BLAKE2B 6389b34cb94312f5d995d06c43e70ca6ecd9249aa6b66642e3bf9c405d234cd12cc9e0ae912faab1ee674654b20bda1804d8701b7351a118a1073e77037a630f SHA512 e97e2a0ffbf94ba1c25bf0f4e8d72e0572c1d043193c372d2cba6521d25bb0048ce765bafb68e8f3a97081c9d5309fcf939202abf46985fb28b5d36b83da1579
 MISC metadata.xml 350 BLAKE2B d128d36a837974853f5e51c64b03ca8eb749eaba54e5049033153e1c3671eef5a91490855820a47ce718f28e2aa45dd9d26df75e81fd923d7f119d546b6d9b61 SHA512 ff4ae4abcc417476ba024f7e9ff8f8de8c57d70f34c36bd2a4adae498c01489c16bf315ff174616ac9d65de3431983c35da66edae60668c9e526ada2a026555a
diff --git a/dev-python/executing/executing-0.5.4.ebuild b/dev-python/executing/executing-0.5.4.ebuild
new file mode 100644
index 000000000000..bdeaacb0be41
--- /dev/null
+++ b/dev-python/executing/executing-0.5.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 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="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+# asttokens is optional runtime dep
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+src_prepare() {
+	# Kill off useless wheel dep
+	sed -i -e 's/wheel; //' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	pytest -vv tests/test_pytest.py || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/extras/Manifest b/dev-python/extras/Manifest
index 2623759126be..0ed0fd5f53ba 100644
--- a/dev-python/extras/Manifest
+++ b/dev-python/extras/Manifest
@@ -1,3 +1,3 @@
 DIST extras-1.0.0.tar.gz 6759 BLAKE2B 341bce7f172afeb9e2a5179ab392d396920dc8ec2b9a6e734daf8668c7f329d9a64de6f3f90b70f8e42d5e111ef196315341c0bb0f347f13ba4974d970695fac SHA512 510c796628f28db90bb96c7c9ba5fc9b2b950d2968e219efe67f3899bbe7ef68fe5de1494f8fd640f13a1ccd329e7dac9cd38aa965ab1e07c4cd287c04da50fb
-EBUILD extras-1.0.0-r1.ebuild 679 BLAKE2B ba6c36fd06ad73c53106f8b9a7c6233f33c59caf59de24a1a86fc5f9a481183b48396333ecf97ef6ccb2666874e59c0c958a9d6a4ef683e27d5221340e670532 SHA512 fb72b90146a6a165e637b43cbae0efea934ac9e633c907567eaa387a6d612d07df02811b79d14e776bc6965796dad746776c0ba7858ffdc9b835a1f4834d77c7
+EBUILD extras-1.0.0-r1.ebuild 680 BLAKE2B 0fcc07a8a31e3e09297b66d53c0378d2f1200b8b76571a8cdc3d5b06a01b824013b5cf0be37b652b0fc13e14bcdb57bf828c99cb1bf9f7031e4ad6e4dada75b4 SHA512 8a524258ab6f25a33aa3a752f957161485101c8e33a4355e1163c044f059d6f099df4db8db494a2d4acf047670dfd08a97313166c513abda8870d74d6bb6e183
 MISC metadata.xml 381 BLAKE2B c7f141d44f01d1f5163cf4f55c03f5a939f575297bfda8a6b5c59442372314cc637cd83f1f0b2fa4c21f70266bebb5645468afad0d747f8e15df689751b89545 SHA512 bd91400e2886a9f79e973f16fa5a84c6b3d38a3fab45db89bdc5f930e7bd8adff02fddbb9f8fcc72199dad32881a355b046c5cdc2c16e679a46c1bc9e08c3e02
diff --git a/dev-python/extras/extras-1.0.0-r1.ebuild b/dev-python/extras/extras-1.0.0-r1.ebuild
index 110cfb6465b8..851698e7b273 100644
--- a/dev-python/extras/extras-1.0.0-r1.ebuild
+++ b/dev-python/extras/extras-1.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index bc5de07afe67..df3d288d9a81 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -1,6 +1,8 @@
 DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320edecdf07d1d2af3b5519f0c884c8cef146b124fd172d74626f70af2b689dd536ade1a68ed27fedff840513ee SHA512 ed147fbe6ce88319cdbfc752e1ddbcb141180bdd87854c209c621956bc52395c5ba442d929016419620c0b230f5b8a3e1fa638b73c7cf329405425148f953c9c
 DIST eyeD3-0.9.5.tar.gz 222657 BLAKE2B 3932c1b07e0961773a1cccaebec116c3b51a8c4560850661e8725efb3f4c5716b43ba610e35a2682f94b0e3b72513fbf108ffbc8c436a52977c308ad82e59400 SHA512 be89a2070b8cd5d70b25ff24e508c35e4e0ad20bfbe7bc91e4119614c1359cbc7a4ba812066b608f310abfd027d34b7bfa13f9dae8f3ab54f3ecfc9ce47c07e4
+DIST eyeD3-0.9.6.tar.gz 250445 BLAKE2B 11f8bef4b17af07f08144e922634e4c6e467bd8856da9d445a70006b5bf32d442a52e234845a3f146129403fcc16047cc759102b93c433a0466bf0afd9576230 SHA512 0c993e9bf0a27ca41a8a2964a3347a6b0ffa472f833b3dada39ae09a5a2b40e0afb6bfd8c0ea5ed71d3dc2bf3cd062c1fb5fe79abe6ad867221b779786247173
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
-EBUILD eyeD3-0.8.11-r1.ebuild 551 BLAKE2B 2e420d00d88b35f98a3dddc45d4e0a0301b0ff27aeff09cb7a49631a60202a6259569e3a2338626228c8dfc80302cc74870fc6f5f8553d530d3f72ab8552f581 SHA512 21a8cdb3a35b2861e309c61d5c9be61f247d72875cd011fec745d1ae78e618274caf2f4465a3aced962b39a9697ad0722934500fcc00b5dd2fd3e24077eaf9ba
-EBUILD eyeD3-0.9.5.ebuild 1228 BLAKE2B 7c43fb2c6481785f7970b6db60063e6988ad1cb7d918d096e3240419725053829a5498e27a404527cb115de176174a23e480e925bcd12f4a3b0b60c7f731383a SHA512 39dac2d29e7d1148d492674876d5481501da373fbb2820af4d4f753dcf2c9b05e73ef1e13405deb2666498a9992a6be1f0b7cea933f6d22cb4cee2e2e14dbdeb
-MISC metadata.xml 422 BLAKE2B b8e4ddea71156c634ca87bd24654a084283becb2724cd427dc24e8bd3b4753e413523684f88fa6ceca7923fb27f7df1620332e2ed50c9fd071e2783212426158 SHA512 45f20846e2b377dc1433c97c09f82f9b94d00de58252307cff4459a8ed820cc5c5ea5bd6bc674bd0dd39b9f6b91a4e49e65e682b32100502ef61ff78b18fc313
+EBUILD eyeD3-0.8.11-r1.ebuild 552 BLAKE2B d775e0519801851b92589eddd8cdccc7d20a022e95d99535b374f0c7d7fab6cc8d5aeaa3c23271291a2cba650f5a9da39f24434a4ed71525743eb443076a8685 SHA512 2ad2ba1733f2d4fae889b220208065d28f0eba45b9d6ee1002f9d755b682ceeda5201149feff6a3ee00796b39b79ee38f0cc2479a40a63837a0e980d1696e39c
+EBUILD eyeD3-0.9.5.ebuild 1229 BLAKE2B bbf8bf885b242caf5eebdd2fdf5b716e1fb0f59d27473a8d26c8b90eb0eb0037f8231629b8b0c612139f46c79c8daa3830f8e3afcb2f999e33ea0994f56bc1af SHA512 4e714d82d923afbdaff4ac82a09b6e522cfc17a5f631cb2eadebd3d9b804fa2da5df09ca09001791f84c5caadc6df93fb261dddc70babb5bb232d28dcd13cb25
+EBUILD eyeD3-0.9.6.ebuild 1236 BLAKE2B 1862b24e1bac50b415041546622fe5f31315bc0376d45301278ddc652f95b9d81345d48b7e9442979a6cf79bb3ff09c34e17ad0eb4b99962758733b2590489d1 SHA512 252971a52fccfae1bf64ab8a511f6c5f2a2ae30a837dc18266e0f54c9c8bf00ffc63742e2e07b7f8d61ce923ad22c49364e0f63b16dea526a2619ca5e30373dd
+MISC metadata.xml 474 BLAKE2B 3ad8e18743ea0332a57b1cd8a4d0ef50beae58cf94ab8796abc64e5c02b1c4a7335b9b14de612ee3334cd11454c1d67bab63a49873aea7f457be1633fcde3205 SHA512 38d9fb375079476f9db94e0abe5f48289c852fb09de4ca830b0ef19488c72db8acbf6b94c51753aad0b5848a71f191fa4c2e05b065d6c3fc216ce4cfb6ef239a
diff --git a/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild b/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
index 49dfff1428e3..070348e5594b 100644
--- a/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.8.11-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]"
diff --git a/dev-python/eyeD3/eyeD3-0.9.5.ebuild b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
index 4c70997e0137..61bdbd2adb89 100644
--- a/dev-python/eyeD3/eyeD3-0.9.5.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="amd64 arm hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/deprecation[${PYTHON_USEDEP}]
diff --git a/dev-python/eyeD3/eyeD3-0.9.6.ebuild b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
new file mode 100644
index 000000000000..3196362443a0
--- /dev/null
+++ b/dev-python/eyeD3/eyeD3-0.9.6.ebuild
@@ -0,0 +1,46 @@
+# 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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Module for manipulating ID3 (v1 + v2) tags in Python"
+HOMEPAGE="https://eyed3.nicfit.net/"
+SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	test? ( https://eyed3.nicfit.net/releases/eyeD3-test-data.tgz )"
+
+LICENSE="GPL-2"
+SLOT="0.7"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	dev-python/filetype[${PYTHON_USEDEP}]"
+# note: most of the deps are optional runtime deps / plugin deps
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pylast[${PYTHON_USEDEP}]
+		dev-python/ruamel-yaml[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# requires unpackaged factory-boy, doesn't seem to relevant
+	# to anything but eyeD3 usage with factory-boy
+	rm tests/test_factory.py || die
+	# requires unpackaged grako
+	rm tests/test_display_plugin.py || die
+
+	if use test; then
+		mv "${WORKDIR}"/eyeD3-test-data tests/data || die
+	fi
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/eyeD3/metadata.xml b/dev-python/eyeD3/metadata.xml
index 0f50ed7380ba..0171f487730d 100644
--- a/dev-python/eyeD3/metadata.xml
+++ b/dev-python/eyeD3/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Python</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="pypi">eyeD3</remote-id>
+		<remote-id type="pypi">eyed3</remote-id>
+		<remote-id type="github">nicfit/eyeD3</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/feedparser/Manifest b/dev-python/feedparser/Manifest
index 27bd99eab8ff..26b34aab4a35 100644
--- a/dev-python/feedparser/Manifest
+++ b/dev-python/feedparser/Manifest
@@ -1,7 +1,7 @@
 AUX feedparser-5.2.1-sgmllib.patch 2748 BLAKE2B c7b4ce987f0067020e996134379ff0d30b151fc64a85ddf8a66748d118d748cc3552c2a889e3621c90221c37d1adcf8668e2e417566a6059a4a272ce1c3323cd SHA512 3ef63206b043179f5a09cf1f3d5256aed1ae0c559b99fc0ec4c1de756dd678af8a7672673f864f72c8162705056fb0011ff19b39debfcbd0faf402804869f681
 DIST feedparser-5.2.1.tar.gz 252956 BLAKE2B 182ebefa8a44276e758f277c203c28b274c580b667b039e4fc6ed9bd059b15e35e775e9efb784a97d712dc57e7b176ff91d6e094ddd225735f4315ffa770ae83 SHA512 1fd0c4324e2eff8ef4b15e3793c767290bca562af4a5056fdbdfa12411095530c87a113bb1b9757e532ff63aecb399b18f1e6b753884798eb6b8d3fdf575af81
 DIST feedparser-6.0.2.tar.gz 251508 BLAKE2B e571bbd1a26ff06536ce3a134a5f91ff2cfc65ef7074ba7d1e17f4ed57ba19f8db395991b0a8137f9a7db931d4bda2a8a9157588ea5764ffde3bfd0616c71a35 SHA512 8ffcfb2934070ed6f0fc1a3b3d7c6a055c8c8e29dee8d56fa489832b71b94bc70dd8c8360061a103894ea9a80c6a91a6708da16999e36619092674ccfda36a75
-EBUILD feedparser-5.2.1-r1.ebuild 1131 BLAKE2B 3e7d9ee086f5c5871e8076b445e3d7954d90ccd832c0158cff4dd5d8b0069f729d1efa32f8d7789f7945af907a0843b5ddbfa47d9560e9ed26033c47f1797e62 SHA512 1369270bab97899853fcc7625b8867c0db6a9285c9955f4517154436ee2fa3c9176b55a9a8bf85a6fa1bb7ac8980db621cd97e10ac2f382ca15c249a3acc70aa
-EBUILD feedparser-5.2.1.ebuild 1194 BLAKE2B 8fa165bdf23171244f6d0fb6fdf2cb296c06515296150cee3a871ad09c9825a476802d176935f7eb459d130f7c0c43a4a4774ac8d913004bc63c960db25dbb6b SHA512 90b24aa7ffd61794fa22a9d530f7ade3aec69cc8f330a9f1979f6ff302aa2a6c94b5897e0e05ae7671b86dbceea9b63f540e221bc3d739d366192ae45dee77a4
-EBUILD feedparser-6.0.2.ebuild 893 BLAKE2B 21b4df6b21a24d54ae9c6392cdec404fb664dee11f365871670c78f066e82ca82a8f11462d4de3e9a92df31427887ebe19753696ee3ca561781c0ef78f3be721 SHA512 1dfec37a2a8be9a53f9abb94f8e80457f265371f4267449e724a6637e82b896e3319a1f905f8e94a1b7a35338b00abb29091c38f37532ee64b1551bfd3b0dd7e
+EBUILD feedparser-5.2.1-r1.ebuild 1132 BLAKE2B 97ce7854bc790949f4acbd033f8d1cd9b486828ca9f14fc6e65f4bd96c5d2145d135f58bd9fb64b8e80ae5af83a1ef817e6e2977cfd1dea0d269dba0344aa3de SHA512 0983408a01c311be7611bbeb7b1ddcb47ec44240529ff1a0e0fa8c2b6cd090c6b86f74d7072a7780fd96501a24a93a26c7e31cd82b29b82b21230d376b4efee8
+EBUILD feedparser-5.2.1.ebuild 1195 BLAKE2B b2d99e9a54eae138e9eb606a5f4620b6052c088b7fcd3592644dd6fbd09b571f471ed4b6655224e5d850cdcd1c1c45c523e37760571289727c49ccb7559484e3 SHA512 8e49ff096dee6f25fefc5d8f509aa2084b310cfb3265613b432ca2fbb39f7cedaa30f34881f3417ef48af82f963d32db109df8be9d91410d46fc95e4a458e12a
+EBUILD feedparser-6.0.2.ebuild 894 BLAKE2B 800b6283d2756008fd67ea405da74abb741ce952b18837ace9f0124477ffeea840ac6b224d91d7124515ece2d3ed7221ce602739caaf6e8309b140a7024aa1cc SHA512 7af50dc676faaf0737f0ae95df6bdbd962efda7b8967e1e64dba3373011940e6b4d9627be2d15f7f774d69976f8e54288c7039f9447ecd07172603679e3cd785
 MISC metadata.xml 467 BLAKE2B 99c83112b5515f5fd591bedf71882a7445b064cd44dc1e8f6fb2654d31582ad310cf796e36cdb8e093ea80a8546dc34fe263ae1a77e34f56db968f174c1e3e6d SHA512 80c5b4647324ece6c83e748e8eb41002403308f75397f643a95c8c9f7682074a66256d0bae04c6a4040ce6d0c3bec564d2496aec15647bf5447b49c8917f2db0
diff --git a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
index 6845512fe6c6..3429a1f279ae 100644
--- a/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # sgmllib is licensed under PSF-2.
 LICENSE="BSD-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 # Tests have issues with chardet installed, and are just kind of buggy.
diff --git a/dev-python/feedparser/feedparser-5.2.1.ebuild b/dev-python/feedparser/feedparser-5.2.1.ebuild
index 8a73635dad4b..ed58ad264554 100644
--- a/dev-python/feedparser/feedparser-5.2.1.ebuild
+++ b/dev-python/feedparser/feedparser-5.2.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 # sgmllib is licensed under PSF-2.
 LICENSE="BSD-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/feedparser/feedparser-6.0.2.ebuild b/dev-python/feedparser/feedparser-6.0.2.ebuild
index fc81a0fea88e..2b6ee9043ff7 100644
--- a/dev-python/feedparser/feedparser-6.0.2.ebuild
+++ b/dev-python/feedparser/feedparser-6.0.2.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND="dev-python/sgmllib3k[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index 76ca883d4c81..dda9bc5595e8 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,4 +1,4 @@
 AUX filetype-1.0.7-examples.patch 824 BLAKE2B 1e3fe9e72a422eafa45f35b43d04bb0cb1d4ccc379b7a318b6de33924b3e4139ca3e6c6efe529da5d99e4cc4038b818f4edae38778c9b9f7e0e0fca740b5ffec SHA512 9d5171016461f65330d4f1e6c985d1764f1ee8a173529e35d4abebbe98a7a3ccf920752f4baab8b3c6fcca484b59043f0338cc7c0b3c319948399781eae31e7c
 DIST filetype-1.0.7.tar.gz 666636 BLAKE2B 3abc1cc3a94b3ca8c91b9b43909522efa18736c826f8f45990b3d7dab18047476f05b259108290bf7383e4df82a63def4249c0d52ae313b0dc23d377bb5369d8 SHA512 8d81261082a5765c2f96b587cc8372ec2e7347536f3e76c1f4c17f10011fd1808309ceaf55923f0e063f379cdd253020ce651a263b9535a9d16375f07dc8ec92
-EBUILD filetype-1.0.7.ebuild 528 BLAKE2B 80f473c85eea0657b5f1efe45649c421004a2ca3cdb1a9678f0f3b3a682f20210eb3c09378318232271ea152cdedea78956f282e23fe51bf9563deb7f204c890 SHA512 5d300b2e60d85cb7e32e46435174ed862a72db5909fd43978e24b113058b77d0ef189ce398c3ba1c14301f1db81ec67d4a7f1d3e475995ebf0df33b332591f93
+EBUILD filetype-1.0.7.ebuild 529 BLAKE2B f236bc866504c00b4124e0b62fad4bcdaf323d28aa26bff9fbd2b11740441e0741422b77774656be32e64360f5436a005d5c1316a6ce6d4bf5717bc9178cc5f1 SHA512 38a2cfc1071e10feae6d1bfca2aeb542a14d9e99718e90bc628f635d308ecfa460d6046858c26af4ce241951f2415433c5cb0db46c90fc752213ae31b71d8d47
 MISC metadata.xml 477 BLAKE2B 6dbd312736921b69409b7fb9958069761814babf275ee8f27119fae412a59b13085eda8bc2075d4b1b0971b9662a8d7e1443f6ade74d644b109eb51df1d507e4 SHA512 e44e28a04f1a024d76a6a880eb0efcece6e9b5bce30fd1715dbcede55734412287ca810c42559470bf835705855e76c2c24286351ec53ed068e9b33932cca92c
diff --git a/dev-python/filetype/filetype-1.0.7.ebuild b/dev-python/filetype/filetype-1.0.7.ebuild
index 43798d810c36..3d833335e8a6 100644
--- a/dev-python/filetype/filetype-1.0.7.ebuild
+++ b/dev-python/filetype/filetype-1.0.7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 PATCHES=( "${FILESDIR}/${P}-examples.patch" )
 
diff --git a/dev-python/fixtures/Manifest b/dev-python/fixtures/Manifest
index 467f92b0fc42..d74386c728d1 100644
--- a/dev-python/fixtures/Manifest
+++ b/dev-python/fixtures/Manifest
@@ -1,3 +1,3 @@
 DIST fixtures-3.0.0.tar.gz 56629 BLAKE2B 949c67c428f5e5ca0afc2f875dd4e2a212922415762a2528c185794e4ae2b74d32873aaf7132d97dec95a681bb4d87d85b11a39c43c64cd531dd4bf2fce75f87 SHA512 e52ba864c42d15a8baa60583761006b2dd78e3cd5f3f043f5702346aef428b933d62e8fa5889b7cb4196e4072acc5df3b7ffa39702a1b782887bdc109299b695
-EBUILD fixtures-3.0.0-r1.ebuild 1143 BLAKE2B 74e1e4647021530af2ef0379ba59f128e2898124a116c3c59f28ef692c3aaafa3af69bcaaf831859faaa03346c90213f41e3b7c725eaaa8af32b37bf3601fa65 SHA512 7acc2564d369ee7915062eceba44e82b2338eec283694b641bb877834361c7e6b821da3807653cf0674adafccb50fd790de617c89046c785e1fd8ef880eed75a
+EBUILD fixtures-3.0.0-r1.ebuild 1144 BLAKE2B 76743f79c79e322730935d75385cabe01d186876f9b273e1f05e653865f7f13703060f705ec277ba2bc3a5b9337eddafb646fd5146498d3282b7b1e420daba8e SHA512 e23aaffaee9d3731ed650329a60b53239c85b4ce68550b8712bc69ee8dca633a12ee688b05679b9f95d35b2f74c1e7e204b4423fb163cacac7ba46bd8da81c60
 MISC metadata.xml 913 BLAKE2B 716897e147898c78b273f4277b5b280ef0b210364bbe2cc2cf722394c33c65c45538c941575ebae6a5636411d38ed74bafce550d5f36a470670108b5f1aa3fee SHA512 e836e15989ce8d5a4af3678e949f6f7dea9bcb69ecd1fc0c41cd768a03842304dcd50679213e1034e460d5fb7a213c118417707b8ca620d316b99659733a39ec
diff --git a/dev-python/fixtures/fixtures-3.0.0-r1.ebuild b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
index f73b73f73f96..6418735e7bb0 100644
--- a/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
+++ b/dev-python/fixtures/fixtures-3.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index 660d6dccac21..1c29ab2ae89f 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -2,7 +2,7 @@ AUX flake8-3.8.3-pytest6.patch 1883 BLAKE2B bd4eb8f184636bfbc33b262df8c5612402a1
 DIST flake8-3.8.1.tar.gz 157166 BLAKE2B cc8b2dc11f78a6b9c62662086cc190a29a0a4e5a228d4823de8e2f3f327cea3e5df4db220faf9cc14fa34e3825b7d1e4fc4ccf9d1205b437903f327f3ebfa7bb SHA512 f73a306be7d8e5bc48dd9d6d8f8cdee07a90c6c38ee7bd37a21f4be23f1812e4a1e214cc75ca1a324f40e750312b5d7ed573ff49d673f9a1f33aad188b108add
 DIST flake8-3.8.3.tar.gz 162305 BLAKE2B 7211c9ff99ce2e8e3094e6a7a1917ee1b3d61902a45408b9c84f077097af8d1b0571e27209ed78409c9931ff53fdb660f81d1886773b8ef74ceb0bd3de60420c SHA512 007158ea5caf60ff84e935f1b74a5f746fba00991c8808395ff72126dc1a8c8e135badc6f1f383027349076b8f3e146e9d0af27b6e24cdf97390463fd69ad940
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
-EBUILD flake8-3.8.1.ebuild 1370 BLAKE2B dea3b7d66efcbb3097ac81e75cd0d76910ea424fee8017e7ae9cde2804858da1f0476a422403b00b17d476eba997afe96b393fd119d25d209ff2e43b72a337f4 SHA512 ea4e8d513f18033b12ee674a16328d41dad86590706623987c379871249b54ffb2527bca1ef0a8a5c5ff661655cef6a7cc9113573d2d4d498472de9568c1a9bf
-EBUILD flake8-3.8.3-r1.ebuild 1226 BLAKE2B 549255d94ed090a20f31068c4709ff19ccc66fd70470ad7403ba281900ea8f505edbee0ec7b2320c4b144ac8c967f48e0345e1a3dc5f6bccfb3247db4fa8bc70 SHA512 aac42be022e9423175fa2ff193349d1c05f2c85e53074017b3185d213cdc84cbcaba79e8e0fbcf2cd88edfbd56dd22cf7a9ef461c1e65e4395a3148bebc7756b
+EBUILD flake8-3.8.1.ebuild 1371 BLAKE2B 841f63744632064b0135c37df7dcc9a7e25ec7d5fe2913ee86270cc916eb1d8ad37c8edfa5d34ac1e82e21e8082271151a3e17c756a18cd9502b2056d551b363 SHA512 c72e4ea3ff2029fd9a3752b13ddff84fe0e507ef5071d03e431419d2cb17fff8f57e2bae7014dea99040c39b2361f1d0db2ee8f63a90576395c5209254a5e084
+EBUILD flake8-3.8.3-r1.ebuild 1227 BLAKE2B 1eeaf5f80a7994b20d87de231577c8b08151fd44098ab6054c5456b8f077cc1e4cdd1f3fbf320a18caad38d3995e3ca06f06baed30eb377c26eaee41415648e3 SHA512 76a7aa5c2a6c0d6b35509d57b582478ee0acf5a14de9e4697aeca465475ad2df6658d09bd1ff6c2225e6d0a0037bfd034b779a185648e9f85f646a2dd41632b5
 EBUILD flake8-3.8.4.ebuild 1195 BLAKE2B a79ccb98a42db8e5e0d5ecd2bb10a9c930f1d4d4a97e53c6b216294a9d1f684a6f827a25d5f995a4497a61efa9d6895f33fa1f1a655c1335b4a548732cf21baa SHA512 077887525adcc75737bdcf2ac8897fc4632f260d6ca9ad1b7217b1fb7f6306e86a8c5bf3ccaf3193b89243fcbd5829eeba09d182a79191d18c45afe03fc9f2df
 MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/flake8-3.8.1.ebuild b/dev-python/flake8/flake8-3.8.1.ebuild
index 8d00e5cc8e07..abe4695b59c7 100644
--- a/dev-python/flake8/flake8-3.8.1.ebuild
+++ b/dev-python/flake8/flake8-3.8.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 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="
diff --git a/dev-python/flake8/flake8-3.8.3-r1.ebuild b/dev-python/flake8/flake8-3.8.3-r1.ebuild
index 1bfc0de53548..9c7cef136a03 100644
--- a/dev-python/flake8/flake8-3.8.3-r1.ebuild
+++ b/dev-python/flake8/flake8-3.8.3-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index d1aaf7eb1fe2..df81f6e1e406 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -4,4 +4,4 @@ DIST fonttools-4.18.2.tar.gz 2499129 BLAKE2B 1ae93418121942e4303e4b138b192a30195
 EBUILD fonttools-4.1.0.ebuild 1356 BLAKE2B b062425fc7bc10c18c3c44e0d29c946f0ddda6e24d4345429039c60323e9b9501f192894eebdc8aae1d39c195bd34e8717e9e8fd9716c8cbc0817c697bd2f5a7 SHA512 317ba31531366edbfe474592594dd8c9dbaf19dda856f90dd3e37f4a5fcec214e6a2197a85193ffd962967aeca32dc675785632d927f170ac03c83851fd63e27
 EBUILD fonttools-4.18.1.ebuild 1392 BLAKE2B 740f06cc15d4902bb0ddf431911eb2940a98b6c395cac21f9863670d43f4f9ac82fcd9ec473542ee773b1abc7a71f5e51497a8f9e68b17adec8b62d130312ded SHA512 2b6c51fd2aab0c4099359a6c621f18fe0fafdcaf35de9e933c0985d63a8295f5d768f854bb39cde3f25ee4379160816ca7d7cd3551cc43ba6a8ffdc8e239a6cf
 EBUILD fonttools-4.18.2.ebuild 1392 BLAKE2B 740f06cc15d4902bb0ddf431911eb2940a98b6c395cac21f9863670d43f4f9ac82fcd9ec473542ee773b1abc7a71f5e51497a8f9e68b17adec8b62d130312ded SHA512 2b6c51fd2aab0c4099359a6c621f18fe0fafdcaf35de9e933c0985d63a8295f5d768f854bb39cde3f25ee4379160816ca7d7cd3551cc43ba6a8ffdc8e239a6cf
-MISC metadata.xml 494 BLAKE2B 2bc2e69cfab3a180d7098efccd9059c14e8eaf75fe29d26272952a7e65a383ae060444f64892cc3b2c185405d59c2cfea5f7fc2e3dbdb68bebf6568cbc4770b7 SHA512 cf381a45630a10358adc449689ce496da052a18e5257c3426c8e52f333a90f254278c2cf9a18770fe08fc7d60b5b50c48fc77bb3b36bf73fba282a3eb8ad5e71
+MISC metadata.xml 395 BLAKE2B f31a990237241b04b7e3222093c878d57d990ee97466160947d4c85a5798543a76c480b01a8f1da13057773b3b6b6dc270d039a4211d7d5cde8991bfa9b7632c SHA512 6c676733e48ceab4d6dcc56359c62d610728e06e7483648d410cbb0826c603521823a0f73b6d832b0f90b3e2f6254a92195e751867e16fbdef8335bbb0bec430
diff --git a/dev-python/fonttools/metadata.xml b/dev-python/fonttools/metadata.xml
index 2abce01d1b35..303f1de441d2 100644
--- a/dev-python/fonttools/metadata.xml
+++ b/dev-python/fonttools/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
-		<email>fonts@gentoo.org</email>
-		<name>Fonts</name>
-	</maintainer>
-	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 631c814c096c..63810bd450d9 100644
--- a/dev-python/funcparserlib/Manifest
+++ b/dev-python/funcparserlib/Manifest
@@ -1,3 +1,3 @@
 DIST funcparserlib-0.3.6.tar.gz 30401 BLAKE2B cfce97cf08914f67ba3bd743bd3d6e7e7a03599ddc00d58a884aa84118d197d92bcc67a93ff1f7a2ab2074d66704078f5392c1d846004a5cd6eed2a423ba6b61 SHA512 efa52f788aa902b099660cb8bc60a025085a8c383e52bd0824a0c3ae28a6c13804a0659de0c80b4dcd839ee70491805d4eecda6cea221e35c3750ec569098c24
-EBUILD funcparserlib-0.3.6-r1.ebuild 722 BLAKE2B b61e334c0fafabbca53931c74cb80ff6a9dad2d26e3eff0ead60278df32af4490d0cc5aa93935518014347167f7b199818ab7e21f5ac09e422dc93e9c1d8cfae SHA512 2b86f364326352280c5d3d136a6ab43146447dc7e1f77087f62cbf2dfe2562beec99c03278900a278fbbe1067bc3be6b372c41a7e85fefde65a0edbf697a421e
+EBUILD funcparserlib-0.3.6-r1.ebuild 723 BLAKE2B 0780acbbba945c08a9b59c01c42cbb5357ee1ed34dc8f0975094cb50946da28bd6f2630c9bff506ff60ad4cc99af578c85fb4b47532fdd2c5df15ef3f4914321 SHA512 533bb67a192e48f9401c75cd201ed837a73a6d03c841cf820cc308195006bdd3845cb5b39933ae9879f74f3bab9d5cb726f312be43fdeef64ae80e99c6b47ba3
 MISC metadata.xml 316 BLAKE2B 1899ee4255eb25643967fafb8aa09ea4b8e6319074de967e512d98ed182c2c7f7992c11c6689000f7bd2076b7296fc544fb8aff86fb03c86d661ce183a41c9b1 SHA512 9fe54328f405d097056ad5e3e0795ded4e3eacd72381dca3298a9af0e7c78f11eab97548b251c6bfaa9144dd0b00c00ac4292ad2ed5e84c31ab6c593a26b8caa
diff --git a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
index eb47dd3838e6..b6f9f424b042 100644
--- a/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
+++ b/dev-python/funcparserlib/funcparserlib-0.3.6-r1.ebuild
@@ -13,7 +13,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=""
diff --git a/dev-python/future/Manifest b/dev-python/future/Manifest
index 4e28a8b36fb2..cc6c27e2e2e7 100644
--- a/dev-python/future/Manifest
+++ b/dev-python/future/Manifest
@@ -1,5 +1,5 @@
 AUX future-0.18.2-py39.patch 2789 BLAKE2B db6c0cb0a030d166f01b95721e560d346f8a80ec63f81c58e5fca663f975b8f8f771d169742a421c34c08b0de01069bb5455b5fafdab440af6e73746df0bb24c SHA512 7bb140d526d2e728d5a988898977e8bf87934f68c42a38f97717b3e5fc040ddc736cdb2b366a8dbbb95c857bffee9f448ff1883dff9c61cb46582d3a01aad65f
 AUX future-0.18.2-tests.patch 11773 BLAKE2B e2b9321ab2a04e4567c312beaccd23886c87f8b78c1de5d480205181a68b77d8c8b1582a57f43e510d5cd3ecc54252bb85130fe6d7e82756c9f1db11263fdf7b SHA512 d884d6b4e320a6e2aeca2c0c46576d9b0fd0d31aaa6f8f9a79f2007ecbc949f1393aa0b9254f0c51616ca4e8d3fb3f11d828879e4e8c01549acd4ecf04e2cf68
 DIST future-0.18.2.tar.gz 829220 BLAKE2B 68574b589bf54aa8dacbd162a54885589faa32829ccf212f50de5bf036ebd8b9aba0c13e63e80d34e507cc0dae4d8d3d47fea33433b17d2c2e6dbf6c37f66d8f SHA512 91c025f7d94bcdf93df838fab67053165a414fc84e8496f92ecbb910dd55f6b6af5e360bbd051444066880c5a6877e75157bd95e150ead46e5c605930dfc50f2
-EBUILD future-0.18.2-r1.ebuild 1000 BLAKE2B d86937c6c6e3dd549010666c2b4b12998df2b841f8ed75bc26b3b74a2c4373189dbcf33c666b9e90dacd0f7fbc5f3cc86919c12f7f000bc95b795048a4b4ae90 SHA512 c5dfb96e2f107a69374df3026fc35bc3b7b20ea19944b68a9510d40a67f1cc59b44119c0b3bd98c7f74eec85db77eeb5ecaa4787ba7caad69018b3cf2c545c09
+EBUILD future-0.18.2-r1.ebuild 1001 BLAKE2B dcf01dfeadc630237530779468ff8bf0161afe0d439db90345d73564f926cf2b7d7421aa8c541fad838c306ab42ff108333c205741d11ed9e868f3dc15dd4db0 SHA512 afd0690773fb5ec23656c978aa2caba9d289ea08d0062a254504f6404d9f91cabf08976fe83cef19971edbffe3e101b8f003259635f6f84ec15e1f91b0a1ce72
 MISC metadata.xml 309 BLAKE2B ac0715185226cea8e3c38698ed3e494b6464d86dad0211e4d0583e3ceb6634c2b1ec230d9dff659d5ef47208b6f3358c701a0c42e49848816ae99703cab82f46 SHA512 e01e3b2733211e1eb6aaef4da19265c7165411a46fde4c2156118700c315bc2ad52cd87de1b90355741de77d91aa22eed5f9e5847d45186bf7138d246cd775e4
diff --git a/dev-python/future/future-0.18.2-r1.ebuild b/dev-python/future/future-0.18.2-r1.ebuild
index eb37d44dc5c1..c6ad9ba67911 100644
--- a/dev-python/future/future-0.18.2-r1.ebuild
+++ b/dev-python/future/future-0.18.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 # TODO: restore numpy when python2.7 is gone
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index a2da853ef90f..38c4a4a507fa 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,5 +1,7 @@
 DIST gevent-20.12.0.tar.gz 5898634 BLAKE2B a73129c7d393aedcd84b6e62c890c3b306722876a1ea4c96485096ce2ea7d1db5f03c77ea77a2c35ef41c7a96183246316c577735bcf4b25fb41095282c64d38 SHA512 76c75128ba2b33e47bd85ef2788387aa6d47d230ef9aeac4bceee03e8a2555dd204c321de7d1779fe4f44503e4fca5dce3b43c1922238da994faed0d78e5c4c1
+DIST gevent-20.12.1.tar.gz 5908977 BLAKE2B fd3536de1ca518e889868537cfb856d022ec2be8f5f658cddb06b9797841333a475d2c4d7eb3f97ecd715a19999804e724f8126b189087582452a88076bf5d12 SHA512 63bf8d63ed0eeed63b5ae6b58a2a0a36bb4a606d7d76f51cb59d5b76aa639296264a01455699cfb6abee53c958368c17f4c6bfca1543d04f9d750637b113046b
 DIST gevent-20.9.0.tar.gz 5806581 BLAKE2B 6b1b653fa6e22539e049a9bba3d3a2b9d798a5555ce4ba60ce33ecbdf14bb5201967d22d677e1ce3170129b0763fddfcc5991347186fb102d10ae39e22538c44 SHA512 966efc945b623df2521fffadca3b7e56cae1efe6de904a724765e0593389e8b1305094baa6fbc9f4fa376b1157d0f230b01e2a90de21e4b9650614363edec9f4
 EBUILD gevent-20.12.0.ebuild 2192 BLAKE2B 1b4de8f295e0e90c6ccaf710cf50f62162437a193132f6eecfb21956721ad44f8b129495aebc159afd2803814ffa4678bfc2cb6855fbc84e8371fe6ba6827028 SHA512 4a68c3e7ee72a199072f3cf103591fcc0839b934532e7122ed0af96f0368a6bd7f5765cb651e828076460f2087e7eaed5186238db924a98a5a4db67911307d98
+EBUILD gevent-20.12.1.ebuild 2192 BLAKE2B 1b4de8f295e0e90c6ccaf710cf50f62162437a193132f6eecfb21956721ad44f8b129495aebc159afd2803814ffa4678bfc2cb6855fbc84e8371fe6ba6827028 SHA512 4a68c3e7ee72a199072f3cf103591fcc0839b934532e7122ed0af96f0368a6bd7f5765cb651e828076460f2087e7eaed5186238db924a98a5a4db67911307d98
 EBUILD gevent-20.9.0.ebuild 2185 BLAKE2B 3ab0e07fd999097d3d658821bee3ce5b5435299de761981b2451bba0bc59f645ee54922ceb8e28f93ecfca0deba1bbb984b9d62f1ad03bae3c153d4a4c37d18e SHA512 302d83e431de91e163e8771712bbc4cee8530a7ab6c1dd136e9e817cf8fca2ab1cd01284812fb35952f8c4676e246d19f3072159eceb4b8471d636f1b487a9cb
 MISC metadata.xml 374 BLAKE2B 80be57b8b296d0c79707bf576e666c9b418ef4a575342675ef50eef354d38cabb77ac2f645c08751060ed8d5cd9996c5285265d56b2018b3e8a72a342c9f3903 SHA512 c4ef41632b92cc273287883b966a262e675ddedd67e32953b94bd329152cc0d667138ab0fca50b9525f514fe73c1ccf0cd4ea2d3257178402b101b4ffda2db32
diff --git a/dev-python/gevent/gevent-20.12.1.ebuild b/dev-python/gevent/gevent-20.12.1.ebuild
new file mode 100644
index 000000000000..1890739c7d37
--- /dev/null
+++ b/dev-python/gevent/gevent-20.12.1.ebuild
@@ -0,0 +1,86 @@
+# 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} )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Coroutine-based network library"
+HOMEPAGE="https://www.gevent.org/ https://pypi.org/project/gevent/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/libev-4.31:=
+	dev-libs/libuv:=
+	>=net-dns/c-ares-1.12:=
+	>=dev-python/greenlet-0.4.17
+	dev-python/zope-event[${PYTHON_USEDEP}]
+	dev-python/zope-interface[${PYTHON_USEDEP}]
+	virtual/python-greenlet[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc
+
+# Tests take long and fail terribly a few times.
+# It also seems that they require network access.
+#RESTRICT="test"
+
+python_prepare_all() {
+	export LIBEV_EMBED="false"
+	export CARES_EMBED="false"
+	export EMBED="false"
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	append-flags -fno-strict-aliasing
+}
+
+python_test() {
+	cd src/gevent/tests || die
+	# TODO: figure out how to make them work and not hang
+#	GEVENT_RESOLVER=ares \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=dnspython \
+#		"${EPYTHON}" -m gevent.tests \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+#	GEVENT_RESOLVER=thread \
+#		"${EPYTHON}" -m gevent.tests \
+#		--verbose \
+#		-uall,-network \
+#		--config known_failures.py \
+#		--ignore tests_that_dont_use_resolver.txt || die
+	GEVENT_FILE=thread \
+		"${EPYTHON}" -m gevent.tests \
+		--verbose \
+		-uall,-network \
+		--config known_failures.py \
+		test__*subprocess*.py || die
+}
+
+python_install_all() {
+	local DOCS=( AUTHORS README.rst )
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 9009f9198178..4c2cd69edeb2 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,7 +1,3 @@
-DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
-DIST httpretty-1.0.2.tar.gz 399185 BLAKE2B 033e954fccf6a351c09dac3c1585ddc65f064eca109dfd8f499fd510ea09ba3ce5198d3f4b54fb832b47425ab721ddc1b2da596b6066028bda1f0a1303cdc0ed SHA512 f9ef1c82f4fe3a31696e06228cea512664c5118b3c32910d7810d1fcf16b05d31b9b55db7bb6bd64967aadb162a2952757627439769db9117164b8248de9049c
 DIST httpretty-1.0.3.tar.gz 411707 BLAKE2B b2211457c937e19f8110bc28446a2b78a8042a742341c0492589def7447e819f051d301e9d254260778f349302ccf6fc163a9f2280a55af925ae353752450320 SHA512 a6349257376c12198d0bf7923245c34f6b8a0889946ba0c2551fd3379a8d9a8e4610de81c66f945656c1879ad3fb1485f2f4148634fcc4e156b9f0a59f7dd758
-EBUILD httpretty-0.9.6.ebuild 1027 BLAKE2B 0309210657bdf6837a4fe2be9a7aca3ace9ef7483274045053a6b16d6f86268f0ed2c433bdc67c332b166da9e4525e3606d224091b61c4c3f92d2cc4448637e7 SHA512 5e8b08de759503299d45fe8bbe0e05dbc2669e98bcf923d58e45fd8c678f7e7fbed69139a31c65e92bddd816af9fb7b34582e6bb1eb81ed6179a22a3f00f8b8c
-EBUILD httpretty-1.0.2-r1.ebuild 1336 BLAKE2B 2925512848a8da4f8d707e8422f398212e146168d7eb669a6eef6f510d05a2822c43d595d6e4296e300249be3169260b8f7263e7a6e7a7d7c2b39041e9b4c5b8 SHA512 15b950045d0edf254f3349b3e0ddfaf241f824cb0f2273aa6a4351522bbd783b90eaa8f88b3dacd45de8df99e6a1f6e57bcc1d75a0672e34046c8ad0563a6bb3
-EBUILD httpretty-1.0.3.ebuild 1342 BLAKE2B 6e4806f5107a21995add20a1781ff3465a68672e0801ef83308dff1e7c18429a550830016cac8404665ee06f57edd3ac62865f730394f396c08b0a04aa552330 SHA512 0a33064f1ab6f53f01bfa441ffe06017dc07ee3ea4fa83d1bc329ea8ebc9f0cb2160651095428d57ee47be59a9acc7a48d8dcba089e62cd2044052cf894859c1
+EBUILD httpretty-1.0.3.ebuild 1335 BLAKE2B ad4c6ac33e39b4ee70c3931016113264651ed87d4deadf5c4c67a0378fd741c7fef0304c8620c1d763683cbf04b3e92429d365cf7bca0841afa20b35d366419f SHA512 ad1b4e93a1ae1759e1c0977b33f3a4c1b144f7b4ec669ddae1acba5fcee504afeb8f6c5c48be1edad8fa24a102d10e75e7e95e770750334b4922d92a115678e9
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-0.9.6.ebuild b/dev-python/httpretty/httpretty-0.9.6.ebuild
deleted file mode 100644
index 512384afe0fc..000000000000
--- a/dev-python/httpretty/httpretty-0.9.6.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
-
-DESCRIPTION="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ppc64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild b/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
deleted file mode 100644
index 12c6a2505f07..000000000000
--- a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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="HTTP client mock for Python"
-HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]"
-# redis skipped as it requires a redis server running
-DEPEND="
-	test? (
-		dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/httplib2[${PYTHON_USEDEP}]
-		>=dev-python/nose-1.2[${PYTHON_USEDEP}]
-		dev-python/pyopenssl[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		dev-python/sure[${PYTHON_USEDEP}]
-		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
-)"
-
-python_prepare_all() {
-	# remove useless deps
-	sed -i -e '/randomly/d' -e '/rednose/d' setup.cfg || die
-	# tests requiring network access
-	rm tests/functional/test_passthrough.py || die
-	# requires running redis server
-	# it is skipped correctly but it causes unnecessary dep on redis-py
-	rm tests/functional/bugfixes/test_redis.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	nosetests -v tests || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/httpretty/httpretty-1.0.3.ebuild b/dev-python/httpretty/httpretty-1.0.3.ebuild
index 8e097d95aae1..a06154c51c1f 100644
--- a/dev-python/httpretty/httpretty-1.0.3.ebuild
+++ b/dev-python/httpretty/httpretty-1.0.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/httpstat/Manifest b/dev-python/httpstat/Manifest
deleted file mode 100644
index 4857884551a6..000000000000
--- a/dev-python/httpstat/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX httpstat-1.2.1-gentoo-tests.patch 838 BLAKE2B 6185274643fc1e67d5cb099f747bd595ddb38fb0ce2f335b3472952298dcb47dac63009d48fe328d22465e777e80b23af1668a6c1da1c62b5208648cb439e9d4 SHA512 a38e8984b9e06b47fb076f449ebc651646b68be448481ce9f197bf995a81c0b81c4ce3070508f597e4dd4bd9e7b5f17f8ae602c4d9978ff3e05b11f7ad7a048b
-DIST httpstat-1.3.0.tar.gz 97358 BLAKE2B e80a3bd6a6bf7dec1e045e39e9b4491cb81623fa432e32f238fedb71a97fcbd3c362d3211b5cee85e8ed293bc7493d8eb262a0821e473f0a7c8df3f2b8c6fa3e SHA512 6620f7d2da8740da9febdc5d0a177890cc5e85a3a41445c3182f6a8906cad05a475b7547737e60331957a5f48e668194d9592f4e53005a5666ef99b704afbc91
-EBUILD httpstat-1.3.0.ebuild 712 BLAKE2B 354747729c2e4d4cbf6afdd7e424e0d04772fc6504970bf090737970f201740cf5b3df5e10e2ae962b6cff5c42c57eb4b251937c2250d3d16e4e00a0e09a72af SHA512 e9861ee10dd6e58a5172b8c12b603871509d24bf7fce119adf5d6075cba55c03b79574e4832134def71b1f94b1ab06d3c80ecd290bddc8f00c11c9b045c71497
-MISC metadata.xml 438 BLAKE2B 06e46ab9f98e01534d2a49fc7a7715daa4bc621453a6f5799d6f969a2b8925802feba503d3a52d68186035fe9cb59659589bbd9c4c413486609e9cb78d6dd126 SHA512 29dfe149f8c10fd8e9a570f8ba19e601d147acf1b3b969dc99664bbf7dd18a5969a6877b14f04618938f43fecac820317c23cdfa786c9f63cc9f6aba2f01878d
diff --git a/dev-python/httpstat/files/httpstat-1.2.1-gentoo-tests.patch b/dev-python/httpstat/files/httpstat-1.2.1-gentoo-tests.patch
deleted file mode 100644
index 2ce199a94b75..000000000000
--- a/dev-python/httpstat/files/httpstat-1.2.1-gentoo-tests.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-- Testscript doesn't need to run tests for multiple python implementations,
-  PM will take care of that.
-
-- Disabling test which requires specific locales.
-
---- a/httpstat_test.sh
-+++ b/httpstat_test.sh
-@@ -19,8 +19,7 @@ function title() {
- http_url="google.com"
- https_url="https://http2.akamai.com"
- 
--for pybin in python python3; do
--#for pybin in python; do
-+for pybin in python; do
-     echo
-     echo "# Test in $pybin"
- 
-@@ -40,9 +39,9 @@ for pybin in python python3; do
-     main_silent $https_url
-     assert_exit 0
- 
--    title "comma decimal language (ru_RU)"
--    LC_ALL=ru_RU main_silent $http_url
--    assert_exit 0
-+    #title "comma decimal language (ru_RU)"
-+    #LC_ALL=ru_RU main_silent $http_url
-+    #assert_exit 0
- 
-     title "HTTPSTAT_DEBUG"
-     HTTPSTAT_DEBUG=true main $http_url | grep -q 'HTTPSTAT_DEBUG=true'
diff --git a/dev-python/httpstat/httpstat-1.3.0.ebuild b/dev-python/httpstat/httpstat-1.3.0.ebuild
deleted file mode 100644
index 975c753128f4..000000000000
--- a/dev-python/httpstat/httpstat-1.3.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="httpstat visualizes cURL statistics in a way of beauty and clarity"
-HOMEPAGE="https://github.com/reorx/httpstat"
-SRC_URI="https://github.com/reorx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="net-misc/curl:*"
-
-# Requires access to google.com and http2.akamai.com
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.2.1-gentoo-tests.patch )
-
-python_test() {
-	./httpstat_test.sh || die
-}
diff --git a/dev-python/httpstat/metadata.xml b/dev-python/httpstat/metadata.xml
deleted file mode 100644
index 6a6902f9156c..000000000000
--- a/dev-python/httpstat/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="person">
-		<email>whissi@gentoo.org</email>
-		<name>Thomas Deutschmann</name>
-	</maintainer>
-	<upstream>
-		<bugs-to>https://github.com/reorx/httpstat/issues</bugs-to>
-		<remote-id type="github">reorx/httpstat</remote-id>
-		<remote-id type="pypi">httpstat</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/idna/Manifest b/dev-python/idna/Manifest
index 7928f226952f..ace00b130a78 100644
--- a/dev-python/idna/Manifest
+++ b/dev-python/idna/Manifest
@@ -1,3 +1,5 @@
 DIST idna-2.10.tar.gz 175616 BLAKE2B 2b109491a5751811e6e85244133a1c66b04b577441c250e600a9cb58511f4a0350f9dc386c64ce40464bf644c7434187c61e747c8e9a422443a740ebb766fe22 SHA512 83b412de2f79a4bc86fb4bdac7252521b9d84f0be54f4fb1bde1ee13a210bbfa4b1a98247affbc7921046fb117a591316c12694c1be72865767646554c5207ac
+DIST idna-3.0.tar.gz 180786 BLAKE2B f802465ccad978600af0f6b2aeacf4fa56957ccb73625ba374663bebc5a507986589c54b7a81c7303fcb97f8fac11695fa6e159236d61e6e29c110b8a8a66143 SHA512 2ed384e75fb3d873a19c6ee49915a48a757b3617227015f92f5e21b130cf30816ce3abf25d9ffd8931e080e645416fb0551b1be18a2d0233e02bce2e4b6556f3
 EBUILD idna-2.10-r1.ebuild 638 BLAKE2B 9de9696607be7240042ab035a8bcfe2d03cd7f19b8d541effb32837c8d345f7a9732be8e76ecfe75ba68f9779aa8093ece8d4f3f3ea237b4ddb923d83c40faf4 SHA512 33f7074653c323a356f4d83ba9beeb7ceee1706bf331912d5d6f541425dac0dd0e4b08778027eab2e862427334de830411e96535300bc66dbacd497635ad5eb4
+EBUILD idna-3.0.ebuild 636 BLAKE2B 744a849ddbc7c65824623ab4440702042fa65c832226bace1098e896e43e776091670e9a355aa8e079637caff8047cff265c9f9da861f552cdd1467e6c58d38f SHA512 4f8fef3582754018b2bb4b7fe9635ffe3f79d03940602f53ff5f742b8bdf7532747215e3fa3ad6e27d9679f53cee35941578ca6fea3bd7445802e53bebc19c1f
 MISC metadata.xml 392 BLAKE2B 3dc0422f56bcbb74b91e6366e35e0393e420321140b9589777e261b3169e837caffa3c6703306cdfc3f3d7d4e77a84b132650b17df485e02bce906992c49fbd0 SHA512 ac8113778dc4e03045ab53beeefacb748df94329289d09a2e49a0df6328c24b864be241e24377ce23173f9f7662f7fc18ce7e4a99e4b6a935db68ffb9fa958b7
diff --git a/dev-python/idna/idna-3.0.ebuild b/dev-python/idna/idna-3.0.ebuild
new file mode 100644
index 000000000000..0b7b1ab7978a
--- /dev/null
+++ b/dev-python/idna/idna-3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 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="Internationalized Domain Names in Applications (IDNA)"
+HOMEPAGE="https://github.com/kjd/idna https://pypi.org/project/idna/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/ifaddr/Manifest b/dev-python/ifaddr/Manifest
index 3d32e381ba84..87bf96411f2b 100644
--- a/dev-python/ifaddr/Manifest
+++ b/dev-python/ifaddr/Manifest
@@ -1,5 +1,5 @@
 DIST ifaddr-0.1.6.tar.gz 6526 BLAKE2B d30b955d42d0266a197214bbe16ff2a8b11e33b4305ae9ed128fca6719e2c86026c97b278b0abaf5f5f35f4c9b744e5b500b4a4c1783dede0ebd4aedff62803f SHA512 911f81c32e808b9e61f7e98b8c67dc9b40cb64de864843cd7239f08538c9ff7cd45c8f16428b2ce200ea5f213a539c7ed8479432e02feb5e82e917f838ee0cb6
 DIST ifaddr-0.1.7.tar.gz 9281 BLAKE2B 3f7d29b69462cbf592899f1b4035685d1e9bb4535b104e6e59b41fd51c4c2681d2502ad190dae633891aec90818bb330c1f8ea403be22d154d9e7de8a5a80dab SHA512 9a428dd6bb022c8f483b77df9e9301f96e9ba64207eda8b3956a7ca5993bfe97f222c451149851135d379db1a819c75d0834566f3b6501456b2f237b0645e300
 EBUILD ifaddr-0.1.6.ebuild 504 BLAKE2B ea147ff0654665742be47c6dff8dbeb87e89d2a36d3e585ac2a954cf2e15a201b1c43fca1b4503fdef9129652ba111b7a012cb5e06a28dfdf513738d4839b567 SHA512 e0e78485dc07bbd2885fa74b7ea7bd12ed249a77b1bfb3b570243bffefdaf1e6ddb29e8e2ff09ce3847df8c3263f84e5d116b31984aaa59b01ce54ac2a341ce6
-EBUILD ifaddr-0.1.7.ebuild 446 BLAKE2B 30646fb0b73cede694e27a6c2004a696a86ce6de61c95f3fef88c6f929c474e65fdd83fefcf0a35e8529116be89262120e0331d4592dc3ba18695ab2897c3be4 SHA512 4553fc9d3fe6517b1b5f8d27cd7919d0fa0d45f8930bc1277b4570ca9ab5fe7cd6558470a3de51094314a534a081d70365e3e0b18ed9e259b7f8edd8f5b520df
+EBUILD ifaddr-0.1.7.ebuild 445 BLAKE2B 405d57047884ace70265b48384360ccfd586ba9cfef34842684f7d64cd20d1dadf853042221cde31d2f0c1309a69930693ac962a2986a80d403bfc15e13dd0dd SHA512 c0188d24dee331bc500533d3ea0b9762f0d0667b09805b0d8aa3df0a2718e97092d198aeeecb394d86e317e8b223912908cc8270364b3543e3624072341d6698
 MISC metadata.xml 451 BLAKE2B 9c1635df1223b67944e805fb0f789070f95fc9232a313c6d5cd234b8e65118da8707a1be99a7cf06b195b1b20287cd14af1362f6af0cd760cba52f16dddfda09 SHA512 ce7dcbb8e40eeb3ad58f6f8983d7b4ceccb4ab6fd02a60d74cb96fd5bf46dcb41d23b97d7495b7422e1d7003502a5d321171338437d89650e42d33f3ff96a56b
diff --git a/dev-python/ifaddr/ifaddr-0.1.7.ebuild b/dev-python/ifaddr/ifaddr-0.1.7.ebuild
index c125ab421907..24d8b71f4797 100644
--- a/dev-python/ifaddr/ifaddr-0.1.7.ebuild
+++ b/dev-python/ifaddr/ifaddr-0.1.7.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 7973f025c8d4..6efd2d63ea12 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,13 +1,9 @@
-DIST importlib_metadata-1.7.0.tar.gz 29233 BLAKE2B a8cd97a384ab06201025fcbdc401fb25788c2eb1dd4f1697ca00e79634cbce32b984cb8a7c2aeacfb0871f92857d08f3ce9c3ae43d698df7401db91add07b6ca SHA512 31f7cda6a1149ca2040032945b19b55d2e97ef8be67db1423c2c2cbb79da3dead46338f3c9eb03b46f9202fca08ed7bf388adc25d34903ddff4b2873c8a89aba
 DIST importlib_metadata-2.0.0.tar.gz 29289 BLAKE2B 4ec24db057006affe1dee20e021a47d385770b1aa905db4ff4223d59f19b53dc85c21475875074664a84a0fb6994493735f5e098d38f938816ebc69dced7a40d SHA512 3f789d717f04f7649dd4a75895669b4f9b875671937035c1c76bd089504afff8c2ba5bfb6a91096ba29eccadc88dca98ea1da5107772fd2053541db15c52b16a
 DIST importlib_metadata-3.1.0.tar.gz 29246 BLAKE2B 2144e10601e089e26e1d85269ed067d505de8ca86071524e038e87850420f42701b36fad5e1fe01529230333d5f23e0882f17a279bacfa39da335f3d968987dd SHA512 24d20d7658c2d15d2207d3660bd181016a16d0a2e3c86b8e86f7f95baab18f01f1a8753942d15ab648a40431bfc6db7d5109339575ef1a50802403eb580baede
 DIST importlib_metadata-3.1.1.tar.gz 32217 BLAKE2B 85155574f554146d89fedbaeffa5b5842c5c76f98d0f8488a019cded9fc7e45323b31a9cb612f81c379feb822a0e5a44f86566510c5bccaa344cbe10ef8676e9 SHA512 a0a3fc0c4cb08ba5676ae144a2176e9b2e02d122a09c1be67fe0c1e1c8304aeac4f624fa060898b20f99f67f9cfee2bdf1177d82cd12e5879edfa268e02cdce3
-DIST importlib_metadata-3.2.0.tar.gz 32793 BLAKE2B e99fc4544ec64bc320754b1bac80ab021fd4212930cb2b28fc44cd6f6c9691214fce2fc408aa65147ae45df589e5ad64d4681e29620a16ffd1d3231faebde077 SHA512 3e744ebaa4606477252243b6e473c33b70332879385719835a4187d5edad135f0f9076c26e4843aea4497c2a5a2b51fa7b5654e9ff97a8f5ec3808053dccc734
 DIST importlib_metadata-3.3.0.tar.gz 33549 BLAKE2B 6646cf7f8dbbeeadd7b4e9e572a59c14e2f17444dcd84aef817e27b299cbc3f0fa868657a59221a42ea8c49c5cc75e9e170a787df3e3014808d19eff1f89debf SHA512 af2215405b0f7e120d2745f3736d021174e611ad226abe64b496192a210e85786e78560349f1188deb3bffbfceb36385e9fbac20f4447aafb025a1d735c333ac
-EBUILD importlib_metadata-1.7.0-r2.ebuild 996 BLAKE2B 2e04af2cd739c2f896b5380dd73625c88cc76150bb8ad9ed1f73a71d253132e6afb272263dcb38383965f620e97696ec57eba41e72aed3673dd140a8e2411dd4 SHA512 1d5a62e708c34147dd3a25f77565c1ab4298ed0c0915f4c056cc7199edc854e2d86aff18dff6e5028ec3f03c03e697525d7c06470d0f68e652d3bb62e1152ad1
 EBUILD importlib_metadata-2.0.0.ebuild 1050 BLAKE2B 6657fb32eb94f02f06e5e09c75cf824278b45d8e9411da2eb5279dcc60c7a3be5018782380a44ac12e6c0421346815f0dcf2d9bfd2af38a57e5e5c842c98363f SHA512 990434854cc236cdf4eb6b44525007dd385985783d7e7387eb6c9d0dd0455c9afc152a30f51e932ad909fac3cb5e46c3b34b250705b5f86d1212255b35b6a5fa
-EBUILD importlib_metadata-3.1.0.ebuild 1016 BLAKE2B 59cf223d538c76d04291195d5c6af921dcce936eb936a168114ef20df8db04cd84eb2adf5e743d0d57d8095b87bc9e1e6fa4e1ef5acad670ec27e017a81880cd SHA512 7dbbd757b1c9ef77646cf095b4b42c03b1d397dea0cb74216b381c03870f9de536b529e8513d41b68def070ded09704530f20feef00724ef875a7c351362e9d7
+EBUILD importlib_metadata-3.1.0.ebuild 1008 BLAKE2B 7255bba30420cdde3405e5fa0c351700cb03caeaf1ca87068877072e65461874ae9a0c5a32c3c894b0c59da37b12a0e146c7e917e1ed24486bfe3c6ee8d62484 SHA512 6dfc50b17e21f401ed8295282dd458dd3722f5a4c0bdd2c728d544d7bca55937effa65153032d928de06449ca21fbeca7d1dfc83cb7eabf101efe6a26d8ac393
 EBUILD importlib_metadata-3.1.1.ebuild 1044 BLAKE2B 455410110f0f1e17d7df2cdbb64364b625d3b4140733f33be55d77deb16c0e2c21a4e816924b603bfa87c76c5294954e2996e252f31f04f5a311326f58c26dc5 SHA512 001f3af3e0133c3149755e482322cc5c91bfb74f578adfd165273926b94f22747c217e8e75ea4cae87918c6ba09bd4c11d236e722b1cb552823c301f2700163d
-EBUILD importlib_metadata-3.2.0.ebuild 1134 BLAKE2B 3e75a125614992d4b1edbc736476b96fdecc97e412ae34a7d0661339f59045365097983c98966f97e1c26fc1a08a1c32eac62dd8c055ee2633a256de48b1a44d SHA512 9425d39127e14bc4bdec23fea4156d9b12fc752397f4c60f3b68b5047aa4a98fa9e96572627254e221e0f9723d82e7ad86772489331fafe1badf6b9238e0461a
 EBUILD importlib_metadata-3.3.0.ebuild 1134 BLAKE2B 3e75a125614992d4b1edbc736476b96fdecc97e412ae34a7d0661339f59045365097983c98966f97e1c26fc1a08a1c32eac62dd8c055ee2633a256de48b1a44d SHA512 9425d39127e14bc4bdec23fea4156d9b12fc752397f4c60f3b68b5047aa4a98fa9e96572627254e221e0f9723d82e7ad86772489331fafe1badf6b9238e0461a
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild b/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.ebuild
deleted file mode 100644
index 20283369fcf4..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-1.7.0-r2.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=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://importlib-metadata.readthedocs.io/"
-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 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx "${PN}/docs" \
-	'>=dev-python/rst-linker-1.9'
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# remove dep on setuptools_scm
-	sed -e 's:test_find_local:_&:' \
-		-i importlib_metadata/tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
index 47bffcc15b52..f52f996857c5 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.1.0.ebuild
@@ -14,7 +14,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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/zipp[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild
deleted file mode 100644
index 7fe2947b8391..000000000000
--- a/dev-python/importlib_metadata/importlib_metadata-3.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Included in Python >= 3.8
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read metadata from Python packages"
-HOMEPAGE="https://github.com/python/importlib_metadata"
-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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
-	dev-python/zipp[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/importlib_resources-1.3.0[${PYTHON_USEDEP}]
-		dev-python/packaging[${PYTHON_USEDEP}]
-		dev-python/pyfakefs[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
-distutils_enable_tests unittest
-
-python_prepare_all() {
-	# Skip a test that requires pep517 which is not in the tree
-	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 846c693b9b63..8ef67fc654a2 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,11 +1,5 @@
-DIST importlib_resources-1.5.0.tar.gz 23660 BLAKE2B aed7a2d730f945505083812355a63d3a88e07b057cf46394f3475135143e535e33dc3ebded24d233797020c805dc35decf5c5ce53758798b093f03f2951daa87 SHA512 34d14c1ff3121cc6f9ef1d3d4417831e3476e9facfcc9b35152c28a59a2c75d7723f171f4b48852f79ec46cbf54b066580745744bc54d349e2bfe12a353a9aed
 DIST importlib_resources-3.3.0.tar.gz 29000 BLAKE2B 5fb87c6e15f01733567fef060607da0625d32e415e294cfd5db94fb26e13d257763f2d3795c19ee7d10fc1fdc579fc0c34a484d28aff32c20553d18fafc7b850 SHA512 1fc03c9d141a094ca6ae0acb9ff0668a3f3aa76b47ce2149691b1d85d37a3ba9d329dbafd8b94961c537a4982cea1bd3ee34bac069819c51d725208f45b24172
-DIST importlib_resources-3.3.1.tar.gz 29012 BLAKE2B ff4fc6eb6dd1ff89b873076b2709bcd6ed10c51388646560eeb929e8cb8a000329260ff093929163045ba32c0d00b9f797f9e06b9524445b1ef052e8a82a7f87 SHA512 3b484169362b7d7062655668a2035a77440a2e2b81708d41e339b6007e8140162d85cfc14fca464b059a649fcda31ef9718a08cdd2cf7c8e588ba3fafc08bb59
-DIST importlib_resources-4.0.0.tar.gz 27317 BLAKE2B 64cd01b650d82f2d3adf2a734a6da390073b190fbd8f8fd0a5be046931d78c93dcf16873477680fc14daadacdde629fcfd6f5d9cd89c7a5de56ba6c1ff4aad92 SHA512 0d5d175a814462db5bf29645f5d06e4cdff5c40ac1e022282690cba79e8f57885873956659952a086bdf7a1f3f7fbd78c1366030642ac8f6b40fa6df3056d6f1
-DIST importlib_resources-4.1.0.tar.gz 30814 BLAKE2B 50b6f9693df9ee21ae53f27f42a7aeb42e6f50ed305fa1004462bf189366b80d7dc48a40f77eafc41107de91f08015275a69e524421777a8d17e155cb867e943 SHA512 a42e4d66649b285489ea3bc0773761da19c05a03732492eefaaa008a0ddcf0696ceed380e296da9ff392529d681350ff045aeeec9cecbbafcd3bd15141920592
-EBUILD importlib_resources-1.5.0-r2.ebuild 1274 BLAKE2B af0f9bd476e6cd42024080fc1ed465e2f546bc0d65fc400d0a3d5518216c503824ee52393b65bb6e50f23d3e6aec2ad0542ccea298e9c90dc7c4fdc6912e8d0e SHA512 91c50f9f545bbbc89faf1e217e8f20904c26ea8de9eb29ad7f5f1c508f32be44f027afda80c03b2b7f730f5c81bd9b1ee283d83995d43dedcf2357142957d455
-EBUILD importlib_resources-3.3.0.ebuild 836 BLAKE2B 71b9f7aa0465ffb0d797b007ab0f12fe7d9542415ad2aedcded20b3acd1f62605f6d375dcb85f09567df2c2ab1cd9d9dfd4526889c7f0ba88f789dd2c3a824a0 SHA512 d3d547d197dd043df177ec74dc2bb0a55802084750d1e6fba3d3371c3baed30719cf7c1380fd93d358aa682d191baf9617ae3863a25c54a551901060e325f3c4
-EBUILD importlib_resources-3.3.1.ebuild 836 BLAKE2B 71b9f7aa0465ffb0d797b007ab0f12fe7d9542415ad2aedcded20b3acd1f62605f6d375dcb85f09567df2c2ab1cd9d9dfd4526889c7f0ba88f789dd2c3a824a0 SHA512 d3d547d197dd043df177ec74dc2bb0a55802084750d1e6fba3d3371c3baed30719cf7c1380fd93d358aa682d191baf9617ae3863a25c54a551901060e325f3c4
-EBUILD importlib_resources-4.0.0.ebuild 836 BLAKE2B 71b9f7aa0465ffb0d797b007ab0f12fe7d9542415ad2aedcded20b3acd1f62605f6d375dcb85f09567df2c2ab1cd9d9dfd4526889c7f0ba88f789dd2c3a824a0 SHA512 d3d547d197dd043df177ec74dc2bb0a55802084750d1e6fba3d3371c3baed30719cf7c1380fd93d358aa682d191baf9617ae3863a25c54a551901060e325f3c4
-EBUILD importlib_resources-4.1.0.ebuild 836 BLAKE2B 71b9f7aa0465ffb0d797b007ab0f12fe7d9542415ad2aedcded20b3acd1f62605f6d375dcb85f09567df2c2ab1cd9d9dfd4526889c7f0ba88f789dd2c3a824a0 SHA512 d3d547d197dd043df177ec74dc2bb0a55802084750d1e6fba3d3371c3baed30719cf7c1380fd93d358aa682d191baf9617ae3863a25c54a551901060e325f3c4
+DIST importlib_resources-4.1.1.tar.gz 30821 BLAKE2B 440adde5ce8604c3dddc6c59f730890b4832076f3f7d5c1f9b46ed4d4fe1d80d714a2f393ae1a1b386ef20812090c7370858ca9d3920bc115a6cedb0d2000c8f SHA512 e277d375f800e8d1be317f90344c10b2848a0f7e0b3b6f28014b71d4b92b496137aa84b8ad865a3b93c983d20d827f18c6baf0d6c540882622b0903bebaae303
+EBUILD importlib_resources-3.3.0.ebuild 827 BLAKE2B e65742ed1491b75a235027d96100ed31d4e2a0799b3db8246cef4549bd69a7f6b407da21a8a58b321991734edf48b81bbfda117906168cd474b465d41dff011e SHA512 fdd643e983c4d4126bdb399934ed4147a7530595eb22931e7c9b24349bc579e425583ea805249adfdb0c1f88f9215c3dde5196dc9844f385250edec09bd807d1
+EBUILD importlib_resources-4.1.1.ebuild 836 BLAKE2B 71b9f7aa0465ffb0d797b007ab0f12fe7d9542415ad2aedcded20b3acd1f62605f6d375dcb85f09567df2c2ab1cd9d9dfd4526889c7f0ba88f789dd2c3a824a0 SHA512 d3d547d197dd043df177ec74dc2bb0a55802084750d1e6fba3d3371c3baed30719cf7c1380fd93d358aa682d191baf9617ae3863a25c54a551901060e325f3c4
 MISC metadata.xml 944 BLAKE2B 7a5aa1dfb947b0115f3e22f9550471b452204daedb386e78374c5dc19b408ec52bf5887d3e645c41be9ebd16f3bd003a2ac1bb3bac539e603d44decd86b92458 SHA512 f17b2ad2e3eedd75db96765537c30d68aa28c60137b12bac3bb47307347431a19ca064a94c8e41e4a3947ab2669605d7183b5b62e55def66631d20ab903e1ea9
diff --git a/dev-python/importlib_resources/importlib_resources-1.5.0-r2.ebuild b/dev-python/importlib_resources/importlib_resources-1.5.0-r2.ebuild
deleted file mode 100644
index 91965fd8c63c..000000000000
--- a/dev-python/importlib_resources/importlib_resources-1.5.0-r2.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
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_{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/importlib_metadata[${PYTHON_USEDEP}]
-		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/importlib_resources/importlib_resources-3.3.0.ebuild b/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
index b94ce8b4f431..fb7616f129f4 100644
--- a/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-3.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/importlib_resources/importlib_resources-4.0.0.ebuild b/dev-python/importlib_resources/importlib_resources-4.0.0.ebuild
deleted file mode 100644
index b94ce8b4f431..000000000000
--- a/dev-python/importlib_resources/importlib_resources-4.0.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(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
diff --git a/dev-python/importlib_resources/importlib_resources-4.1.0.ebuild b/dev-python/importlib_resources/importlib_resources-4.1.0.ebuild
deleted file mode 100644
index b94ce8b4f431..000000000000
--- a/dev-python/importlib_resources/importlib_resources-4.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=7
-
-# This is a backport of Python 3.9's importlib.resources
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Read resources from Python packages"
-HOMEPAGE="https://github.com/python/importlib_resources"
-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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-
-RDEPEND="
-	$(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
diff --git a/dev-python/importlib_resources/importlib_resources-3.3.1.ebuild b/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
index b94ce8b4f431..b94ce8b4f431 100644
--- a/dev-python/importlib_resources/importlib_resources-3.3.1.ebuild
+++ b/dev-python/importlib_resources/importlib_resources-4.1.1.ebuild
diff --git a/dev-python/inflect/Manifest b/dev-python/inflect/Manifest
index 4e62deeff641..2e780c485644 100644
--- a/dev-python/inflect/Manifest
+++ b/dev-python/inflect/Manifest
@@ -1,5 +1,3 @@
-DIST inflect-4.1.0.tar.gz 72200 BLAKE2B c15f6b0d5d93050283dfc4d691e9fdbc26bb2f71573d6b397834e87af62f3afb8f5cdb0448c531de37e84729c0c6ae0cf4ea7a7b081a9dd784f7c06b962d7def SHA512 9a2ba4777f01475390976f3ac28f046d39d1f86cfdafd161cc7c8d33526aca35d44e6598ccf2a0b68d3511a64b67ed0991b51c78bda8f279cd706fd29a3fa514
 DIST inflect-5.0.2.tar.gz 71323 BLAKE2B 42b2524b00a8b71aca6f164de9b57708be172ce63bc62480e951d082bd68f082ad2fadb502321a5fc97ffa3af95f26935d0de855144863b9bd1dfbdf3bdae516 SHA512 ea97ec4a4a1a94a6218e60c20d63e483026beb1901abe2fa69f186a823f8a786b9a82af231fc42bf705146f650fdbfa5ff660cfbe821eceb53891ef2e91eaec3
-EBUILD inflect-4.1.0.ebuild 1005 BLAKE2B 47027952c17e73fdbf15eeb872c29b9f0080e3da59d65e8738d04c9a3ed81c118013cbfb4d8dfee9560103f0866bec2eaf476c722d136a123b6c90dec9a0158c SHA512 ac507e143bb5dcd85148042d5d18e53799f034f7eaf0e671af17373c922928209577b1d8ed83136cad7a62e23f67fdd4da8eb1fbb49d9bd95f017932f56428d7
-EBUILD inflect-5.0.2.ebuild 858 BLAKE2B f7b935adcbd05b55b6396c180b93d5e1bef4162cf397fde9874193e040cebe8776792039d0bf35161bf457d0463be81ac883198d9b08cddf7fe48e9133de1b72 SHA512 17bced660ebd798c3226d6bb69b42e4cfc4d6d8c2cc9a8e22004c18d1cdfcd2e7bac2dca4f844650bc07be49b89dec78ca4882cd4e25a7a7e44b1e6e18d9a3af
+EBUILD inflect-5.0.2.ebuild 849 BLAKE2B 134eefe153ddcf7a4bed7673e21b9dee3bc0a270605d5cb276c9af48fd618700f28732be215cb6de0430efc829bd6cb227eb43701c924d230b31580a1cab1d82 SHA512 23571ab1ec4e547978cf4f0ec22064ed114d063a866d693acd7051fde0d5f70c77763bd2f555742a52e4280795dc3d93d80af3d4e274df69d8ecd50ce4db86ff
 MISC metadata.xml 556 BLAKE2B fc273466492a4a7c43d631fa5ec3d7f0a4896f5d9da637334b74a2824228974f7cd38958fc14ce89055e997adb81bb88db1c1e31d68e96527f2767d6193053dc SHA512 ccede3941149e254e1f64242fd4f804a089f8235308a8dc137820beb6ab78f8867292fa27cb467051fc036baae280b19d5f386053c6c7e31ec682cd7bdab901a
diff --git a/dev-python/inflect/inflect-4.1.0.ebuild b/dev-python/inflect/inflect-4.1.0.ebuild
deleted file mode 100644
index 5ed8ab2d118e..000000000000
--- a/dev-python/inflect/inflect-4.1.0.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=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Correctly inflect words and numbers"
-HOMEPAGE="https://github.com/jazzband/inflect"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
-	'>=dev-python/rst-linker-1.9' dev-python/alabaster
-
-python_test() {
-	# Override pytest options to skip flake8
-	pytest -vv tests --override-ini="addopts=--doctest-modules" \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/inflect/inflect-5.0.2.ebuild b/dev-python/inflect/inflect-5.0.2.ebuild
index 760eca9c4050..fb325264c26b 100644
--- a/dev-python/inflect/inflect-5.0.2.ebuild
+++ b/dev-python/inflect/inflect-5.0.2.ebuild
@@ -13,7 +13,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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 0413d16ebf1a..398848677f2d 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,6 +1,6 @@
 AUX iniconfig-1.0.0-pytest-5.patch 1809 BLAKE2B ccb4383f447f84a88cb020daf0b17ae626c627ce46424ba89591e1feba8ba38b48877e0cac83cef8792cafe283e632cdcec358f6d3929146cc67d2da57848233 SHA512 347295b050cc31108ee013a20dd1135f42a85636d83fba19d509a09856e50ad9343074b965e3b80306a9b73bfcda4c5197800ed3c2e5cba8432d26c5397a135f
 DIST iniconfig-1.0.0.tar.gz 7807 BLAKE2B a77c4d8c6f549db911110505ac5a367be5175adbb580211d4aded14d1108e189fd6d6a229ac4e0e742baafa9b037d58c2bbc810897c8b274c07493c518ef752e SHA512 639a4e765637110f69627fb18a5e719b6d648e5549fd857168183d97da7880434d447c9af1e254dd2aa5d0e36cbd3f5c4ffabf8a949ed3d6294002e7e1b2f6e1
 DIST iniconfig-1.1.1.tar.gz 8104 BLAKE2B 31301484887018a6aa75c944e2f8643f85b2433534ae46a8da893a113f2376eca14cbee88095a3784d1c52f26d4c748260c1df59c46b8f94cd342038f93242e8 SHA512 c9341db7e3ec2204b6a674fca7824cbeb492e3576d5ac3f084b234c82842b28f2f6acbfdb812e183f4334a95b990551f942a4caf548f5ce7ef14885f931535ee
-EBUILD iniconfig-1.0.0.ebuild 580 BLAKE2B ce259dcb36fc087dc75fd6919c2ebaf15c02ecf33bc264242976590d5de397a20d6bb28e5fbd8629516753053bb78eabc5f261b7370d0b96fa3b72672a039dd0 SHA512 77b2c635a013aa21cc3be927d379c516c855154b6dce273258cb75f3a18a3018bc88fe13353677846fe57e8ed68d3febcea9cd3858d6ebeea54cc494eb8c4f3d
+EBUILD iniconfig-1.0.0.ebuild 581 BLAKE2B c84511fef6516d9dc2945aab1ea72ab9463dba852a987a4b4cb52b541589f26965a4fe5aa402b7b9ad07c0cdf24f7bc0804a9aecfca6bd84935627243525ffcd SHA512 2f72e8be6e27000637cc4920e667c277e35483d75fd5c712c92a6f4ae3f720ff732e0f29e65947b446f24e50de8f319c0949a25b1cdf5c5b753270dcbfb1c97c
 EBUILD iniconfig-1.1.1.ebuild 536 BLAKE2B a52c461adbd916197518d1b0f8171791d74c29cd5d62bbbb6b31552f244faac1ad4d1d50c299fe016712213e62d9df60d56f3ad3983507058aa6119f04e09753 SHA512 c26851eebe8d527b3435c2098075d003412b87b5c3863e7f0ffce0016069bf47c1a18aebf9660c2692d318b63a02137165bd7b83ec077ab88b85566d07f3bf32
 MISC metadata.xml 290 BLAKE2B 2ce3db3ab43e55c8d7cdb33ef6c04d0242b80927b9b363ae5e0ca3435c4984455cd3c711b50e5e8e1dcef50b814fdff0fa3c82a6eb2fb8199fc2ddb9949dd9f4 SHA512 878fc9a22e172b52509babcafd133caefa1f86153b877641a13447409dd8c0f28d507e71a01587887ee1d01dd5b609e0189cedcd43eaaf519934223c3890b05f
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
index da3d3e6d86df..89b47a779d41 100644
--- a/dev-python/iniconfig/iniconfig-1.0.0.ebuild
+++ b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index e104ce10bf35..61fc474d4359 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,6 +1,10 @@
 DIST ipywidgets-7.5.1.tar.gz 5656334 BLAKE2B 8bd98f523b619bea02e01ae5faffb08040dc5011905dd69510728b02736e66444b3c3cdf1e7272884c1df97f610aff790063f783e1d0939786669ef39cd1fc94 SHA512 856b3e4dad331766eff6e5f1fd31984a4b6ede5c678ffd51a4896f6448dac53ba181ccec2821f10e07e0f1095318427affe19f1420d0337bc3d37ef1e0a9ea0d
 DIST ipywidgets-7.6.0.tar.gz 4066107 BLAKE2B 5e5f9f6fca1e554ef2b6157a493435148a9832c7f69ec1245e24828363e2a9a1edea804236beaff1f0870d3c7aa028d329e18bc7b1aade7b212110dda3be018a SHA512 eee04406d90f8cadab0208923d51679677b6f630417b69acd0382fcb69cf3d727e47e5abde071939f0b5f45b8b0e72d0bf9316e41508c2c0df7518bfb322db51
+DIST ipywidgets-7.6.1.tar.gz 4066110 BLAKE2B 81f46c91352c8c490c588263489e5e6b2de07df4a0ed8a94e620abd16d064a0776330bb4e3cacf610e99c5528deeca18fe019c9f573d67de212b8271bae29210 SHA512 7a69f57d378c76b0c4aea1878e5a5f19adfca0acf3ec362ebddad5b05513c3bb078321c3c700f91da78dace2adb468d6182cd650da6ae299cd7022329368e538
+DIST ipywidgets-7.6.2.tar.gz 4066260 BLAKE2B b0d75d83108336bac204c24d2a67e88a200939cd8308d99bdb3842916387266f24607726ce0b8781b4a8b6330b9e26bf1eeeeebcaf7588b74980d5bc6603e1b8 SHA512 a8c25ee82e0b0752f850a314fd9a05bbcdd098c9fbe8a0cf0b23e097380beaf7fc916e555fe1597a45bd0085efebc40593da66ef1408114fc6d3085467d95183
 EBUILD ipywidgets-7.5.1-r1.ebuild 662 BLAKE2B 59d22bbe2c5149799509cdb5bf95592b6e4eaadb687fb8a6337ba39b111aece352e86fc44cc811ec45c174ca8e83bdc7c0c17a933312e355f5a355b19413516e SHA512 3f7c57a8e75fdd19b6a718cc09f6bb5b296070f22e2fff8a4a231633c0dd201bb2c96e8083389950086145584f592c670197fc7808fac4d96f4c7c1292e00c61
 EBUILD ipywidgets-7.5.1.ebuild 662 BLAKE2B bca9b4a4d217793b05b1eef3ff58b8a5c0958ae98ecb1acaa7f8cc6417755c9a00d04d98775860ab752ff79545b62814cd9ba994dc20be7816cef2f351a0afdc SHA512 b956f20f561e0d3a835d658adfe8454305a2b6193d0e0bfa5ed2b91b8bd43a8fbece646ccae88e2e9593a5d3b989262b952c7b648723017bce335fe33341e939
 EBUILD ipywidgets-7.6.0.ebuild 664 BLAKE2B f9002ab5e29c788dc83c10130d1e42e92c6094216593308ffaefedf5e9a4d6ae5d607a49665a548916eb2c8a406eb04ea3a2832abf4374afc674f0c4f5f299f6 SHA512 ea57701c1282fb716ba8746fb287e0fc46cdef092b969c92833b0aa473d443ec2356f1d8bfc4e07681b3d397050c8314d2102a7a86fd15e6312b30d04ba1952b
+EBUILD ipywidgets-7.6.1.ebuild 692 BLAKE2B 050bb849c9300a5ffc23659c29624a989034907527b297997517c3704ca63feba144ca276f2903d8d683db54be73cb28e3e4f333abbd23d3fc9799c48ccbc9f3 SHA512 53de75afe4494284a17082d230651f707d64e09f338b10c4523d442e4d887e5277efd5b31ddf1bcb81029ba19d73af2bde942aa9d44f06fdbb763e90f9e6d037
+EBUILD ipywidgets-7.6.2.ebuild 692 BLAKE2B 050bb849c9300a5ffc23659c29624a989034907527b297997517c3704ca63feba144ca276f2903d8d683db54be73cb28e3e4f333abbd23d3fc9799c48ccbc9f3 SHA512 53de75afe4494284a17082d230651f707d64e09f338b10c4523d442e4d887e5277efd5b31ddf1bcb81029ba19d73af2bde942aa9d44f06fdbb763e90f9e6d037
 MISC metadata.xml 536 BLAKE2B 885f71096220f3b226d03e8b44bfb31ccccf060a55c1de6634369d2570463912e19146577c10c0152ad0aac8c5d0a107317db1e2a2f705bc8a21efb6ac59a636 SHA512 2e7e02e4dbb0b2ef05216f597a14bca27af0526da6ec962da402e206ec5eb8a9b08174d52cf5d6d231c20c899a7e87a8f942c7cefb93dfa50eeab7bc65d61a05
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.1.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.1.ebuild
new file mode 100644
index 000000000000..cb2bddc2fb38
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-7.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="https://ipywidgets.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipywidgets/ipywidgets-7.6.2.ebuild b/dev-python/ipywidgets/ipywidgets-7.6.2.ebuild
new file mode 100644
index 000000000000..cb2bddc2fb38
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-7.6.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="https://ipywidgets.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/ipykernel-4.5.1[${PYTHON_USEDEP}]
+	>=dev-python/nbformat-4.2.0[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.3.1[${PYTHON_USEDEP}]
+	>=dev-python/widgetsnbextension-3.5.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index 28bf7ea6af22..aec8f0b2994f 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,3 +1,3 @@
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
-EBUILD isodate-0.6.0-r1.ebuild 693 BLAKE2B eb53a911115221abc4a4b0603342210e7826b4cd070923de051f3eaf27757a24c455b3cbf3def0dbe657a7185a202f4335c5285db1a2a7701891bc8ff1ce70ef SHA512 84ca40a536a6ad378a96cfd91ca5c53be8dab0bfe77e4045dc30485fd20e761b8dbcdbb1ec8261c7825f31f06e29e265af88f950ff1d976c654a38a4d1f979cb
+EBUILD isodate-0.6.0-r1.ebuild 694 BLAKE2B 6ea3c59b374a8fb47c6836567992ad864eaad080ab275482557700ff80dbdd9b98850fb16bac39b53268ab4e89d5f5d6414943b123d035ec064423025a851df8 SHA512 3334eca7af4301b7bfda8e95211e2dd884d33139764f62c6451d2b317227e47517264228ff1c767cebb6b6b6c52fc340c3b366534bb82595f342f87773f583c7
 MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
diff --git a/dev-python/isodate/isodate-0.6.0-r1.ebuild b/dev-python/isodate/isodate-0.6.0-r1.ebuild
index a3724d35406f..d0370ff5da40 100644
--- a/dev-python/isodate/isodate-0.6.0-r1.ebuild
+++ b/dev-python/isodate/isodate-0.6.0-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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 05c7e2635006..12ebec07dcd0 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,8 +1,8 @@
 AUX isort-4.3.21_p1-tests.patch 1301 BLAKE2B c56ffa6dad9605def443bd1f714cd3a88e77b79aa5095a428c29a2420ca0308b88ede5070d827fcd5ac5815895f9dcfa846dfd2d983640134343e89b2079ef37 SHA512 6e32001e2f3fdc97da37f82dbe37ab293b1a7489d5c533f276583161028384da623bc3ea51e90e7440a866c28c6828eed272e27821a3f101d0e3e635f809efd0
-DIST isort-4.3.15.tar.gz 67949 BLAKE2B e78960518928cd74c15733bbc14bf066798ecbcc3e906754c10e352e7b88843451a1d0616d1b450100c77e95974f863951d640c9568277e867fcdfba8f44abdb SHA512 a5774d4f3c49c978e9043e52681e80011591422e60178d72074142725d9d7fa5065553686fd42bffe9e71b38b2b5bdaaa6f20e32cd8dbe33beb9431c397d78e5
 DIST isort-4.3.21_p2.tar.gz 158539 BLAKE2B 316703ca754c939e4af0db4a1060fb13a5164797a672b3faeb585a81fa0c86453fb0f1953b789661588cd0f04267a28837d46a88093a838391f752afa43e9f8b SHA512 fc2aa00c87196864864d2516b8be7acdedcf40d71d1931510e4b878dbd2b6da0b579661b50221f03f4aa5560c8bf23d5e1e10a2694d2b741ca09a92e40a4c687
 DIST isort-5.6.3.tar.gz 161712 BLAKE2B ffbc2977016807d2bd5b1644377efad021af2ad27fd0e27feae1e5dfdfd112c7b5bf4b296ebf47ea6bfcbfe7f56cf3bfa8e1e7cf03963935660e678223397afb SHA512 fa2d9be306d03fc802aab3915bee2c41f4fe0c28353d9d99aa6604755e1602027cd81afca92b4302f80497c88a9dcb2701ec02ca55a5f9a2866669a68368d957
-EBUILD isort-4.3.15.ebuild 447 BLAKE2B 05640fd2f8789ab7457e0081519c72d6998623a61d6f5c8c6e2a7d2b7c7928949a578f283723d89c6a63f08e7d81670fba6f9be2905a033bab32a23dbcd35955 SHA512 b719b23a49a47897d115d38448ec3ca32a1f3e762113ac2f7b1e0493413afa2127599ff0282eec818ad914b15c9093055657870ac7e4d329a53428fe4087acce
-EBUILD isort-4.3.21_p2-r1.ebuild 789 BLAKE2B 555ce31eb81a5cc99196fb73c98472368f191aa3614bde3ecd9d06c5c9b7956d1d4211b0a08c2f626c8d7a24c8ad346e427b074884d9960a620dd7a49204fa2e SHA512 eb8e7ba2fe0b40a90bdab8b06a8ea71655c6bf2d84ce2119780cce907ffb09c4d3d50d9813e0390b98ec14603072c3307342e66fb72a494b578dd98aad8be57f
-EBUILD isort-5.6.3.ebuild 1676 BLAKE2B 2817f632deb43f2029d4137329cb523643754bc0def41fd15d093a205b102028d483cc3892065b65dd494284b09ec55c7c03d2522aae05234860438d72fe76aa SHA512 4777ba69ad9611c00b13d85fa72eb0a1e0992cb959a01be4953d1ce103f198444604273623a22912d4310ac40c12b7d07ae9638c499a072a67c70ec542e984fc
+DIST isort-5.7.0.tar.gz 169353 BLAKE2B bafd6a0ce81ed80a3c1ad53ce320361ef11bc01a78211ad13b7947aafddd4d9bb5a4fbf65ec01d4c90dce7ebd0a2e3b1c4dcad729b1e27b1dd2c5c90c802eecf SHA512 ae5ff56394f495f6bd86f7581e0f8a67264671553b344b9dc2c5ba0b37f483ae500ebba9882ff5c315b913a689901b17de2eac403e0b4240f913c9e1864bab9f
+EBUILD isort-4.3.21_p2-r1.ebuild 835 BLAKE2B 1202a9a9dfd61da30158560fd5364bd7bfb80dd79558891d1772140a47455241943179d10ef6bc387476e988e1d10e006de3f8e21aaca77f1fb302104cb95290 SHA512 acdbbba6eb9a85048a04b79bd3874aaaa0f9b37e3033305c01c02a28b76ca0a7f6cb11f807a0d8549e82bb93321c44c3a88e9f8cb5034342f2b356cfb66f2abe
+EBUILD isort-5.6.3.ebuild 1717 BLAKE2B aec500f334bad2b8d37b0497cac5096581232211e95e8506d059d81e63678bb4e06c6c20e1e3cd2a611a0e03dde128e7c93f663869e125a647821034ad53445a SHA512 1040452c28747b27f337ff09fbe2b89cc1306b0aa3d43c605969d0b7c25b36d3ae783a996d608ab584eee4203ed052d1b83fe6a1d3107a567cd96d9640b6dae0
+EBUILD isort-5.7.0.ebuild 1724 BLAKE2B 8a2e1c081146ff3edb8075b7d7fe5c5a752232e5b5179f9f71d43e549173214dd410522ca18845d3ef17464d262cfc7e1558619817837a0e1e845898c7912fc9 SHA512 973463652110aabb7918aff8f442a06b055ba0d4f0306835955d3f71122bbb992042f8bcfaecded6331fc5d848245a692cb35fc1f0454f5a2b87c9e3ccb0d85b
 MISC metadata.xml 573 BLAKE2B 025e9dc210ba42b2d385c75897d233aec2fa2810b5a2699339d1f33da94a8b5057001af48fe68af1a1c0a201c1ef73971433498e7f8c72cafaf306b51af17375 SHA512 369e47a3727a5c48720f9275ee6dd6b3dc5ee2fa05391da8bcb256d4c35af8a76bf33149a63eeae2a7259f59632f6cd56f32910ab10d652752c481609429238f
diff --git a/dev-python/isort/isort-4.3.15.ebuild b/dev-python/isort/isort-4.3.15.ebuild
deleted file mode 100644
index fb2cabcf1a32..000000000000
--- a/dev-python/isort/isort-4.3.15.ebuild
+++ /dev/null
@@ -1,15 +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="A python utility/library to sort imports"
-HOMEPAGE="https://pypi.org/project/isort/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
diff --git a/dev-python/isort/isort-4.3.21_p2-r1.ebuild b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
index 5d9e679b4968..b1d0bedd74e2 100644
--- a/dev-python/isort/isort-4.3.21_p2-r1.ebuild
+++ b/dev-python/isort/isort-4.3.21_p2-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="
 	dev-python/pipfile[${PYTHON_USEDEP}]
diff --git a/dev-python/isort/isort-5.6.3.ebuild b/dev-python/isort/isort-5.6.3.ebuild
index 87d950a5c148..ef6cbb6b989b 100644
--- a/dev-python/isort/isort-5.6.3.ebuild
+++ b/dev-python/isort/isort-5.6.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 BDEPEND="
 	test? (
@@ -31,7 +31,8 @@ distutils_enable_tests pytest
 
 python_test() {
 	# Some tests run the "isort" command
-	distutils_install_for_testing
+	distutils_install_for_testing --via-root
+
 	local skipped_tests=(
 		# Fails without -s, run it separately to avoid unnecessary output
 		tests/unit/test_importable.py
diff --git a/dev-python/isort/isort-5.7.0.ebuild b/dev-python/isort/isort-5.7.0.ebuild
new file mode 100644
index 000000000000..bbb50f8af619
--- /dev/null
+++ b/dev-python/isort/isort-5.7.0.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_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="A python utility/library to sort imports"
+HOMEPAGE="https://pypi.org/project/isort/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+
+BDEPEND="
+	test? (
+		dev-python/black[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pylama[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Some tests run the "isort" command
+	distutils_install_for_testing --via-root
+
+	local skipped_tests=(
+		# Fails without -s, run it separately to avoid unnecessary output
+		tests/unit/test_importable.py
+		# Excluded from upstream's test script
+		tests/unit/test_deprecated_finders.py
+		# Require "example_isort_formatting_plugin", we're not going
+		# to add an example package just to run a few tests
+		tests/unit/test_literal.py::test_value_assignment_list
+		tests/unit/test_ticketed_features.py::test_isort_supports_formatting_plugins_issue_1353
+		tests/unit/test_ticketed_features.py::test_isort_literals_issue_1358
+		# Same here: requires "example_shared_isort_profile"
+		tests/unit/test_ticketed_features.py::test_isort_supports_shared_profiles_issue_970
+	)
+	pytest -s tests/unit/test_importable.py \
+		|| die "Tests failed with ${EPYTHON}"
+	pytest -vv tests/unit ${skipped_tests[@]/#/--deselect } \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/jaraco-collections/Manifest b/dev-python/jaraco-collections/Manifest
index 1a41e2fed596..4500b2037f4e 100644
--- a/dev-python/jaraco-collections/Manifest
+++ b/dev-python/jaraco-collections/Manifest
@@ -1,4 +1,6 @@
 AUX jaraco-collections-3.0.0-pypy.patch 977 BLAKE2B 528835efbb2d7c6f60e9f49b35032649f81d5b3ae08a8dbaa6ff1e362619eb886570c14240f1660f2a8cd63f54ab4651d26a2e401c01557582fcdd9294a037fc SHA512 6bf4b43230ce7cfaa4971cf1d8bc243378284ef2381d910a9b6932f067c689ae46a3e9caec9ef696f72aaf2d0fa9f5226f79abeeba047c847926a2f588ae27f9
 DIST jaraco.collections-3.0.0.tar.gz 16439 BLAKE2B ff3690d85d91da8d88945e9ab8d16d13c7d0f67a9334f706701f9b392d8cffdd9450b2d6051a92799564cfc81310e45f50368ab729a0b68c08a9c8b0ccd9627d SHA512 c6c5d28fe4b3940c81c68bf877249805db3f508d83a0071947c7a5596d3636631df91cc6e87802b0fa6cd5c8bdd1ef2f39b924471666b44d2147cb64ad1533ad
+DIST jaraco.collections-3.1.0.tar.gz 18206 BLAKE2B c420b3c65c048840f2957ebff0e69a7e2d3db515801a54d829bc2dd9f77b804066ef15766c915b764a148eaa945fc9a30576bb00a645f4c124c031b6ccc64184 SHA512 9a3e4e60cd497ee2ed4a092bd823ecffe0d20293dd9ba491fd2c4e5df2481042efa8ba52503b001e11908982608852a0588cd70b4957d0551c066be97389652c
 EBUILD jaraco-collections-3.0.0-r1.ebuild 1532 BLAKE2B add04d630b8b0126853b02c3dc9e8016dea9a682f40cd6b7eaee8747f1167b62ee1315da8f075dc0b6477da3612cfb9f8f0559a39e37be1006882c240cdde582 SHA512 55e4902449b653f49c80f4e30a9955eedb6833b13436bc878859a4ea1f2d8b5632ecec805e0a7a71ddb92eeb38780f26966e7037a3194189163795db0669cbc7
+EBUILD jaraco-collections-3.1.0.ebuild 1310 BLAKE2B a625fd1a3f20e0f64992eedabf8e6924b75c25d06c49fff2d3fd3be015c2a4568164eca1aeccf739582a7b1be0d4c5e35359dddb62af11e550a2798773f015d4 SHA512 5ee20f434970ce628f65d5f05c5267dee99d8e41f221df3e0f145c7d2c08ac69812b3e1ff6292116376039883117e51eb9db43aa13c29bd8b6366599a86d1581
 MISC metadata.xml 659 BLAKE2B 93e69bff80e5efb51d41b24817d5aba23bf2a6cc6c45a81bd4b0fb43ae5da538f377ebc0441b14f3fdedbda8b3a7932defa5255087fec9cdf6ac4d35f86dfd1f SHA512 1609b6fb022a1880fde31a5e9c7096e373a3c5da4f8a7b2e256241bfdaa591d4247b259a7b5dfcb6c9ee06182c3b899eec468992b50a04eb3f1e1fba43f20b20
diff --git a/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild b/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
new file mode 100644
index 000000000000..57a148e6aa8a
--- /dev/null
+++ b/dev-python/jaraco-collections/jaraco-collections-3.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Models and classes to supplement the stdlib collections module"
+HOMEPAGE="https://github.com/jaraco/jaraco.collections"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	dev-python/jaraco-text[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/jaraco-collections-3.0.0-pypy.patch"
+)
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 5a8f272bca73..d7ade7fd2ed3 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.functools-3.0.1.tar.gz 16996 BLAKE2B 8cad1532753ae5c941038d4b8cda17b49f2d131405bb010d3747ecafc1ea4f72ad2c91b1ce2c499cd2885b18a9fe2cd1ac1bf06d58ed6f13a7a379cf9deb0e66 SHA512 96696839d3405e571bd0120443c5494f13d737b7e0fd9324a7a003c88ff45bdaa89a717c81b9c5ecb4eded9781ba2c05f4735e5cf24c1d1c162fc3d55d38eedb
+DIST jaraco.functools-3.1.0.tar.gz 17006 BLAKE2B 0807138aee76c5ad5b09b0887aa4f294248380d2171e272b70e7de2eb59a39c775c534c6123ec3f38987073c25ffe899a56020bc5a6047109c110f7ceec32ec3 SHA512 81a56d3325106e65889f90137d2f3ab57198e2b5905dbe067a056057dee98ca8a715fc46384f9ab15a081d5d7fd309d69ffb77be9c2b24a9a8eda817fbc0b1e3
 EBUILD jaraco-functools-3.0.1-r1.ebuild 1383 BLAKE2B 3d7e180ae928ad3aee0205f7b4a6f2c5270aeaa4619923026bd7da4f269456073201f584c56ba79e45f7e297d5aea64151dfb76d7889afb054959188af3d39bc SHA512 d73deca407f803d1f41062c7d030a284385821dcb874356e08c33f5f42ba960b8520166c67bb92c387bb96f930536f9a785b56acdfe6fda539216433d1bf76af
+EBUILD jaraco-functools-3.1.0.ebuild 1322 BLAKE2B b9e60bbbe206712fdffb61cc3699fa00e4ac1afe55231e1ccce4560fd1d23ed1a65b9c3407891a60df04de56c0a498c0687e2a5fe5fa01a2464494d89fd743d0 SHA512 a1dfba2aa04502753237060c31af591e699bfcd826a57c7cf63cd449fe823e64eb7764b9f189c413fa07493609bcd4c96ed65db661d6003306caeafa1ee3d26b
 MISC metadata.xml 675 BLAKE2B 64f36f8fd58d397d3efe5f8a5026eba903a37a6db1a1b2cc33fc893b3cc5c3b9c191adbe814f508bb1798b0e7e5ea6cfba61257982495eb536aa1d244dd86ed8 SHA512 abc84c4f12b89d334309821d54b4d59b2f1b490e83656bd375ed932835aca4dd9fd3299fd496fd33a34a5ef0991af115211b28ff83179632a13963b68ef9156a
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.1.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.1.0.ebuild
new file mode 100644
index 000000000000..22409d35da9a
--- /dev/null
+++ b/dev-python/jaraco-functools/jaraco-functools-3.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional functions used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.functools"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jaraco-classes[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-logging/Manifest b/dev-python/jaraco-logging/Manifest
index 533895c59537..01cd304cf1b7 100644
--- a/dev-python/jaraco-logging/Manifest
+++ b/dev-python/jaraco-logging/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.logging-3.0.0.tar.gz 10739 BLAKE2B c5cad0b6d7702a1216869dd0cd388d51a0a8e7bd24000108ef818623b54d23ce1adf0de2e017b869d764342484bf25d676ee18af9647b82964933ebb184cec0e SHA512 bc0edeef6223d0eb78110d51159a70afd16542e830e3cd37dec7628e582bce44218cd7669c03c41125db9824b6fc774f608dd7f6540224659f4dc2f1927d681c
+DIST jaraco.logging-3.1.0.tar.gz 11801 BLAKE2B 858f0930b7e04ea6f1e3d13b3d7be1056ad9efa901857ded3759e450e151c8485feb1cb6eb91c8ebf7be53c649bc818759009394b20f606fd5551c82ce0d1e61 SHA512 ce9a9cbad6d6bb448615eac986d361f9c6ff477b1209e85433f12a49055a9e30125cd49bebcf915a08b8efe0732439a8e1d336e63f6454369b3e846a9a1383ba
 EBUILD jaraco-logging-3.0.0-r2.ebuild 1351 BLAKE2B 1165fccb26fcdc96abc740127cda40639a24c127066d380e6e950e889a5a9363cf0cfce4c44d4998b59e6eab945474b69799c49e02c5d09b96424fd48c34147a SHA512 816ae9b0296816741dcd3efb49e5b66d7df4b8309ee89d7921b27f37453f8aec85c60f54e43f6992fdda23abfdf9b34b4f73682a5575f567692aaf8d919a7eb1
+EBUILD jaraco-logging-3.1.0.ebuild 1171 BLAKE2B 6bca93b690ced66f032ecdb9eb23f04749f3adb39bf2b6cd3aa8c347b6d22265683d0bd170ffa3ab0001102d4085fc95220797d70a07c92bd610368c57e04982 SHA512 2a0fa1e5a915411c98181d9a3846061f08a8e999d74be076876682289c80e45ec301a52bd964d37618c967f28738cb95208837584f8834512a079a64edc889a1
 MISC metadata.xml 452 BLAKE2B 6beacf543b6c6ba9482609f0374283438dab3bff1ba25c53f1ec6c6441ddd0e185336766eaaae3ef89277874c6f12652a68b79a934919c8fe70f8bee88872b43 SHA512 447053b09d211ddbe1b2e98f7c1379395291f1331c75837ba1dc036a3b5d1e05e1f78717c419c4dfdc7d687001992f4c926cfc61bf267aa925024180646a3296
diff --git a/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
new file mode 100644
index 000000000000..ed7469cd1211
--- /dev/null
+++ b/dev-python/jaraco-logging/jaraco-logging-3.1.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Additional facilities to supplement Python's stdlib logging module"
+HOMEPAGE="https://github.com/jaraco/jaraco.logging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/tempora[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/jaraco-packaging-3.2' \
+	'>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	# note: eclass may default to --skip-build in the future
+	distutils-r1_python_install --skip-build
+}
diff --git a/dev-python/jaraco-packaging/Manifest b/dev-python/jaraco-packaging/Manifest
index 940b5cf043b6..429cc60c888a 100644
--- a/dev-python/jaraco-packaging/Manifest
+++ b/dev-python/jaraco-packaging/Manifest
@@ -1,5 +1,7 @@
 DIST jaraco.packaging-8.1.0.tar.gz 15322 BLAKE2B c354bec458a319bd9df0667c155203efa5c3de2d95218d0dd3a5878011d2d8fef694a490a2bac0035bff8daa18d1a3447c2c8dab7c0bd7bb09b62969f91d4709 SHA512 99996765cb047f2f0416d6afc4ff6ee0d84d03da0e07c7a7121518fbaf668f587c044f567c1d66a455372897ec1634ba5ee490552ac92064ca072e20b8f60a3b
 DIST jaraco.packaging-8.1.1.tar.gz 14580 BLAKE2B 6ec709571d74a9c840652b565e42b5301ab1ad71df823df6fb972c110d7bc0dbfdbae0dd3cc7123b29076a42de0d2b716ef2bab8dd58ffeb2563a868d90bdc90 SHA512 c0724e8694c3019bf3be24d99c7cde6dca65851e288ae027eb0b0fdfde9e1260804db3f8690b3bf69abd1e1e50733178c0387a859b0d634e8096dc49537f5877
+DIST jaraco.packaging-8.2.0.tar.gz 15295 BLAKE2B bfa8ca1547586122a5e142681be573ff0c7b95e0a5f5df25cf32dbafb4cd105509d6f7dcd9673e9f31bfe9284811721d778596a5ca3d25e41c9b1d88e8eb90d0 SHA512 469eecdc0648a0262e901462c3447450b1e3ca229ffd3747ebfedc7f80e84ff293680ff84bce0d83ee356bfa35fd0db64c7b0d61e02bad191bcdb5713c770789
 EBUILD jaraco-packaging-8.1.0-r2.ebuild 1500 BLAKE2B b16412d8ebc5dd59a8f38e9a381519ee3fd2da24aac01ada77a2adf99eaa30e60a7c0b411774a9c2cd3b99f4687d40c5151fab2aa75bb50284da45d8c6477bb6 SHA512 9a0375ddbe696a4106e42d74b8ee286e7433f02f6b72d65fec7e6a78d5f4e25757c10894ca85c6e7380fe313769df3eb709bd067db1ea50de2e034e79948eef1
 EBUILD jaraco-packaging-8.1.1-r1.ebuild 1289 BLAKE2B 105f30e334efe976c6cd7ae2a77ada8883dc5d8df1eaa66fbc22e38f8f15c29cbbf4d5c4ecc4783e40ca1c8db098c671e4e10f16bf9f51bce44005ac777747b1 SHA512 6d4295c490703bd1c7b41387cff0f5532af811d3f8adc23f1a3ebe3d555d9f9be5171730284c7f19fbad545148947fc1440ea2c8d0e1431445fe8ee930abba6e
+EBUILD jaraco-packaging-8.2.0.ebuild 1218 BLAKE2B 02f1d8af0104b9fe5a6322ed3f007e92edd2aa384036870ec1a6dfb2daff53c571a688a26136fb909de0a406e0ae60660b68b365007253b85ae8443cd1c76db2 SHA512 51f35274b516df1a026e1fcbb36b0e71e5a53506c4f4fa50f43ca267239ec58d5273061d276e3a010b4ca8ca5224f15eaf41571309facadb53f3b63f2c4d750b
 MISC metadata.xml 675 BLAKE2B 36430dbb7cf6f29c913d02aaca81aeafa88e15cf44529c81835ae95c1b7a023a60d0116d50f04fbc424ee6aa49a2fe0eb56ed93b3a91cdd9d3bdda3d0377be91 SHA512 1532e2554229bec8576d60f8bd6b1f170fbe7a869f6b3505bd84efe33472b66b83cb08a5b4cbf201966d7e140a0571a89ff9dc3f821ded1181213841e551c506
diff --git a/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild b/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild
new file mode 100644
index 000000000000..7737f8687618
--- /dev/null
+++ b/dev-python/jaraco-packaging/jaraco-packaging-8.2.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Tools to supplement packaging Python releases"
+HOMEPAGE="https://github.com/jaraco/jaraco.packaging"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
+"
+DEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs '>=dev-python/rst-linker-1.9'
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	distutils-r1_python_install
+}
diff --git a/dev-python/jaraco-text/Manifest b/dev-python/jaraco-text/Manifest
index d6b0219aad66..2a2a833673d0 100644
--- a/dev-python/jaraco-text/Manifest
+++ b/dev-python/jaraco-text/Manifest
@@ -1,3 +1,5 @@
 DIST jaraco.text-3.2.0.tar.gz 14279 BLAKE2B aa8c8903bac61db3d1017408e1aa525f66060422c27b754af343a64e586b64c6623b66881bea62b9b2e89821a40c933d54c9a8cddc7bda08ac108ad08a9524dc SHA512 4107ef1078b44714b6ee5fb6ebd2bb7c35415debc6eaedd8bc18a70a2936cc7c7757acd7b3fac9587201ef52a25d9b29e49f2385a0a08afffb1d0c3de6ecc377
+DIST jaraco.text-3.4.0.tar.gz 15427 BLAKE2B 4f9584b9824c4d73ac9c75bc153048466d826fb37e8240ebec12181c837bca0d8f79a3e1dce25117f4c3e361a48a1566419d2555d430fcb792b5e40eede2713b SHA512 074b963c9ccf020409a28d7ef0053d5b221f9a3b16003ca9eac663f70b1a909b4523f9e5aba606f77108723157f237602f7c9f5079a782c8bfa9fdbbb553cf28
 EBUILD jaraco-text-3.2.0-r1.ebuild 1432 BLAKE2B b7e019195825f6797bd9a1e8b43c7d4ac96ff91287da0f0ddcf2a274a6ec70c6e02c88da9ed91bbec5938bee8b865a86a53b3069570c095de81f4a3454943280 SHA512 e0039d4a9db245807bc2d5b66e490bca2d98fbc7e5013d11e594be9de8c8300891b7f267797c4118a8e208b76156a6007b0260bc6159393c75e933bff57e18d1
+EBUILD jaraco-text-3.4.0.ebuild 1246 BLAKE2B f7b259a40329216ea1ae222242eb10c4840789a89bdbb705477d65d61cccf41950f28a433da8b79b6d46600515decde03021ae94d87b808f514b9780fc542193 SHA512 05599318ed2b22353ea88dc227fca9ee889e6223d3888bb70d48330cbc8febd8cc7091419ca43aa140d7c53128ec52a4aeb5d928e6cdbafeb98142119f1d1027
 MISC metadata.xml 631 BLAKE2B aaa62e5e0d4cc048c1a279b16890d035cd0a60cc41e9b4c99b37876a21286248b5a00d193a2036d0c6d447ff57e635245583f571834daa5a2e994653570122b8 SHA512 84c01b2578aabd0fd5be4347ade555ca4f4ddd96e7009f7dd1b9d021465bc55f66431c72ed05a7e5633a81f3b401f8f77568bacc872198e145b5421aed05491e
diff --git a/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild b/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
new file mode 100644
index 000000000000..175555df272f
--- /dev/null
+++ b/dev-python/jaraco-text/jaraco-text-3.4.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/.}"
+DESCRIPTION="Text utilities used by other projects by developer jaraco"
+HOMEPAGE="https://github.com/jaraco/jaraco.text"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/jaraco-functools[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_6)
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_sphinx docs \
+	">=dev-python/jaraco-packaging-3.2" \
+	">=dev-python/rst-linker-1.9"
+distutils_enable_tests pytest
+
+python_test() {
+	# Override pytest options to skip flake8
+	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
+		|| die "tests failed with ${EPYTHON}"
+}
+
+# https://wiki.gentoo.org/wiki/Project:Python/Namespace_packages#File_collisions_between_pkgutil-style_packages
+python_install() {
+	rm "${BUILD_DIR}"/lib/jaraco/__init__.py || die
+	distutils-r1_python_install
+}
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 055f7e735128..5d6c52add3a9 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,5 +1,5 @@
 DIST jeepney-0.4.3.tar.gz 28121 BLAKE2B 2c9b5b5ec26a9af25d28af602827c73c8ec9377a88a4aa79b9a986675c1ef3f195763a338f3efa4ee371f7751dcf05a9f9cfed06c8d6677d81da3699773d5561 SHA512 bfb12c9259a57324759f8be44d1faf2c0535762e72db5f1370e64cb144c0fc537c9bc9cfb9b075932fb3a20e3ef4e0c990c10905cc5a69e3fb088e8de4193689
 DIST jeepney-0.6.0.tar.gz 49513 BLAKE2B e5f9b5104cf07dbcd2d40c2d22b690dfd56c456ab56daf44f4abee83f0bfe7e1dfbad797348044d51e3dc20fbc6ce68bf8df54f9c1e46d7a86ceb22d3ab30f8d SHA512 140be9dd28ed853d2d41b6a8bbeb2f22c0270ce7bf33b943ec2ac010db17d4f06e253fa8637fbbb3044fe9ffdbfa1e15f0c663eb44bdd538f8c47c2e7dab3ca5
 EBUILD jeepney-0.4.3.ebuild 802 BLAKE2B aefbece367f00496eaf9b986ee25c8b470dbac4d4ec4c9715b8b1d29b8c31f4307d6b0ce67154b9fd78bd518f984c8fd109185610a7b9dc89efef7b57568fd49 SHA512 13e500ebc659528d61478f15329c0b084c5556779e742144c5d3e5d3bff1c3c9eeaec607974c58e74c730c8893ff662223adca2fc2971f8a4672af687e339fb1
-EBUILD jeepney-0.6.0.ebuild 932 BLAKE2B 7de2a523889d9d54bfb61f8b3e6def9747aec1beaef87ab20eb6e30143a147749612e8d81f037abe07c622b744569cb124731755692265baa208e196f0b75497 SHA512 64e6149711ac1b43ccfd1fb11d33553bc4d26710e4f6442dbbabcaba3104e52a15572f2d873ccf539374b33d0837492c51d0eb2e7da53d5f8d9c892f94f9027a
+EBUILD jeepney-0.6.0.ebuild 925 BLAKE2B aa00218ecb24fa7a7ed6949b432a980e57d01deded37048845133ceee516fdb5107b7d8d699b0d5e92ecc6fc04d9cfd3134c9994ad8fbb28a4e63e5736be9ddf SHA512 85419e368b9b6bf0814d3a1f07ec6d2450fac0ae017bd6688465977707ad441686f96300cfacdd01da98c34d3032d0fed54b329e1ef6bc68180122bf7c5e620d
 MISC metadata.xml 456 BLAKE2B e597aacc0128f9cd06d21a03ca156343861a56adba6449e12127025265c6019308ba2e8f360d7a4f43bbca3f95a78789d964bdd3e5bd5fea7d21d7b8eb413c74 SHA512 6cb3b5fae02190cce838221a1d5269bc005f985d5935f77880b066999340818338a747a9e24aa5d39ab71f69c842747068e3b573dcf475c7d552af1bc9af031b
diff --git a/dev-python/jeepney/jeepney-0.6.0.ebuild b/dev-python/jeepney/jeepney-0.6.0.ebuild
index a9562c3433a3..2ca76973d399 100644
--- a/dev-python/jeepney/jeepney-0.6.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.6.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/josepy/Manifest b/dev-python/josepy/Manifest
index 048e06f821f4..b890bdf8379d 100644
--- a/dev-python/josepy/Manifest
+++ b/dev-python/josepy/Manifest
@@ -1,5 +1,5 @@
 DIST josepy-1.4.0.tar.gz 54174 BLAKE2B 67117e7399422d0cfe2c47f9e5ed11a3b93617e673cf9ab1344334f7f11f0c884f45202e8e5e65ebacc00f527becfdbdda9ea246b8e96ba15e516bfc2fb33ba9 SHA512 a5038a4bb42c5a55d665a551743a976b209c24d8aa368d2b6acf0957e953bd4044d9dc41bf9d460283f44c14b7dd7ce2a860563fe107663d4a4deba0c7834e40
 DIST josepy-1.5.0.tar.gz 53979 BLAKE2B e08b3d7a9ce5b123ec8731de27bff63638e68a052f2e6c8715c77f6e4ea644eae1c8200d6d2135853f27eb8caa2e24a04cfc563bfbd01884eb247fcdcc4c9d4c SHA512 39ace649ae4fcefee3eb7fa749001645711de39dc17fd47f1ebf52981929e21bee9b6316d09c61b5478d3d652afc0659e7d5110d1e222e8dcbdc2bb831cb2d8d
 EBUILD josepy-1.4.0.ebuild 803 BLAKE2B 6b676ed68e693c54940d95df787de0c7c2159b71d303032aca5fcf1c97d1721183ca5538fa9cc2dc407c409608e38e9d8a9bbf9fcf33fdcc8e2e70fb543be36a SHA512 b532c2ef85e85b7bb05f5626c5ab2f7118d3d1c45037bc4e621cfcf0110e2af839c0a886206485762ecd451dacc729d3c3c93e4a657a4e230e36c1824cebeb30
-EBUILD josepy-1.5.0.ebuild 805 BLAKE2B 33a425040e9da1de093813064ca138ec2ee650dcf7719c24e29b191c74fe475d84ea7b14ca95bbdad8894bf3d71e411242ee2532b4943188f1608281408d83ea SHA512 06dc270383dbda9fe3062f7022c0d561a8e0c30bc48f9091c14932bba383d6600b47f3d5d8f4e5de879a62f505e174fd6a4bc6cda23f3afad1ceb4f030b51a5b
+EBUILD josepy-1.5.0.ebuild 803 BLAKE2B a5c6ca6cd289616ff94e9c8610b7b2a768aa85f7938ac3c54e6870b0df4d7428c31b787573196433e2050ddc49968ae162e70152bcc2f7fb5ff7534dd148e14d SHA512 c81fe24348141a1ffedda02203214fcdbeed9ba57d785225eb510958558be7289227c0c64192a10ab1ee572bfd082a91cbd255775c2145450e1cd8771e6835e3
 MISC metadata.xml 719 BLAKE2B 658dee515235de05c2e9bb0f806feac685ca20ac9950982503eee109cc110ab84c2959542c2425803e38d5925eb95bb04c53daf21f6d8aac478a7f76fdef92fb SHA512 8fd99401c198b6a0a5d440d90daf80e085e16bd7d0872b1794338bdbe23ee31893346486e57d6c6ebbc892c7d9ff4351d9254d54726bec5cecf5510468a6df99
diff --git a/dev-python/josepy/josepy-1.5.0.ebuild b/dev-python/josepy/josepy-1.5.0.ebuild
index 5acbb31edeab..b644e5d23385 100644
--- a/dev-python/josepy/josepy-1.5.0.ebuild
+++ b/dev-python/josepy/josepy-1.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
diff --git a/dev-python/jsonpatch/Manifest b/dev-python/jsonpatch/Manifest
index 41510e7e0ca3..0536cc31ad69 100644
--- a/dev-python/jsonpatch/Manifest
+++ b/dev-python/jsonpatch/Manifest
@@ -1,7 +1,5 @@
-DIST jsonpatch-1.26.tar.gz 24440 BLAKE2B 345831bd9a9fc1902d0959685ed2dbbc0bf04d191bbc78567d27283e9ae52f7e22f50e9f400461300d1c3388712afa51d4d6a2ddd0a06dbc0a1b576b02bfe807 SHA512 1ab25c8e091cd0b772062a8c448fee4772081d8bd715489b2f7a76e4c0bdff8b26dd38b26c3037cf9bdf8780b97e62a20b6a5bdc43f43af16fdae51d1291bf52
 DIST jsonpatch-1.27.tar.gz 26599 BLAKE2B b3481b4dd01d4fc6c2ad129141fb2b72d53d04744da54c1e4c989b2869113c15862d1ec5c84390758ad495ac36a9156f0e7b730ad091f96f6cb42fe96dde7fcd SHA512 297ca02d114e6b199bd516f69dca147fbe309f0a1b031046859271720645322607236f97b489c242575f7e1ad3cab0c68b1b7f11894c5af82be24013e376c0a4
 DIST jsonpatch-1.28.tar.gz 26829 BLAKE2B 1dee89500be23c49e5d7fdcaacb05da7ea089b691e133c5187c9558d378ae3714ad7fc6f164d0b7eea7b3cf1afefa39b7748a4637b0456051fab086e0e8f15d0 SHA512 2884cb95307cb607c8cd80e688491b4449f953e43e5b232d4d57d7249c590652ecae0856806ade6bf2807a04180e992fd2cdf61590ac058d573d653382bf7a28
-EBUILD jsonpatch-1.26.ebuild 841 BLAKE2B 5568878443867eeb529b3c513dfb9d31c924588ada8af0f5430e9fb25b6b3253ce69e82d81695fa98ab0bb7caaf99e9df1246520d34ee9f7c294974f64df349a SHA512 780d8d1a2e30a13df1c792a4b2cea0f970e8d3ab26e8692f8a2d1a0fcc8bd484472c10346b7d61c7cb3dec825615dee5cc478bd68e0fcbea9d7f5de90e0f58f7
-EBUILD jsonpatch-1.27.ebuild 845 BLAKE2B 10f66c19b9c2bf4c0bd578a05d1489fef2f1cc9d6e3d4d79cc9cc6106697026a842e5c6f0c2cbc98f398415763c135bfcbf5ad6d05bde0c7eb7a20f89a0013b9 SHA512 1bd8aa5beee9ed0da82d288c8c28d1a9700299825dae5160eed09b05b6f48eda41cc6382391d993152df62b40fe072742c80e198253f5f360aff30d846c281bd
+EBUILD jsonpatch-1.27.ebuild 841 BLAKE2B 5568878443867eeb529b3c513dfb9d31c924588ada8af0f5430e9fb25b6b3253ce69e82d81695fa98ab0bb7caaf99e9df1246520d34ee9f7c294974f64df349a SHA512 780d8d1a2e30a13df1c792a4b2cea0f970e8d3ab26e8692f8a2d1a0fcc8bd484472c10346b7d61c7cb3dec825615dee5cc478bd68e0fcbea9d7f5de90e0f58f7
 EBUILD jsonpatch-1.28.ebuild 845 BLAKE2B 10f66c19b9c2bf4c0bd578a05d1489fef2f1cc9d6e3d4d79cc9cc6106697026a842e5c6f0c2cbc98f398415763c135bfcbf5ad6d05bde0c7eb7a20f89a0013b9 SHA512 1bd8aa5beee9ed0da82d288c8c28d1a9700299825dae5160eed09b05b6f48eda41cc6382391d993152df62b40fe072742c80e198253f5f360aff30d846c281bd
 MISC metadata.xml 704 BLAKE2B 774410010ca5fff3237e4864e88e19fc80bf705a166d2d278763a047cc37d2b7cef314e3c96185a42a97d32693ccd27403b990ee59acc2c30be6a8cb22ecae48 SHA512 2e2dcc4a81bae9412ffa008ed17010d1a06505a9f6be59a3c45dbc0e6b9f25f627f25f3c7ec64753e39e10e56c62ad0bb2b28c648e677ce14179678793f036e8
diff --git a/dev-python/jsonpatch/jsonpatch-1.26.ebuild b/dev-python/jsonpatch/jsonpatch-1.26.ebuild
deleted file mode 100644
index f52165d4f2fd..000000000000
--- a/dev-python/jsonpatch/jsonpatch-1.26.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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="Apply JSON-Patches like http://tools.ietf.org/html/draft-pbryan-json-patch-04"
-HOMEPAGE="https://github.com/stefankoegl/python-json-patch"
-SRC_URI="https://github.com/stefankoegl/python-json-patch/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/python-json-patch-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=dev-python/jsonpointer-1.9[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )
-"
-
-python_test() {
-	"${EPYTHON}" tests.py || die "Tests of tests.py fail with ${EPYTHON}"
-	"${EPYTHON}" ext_tests.py || die "Tests of ext_tests.py fail with ${EPYTHON}"
-}
diff --git a/dev-python/jsonpatch/jsonpatch-1.27.ebuild b/dev-python/jsonpatch/jsonpatch-1.27.ebuild
index 7b86861b301e..f52165d4f2fd 100644
--- a/dev-python/jsonpatch/jsonpatch-1.27.ebuild
+++ b/dev-python/jsonpatch/jsonpatch-1.27.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/python-json-patch-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonpickle/Manifest b/dev-python/jsonpickle/Manifest
index 6ff85c58760b..ee8e9f087cd6 100644
--- a/dev-python/jsonpickle/Manifest
+++ b/dev-python/jsonpickle/Manifest
@@ -2,5 +2,5 @@ AUX jsonpickle-1.4.1-importlib-metadata.patch 1198 BLAKE2B c37f21cb8102eb1f6ec2b
 DIST jsonpickle-1.4.1.tar.gz 104564 BLAKE2B a3ad6f9c712f39153186b6ccdef515581012ad4ba1251dcb094074f2093eb4b158b9357bdf2e8668073cb21dc3bf6dd2fc3a0058c8597252c558a797432068b9 SHA512 ed6bf3472c59ba907a973c5c6f05de13dbfc75eef103796b8f8a63d388f769527f22667ca8761092d1649ff2caf5a73de0593e370df3e7fcabe06e73b265da35
 DIST jsonpickle-1.4.2.tar.gz 104745 BLAKE2B af12141c867cd3dbecace5b7bc637b554c51c245d4f584c4d94e73e694b74f66fc59a65a62b7a0af361a7a8010b9398a9b04ee838c4f76c168b21dba6f2c9542 SHA512 a6da661a69daefbc9393a4a4c88aa1da1b8bd687b6eeaed3d833ce1683bd1fa9d7943fdeecfe927e0492945ee2910b6f2d5e53ddb2b928b21f7b099ab79d45e9
 EBUILD jsonpickle-1.4.1-r2.ebuild 1460 BLAKE2B 6bfb7c132ccadded3b493b49ccaa0358c34ca8c18c80224dfb96080d9e15c02de1ca8d2fb3a61e009f1c1097577787c0f8f08fc4e42abc51b86d04423fe996e5 SHA512 d219db2ab875546fa2f4b7a39918538d251f068089e44647ddf4434f550a460a72a503b4ab9c77a021e4bc1dfc8a4e79e94b5a6915e5fdb0af85188687b91d36
-EBUILD jsonpickle-1.4.2.ebuild 1443 BLAKE2B 16245528b721a13d638f807a0c44fb891b43fdfb6a6e511b7cc1188a6ee0b7017b0086d1a81dd53695d81b2afa26ae9711644dc362e78baff0af2a34ff3ec57c SHA512 f97e165e995498ff59ff83fe5f96278fe397438b38acbb2fe20f530570827dfa7a108ab62e3a5d91bb425b5d93a1a40a15593facc06f7efd1c835b23dcfb9d84
-MISC metadata.xml 386 BLAKE2B 486aa3823ac1ae6b816068ae775da293fedab7120df504f2bb64cbbd026e1ad4ac2041acfb48035b5816616dedd46a5f4bedf8c63daad2315727cdbaedcd15ad SHA512 12590542127c674ae6c8123b20ce5c7ed6815f9129eefb95ef3a8c064fdc25477765d397cb7d7e62772475306c0ac7389a7155655576845b936866470302b759
+EBUILD jsonpickle-1.4.2.ebuild 1441 BLAKE2B ef8bfc14c6235e351bfe23125149b85c4b4ed261d971742545b2a36136637910975f74b063830784d032e2217e5ed59544a9a8803f75da61ef0681696e09dbe6 SHA512 fab8686bd27f0159b00beec66e3cf27e8deb4eea25a6a94ff67c61e90b90993e83dcf48bea3eb178e3654a628e851cc6d706941361a1a709ee3470bfe3dcc5e6
+MISC metadata.xml 411 BLAKE2B 7c2473bf3bca8eb7efab35c7aba77ca20a40e1c46f3acdafdc75f7484bdfd5af7061f297042707db0407da1622ca4fb587273b9db80c75f85df9c8b8f504bc30 SHA512 8120766a306055c9b9a79ec95ffddd619c0b423e566a7654803cf7f3446d27a75f713de94414344fdb756efe2eb59a6f1dfa91c994ea7636db41fd49489a0650
diff --git a/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild b/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild
index 0305f827e625..bf67e24482bf 100644
--- a/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild
+++ b/dev-python/jsonpickle/jsonpickle-1.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/jsonpickle/metadata.xml b/dev-python/jsonpickle/metadata.xml
index 6ee6ba05b2b7..bb556639ea8b 100644
--- a/dev-python/jsonpickle/metadata.xml
+++ b/dev-python/jsonpickle/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">jsonpickle</remote-id>
     <remote-id type="github">jsonpickle/jsonpickle</remote-id>
diff --git a/dev-python/jsonpointer/Manifest b/dev-python/jsonpointer/Manifest
index 2e65e90838b6..ad70207fb245 100644
--- a/dev-python/jsonpointer/Manifest
+++ b/dev-python/jsonpointer/Manifest
@@ -1,3 +1,3 @@
 DIST jsonpointer-2.0.tar.gz 8699 BLAKE2B 7b52955aa691a1bba327df6674704503b009101d0dd94587620a684ca9310128e3afcc62cedabd92106deffc3a6a3434a72123fc804224ae68ade8751462bf14 SHA512 e8e2b03c12c3fc5f65816fc71d1c07135ef74a0c912286f5b8bef2d9e21b8ae6e766d1aa2104b3eeb0e53928034321f25b203386ac3f5641b54b0641f6a08137
-EBUILD jsonpointer-2.0-r1.ebuild 604 BLAKE2B 4a4c6f5b33ebb96f695bc70549abfd10085784c49187bc1e23d66aa4af18c8aa85133b04ba5abd14748fd5f739200b4f8310130b557c822bb622cad593e886ef SHA512 7b9a601360ae2c6a9636cbc8c5003daaf2336a1f4c3f42b148bc9398d975f88a7fad65873b65e4bb578a2d15a48a4c40833d4ee39705879ad4660d7f28ea69a3
+EBUILD jsonpointer-2.0-r1.ebuild 605 BLAKE2B 94dd1a0d58a643a4d4da348e9432d1131639544d9afbc057b5cd3d2a4747bffdac050f969be9e03273b98cdd05d37b2c104d288b0b43ba0277fa5add1d9c8586 SHA512 bcf6e86d9557f4051b9ddb184b7006dd95a055c7bdd40336e26d6d5f8b46774646abc01092449dd57c3043a4f9c9a0361cc0b75394523a6f0aaf809fc7e324a8
 MISC metadata.xml 702 BLAKE2B 20a9bbb2163d360f6797170b59d71a8233c7e7bc9f66f1809bd5c70d4c460a464fc0d8ad831f4ff08bb28df0c2ff77c0a0fd483a6295a7090fa73d1a3a4902ec SHA512 0f25c1d5667c07fc6382d958c6f150412de3208a9f21218bcff55c32354e86e17338d3b2480dbb8c7633f1b0d95211c9510aa4cbc9e5392490b6c3904babb9f8
diff --git a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
index 3c939dd22807..138c2b2203bf 100644
--- a/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
+++ b/dev-python/jsonpointer/jsonpointer-2.0-r1.ebuild
@@ -12,7 +12,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 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" tests.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/jsonschema/Manifest b/dev-python/jsonschema/Manifest
index 3f921e1ceeac..5d268643c594 100644
--- a/dev-python/jsonschema/Manifest
+++ b/dev-python/jsonschema/Manifest
@@ -1,4 +1,4 @@
 AUX jsonschema-3.2.0-add-webcolors-1.11-compat.patch 2146 BLAKE2B c9b2e6539e20955fccd4e6c1817ee4b22b645ac98d23be6f1f41ec62a11461546b7ad2e43028d8da22456422638bc08f030dca76a033238a258de11b9d72235e SHA512 ae8dc22aa163bd4e206f42fb450c4a3de78ab448c99dc754e8a97d4034d9ebb5913b85a8de1f365ff2145cbba69c4ca57af1bad7a491565dee86f714f7f40258
 DIST jsonschema-3.2.0.tar.gz 167226 BLAKE2B f89a8198f6b7b4dd56b0320ddecdd834423cbeaf49fbbd1563007da61004322b92e25856ecc17b4d02e2162b2359ec5d7601826fe42cfcb7683ae16cf2baeb39 SHA512 acbb4cec730a8cdab9f070593ed896064fbe082d464ec362adc952e4985e9eaa12ad0f2d55a04018ffdaf675e54037999a7219533dad6b84bf609f5dfe21bbab
-EBUILD jsonschema-3.2.0.ebuild 1652 BLAKE2B 57d693be052fca3f6b3b3487df83a3c7438935d37c8d981ffd1ef1c8cb73b4c9769abc9782a7461b19a69a4318ca51ec43c8007d66c92a334a7c7016749f2790 SHA512 b87dfcffc165489b5855eee395cd52d722ffe3f4e469a7497f8d7826bde6ba3b7f7ad050e9268e72c8b64b9c2ae08580374dac6365b6ecb970b25e378494a9d6
+EBUILD jsonschema-3.2.0.ebuild 1653 BLAKE2B c9610fd286e58904a76e77d2e7c50a7eeca8b0fac136f585821885f7edbd9e43a0ee586c96747d2c7696869dd843ea4c7b25a8bf9b03ebc13f157a7c9acb9209 SHA512 b4b269f2101df08fbaa6d013b5206481c66cbc87888e8a166aac7c9b8cea188d300d80e5186bbf5501678abdd1b32033af0103665763115347de620d16180206
 MISC metadata.xml 691 BLAKE2B ba215d56ec3a691b6ef597e064456c97955d35fb03741bc2fa836a87a399fa7df47ba20b44904707f03cd5f9c5d5b43a086f6686c896bf0ee59bed3730f9dd8f SHA512 cabc9997b24ea7a0b3d9de733373be3bc00593d53472bccae0f395ebf7d8911004490a9d579a6a52e1beaf4f53736d1f139cd12779ea613b9940a8bce74c2496
diff --git a/dev-python/jsonschema/jsonschema-3.2.0.ebuild b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
index a12e66484c43..5877b82cd4b1 100644
--- a/dev-python/jsonschema/jsonschema-3.2.0.ebuild
+++ b/dev-python/jsonschema/jsonschema-3.2.0.ebuild
@@ -13,7 +13,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 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 BDEPEND="
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index f4063feaef82..b19e39830db7 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,9 +1,7 @@
-DIST keyring-21.4.0.tar.gz 73591 BLAKE2B ad8fe71a6a8bd3180b01ce3ca0372f9d1dc493d3eb58ced707d1869284d21ceaffaab314c1304b58461d771fa1a4a5981ec8fbcfaf333d602bdef7985d8799eb SHA512 149f1706296c830605d0ff2eddacf3d531c3d80f694465785d83e2af1d55a49204a2112db840522d4de10cd012073cafe571638e2c39a2f61c308821fe5ec901
 DIST keyring-21.5.0.tar.gz 45885 BLAKE2B 73fe60f0d414cad3b36e0c995b63f048f75358b9f4d389f41ae3a32d68c82ccb9d1fe76d9bd375d06519bcebb8ad9aa34ba98676bf37f3c5a10d9424c161e074 SHA512 25cbbcac0810829e48e6ff4c9497b8c9f3c03011047e76a6901f6c422d6eb1711e535233a90d96f8dc16a77352d4228114f3b447d9e196184a9d87402658f5bd
-DIST keyring-21.6.0.tar.gz 46983 BLAKE2B 847d4de4ec23ce0280684a00a9c2de77a13dc23bfe14e8ee22b4e2442a7c17ae61416c99997cef3177291ea835d4f3d24c8ac27a00a71bb95196c99d49921493 SHA512 892c5f019fecb145546488045152c2bfa5897e05ace9c370979a9d239f7ca50ed8e6f818a1306bfabaad62f1b5e4983784384e52b404e5108b397b1bd7125b5f
 DIST keyring-21.7.0.tar.gz 46998 BLAKE2B 469d2de254ed88604a40a4e05c001f50986f55296d35b54969cfa8612473cbd5184f36bd6babdfb6631ab908e03f81858434b7e52471a2d366f97293c2c0ed93 SHA512 8fc5e8f0f0cf2a336c6ce900d59fcd31b4ec270d62559a1c2b4c36803428532b463bad0b2ace9af33b6fb0d50de94229449c4ef4042287ecaa8f1fac37c5faf8
-EBUILD keyring-21.4.0.ebuild 1156 BLAKE2B 5746ebd36c32f8a05042b1b89b05ca2f5b71857c69e1325ae20ad3af7924d4894a92846dc4912fbfdab2bf3d69f13137503624b632e60e64a1534e0ede08d255 SHA512 5836a15a5247c525f3f839826cc5685461c3282528f4f44c136ce6ae3577a106cb92ab97e87321b994b2702a5e91d45786a00cda37f3ebb114770db5c46bb136
-EBUILD keyring-21.5.0.ebuild 1172 BLAKE2B d2151e7d29443366931f0e71f9bf08b1deab55eb592657e66b77278c5e9ba1be749780e6cedc9144be6e1e108b11105ac3f8f00c80e6d6080579382135973792 SHA512 69026bca0ad861e49726e4cde2497fabb8421326ce7b9b1b250e413a55305a794fc2ddf0abee91ce6f1a0f6358db5e5770a0d77d002ddff605644bd7bea3c77b
-EBUILD keyring-21.6.0.ebuild 1172 BLAKE2B d2151e7d29443366931f0e71f9bf08b1deab55eb592657e66b77278c5e9ba1be749780e6cedc9144be6e1e108b11105ac3f8f00c80e6d6080579382135973792 SHA512 69026bca0ad861e49726e4cde2497fabb8421326ce7b9b1b250e413a55305a794fc2ddf0abee91ce6f1a0f6358db5e5770a0d77d002ddff605644bd7bea3c77b
+DIST keyring-21.8.0.tar.gz 47639 BLAKE2B 3b8b11cd7ea121f9d8544a5775d9f62de23613da0265f0d815687ad311f4a7b6ed431142682df3059fbe43a342c6151871782a850c416a5b50c1df14a64d609a SHA512 4acadf421946644466b5c43481eddd111170185ba3993f4fec38cad0129259bd17aebad4dc2e2d2e88e84aa814e62d37b39efe7385ccd569e40a5291d5f4ae40
+EBUILD keyring-21.5.0.ebuild 1164 BLAKE2B 7a1c0fca40b678e8983402aec32ffe72631ece1ca576983c3c81d5f77e3adaaa36ca1cca00616982fc0fc0252522f2708df3c6125d793aea58d0ded49301fef9 SHA512 c022174b8ecca7e30edf9772a696222acc3189107afbe42ea255fc4f840ca0cf76d70f55b5d986d27759ba39642bb009369624b902a82228ae59083d65e02af2
 EBUILD keyring-21.7.0.ebuild 1172 BLAKE2B d2151e7d29443366931f0e71f9bf08b1deab55eb592657e66b77278c5e9ba1be749780e6cedc9144be6e1e108b11105ac3f8f00c80e6d6080579382135973792 SHA512 69026bca0ad861e49726e4cde2497fabb8421326ce7b9b1b250e413a55305a794fc2ddf0abee91ce6f1a0f6358db5e5770a0d77d002ddff605644bd7bea3c77b
+EBUILD keyring-21.8.0.ebuild 1172 BLAKE2B d2151e7d29443366931f0e71f9bf08b1deab55eb592657e66b77278c5e9ba1be749780e6cedc9144be6e1e108b11105ac3f8f00c80e6d6080579382135973792 SHA512 69026bca0ad861e49726e4cde2497fabb8421326ce7b9b1b250e413a55305a794fc2ddf0abee91ce6f1a0f6358db5e5770a0d77d002ddff605644bd7bea3c77b
 MISC metadata.xml 610 BLAKE2B abd4cf8986ea009081e0e21d31b8bbdbe7b2e99fb332bda41d666c97feda8974cabcabdf6d88e4d8d9a2b9aefd250ad06bfcdd8888513cc0a10cdbda9c93c981 SHA512 931f5d607bc5d9caf329f0b7a010ee055f3c962e67e61c8f4e7458f5325a89bd91678c215fbdd63160eb2d7f34ce58b0a30b144e4159fb426c243efa1dc12d05
diff --git a/dev-python/keyring/keyring-21.4.0.ebuild b/dev-python/keyring/keyring-21.4.0.ebuild
deleted file mode 100644
index ced5c71c1408..000000000000
--- a/dev-python/keyring/keyring-21.4.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides access to the system keyring service"
-HOMEPAGE="https://github.com/jaraco/keyring"
-SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND="
-	dev-python/secretstorage[${PYTHON_USEDEP}]
-	dev-python/entrypoints[${PYTHON_USEDEP}]
-	dev-python/jeepney[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/importlib_metadata[${PYTHON_USEDEP}]
-	' pypy3 python3_{5,6,7})
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	dev-python/jaraco-packaging \
-	dev-python/rst-linker
-
-python_prepare_all() {
-	sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
-	rm tests/backends/test_kwallet.py || die
-
-	distutils-r1_python_prepare_all
-
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
diff --git a/dev-python/keyring/keyring-21.5.0.ebuild b/dev-python/keyring/keyring-21.5.0.ebuild
index e2a8239584f5..1c9e6512b951 100644
--- a/dev-python/keyring/keyring-21.5.0.ebuild
+++ b/dev-python/keyring/keyring-21.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/keyring/keyring-21.6.0.ebuild b/dev-python/keyring/keyring-21.8.0.ebuild
index e2a8239584f5..e2a8239584f5 100644
--- a/dev-python/keyring/keyring-21.6.0.ebuild
+++ b/dev-python/keyring/keyring-21.8.0.ebuild
diff --git a/dev-python/kiwisolver/Manifest b/dev-python/kiwisolver/Manifest
index 657f98684442..edb69c3e16b9 100644
--- a/dev-python/kiwisolver/Manifest
+++ b/dev-python/kiwisolver/Manifest
@@ -2,5 +2,5 @@ AUX kiwisolver-1.3.1-darwin-build.patch 793 BLAKE2B fdcbfd2966f7f5e18859ca02bc85
 DIST kiwisolver-1.3.0.tar.gz 86440 BLAKE2B 931a230909a7778aac3bc93fb24538c7b9e0a3cf1dea33fcf374fd6576d56b80a50597d14c6431f659326222c8810416897fcc9ce2725ca5341891f65aedc5b2 SHA512 64bb475f86e6f409318c5030cd2874bf060c26bf6c1ea62bfb96c1ae27f7326fcd6fc575cbdad7351808d18ae9b9f6664eb312019d432cd6a4c0b8af4fa317b6
 DIST kiwisolver-1.3.1.tar.gz 86948 BLAKE2B 4e03547842e831424aef5be880021aea8d0fef372900bcb9b55f2367fc89f728250b936702fd737807579be34e4ff7489d5669f5113e95612352a293d9f883ea SHA512 0f5c1e516c334d358b8679313035dd45386381965853005271c73e3f4421fb27e3ca5a43b4f2dc85d693f4151427dae9b34d372fe72fcc1a186abd85a54a225a
 EBUILD kiwisolver-1.3.0.ebuild 567 BLAKE2B 7039acf9b8ee3492399301babea6e376710837f7743d365562e098e779d8c3f59e8bb55783d510977d046ed5865fa82a3beb4c6027e050a0fb083e861eff4553 SHA512 df956b9396107fac591cb927ca718b0f56d35f9a3b4317a42d9829be473d497b83d8379a627786885a2727b3c46e5b12ffb52c9d999b2894c58c6551546f51f7
-EBUILD kiwisolver-1.3.1.ebuild 630 BLAKE2B 64f99b09f46aef2ef797a49989cab3d8df6ca125c1f4a8f4ad7fd0939195ac70d6ae60338de8d8858dc07d26215eee0c0212f48ff340f1fab0d105056e0de55b SHA512 283f9d9289170188316b75282211eec5f9c64d7c998cdda3065da96eb297c448cd23e81801f8d2c4a2eb158e957358c4e084f98e7fe96bd4aee2c71fa739792e
+EBUILD kiwisolver-1.3.1.ebuild 629 BLAKE2B 753bd4ef13c6686dbb3ffc3a68e8ae3813768dc89438395306f24e1e0af36861739b6a12f65ae9999f4309be531aa77e52a16029fb1a0c076c3d8c494778bcb2 SHA512 57d060a0f9f2c36411badab272b24d32189c5e1a7905b72455039749abdcbd4b5304f5ce338462da7cca7383b1c818a820f2bfb7aa5e7d78282de3370a973649
 MISC metadata.xml 589 BLAKE2B b855a937dd7e70011622983e63e7b227aace077f4fddbf2fdc558a941e446384561b3f0f798e97db23ce0b6cc2f2aab6af9a0eb7e2d6b221c7f511d5145d239a SHA512 df0848bd49ea1b4ff9d1fff0a60e288054c319acf1fd82776b24c07ac1dc8587d2db0d6ab34fb0d194dffa8734b44796b4f2599a20dd8cf6f68b4f68489696a9
diff --git a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
index d49c2b5c587f..233aacd78afa 100644
--- a/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
+++ b/dev-python/kiwisolver/kiwisolver-1.3.1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}"/kiwi-${PV}
 
 LICENSE="Clear-BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	>=dev-python/cppy-1.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/libnacl/Manifest b/dev-python/libnacl/Manifest
index 38e13b3fb8bc..6d07fe04172c 100644
--- a/dev-python/libnacl/Manifest
+++ b/dev-python/libnacl/Manifest
@@ -1,5 +1,5 @@
 DIST libnacl-1.6.1.tar.gz 39789 BLAKE2B 7c73f67d4faec8d6e53df21eb3c394d4f36754cd9ad1dfa63ef45aab43bb1832cace7446688b2b29b9923539e00d59f3a78c719b8b8770b2c6c217db19dd2f6d SHA512 90fd9302cdfbe84acfc7dff0ac95eeb05fd1bb346cd8b220613174d5d1ae5f627be06b4d588fd4a939c49a119ca557d68a06d3cbe1c0d409a253fdca96d944ac
 DIST libnacl-1.7.2.tar.gz 43343 BLAKE2B 4f7d03661e1385033c51821bf673c81ced11a1523b371ec7da42ed9cf75bdaadee1e679059dfae85871530652b5fea80bfb91c19a8a1eefb4ecf1b8661f11e19 SHA512 a4efbf73f73d9493ac365efa5a5bd6481f85ce4c880ad236bbf7478090bdea857e78e33e445c4e467d2a2032040863b835f32f9a942d2f1e467015bd76b0d469
 EBUILD libnacl-1.6.1.ebuild 539 BLAKE2B ccb3670d51307049905a0c83b804f84ab665209d74c701ff3c03a629bf8a5d4a5d97a5fdba12e28e6f067584ad12c6a5bc2250296bac19ae79aa9d08fe404bad SHA512 231d321231c039dc696d18494d964e2df61aab1dc4fe27d2f8cb70794ffd28dc58670a8f5000c518f2dae723140eaf822670159ae9c4d02687a723f817b7a9b9
-EBUILD libnacl-1.7.2.ebuild 566 BLAKE2B 2e3297c232e0ae6cdbf182fbf47f5f58fe0b9793645c872f9a23a2795c69a29325d27b51b960040c954d7e5cedcd830086e0055b618c433224080a51b407db4b SHA512 4f48389307e98895855f347652cc4f131bbf73b30a59db8ee8ef0d2072d91418893e4adf7f57cb59f1ee102122118a39db1fd45d8b549a5a065a0c211703b0b3
+EBUILD libnacl-1.7.2.ebuild 565 BLAKE2B 33d42e568ddaf8716c684c2194ff5c393ddce1e47ece893adf39087e2d44dc6a4dea6357a7b966a97db48d33507a74e7426e00cd582a6e57004ccb85861ec5db SHA512 505827c9f1c7ab9d43ca403ec4f36d560e88e06198a210de15662125e24ed6b5e02987e3998e3190410f1f4ad3136b5f734f68c060f669057d68d041e70f2061
 MISC metadata.xml 436 BLAKE2B d4777abed0c62a24f98f7053792402c4aca92cc9e352b7436061bf4669a18a731bb8edb9f79707780e3e2eb7a01daa46ab7d1222729d7708f7558b42cefcef69 SHA512 f8a241e4d71d6d6c682f019d086e4effa58608430a5df8c2f70c29cde07124fec2c37b8c63411b19e50baf2b5486a88ec696e4499e47e64936212f6dce938a2c
diff --git a/dev-python/libnacl/libnacl-1.7.2.ebuild b/dev-python/libnacl/libnacl-1.7.2.ebuild
index 22ed96d32aa4..fafebb13d24d 100644
--- a/dev-python/libnacl/libnacl-1.7.2.ebuild
+++ b/dev-python/libnacl/libnacl-1.7.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/saltstack/libnacl/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="dev-libs/libsodium"
 BDEPEND="${RDEPEND}"
diff --git a/dev-python/libpillowfight/Manifest b/dev-python/libpillowfight/Manifest
index ef71e1daaa3e..daa54902c55b 100644
--- a/dev-python/libpillowfight/Manifest
+++ b/dev-python/libpillowfight/Manifest
@@ -1,3 +1,3 @@
 DIST pypillowfight-0.3.0.tar.gz 41065 BLAKE2B 8e945bb5a96d7ebd610435fd868d12df371c29fbc26a9c57152988a990ad83daf70382bb94e8b5591144e18d6c54702c0a578ea5f29044fcdadd169effcf933c SHA512 2782030eabb665d20cf49de584220fb65417616c3a0e2a0376c91dc2c228b571768ea3a248ebd5ec4d244a1b825e98609a35b736f7f2fdbb3f674b08e891d9a7
-EBUILD libpillowfight-0.3.0.ebuild 726 BLAKE2B 4a38f9968e4b0a37f7d8eb007e337ce35d734590ae65f1f48ceab85fa558b6c2c329b4ed6950daaace82564d978896f34d451417dd9e05b21e07e39d8da85dfe SHA512 561532965178a1111a06977db73053913e65f31ed8129e82b393310b2beb850ee0f0222fc39cbe1f935d3b6dc893a7ee5026b0ce0a759274f35fadc8b62482d9
-MISC metadata.xml 408 BLAKE2B 6696490ab4ca4a1c5c27c4da76a781075e5bc248f6203a14d2116002e8aedf53d2ff0de76b119d822a251bd111772f2ab7c6376eb707813da079d972976689fd SHA512 a01430e7488806818e2cd64a8548fb339eef7ec6f408fe25c64a8d679a6afab988a068c4cbaab3b028fe28a2bd21265550eacf1af0b84f2c9b33c8d3e6f28b06
+EBUILD libpillowfight-0.3.0.ebuild 740 BLAKE2B 8aea9b464baf2f79db609e70922c11f7f0027843b542f38f76ea867548bb69f55e7cf40b36f96b474937ffffeef745e5ec11b4f4f5ee4eb55c9150fdb96b07c7 SHA512 31f133daeefa462b3e6a14e1a7ac6fdc3f504cd1c0fc1c07db085fd3483c89df09e45387eac2060d55c8accd0cc979b35c461a60cfc2eb4fec18bb8d77152c5c
+MISC metadata.xml 338 BLAKE2B ada0dfa770b2f60c7d5178cf3cbfe1843b4224bbf79b249bf4536feaaa6892266d68cc8b015206f2b2914498dfb64139177da8386616e9736c386acc1d6ceefb SHA512 8f55abcbf5cbfd6d15979ca499a421ebc0dab451475458076b2eaf61d3ae3451a7e85a040e9b3f8bfc8f5a33e6b6b3c07a99122f7163e073f79c0a58346f9f44
diff --git a/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild b/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
index b7074698be93..e2b9a36ffed3 100644
--- a/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
+++ b/dev-python/libpillowfight/libpillowfight-0.3.0.ebuild
@@ -2,14 +2,14 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
 MY_PN="pypillowfight"
 
 DESCRIPTION="Small library containing various image processing algorithms"
-HOMEPAGE="https://github.com/openpaperwork/libpillowfight"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libpillowfight"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/libpillowfight/metadata.xml b/dev-python/libpillowfight/metadata.xml
index c7823a9260d8..7dfa43dc56aa 100644
--- a/dev-python/libpillowfight/metadata.xml
+++ b/dev-python/libpillowfight/metadata.xml
@@ -7,6 +7,5 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">pypillowfight</remote-id>
-    <remote-id type="github">openpaperwork/libpillowfight</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
index 4220e1cb789f..185d2f2c001a 100644
--- a/dev-python/linecache2/Manifest
+++ b/dev-python/linecache2/Manifest
@@ -1,3 +1,3 @@
 DIST linecache2-1.0.0.tar.gz 11013 BLAKE2B 5f9b125819d9c812d37f1c14ef9ab52f2d5787c83a3d0d891a4def65f17aea26d903b269a610b7247927f72c1594b434ce9274c5358b29799e4ca5b426b37836 SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e
-EBUILD linecache2-1.0.0-r1.ebuild 709 BLAKE2B 93fa89d24765a3a3b7e82b773abbb575b00fec9eb74399196b7bdf0d5ff06848c0632bf340a774f3b31d56db63dbdbe546f0ce49e2193b8c2cbc98115db17aab SHA512 ba4e9271859fbc0968ac421566f20bf2c1dedc0e125404d34e3d389be230b53aa0810c276b057e4f286b33b721a5930de8f2f220e9814efdf454d8806561eedd
+EBUILD linecache2-1.0.0-r1.ebuild 710 BLAKE2B 23b3732b2b49eedd5d6ffba00fa57f03e65ad3f17cf3dfc841e32c0c9fe64cd44f407ada2b7c407305e796b7d62d139fd8d46b5ef70be364d65e639229d84e85 SHA512 0e57b12f64b269aa4b82076ff033ee313032df72b69ed387de42d1a4544fb4248f62f30b80900a86dac592b59ab3a11c2fc0181d6267a975e504e8ad00c5901a
 MISC metadata.xml 377 BLAKE2B 7de50cf7b25ff4a5670c0976205066353aab31ca2c46d14b037253b9843af6a6d973b7a43aec2d213ea4256de851f6ed7accda0aeb1378ba04ae52e69d1c5977 SHA512 577fa842cf618ecfe56bb1661a9b5e124d0f53c204d36df681f2d2601cc797120bbbe9cb863b8aeb268127044c5d2fcc1cf5f21e953262d793d97d9c9ad98aac
diff --git a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
index 95453da06aa1..c6eed7827d67 100644
--- a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lockfile/Manifest b/dev-python/lockfile/Manifest
index fd7971e82ee3..74f6727fc006 100644
--- a/dev-python/lockfile/Manifest
+++ b/dev-python/lockfile/Manifest
@@ -1,3 +1,3 @@
 DIST lockfile-0.12.2.tar.gz 20874 BLAKE2B 8a1e49e8799516b44b219fb28101f3985d75fea842456e69c4357b71eb6a7be21cc56c0f9e885df8da3fb6c584ff4a47c7daad87ba34fc47a8cd40644ece063b SHA512 67b7d651d7e963a497c2604912c61eed90181cdd09c744a0ceaa26e6bbe09d1a871ce48be3949b7da7ea6b366b15492c8c8de589edeca2641ca5e6cb3804df07
-EBUILD lockfile-0.12.2-r2.ebuild 598 BLAKE2B 2144b7f1a573c7226063aa7d5b43a81799bcadd74ccf4dc71a3417aef140dd9c675ccc1b10c7215868127e1831ad847014e4383d8bd93fad9950aeb508e9de52 SHA512 8db7f59ce5b90c0c99e4ba60d2b4ae32bc76b6196756d46121d487cc984807bd1b3c068bf6465d986d41a5c2ef7836a37205912c583f5f26af7243d77c3b3ca3
+EBUILD lockfile-0.12.2-r2.ebuild 599 BLAKE2B 163a2d4efe42186130eb8cb81f62864840b26aa19e947d3101262610ddcdb6a0a4902974fe50f7082e4bc92482646792d031540e7ac86263e1655652df1d0e08 SHA512 b31cb0a547954798bb8d59538d6ccee3f92ab969a18832f2085ee9b2913080195fa52e27bdeeaadb0c4e60c1bff4e7972dee1f6d4bac6974eed4d82fd52dad73
 MISC metadata.xml 388 BLAKE2B 0fe02708c02d058bc6deab9d0138d9b03cc96f604088a4a50faf869b07e8a6daa8fbb6afe0f24464d5820e32d0a79ee7d882f56862dd7a26236d78a69d127687 SHA512 1c5a2a4f97d31f99a9b802b192505d5594cc6df1ce0aff1cea2bf2520c712608b2642429d68c66d73e21fb07d5cd71ba5bde9de486494ef7a769c7c725650d9e
diff --git a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
index 43174f8deec9..0b2668ce9325 100644
--- a/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
+++ b/dev-python/lockfile/lockfile-0.12.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 BDEPEND=">dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 85812daca0c7..e9833e920fae 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,7 +1,5 @@
 AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4da72d8261a99d3593c9886ec7c734d145f4919c61d5a4d434a3df942eb30183988965d28407fbfdae6f228c23dd5ab2 SHA512 527d330145491227319cfbf07d176f100b6d61b285a13f3e6fb0c3fb259df697de45ea22e2dd18db7d927cae32219992c542616c4c0120003b796a30974becb5
-DIST lxml-4.6.1.tar.gz 946461 BLAKE2B b1ea8e15af1130b9f9683614bbc2480ec5008ad697f70536a332c1faf4bda4aa9525b2ef5d82d32c415c91e47ab54c7b3cb644e9a2933517946c3fc8ab7ec7c5 SHA512 3cc917e7535ac1be3db8939f72846313267c8b1f0adccc92a2155a160ed7299d0def718bdae1379e42398ca1b959b1130505597febca00f02cb87c8666f1f1c3
 DIST lxml-4.6.2.tar.gz 948652 BLAKE2B df6ec7e183df48c0edc6cce0fbdd6ab78eb8d1b7e8fb81a76bd9f4a24f05923c757d5b21f508be9be50c7bb187927c4e3a66146d480f2d40efc05388d26d3bf5 SHA512 81dcf5cade7b05c0e831beae7cdfbdb21e876fa55b23da98b89cbfa7960a4737efc13346ea3ade22a2448f20e036173cf5e32d43df6656c3231bfba07981f9ed
-EBUILD lxml-4.6.1.ebuild 2237 BLAKE2B fb05a57bbe17e7fa4f6f0e0aeb666ceadf4cbc3654ef331f3548cc5916900a3692d3eb748a0284ab053d91e6691a568d703b96c9a446b035413d617b9bc6608a SHA512 5bb200f0e1759dd660fe9fed714add77fef4c883eb804f40b0fd623f3c2de5d394b0dded79f39a78f5942872a1168cceda43690635cd764317eda196deec8fb6
-EBUILD lxml-4.6.2-r1.ebuild 2779 BLAKE2B fccc0cbd59579b228229530d236003ddea37d0bb5bd2d9a759d1568d5e6c5d57154edaefd5ebcd5f9b5994297deabd9c3dec763e4f3fa98b9b38ac66951c20b4 SHA512 dc6a5d865867ba81fdec01856d74e981170ed57e7ab1a1f82afd7d8c434abed81daebca1b319225abc26794cba271add708381d7523612f9baf0f1ab501fc8c3
+EBUILD lxml-4.6.2-r1.ebuild 2774 BLAKE2B f061eb3eca5cb67fbf0c90fc25f3dbba0a3e41fc2c0e4fb6e29e725e0b4faf0e604b7cae6d058dff8eba2a3d203a64fe6a03009c04063a99571061c307d9bffc SHA512 1705377ad1205e10c0a298d46fbbb2c1cbd5d9bbbb302c968fb2b5c97ba5a4813d0851c79095e535e75ee811386db0a1393420b79c91b0ac9c6837d01fb2011c
 EBUILD lxml-4.6.2.ebuild 2237 BLAKE2B fb05a57bbe17e7fa4f6f0e0aeb666ceadf4cbc3654ef331f3548cc5916900a3692d3eb748a0284ab053d91e6691a568d703b96c9a446b035413d617b9bc6608a SHA512 5bb200f0e1759dd660fe9fed714add77fef4c883eb804f40b0fd623f3c2de5d394b0dded79f39a78f5942872a1168cceda43690635cd764317eda196deec8fb6
 MISC metadata.xml 356 BLAKE2B 2fec6d393695217c863df74503bb69c58a24e9fe8bee31f68ae9f4bf5bc290fce6fdb80389f2694f4b94f9b8c4fba6c5c90faf2a68cae21a01b105c5a99c9640 SHA512 36358d7b4791b190fd5e168aac89cb32581e056b417ecfdd04c3e9b83a9c90f2ae3ab89d2a671f2a5c09f39198264ee9c59f3fb587dc907185dcfa376fbea04f
diff --git a/dev-python/lxml/lxml-4.6.1.ebuild b/dev-python/lxml/lxml-4.6.1.ebuild
deleted file mode 100644
index 80462dacdab2..000000000000
--- a/dev-python/lxml/lxml-4.6.1.ebuild
+++ /dev/null
@@ -1,81 +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,8,9} pypy3 )
-
-inherit distutils-r1 optfeature toolchain-funcs
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="https://lxml.de/ https://pypi.org/project/lxml/ https://github.com/lxml/lxml"
-SRC_URI="https://github.com/lxml/lxml/archive/${P}.tar.gz"
-S=${WORKDIR}/lxml-${P}
-
-LICENSE="BSD ElementTree GPL-2 PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads test"
-RESTRICT="!test? ( test )"
-
-# Note: lib{xml2,xslt} are used as C libraries, not Python modules.
-RDEPEND="
-	>=dev-libs/libxml2-2.9.5
-	>=dev-libs/libxslt-1.1.28"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/cssselect[${PYTHON_USEDEP}] )
-	"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.6.0-tests-pypy.patch
-)
-
-python_prepare_all() {
-	# avoid replacing PYTHONPATH in tests.
-	sed -i -e '/sys\.path/d' test.py || die
-
-	# don't use some random SDK on Darwin
-	sed -i -e '/_ldflags =/s/=.*isysroot.*darwin.*None/= None/' \
-		setupinfo.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	if ! python_is_python3; then
-		local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	fi
-	tc-export PKG_CONFIG
-	distutils-r1_python_compile
-}
-
-python_test() {
-	cp -r -l src/lxml/tests "${BUILD_DIR}"/lib/lxml/ || die
-	cp -r -l src/lxml/html/tests "${BUILD_DIR}"/lib/lxml/html/ || die
-	ln -s "${S}"/doc "${BUILD_DIR}"/ || die
-
-	"${EPYTHON}" test.py -vv --all-levels -p || die "Test ${test} fails with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use doc; then
-		local DOCS=( README.rst *.txt doc/*.txt )
-		local HTML_DOCS=( doc/html/. )
-	fi
-	if use examples; then
-		dodoc -r samples
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup as a parser backend" dev-python/beautifulsoup
-	optfeature "Translates CSS selectors to XPath 1.0 expressions" dev-python/cssselect
-}
diff --git a/dev-python/lxml/lxml-4.6.2-r1.ebuild b/dev-python/lxml/lxml-4.6.2-r1.ebuild
index 4a5b6c3b8df7..92f12f256e88 100644
--- a/dev-python/lxml/lxml-4.6.2-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.2-r1.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lz4/Manifest b/dev-python/lz4/Manifest
index 33df17b5eb87..1c199498ca23 100644
--- a/dev-python/lz4/Manifest
+++ b/dev-python/lz4/Manifest
@@ -2,5 +2,5 @@ AUX lz4-3.0.2-test-fail-skip.patch 680 BLAKE2B bd222f948084901cabb7e09e525707d0b
 DIST lz4-3.0.2.tar.gz 152443 BLAKE2B 3bf452b5b5ee65caed13b21fd7c39f32ccdea18e6d900facf74e3271868299a2da258b2b0058efaea12a3b42006f0ad0d17004692c95be951c173fee1a1162be SHA512 c31116ee3cd70241b19bff6c59d1852d4c26ad5f0c9a56cd2ecec58e8c2751773162c7ac6a2d887e8cf537bc869ed8866929164f976849efa3ea041eacc4535a
 DIST lz4-3.1.1.tar.gz 154325 BLAKE2B 2d40728087aea735aeac4d39c415edf94f9aca83c77e4a36fe53f6f32f6c1595c0b1ad97c11f6e58cacafb95e0e12d29336d9f072d4f0d47f2d522f552a368bf SHA512 b6ddcabcb323b88eeff1fa9cb91d379d6435ab51b2b51e080138892fbce57d92c8175e2ae1ef72e8a2f95429aaa4be66a5e8cd9d4dbc5bcd6b44ec26b7df96db
 EBUILD lz4-3.0.2.ebuild 768 BLAKE2B 240a49f561a7eaeb2cf9ab75c39e58b3d3750f0e1f99619f0dfa91decfc69dead74461f3e514f0b4fff2343351aec04251c610b17d65d503f21a125372743942 SHA512 645e3a986abc2a5a4587365dd3a0f2cc379bb06e63e6c3ec2bc7aade8e2f57779e9478ae9ec820e4b8f7822c707aa788831147fae95087f326f05e02a7bafdec
-EBUILD lz4-3.1.1.ebuild 773 BLAKE2B 707ba911be1bb5efaa9ba7e2968cc3b1038d11a5ea5af1143f30886958795a589ce81cc5b849de7af8dbe60beb84d9cbf8bf25f15aeb2a4707cec4cd0cdba842 SHA512 03fb2d9f98901a8faf4f87f6a6b6cb3a2c806545557a8bc3f056109d24c23989193045d3451c745f158dfd4def2edbc563d33c8c6f9b077d061a64d3e0860b42
+EBUILD lz4-3.1.1.ebuild 770 BLAKE2B f2961d859c309827af6dce6d142eeef9954c6dce48b6a30075546b5b5dbc7baf8fcb9384208cffac1466e4852accdc81c601910a009c1f3518d661aee906e236 SHA512 b2f1291cf0827f322e289617bebe6b7686ba575e386e25c1e32eace4a3fc3e2e6d20829298a359855cfb6e2813abbf326cdbb48c13f9c6f3a04afdf67da7b85d
 MISC metadata.xml 453 BLAKE2B 50a9701ace3633dbd38132d90aa352056bd40a14f04ba2e38f5ee644a15d1f0df3d1b8289b060b5778fcdd865189b76767e445b9e4c204acaa3684b7ef165e5f SHA512 7945fb025f4da1ff27cdb803bbdf5c6ba005a66def1b80ac35c5676ef7310c1764524f97b0de7177679f8ca41627c0955f172ab1e4594122e1d6e4338fcc3c3e
diff --git a/dev-python/lz4/lz4-3.1.1.ebuild b/dev-python/lz4/lz4-3.1.1.ebuild
index f2e006ee00d8..3c693c19c354 100644
--- a/dev-python/lz4/lz4-3.1.1.ebuild
+++ b/dev-python/lz4/lz4-3.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="app-arch/lz4"
 DEPEND="
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index e6be9d0bf772..6bf6ccbda3e1 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -2,7 +2,7 @@ AUX m2crypto-libressl-0.31.0.patch 8211 BLAKE2B dc36c1e77f6fa9f260d465c0e61168a9
 DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
 DIST M2Crypto-0.36.0.tar.gz 1127584 BLAKE2B 5cdbbb11ff67d4ddffb2853a72383f3c7f1e1aa53ab84166aeda4fbea1b0d7f506761bb07bf8cb5b36f94bdbeb2ea2b46e0693da8355f81b4bf5c4c1c1cc18b1 SHA512 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1
 DIST M2Crypto-0.37.1.tar.gz 1247031 BLAKE2B 3628150b8da15d7356298b6e52e0d8fa7875921a184a0eba3a97eff0588c9e0fee340c92fd486919057d900d6e3b2b711174dde9761fe247848f92ac6434df0a SHA512 9a5e0220704b4897a9ca7efa4b3b57447b9175c52e8039a85bff7bb1a43b709c69f3c8b5903df461f8de39d3f8a20f9bf494df6f5882771846adfe2c03fbea9e
-EBUILD m2crypto-0.35.2-r1.ebuild 1423 BLAKE2B 92478c705a27ff450272dcda5111f612fe0bc5c096d0059859d1e5b3ab349a70f8f39c150658fec1d2c02e7aaac1dff95f2af77b190c790d02b222187334a9ea SHA512 54dff1c9e7ee5320f6a4c6f527db81135af475425c70c71516fa96589cb8ea6dc6e43df3a6f46d325adeb15619ed71c448545ab1ad6fee8edb6f7401dc0830b5
-EBUILD m2crypto-0.36.0-r1.ebuild 1553 BLAKE2B 0658aca2425aaffd659237def2152368c775ff72d94db787cdc687a6de90368445407267cdcb23db3e4d0dd323e556f7d2e5205f8d37827e0297384b2ebe758b SHA512 491c04ef3f8bef87a6e7be22af4a45e30ba726c97a46e4e2d17a344d930cda747e40a15517901389061e69131581cba039300552af4cffdaa5cbf3ca70b527ad
+EBUILD m2crypto-0.35.2-r1.ebuild 1424 BLAKE2B a8369a5659ac4fac3b7e03de3e83ed13f1555f07f3cdc9b7e4cab9a61f2683a70b78addc748cfa070c4c2988e97b4c755d50fd9c85f9bbdbf19226b6c0946352 SHA512 9f3e056fbc7e0b2c55b0bf96f9ab5a92a423252db9e40dd7d15a6323d3cf2a5de829edd9d199560cac8364a20dc03a287829151f6ae8a942ab1032302a8f823f
+EBUILD m2crypto-0.36.0-r1.ebuild 1554 BLAKE2B c1044ae03b8a6d1e908d6dd1e2a3d030835c7fdbc091669bb6b5917b546ab1f34ebd6b5b1b14cdc8b89a752d3689f7033b9c662cc73dd35e064de85db41f2dfe SHA512 b567ecd6edf7e8089017f8bd9ef38716f79a0ae1efbf99567a53cf4a8e0d474afa04d96a76ceee27daeb9d26d6db1ed032f971a8c42c28719ed76ff954db4a70
 EBUILD m2crypto-0.37.1.ebuild 1535 BLAKE2B 28a6c7f03d916220278f27330bfc737917e354711ee83d74af1725322bfb3c0ce5365460cf1fe3b16086024dab50d0180e583c60fad30224852748d1356d83cd SHA512 75f9c878ca42f19f6ffeb9720ed01983be399167e3a5f2684d166337bfed4c505014887f286068643b09d47eb1691a60c89e85d21040982d28be33b96dd1a020
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
index aea1e501c2b0..bc73a637a828 100644
--- a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild b/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
index 98a5e00e5529..149036195f90 100644
--- a/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="libressl"
 
 RDEPEND="
diff --git a/dev-python/mccabe/Manifest b/dev-python/mccabe/Manifest
index b01988a76ee6..6e0bedffc581 100644
--- a/dev-python/mccabe/Manifest
+++ b/dev-python/mccabe/Manifest
@@ -1,4 +1,4 @@
 DIST mccabe-0.6.1.tar.gz 8612 BLAKE2B 6828dfd852cf9b47de10bd889dd4c32dc1ee95910fbd27e0921cd7d9975a0831b1c2763eda5b2d77d7e4b44b5a9d0e89f0818cab71de655954cc87cacfe8d382 SHA512 d8fc251a29790887c14c5932c5172b4cd578cd37ccf14cb96e80f0b97f27023427ea032d14e1e2a99d72627b055eb285f60db69e679ecd79d90a34b0255703d8
-EBUILD mccabe-0.6.1-r1.ebuild 746 BLAKE2B 633237e22e2fd9516d06d076a2308c9acd4b1cdad7feadd446f4ffc78957675ef7ed6fd902c672bc1df0a4ba79c172fa61bcf92bfa47b00882d51fca532dd761 SHA512 b6476932275c77cadc7f5875c6eef4347bd161ff5e9a237f985263bbf3bed787f93646e7d036f9f432f9456a02cc1ac456dd093d26f5db1d8c0198a34bdf1cbd
-EBUILD mccabe-0.6.1-r2.ebuild 712 BLAKE2B ee401880b86ac5dcbf3663ce7caf1797fe7c443278efcda3b0347ebfbdec70394eba6052fc47a38ebe31ceea648340bbd8fd8d696a37fbedacf66e445a12ff88 SHA512 fcfbd75e1d2312f19647676b4515769a5fcd166e85601409b4126fcf2d9053513fb5e12403a3c61ac72180d12b983870204d104d35410b521dfbac5d7f4592b1
+EBUILD mccabe-0.6.1-r1.ebuild 747 BLAKE2B 78ce78c44296e11c1c2cbe88b9e79e4ab6bec08d632681165f76f38edcae5930bc09ce600e29284f89b353283b312016144b982437864014786ed1dda83592b1 SHA512 f200e3d6b781e8f03b372606d2c00bb490399c715486692e7de929121c9abd4a5fa634e126bd2abb86993552f8da95a77ce9acf366ccf48899b746f5d370f6a6
+EBUILD mccabe-0.6.1-r2.ebuild 713 BLAKE2B 338190ea7e340046920770ba11e91b72b4e40897e99e57a3d7f3c80046f1a0b0938fe2c30fbcf2a7fe48e319ae0cc91ac7c38dcafd06d34cebc965122e2ab43f SHA512 9a2ebfceb1edbfde03e66e500681efc64605cd53b1fadfc3218859d4e321645df0930e364c46a4d1a1233431024a39b09dcd6e6199fe222377e194676fbbb489
 MISC metadata.xml 398 BLAKE2B 868cbcff67488d329190b54ddbb2fcf9d7be6c3ed535d8437161b6ac35f067d8585d8de67874ae87615656073ab113f0bb10ecd164d32f92844cb489489085dd SHA512 a23a9f2c7bbdfee2547cba6c99cc8112d900297c76a6e2ff739177e32a1877156379f341b6c2d3565e4e503f3999f51317ea35b1ac620e8c18911c1c1e0d1b40
diff --git a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
index fdc9be8ec553..848f4303ff1e 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r1.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
index d32055af4453..e14e202a0efb 100644
--- a/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
+++ b/dev-python/mccabe/mccabe-0.6.1-r2.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="flake8 plugin: McCabe complexity checker"
 HOMEPAGE="https://github.com/PyCQA/mccabe"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 LICENSE="MIT"
 SLOT="0"
 
diff --git a/dev-python/mongomock/Manifest b/dev-python/mongomock/Manifest
index 023a3ac22517..ec8b6d8edf23 100644
--- a/dev-python/mongomock/Manifest
+++ b/dev-python/mongomock/Manifest
@@ -1,3 +1,5 @@
 DIST mongomock-3.21.0.tar.gz 116340 BLAKE2B 5f6ff23bce50e2104a7772dd692e6341398b2fe4b8be07391285074e680661228ec50368e437fec201fb62eaafb5fa588c2cf27f9554602403fea3cf0eaabc55 SHA512 777d5eb7a4ffb2caa569149c600c0eb3bde2737d734f0f934787ee10af571771be201c9cb44b3464ef550e48c035de3ed31cabb2ddac9c0cb864516256cf5c2f
+DIST mongomock-3.22.0.tar.gz 118915 BLAKE2B 98c90684a58e582601acdb2f112a4d1fbfe043f979b9b07b12649a2928fc813c0d11c8a51851b0fa87c5fdc8615c0b923b36d2557e82bcd8f668a3cfdc03a2e1 SHA512 1033d95620a5a212a698f8f0f90679a1cae7c7fca97448ab7cff223db2cf45a230d4d5c863aecd20445bc9ab189ede188ee756b13f108eef81e088c622385d61
 EBUILD mongomock-3.21.0.ebuild 852 BLAKE2B 8e9bdcec3740a4b2a3c08f999431179e7d3ac1e63e93fdf8c9ad310b4c07cd1db0bbfe4004699d4948d39dfe4e35bd46889237973f59712363bc5eaec44c8c60 SHA512 9808692de45c70bae0a3f68e8a3e5c0db027c8a4bee7f802820f5417e08c6f34ea912539d2f31878f3b524dd1402d542fa34ebb25c395eba79fcefcf3a0f7947
+EBUILD mongomock-3.22.0.ebuild 854 BLAKE2B 41830428d5637dd3b6485d16abbd097069682bdd27e65dc3229adfbf4672400a8a6dd1064edac0b8316de34cc288c24c4c0a345dd91ded9ad3761e66f233b004 SHA512 9fcc8ca838cd7da241832cb494ecdccbf515bda504b5b8dfb7851c6393c46e33aab41f27404d661e52a84420178cc98863e854710959dc873d892cd77fa49e30
 MISC metadata.xml 619 BLAKE2B 9b3bdbeeadf2a214e0e6dd41b6177080fb6ee475db19be125bc09efcfd1adb9624ed262ce3e739801eff91b7045bbcf3a51b78ba499a7c446a3ad7389493bb72 SHA512 b0bd3746abb8f97dcb9dd4893aa00612c2444fe1d39ad9b0b203f135f4422642809bee2c37e7fe3d783ced47c50bd2624c19ced3b9218127b799096ca7ee8182
diff --git a/dev-python/mongomock/mongomock-3.22.0.ebuild b/dev-python/mongomock/mongomock-3.22.0.ebuild
new file mode 100644
index 000000000000..fe73bdcae26a
--- /dev/null
+++ b/dev-python/mongomock/mongomock-3.22.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="Library to help testing Python code that interacts with MongoDB via Pymongo"
+HOMEPAGE="https://github.com/mongomock/mongomock https://pypi.org/project/mongomock/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=dev-python/pbr-5.1.1[${PYTHON_USEDEP}]"
+
+RDEPEND="
+	>=dev-python/pymongo-3.10.1[${PYTHON_USEDEP}]
+	>=dev-python/sentinels-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14.0[${PYTHON_USEDEP}]"
+
+src_test() {
+	# Use NO_LOCAL_MONGO to disable tests that need a MongoDB instance.
+	# TZ=UTC needed for date/time tests to pass
+	TZ=UTC NO_LOCAL_MONGO=1 distutils-r1_src_test
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 1a56591c8d29..01b009e5f129 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,3 @@
-DIST more-itertools-8.5.0.tar.gz 86861 BLAKE2B 6c5d7e0e2bfa89b65636115d5539ca5a36de24b7e0971638721d8fa13f6ad84f0fc64b297b5c3c30d380f78e271f6b6622d72a41ffb8f1941945d5918ec6c78a SHA512 f11a4443d4d5e79fe241fc6e170ae51b08cfb1f1093dddad036e1ba043c30d03c53ab9fccbfb4de97279862c6cfe44759ae88ce6027d871515b032e7d9e435e7
 DIST more-itertools-8.6.0.tar.gz 88371 BLAKE2B 79c9020c641e61d97c350ec9004fabfc4a94969d17c517e421f63f41aedf101217906d5bc1d397dc1ed7666143b15ea7ff0401a2a6b3fccc1d08f3cf9ff55eff SHA512 9fb6cbb1d303c79a1c67d1c473a161d71bc5d88c8ebaf290947c1a6e64c2a224478063c58ffc4d1dfdcb2931bcff9cd165bd8724a9e78e95c6f163000c138a5e
-EBUILD more-itertools-8.5.0.ebuild 667 BLAKE2B 5f27ed477db780fe6ebc3f1688e73dc25b7ffa233e19af8303e9e02efab75f9c4d908d285023d355af84f2ed86352a19819f0cf075b9d2dbd28bba6b38eba7fc SHA512 4461d23de5f7936a6b7aef06b36508ae19260b6dbd40edb83e5e3685788180c9c04690d064a365bed330322c22c222931f8e9fcd92c2ff83ce754fe12cd77e95
-EBUILD more-itertools-8.6.0.ebuild 687 BLAKE2B 264956950a151c7d44d9986d66e585af719aa3de281e682dc6ede08bdb2d64d9a74cf68b353a5862fdcd44371749d7c52d11773ad88f226173b8ea1f4a5b1f37 SHA512 faa41953b5534a9065ae645108b5b63211664d65558fd4ec52f888d479e3fa3cbfa6cee15b43bff65b124796d4baef8699fef3e0f243ab7a68c3867a9203fb43
+EBUILD more-itertools-8.6.0.ebuild 678 BLAKE2B a4d5804edfaf2269487a0e8eb8d300fcf09c01c5135d29690576f4468d52de9d4fff139741bdd84276ace34d59529d82299b60166ca48f2329ad050f6207b7dc SHA512 eadaea54adf6b71a8d655bfd7636c15671b99d239e665599bc5c3f71641461b7eaac2e151b030430e582e6221e6c57a1b2305d7a8b0b554c6f21b1107b54d8c3
 MISC metadata.xml 475 BLAKE2B de5a09fa0987ae45ca73d94cdf2ecaaee8b0f697e1cc4e1b535fd16f50a10460cd5a3293bc1a0633ab099c3ef07fc1ae0d99a2faebfe4117f0a5ab53837ac94f SHA512 3cccec99e9f80ef9751d2e19fc196a177f62a6b72ada30859fb8cc577fd362cac9b8261869b59a85ff1e8b4d9716daaf190cc97b3733f63e014d2e2c838d00e4
diff --git a/dev-python/more-itertools/more-itertools-8.5.0.ebuild b/dev-python/more-itertools/more-itertools-8.5.0.ebuild
deleted file mode 100644
index 85c32afd0d44..000000000000
--- a/dev-python/more-itertools/more-itertools-8.5.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="More routines for operating on iterables, beyond itertools"
-HOMEPAGE="https://pypi.org/project/more-itertools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests unittest
diff --git a/dev-python/more-itertools/more-itertools-8.6.0.ebuild b/dev-python/more-itertools/more-itertools-8.6.0.ebuild
index 7700620032c2..a76c0801ae88 100644
--- a/dev-python/more-itertools/more-itertools-8.6.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-8.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 BDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/mypy/Manifest b/dev-python/mypy/Manifest
index 5655dcd32094..fe932637f52d 100644
--- a/dev-python/mypy/Manifest
+++ b/dev-python/mypy/Manifest
@@ -1,5 +1,5 @@
 AUX mypy-0.790-py39-fixes.patch 6631 BLAKE2B 97f2960e231d70c7fcdd3439806ed60c9b81348e920385e7c4c0ed458877bd295199cac75cf2f5a428acefed292af57416423ce7f689667c61d0f822487c1fd1 SHA512 17e353e019064321c62fa3820a7e934a43d03bd179e0a5fc9514d55478d81ab2c851c028703478e5f9dabe2e8d8414335f27ab764bc7fded1afedb794cc09b1e
 DIST mypy-0.790.tar.gz 2082487 BLAKE2B f8efcb701b4b7533306948721968c9a01ab6c6e56ec99fe6c36e35aca50b52f29f518aee2268a628539a372b8024094ef2d4d87da580b4dd667f41133351596e SHA512 be670456bb64cd197bb6a73832b7e0fd6439ae4af128212328a41cd93d9f644a82e79ffb05bf4695e99bd9788244a24916bf765cf30a6f162cf3b471f45c25b8
 DIST mypy-typeshed-5be9c91.tar.gz 583006 BLAKE2B 08ab2b6d479ccc66493524482051e825c65c0a94ea5cac8e56a8ea1dca85eda6104e4ed3188b7d5ce1ea99058019d66a21a7e270e3ad9df694be67ea1e6a7ce9 SHA512 2912bcf66e0f550941eb9c1f34979644857448a4bec478cfc0d662e9a401ade93ccfb2f57b5348504b4d6f0f23e576da609167f1ec3a0861414fc9c7dea80243
-EBUILD mypy-0.790.ebuild 2412 BLAKE2B 6a265af140b77cf22962e3954a27dc81d3c402a3757db6a27e8676ad5fef407e207eba8f0efaabc79c7e1d581760c88485ce924bdc67b2bd902686650157e248 SHA512 3ea5570ede77337ec680074bd943c12aad100872a497c400f1245a6a0910e19c8c572974e8dcc591d6635bafade04fc5415320907c0d90059d9f2951cf6b1696
+EBUILD mypy-0.790.ebuild 2408 BLAKE2B edd9d2a5269346456c16d5098363203c79268eea59ccbff7300287dc46ef4091e572b096a50f1aaabb3301384ff1cd1b6a51f9f70aef9e4ee20047447610a28b SHA512 fbffc1f40dee6d02570bb70131b8de9e4a1be5860f4f348d8ddcc39859fe7e03d87f4ab826ec7e0f80a0048c7916ca458e9c25dac0640aea264734312c7ceb35
 MISC metadata.xml 586 BLAKE2B a75692d2b46a9bac5362c4a5111de861297ae5829654d14fa7eaeaaad8eee2ab784017e073423a0e4c8dc845f035884de80c72c73921c01d5fec5b05c3a71c2c SHA512 79916a4aa04010ce67ad08386f0b7e03dfdc6fc0a6195b376c4cd1207ccc408b275efbb3338313db467e3b8fef7abaf93445dc92defa8b9043e497216e0f1045
diff --git a/dev-python/mypy/mypy-0.790.ebuild b/dev-python/mypy/mypy-0.790.ebuild
index e2f2b8586bb0..b02145a9c92e 100644
--- a/dev-python/mypy/mypy-0.790.ebuild
+++ b/dev-python/mypy/mypy-0.790.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 
 # stubgen collides with this package: https://bugs.gentoo.org/585594
 RDEPEND="
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 26bd353686d7..1d6793ddc152 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,3 +1,3 @@
 DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
-EBUILD mysqlclient-1.4.6-r1.ebuild 876 BLAKE2B d323339107cc539b85dd150b85a917ec39e4c1680e9d517c89657d5bf0afee1f0a1b29ad4d01379eb691bba920f8f2982608baeef31f945cff3e1588e0c29180 SHA512 c6ecdcbf89e63d169d640f65f2a40519c4a3955f23e1cb724602a5cd7020e291cc57c535be452d16b25d91c74ff04f5a722e0b69df47cb149893099b49f8b061
+EBUILD mysqlclient-1.4.6-r1.ebuild 877 BLAKE2B ac2982939fcd1b55a9bdd5b6b4de93f7d4ff67397866a89dde0b630e8c78ade7f58d350454ffba91adc2bd7cc825b37497f653b22e7d6499e620550af06e6ccb SHA512 2a2974a7460ca6fcca98b7826edbef043b817d4969b807c5e4742f914aaa018a28ba07652de2e368783f1efa73ffb46b65a57dc861dfe19000a53f82e294f93f
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
index feb334e9b11c..1401887849f1 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index f4a056526805..3383d669d753 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1-r1.ebuild 830 BLAKE2B 4d1f8cacb0974bdbdd85e5629b416dad3f06498e9f4584c4d1c6aff3be11d3bab5843f7968e7770cf996fe120f4a4a2e104879d5d0b30fe0ff8700016468cc4b SHA512 bda66556d8ddd1c408f1d5a5166ccc091938ce67f4d5e4c6ac01726a48ce57dca9b8cb21172970552b69d52f1d949b4e386cb093aa9b1192bcb001f8cecb569c
+EBUILD namespace-google-1-r1.ebuild 831 BLAKE2B 5fdddc2393869f8e055cff52599c27d31f07a1dccfe9e2f2add1cb1b49c44d1a71b4bb7e1b894a00284189925659f60e6978e71d60acf732734dcfbb40f1af3d SHA512 10059bfb495b0b65de8e795ed7ce2c87f48884cedf6101c411822c9ef0792649f804b7fcfb57b608a7e2ebc752b2f6a7229ca96262e6074cc9117d6a8b337ecf
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-google/namespace-google-1-r1.ebuild b/dev-python/namespace-google/namespace-google-1-r1.ebuild
index fbf1dac945c4..552abace8bdd 100644
--- a/dev-python/namespace-google/namespace-google-1-r1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/ndg-httpsclient/Manifest b/dev-python/ndg-httpsclient/Manifest
index 9fb6241f9b0e..3969b47400f9 100644
--- a/dev-python/ndg-httpsclient/Manifest
+++ b/dev-python/ndg-httpsclient/Manifest
@@ -1,8 +1,4 @@
 AUX ndg-httpsclient-0.5.1-expiration-test-fix.patch 17191 BLAKE2B 6dd375fe61ac3b55c5660f7fa70fed69d026f148da439d1acb417cb5107f1834be3e5dd089c3daf4e658fba107e3484baef5d0d5161d803b31bb549dd8f77469 SHA512 cd78bd9c39f7b5ea12fe55cdf08351804db98c9871e2f9de9f593c1cbe167ce988c556752392d4112ba4cfe978b5f41a5dc3e8917f9247508c1f514827ffb648
-DIST ndg_httpsclient-0.4.0.tar.gz 24038 BLAKE2B 147ba36c966b2220c068ce3376bd84259807f66c57141fee4ed95457333cd9d568d19fd4d3348e7ef25d456e3f7d794f83f8302a15beb16f451aa02ef6181848 SHA512 3c0225a20c25cf0f12f03005bb79e738527c0488bb660c1eb3b55c505a0ef503002d37fcffb3d013e5f91101bdd03080a68d5805d6d29b682cc01bdc9f0e4a19
-DIST ndg_httpsclient-0.4.2.tar.gz 25062 BLAKE2B 740075cf3031547028afa3ec2e005e5430e7fbb5c2bfd444e4051c60a9ac14ecacd3048f87f546516bddc4c0403738aa3ef227b3fd763a48bca28da09a47f707 SHA512 c7d6f442242ce01f69d2386b8ed41e4e5f72a2523ecbe38785c4333405f1b000e298133ccc4169d9685a3dcdcf0b20567c8e4b2dfd36f42721d36c73ee27d90a
 DIST ndg_httpsclient-0.5.1.tar.gz 26665 BLAKE2B 1c7f0a8d41b945d2b2a51cd69397ab0943cb91e25013c931f055c5608bc3a0106a99d9b126e8caaac9f8d9b409ec117631fb23f19dfd3194b783548ce3536050 SHA512 b2b4c1b1df87ea1a94811b9ae831e7bf32af27258f487fd5ec319e0e6e0d79dfdb1f7bfadaf397d0693a8a7f0720df170a7fc946aaf10c82e3957ac5464f672e
-EBUILD ndg-httpsclient-0.4.0.ebuild 786 BLAKE2B 6967c45cc141118acb98dfe34e4067553a0931b09fd35472c32aa5ec6dfa6ad5dfe132b1d565f1057f892791096dde0891414a467f90c35c86146f37ea23c6c9 SHA512 95faed72c02e8b2db8da43931b03aeacf217c358b9ca11c97d9f702ac097227eb9383db98c906c57b4de7b28043bec3e2c26f17666795584896ffed8469a463c
-EBUILD ndg-httpsclient-0.4.2-r1.ebuild 1642 BLAKE2B 26b8fba6fc5fce373c2f9633d28f12bb2b74d6ec8bad90b497b675eb678440d408e9df97168bc3265c4d1783d9ea2337450ce5b606d1c471fd95e79359dc5100 SHA512 57d30e42f7892258da946454c3185f4ec0bca672a7fac4d0b5636892badaa95b005009fd8ef70aedfe082f655a0d39a5c50af0f328019efa1a3091df9db6dff9
 EBUILD ndg-httpsclient-0.5.1.ebuild 1172 BLAKE2B 00a079242a7765f14d3b9f954d6ea6dcd35e18d33043e5a3609c1c54c20293ce6103fb1eb1f7a7f0b6d7d80cf829afeafef4f83fa4fe73132e62247597270d88 SHA512 931e106f898cc003e210718ee0dbcab70f2c434610d84bfe2943609bd065446bbedf2040c2c8f6a5216c6ada0f09d16b21a7d60a139de1021761d981a649a624
 MISC metadata.xml 418 BLAKE2B d8bbb595e8483ff5072ad8bb4dd0558aa87e0bcc9b01dc59b5816c42d9e465ab1bbfcb5073479a06b58a2bab3d637e4ed23abeaf899c5c5be6edda057afd123b SHA512 82ae35467b503a3fc7e5382efc7f023917bcbf67b7bd9ed2a01628c76865154e46ffd9e2f7f7eefe6a161c745d0da92585082a27b88b5e957839690803e99de5
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
deleted file mode 100644
index e98c6f3464f4..000000000000
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python3_6 pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
-HOMEPAGE="
-	https://github.com/cedadev/ndg_httpsclient/
-	https://pypi.org/project/ndg-httpsclient/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/${P/-/_}"
-
-# doc build by Makefile in folder documentation is broken
diff --git a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild b/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
deleted file mode 100644
index a7a6b5a600fa..000000000000
--- a/dev-python/ndg-httpsclient/ndg-httpsclient-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Provides enhanced HTTPS support for httplib and urllib2 using PyOpenSSL"
-HOMEPAGE="
-	https://github.com/cedadev/ndg_httpsclient/
-	https://pypi.org/project/ndg-httpsclient/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/pyopenssl[$(python_gen_usedep 'python*' pypy)]"
-# we need to block the previous versions since incorrect namespace
-# install breaks tests
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		!!<dev-python/ndg-httpsclient-0.4.2-r1
-		dev-libs/openssl:0
-	)"
-
-S="${WORKDIR}/${P/-/_}"
-
-# doc build by Makefile in folder documentation is broken
-
-src_test() {
-	# we need to start a fake https server for tests to connect to
-	( cd ndg/httpsclient/test && sh ./scripts/openssl_https_server.sh ) &
-	local server_pid=${!}
-
-	distutils-r1_src_test
-
-	kill "${server_pid}"
-	wait
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# install the namespace (this is the only package in ::gentoo
-	# using it; we'll split it if we add more)
-	python_moduleinto ndg
-	python_domodule ndg/__init__.py
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index 413ec9ad0567..02778e456e7b 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,3 +1,6 @@
+AUX netcdf4-python-1.5.5-tests.patch 1309 BLAKE2B 04876bde9d60bfd48633366eb35d20dab843537673c04ff26fd979cb2de4b6cb36296c2f77b89b2227e7d103a2171827330b4dd0febcffa7aaba288b89becdff SHA512 c876c492c0d5004b1f4092ea580b11f2faf902ed5ce7bbbf16f591e76c12966c15c6616a272ee1e8026b0eba614eb2bdd4cdca495c60f7d7957228eedfae3fd1
 DIST netCDF4-1.2.2.tar.gz 679107 BLAKE2B c15ed9332bd8e4bb18c312cd4418add169716ef29b6f5c4b935c880259a6a16c8388ed7c790919bfbbee631e9e96ce4b9a9afaeabb305e4dd32028353e62207d SHA512 e09465d125077e71b8aad4332be844099c7fa29d0ea8f1dd0887f7a5e849ab778361026323466b1d4897bc3d8f8be1818cfa5f426773c765ee9c5f3728ff3da3
+DIST netCDF4-1.5.5.tar.gz 793676 BLAKE2B 15783e359ed65062464874de24b3fabf07c5666f54f979cb4abd5429cb1668df9dc5aee6d96fb171f597b670ac87ac15400549659c82754da60dc9b00ab734cd SHA512 da6ead22ca60900468fbefdb5d1e9486555e73cf4d99096227404094e94cd4d0488320fe4eb2b7944e1183c39817d9e593065297f921016811b7dc6eabb918ef
 EBUILD netcdf4-python-1.2.2-r1.ebuild 694 BLAKE2B 50dcce00d5f8cbc79672f2abe5c0379965aec03ef099618c894691f88182b6c0c23c440e817bff228ad23a3af75d098eb60a75e50e7b50a54340b5359f5d131a SHA512 8fd9372f785f22e2ba8286172ef6c7ae061b7467ba8fea72fdf6188e6901ed079445f036ce1fb6b56ceb15e4369a33901256c1a4f2cf82e17cbb01b2292f081f
-MISC metadata.xml 702 BLAKE2B a7c9b2dd81a36206430022513af169fc3819eab8923bb9fe50d94fa165ad6605bd4bbabe700e1c11612d522ad39d02bee56db03b31888969e4f871606ecb5018 SHA512 ecb1a82976d540d6a8472901456bcc634077214703ca30e52cd9cf6fe47d7ac69abbf754dcaef977ece693e5c7d8f97dd250bbe1e1dccc4c03964eba576e29d5
+EBUILD netcdf4-python-1.5.5.ebuild 1001 BLAKE2B 55b28d4e9d5c2e26422e86968dc27453fcbc246411db13ae3aec9766cb41ff828927fa1da2d064495ec666f2ba7d779c175d785c850a13165f89172934bcaade SHA512 d303f3c347966e9a08a4885dc22c11f3ef50399ec9da891bc26aaea3aa91ffb132bc9f0b9e2aa4d7c735e3a8e950bea652993b5a460a9e53999f3ad4ec260596
+MISC metadata.xml 680 BLAKE2B b380916f10fadde1beadde6b0f97dabdada2a183db75b345dc6bcc8723a24ce5b1d266048e758d02cc53bc0e92339fe359c86741212f9122a984825ebaf45e2c SHA512 5825d714a75190fef8b60360221425c5feed48220920b854f5f2e1a6489b4fa1952b7a798e42c4750b69c83902879ce263fd5b7d109ed9d43a147e6298a329bb
diff --git a/dev-python/netcdf4-python/files/netcdf4-python-1.5.5-tests.patch b/dev-python/netcdf4-python/files/netcdf4-python-1.5.5-tests.patch
new file mode 100644
index 000000000000..ff0085c7a1f6
--- /dev/null
+++ b/dev-python/netcdf4-python/files/netcdf4-python-1.5.5-tests.patch
@@ -0,0 +1,33 @@
+# tst_diskless.py fails and tst_dap.py requires network
+--- a/test/run_all.py
++++ b/test/run_all.py
+@@ -16,9 +16,6 @@ if python3:
+ else:
+     test_files.remove('tst_unicode3.py')
+     sys.stdout.write('not running tst_unicode3.py ...\n')
+-if __netcdf4libversion__ < '4.2.1' or __has_parallel4_support__ or __has_pnetcdf_support__:
+-    test_files.remove('tst_diskless.py')
+-    sys.stdout.write('not running tst_diskless.py ...\n')
+ if not __has_nc_inq_path__:
+     test_files.remove('tst_filepath.py')
+     sys.stdout.write('not running tst_filepath.py ...\n')
+@@ -29,14 +26,11 @@ if not __has_cdf5_format__ or struct.calcsize("P") < 8:
+     test_files.remove('tst_cdf5.py')
+     sys.stdout.write('not running tst_cdf5.py ...\n')
+ 
+-# Don't run tests that require network connectivity
+-if os.getenv('NO_NET'):
+-    test_files.remove('tst_dap.py');
+-    sys.stdout.write('not running tst_dap.py ...\n')
+-else:
+-    # run opendap test first (issue #856).
+-    test_files.remove('tst_dap.py')
+-    test_files.insert(0,'tst_dap.py')
++test_files.remove('tst_diskless.py')
++sys.stdout.write('not running tst_diskless.py ...\n')
++
++test_files.remove('tst_dap.py');
++sys.stdout.write('not running tst_dap.py ...\n')
+ 
+ # Build the test suite from the tests found in the test files.
+ testsuite = unittest.TestSuite()
diff --git a/dev-python/netcdf4-python/metadata.xml b/dev-python/netcdf4-python/metadata.xml
index b230a3c11bf8..a0d7a57b9d31 100644
--- a/dev-python/netcdf4-python/metadata.xml
+++ b/dev-python/netcdf4-python/metadata.xml
@@ -1,18 +1,18 @@
 <?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>
-    netcdf4-python is a Python interface to the netCDF C library.
-    netCDF version 4 can read and write files in both the new netCDF 4
-    and the old netCDF 3 format, and can create files that are readable
-    by HDF5 clients. The API modelled after Scientific.IO.NetCDF, and 
-    should be familiar to users of that module.
-  </longdescription>
-  <upstream>
-    <remote-id type="pypi">netCDF4</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<longdescription>
+		netcdf4-python is a Python interface to the netCDF C library.
+		netCDF version 4 can read and write files in both the new netCDF 4
+		and the old netCDF 3 format, and can create files that are readable
+		by HDF5 clients. The API modelled after Scientific.IO.NetCDF, and 
+		should be familiar to users of that module.
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">netCDF4</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.5.5.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.5.5.ebuild
new file mode 100644
index 000000000000..1bcc154d3094
--- /dev/null
+++ b/dev-python/netcdf4-python/netcdf4-python-1.5.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1 optfeature
+
+MY_PN="netCDF4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python/numpy interface to the netCDF C library"
+HOMEPAGE="https://unidata.github.io/netcdf4-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/cftime[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/hdf5
+	sci-libs/netcdf:=[hdf5]"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
+
+S="${WORKDIR}"/${MY_P}
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" run_all.py || die
+}
+
+pkg_postinst() {
+	optfeature "HDF4 support" sci-libs/hdf sci-libs/netcdf[hdf]
+	optfeature "MPI parallel IO support" sci-libs/hdf5[mpi] sci-libs/netcdf[mpi]
+	optfeature "OPeNDAP support" net-misc/curl sci-libs/netcdf[dap]
+}
diff --git a/dev-python/nose-exclude/Manifest b/dev-python/nose-exclude/Manifest
index 5c43ab15466e..78c330bf3bc6 100644
--- a/dev-python/nose-exclude/Manifest
+++ b/dev-python/nose-exclude/Manifest
@@ -1,3 +1,3 @@
 DIST nose-exclude-0.5.0.tar.gz 7359 BLAKE2B b47087f0af6a41f8a432c2e46b4a8ab3229dc682e11625d99b7d1aaa05d2cb0283acc95d9ce5eef3a071190c47dbcbd3e9d5e3ac7785e48d809a7962c27e4866 SHA512 2795f2f42430f8622fdeb46accf4a75853f8202ce1849852ec4b1a6e26aeb20accb8c2ec4faf3dad0ea174570fccd67d51140587ee9f47c905eed5d8a2963356
-EBUILD nose-exclude-0.5.0-r1.ebuild 571 BLAKE2B 3069d3a87e64edd000b3c1172965c62e765b55d38f83651814db5e0f32890eec7d28983d7e4c89a6a35e52a01d027f0134d04b3dafc70d54526b2b5fd8c7c22d SHA512 381b4dd159648d2623a57de4909aedae3b80a0f77305f8752c202da5e5c317c204ac6ddaa2f9927bee83d850d1664f0cbbc79dc78988b19ab1b9f2dbb4689085
+EBUILD nose-exclude-0.5.0-r1.ebuild 572 BLAKE2B be7ba35c0a8ee66ac41fdf67bb994adc74c8b2708bb475b2dfb646d534e5f70acacd37d0735c42c1d286af92a6935223bc41fa2c4338ae1ddf5ef73275bcd987 SHA512 56aa63f797c5d0485e1bd9f8cab6d59432b24c14e3555c7e47265c5d626fb67694d4f22eddf9b12139004a42095bc239860b3ee56bd90407adaca331f526566d
 MISC metadata.xml 600 BLAKE2B a1c8deb7fe22b02ce8f542d59af02faa7216b6f461dc995378fd9e10c19559ea5ec7b6c9266d13ca156babb29ea47f044f3b4bae39203685f4f748c80021c9d2 SHA512 6ce849dfed4189aea8b6832400b3dbd9fab82ae7a9c0bf08db77e0386ff7bdaada853a7f2837daef0f2ceb1bf1565605dfe24b33338d78b8d5ca353e3cf34264
diff --git a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
index da187c64917f..dc9a453de6af 100644
--- a/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
+++ b/dev-python/nose-exclude/nose-exclude-0.5.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 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"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index bf5c0e11796b..f2f4f57d5963 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -2,6 +2,5 @@ AUX nose-1.3.7-coverage-4.1-support.patch 950 BLAKE2B 451402abfaf917b42584fb2530
 AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd619b1bc01da05a1a81e95d3d9dfa097b131727229a05228315252a67c57ab15aaf2dc90df59c7ff3c726ae62f4a5ef86776bb87 SHA512 032c4c291edd76bb594329578e57483942ced2a46c3f6cd4e914d905f3894e420cc4da0ba2a63c266c81dd4d8f40b8df180f56ac75cb3c5e83e0309bbac573b2
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
-EBUILD nose-1.3.7-r6.ebuild 2387 BLAKE2B 479cc00c1b69dff7f4fbedf8110af6119d1ba40930784e675a95f8c41218c263deacf7691f64c0524a0b6d95b27bf018531425a0a6cc8031a1f924c9b5cc48ab SHA512 69609e3551fc66d5f7664775b9e9e441e1179df1ed4398ab8b53a9afea13e828abd36419036033d2fc954c4d680ca3d02c887fbfac95d66b35f4d215892b0947
 EBUILD nose-1.3.7-r7.ebuild 2314 BLAKE2B 63645f3d141042611f477c0928de99a82957542a3750fb8aee3989dfff9a52c52b9bacb007c8c0ee08149ffc0a698e23a8842658d2382e1fc8509af0e16581e7 SHA512 a7e290951ae606888d9715368de4002f62e2cde14bd206bb801371e04aaee96e150088758bae60660d77be09687691c23d56b313be09e45cc550eaaff8069ce1
 MISC metadata.xml 524 BLAKE2B 90a98bae0d27a49c51aee677f8bdebcbee461d74fad0f349f73458229098ba3038705d63a88c59f90ef8621931e5d3902c0209bd627c28d2b0296deaff4af75d SHA512 4dc9346469b9b3a0b87fffe49db530107a019bd798fba0620b671d71a43805537face8451c24d6ad40bf11ed3498d8970ddc1ce3109398534c9f3c8ed72743e0
diff --git a/dev-python/nose/nose-1.3.7-r6.ebuild b/dev-python/nose/nose-1.3.7-r6.ebuild
deleted file mode 100644
index becd426346ef..000000000000
--- a/dev-python/nose/nose-1.3.7-r6.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
-HOMEPAGE="
-	https://pypi.org/project/nose/
-	https://nose.readthedocs.io/en/latest/
-	https://github.com/nose-devs/nose"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="coverage examples test"
-RESTRICT="!test? ( test )"
-
-COV_DEP="
-	$(python_gen_cond_dep '
-		dev-python/coverage[${PYTHON_USEDEP}]
-	' python2_7 python3_{6,7,8} pypy3)"
-RDEPEND="
-	coverage? ( ${COV_DEP} )"
-DEPEND="${RDEPEND}
-	test? (
-		!hppa? ( ${COV_DEP} )
-		$(python_gen_cond_dep '
-			dev-python/twisted[${PYTHON_USEDEP}]
-		' python3_{6,7,8})
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-python-3.5-backport.patch
-
-	# Patch against master found in an upstream PR, backported:
-	# https://github.com/nose-devs/nose/pull/1004
-	"${FILESDIR}"/${P}-coverage-4.1-support.patch
-
-	"${FILESDIR}"/${P}-python-3.6-test.patch
-)
-
-python_prepare_all() {
-	# Tests need to be converted, and they don't respect BUILD_DIR.
-	use test && DISTUTILS_IN_SOURCE_BUILD=1
-
-	# Disable tests requiring network connection.
-	sed \
-		-e "s/test_resolve/_&/g" \
-		-e "s/test_raises_bad_return/_&/g" \
-		-e "s/test_raises_twisted_error/_&/g" \
-		-i unit_tests/test_twisted.py || die "sed failed"
-	# Disable versioning of nosetests script to avoid collision with
-	# versioning performed by the eclass.
-	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
-		-i setup.py || die "sed2 failed"
-
-	# fix manpage install path
-	sed -i -e 's:man/:share/&:' setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	local add_targets=()
-
-	if use test; then
-		add_targets+=( egg_info )
-		python_is_python3 && add_targets+=( build_tests )
-	fi
-
-	distutils-r1_python_compile "${add_targets[@]}"
-}
-
-python_test() {
-	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	use examples && dodoc -r examples
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 9a0f5b340802..7aa7276ac2df 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,5 @@
 DIST numexpr-2.7.2.gh.tar.gz 118982 BLAKE2B b032f00c36ffadb88cf9a4cd6323137b920bce48ec73f88f006d3186f9a8c1d75a11ceb6bd32f412cba5c10cbe3cb518cdbdb19ef022100fcc408fc82ede9881 SHA512 41946df6d642e226b4a38b11d5db67ef91d63d56b33d3b52f09377c022d236ea4e9a5aaaf380737d18405ee25109260ae60f79d0c9465b95de14465f41c40075
+DIST numexpr-2.7.2.r1.gh.tar.gz 119099 BLAKE2B d424dd89761ecdad3e5a35a5c8b41f089c6eb7c9ca10a4309fb489bb7ab60c0b77863c1675583014265c057e27f3b9584a35e0ac6232044ed5f8b8c32fd330d6 SHA512 d786aeb3597a6b2196e92f364934a0bbc518c7973252c38f1e93c317d55220270b5d61320d7a465c87da979ec68e988b25182d527e0e96aa3a898f20a6997802
 EBUILD numexpr-2.7.2.ebuild 1221 BLAKE2B 561357cc6f57f4c85d7810dcf7286d89668885847ff5329c0fe996ec3a4d4bc4e1fc6c1f6d1139d78c6b42c8b1f5f060828ca10682287f345f461ed075f7d527 SHA512 f00f2d0bd83c71f95b8e8b1240ba76c4b0cc33a116b30ef5a3ca1dfa92d50ebe7e646961b245434c2d9fc5be803a1d90e8720d80bef41081c062581ecfc8f7e3
+EBUILD numexpr-2.7.2_p1.ebuild 1255 BLAKE2B 58351c734d9227325a282a1ca7e15b65bf1bffbf117aba209a1824a4ff458d43d24097b4ab1d69ee2fead7a1820a4a25024208f432e96bdf6d4b11abb24e6e78 SHA512 4e8cc06db26d08ce6e33f824c8b7969481e21f695ad1ad6f504bbb1727f15e5a344d8983a909e72ee503a58f1cb07490045339fe6fae9a1889e55254947d743b
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.2_p1.ebuild b/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
new file mode 100644
index 000000000000..baa034dc390b
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.7.2_p1.ebuild
@@ -0,0 +1,51 @@
+# 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(+)"
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="
+	https://github.com/pydata/numexpr/archive/v${PV%_p*}.tar.gz
+		-> ${P/_p/.r}.gh.tar.gz"
+S=${WORKDIR}/${P%_p*}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="mkl"
+
+RDEPEND="
+	>=dev-python/numpy-1.6[${PYTHON_USEDEP}]
+	mkl? ( sci-libs/mkl )
+"
+
+python_prepare_all() {
+	# TODO: mkl can be used but it fails for me
+	# only works with mkl in tree. newer mkl will use pkgconfig
+	if use mkl; then
+		use amd64 && local ext="_lp64"
+		cat > site.cfg <<- _EOF_ || die
+			[mkl]
+			library_dirs = ${MKLROOT}/lib/em64t
+			include_dirs = ${MKLROOT}/include
+			mkl_libs = mkl_solver${ext}, mkl_intel${ext}, \
+			mkl_intel_thread, mkl_core, iomp5
+		_EOF_
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" \
+		-c "import sys,numexpr; sys.exit(0 if numexpr.test().wasSuccessful() else 1)" \
+		|| die
+	pushd >/dev/null || die
+}
diff --git a/dev-python/numpy-python2/Manifest b/dev-python/numpy-python2/Manifest
index 318a954513eb..504aab5648d3 100644
--- a/dev-python/numpy-python2/Manifest
+++ b/dev-python/numpy-python2/Manifest
@@ -4,5 +4,5 @@ DIST numpy-1.16.6.zip 5143340 BLAKE2B 2c31473551aaf00e7d3175ce37463ce0f14ff3e77b
 DIST numpy-html-1.16.6.zip 12190671 BLAKE2B c24586a40bb05fdb2f2f092778e01f7c60b17d2c695d0fb8577e988778ad80b711edf7e067a20c699946344a50febc152ab586f4653b80bcbeb489650dafbd1b SHA512 ad25e7b91b992af78a6748f12d6fcbe153d96cb8667d5dc4a6b6b2a6105e24a11c32cbf63dd3314ed4aa9b65a55ec5b3a51cd7763af5dfdd133510ddd6e4ed16
 DIST numpy-ref-1.16.6.pdf 5183393 BLAKE2B e92a8a7a32ab45d2fdfd6760e62d8d9b5b3f89e202a29e18ef1b6ce49ec56bbfea0e48e0c47b4c35cad02783fa1db33726a0f4fed4a50b0d8ed84babced8b79e SHA512 66dbb684f4140874d19826b479c781e16e7992a7cec46137f785f9a8fa071911966fbb3932cbcdcd040bbb5fbefac8c96d511ef623a57fc268aac9331aae8d22
 DIST numpy-user-1.16.6.pdf 621980 BLAKE2B ec735ff7057935d3a7f33f291792b74618f5dc10ee091c434f49c77e58f683821af9cce46286564ac9b8cb0111498f9d1b657d0c343e0a4313c3f895982dca8b SHA512 ff03719c91707a39b4bc388558838f72d4412f34dd0b07f2a0b2cf8fedac6811e8789985013cf1f23c7a650f115655f71e9cadc51ef4e7ae6e49d7552752409a
-EBUILD numpy-python2-1.16.6.ebuild 4171 BLAKE2B d6244afea795e38fa927ceaba1778fa414b2b078099c289a7294f54cbd47fd294e6aab6e408f83a1d2870b8bb45d950764a3318be4fe1526aa2661626772e3ec SHA512 f3deec79d27718ccd6d8a934b2c0d8f073e96c8c5beee5c15aac8e34f28a5711bb1ef39997580c71f317b29b641ea717f2ddf89afee1a57beede874df1f289c4
+EBUILD numpy-python2-1.16.6.ebuild 4172 BLAKE2B 799b286b170be06d8d7ab24c0dbfd16586f358bc50b4b42992faac66a10343407a6e491cb6525361b62958af70b73733099365c3ae871ae0b7f2ed4380a48ccb SHA512 177f75f493e5affdce8db3874ac81304520ae4d748782c9f8b2142533ce3f9fd7a2a5426c19caa7938af9b5e01815f97911bda4990f999fa1bc0cf0b9c11ad83
 MISC metadata.xml 366 BLAKE2B e9091f018d33b7d7addac725b90adfd9007e90144f7cdaac94b25e4783e6c11c33d754f8edb8932d7f6ffce0e0371b1711abc7d8ec91117a1fe6b64067c29517 SHA512 3bcabbfdd7196ad70ff9c4ae84f3a6b46b14457140e5b7d72c0b1dda202ddc2a77773dad81eafeeee5228298342c04c8f1f36c421802214ee1f62e6cad9b1222
diff --git a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild b/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
index e103d561cbc2..e8b753348f8c 100644
--- a/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
+++ b/dev-python/numpy-python2/numpy-python2-1.16.6.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 RESTRICT="test"
 
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index f797445d26a8..e96f579db6a2 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,14 +1,10 @@
 AUX numpy-1.17.4-no-hardcode-blasv2.patch 2420 BLAKE2B e4c0058b1226fced2c38caf67b2843021c6f42773781668a556eb48d7038acd0b1c7cbf30a432fdc3f4d2abf8eef28df7102be1bc9669a4ddc4ee4fc5e239d68 SHA512 9c6dc7e4f5b28b24ac5e1c686066c973b218b0e4e07b500a52c8b3e247acb150714072d17dd1a8579f47c48e9776bddebf9f049616aca52e0325c8f09ef09dad
-DIST numpy-1.19.0.zip 7296082 BLAKE2B e388a1b8aa8fa5e23b57c69c5aa5f2b7b286a69fca6007843adbfa374d541ace7875757a302e851bc41194f565390b52777fff13da8166e7a2c6b0a0f3efd29c SHA512 24f8847ff6b72dd44db197fbd80596677f9f3c5afcc87f30c41a4c0a2ccd4ee652ca630a537997ba8fe68c4919fa488e9d8cadd9a310e5356b017f6086055850
-DIST numpy-1.19.1.zip 7301568 BLAKE2B f7c17666d8cd4f477d7946be383d2ff1656c412e23dc49c55f94a6fcb95a6cffe6b4958169b1b27e027a7d674feb96de979d8bba4f1e3d9daef9b72e7f48cafa SHA512 ddc5f5e262d6f7f6e1a8879165860427baa237b6aad5b09d5b943a36bb0d5922424aac4c0e32a2cc3e14087bf6eb671988b6ff6df0d9ab8c89724e093220eead
 DIST numpy-1.19.2.zip 7310530 BLAKE2B a019c64809bd61071a4dd5e10c2cdf6927f392ebe58b45a08529295079bca68a683502aba89847578e122271d2fa4ea6d2d5461f1e58322f550cda863d36125b SHA512 56ae348f08818e30b6675df7d41a2b03687af452d7a96356fccfce2994843c7b61918946381c3af25fe03f209413d0378ee691fc38d805491a12c464e49bb59c
 DIST numpy-1.19.3.zip 7315638 BLAKE2B 77f5ab83bfc69fcdb1c1bc0735e46914619be9e8291eb8ded3d5fa98694080f5272692453803b3924b371611014655f4532c85126c29ce1a84a4b807371cbb17 SHA512 9595e5adbad5debc7edb9fe2d4c511111a92413b6c3e5086c7dfb2f68974c0493d2dd2cb1cb8b07486b1f4fbef324fbdfa54f80a4c4cab66215980a40440f79f
 DIST numpy-1.19.4.zip 7315971 BLAKE2B 4809ad6aaf7f9893ea6ed4c2456f4827aa5728b9dba00ed4c8e517267dd299933ca6c9205e3e31ef61ba25a6c13dde32dbe7d268c2d54391bd532d368bb3c5e8 SHA512 ae8e6b2792022c147159a11188f9702fa9fa9c9707c834da4f21aa43752451509b0a5b8807d93dfa86dff7e95c127dab20e4f372336a66f25f9b56c2869a486f
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
-EBUILD numpy-1.19.0.ebuild 3726 BLAKE2B b7ff98d3782d037656a810490a46f8d6a1f9ffa407577b910fcc7a06ce900390d341a06213c5f8d3b6073c7b20053f151f65636beccb07cb055e4dd5a965cc9c SHA512 36ef418f6e17a0cb364bb0f5cef4890fdb84d3a2b748733e35f576574a84cdebfb1e086b8764aa6a14ab887d1730f12cd7f6550a70a792d942622b7ed8602407
-EBUILD numpy-1.19.1.ebuild 3734 BLAKE2B 39e3d88c8f374fc7c6a3bfaaf71c33ffe711891e6bfab8074ee7bf65d39bcc71b1452397f770c56bd4adbe84ba994c5ae14e52eb0b7b3c89b06623eb271c3184 SHA512 7468e68b5e4c1e0a85566a1ecfab03127a06998b34a548202cc78be181219c90dde824a150293464d942ee6a8051d67815c7b968ccf9f4f351198ef20852a561
 EBUILD numpy-1.19.2.ebuild 3734 BLAKE2B 516cb3fcdd3d26da409ef8bf3522f8638ecaf4e02fff6025311d3fe874f114e95cfb88a0b167c4058d214aea6d805ea6b914d574e2af90b859901b94dd109832 SHA512 4e77f799e2600998180438b6cc6f7f3a224f5b342f78cab23bce5abee59b36f16e9646829a3ef9f3bce7daec6eaf8a07625369924b87dd4829cd0f7b60f26e9e
 EBUILD numpy-1.19.3.ebuild 3734 BLAKE2B 4b9b8959e74734c345637f661bd3b92bf05cd2c189cdb62867a1c535803e6081087d54f4287f8c678fb93ecbf392412d0f812f88c5cdca40eb00401945aa1b6c SHA512 5d09662fbfe7da320b3da3b39863f6f71383dc02b68aa20248fc377946757755e023b94ae267ee10c2e63dfd4e9bf03711a88c0b2f127ae4ed58fe6b70c412c7
 EBUILD numpy-1.19.4.ebuild 3735 BLAKE2B 92e140e6010ebc0b866082b0da267c4ccdd2e6c824895fd70669adf866e7779457a977d74fa54972f113fcbd9fcbec0e538ef59f04afc5ade1ed44d4766334c4 SHA512 70e637310264d4d34db4084fbe508286acd233c72d59ae51aad6d9a9a1f27e4cfb61ae61457cff4cb3e639143fb6f33e7119b67644d4fc758d0b2381312e4136
diff --git a/dev-python/numpy/numpy-1.19.0.ebuild b/dev-python/numpy/numpy-1.19.0.ebuild
deleted file mode 100644
index 099367952cc5..000000000000
--- a/dev-python/numpy/numpy-1.19.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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(+)"
-
-FORTRAN_NEEDED=lapack
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.15[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	"${EPYTHON}" -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/numpy/numpy-1.19.1.ebuild b/dev-python/numpy/numpy-1.19.1.ebuild
deleted file mode 100644
index 6489c02f0d1d..000000000000
--- a/dev-python/numpy/numpy-1.19.1.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# 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(+)"
-
-FORTRAN_NEEDED=lapack
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
-
-DOC_PV="1.16.4"
-DESCRIPTION="Fast array and numerical python library"
-HOMEPAGE="https://www.numpy.org"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
-	doc? (
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
-		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
-	)"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc lapack"
-
-RDEPEND="
-	lapack? (
-		>=virtual/cblas-3.8
-		>=virtual/lapack-3.8
-	)
-"
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
-	lapack? ( virtual/pkgconfig )
-	test? (
-		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
-		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.17.4-no-hardcode-blasv2.patch
-)
-
-distutils_enable_tests pytest
-
-src_unpack() {
-	default
-	if use doc; then
-		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
-	fi
-}
-
-python_prepare_all() {
-	if use lapack; then
-		local incdir="${EPREFIX}"/usr/include
-		local libdir="${EPREFIX}"/usr/$(get_libdir)
-		cat >> site.cfg <<-EOF || die
-			[blas]
-			include_dirs = ${incdir}
-			library_dirs = ${libdir}
-			blas_libs = cblas,blas
-			[lapack]
-			library_dirs = ${libdir}
-			lapack_libs = lapack
-		EOF
-	else
-		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
-	fi
-
-	export CC="$(tc-getCC) ${CFLAGS}"
-
-	append-flags -fno-strict-aliasing
-
-	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
-	# with the subtle difference that we don't want to break Darwin where
-	# -shared is not a valid linker argument
-	if [[ ${CHOST} != *-darwin* ]]; then
-		append-ldflags -shared
-	fi
-
-	# only one fortran to link with:
-	# linking with cblas and lapack library will force
-	# autodetecting and linking to all available fortran compilers
-	append-fflags -fPIC
-	if use lapack; then
-		NUMPY_FCONFIG="config_fc --noopt --noarch"
-		# workaround bug 335908
-		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
-	fi
-
-	# don't version f2py, we will handle it.
-	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
-
-	# disable fuzzed tests
-	find numpy/*/tests -name '*.py' -exec sed -i \
-		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
-	# very memory- and disk-hungry
-	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	export MAKEOPTS=-j1 #660754
-
-	distutils-r1_python_compile ${NUMPY_FCONFIG}
-}
-
-python_test() {
-	distutils_install_for_testing --single-version-externally-managed \
-		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
-
-	cd "${TMPDIR}" || die
-
-	"${EPYTHON}" -c "
-import numpy, sys
-r = numpy.test(label='full', verbose=3)
-sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# https://github.com/numpy/numpy/issues/16005
-	local mydistutilsargs=( build_src )
-	distutils-r1_python_install ${NUMPY_FCONFIG}
-	python_optimize
-}
-
-python_install_all() {
-	local DOCS=( LICENSE.txt README.md THANKS.txt )
-
-	if use doc; then
-		local HTML_DOCS=( "${WORKDIR}"/html/. )
-		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 6aeb0117b619..ec9e2a3f677f 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,3 @@
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
-EBUILD olefile-0.46-r1.ebuild 553 BLAKE2B fa7a66540df05545ab8991a400d905b305c436d24c06e8a14017f49a8e1837e28256b50a17d3d5593f0424b587a845bd07efe32edde98ca8ee260d350def387e SHA512 051bb35b7299ab790d46cfcbfe54c8f44d0e81aa8fa0ec08301710a41ff1af6bd309d81a835e6ef69eabe5466154f60d7c7718f2012b497e20263fc8ad4e461b
+EBUILD olefile-0.46-r1.ebuild 554 BLAKE2B 199dfd2c484ab63b25cd76cd1947d5c39d8c385af30b3d23fd9c6eb700a789dfd375085e9f69e5a8bbc6886f6f620d8a8d906de5fdfab8627e2c4e22a43403b3 SHA512 d867c3b28a4db3a4d848cb220c9bb968d83604d620438cb5fd40eb69cdba3fe1aeeccbf9311be4e2d782239b55385952bc5f4e7e2fc555a78adcedea7c33b408
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.46-r1.ebuild b/dev-python/olefile/olefile-0.46-r1.ebuild
index cf09eeb237d8..ed253e6051da 100644
--- a/dev-python/olefile/olefile-0.46-r1.ebuild
+++ b/dev-python/olefile/olefile-0.46-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-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"
 
 distutils_enable_sphinx doc
 distutils_enable_tests unittest
diff --git a/dev-python/ordered-set/Manifest b/dev-python/ordered-set/Manifest
index 18b49bc4da0c..dd827610b85c 100644
--- a/dev-python/ordered-set/Manifest
+++ b/dev-python/ordered-set/Manifest
@@ -1,5 +1,3 @@
-DIST ordered-set-4.0.1.tar.gz 10607 BLAKE2B e9bb24f8709c73099b83ee27abe30193ff1b530cd92fe3f2a43bc25212542d80e459fe404aa97aa7447ef52ea239153d427087f1ed517a7e7c8e18d68f27d0f2 SHA512 6ebe758efba7b847cce4a06001e84bf4a60728ae5d088cd7e3a2ebab86a6f5aa6a421bfda1cea0e8751bafd60eac1b3f2ec14e74a7b71f469dc7851aafe52235
 DIST ordered-set-4.0.2.tar.gz 10658 BLAKE2B c07a4f48a6b0bf74ab11dc25a2d85c401bbcde825b63ff4d6e3e6ee12139f22d803bda3db57937ad3760c0c665f0ec3b44bcaab832c2604148dd0add350f515c SHA512 d7031ae90fdaf116c27415170a7197be34ff4b977a03684a6fb53dc453845a97cd32b9666ed3ae58fb7bc722ff3b2b4f2e156578841033759b490b359a5619b4
-EBUILD ordered-set-4.0.1.ebuild 426 BLAKE2B 903b2ccaac7e385825ca5b0b42fee4f02d35a368a35fb8ed4b9aac0e0d2694371a5f705e9f2a3eb0ef758948c19dc6a18dcfbed39f940840dec4dc6c17d70c77 SHA512 1fb07f596a4f97d7b69dcce7b4ee2dfa1794d9bf75832a96bcf912e82ff0465755dbe15a0e1087fd2a339ec768e197a415eace34bcead6043901a02f5871d91a
 EBUILD ordered-set-4.0.2.ebuild 426 BLAKE2B 903b2ccaac7e385825ca5b0b42fee4f02d35a368a35fb8ed4b9aac0e0d2694371a5f705e9f2a3eb0ef758948c19dc6a18dcfbed39f940840dec4dc6c17d70c77 SHA512 1fb07f596a4f97d7b69dcce7b4ee2dfa1794d9bf75832a96bcf912e82ff0465755dbe15a0e1087fd2a339ec768e197a415eace34bcead6043901a02f5871d91a
 MISC metadata.xml 622 BLAKE2B 1167641a84aab10005d9444ace4e2029b90db6d321b48541ce3d77330d10ad4c7e6bb5e8eb86b30772b745d27e31b3ab90a476f268eb834d414dcab3e68c6a2f SHA512 ffb270f086a8b81c1168ee3ca44e88dd0ff3f36d6aeb8695eb28f5c11ef7b23695e83eda5bd1c9aace2ba421e96ee2cf138674cdae97fa3b75cb696c0a9a4722
diff --git a/dev-python/ordered-set/ordered-set-4.0.1.ebuild b/dev-python/ordered-set/ordered-set-4.0.1.ebuild
deleted file mode 100644
index ebb2d1a64615..000000000000
--- a/dev-python/ordered-set/ordered-set-4.0.1.ebuild
+++ /dev/null
@@ -1,18 +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,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A mutable set that remembers the order of its entries"
-HOMEPAGE="https://github.com/LuminosoInsight/ordered-set"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/packaging/Manifest b/dev-python/packaging/Manifest
index 4c08ae4abe80..00228efe9f62 100644
--- a/dev-python/packaging/Manifest
+++ b/dev-python/packaging/Manifest
@@ -1,10 +1,5 @@
-AUX packaging-16.8-distutils.patch 447 BLAKE2B ee667f6aed01fc273092b896acafc676e399a2bf8e68324e1f08d20738863e272a8ab13bac2e40d1216f44296711281a177c1382337d27d439873230aa323ea8 SHA512 080a1af701c81f694beb336e6239661d04932db904cc6c0ea7e9fd2c2d0e9a42ac3690dfd64eee745c12368f222d20d4b2cdd9d578d7a3b7142924f41b1887d3
-DIST packaging-20.4.tar.gz 74402 BLAKE2B 3c667c1605445aec37d264ec3846a1a6678f13a12aecc09a6d16e09ea27041fcd65d23538acef4f6272ab0458ce479c42906b15cb6eddd9c8001b1970c23e4fc SHA512 d53912041a9950efb5d221fc968adc328c2ef1e54ec9806d2158fd6db1b170e37afb05213f5750b10c59927504083ca3781c958caa0c802b1c7c0fe1ac1682a4
-DIST packaging-20.5.gh.tar.gz 75111 BLAKE2B b088b85fc042b48337878c0f663934f32f90eb792ba53257b1b0879a097ef042b67a9cff56b23f5e0187a3df0f89092e0210939382851f0ae917f6ef00ad73ff SHA512 ef3c4853c30d9635b9372d6861cc0df8f7fc5a1d784e5f3effe3f315da0f24662ac939e70f55c6e9bb8864da95b9f75bc0df093f12c0f5c2af654b5354a5f081
 DIST packaging-20.7.gh.tar.gz 75182 BLAKE2B f3ba27ec33db576273609f28aabb5edab4acd07d8174c96e3a1608eacdc1a571d2ce96cc4e38c50c964ae5a716bbca077effd6dea039b25ac7bd6ce5707ae08b SHA512 4da8f66af066ac92b47664d21af34a02526cd1639cb766927670bec0ac8c7416116834c847678a29862a46faeda7e2f2393744be315cdfbbb8bd55a04ceb942c
 DIST packaging-20.8.gh.tar.gz 76310 BLAKE2B f6a220bf8ed61e4ced5cdb93eac8a83310d5c1abc11861e3eca64ef08e3fa2617a9dedd9006fd833df37da5bd7a33c216fb78b9151b1c72121fbb0a27e7b88d3 SHA512 77c77da9298635274de58b856b8738ab279749f736264212e6ecdeab47db607ea9c6ae696952f0702e9557d1fd2b89c7277a2c81ff55081593f49ebcd6eb74d4
-EBUILD packaging-20.4-r1.ebuild 1403 BLAKE2B 32cdfc7e75e27420dc234bbd1695b21e8b7183941ab590d6eae30d16510d93f323580c19c0ff00da78c6c352e8fd82d610dc6b5bd2f913c7d277c71126b0fc0d SHA512 9aa1b1e682839c0d23f514fd66d9436257b77c2cdcca975106e544ff057d71f84d8c52c8d108d2b996b7341669a07cbf98c64eb37754a6eeae473312d93b5a39
-EBUILD packaging-20.5.ebuild 1012 BLAKE2B 8aaa25b51d42e8ead7aca7ccc20f2fe2f42a00a152bb9cae41a1a724b41af864252e4de09e5a395294dfe6e950a789e06379cf816e2c607687747b1c451103dc SHA512 6f104ac4154b63e8715f44a43be0337e55d565eead686283b795cb5ed66e31ae32607d1039de3116a327ead44575beb22d039f93942ef0adbbda961d6c6ada2a
-EBUILD packaging-20.7.ebuild 1012 BLAKE2B 8aaa25b51d42e8ead7aca7ccc20f2fe2f42a00a152bb9cae41a1a724b41af864252e4de09e5a395294dfe6e950a789e06379cf816e2c607687747b1c451103dc SHA512 6f104ac4154b63e8715f44a43be0337e55d565eead686283b795cb5ed66e31ae32607d1039de3116a327ead44575beb22d039f93942ef0adbbda961d6c6ada2a
-EBUILD packaging-20.8.ebuild 979 BLAKE2B 7a592c137327ed78fd4e5e275c026ee3fd86a6df9f5470a3c69c247977ffbdae6f4e8d048960950f2411c6c87a4570d8d49b6a9cda003432f74656e7e297bd19 SHA512 91ce39242d04758fe28f7a115c6c879f56abf60ee3d1ba9cd3fbc501b19529df30f9a43fef4fcf41f61f9d00ce6a6785899c0f9b35b30fdd760ea4fa179a4424
+EBUILD packaging-20.7.ebuild 983 BLAKE2B f80b8e323c26aaa0ae8b999f618da39e59211108ee11acbec1bc05b296c5f3f1492402f2e533c20014616902a816dc4df5799fcff98ca605d5036a496fa90bb4 SHA512 10aae20053614ae2c346a81e816b0f61737083c3c3d563b2166df19606ed169ec5f7349cdb08cdf7b0c0d73811f5453fc8fe3799cb27b926beb0051bce1cf847
+EBUILD packaging-20.8.ebuild 959 BLAKE2B c09de0daf169e9c0d414c9ff417880a1a229f705af7f2f2f6596cb469edf40d456ead643f2f759d1aca3464f24257a840d5151981305ec0f7e13a6ccc555a6c0 SHA512 87e883efc98473cd5c52277c39dc67c36ee1ca7f413d63f49e5e36c3484ef99e4ce534135124dfc61d6522f3805c233be9674e6d4effdc6260fe32eea1f72484
 MISC metadata.xml 390 BLAKE2B 98afec1f8a7889d12e1a44ef1ff2bf1db635818b7fcb8d86dff0d820fc8fc92920615cd5de63f35cbb6eae6c29f8d6942807f0a7bd48b320c9a0d55a7fa0de69 SHA512 d082f5d387c5d71f0f6cfca4572d4637081daa863186d8b05050738269559617b910c95de97ac3eddd41434cc528e34597125a6973b7b239734c91bb2c588235
diff --git a/dev-python/packaging/files/packaging-16.8-distutils.patch b/dev-python/packaging/files/packaging-16.8-distutils.patch
deleted file mode 100644
index 84bbb618a6fe..000000000000
--- a/dev-python/packaging/files/packaging-16.8-distutils.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -13,10 +13,7 @@ import re
- # dependency when projects attempt to unbundle stuff from setuptools and pip.
- # Though we don't really support that, it makes things easier if we do this and
- # should hopefully cause less issues for end users.
--try:
--    from setuptools import setup
--except ImportError:
--    from distutils.core import setup
-+from distutils.core import setup
- 
- 
- base_dir = os.path.dirname(__file__)
diff --git a/dev-python/packaging/packaging-20.4-r1.ebuild b/dev-python/packaging/packaging-20.4-r1.ebuild
deleted file mode 100644
index 5fb38fce3dcc..000000000000
--- a/dev-python/packaging/packaging-20.4-r1.ebuild
+++ /dev/null
@@ -1,51 +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,8,9} pypy3  )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="https://github.com/pypa/packaging https://pypi.org/project/packaging/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-16.8-distutils.patch"
-)
-
-python_test() {
-	pytest --capture=no --strict -vv || die
-}
-
-pkg_preinst() {
-	# https://bugs.gentoo.org/585146
-	cd "${HOME}" || die
-
-	_cleanup() {
-		local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
-		local egginfo="${ROOT}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
-		if [[ -d ${egginfo} ]]; then
-			rm -rv "${egginfo}" || die "Failed to remove egg-info directory"
-		fi
-	}
-	python_foreach_impl _cleanup
-}
diff --git a/dev-python/packaging/packaging-20.5.ebuild b/dev-python/packaging/packaging-20.5.ebuild
deleted file mode 100644
index 6d1b30fa1a72..000000000000
--- a/dev-python/packaging/packaging-20.5.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{6..9} pypy3  )
-
-inherit distutils-r1
-
-DESCRIPTION="Core utilities for Python packages"
-HOMEPAGE="
-	https://github.com/pypa/packaging/
-	https://pypi.org/project/packaging/"
-SRC_URI="
-	https://github.com/pypa/packaging/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/pyparsing-2.1.10[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	pytest --capture=no --strict -vv || die
-}
diff --git a/dev-python/packaging/packaging-20.7.ebuild b/dev-python/packaging/packaging-20.7.ebuild
index 6d1b30fa1a72..46b490511dd1 100644
--- a/dev-python/packaging/packaging-20.7.ebuild
+++ b/dev-python/packaging/packaging-20.7.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/packaging/packaging-20.8.ebuild b/dev-python/packaging/packaging-20.8.ebuild
index baebfde47304..0c44e8067110 100644
--- a/dev-python/packaging/packaging-20.8.ebuild
+++ b/dev-python/packaging/packaging-20.8.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="|| ( Apache-2.0 BSD-2 )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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 )"
 
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index ffb33a9a1155..2e749323f582 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1,5 +1,5 @@
 AUX paramiko-2.4.2-disable-server.patch 1596 BLAKE2B 7e2ef1e216f34086c06d985556dde82eccfc08b835a9b336f1e54e81ddf32567872daec9dadc728bfaab8e3c4728439d704d51f9b1df5e04a64b5064f6d79bf5 SHA512 5e2f9285ffa3ece551ce929c6d50691761da6269e906355bbf79b0664a764083f7d55a9e347e2ed236a4c9a7f934d489315b68ebea984694ee9d1714416d34fd
 AUX paramiko-2.7.1-tests.patch 4618 BLAKE2B 9c1d055e24e360574fdcb63ef01a1669e380da42aa2ca72ba158159a1d618b447936a3c3f746625126a1bf8c945d8000bd09aabc5918d25b3840296b57bb5469 SHA512 6192dadd31c33ccf178cd813b726c5c2cc31a12ac7698377ede19d10b19b4e32b6e203ec2bbf26b486f58151f642c4d44095e9efeabad96e2751fa4631ee11c4
 DIST paramiko-2.7.2.tar.gz 331678 BLAKE2B ff96dfd7b114255c15282f4f73e1f9425ccf77106426ccf3ad3f833b56bd5abfde867cf2d322448dc7b3777af6ab080b4e37ff8871ce17f0db17634b7f101747 SHA512 c9bc569428a0a61814cb73941356de5bae7fea7891ba4fd3f5c00ff1ee5083454bfde7e969fb4aaf5254b909f7f0132f590d67803eda8a67503e5c02ec2bf01a
-EBUILD paramiko-2.7.2.ebuild 1340 BLAKE2B 7d0ca17dc881127e3120aebc155cdbee86e3f9d4397915e34754c21ef9cbd560584b13cd9a5bdd030c740b600a22bf7f9ed7dadb3d3c77fb58489baa73480f5b SHA512 9bd6567d3d159684b424587ddb514b0468ef026dff2e59125c2cfbab8bd4e37f22aa44c6069b200f1a9eaa4f51f7d0388c36cd76f4ccbc605357bd6e585aa47f
+EBUILD paramiko-2.7.2.ebuild 1330 BLAKE2B 2138e21d9803a0ff0d1a01acec229b8172ef529e3c94e05d3162582445dc0859de2d0e4b0d7821c5c757491fd4cff95b927eb8a22d1699f2b0353821d1f7257a SHA512 d41051e030b21ef6f71e141a4430746f3fb079d890a363b9d4844ca1002a164863cd459331da01e6b707336823969109f26274231de96c999463079637bdc507
 MISC metadata.xml 1331 BLAKE2B 4e53a314a1a86c488328a89170e03932bab1944bb133cd8551333da5a4cb80600e1bd5238b858bdc3565334cbc7251782979f4a770b43d064a9bb5096fdec7d7 SHA512 14cad597d85d0778ee8b2ce5c7cdda768e8f3cfb8de084189e7d0b422b77c73c2410448c8c013c1f03864e7b4365a87c1bba16fe49081f728c3bfef3d0ba455a
diff --git a/dev-python/paramiko/paramiko-2.7.2.ebuild b/dev-python/paramiko/paramiko-2.7.2.ebuild
index 6d2df7d5a69a..8dd3a9e37d60 100644
--- a/dev-python/paramiko/paramiko-2.7.2.ebuild
+++ b/dev-python/paramiko/paramiko-2.7.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="examples server"
 
 RDEPEND="
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index c11cafdd22c4..e1cb2c82cc1a 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -1,7 +1,9 @@
 DIST parso-0.7.0.tar.gz 395175 BLAKE2B ac407b711b6229a93864e339b3632563d3fcd7f84e22a43bd89282300b931f58d638ab8a64c441dc183852576261be18a3be471b0824b6e56fb69025cf666d6b SHA512 41ad60b1d7dff682281059aabff0d43ccd3048b6cc6ee3e9e141d4a0a965fd99449f6d3f23689914c1f7bda371e3cc86266775a1c23fb1c430ea689c916fbb71
 DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a2e95fa3f54429633b1c12dc39a4abe237fa46eb629408006777bd1f512cf878025b55119568ac19729b8c19 SHA512 318969a7a941c4a0948e58643b07b6f5c446ea166b3a8e44a556f0677ec9a36d7dc8c6d37ca7bce3f8276ee3d7144e22fbaaeac90c738fb90f7e94a0cf8abf7d
 DIST parso-0.8.0.tar.gz 392579 BLAKE2B b816a9f54aca54fbb8df772d1f6501d55fccef91d3c9bfcddc9f069e1b5a15dee7742bf37dbfd07f26253247a29a42303c4034608c6c9991c97e55acac77b69d SHA512 fe9d1c46cb128d6af9c45f333e49475da795c1ed67572891f4daf08af620814b9db18469be11f771869e0f44acea9446e1419067e1b72affc1cb669a277d6a2c
+DIST parso-0.8.1.tar.gz 393403 BLAKE2B d8d2a025dfb6664d8deeabfc621f4dcf0c6f6e0769dc3a7081888436cce39685f7749ee4ed33c501e3690bec0c8b21d18195d585a8baf5fa8c1b1ae1bfad5680 SHA512 10cc36a4f288d06b8d06bf3995eafe8c6b5d46d0ab01ce6db4557c82f8c64c6792b438a5b7dea570a9690bad586ab4216161268be9c1979b91b3af50e1c8801c
 EBUILD parso-0.7.0-r1.ebuild 735 BLAKE2B 05ded4e1b2a686f3fbf7c15804543213fdfd8fd0cfd377233d9ccb6dffcc03cf804e84f94d89056dc720f62859032340b44d9793717fea3b9664d8b5fd8f8860 SHA512 4fe14fecd8e8b9bc89c171a30b9181a7841ef4ce2f393c37c44da81242098a55e5da2f39d61ca15edd94be5b645a0ec5a01ce5ea46f306f7ee8806df6d8df2de
 EBUILD parso-0.7.1-r1.ebuild 548 BLAKE2B 4243ba3804a5ce72bc9597ccbc33160e76ef908c5d327fc4365c26b3a7e516b7561dffe8a3a5db41e76cc5c9304848a9cb16ec2e4bc340ed9b210a3159b63639 SHA512 edfc8aa30585fc2d36e7dd0dd4f96567c7c107dfb737bc64a147a8a8abc6310a94b114a562700df4541df2af710f3e814281a3ad8841873be8e58971c00ef210
 EBUILD parso-0.8.0.ebuild 548 BLAKE2B 4243ba3804a5ce72bc9597ccbc33160e76ef908c5d327fc4365c26b3a7e516b7561dffe8a3a5db41e76cc5c9304848a9cb16ec2e4bc340ed9b210a3159b63639 SHA512 edfc8aa30585fc2d36e7dd0dd4f96567c7c107dfb737bc64a147a8a8abc6310a94b114a562700df4541df2af710f3e814281a3ad8841873be8e58971c00ef210
+EBUILD parso-0.8.1.ebuild 552 BLAKE2B 5deb6f54cac8603aae1447e63ce9b7d4d7c7e2ae26f385ce2b90987adfe9f3613c0b4249f51cd88179ccd48f10a40abc46a90d25cf70cde962156d67f7ae0c4e SHA512 660631d957d0fd51b295c4a8831e0cc8735b1259326dd84d84254b7f6c05b16cb4c77ff01f524b88a90da012d748f92174aa67ebf43568d19b72731e92359800
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/parso-0.8.1.ebuild b/dev-python/parso/parso-0.8.1.ebuild
new file mode 100644
index 000000000000..e5da1da9a57f
--- /dev/null
+++ b/dev-python/parso/parso-0.8.1.ebuild
@@ -0,0 +1,19 @@
+# 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 python parser that supports error recovery and round-trip parsing"
+HOMEPAGE="https://github.com/davidhalter/parso https://pypi.org/project/parso/"
+SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
diff --git a/dev-python/path-and-address/Manifest b/dev-python/path-and-address/Manifest
index 94c65e055549..527b0c4b2cfe 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 465 BLAKE2B 65cc6761b9f92a26f54fe3e41cf5abe9f7019d3ed6f56a60538349e6bdd0c2fd72ae1cc0f6d6026fd0619cdf2c9126ba5e977d2b58a631123a4584dadc116514 SHA512 808d6954d42f559ed17d68e7f24f7ca607c9aa48b21db5a398a9189753536a7475fcbb2a2ef2ff78379d543e012c61f00f9b3b573b048178248a3d21bb6b4f20
+EBUILD path-and-address-2.0.1.ebuild 464 BLAKE2B 2fc6b9d84daae64e1de0e32f454a2f490a1823aca83592861dfd6a4fbd68a66648f68e4cff5667f6af08dc903f1adf1b2a4a5a58bbd6a7ad6949eeb38305d39f SHA512 adedc63ebf22318f2d673ed307dc64af41de1c3ea41e8bc0671ee1bf46970dcd61bf2b4c2e299fe12cc0679be9b6f435bd0df4b47f8eb78c6b931489e24db19c
 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 f4df422f872a..c37f5f7172b5 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
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index a8e881010d3a..b5349476a938 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,3 +1,3 @@
 DIST pbr-5.5.1.tar.gz 117488 BLAKE2B 52deecc6107d739daec0b2d3c397285c87c63bb3d2a2abc8266feec78d43eff84f4093b9739e2bbdf47b604a1621e4ed809a689b2167e6ea673418bd27f29018 SHA512 c72c2bb8bedd7f0606880f003dffa0ed585521b698e3e986ed2913cd74303e281fbb2374cc1a00b76777c677eb2677507eed9ccaafefceee0a689cb6fa61bab6
-EBUILD pbr-5.5.1.ebuild 2118 BLAKE2B 8206a5574d116bff79d7825bf1c5ee8e5ec0ad96e5d8198b30943801d7d888dc19af45915ad68b77611964392889791547847e0761dc8d3f39330b07e58dda9e SHA512 9eeaa41599ef1d32c4df142d39a07d072251c1c631dc1f1f2caa3797d61ae6187cdea72ef73aa87c898e2d1b6c50a86f50b93077c15542f917dc352887e51906
+EBUILD pbr-5.5.1.ebuild 2119 BLAKE2B 2573af2d0e3aa664cd7a111e1fa9af33a5a88d80ca59319d4ee0fd1b2a47e8c1dc1f9f690691dbce13b6a4d85d7b6155338f818cf57181442bca72ce228184f5 SHA512 408b792863bcb959a851b6eb9e029a10b29d64b953f659d879daf04877902c8e179567bdedd72c0cf389b20ea54220074928ccfa1c503fda18e3bdc9dc7a80cb
 MISC metadata.xml 818 BLAKE2B b3ed054273dccfd8cd24f2e86e1505be70445aa45d193d37c30e6f5abcfcab489d59cb6a1e11d54cea70bbbcd152d9a208dc32237058537b99061172f573b868 SHA512 3d21678a6769bea88b901391d5df75882798e49ab5266ab7d5a73282c30793e479ebbe24cbb5b7d35ad19b517996e52243d238632a390f136ff30f77f54436fe
diff --git a/dev-python/pbr/pbr-5.5.1.ebuild b/dev-python/pbr/pbr-5.5.1.ebuild
index cc0dbd1bf78a..fb126b50dae4 100644
--- a/dev-python/pbr/pbr-5.5.1.ebuild
+++ b/dev-python/pbr/pbr-5.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index b8eb29d76b09..c54ac4e88797 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1,3 +1,5 @@
 DIST Pebble-4.5.3.tar.gz 23411 BLAKE2B 4e270b0de183074e151f3c7cf8754bd3535efce601c0dfdd5bffbe04a4308aa7db6e6414668471d3af6f1fb374230590d90e2503ba223c2e95b17a2a0d301310 SHA512 e3b17fa6b9ca959560d364e84091e7990921eb9a2aef854c391a5d0e46359b57e5ec1a4239ac97f4c0bb485d0475ad8338c3485c9fdeff7e446a989129738096
+DIST Pebble-4.6.0.tar.gz 23910 BLAKE2B 3a2f1b4cdad898274d53cdfc07b5c933162aef375ae548a39138b50d50376e7f06642dfbff038b431d77715a14414f90fbd77db1c373e988df6afe65cfb5a632 SHA512 445f65cf5a18c864478326ca1198ae49bf5aae3c53e67f68ffdcbdabe3cf16c59468b3d340568986414f45f13684c11da0e3a9fd31f510c391a7fd44cf3dc6e2
 EBUILD pebble-4.5.3.ebuild 505 BLAKE2B ee34fee546c5a8f32be5c4cd4dd088e92a23bbd6e6f6d4553b096493859c785161d0b09429020775b8bd0d34ce6367f5f1e96a5da85a209ff6ae3c82f57ef16b SHA512 bbf09e6ed81876e7f050e4b84cacb3b8895e2bfc1d60a88dbe0f4c396075273b4ced9f7fb62dbe324ade0f138b64d385b6e0d4661767d25fd36ec1566aa6217f
+EBUILD pebble-4.6.0.ebuild 507 BLAKE2B 418dcc35d202e93a4c25f5d0e4b94d723ba0b16e669b11df9b7c353ebcc87748ad8fb25d1eb3bf8b9a069d36e650ce57f25a734ba3eb68fea10bed4ee7b4d914 SHA512 404a5eaeee9487d4774d0e47736373f7a17516f21d01be0abc76367c280014e5ffab3d067c5f6f898512eb2ec40e617742aadcc18bed15c6c6012abc03de34cf
 MISC metadata.xml 342 BLAKE2B 451d73b322064b55aec3ae0369daeaa2081d126ea090c0b9a808932cd32ef1b5f92846d15f5cf11d399c9f822bc11b484107543c0c33434c2ec63b97ee8e865a SHA512 68bc288f46ab7ebfb8676d7ae40452500e39d72f9ccecc69d9e6ccb26d1465d8845333a0430611332eff2d4749a4c6bc476d645105191989120d14e338846f28
diff --git a/dev-python/pebble/pebble-4.6.0.ebuild b/dev-python/pebble/pebble-4.6.0.ebuild
new file mode 100644
index 000000000000..85f87286314e
--- /dev/null
+++ b/dev-python/pebble/pebble-4.6.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Threading and multiprocessing eye-candy"
+HOMEPAGE="
+	https://pypi.org/project/Pebble/
+	https://pebble.readthedocs.io/
+	https://github.com/noxdafox/pebble"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index 985f357ab33c..d7875a0ad099 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,3 +1,5 @@
 DIST peewee-3.13.2.tar.gz 871323 BLAKE2B 18fd9729ddd6ce3fe4a6963b697815d44e91b5078ba0b868e6b4f24f4cec9c5b01239d7f414f4f8c0871d3dc6bd5e0e37e218c9438cf1f7461bf729cb74049e4 SHA512 7304473f8e64df7cb2205900cfbdd52346d89e9639dc79ed6e13d5c4c11cc856e39e366772039097dc5ca86b4768fa4670dccd96a85cabfb522c463b31c40a8b
+DIST peewee-3.14.0.tar.gz 877299 BLAKE2B 25d0027354258c3b2a4db0765f8dac23527816c24afdaf20252e244cfec383a4ae4f10a29ea0f801d5c38406f8c17bcc6fef881b4bce96ed45920a8865868e80 SHA512 083bb24952a6d05cd6c8376e185e050df0ab5b37bc553241128b0ed3b0ebdd322d9626c32943658324d413cff8ab0bb2ddf6c84d99a0fbe057c0e5c8ec93d7f9
 EBUILD peewee-3.13.2.ebuild 757 BLAKE2B c9df37e300014ba2926e1e33b6e4e5b8d50b04bb31687ff4dfd21d84da7faa0d7cb843970ccbc817ea52750e97cd8a351ce7c56d6fe0c003312a8a9c53d39004 SHA512 8255962995c158f633702a8d661c80adb7a71e03f630cd39c6297ac863833f2b87649e2fee6a10146e799ced0040fdc9746640d1dc79e8a186c68782f83ef0c6
+EBUILD peewee-3.14.0.ebuild 755 BLAKE2B ed8a38de1f3db828c1ccfc205152465640c0535616a1e8d77139c56dde6b4780daf607af0c2733512b7a61631b996217157b7b89fb47d1a9d374dd7a352a5ba9 SHA512 6f74129982955d4d3b6c501b6f4cfc46d987947c7ba80ee68c717b21dc471bffc08d030c35944f52722c464c9b370422d44739809025868dbd1f53bf9a5a2a3e
 MISC metadata.xml 364 BLAKE2B a14159b1b72a7138b6df21d06f487b2bf4e0d71297eecdd345343996327713a34fbaff5d69d9dbd4664b3aec116b8bebe98f48f5f672922cd0f029563d28942f SHA512 b60eca92f270da62f8c55a42a6b69d26f1ef888afbe62bb58d489b890e748a6bebb1f6048bc30e4f5c85fd47be4f6d95c6b5fbe125ce1be293ce7e7514691356
diff --git a/dev-python/peewee/peewee-3.14.0.ebuild b/dev-python/peewee/peewee-3.14.0.ebuild
new file mode 100644
index 000000000000..7d4284d04385
--- /dev/null
+++ b/dev-python/peewee/peewee-3.14.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=( python3_{6..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+DESCRIPTION="Small Python ORM"
+HOMEPAGE="https://github.com/coleifer/peewee/"
+SRC_URI="https://github.com/coleifer/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? ( dev-python/psycopg[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	"${EPYTHON}" ./runtests.py || die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && DOCS=( examples/ )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
index 4cbaf292b6a3..ba69a38080e5 100644
--- a/dev-python/pep8/Manifest
+++ b/dev-python/pep8/Manifest
@@ -1,3 +1,3 @@
 DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
-EBUILD pep8-1.7.1.ebuild 865 BLAKE2B a678272d798b58917916f162403aefc54146f27f5c7de6f47396a8b415656079a54c6b3d0d37df76ae1a0c2bb57dd01b5ed1e90157fd3e36a4ae14cbc37efe8c SHA512 c50a5d70c2e0e444e47a7e4ac2c4ebb347dcb4b98f0a7febd7ae1009b87eda06a7b51261e5e559fd243758edda8db8e9feac63023878d9709770d1bf6211bb4c
+EBUILD pep8-1.7.1.ebuild 866 BLAKE2B 838ca8e7cd54ec2c312f204b555ac14128c3fdde9352738dd5cb98b32d02b5951709e94713756cb0d3390ed7ee089c60ce4d84a6bacc2f20da734da6a778063d SHA512 1d8d6fb140aca21bf9e58c57ced4be9b1360cb03fdc8b1bef9f8481ee746e5a1b32e826c5c59d35efdf4d0a082868b914aae05be76def07634a22d87715e778c
 MISC metadata.xml 401 BLAKE2B 38a3d82a63a9f903a3d135ab620bfdd4a2e8de7b998bd45ca9ada37d7d08aea6e360fc15a0414e3c11276784c4c60aa557d4cc326f220d7b39bbaa96322e60a9 SHA512 b3cc2915ab81da987a14260c611822ea0ee3b550c60c34e88cacc9e760d1b3965aaa101cef1947c34d269ad8fabb8eb8e29403cd961d99a0e99563433f1cf336
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
index 82e6438930b1..4b19a31de0b3 100644
--- a/dev-python/pep8/pep8-1.7.1.ebuild
+++ b/dev-python/pep8/pep8-1.7.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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 3b86ba608277..c2877532298a 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -2,6 +2,6 @@ DIST pillow-7.0.0.tar.gz 37880130 BLAKE2B be940cbdced884c33f2b3979be113b1bc89748
 DIST pillow-7.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a517b3295abd2e758941b95162cef0fb1fa2a0e6ee0ac86323709ee3af02888f6e029a1905f13698e82c1f38d5d94 SHA512 ac9c7c8f445b3f67f51bea13fad118d1612c45272c26d33bec286f3c2e198912b934378c4bf986b409aaa2a83d92ff176ee4d25f28701d61746c9cb86d0f412b
 DIST pillow-8.0.1.tar.gz 44614653 BLAKE2B 0f8ec178e92a57a55d575fac61779d39e79ff18032a02ad93aa6eca1211436342944b1a5bbd29979b52f0e2df756936ade4bf637ac3c153b5dda5838b58087ac SHA512 41b4ea786990c834f77ad06b64f465bc8f3a65911cf14bb05f452316fdf504e5e49b2bb50a9346f207187e79f83c5b6d310d703d1588f678b606584b1f27ce6a
 EBUILD pillow-7.0.0.ebuild 2638 BLAKE2B bc13ea32fd5b0a25aad6c976bc4776ebadddd6fd778126e0995391e684bab49aac9c8681face6a2ff9663203d820de77a9c18b895ab6ccf48862ad153cc01225 SHA512 a709259b589008d5e745b6011b10f503db7664fd9e52b858e3c45ef91e428b531bf461da9962a2807a5c0058980cbb7b70e0a22b84aa624ecf9690075c202ff0
-EBUILD pillow-7.2.0.ebuild 2694 BLAKE2B 0c5ac7be9523a70ef6b0abda1bbaa1183fde635e608d76b0b99216256d4d63288ece9f9901176d2a405969143f86aa524e09f7a23fc64c53de01ab785e3b6ab3 SHA512 21573a1826123c84025e9706114f6cef7f6c21a8c88237957b23d0e05425ea477e468738af1cc8379e3b4e322d3f1c81248fc70d835dc333f90f7250c58c2ce2
-EBUILD pillow-8.0.1.ebuild 2622 BLAKE2B 9e304d33eb3dcb202c5e82ec74d71dc47d014ceee37711f071adb8b5e39b33aed66d67b055bc7cc3ee022d1cdf2afa057b985c8b619692829312b62e3a5dc5f7 SHA512 e65a4e6ca5d5259b05723727fdbbc76b1e99e341d8f3bd1072bb2222aa97b76789b3d2a272b8606374186a01addf040bddb10218ef7e461a085cdddab2f1b9ae
+EBUILD pillow-7.2.0.ebuild 2695 BLAKE2B 1b4ee46ff5821a68079e43b2645f40a7f86e964b5875b5dbb10a232be9f55901be1efada636d0383930dd5fc76a0ad1f12e8af090e981b7e036a3393d7e48632 SHA512 1de60e1ed6de3d9945ce4c6d8ce0e7f04669c76133f564dc0a58914124be6c644dd09fb80cc6589e67dead064e109a9675366bb58ad63529bf312ed878675864
+EBUILD pillow-8.0.1.ebuild 2623 BLAKE2B ccf196e311630ec4016162ea928e2a25bc3539ff59404934edb7453a052ba4feec81c0c0d5dfe875bef19231adbbf898442c604549d4e64caa3ba4e396471fee SHA512 c1cff130d785c97d5dae01362e7ee04b96e2adf75ba50c431d363f73f7ee6f6bb93ac1df7a182ed2a176202e6e48d1460dddb9864bbc40109253346cbaa88b44
 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
index e200e8634792..1ace1e74cac3 100644
--- a/dev-python/pillow/pillow-7.2.0.ebuild
+++ b/dev-python/pillow/pillow-7.2.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-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"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pillow/pillow-8.0.1.ebuild b/dev-python/pillow/pillow-8.0.1.ebuild
index 79169c5b2c64..dfbcbc1968db 100644
--- a/dev-python/pillow/pillow-8.0.1.ebuild
+++ b/dev-python/pillow/pillow-8.0.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-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"
 IUSE="examples imagequant jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pipfile/Manifest b/dev-python/pipfile/Manifest
index 7c9ad273c8ed..7ecece5ae1cd 100644
--- a/dev-python/pipfile/Manifest
+++ b/dev-python/pipfile/Manifest
@@ -1,3 +1,3 @@
 DIST pipfile-0.0.2.tar.gz 17395 BLAKE2B ac86dc6a725cfec0e3d23cd24ab9cdbaa5c803b15916e03e6d2a1e371eb137e25836e78b3393bf6ac42c6d98ebf85fd4ccf29f63b8ab9b87cdd4828b3499278e SHA512 070986a213d0d42c3f5391b303ee0c4a588269ad1889c79b6622c1a9817cfcec4365b8764dcd208aafd78394890d3367c7c9782e65dd3f04ea1bcce001f164f1
-EBUILD pipfile-0.0.2.ebuild 683 BLAKE2B 1351f993994f9be71d81bde4242ae44fd59d7e903cb42a6eb65a8c92bd2cedf2594c340399423023e1bd327411405a2285fcced2067189bcaad1132d17e0f66e SHA512 ebe2077b57c8a2a309f0543f2558913330f890de093adf5a458ac3a026b91ecf341ebc8d6e9feeabf14a0808c6be7f0a28e52b167693e807a059a415e48d6ca6
+EBUILD pipfile-0.0.2.ebuild 730 BLAKE2B fd24500a8778aeff28d32e571e1ea592e3668aaf0c4599febc61c1dc9ed51b4e52b658699704e54ad7c5752ba2c229c3745b4b4302cd07ca4d71e0b2b2fb816c SHA512 18e4a80059040e7145bb0d619f436fe3c25b5e6f4437de6f7e1a8660a7605f7b1dc67035001c2afa2ae9a390ef9b4318b628be1ecd4e7d2214979c8d4d32bf47
 MISC metadata.xml 374 BLAKE2B 33a0b13410d7700b88daa529d089d32088b734da535af09b4b721017fad386338323207c58d94d517762f617d1d73a8e4bec44a5fcfb503ec8af83a65427e047 SHA512 7469685c63c03c2dd25a114bec9c2c3c8531858e45bc880f5cdc6066a9c22a7ca73d1be0d8ffbc5eabf3ca28ed80f17d18f4eaf86bb54ddd888a1fbcde53a49f
diff --git a/dev-python/pipfile/pipfile-0.0.2.ebuild b/dev-python/pipfile/pipfile-0.0.2.ebuild
index 5ce953f15094..381a08a5dd00 100644
--- a/dev-python/pipfile/pipfile-0.0.2.ebuild
+++ b/dev-python/pipfile/pipfile-0.0.2.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
@@ -12,7 +13,7 @@ SRC_URI="https://github.com/pypa/pipfile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
diff --git a/dev-python/pivy/Manifest b/dev-python/pivy/Manifest
new file mode 100644
index 000000000000..e44449dc59d7
--- /dev/null
+++ b/dev-python/pivy/Manifest
@@ -0,0 +1,4 @@
+AUX pivy-0.6.4-find-SoQt.patch 925 BLAKE2B fe3224f5aa0286204e81352b0e6c331654eb15fc509a219a4924cedafebda305182882c2de51aef504ae9a0432beeb4a67c5f80aafc24dab7a40c3a3d37c34dd SHA512 02a9c530759901488073bfa69c7a97d3814d4daa94f4724158ce037e208016f2fd025ac5020717ed80e5f561721d5be6967f0f44521738248f492fd11b7044f8
+DIST pivy-0.6.5.tar.gz 6614159 BLAKE2B 2652feb26137b2deda8b76083d3bd9018303ca0a0236ea97e83e9ff24ddeda30462a25ac1b20b0d3e718fc9f83ae5ebf7116a5c0d94debcc5b6d729792230655 SHA512 6cf0b1ac348336609f42f6a72df7ffdc3e1042a4f8fc6e2b725ca38f09476c70bafa14c1f083d1badeb5b37b974a0fbf5806ea71d44d734b9ab9b125ce7f8695
+EBUILD pivy-0.6.5.ebuild 853 BLAKE2B b56eaee6b4fce45eb8688c9f2635fe95d8362b3ed8b71773c39354a7b2cd3700df7cc9784ba788d66edd9718a11f86ca16ea49bb04cfa711bf08212868332619 SHA512 a36aad7c39ff1658e27d4df282159acc26e5e84e7ef3a634b81d1bea3752527f6d37979576daa764862e988ac2a7dabd2f3a3563bcfad43693059641fc28382e
+MISC metadata.xml 596 BLAKE2B df27b3b1e613d1247245734dc11b084e5b2824108adb8c0f9523150788d46299d05866f6e46aa24172685470153183eb24b7c34a5d22ac1ecf20e424a2fd05a9 SHA512 2dde309132022ae5e7c054f257de8aa43c8fd92f2be8f0a420f8df101e48a3525a35f0d6791d97bc6a905ae071cde9f6052337244c0df6ca782fada9c6a69512
diff --git a/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch b/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch
new file mode 100644
index 000000000000..4d8a6fdd8889
--- /dev/null
+++ b/dev-python/pivy/files/pivy-0.6.4-find-SoQt.patch
@@ -0,0 +1,31 @@
+From 1c9ffef4d85327fe517bdcf7e11c339a4862ba2e Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Wed, 12 Jun 2019 21:21:34 +0200
+Subject: [PATCH] CMakeLists.txt: remove NONE keyword for languages from
+ project definition. This solves a bug where SoQt is not found on Gentoo
+ systems (see https://github.com/waebbl/waebbl-gentoo/issues/42)
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Thanks to QÍN Yuhào for coming up with this fix.
+
+Suggested-by: QÍN Yuhào <qinyh18@mails.tsinghua.edu.cn>
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 76d0d06..48bd3c0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-project(pivy_cmake_setup NONE)
++project(pivy_cmake_setup)
+ cmake_minimum_required(VERSION 3.5)
+ 
+ 
+-- 
+2.21.0
+
diff --git a/dev-python/pivy/metadata.xml b/dev-python/pivy/metadata.xml
new file mode 100644
index 000000000000..65acee7c3687
--- /dev/null
+++ b/dev-python/pivy/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>fordfrog@gentoo.org</email>
+	<name>Miroslav Šulc</name>
+</maintainer>
+<maintainer type="person">
+	<email>waebbl@gmail.com</email>
+	<name>Bernd Waibel</name>
+</maintainer>
+<use>
+	<flag name="quarter">
+		Use <pkg>media-libs/quarter</pkg> for GUI bindings
+	</flag>
+	<flag name="soqt">
+		Use <pkg>media-libs/SoQt</pkg> for GUI bindings
+	</flag>
+</use>
+<upstream>
+	<remote-id type="github">coin3d/pivy</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-python/pivy/pivy-0.6.5.ebuild b/dev-python/pivy/pivy-0.6.5.ebuild
new file mode 100644
index 000000000000..0afc6efa7ab1
--- /dev/null
+++ b/dev-python/pivy/pivy-0.6.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,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
+
+inherit distutils-r1
+
+DESCRIPTION="Coin3D bindings for Python"
+HOMEPAGE="https://github.com/coin3d/pivy"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	PIVY_REPO_URI="https://github.com/coin3d/pivy.git"
+else
+	SRC_URI="https://github.com/coin3d/pivy/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="+quarter soqt"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	|| ( quarter soqt )
+"
+
+RDEPEND="
+	>=media-libs/coin-4.0.0
+	quarter? ( media-libs/quarter )
+	soqt? ( >=media-libs/SoQt-1.6.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig"
+
+PATCHES=( "${FILESDIR}/${PN}-0.6.4-find-SoQt.patch" )
+
+DOCS=( AUTHORS HACKING NEWS README.md THANKS )
diff --git a/dev-python/pkginfo/Manifest b/dev-python/pkginfo/Manifest
index 9cc7350a5430..08a8a3484e48 100644
--- a/dev-python/pkginfo/Manifest
+++ b/dev-python/pkginfo/Manifest
@@ -1,3 +1,5 @@
 DIST pkginfo-1.5.0.1.tar.gz 34496 BLAKE2B b5a60e3fe2408283afbdebf8efa709b7b1c96b82ddc76b3fbc4d58d544c2170de1434525fe2e324af9864332c6570885b05a3d8ec2c248fbff20984d2ee80a94 SHA512 319bb403970affd5a4222dfdb3d17738630d1350ea84e51ad1bebc6c8c72e0dcfd69a4eaf5e7bd156b8e605d806357922c05cc994dcafb01b7a33c617b2df447
+DIST pkginfo-1.6.1.tar.gz 37124 BLAKE2B 852a37825840fc5d20fe73effa39e1c01e5fd1f1c7b1a0663d0d43d7ac1ae1ec3ae62e0442fb436731a985dbb936ac4651bc4003f14d55e4b51f200b4cf4ccd6 SHA512 51ead9d2d16464eff1e46ccf99b7bcb40897d2526e8f5a0aaf10cb1305271134a1bc0b4524b4559cf0a8ddbb450ba4a9b123a41676f5b6bc2cbe721c7cec52c9
 EBUILD pkginfo-1.5.0.1-r1.ebuild 717 BLAKE2B 3a483c01722fa1122893a64687f39a4bb8ef6d4df54830e4cd8cdb933ed450e395ebf909615fbc822fff0248523210d61c9ed617048c60d6fc877bef93c595d3 SHA512 7e0b8d6d77c677c367373fba30feddab763742d0a475b94bfcde1e80a1cd9d13ed0b267d5057856fe3b3c6b738a4c8ffdfc4c7a1669c9f932ed07acad3637019
+EBUILD pkginfo-1.6.1.ebuild 725 BLAKE2B 06992d42f02273e33b345c186d4e409d0f0bc31042f04278688e8b7e526cd43332a2a952968a0142259acbc60707f6e0f8e40e275250b6a2a6690b5029e1344e SHA512 b7c64d8b9833505268d50d76d814b649f72616e7ca3286937fbb75eac674789dca3e654746ce11fd0ed2a76e0e4757d7e5a3bbf26c56822995415dce2d6caff1
 MISC metadata.xml 345 BLAKE2B bae902e9e5c7357ce7df1d26ddb2c4c81ca0dbcf4d17eeef7127a49cc4a17794ba29483049ebd5518df71e18258c4ad375a90e0bfb2052fa95a9143431095662 SHA512 f970952fd577c2baadebf824932c4e825d962a497d7f41870a6d51301a5776d22809b923efcdf2ecb38322e4c53e11dbeb5083660ff0f93a3c301a88bb807151
diff --git a/dev-python/pkginfo/pkginfo-1.6.1.ebuild b/dev-python/pkginfo/pkginfo-1.6.1.ebuild
new file mode 100644
index 000000000000..d71b21bacf28
--- /dev/null
+++ b/dev-python/pkginfo/pkginfo-1.6.1.ebuild
@@ -0,0 +1,28 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides an API for querying the distutils metadata written in a PKG-INFO file"
+HOMEPAGE="https://pypi.org/project/pkginfo/"
+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 ~x64-macos"
+IUSE="doc"
+
+distutils_enable_tests nose
+distutils_enable_sphinx docs
+
+src_prepare() {
+	# TODO
+	sed -i -e 's:test_ctor_w_package_no_PKG_INFO:_&:' \
+		pkginfo/tests/test_installed.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/plotly/Manifest b/dev-python/plotly/Manifest
index b1462b8042f4..9162ec4a2272 100644
--- a/dev-python/plotly/Manifest
+++ b/dev-python/plotly/Manifest
@@ -1,5 +1,7 @@
 DIST plotly-1.9.6.tar.gz 546722 BLAKE2B 5905af517ef40bc077492f01b49c367c0aa03a96accb86ec072e188a43e463c187a0b9dee3d0df33669aa6d600ed9127b067c7099947e5235331d14ce10bf33c SHA512 7564036ed3745fc06ee7428942e45ca6bfaefa1e47b08a5868a918924268ee632515f1de4bf3e90911234f18a4d85b092ecb6ef9f213b939093dcb433a12dec4
 DIST plotly-4.10.0.tar.gz 6263967 BLAKE2B a78ddf286993621a555cc7f34a5ad0f44e93dcceb9bdac2a20f0cd80257e90485f20b4c89a350a3718b104401d7677a762231c6a774e5c2757a2de1454822875 SHA512 bc32dac7e5621b254c3868e85ed18133ad8341bed5784f707a89242c5e1ef9959afc603a91ccb068aca24032d3ff5b44678811c405d579284334f051f59f93aa
+DIST plotly-4.14.1.tar.gz 6373585 BLAKE2B 8e8d15a7f68bbef835fcbc0048c2457916aad1b10e06c903222030b2b2e1b902e2d42080f8ac2c19928dabd7e1623210930b9f33dededa71dbbb28b2f41f848c SHA512 e052680d0e7344b9f53f1b917dd0b9bc87b0c34300d93b8958ccb35b38f9dc5e7fb4db016d1113df4bae78c419f3d378112c59c3470723ce1349eaadbc5011f8
 EBUILD plotly-1.9.6.ebuild 581 BLAKE2B 417af31851a15f9daaacab05b8f2ece2d43e014c61591df78cef90d9c64402461ad81fb3fe35dc9bd21bdb13dc825f3307c62e3615a66695e0c3c47d4974aac6 SHA512 36b10804505a919ff4c796d3089573e1c194df7a116a4f139f8344f60e28fe1c909e9b8aff7990280d51f1ab0a22460c618078527fe96b94cc057f688dc2f8da
 EBUILD plotly-4.10.0.ebuild 613 BLAKE2B eecc55525b63ce6d8c9efd129f004ba88d3d50130331a7126036cb531b3c6ea4c76335785d97de532c6433c355540e4d4df093c4e7676c114ea23e4f1858c2ed SHA512 ac924fdf965af316a4b79ffac80c4267556ba24f2080ffa0d5b89759ebed6d160096c813f21443de786b3c65c92764cc56b5ff337fce7eeeef6bd87196813d05
+EBUILD plotly-4.14.1.ebuild 613 BLAKE2B eecc55525b63ce6d8c9efd129f004ba88d3d50130331a7126036cb531b3c6ea4c76335785d97de532c6433c355540e4d4df093c4e7676c114ea23e4f1858c2ed SHA512 ac924fdf965af316a4b79ffac80c4267556ba24f2080ffa0d5b89759ebed6d160096c813f21443de786b3c65c92764cc56b5ff337fce7eeeef6bd87196813d05
 MISC metadata.xml 710 BLAKE2B 633a653c6685aa7653f7bd98dcaf52b79d2cf21697312e0547572ce2af049fc42c46769e6072af0021228bd0ab9a2b79cedfcc7aac8c9334eaec035598124d71 SHA512 cadd4997b878844c4d425f0c2c4515f9ed8d91258ff393b317b8c7f946cdcb8ac8c00ed0c15731e3b7b58b02759f621aa0f4e773817cef6de5aa3b962456fd31
diff --git a/dev-python/plotly/plotly-4.14.1.ebuild b/dev-python/plotly/plotly-4.14.1.ebuild
new file mode 100644
index 000000000000..24a60e316802
--- /dev/null
+++ b/dev-python/plotly/plotly-4.14.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Browser-based graphing library for Python"
+HOMEPAGE="https://plot.ly/python/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/retrying[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	mkdir -p "${ED}"/etc/ || die
+	mv "${ED}"/usr/etc/jupyter "${ED}"/etc/ || die
+	rmdir "${ED}"/usr/etc || die
+}
diff --git a/dev-python/pony/Manifest b/dev-python/pony/Manifest
index f5fd52891000..b7dcdac70b07 100644
--- a/dev-python/pony/Manifest
+++ b/dev-python/pony/Manifest
@@ -1,5 +1,5 @@
 DIST pony-0.7.13.gh.tar.gz 302541 BLAKE2B a1e6f82c6eb72f8626238cbfcc0bc01d1ad3498a75a5ce4c3b8a4511e6d1fbfdd39a239f0462458ae1d64dc9446b338bbaea33d6bbdd861c8d0738e50d58a717 SHA512 431d19e3297ba1cdae5313948123d8b8cd71ee8ad5868b8cc2f5447eb435875fdbcdc3768834b9afe22ce8e4c1abaabeb597f3e6974b00aab33aa61e497d6390
 DIST pony-0.7.14.gh.tar.gz 305795 BLAKE2B a0e056d722a205a00567a230628be6ef8a7fe86f594f91ec0e8bbfc6d6eec17ec1d4cf3f57ad10984b8beb0a90da3010d9a32f2f08dca434af39e20fc6e9126c SHA512 ed27fd697dd14948c282dab6b75e41c9309d0ef4c4cccb0f91e4214e81de52a2de3910e413dfc5495ffcea190a5b50255c45b2beecead84eecb601ba2463d998
-EBUILD pony-0.7.13.ebuild 547 BLAKE2B daea6fbb688148b05319f2aba406eb338a6d39bf0869e593f0e9439c2dc333d745e6baa17d116f9fd3f709f451366bfbf70d1ae487ae5ba0a73818e4ea316521 SHA512 7ab067e1f9e62e2fd609432182e96085be1b43364aca23812bb123a6eb8721a9590bced454af275383a7538cbcd5ea9ed964fa50b7cdc0a1b84779b4cb3ee674
-EBUILD pony-0.7.14.ebuild 549 BLAKE2B 3089cd60d0f92e766efebe5030d88f677b9736a38d8bc765661aab9edaf3547dba86595d8ad9a70d0b831c8f135779740073e3d8c1e83a142304c8ad5f478463 SHA512 c471f91dbc141c2799686e27aaf5ab911bffb7cc872a634e7702c9f219b64eccfbb5c90c3a63632b6e4ae2902e54dc62cd5ed4984e909b4a48224a599e147aea
+EBUILD pony-0.7.13.ebuild 590 BLAKE2B 8b2db83263f59863882d969c8f23e0c74bf28c2c14fa1c6908174b49c0bd962198a6a8af9f226c6898f9f9da54d6cfa38388c1d66e923577535c84f727f7fbe2 SHA512 a5cc91f99b3350541d6e7d5845ed60d6cb522838a3b803aa80db2cf12a3f623d696dc7f0888d680cf2009f9dd1b36649fabab4fb76e98d3db6e962f18dbf99ae
+EBUILD pony-0.7.14.ebuild 592 BLAKE2B 632eb686eb9d507b5f7a78695e2ec596bdd26d834d60cafe1a5b9a991a12c8239f28e18a93d3944ed07fdcf7ef5fc91b94101710a0cfa3dd74dcd55d246dcef2 SHA512 b040117bb06cf4921055b9701d81fc7f98433244dde4dfcadc207465b902e3541f0d3f27589d465b6985f22bf24a5edc02390d330134d7a46cbfefbe8fc8b0ef
 MISC metadata.xml 309 BLAKE2B edc1d34594619e713d9cc0231d90bc42190dfcd967ab602c48b0339571d6142aa3daa691223376896f6e50bbf5960007c21c5e7dfe50d2a1f64099fa3d897527 SHA512 fe4e8936257c41fbd7b57bcbdd004565bd3779a945c66e3da6cbbaee65d0e58d047701b8959f5fd3c2ad9ed9541782aaf7bf0fc16262ea562eb3553ab4d5de4e
diff --git a/dev-python/pony/pony-0.7.13.ebuild b/dev-python/pony/pony-0.7.13.ebuild
index fbfa5b2adaf0..4d7083006ecc 100644
--- a/dev-python/pony/pony-0.7.13.ebuild
+++ b/dev-python/pony/pony-0.7.13.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	test? ( $(python_gen_impl_dep sqlite) )"
+BDEPEND="test? ( $(python_gen_impl_dep sqlite) )"
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
diff --git a/dev-python/pony/pony-0.7.14.ebuild b/dev-python/pony/pony-0.7.14.ebuild
index 6de64d60c256..e114ab933aaa 100644
--- a/dev-python/pony/pony-0.7.14.ebuild
+++ b/dev-python/pony/pony-0.7.14.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="
-	test? ( $(python_gen_impl_dep sqlite) )"
+BDEPEND="test? ( $(python_gen_impl_dep sqlite) )"
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
 
 distutils_enable_tests unittest
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 6e79654691bb..7ce83c663bbe 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,5 +1,3 @@
-DIST portend-2.6.tar.gz 12295 BLAKE2B 307bb77bb7d73e201f00ca203204149bb4fba8a00277da08f804626be4d01b15bdd38ade7a49c7acafd37263cad6e8c62e0eb6e6bdec0d9e10267c1fbf469aa9 SHA512 9e53c668ba9d0ddb2e92d9b4c97d2b8a4d858a6fc44123414ee3c8ac433f51f50a4773ee08f85bb134e49aeace2a17baffd32962d36df0b19b505a2c6634bf7e
 DIST portend-2.7.0.tar.gz 12732 BLAKE2B 147d47295d702e6e4a41da1af91afc72ecb2a29713431aada6c98fe527c96f86a88a845cc1afe6507e2fd0d749e146f8b349df13d2e1fb1ff2c0a12fc7d6bdae SHA512 8c81e524e94c4902806a6d33a2811d405e6024796fdbfb5ee1037a177b0aaed4c1b87b76822eee5ca55e552ffa569f4e619d0c1645f0d10c17f8d721ec73787b
-EBUILD portend-2.6.ebuild 930 BLAKE2B ce9938e70cb8ab428a1c079dfa8c528fb1261808c1ef74703afa2905364915a318cdbca09c3bf54d7c3a7ef7dbc487c39c5a8a446d80c584cb17a85e931a8916 SHA512 2307f4b2848ebb21f5b50851ec31bcf7b07a5d0b57803e1c235ecf8140927ba712baf98aae91ffbea98ce10c4db2159c9a38ea4e1795d71bcf7f296be3415e63
-EBUILD portend-2.7.0.ebuild 799 BLAKE2B cfc9f270726410c841d3ec634ff4755a13510183a02580d56e497e21d3480ce16ea91ef841a47942caa8b20a471d6ec41f4552f2e0c68a3daaf237a6552eaf3e SHA512 924a784d28609792e415148602c980dbb74d2b072c3a69f08dd68c88d2504c98f023456f54d9fcd40eada9ffdf949bc15abd2e259c684bd5759df5d54f0f42cc
+EBUILD portend-2.7.0.ebuild 791 BLAKE2B 6486ae8ca697fdecfe016e56ea69f5024b6f67e5651a628cfbe4495f3e0159bda387c6522a2aeb86a59d0c3c6b1335a706e0fc514cd1a96d3811139f166c906c SHA512 c4a0328678d734e86f9387c5e9e145d78d318d55b40aed58e728a9be7381d8b53fc19484d433f8f8fe460b6f7eef6d8c67dfdff2f415e31b4f1a67b7c5840f43
 MISC metadata.xml 493 BLAKE2B bc4d9e79f1ff9387da6705744d7fce19c8b6cbccfc62878ba79b14312b3612598c6042c5f2842f663af254fb8977a60c34d373624604b69ccb2f861a2f5aeb56 SHA512 7db9144b99d487353a90f70e85d8800418eb92aab0678e934ffe92498c7b0e4c0f574dcf109f1a3ec2c7478174a26346152f15d57f15c9edb89f5d9dae2c788c
diff --git a/dev-python/portend/portend-2.6.ebuild b/dev-python/portend/portend-2.6.ebuild
deleted file mode 100644
index be175c62063e..000000000000
--- a/dev-python/portend/portend-2.6.ebuild
+++ /dev/null
@@ -1,33 +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,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="TCP port monitoring utilities"
-HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
-SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-
-RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools(_|-)scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+|)[[:space:]]*::" \
-		setup.cfg || die
-
-	# avoid extra test deps
-	sed -i -r 's: --flake8:: ; s: --black:: ; s: --cov::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/portend/portend-2.7.0.ebuild b/dev-python/portend/portend-2.7.0.ebuild
index 2d080d4a15f4..3a5f80df2641 100644
--- a/dev-python/portend/portend-2.7.0.ebuild
+++ b/dev-python/portend/portend-2.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/prettytable/Manifest b/dev-python/prettytable/Manifest
index 58eb2f85ffb5..0a60ac4a0124 100644
--- a/dev-python/prettytable/Manifest
+++ b/dev-python/prettytable/Manifest
@@ -1,5 +1,5 @@
 DIST prettytable-0.7.2.tar.bz2 21755 BLAKE2B 385d5bd6d4ab75a8c7ae96abc9d9e98a66a196265853113e7fb59073876e9f5e9c6c4fba9a30d80cc726a5184e78fb6451ff9a553909704fcc5022b6a08413f4 SHA512 f3a3fe6fa29f4ef090ff6cac06549ebd9db8b387e7b25fc64c4e37c8444586f50355c5573f38caabc72360aa68054aa189a67aa37f0bd13b872862ecd9151e71
 DIST prettytable-2.0.0.tar.gz 43072 BLAKE2B 2293d0377f0bbef925014812cf0cd3702ef4f651927302012df44e829dd9ea249d03ddaee32f9313f3d001900e92df9a3be8812c8fc573624d308fa5c40a858a SHA512 b7c47df7d85a91e9518dea8dafcb27037e5cde81f59dd2b9e9468ae44b18431dd7d943fed487d5713e2c5aa25df76a8eb6587d045f73b8f25f53715a8a2085fc
-EBUILD prettytable-0.7.2-r1.ebuild 593 BLAKE2B b2dc0968e6362b62e7dc57adaa63ce07f916f2aefcbe9275a69ea92ddb50f8214a20354d9222b6a5b9046cde19f8381ff38e9405bfab57be7528faba74f2755a SHA512 7154946690ed4bb294a84e52a84865c49eb45907c416713292cef9f2f11d2f003c8a26d7883263a34c5c41335a596d09e98653140472a5deda8d220f051c7599
-EBUILD prettytable-2.0.0.ebuild 828 BLAKE2B b4cc7851b68be9adbddd6658f6252111bba3d3e9352218fbae8dfe2aa0621b0cfffd7d55407571a32a95578c9e41fb4babb801abf91fbe29e64a60633fdfce82 SHA512 a12416736c67efbbc21d6fd525f0346d12d373e357b6012a17d7042756cb0debf4c85148bba8a1ce270954c2b6a9b4581919d6cf244d3d6a0a13e82a62b83da4
+EBUILD prettytable-0.7.2-r1.ebuild 594 BLAKE2B 0630cf6a026709e13372eaf407621f3d885e5f9903a9566bd79872622562910618b6821184b000c45b16b516deb1098e2a639b7f520f5ba3031df4a766d2f16b SHA512 23786154d60b368b3f0cf8face2b7354c1766abf1d17be0b87016608a5f074f409c930eb9b490680e9b625653723add5e18b952f6fdc0bcbcc2b60f57011ba09
+EBUILD prettytable-2.0.0.ebuild 829 BLAKE2B d9e4d81da39545f56b05ee3ac66d0cd4b27a0800a3c5e5dc39eba22f0811c2d2612ce82d2aab234411e963194e1f702714e9f57465eec0243ddde2bb219088b9 SHA512 4b38bc8e32b7187d2b538734ea9d0271cfe1607d8898cad58b810da50d226ec0313b5bccb4c2916d38a4b42907c4663b9765a6daedc547ba3eda9270d8468331
 MISC metadata.xml 582 BLAKE2B 2abcef37a8ef89f66a30fa5c96406bc7ae799f16cbeba3ab5105d5412da65ecdc691d410b0d4147d089290ef49a0fd8c4af42c1676c7161d82b12b31f7a2d5a1 SHA512 e4665346eda726a3041e5eceff3e7925bea95dc2a2df761c7f807d9da0f333d5a46a68ffb1413e6118e40c459fd08af9e9d73e6a45e9c84d41628d80e86fca60
diff --git a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
index 24736c304290..1ed976c3d460 100644
--- a/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
+++ b/dev-python/prettytable/prettytable-0.7.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/P/PrettyTable/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/prettytable/prettytable-2.0.0.ebuild b/dev-python/prettytable/prettytable-2.0.0.ebuild
index de689a00448c..0bce09b3a5ed 100644
--- a/dev-python/prettytable/prettytable-2.0.0.ebuild
+++ b/dev-python/prettytable/prettytable-2.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm64 hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 9aeb85fb2079..eda8f96da79e 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,3 +1,3 @@
 DIST process-tests-2.1.1.tar.gz 11522 BLAKE2B 6f6b97da73f1e4f449c3c7f85a6d860611de57e78cb57c352ea4563be07d7866a5c44107fae0ecfaad24b262c933806b59c2c9218be959b2576fc0d8250da4b9 SHA512 4bb520074a9964d3eed4aca7a1952bf1a0d99b475f3f61b5c51137d8f2e804352639187da5b5ff30ea8739466200eb9361e77dc3c43a20d5ea418f63a2765a1c
-EBUILD process-tests-2.1.1.ebuild 646 BLAKE2B fb32427bb1f53b8e48dd47c4f9e0a6c04a6df80a85ed64bd8df380e6931a32e1124d77331c0803feedd88d551e6297bca1eed3dbe08cf1133a62e9aac853cf8f SHA512 be6d91e83d86a15e7564f9eb35deb66e59d1b815a9e5a2f58096f52e1559f1335a8438f5b85605d71c3b68547a3c467f2ee97b9d154bfc8dccd183b92f2b1418
+EBUILD process-tests-2.1.1.ebuild 647 BLAKE2B cd7f175f74d937456806d771b2caf6770a5c36d91269d8daa7614708317d3315a3d06a1d98deeb2896134f00ab3004a2aa63dcffcb28b0b4d999d150540548fe SHA512 2fc5361aeef452d5584f60069596488ec4c1dc6414059001be82779cb5918bdb596cb9eaae9a2f062f826b4769aad2645d5b9d487786773681da7f9fea04f215
 MISC metadata.xml 408 BLAKE2B 9b3db07555d5a2939176e7a6628c57510dd02652862027662b225d36c1315d53d3fdcaee98e35cb3b2ea57b759d71a5a63856aab57edd20f9a1cc698c56d9350 SHA512 94e3ab549a93bd8fbb5383300110603d4618da0024bd4b227370e4ffa3af791c632d8fd143ca5599c40fec8c46fe92d85c54968070260f59894ec04afcd776b9
diff --git a/dev-python/process-tests/process-tests-2.1.1.ebuild b/dev-python/process-tests/process-tests-2.1.1.ebuild
index dfd2fc63f1ff..ddbad902b48c 100644
--- a/dev-python/process-tests/process-tests-2.1.1.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # There are no tests at all, under TODO
 # see https://pypi.org/project/process-tests/2.0.2/
diff --git a/dev-python/progress/Manifest b/dev-python/progress/Manifest
index 3b758cda3aa4..6cb2db470380 100644
--- a/dev-python/progress/Manifest
+++ b/dev-python/progress/Manifest
@@ -1,3 +1,3 @@
 DIST progress-1.5.tar.gz 5842 BLAKE2B 235f02edf0f010b4460d36b868be2df0cf4685f360de491f1649f14defffd3f1789c6c036c05b91007efac49cacbed3de5cb38fda3e21d0fd633279b2066c4f9 SHA512 a9bee3498746233f874da2d6509d052882d9592df69c223637279a1fae40174a4dc279b56a7558e95ed173b0d357ae07752501c577a3cb9c79e0f87095838896
-EBUILD progress-1.5.ebuild 568 BLAKE2B c6bb9f0441bb08f4ba2e5a0e636e749665f4b651f1b0d8fa6d0ab68820ebe4af0b91a280cd83bd56d7ff1d8a6e891b3dd92bf8d750defff7363d60f295c502c4 SHA512 1ab90899766c6a79bb42b27709121de6089e17ff3b611773f2b3955fab92d7e8dd5f9b447c2cdafdc749fb04d8c24cbd58d413f2c49c1069ffa21b5eece53481
+EBUILD progress-1.5.ebuild 569 BLAKE2B 77e003de70391df714673df89a8b0ad7c557735e8ec8079fbfd9f3fa1c74a315febcf5fb8582a1309cd580883e4505c79d3ebde28fc358ab63edcd2d2cd9b89d SHA512 381e38127c560fa873d97f7202ab8dbb0ea34ebef318b43c142fdd507c14110c8d3b921635b1c17929e8d7a8d6908fd3a55c1bdf389d2fa995fcbdee632d9b93
 MISC metadata.xml 391 BLAKE2B 8c43d18b83bbba693a62930ea28e8b47f6cd4594e03aed277ba0744d94558e8f32a68ead65b311d1ffda228be6334cf88ce7a1171250ceaef59028785e95361a SHA512 641f3a01855cda8109b87dd9c845ab7bfbe0c8ca406cd8de947e817659b97e7ad0d902ab682620b63fd8eac749d89308d54cd1f666b6ab72687a897bf41c567c
diff --git a/dev-python/progress/progress-1.5.ebuild b/dev-python/progress/progress-1.5.ebuild
index f58e067415e3..452c0e3fbe42 100644
--- a/dev-python/progress/progress-1.5.ebuild
+++ b/dev-python/progress/progress-1.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="ISC"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" test_progress.py || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/psycopg/Manifest b/dev-python/psycopg/Manifest
index 1427b49bbf5e..dcd2f633d3a9 100644
--- a/dev-python/psycopg/Manifest
+++ b/dev-python/psycopg/Manifest
@@ -1,6 +1,6 @@
 AUX psycopg-2.8.3-avoid-mxdatetime.patch 954 BLAKE2B 073eca8e49dd4d7fd2ec920dfe52e255d3fbb0e9975cd0378574d7c6f6f097c4b0bae0f4eba74e939b15c19ccab1dbe84d28f434830d38db6b59e18246c3f2c2 SHA512 9e0ac41a70002bdac03628ac15b84edd3e67e589f8ca145242018aab03fc42b8befc1c0330f0111d01b239dc00b6ffc29965ba3c18ce0965cbe9e7b31d1fef4d
 DIST psycopg2-2.8.5.tar.gz 380874 BLAKE2B 843321175499bf00b080d3e58ce0d586e674585af4be5a08866b5dbb68256ff9232d3c25e2603a3a0920a6c91927eb9fbb5942acd429be5dab9177c65da0c32e SHA512 d4cf9b94573b90fe56555ea5cf841aa0c4c806770f92f35a7ef2531999bb50f98eb1276e56f1540b5f2695e443bac7e9cb8bbfbd24ed82164f99663259d2da3e
 DIST psycopg2-2.8.6.tar.gz 383797 BLAKE2B da0e3f1e143c51c940ba1f51d3e457b492d880ab71267dacd4747444bc767711ccd6c2f54d9e10ce5ad8fae0c3206fb4b6199f267e9bbaf12eb654227f59c2b0 SHA512 1e1d5d8755c6d1a153d84210bf29902afafe853659d709e13abc6bc5772def13779d2394690af1c544384c9c607edc0fe5cf2763244fb346febf9a9e0032b45f
-EBUILD psycopg-2.8.5-r1.ebuild 1514 BLAKE2B 08f45229d2bf8d868ad9c16de2e33c070e17a53e6ea9f8804973935a8f76c81cae103368e9cf9da2456764ec3a54e71cab2c1a95c984f1499344d03d958bb470 SHA512 0d150dbf7d2fc85af31323f18f96710a8538b8030936aae379b4d95094c7e41e2a13a1d99f5de07a695468e7fa172cf3f340c1d44e86e63cd4a3753b433399b9
+EBUILD psycopg-2.8.5-r1.ebuild 1515 BLAKE2B 62fada85fe9045c84305111fa28d90755251f1a054ba1ba7b982cd6356c2a6b4515d757c677aace4bc66e6702b7dda267dead7a865488df034a44e9f16680155 SHA512 8291649a2766cfc8fb4d5ead4069d414814be30340150924a490cf1419d62c0956dfc28836d41ad02ffff9c18a9ab9732771fde4474f84e348a16fb7eae28a7b
 EBUILD psycopg-2.8.6-r1.ebuild 1611 BLAKE2B 36a0a33fde22a54c3607d763b62ad8a18cddb54e016f3d8a8a6fb2e947599a3a3f3ca99165c2cb640790f21d8c6a58fe07891ade3f78de47464d8ea2a2c2ceed SHA512 a9f038beb7998535d92414cbda14130b68535c2639075ec98d621c22c0a85215bb846377c9be3e50bd1692a37a9d37c3db7036481cf2785618aa15e5ce5f3cd3
 MISC metadata.xml 321 BLAKE2B aff48bec04e34b92668aa18214d86ddbedef2376eeced4815118d35eebfb8e6af87234a9470828f465626f7d9ed56fe0fcb8f078c23945371248136533651ad3 SHA512 358b751b3a65f64ab5468bcf4022315f7069a2fb60709c2bb12ac02577866a3ff24ab2dd69577052070cf010a51428cb3ec385ca7cfe48640f4dd25ae478a966
diff --git a/dev-python/psycopg/psycopg-2.8.5-r1.ebuild b/dev-python/psycopg/psycopg-2.8.5-r1.ebuild
index 963d0ac88a69..fcc8a9640da1 100644
--- a/dev-python/psycopg/psycopg-2.8.5-r1.ebuild
+++ b/dev-python/psycopg/psycopg-2.8.5-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE="debug"
 
 RDEPEND=">=dev-db/postgresql-8.1:*"
diff --git a/dev-python/ptyprocess/Manifest b/dev-python/ptyprocess/Manifest
index b1c82c31250a..4a393d43aa6a 100644
--- a/dev-python/ptyprocess/Manifest
+++ b/dev-python/ptyprocess/Manifest
@@ -1,3 +1,5 @@
 DIST ptyprocess-0.6.0.tar.gz 70115 BLAKE2B 02499e560c4df2f852d0951a9acfcb88a2bfe659592ead0304bb6a240e831fb093dd40a457714a8a91d1af70b5364b7af91d2c14c956d8a84d3eeec3eb2a9edf SHA512 b34b6bca977f09d1443b210e338e1300e12d6ef35857f9543b3a116ef3b500ad4844357a7a283321756f886af41bddb1f02b27bf200ef1e82a96fd9e431bed86
+DIST ptyprocess-0.7.0.tar.gz 70762 BLAKE2B 6c72cda3eae7dbf4335af11b6ffe1d46040d01fc5c2599948abf0a4fbd53ea45e9d2833843465dbb868da7b4058a014ed08754bb49888795de221bd54ae092a5 SHA512 791d8f2e79900627215ce80ce67ee9c79173dbc08297c6219d5058f9b80c5e323b93049e6836a70c4073f43548d22e3cf310f2e9948ef12f96bcaa15b0ddb2f3
 EBUILD ptyprocess-0.6.0-r1.ebuild 539 BLAKE2B 8c31d581c960bed8148f21bf2236f7d2ca969abbf67cd793ebb18d6d52ccdda1438a93a822419a43b030ee685fcef6f5560285d553c0226c4531e52fcd049c40 SHA512 12939018bcca432f6138b1d0b50720a03900371066b6837cf3f3f5dd8ecd52ee6500f636be96fc73de348bfc4fcfb6bb373e8d031cd92f754f699fc4a24a4970
+EBUILD ptyprocess-0.7.0.ebuild 547 BLAKE2B ca18be9ff4031230c87cb7f316bbdad170c07ab95c5e66755e50f266d8a40d000af6a46c0b12db226ba874a3d565874fbb6913e2e2b603c436dda698deae02a5 SHA512 cbee25b70845b1f4d60d805dea4e5022dbed6c8441d3b47af60e36f2eccea6451791e16bdbcc89d2a16603050e06e082cd92f6d0af1dbdb14b6d906f00ecf67b
 MISC metadata.xml 383 BLAKE2B 03c99bb4daff695f738e75605fe765379ada90b822ded3015bd82e3e34fff7ff61699978e00dd615d2ca6684567b3d072316debbf66abb0c6f9413ff2e3ad724 SHA512 4355f5b56f756ee65c09bcc3647050e727abdd9abbee62a3f2fedf18fb97bbd523182c55ac8eb8456b0d8b7c0904372ee92cbfeed50765d6f2d608280655b05a
diff --git a/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild b/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild
new file mode 100644
index 000000000000..b1ca6b3d3d53
--- /dev/null
+++ b/dev-python/ptyprocess/ptyprocess-0.7.0.ebuild
@@ -0,0 +1,19 @@
+# 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 )
+
+inherit distutils-r1
+
+DESCRIPTION="Run a subprocess in a pseudo terminal"
+HOMEPAGE="https://github.com/pexpect/ptyprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index 19db916a52fa..216c253e87cf 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1,4 +1,4 @@
 DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
-EBUILD pyGPG-0.2.ebuild 1119 BLAKE2B 4babadc4c0051e4f45cfb0e2ac9cab9963eb43a74c0e398525e29c5011665ce2e815e583bdbb0bd6e7e51030b776d27eec748be97e9fb8e785c80f5be17c8f4c SHA512 e95fb00284ab69db327da400a4c300e72d47ed4ff45d6c99bf027caa3d77d117714c2876243d63ff599f136c558f114b212365b1bbb4042b4ac326299ab8eea3
+EBUILD pyGPG-0.2.ebuild 1120 BLAKE2B 79d3cecfd1c8ed6e02ddd18c26103591841e89b23f174eafc8cd1b1477a2be0e5375fc173acf360e9d11cdb9fc4b7181459359cc27eca5d3b613dbbdcba6b6f5 SHA512 a769966e9092299daf52152cbced0d47acf1cca1ebe9feb9f5a2670247eb32ce2efe18bb7fa8525070d4caab83d2daa553c28f7340a3ff518babbad48ecc11fc
 EBUILD pyGPG-9999.ebuild 1127 BLAKE2B 060c36e73c0db8a911963d58562cfe478a7112cb50bf47c2e9ce335a5fac83017ff4bf36d1a54237cb9bb2e2183b9523ead8ec40f42f605fd3a4a5c49cc443bb SHA512 d9f05cfe69a66e339a5e83128aff0f8cc2b5cb6344f4df10b71f3fc72b4483c2ccd0be9d10333fc5adc9c98af1bbaeaa0f51901cfa3243f36961a47b1c45a53f
 MISC metadata.xml 566 BLAKE2B 85f26a61bb3bbdc790bbd1f67133d51d522f492f16ee59dca909eb1c33668cd330faa69cd75603e65b41fc3a0ceb760e0a9aace292de9c7fad248273d0c407ee SHA512 03125338286f45302cc2b60257f4650a8bbcb43e8b7d433b6f012e646a2a2ef7f84b994057a93c3fbdeddd94b838a428d1409d965e0d190c937e4e2463ad34fb
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index c14d0e4c2a22..2c1976eab364 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/pyGPG/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="A python interface wrapper for gnupg's gpg command"
diff --git a/dev-python/pyamg/Manifest b/dev-python/pyamg/Manifest
index 8cad74072d5f..2f7ff2d80a25 100644
--- a/dev-python/pyamg/Manifest
+++ b/dev-python/pyamg/Manifest
@@ -1,3 +1,4 @@
-DIST pyamg-3.2.1.tar.gz 765723 BLAKE2B 72c59c0fe93363f73d8ba4c6297920dd1ca8406b048cf0357baec5f2390bdb524421a35ef65e790be45b543e9e162067ee8f8f09327b464a4bc5c9cec368b003 SHA512 6be0dd068417389934ce97813321367920abf6f9f5e94ce2df8bd796edc797cedd492c9153b62466f7d68055a05821447dcf21578ccdfe3294766a49a9ac220e
-EBUILD pyamg-3.2.1-r1.ebuild 699 BLAKE2B 894c592309416b56a4a3b23ec9d241f8000ecf8bffd178d216e86b6b494e9a497c29ff3c0728c8f02ba90f34013169e1213c1e849275416aa918064f56a93dd4 SHA512 64bd056a6a6173072d3cc9ba7c2d582ea0c71fac786e8d73bc2a8592ef78ab7e6cc3449c922e3c58be19c6f04afd84d76eed804919ac212cef4cbe7d740c6eba
+AUX pyamg-4.0.0-test.patch 589 BLAKE2B 2b337d2815b4bf091a30fcb03b8c9270e601a0dfc5c1d3ed2a4541e8af1d026e8d56a517097d403110eb91c675cc07177b0fc96c81fa48cf51cabccd81da1112 SHA512 c6419ae72b6231015f46679a277d61755cb11cdf1a586789d6cfddbd28ec548ced6bc81c4b973011163d6be76509d26035636ba5952c8bddc3d0c66bc258142e
+DIST pyamg-4.0.0.tar.gz 717171 BLAKE2B 16483d829e8a938359827ca8ebe3093c890685244125576e05220910b66e9aeec278472134d10c589e58dfbd363930cdd7ae13d16c9b9d54c1bd5250e66f4677 SHA512 cdd27834c12ef18f023e78b5b946c06bc2c35f73cf65fc4c76da2fab75f23466e6c1a4b3dccb8506be3ada7e0bafda38122d3d7315deebc7959d2e5300d9add1
+EBUILD pyamg-4.0.0.ebuild 691 BLAKE2B dd58e37ccc7c2b7e2620d043c64fe6ff33a531dbc5e09a419a00b7c572472a8550692f2ed169de11064e60dbf7e6869e2563406c8bf8089cdc733dcb8032e1e9 SHA512 613a44f4139325aa10d12e91866f42f39016b39addec40dbaad35e6775b2ede2d13c01e7ee5dcda5e6fa46693a539ca165e660db9fa4f7ff66999bba275148ba
 MISC metadata.xml 660 BLAKE2B 09f5ba733b9e679cd6435afe0e71a2382498ed2417563031c24dbb9d8630f1ea9ece9d10c2851afb411dec9694b773e495aac10e9cfe4398980f2d0c26efa370 SHA512 9900180bd0de0c9cb26205d2de5674f02405499778124c3fc21a3d3be6e7bd6602f4f619b0b983e95e30ff3f8f37e15ebfc66535db144f92e8f0c6d579e5e6f1
diff --git a/dev-python/pyamg/files/pyamg-4.0.0-test.patch b/dev-python/pyamg/files/pyamg-4.0.0-test.patch
new file mode 100644
index 000000000000..316d0a2baad4
--- /dev/null
+++ b/dev-python/pyamg/files/pyamg-4.0.0-test.patch
@@ -0,0 +1,14 @@
+Backported from: https://github.com/pyamg/pyamg/commit/6f5e549e6105e18cfff9bf4b5f1834d081fa4510
+Author: Luke Olson
+--- a/pyamg/aggregation/tests/test_smooth.py
++++ b/pyamg/aggregation/tests/test_smooth.py
+@@ -485,6 +485,9 @@ class TestEnergyMin(TestCase):
+                 Bc = ml.levels[1].B
+                 P = ml.levels[0].P.tocsr()
+ 
++                T.eliminate_zeros()
++                P.eliminate_zeros()
++
+                 # P should preserve B in its range, wherever P
+                 # has enough nonzeros
+                 mask = ((P.indptr[1:] - P.indptr[:-1]) >= B.shape[1])
diff --git a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild b/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
deleted file mode 100644
index cc9224f2094e..000000000000
--- a/dev-python/pyamg/pyamg-3.2.1-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Algebraic multigrid solvers in Python"
-HOMEPAGE="https://pyamg.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	distutils_install_for_testing
-	cd "${T}" || die # need to be away source directory
-	nosetests --verbose pyamg || die
-}
diff --git a/dev-python/pyamg/pyamg-4.0.0.ebuild b/dev-python/pyamg/pyamg-4.0.0.ebuild
new file mode 100644
index 000000000000..85ddd0a14093
--- /dev/null
+++ b/dev-python/pyamg/pyamg-4.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Algebraic multigrid solvers in Python"
+HOMEPAGE="https://pyamg.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+# cannot be enabled by "distutils_enable_tests pytest"
+BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+PATCHES=( "${FILESDIR}"/${P}-test.patch )
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index 4c059024d558..6387f02313eb 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,3 +1,5 @@
 DIST pyclipper-1.2.0.tar.gz 53504 BLAKE2B 611a86b4173838dc0c77ad765f1ab9d08e73b147936ec60fae63308d5bb0019b40479222b80565f3d3ba5337c1a436fa63306105bb3a698592160eb8b66f3014 SHA512 2b8966a695fd7916786ab7549f8c867aad1d4879f3d20b87d7a4b6e1fff8a36871a440795548e91256ff89e574c04be4390ffbd05bab6b0bb51441c7f8acf674
+DIST pyclipper-1.2.1.tar.gz 51862 BLAKE2B be59011d44ba4364e3e0d1d789c10f76635a5bc690dad8030104fa7965cc118e3529bf6505e5c4e743a8ff21e0d24129be716cd91e09b7521baa64359de364ab SHA512 0fc411bd8fa33fc3e5a71ec149b720b5c2f2e9a5e704d5e175b5930e0e073bacfd26b68e19c00802ab68e7a8946bdfcacae858e2d6d81b87d85b3747fa4a316b
 EBUILD pyclipper-1.2.0.ebuild 784 BLAKE2B 0060491695fef4966ebc1041b1a54aedd4587c90affaf89dedc90432e5d9bd5480a2b2b8adab7880b4c7d2c7621ff1aaf9c4b24f42f5d868e81e467e8d6a3497 SHA512 9c01664dcef14a887b1939696052a83979030a4aaf4e26e1dec3d75d5003a9de1f3aed343bd2ffc5c2a2ccb159ae9e85a133723372f3a270f59f541dfafddc20
+EBUILD pyclipper-1.2.1.ebuild 787 BLAKE2B dc824b271b64d1b045c81e8639f5a814d14c847dfaa6c5461f218fbdd6b5a8fd7fca17284f2b380a38b08e70a07637c5c40a31315e4c5da0e2df02d9306623b9 SHA512 0ff63d3385d381168d90c0641ac56e64a599b049a4c52ed0550f5a69ec72cde7477ecce0153ed88c8110ddafd66563f8d9f18d2bbbff4d67224562ad8a6a1d21
 MISC metadata.xml 315 BLAKE2B dfea428911659d721c46baf73e32549fd98d51aa056ef26b98f305f447292b75a1ddde062602dbe03cf4b7f4e08d0a32a7e085463df1e650ac40f997cd6c0c9d SHA512 15f70085b3bba01136c37bc97ab84749d0d6f99e785c753929c00c3f9de7cec360804f44001954db05d650eae634038791533a1d02e9e1286e8fcdffda3bf597
diff --git a/dev-python/pyclipper/pyclipper-1.2.1.ebuild b/dev-python/pyclipper/pyclipper-1.2.1.ebuild
new file mode 100644
index 000000000000..3efd8d8de2fc
--- /dev/null
+++ b/dev-python/pyclipper/pyclipper-1.2.1.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/pycodestyle/Manifest b/dev-python/pycodestyle/Manifest
index d204cda8e33c..bb6606b6c3b2 100644
--- a/dev-python/pycodestyle/Manifest
+++ b/dev-python/pycodestyle/Manifest
@@ -1,3 +1,3 @@
 DIST pycodestyle-2.6.0.tar.gz 100213 BLAKE2B 484cad34de86ae50f8efaffe590e79fa52ca7f13a3a9d5c9d52f52aef7a940a9eee8cff74b3bd1f711c3a01155f0ce6794196817d1b0e941b8afc77de4804387 SHA512 3bf9904752170135ca399a1b25470a531adb5b85dfd8df7ffbbc86b5875bc3a507cd8732158bc9cb7fd5b44b48c9a32d63d621856d55a15bc3104a99ca4bd271
-EBUILD pycodestyle-2.6.0.ebuild 908 BLAKE2B b576b89f64d10a9ccd97da866076b13c45cae967160fba572812d9b7fa88a53a5d68551828da56415fe9afe3b0a6c7c5bb4caac33dc66b9b668d358e12964ec7 SHA512 1f8db0996c51ef2df5f24b708bdfd7628c7ef73d3b8c135cbbc1933cd69a4d390320c08234759a14b9d4eb837916951f99689372f3fb77099cb223e6b7d736b2
+EBUILD pycodestyle-2.6.0.ebuild 909 BLAKE2B 7e7d558135584545bf5a25de309e247ba076849398fc03b1202a4ff1d1d29978e70793f8075f6cb29dd98ef9c639fb85b85af5c8c67847395a79c08c8d26f631 SHA512 db781be65f15aed270ebf3e4e46ccbba9fcaf33a644a0b3215cf37a8386384a04471eada0e39316abb2e87d1f7a4fbd24f8eee47026d4eed9f137a04b9e25fc5
 MISC metadata.xml 360 BLAKE2B f3f8ecb3bc2ed8eab2e2283967a5a7a94a5149302e8651e819204810bfc7fe43689f0b1c35824a737fbffbd5967845ca089a539dcd0b50704b6d5a219e3406a6 SHA512 2364901eb99136d33c8343c14fdd7d0f83e6328c311a5a8395068724a2d15d8dc6c6ade8026336ee92cf105e589d7fc960780f70c938f67f48c797503a956e5a
diff --git a/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild b/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
index 6c0936b68e1a..116cc53d014c 100644
--- a/dev-python/pycodestyle/pycodestyle-2.6.0.ebuild
+++ b/dev-python/pycodestyle/pycodestyle-2.6.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 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests setup.py
 distutils_enable_sphinx docs
diff --git a/dev-python/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index e28ba233c6d1..f47c0008be5d 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,8 +1,6 @@
 AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb983131838287563d4d60896f27e28d5c2534f4ab008e50017694ac9355b43f8f387cc29abfd21ffd648233c3dbae33a06fcedb12a6c7e11e80 SHA512 06b42ea780bd374cf5cb5d6cef3fade5d695c1ee0d765e2659408da7645ad311eef2028f17d8ec0289d49c3a5851b4c63503d7c922de15873dbbf16d0db58b08
 AUX pycryptodome-3.9.9-system-libtomcrypt.patch 1538 BLAKE2B 7928e5a3c2edee7f58d7b7f5876416d3b397e29cfb63e063f904f7a1deb46300113d165aaeddc57e5e0e0b4b1f0ab548fb9151e1d43f16483491948c2d722d2f SHA512 74b0ec6e521e0d51c3e777a8cb6f374e2e3853e163cbe66e50a16b9eb72b004386cb6296a0f3950ccac9a3fece26221c0363e4b05df4608a6c5e7cf408fce6c8
-DIST pycryptodome-3.9.8.tar.gz 15633268 BLAKE2B 8c4f8d4839be0fb09556677514ee6c7f832684f20eb4e355cee87eb5b52a5c09e12712c1865ff89fb5dd6c628ca027374c7cab8a2287aafa4eecedf1095f1a12 SHA512 894e763720df284804fd686d5805980853b86773bb3097bf03d929818b9944e5a257e47414275f302966864751e50ae34dea19ad749910f1ceac31833a53ef7c
 DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
-EBUILD pycryptodome-3.9.8-r1.ebuild 1320 BLAKE2B 043de28361a19d129a73c360118f64d602039d3ea9a7a27a2564d709a53ec307fe7ca8589862436c2a44977f23cb7342e08d2fde8a1d32c524044a7cdc02302b SHA512 dcb8e914dd502e4d9335aa41d73551261d2d0645a75ae1389d534cddd693b25013d8551af300132d2093d2379e70eadb81081a082fed3dd551e49b35df3042cf
 EBUILD pycryptodome-3.9.9-r1.ebuild 1414 BLAKE2B 7fd9ff7660816ab2f76c0d57c7a7732d858d92a205633909b4d84c8811458a77d7f722eb9ec2181388ce2386400b2f58d0ab82f7d360fc2f860c2175c9af3d22 SHA512 55c77d6b4850297081c8a1a14ae170c7e7bd28f1ed48aae38700e23a82476747fb04c6973501deb9626e0ce70889dc40a0aa521b8f04c89ab2fd698ddd0a9d1f
-EBUILD pycryptodome-3.9.9.ebuild 1387 BLAKE2B e567fcdd6a7233657c2219685690d67b63201c492f69e25673b0e8a69792c38229e2019a220dbca690a1d5eb7f6489a62ecc33d80ca8f20d16e7c8dffa2cbe9f SHA512 a23ab811ca63ea99cd243ed0c171b13cac88b79434ad7597952f28e45fd38ec2117381c7c44728f1130e0ad3698be075e2b9e3a71376b7e21f374bc295a1cbc0
+EBUILD pycryptodome-3.9.9.ebuild 1367 BLAKE2B 0ab10718491c8cb9291edd81c5fa87664cb9a535fb8c047def3decd950a9cfbe436a04248d80135c9fd12d61f8ed34bb2d61e3985446e991133ec1048f95ecd7 SHA512 649f87cb58e8cdbc26f7011a0390c4d99eba86566566ad16c4ac2782c0cab73409ea77c8def6cddcf15ab0af09c65ab35b955d93535b2bf338106c7c412c1e29
 MISC metadata.xml 385 BLAKE2B 8ee308521948e0f6bbc9c70e25c231a02424c9d4bdbf2c6ddda10767d4bf77bbda74607f4dce97ff42bfe6fef8a5ac2ee25e0b91bbc491e977c5cc46b3486699 SHA512 073885df3e0742b6088a537d54bfe9fcfb646ed9a5d3d19940d02fb05d453601b71db583567a4810a8d739c935488291624bc06948c4cb21b28a5500fbea4e97
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.8-r1.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.8-r1.ebuild
deleted file mode 100644
index 4ae0c12c89b5..000000000000
--- a/dev-python/pycryptodome/pycryptodome-3.9.8-r1.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,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A self-contained cryptographic library for Python"
-HOMEPAGE="https://www.pycryptodome.org https://github.com/Legrandin/pycryptodome https://pypi.org/project/pycryptodome/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2 Unlicense"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="dev-libs/gmp:0
-	virtual/python-cffi[${PYTHON_USEDEP}]
-	!dev-python/pycrypto"
-BDEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/pycryptodome-3.9.4-parallel-make.patch"
-)
-
-distutils_enable_tests setup.py
-
-python_prepare_all() {
-	# parallel make fixes
-	#  Multiple targets were compiling the same file, setuptools doesn't
-	#  understand this and you get race conditions where a file gets
-	#  overwritten while it's linking. This makes the files look like separate
-	#  files so this race won't happen
-	ln src/blowfish.c src/blowfish_eks.c || die
-	ln src/mont.c src/mont_math.c || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild b/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
index c175cf74a398..b3e1f6cdb24b 100644
--- a/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.9.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycryptodomex/Manifest b/dev-python/pycryptodomex/Manifest
index 276792cea24b..c51748b53a4f 100644
--- a/dev-python/pycryptodomex/Manifest
+++ b/dev-python/pycryptodomex/Manifest
@@ -1,6 +1,6 @@
 AUX pycryptodome-3.9.4-parallel-make.patch 756 BLAKE2B 06a79eff056ecb983131838287563d4d60896f27e28d5c2534f4ab008e50017694ac9355b43f8f387cc29abfd21ffd648233c3dbae33a06fcedb12a6c7e11e80 SHA512 06b42ea780bd374cf5cb5d6cef3fade5d695c1ee0d765e2659408da7645ad311eef2028f17d8ec0289d49c3a5851b4c63503d7c922de15873dbbf16d0db58b08
 DIST pycryptodome-3.9.9.tar.gz 15551299 BLAKE2B ac89bcc2bbe707cb2a9cf2496a2eb74ff5685f11017d60d67558de7ac6cad5c24c43b4074bff01e99378d7c88462e88e88f363c5329fb800e1a7872ad8a34dab SHA512 a1aad4d52256220fe3d5d7f399c2c5e7338d6eb88058da0571fe1c686d74d33ff4bc1c275d4b9373e0ff22f4ddcded75a25387e76fc65047f8612f8856c1bd4d
 DIST pycryptodomex-3.9.8.tar.gz 15633485 BLAKE2B 3d7b8a74d2f7cc0f47c73f3f3d1dcf13c8b9feb9f2f532dc48751c4a73915aa081ecf273a81731076070f054f5b2037a5eba9054ca71e549aad18ed0c3148c74 SHA512 bcc5fb27a89c00e6348eacc744a23d687d0b308d5c8ad8f6d955fe2b9e84288a592206336e7fef699800948f8ea7b1ac06d2bec60df0b9ff0fa32d0a05380869
-EBUILD pycryptodomex-3.9.8.ebuild 1326 BLAKE2B 2ad09640a04fc98b7ed803a3b843d52edd55bf14b8b62de34dfd35fd63fdf5979a5fa5d745fd8f675048b130e504aa7f87799f303be6a5efacb30f6f8f1b496c SHA512 5ae9a1e0a9f7db68fa43d13bfc6489f680fb400c651e08ec651c33e94d0181f1a5411b5f0ad31859a66c08f753661034b30aa40da7926fa0e614a98f2d4c8101
-EBUILD pycryptodomex-3.9.9.ebuild 1510 BLAKE2B 1139a7ff5c924c04175db63903eeaea57b3f00c5c1869eb012810243097f1c40fbd78c1421d0366eb8ea0fe531b745061fd1132a9764bec268792dd48137901c SHA512 448c19f7bcca190b531015e0ea25d927d0b456fdc0b44a3c6b4d0d44a159e30579c45395e37683180477bb6d8b9e9c233a3ae38facf913a4741694d240cfc08a
+EBUILD pycryptodomex-3.9.8.ebuild 1306 BLAKE2B 8a391e69c49a28163889c11cea8555315b1d55acde1aa626f8f10b0d9009dfac05c3192a0879c9e8d12b23ae165626357e132529014fd35b0ddf44144dba695c SHA512 218e48fb4dee89dda307b9780572946b370569ce3e82315d0d5ea3b9b3bc6aadbd0ccbac7b32dbc63622a01140f56cce89b004a8e7ef2a6503336a3b55a1f90c
+EBUILD pycryptodomex-3.9.9.ebuild 1490 BLAKE2B c10d0e6a5aaee715fd8e3cfad95aaef4927f981908d253cec124dcdf1cd27f3e226e398a35805f3e861e19b3afa2db6813fe1cfa8bb47bb79d8ca897dfdbdb62 SHA512 7e725117107ece102dfe83a12dbdb5ba90d9120d8ae1ca73adb25b15c3daca42720373505b24a439c4394094ac00894f6dcd573c8c99391488f8363725fed218
 MISC metadata.xml 496 BLAKE2B 8ac5f6afdf1dc8341803e415ae9f3c7c845d066c613b0643f80202367ebd44385f9b0a101c154455d545da479358d74852fb15f003c2efbb0cd6da952454d5c7 SHA512 9d8246235e1ee909fcb035b8f968f1134a09b774f182a4d88bdf0e3fb6296412963fd15ea504aa627ccf50f431a4521c27b6c3233603a9eef486f93d03daf2aa
diff --git a/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild b/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
index 485ba9c9ea37..db6037c6b1e0 100644
--- a/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
+++ b/dev-python/pycryptodomex/pycryptodomex-3.9.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-libs/gmp:0
diff --git a/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild b/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild
index b3b8e7593c3d..ba61315d3e53 100644
--- a/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild
+++ b/dev-python/pycryptodomex/pycryptodomex-3.9.9.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2 Unlicense"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="
diff --git a/dev-python/pycups/Manifest b/dev-python/pycups/Manifest
index ec8047dbba8b..1407d80b37f1 100644
--- a/dev-python/pycups/Manifest
+++ b/dev-python/pycups/Manifest
@@ -1,3 +1,3 @@
 DIST pycups-1.9.73.tar.bz2 52732 BLAKE2B a6c9750970548ba85cdef4041f716491e9b0cf4273cb5381bca8e57deab457affaa62eccf74d36eb3f8b047e5142c952e56e7e624f85ed7959a769f568824f26 SHA512 ee893d64f1645b71805ac358c4a3cc594f6285f04272ff0558aa60cbc90fafdbac30b623ffcc3a6b739218d9fd7a6a6e1d8cb186a5582f2cc30a518ed4dde810
-EBUILD pycups-1.9.73-r2.ebuild 653 BLAKE2B 60eea52d69a1db1abb4857cc19bae3f400fcf138f65269c3cad6806d31bf9a09a78fb19f305a503b1535999b6e589a664dfea80db08932d38829a8d624e45df5 SHA512 f407cc61fc0315b91c9cf4e20cc3ee5140763dd0db5ae9a482fae94e8bc4e4fbbc07151429b879057a19ac6d06e25852e1f53786df60efa36038713db7b02808
+EBUILD pycups-1.9.73-r2.ebuild 654 BLAKE2B 0950830e227794c6d12d046d89c7713635af11b548fd1cb5030c28f274526a3f7c21d49e05d9f654a461dce0fc3f2c815613dcaaf6c090e92432ade0d8d15473 SHA512 365c954a952104ab7c5a3a332c3ed158665e5d97631eb3f06fbcddd7a32158d029db0240225f1840debcdf6eb7e5614aa68bec1a8e7d7a28ff4874d1e2320864
 MISC metadata.xml 456 BLAKE2B ea7d7af9ed2baa3cb5270b3da9c5e1c6dc64d1391e0b280ddd1a6e3e8f3317808eb3906e1c9551615ac2218b89685b9ccbfb4d4656e80eeb54cf2d8dec2149c7 SHA512 c8318d150b07e8a369037201bcb9a99a7bc8c406a2a2889f4a1af62166313d4db740e8546f78f0de1e80cddf774f8818e49a4d3e99e906456ffc2f46a562e7ea
diff --git a/dev-python/pycups/pycups-1.9.73-r2.ebuild b/dev-python/pycups/pycups-1.9.73-r2.ebuild
index 6ad4f27a027c..c819174cb154 100644
--- a/dev-python/pycups/pycups-1.9.73-r2.ebuild
+++ b/dev-python/pycups/pycups-1.9.73-r2.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://cyberelk.net/tim/data/pycups/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-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="examples"
 
diff --git a/dev-python/pydecomp/Manifest b/dev-python/pydecomp/Manifest
index 34f773359d3e..a2f67e22f8f7 100644
--- a/dev-python/pydecomp/Manifest
+++ b/dev-python/pydecomp/Manifest
@@ -1,4 +1,4 @@
 DIST pydecomp-0.3.tar.gz 10009 BLAKE2B 2741dc776ac265a84daf4c68542e652c7e2663dff1561297057f3ac219805136ece32af3f33e0b03df0a9883663692fc3855490478c538a0edec838c90c1c4b6 SHA512 7935111f9d0629eb74f529a6427b9db3cac4c9c205f80b28380ab9c323ca9ad7b78b40f69a7760a5a69ed065e9d6ddd42d08fb8f2cb787f15d2ec6e88e20221a
-EBUILD pydecomp-0.3.ebuild 974 BLAKE2B b8389f72c99cca487ef1739fccc8cb9581003f5d29be0457c35a40902d29c1922df0cf338c2c528f00cfb404ea267c7a52d3f64d22b74a5c1c9d78f37af295d0 SHA512 3660a157d733cc28edd613880fe8e0a81dcdb0e4353109dd9352abf347adfc87af934ff96ef0e0b67ef0b554a7ab23929b90a4d4c1e9272e9c796f8aaa34fd06
-EBUILD pydecomp-9999.ebuild 1247 BLAKE2B 09bfde84e9f7b9470217a6f7383ba4889e800c6faac36565479050d11302b09e10505287563929d27d411ceaa3afe8429bc974be0f1f72510e631b6391b75672 SHA512 87466b8cd25c870ecfb66d4a9dfe81ed644e26a7d6d4c10e263138007d46c232ac808c4db9e30bf65f232d708ac669efaa493f9da6d400562756d1c9c577f005
+EBUILD pydecomp-0.3.ebuild 975 BLAKE2B 1a039903502153fdf61685624f0166b2a46bfe517c658935de19e6d03102047a84b2c9809dc7a96527f303605d3bc0f88318386bae970a7b8ffe4d4a77afc3d5 SHA512 475e7afb389f886280ab86b6596c3d3b88209a66321aea60750a526c1d79fab5db2e5e30f0c467f670dbebf35f980a5033d6804ba08ccb8abbd20b522c8372b2
+EBUILD pydecomp-9999.ebuild 1248 BLAKE2B 47bbb8030e44aadd9a97266e07e4825428c5addb04007819036a977d526055c81023c54c7d36eb4ee1b0c01c8100781a5f2b5dbd74b7dc30e84f3fe5352029e8 SHA512 a959e534eb5cf67419599833d43bfcecc7aa9ba1b5e766354ebc8a5eacdc8aacf31a79e29a2d1b267b9b2295a96b31c5dc1c8b987bb00afb2cf88ff6935de7c5
 MISC metadata.xml 690 BLAKE2B 4fea9b06a19ceb9616513e452d1016972ade5c78bdfddb2b94c5d6c4b9884d8c2a379a9874ac5a4dcb7d1e9373a030fdfd1fea8c91a6e21ecd723d04e85a247d SHA512 ec9167bab90e021522941252d9f523ce6040adcaa337b4bdd31495867ac64cdb8ff919fd0928e9ad8e2c12cac45555b805cc7d9afab059e1a20b014fd8c25707
diff --git a/dev-python/pydecomp/pydecomp-0.3.ebuild b/dev-python/pydecomp/pydecomp-0.3.ebuild
index 4cf31eba19a3..85ffb6ec8939 100644
--- a/dev-python/pydecomp/pydecomp-0.3.ebuild
+++ b/dev-python/pydecomp/pydecomp-0.3.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pydecomp/pydecomp-9999.ebuild b/dev-python/pydecomp/pydecomp-9999.ebuild
index d3dfb9ec5919..bf54f4c83519 100644
--- a/dev-python/pydecomp/pydecomp-9999.ebuild
+++ b/dev-python/pydecomp/pydecomp-9999.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~dolsen/releases/${PN}/pyDeComp-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	S="${WORKDIR}/pyDeComp-${PV}"
 fi
 
diff --git a/dev-python/pydiff/Manifest b/dev-python/pydiff/Manifest
index 3d356186bf36..6c175fc9bb44 100644
--- a/dev-python/pydiff/Manifest
+++ b/dev-python/pydiff/Manifest
@@ -1,3 +1,3 @@
 DIST pydiff-0.2.tar.gz 4108 BLAKE2B 868b9b31f96e49a4e375d2933fc158845ced4bc561816512f41c85dbd6d5373567a51153dedc527826ef2d03306288e3255d300fc2b400e28983e6616eec6a25 SHA512 0f55edf17138c4a1894a1ca03db21e6d6d21fb3961a2738c00d59e05d32a006413aee04005962f1ba6628c012bb018d43fcbbef50665ea10d3397539e5d3def1
-EBUILD pydiff-0.2-r1.ebuild 521 BLAKE2B 90dcdefb0b0ef4ebe3c1b3745b9755927d5e4b1ecab6496a55943edc592dba87b76e62865be873080da6b43d334b6474923b404cc45328f8bd43cb3b5b926a29 SHA512 345cb20117e9632d41aae37002a8e13bb18ad8df26d4b478f455a1ffba14d7bbdfbbb0d9fc492ba3b76d96d1396784457290fd3ca2a0fce5bd3d9a57b29db649
+EBUILD pydiff-0.2-r1.ebuild 519 BLAKE2B 88b706111c80d97a6e061a099c83f7b54a8985bf1f21f0ca5ac5501825ee28c3dbcc6bee368afacf128794d13ac0149bbebb5b643030a7d7c13eed506eba7b9f SHA512 954e7ddaa35bb679fcfd6e54445689158d73f72a2237cdb8e4c17fff875044c59adb5a235f884073342a89dbe41e12f6703e46166273d7f705954289ac17df1b
 MISC metadata.xml 373 BLAKE2B 8e20b47c64105d9f29c7beb15868eee311dc1f6bc49645729b780629d1e7d26ea7296f0768b29de4f4cb9df2e629d25d100409e646f30f336608a7996364ba34 SHA512 cc56455c69ef9816eecb5ca62fa6f660ca124cae7d62d58006133a9d9af79aa4bc45e572ca1d2cf5d9b64c7f7617f62b94b573b65d799327a2088e1f80902402
diff --git a/dev-python/pydiff/pydiff-0.2-r1.ebuild b/dev-python/pydiff/pydiff-0.2-r1.ebuild
index a0648cbbd2af..6f14b12eb146 100644
--- a/dev-python/pydiff/pydiff-0.2-r1.ebuild
+++ b/dev-python/pydiff/pydiff-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~ia64 ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm64 ~ia64 ppc sparc x86"
 
 python_test() {
 	"${EPYTHON}" test_pydiff.py || die "Tests failed under ${EPYTHON}"
diff --git a/dev-python/pydns/Manifest b/dev-python/pydns/Manifest
index 8ead0d8fe0ca..d19b11655beb 100644
--- a/dev-python/pydns/Manifest
+++ b/dev-python/pydns/Manifest
@@ -1,3 +1,3 @@
 DIST py3dns-3.2.1.tar.gz 30691 BLAKE2B 336ed91a3bf8b33db258667ac96eba6df361bb2a8f24c433dbc6754ea32a7284ce0463c392c1392538eed9d8bf9ea3f09400bc08f1970a7c96c52bf072606718 SHA512 22f16c571f9fad02a70a8e0bbbfd802f4f9af23946edb78e15f69f23e57411369274945a1dea5603acae1fc1eb404e5445207c541afb7864a60b92dc4d5477b3
-EBUILD pydns-3.2.1.ebuild 756 BLAKE2B c5778de45438146309d7c1f6630db9493972db23d2811c53a703a5b924a77e0ea3c4870303078f93c456623df5dae01344151a3a3c2698ac03cb76c05a527c7b SHA512 bbbd42c42203e03c1410f27ecda618013d35ea2456d80ba441c2ba4059a7346fb7dc180c09204d6d493a6bbc43febd20196c81702b003d70956affabb386a782
+EBUILD pydns-3.2.1.ebuild 757 BLAKE2B 4a619e1aca3865dad3f0f61379c5552231e86b998213d990a4f2637833e5594872e9ad1a208f1154125033aa4cfa35cfb74d5f0650c7af68cd9dbf4f85a8019e SHA512 f381d8b3303fed7914ab8a9baf2615822c883dda516ac50360e6c15b55e7273dcc586feef1311b7dfa33175218655c06f4aa4b8373c37ed1a6bfad083b2828b0
 MISC metadata.xml 662 BLAKE2B a86ca878eddec2ae971f3fdbda533d9fff639c7619aeb25997bf335de25d0738c9370a1b68d6e6fd8fe5eca6237d124a0fa629c048ba9e1772b42e42a1b0edd8 SHA512 a87cafcd69bb347d9737d97589211360b71181b80caa73c4f117790596f5482e0b3177dc712eb89afb200c7a56669eb8a805f7c3f4974f9527dcaff8c4cbc821
diff --git a/dev-python/pydns/pydns-3.2.1.ebuild b/dev-python/pydns/pydns-3.2.1.ebuild
index a3c44a707996..eb1339ba6054 100644
--- a/dev-python/pydns/pydns-3.2.1.ebuild
+++ b/dev-python/pydns/pydns-3.2.1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="CNRI"
 SLOT="3"
-KEYWORDS="amd64 hppa ~ia64 ~ppc sparc x86"
+KEYWORDS="amd64 ~hppa ~ia64 ~ppc sparc x86"
 IUSE="examples"
 
 # Tests require network access
diff --git a/dev-python/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 0897401ce9f1..f3dffdfd66b9 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,3 +1,3 @@
 DIST pydocstyle-5.1.1.tar.gz 70759 BLAKE2B 3cdb519d7f9459a201c9b7bc3002e69dae76b79758b155198b3101c6817c66db01616723e789dd8105d0339d6163fec02ab50db2370b13d3a8d1c5a17ecded6c SHA512 70c7408dfa4c8e54a3abf0548a9af26a7ad7ee0bb76f3a41bf6f2297ce09c13c03ab5e066b1b15404ba6390ddfcacbc5e199d8b73ee74e3b184759d88c8b2a51
-EBUILD pydocstyle-5.1.1.ebuild 913 BLAKE2B 5ca93c5f6320683b8ef405e58eaff2ad1233d7046bec85681b07cba7d63daac8e915a3d9058d6b3da7c67f0a14f38cc52b74c8ca2254e77536720079a950145d SHA512 a8028bdeca7ac3e08be31f08e70ebb4c33aa26573ba2686536d3ad4ec0405aa95cc9c1e5b2d7508c1488f7a10ea5b968300d27c37ce1f041189d95176923d68c
+EBUILD pydocstyle-5.1.1.ebuild 909 BLAKE2B 78ffa0615df8e0b6ee603a26d800321f90d0528032084f515a284c7b8c3af58dc75be2f47abb26eff07143ec2464235735441c15c5d1835d1a9ab29b199a78dc SHA512 4da34c492a74c28dcc9b2212b9a79d7cbbb557b2c4cbd8bfa74f29a5f6c70f59dee98f1fe4d55c5376a1bac106ca0fc475dfbf560a1e8415e371e147793055f7
 MISC metadata.xml 787 BLAKE2B 15d107190e09858b1c4642148e64d288ec11c96509ab438488cb1aba5ca0640a8ca779c585221d6bfb066c5983f6f243c2c74fc099dbd4b09d026ec48dac662e SHA512 1d38ca977db0ecf99ce5c8a8bf6b57f897b7fd1d9b087075dcdfc5891959a6bf15baf0a8ae44202fc6a9645d08a0a0c52fa6e1e39ce08f7d6eb80f797476cd70
diff --git a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
index 679fcbe1f698..e3ce4474db26 100644
--- a/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
+++ b/dev-python/pydocstyle/pydocstyle-5.1.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 277f2750fdaf..290526082cae 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,4 +1,4 @@
 AUX pydot-1.4.1-unittest.patch 3496 BLAKE2B d5aa063d1700836c2aa967c0856c4b693f0820f1c3ecf41de444781a29f4ff4fde6d8d2cbb30458364efe47154fb6ad50c545fc45fff6fd27864483ab4bef2e6 SHA512 0204de6a767d062e4074344ce093da6789145407c7aab3706abc72d15e655489b7e43f1038b8d5951ac9a107aa0ca8a399e119826100d05433d13b537ae48cdb
 DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac19a6c197ab1725f92c87e973c2dcd84d4c6c04cb2ca76b8f40814cfee1d5a53e4952065a538fc271e75d2a0 SHA512 b5f16b59908586df61cd415cb1a3e242fb69c39674a82b171862beff1f3727f47cba39bdd806901cb56bc8a6888783a53d112b1b70044e124ea992789d77f938
-EBUILD pydot-1.4.1.ebuild 931 BLAKE2B ec465d1110cfb856ed5f9573b454ccb8e888ac97fc9eaf5eb0e4fcb89d075b43751f13e3e4b2f5cc45d7d93ecdf3c6a64a74fd28318a948dd3f333656f946152 SHA512 23c4b6e70f6b2a978e915da0576d63be4f349c2e3fb7f5a4b23aafd661261fe0722169051ba54bbdfd75c4b24a7cecbf25e732d404644dd3191699dd35c25d9a
+EBUILD pydot-1.4.1.ebuild 932 BLAKE2B c54a2e5a61c86a23cda503f20e20805a6f512ef4493bbb53e485c2b3f1afd7ff1fe5d43c96f17297583c6340657d6d8792d532f365174205d277ae1bee194164 SHA512 3f0e50dc26aaa71f4772ca575a96a328d11e24b643dcb9514d2abb06f09180e4ba5f43af122c4c00d94877d21c640ec6d5117dbca9397aa87d1c579e5254e6bc
 MISC metadata.xml 376 BLAKE2B 2118896ad9769d359f3d1573285cc61affc3989d2ea81d0914e01b5e8882ff94fd70a06324ce3cdc38146edc8513aa67457dc65b81af93474568e9a1b3b23c47 SHA512 0f67a0286f6ff6c6b35e67ff08abb0b86f9ac60e57d321ac7ca0508383b5ce8b0c091a3b023e87d20f3705887db40a5edde2055fa96ec7bca21a5b8aacac31ce
diff --git a/dev-python/pydot/pydot-1.4.1.ebuild b/dev-python/pydot/pydot-1.4.1.ebuild
index 224ae09f8d9f..c702cb823753 100644
--- a/dev-python/pydot/pydot-1.4.1.ebuild
+++ b/dev-python/pydot/pydot-1.4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/erocarrera/pydot/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pydotplus/Manifest b/dev-python/pydotplus/Manifest
index bc17cc5b5de6..6e92a81c00a4 100644
--- a/dev-python/pydotplus/Manifest
+++ b/dev-python/pydotplus/Manifest
@@ -1,4 +1,4 @@
 AUX pydotplus-2.0.2-tests.patch 907 BLAKE2B 387823545ea3b1372b6584a4b2daca756eb21d81487e3749309c155e37b21171e8e624d54caecc0b356a1456446a4e3b8340b5fc233301bc270fb3056571a601 SHA512 21dd557a0a94d6ad0e4932e01a97a450d76c0f7bcceab870b0ba60a2b96c711ab139fc682ca2a20da4c68b49fe37577763639bb77b9fbe28c7fa1281f2e5bb4b
 DIST pydotplus-2.0.2.tar.gz 278677 BLAKE2B 879271ba7e2104134a71caef7676082420770dcdb34aeabfe76232ad8f9774d3e90a9f7ca5fb407a7a4e8e0c4e5e01824bd0d5936fe77554cc661839fcc0dc7b SHA512 6f06a1f284401123a4514f9e9a4974dee8dc8d01e6b7c40a797fb70eed22b99fe774272f8b106b5632a33f524b356349fe1ff9633101ff61ef2fc3fe69d641ac
-EBUILD pydotplus-2.0.2.ebuild 656 BLAKE2B 3619d05d14fcd707dd15d52c0e46ec6ce61c13de3e76188b085d5169b8bb432e2e5bd6a3481c4ae636b59ce6f1cfce7ace89be54e8b945780c11421424b02a6c SHA512 f8195c8916cd4963124c8b3f3d8fd2cedae02f926e695a2b78d93865fe82de4a8790e8c3f882573ef7b7e5802f06ced6a50d78bad297e4df44347a78f8844d04
+EBUILD pydotplus-2.0.2.ebuild 585 BLAKE2B 44ebcc5815fa3f19abb257b80df372d52b175f01a6b06656ee5d4a807adbc3e25898f9f03e489e8473f4ebeb4ffcc735a3d47debb170b0933d78f88f0d02e83d SHA512 f2ff38c1c65859b1e2f9246f0f166f87f18535a5fb48ae33d37ba22d4afa77ab95019cbd8660a33660bcd1409fb94e30a01c505c7715ff1767c96c9499c303cf
 MISC metadata.xml 608 BLAKE2B a3bb72fe1014a3c5a094baff6002a47999c6055d81681b0df29f90d24554cd609b5940b30560d34550ffe3c161a6e76fe05d2a7128a2292f2e8cb4494d7aae30 SHA512 f05b8685f9afe5083512eafb1041f8b868c67b5b97f90f912a13e78717826526c5530af6c11a5e92318f27eab8a875835a66775ff36453fd6f9158dcdeb78a62
diff --git a/dev-python/pydotplus/pydotplus-2.0.2.ebuild b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
index c8aa79de634c..0c5a24a0433f 100644
--- a/dev-python/pydotplus/pydotplus-2.0.2.ebuild
+++ b/dev-python/pydotplus/pydotplus-2.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,19 +14,16 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/pyparsing[${PYTHON_USEDEP}]
-	media-gfx/graphviz
-"
-DEPEND="test? ( ${RDEPEND} )"
+	media-gfx/graphviz"
 
-PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+distutils_enable_tests unittest
+
+PATCHES=( "${FILESDIR}"/${P}-tests.patch )
 
 python_test() {
-	pushd test > /dev/null || die
-		python pydot_unittest.py || die
-	popd > /dev/null || die
+	cd test || die
+	"${EPYTHON}" pydot_unittest.py || die
 }
diff --git a/dev-python/pyelftools/Manifest b/dev-python/pyelftools/Manifest
index 191caae595ac..c46660e6674f 100644
--- a/dev-python/pyelftools/Manifest
+++ b/dev-python/pyelftools/Manifest
@@ -1,3 +1,5 @@
 DIST pyelftools-0.26.tar.gz 792390 BLAKE2B 523e6f64205273e8362db92900aebdc05849c5a55d48f75aeae4aa0c58d6dde35ba73c660a5993b211b210fba634360befbdfa90077a140d708c71091918e306 SHA512 dd166f56654592f6a0d7a91bc41c01b9300de6d2f08b204a61ac48eb3f4b3224f89271c5fe66adc41d71a5e2bed8ddfa4ad495098df917623f7aa90c2caffeca
+DIST pyelftools-0.27.tar.gz 3328795 BLAKE2B 74e6e17c68b197d0ecdddedba81a96601003c41a9c095bc72dff7630511705d36d1bc2732005a87ad1420c99497d729c5b771eca7bf5409c0da77d7b348d9c1b SHA512 bb0a00e5500016e3d4f64be0a728e190f84b11a805f78d668b5a74716a30400e6794946f198ef4a3f3b8f64a63deb1b5a96180b09e56b7357b988b28e25fad0a
 EBUILD pyelftools-0.26.ebuild 937 BLAKE2B d8404070c6ab741da801f2ad52ec00f9db8563aff3aa5301cfc0e4d1c8d6599dcda28dd80a85b9dd72cfe01a10e109bb22a462ce2a07c11119874d24b00b6aff SHA512 71e4111e57aaea769115a6ccfc5df3e01d88947c1be4a192880e360897fbc23ab9aa1933031d730f1e5ccf68d7cc0a9e58b8a1f04c4d42136fa70dcb296da187
+EBUILD pyelftools-0.27.ebuild 946 BLAKE2B c8f47097bfd85010257ff78918282b5d901fe6f06cbd7d0354398b6f1ec082070673f64c7ce74f6ac0a0979a2246a899f9d270d35659a1df7ce48b88e08ca00f SHA512 43d063ed1746c410617abe9829ae89b70909476356575bddf9464e902bab7e4f5b653e14ea31f4ee33b63e03694b89fdf654dd8d022d556ab4077a1c5e52054e
 MISC metadata.xml 394 BLAKE2B c89bcd4af21dcb7e2136ac81fdd480baa7749aee4ec4760a95192daed4b1db944e30ad84338a147cfbf56e36b7b8bcb3d7130c3261b7a34a24c6b1ef7539a9cd SHA512 7a09765be5f629bffc63e9a0ce39b84d3671a10d6a5223bc0f4d96ec3305579e7f872c708e744bc90e5d6a43d9c6a948fc4f66da3398b1c160325829ff714e6b
diff --git a/dev-python/pyelftools/pyelftools-0.27.ebuild b/dev-python/pyelftools/pyelftools-0.27.ebuild
new file mode 100644
index 000000000000..876947e90675
--- /dev/null
+++ b/dev-python/pyelftools/pyelftools-0.27.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+inherit distutils-r1
+
+DESCRIPTION="pure-Python library for analyzing ELF files and DWARF debugging information"
+HOMEPAGE="https://pypi.org/project/pyelftools/ https://github.com/eliben/pyelftools"
+# PyPI tarball lacks some test files
+SRC_URI="https://github.com/eliben/pyelftools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+python_test() {
+	# readelf_tests often fails due to host `readelf` changing output format
+	local t
+	for t in all_unittests examples_test ; do
+		"${PYTHON}" ./test/run_${t}.py || die "Tests fail with ${EPYTHON}"
+	done
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyflakes/Manifest b/dev-python/pyflakes/Manifest
index 10bc6294d61b..27b9f6266508 100644
--- a/dev-python/pyflakes/Manifest
+++ b/dev-python/pyflakes/Manifest
@@ -1,4 +1,4 @@
 AUX pyflakes-2.2.0-fix-tests.patch 3826 BLAKE2B 6f4d213526b2a39642765b3b13665e8a17bcf39804e6787ed2627a77d3b068a8ac1d7951a207c83e1d76812ac77b889d6b4cbf0b1cc30cdd8c59f8ea886ef373 SHA512 47e1c624358edd34b3ddae023275a81ce529594689c3b67ec2c7b5acec84b9c9f426b9f79151a1ec3dc89b39335f11e03cb22db4f4c63399e876f887e3f3ecee
 DIST pyflakes-2.2.0.tar.gz 65307 BLAKE2B e48e0cb0497f90b6482c0fd08c182d766ab50755fe348352df510841f4ad43f7c1d6486753ce774603a3624f49c9b0165ad930bb1451ef30cf2e828d732e0652 SHA512 6a411efef261874c216b71bcb095412448a8cbeefdf7fa5577d4f4edd48a4a740a4433665e87e5dda2c08fd9ee3bfb7f134f56c7523e1303243edfa92b0ccb35
-EBUILD pyflakes-2.2.0.ebuild 748 BLAKE2B b280ee982aca6d146bd1aa77b1983394ec313f52270788abb6d9b39f294fa5863ee03d157e06f922ec8674a486e0b22795159831b974e2eabf209c81cd48bca7 SHA512 d994c33875d315f160fec768a171cb530750d94ea90e21fe81fc61dc3827ff2d800115f336ba12d34f51f6103384ed894bc6a050742e6c128924ff5c5e13194a
+EBUILD pyflakes-2.2.0.ebuild 749 BLAKE2B 06bf253edd226e7a49373ed0e354490bef3666c2cb6b866df88b98fc1c8ebc926c51b20bffb4fe57a7d27948ec0709421b12ca03c98a3c5ea85d62543b8e4b11 SHA512 446740c34b37f47918d0230fb8391a10376bd101fe04ba3673fc5a035f0ef5006510589426e069d488af8ae2c3aa7be2c27052e4f78387b0c0a3646f56c5c6d6
 MISC metadata.xml 762 BLAKE2B f31d372e281fb92fd01a1bb9e33afcffbb020fed4f82f8c549de08bd4b45619f914ccbad2f60e88f46cab9c3932003d7db353d79548f825a7e9add773b374cfc SHA512 d21377d6a2d76377928b0ca8db8d17673e9f188183141f8b4b980b9da90572ca68bee0e12a71bdb79339fe7dbec8a1e4b4aee344275280e4a61f08ffe9ff6996
diff --git a/dev-python/pyflakes/pyflakes-2.2.0.ebuild b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
index 0ce909282377..fabf6c8e5a36 100644
--- a/dev-python/pyflakes/pyflakes-2.2.0.ebuild
+++ b/dev-python/pyflakes/pyflakes-2.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # Should be included in the next release
 PATCHES=( "${FILESDIR}/${P}-fix-tests.patch" )
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index f6a605fb2ee4..ec0d28bfeec2 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -1,8 +1,7 @@
 AUX pygame_sdl2-6.99.12.4-mixer.patch 1513 BLAKE2B fa0134e7e4c458caf720169bdb655793e2caebe746e04c5204c210b3535830afa56e8cacf2972fb27953500c4e82dbcc5554fbcbbc20a098d7a325b4b30e08d3 SHA512 4c7fb5b9f55e8f4bfde5ac911bda4f83be535a101eeec80595f70a290228cbdddf2686595901aca25c429beac34ed4ee906c92ddb0522b4c73ce48c1e1556b31
 DIST pygame_sdl2-2.1.0-for-renpy-6.99.12.4.tar.gz 2294620 BLAKE2B 14da5e955ca6b9f6a08be1a3ae929db63e358c53b7a05a16cda73d6e3625a7d522dd5dfc972be978f330f26bb30dc70f4657501cd5e5a6d44c1f6b81eebe3fa4 SHA512 eacce553d6729b937c13420d826f2fe327bc7aba499a06bea7f1ceedba3327a9456c023878290ace39e1a8e417f54957345b8b78500ffc9ed3d2ec9952397754
 DIST pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz 2678274 BLAKE2B 537e63a7e4755f6fea20f4ceec065272b83879958a0a794780b8976877aa083a2a9bc1b8b4a4592accaeb59dbeeac480d75965291ddbff324aea5c90d7dbcfc0 SHA512 b58a57d70efdfcea066735e3681047bec4fc89a9b75e423f5f889cd29f89a25bd0b96fcbca17578958b677e44858aafc9c6b17aad54dae640640bb7eb54cddbd
-EBUILD pygame_sdl2-6.99.12.4-r4.ebuild 1103 BLAKE2B 01f497b66ea90decb55533520ac36ee9ec17a28ebe9ee353fb0c0d75426942c68d52a47975129832f34536ab0d2e3d8146ad615da4c0088912447ec655a39c2a SHA512 c12cf0a700f05f7f93f5bdccef6386e2ce23a46325f6e10babe63a7e6a396c5f5ee240d392d02008fb601b7a9d0ec9f9fe75809f7fed0ece400fe78ef68b845d
-EBUILD pygame_sdl2-6.99.12.4-r5.ebuild 1113 BLAKE2B 83f99eaa4354ddbb00d7de872ff8d5a72cff5c3d174d0e3f8d11ba1fe88461e59142ab7c3fe575ba7d2ed778fded85b1f4d534b0ca9aee2fb4bacc867e50e52b SHA512 e3a2dd3e3d38859b1bf8e6fc4788dad33bb2f6118ef79db1f07251b2650aaba195027993f2134b2fb401fef7a5195654cf239d8f69635e1808052f0eae3e21a8
-EBUILD pygame_sdl2-7.3.5-r1.ebuild 1050 BLAKE2B 3acc4a3442b315bba46ee780d283f4ca2aab973eafcf4476e194590b434cde5f813fd0835373dec2e9de6b81c730369d850ed287692e04a95fed2d915687fb63 SHA512 530ed75bdcdc03ac211f4a5d2822be1842a92321c22370033ba83fb999035db6eda89ef7a82822cbd66752a3c7ec8a484b567b985af5383d909afa48ea22ee0a
+EBUILD pygame_sdl2-6.99.12.4-r5.ebuild 1109 BLAKE2B 112ab6104a6bb217c97077b31f62dc4138b8eadea908b4e7a6a8a20df9889b65ca4024acefb079504103fffc1bade01e9b9e98f77b76f74b797324826a4f4528 SHA512 9576cea19705e884f118cb3e3756bc7c84453e85d26592ee35850a9b6f0e236dfe63d48b00467dccc892637e525bea940e9aa1f4d214368200c40c8313b6988a
+EBUILD pygame_sdl2-7.3.5-r1.ebuild 1046 BLAKE2B 7495351fbf8558a71a0570711bec733227978945c7ab5e7966a19de3febc32a38f29ba0620c19ea33ffa3180595987283a1602f9e48cfe85866184a149544e14 SHA512 c9d4ebf96b5f2bbeac30b61fd9338dd41c80e3d3b1c1d95fd0598a74e9d9b6f621f5cb2339dcde3c6b96a6b70cce8d7d2d55d5fdfb1434f7588f2877416825cf
 EBUILD pygame_sdl2-7.3.5-r2.ebuild 936 BLAKE2B f56e68e2a4cb47d8e9761b7d15fbde445c4111810efa2256b4c01114ceacbb86912b4f5f9cfa44b7d8fab073380cbe8b28cdc637122400762d1b6b400a9457d8 SHA512 8210375dae6c47460ec1d021681e21695840180b11e30e636437244edfdbc4ca1e469884814122ac084a21408911ed4d0c1a223efc8dc12a389f5cedc0a7c183
 MISC metadata.xml 381 BLAKE2B face1e81c908bd2e35fa85bc3d2ed8473cdfa943b699828de42b38aa89a977c3e07c0b1034180407e1d1a36646cd47649bd77703bfea4e6854899a8ee881d8c0 SHA512 6427a345bfd1e8fe49f30795c50f6253b20199420976e501e5a81a92db0cf882e1db0bca15a417d9a898e71e20124c537bad9c6fdfdd1a848cb59406ea2ae517
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.ebuild
deleted file mode 100644
index 633a70aed476..000000000000
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r4.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=( python{2_7,3_6} )
-inherit distutils-r1
-
-PYSDL="${PN}-2.1.0"
-
-DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
-HOMEPAGE="https://github.com/renpy/pygame_sdl2"
-SRC_URI="https://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1 ZLIB"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]"
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/numpy[${PYTHON_USEDEP}]
-	' -3)
-	$(python_gen_cond_dep '
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-	' -2)
-	media-libs/libpng:0=
-	media-libs/libsdl2:=[video]
-	media-libs/sdl2-image:=[png,jpeg]
-	>=media-libs/sdl2-mixer-2.0.2:=
-	media-libs/sdl2-ttf:=
-	virtual/jpeg:0"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
-
-PATCHES=( "${FILESDIR}/pygame_sdl2-6.99.12.4-mixer.patch" )
-
-# PyGame distribution for this version has some pregenerated files;
-# we need to remove them
-python_prepare_all()
-{
-	rm -r gen{,3} || die
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
index 55101c29bba8..afa68d5e211c 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-6.99.12.4-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit distutils-r1
 
 PYSDL="${PN}-2.1.0"
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
index 82e8be6cc2e1..4d8613ac410d 100644
--- a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
+++ b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_6,3_7,3_8} )
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
 inherit distutils-r1
 
 PYSDL="${PN}-2.1.0"
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 666346ded15f..de3b7d5c0f5a 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,7 +1,9 @@
 DIST pyglet-1.5.10.tar.gz 6417209 BLAKE2B 2c413c111ce3d016ca23186e92b17cb6f67bb904d90ca241eb0f95372a0a9ff8915014f31294a6609e2f35072cb963b6998d791157ede2e2bf01175edeb91582 SHA512 02b3859f2805f703997d7799e324e7debe9375f6c0df211ceff2f750aa7dbbad61b6ece55fbfec111e4f47f0ee6a71881fd73a47bef794a437615ecb42d0f411
 DIST pyglet-1.5.11.tar.gz 6414606 BLAKE2B bc39a611b10a6397f31ce402d0f4be17093e5c37fdbd6bb419156cc00929fd951cfc8e309a0c2a557afba9c567f203956c6ac7fdd1c677d4a5c199c1633e86e4 SHA512 4121fcd45c8d7f500e2bcbaf85e30e39d44b9de165a818455c006964787ad9dcdbb1a670ca72e149a3574ec7c18f113166190acca9a2dec4bef4b5fde856e129
 DIST pyglet-1.5.13.tar.gz 6415241 BLAKE2B 784e387072ea7260c5fc3f0c78869e62d42a68b7ca1208318af3dad77d64d6ca8d12b03c040ce1dca8430cbab31f218c2a1782ccfcaaf3637203e1e9638488b8 SHA512 05863b187653cb82d7727d7d33a65d9907030ac97d926d6dac01301817159c31d4a301570f41ad8e2af9e0509f67008b876e7f3460f31c6d58d5548179cba4ea
+DIST pyglet-1.5.14.tar.gz 6414252 BLAKE2B 3e30f4dc80fffbf93a3cc7fa744ba224868dea1d9f1998446a2341fd3ed1c058493c486979aedb8415abe5c8a3f53dc634494f849bf6f3ab6f9ceb0e35cfecd9 SHA512 9b34e80e1b28a2ef0504339b67bdc31e568bf3a3352a9a1d78d3cf87ba84e86e23aec6e524abbca26865082ec2f9da8d7633ba83206f9996d87002faa1269044
 EBUILD pyglet-1.5.10.ebuild 1297 BLAKE2B 73e71b2b7b0feb6f2d1d4a8956e0b1f4433d2374e293334ab34e00f8a5d6720b177d266d17eb5c969b0678303fa82a0dc98879fb851b1413c48936d2598f2d17 SHA512 2e2f3b3686078f8bbe72f379612a66fa57578cecde7e2bedbc604900b7ab14741f535d5597c957f86aa082b26fa7791a6c75e9a09777a44da19c4ca2601d1ac3
 EBUILD pyglet-1.5.11.ebuild 1298 BLAKE2B 095b0e8a5f28e4da68af1da870634dec894fdac5b98f1c31ba5c1c5a7b41aa7a8f223edf79fa2609f1ce42a84fe517036b757824bd146aba41cb80724ad0b819 SHA512 a30f80bd64620ab6d0f83f8222f76ce30d6e6a4fa637d197a1bce1e454ee8509be8ec65e81fb3e86c9c00a5b99989502dcec129e38bcd085f2e2db3b4c63793f
 EBUILD pyglet-1.5.13.ebuild 1295 BLAKE2B 20694764dd3c60079418001b0e72c3b36bad38738174e3fadf0fb44737899194302566ff7198c4c45d745420663f5b49fba0eb5eadbdf15f2fe6a9a783821a81 SHA512 a1fcde05da77067d3a91e6fc81da4fcb304838e8334445a2d5351347a703030cbcbf41b889d229dddfbbfd8fd357ffde717ea41184a00264588713be01a91f5d
+EBUILD pyglet-1.5.14.ebuild 1295 BLAKE2B 20694764dd3c60079418001b0e72c3b36bad38738174e3fadf0fb44737899194302566ff7198c4c45d745420663f5b49fba0eb5eadbdf15f2fe6a9a783821a81 SHA512 a1fcde05da77067d3a91e6fc81da4fcb304838e8334445a2d5351347a703030cbcbf41b889d229dddfbbfd8fd357ffde717ea41184a00264588713be01a91f5d
 MISC metadata.xml 996 BLAKE2B 74fda944aaa3954eafb31e21741f8cb599c9f8bff46c662a598cb384da9770d3160302b37ce8cbe9ddbc7dfe63c594614783afa568ab4be5e73db502fdc3a095 SHA512 a13a1aa2134de7bc7e007f81540631623c5a3fc1f5bfd4b6f7bc744eff8cc037da321292aa968184d324099dbfd87f608d7c0a2aeea90707c27aee5532a1fe15
diff --git a/dev-python/pyglet/pyglet-1.5.14.ebuild b/dev-python/pyglet/pyglet-1.5.14.ebuild
new file mode 100644
index 000000000000..b3559565c31b
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.14.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,7,8,9} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+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/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index b1c095dd827d..ccf173c0dbd9 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,4 +1,6 @@
 AUX pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch 1192 BLAKE2B 7590379873fd2be694a70d272a082fe6916e596f3b0945bc5f6c390880cc31e6b07da9bcedeb4e9bb048cd50f87ccff5b61857903f0e295af37dc005e4792a7e SHA512 7ef4a769086e5cf62cd3ad18bb169578da5557bb7006250f7dc13e6b623e46e2805ec9b51926f0eba27fb414eecf2f0017dc282f67ee639edf013ff135c54086
 DIST pyilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
+DIST pyilmbase-2.5.3.tar.gz 27534825 BLAKE2B 4647b4aac074b10c0d1fb35ddb6b5acefca81c0f2debde04987b5df4e290b14b6406fc922949449aaeea7cf4be371a25c93f8fcb9f67c63d65276340bd586a21 SHA512 6da03193d4fea1e97e35008f59304ab408c521ead8495ba411cde5c172cf953be97999971f57398b813d14f1af1d722539a6b74d5ee54b9e74769ea8258d36ba
 EBUILD pyilmbase-2.5.2-r1.ebuild 1484 BLAKE2B 9808e56335ef42c9bc1bfb17e6629b0643ddbecbd5e51068fe56a114146e9a21f0f9ce73410fd5af03001902d649389007e5dd63a5b60044164d94dc3073d403 SHA512 d8c8139249f34803b50a7dc0407dee68518f353bf6b2da9430d15c6c7e1821fcd2b384c0bbb375c9aadbba94731bbb139edda5a80358c49829cf39268e89069d
+EBUILD pyilmbase-2.5.3.ebuild 1529 BLAKE2B daf0059beb24ac52a762359c5c3fa4df26b6d749e990600cfe5b7f84da90bedbbbea80c7bf02707cada717f2ad0b219a1262fe4c8dd17b2fe2dc7d30f9d25641 SHA512 bd199100cf889a81a21da5ddcf39d1861493e150b428d58fe88f1225b246d27dae842028e6ac3f4bef7b1b906111bc44c466600d06db2867eb37ab6df1d5dba6
 MISC metadata.xml 652 BLAKE2B a1f5b54cf36def29e3cdc8727b65085b2b83d26bbe0019421cc4b2acc09a027843dbb1ebc5d93bbec9174e1024b496394f9061477b842760048dcd82afc6b347 SHA512 b6e05005a16a6f72261fc1f3d305880b3e073f8a975275e19720742799e1f78fd7e29ac23a589a7724fbab9f4c6cd3b4fe5c81bd309d4532ef94a300e9440840
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.3.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.3.ebuild
new file mode 100644
index 000000000000..d755ffeb1354
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.5.3.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_{7..9} )
+inherit cmake python-single-r1
+
+DESCRIPTION="IlmBase Python bindings"
+HOMEPAGE="https://www.openexr.com"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="~amd64 ~x86"
+IUSE="exceptions +numpy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~media-libs/ilmbase-${PV}:=
+	sys-libs/zlib
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
+		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-admin/chrpath
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/openexr-${PV}/PyIlmBase"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
+)
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
+		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
+		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use numpy; then
+		python_domodule "${BUILD_DIR}/${EPYTHON/./_}/imathnumpy.so"
+		chmod +x "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+		chrpath -d "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+	fi
+}
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 9a8bf60cf8ec..6a7cc88bd20e 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,4 +1,3 @@
 DIST PyKerberos-1.3.0.tar.gz 41033 BLAKE2B 5805df2c258a75321dab5fe84fcbf1de706cb7c14a710c914ae4918dd39f79036a4f4033a068982778f73d9f00a4ca45b80e9cfc59c6a246a236f3c6931bacc5 SHA512 ed2644a236993d9737af43be951d57207fc787a74e82f343b265461b456923763610f1ce1b46d7d56f22d6452be1418b98707b8529b22fd8abf299143e52cf69
 EBUILD pykerberos-1.3.0-r1.ebuild 1308 BLAKE2B 8de49285c3a28a2bb56effa38b5d37e6022d2f0d3613213fdd1f594c568de4b601e36cd8f655f4e6f473b1835307de909cc903aa457a11a9168c573e47e9f6a2 SHA512 0cb0956462676c4106b4ddcf9dc35c136344b953388c2244bd5693abcc725ab3dba522d75e9456b55e3640dd1310c98f08f566bcfabb1447f5f7453565d924be
-EBUILD pykerberos-1.3.0.ebuild 1319 BLAKE2B 04348fe54a9b06dadf14693e784d1b652317124a81b111b5239cab4420c888fc72aac1323b1da1f9d5f14433a9fdccb7c0e4e45e88492452ad6caa27ecb1ec09 SHA512 46b623a0288cec6f1acec781f62e1bf2ddf3998605999db9c0ce5cd1510f07bdb8b388f04f9efd9f72f7a58a618365f66371aac1d4013dca984ca1f92f326d66
 MISC metadata.xml 481 BLAKE2B 5e7a2f53e994e262e3bf3d85dcfcc3b74fe54971f620277b5dfa74682c69a0fe75e578ff863f157a758d784a895d61a7560300de3138c93378a28060d1bce4c3 SHA512 dfb577fc1818d54f4ff97223cdad710b2e1007c31ef4a2455625cdc7ece6f1c10cb13e706c8f1e78824d7fc9de480ba052205e4ac8090fab69238683b74f2ea8
diff --git a/dev-python/pykerberos/pykerberos-1.3.0.ebuild b/dev-python/pykerberos/pykerberos-1.3.0.ebuild
deleted file mode 100644
index 3dfef376e5b4..000000000000
--- a/dev-python/pykerberos/pykerberos-1.3.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=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-inherit distutils-r1
-
-MY_P=PyKerberos-${PV}
-DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
-HOMEPAGE="
-	https://trac.calendarserver.org/wiki/PyKerberos
-	https://github.com/apple/ccs-pykerberos/
-	https://pypi.org/project/kerberos/"
-SRC_URI="
-	https://github.com/apple/ccs-pykerberos/archive/${MY_P}.tar.gz"
-S=${WORKDIR}/ccs-pykerberos-${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
-# test environment is non-trivial to set up, so just use docker
-# (see python_test below)
-# also for alpha/beta Python releases support:
-# https://github.com/apple/ccs-pykerberos/pull/83/commits/5f1130a1305b5f6e7d7d8b41067c4713f0c8950f
-RESTRICT="test"
-
-RDEPEND="app-crypt/mit-krb5"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	set -- docker run \
-		-v "${PWD}:/app" \
-		-w /app \
-		-e PYENV=$("${EPYTHON}" -c 'import sys; print(sys.version.split()[0])') \
-		-e KERBEROS_USERNAME=administrator \
-		-e KERBEROS_PASSWORD=Password01 \
-		-e KERBEROS_REALM=example.com \
-		-e KERBEROS_PORT=80 \
-		ubuntu:16.04 \
-		/bin/bash .travis.sh
-	echo "${@}" >&2
-	"${@}" || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pykwalify/Manifest b/dev-python/pykwalify/Manifest
index 72a7a06c2e06..c024bae85d9b 100644
--- a/dev-python/pykwalify/Manifest
+++ b/dev-python/pykwalify/Manifest
@@ -1,5 +1,7 @@
 AUX pykwalify-1.4.0-S.patch 862 BLAKE2B d92c4e8d4d85d28f6df574bfe2f1ab0aa82c32ba8ce2b4a2d6ecdc21fe1db4056351b6aa6dde04d897525ce596ed492781bd7dcf0fba2ca5970a3af79a9abf3b SHA512 f7d9189993cd73a0412ef01fcb01a99fcbc61edc6863a1997333de085294b9c5772d026f7ab8f16703568404f2ff76bb1aeed760d7908c7865e0891ad5752dc9
 AUX pykwalify-1.7.0-test.patch 1873 BLAKE2B a95d46378faa7ef87db078d44fdc5b3121bff303cbdd682907a764b7a142a8813366547731cce54424a1900b9c3ae3184f3b98a1519687063e8cdcf69c953457 SHA512 6b22feff5efbfce01f46791a8676d39839e5e3c5498253dfb2b80ddf7f96d3f83978cbd7378c15bdf9a9a69b4143a5643e034156d66d134dd962dde6de7b8023
 DIST pykwalify-1.7.0.tar.gz 69402 BLAKE2B ad2ecafad8457509a5517917cd3bbb078a244a9ef96e5560efc4f6b0c4a3939df7f20a9e3e72e43be97edb8af6315d49e2c2f3248aaf17d3c4f0962f60132185 SHA512 d0db48814712dc26eeac8f00ee0751a006c8b00521c9829e3c1a4ecedd6083194e9e28da1ed3c13eaff30d9b5c3dd1dbb499ba8864251400e34c23911110d848
+DIST pykwalify-1.8.0.tar.gz 62462 BLAKE2B 1593f5e3e15188929574ece60bf6818438258bf024d105ae26323a97a202ac69001a15ca6daaa430970af3659c49da745bcf1f77c23ac72bed2ddca14440d943 SHA512 c77d3072995bb3f61336e725227eeece1dafe2182513e5f67eedeeca3437825b53ac691a991055aad8298db252e2012bc9a61c23d766335fcfbb10a3b587b45d
 EBUILD pykwalify-1.7.0.ebuild 801 BLAKE2B 465753988c6c4442cc32c0765292f7f89874fb396a098a5573508cd2e9ffbb700ca5072e7db96c6258b7a2c1edb0e881f1c159c90d4ad85ef694bf6fcb22ebe4 SHA512 73c6d0a8ddb442ea314ccac05a34911aede632ff5114b85bd4efa30f6fe82dd96c28d6fd953d1cce5374596c5150e8ca6e8c422254e4c31286c29240b5624ee7
+EBUILD pykwalify-1.8.0.ebuild 779 BLAKE2B e3b319dbe3860aba1112ea7ee92392374065f20c1d4fdf616b78fe3f204cf78680f7f3b80719cf5f5aede511b38f5ce53b05507b539b2991945a3d917d06c15e SHA512 c1fcfc53a4057271deb0ac01a8de60ba321ccc5700b49760bee5b1de8827f77696324b846dcb9d8f9031709aea6298e8f3ba1a9ace8027b226eac79ab0286965
 MISC metadata.xml 369 BLAKE2B 8c31d9164a8a1c9210a56c2f7f7a604f2fa2bd4bd7de3047420074af8a19a63f12ec18f4d5c436aa28533ea9d7e15307ab99c114cb8a0aeea419ec1d185ea7f0 SHA512 a99ea380231e9e3537bc693c2bb1ffa6bc250ec086f88bfa19a7c7a8df04d21be8dad752535f8e89eee4fa989b79c38e998946a44dbd9bae64def2cd2e858913
diff --git a/dev-python/pykwalify/pykwalify-1.8.0.ebuild b/dev-python/pykwalify/pykwalify-1.8.0.ebuild
new file mode 100644
index 000000000000..1e06c9a7d3fc
--- /dev/null
+++ b/dev-python/pykwalify/pykwalify-1.8.0.ebuild
@@ -0,0 +1,34 @@
+# 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="Python lib/cli for JSON/YAML schema validation"
+HOMEPAGE="https://pypi.org/project/pykwalify/ https://github.com/Grokzen/pykwalify"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/docopt-0.6.2[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		dev-python/testfixtures[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.0-S.patch
+)
diff --git a/dev-python/pylama/Manifest b/dev-python/pylama/Manifest
index 273e15f64dd4..0718eb3faabd 100644
--- a/dev-python/pylama/Manifest
+++ b/dev-python/pylama/Manifest
@@ -1,3 +1,3 @@
 DIST pylama-7.7.1.tar.gz 34740 BLAKE2B a4bd5aed40c2c4e7bdb9f9968030f0954f0309cff80567b2252ee9576fdb4598714286bda63c22676789d4919662430ef2729089faa70b5cb590784eb47ef1f0 SHA512 298fabffcdf38e3e868e3965de87a0e761bc9dfcfe33320b53057c4e05598bcc22045481ec16ccb8df27f49ea41d6fef82b69fe7327905f93ce74d9350682cf0
-EBUILD pylama-7.7.1-r1.ebuild 1310 BLAKE2B a35c46402412e87ab92aa3fb8f7472032df817108411fec6f0142f93a5709715bf6152db3f6cc8f4abaa15506983e110b2bdc55c2e7fde5b81e5888aa2ee49ed SHA512 a99a6df06b0504d1b5260aa8d96cd356ee344f591834be3cf7d74e237e836b3bedfcddae83d84beec4efe831cc9da2271a08c4ec7049be2eba09c9d7ebe31d42
+EBUILD pylama-7.7.1-r1.ebuild 1304 BLAKE2B f4298e8b8ee59b1c0f8121e55e4779d15853805494d268e438738f2e03751ea423c704f3c484e83eaa4a47f18826208d3f98d6d27133ac832b9d8271b3cd308d SHA512 742554f01820592ed8893c33a50b6fcefe1f422625816329b0450130da1ed0407e9e2134af6ebfc0dc6eee2bc1f6b03ec5c188d64c77031112a21107702f6f2d
 MISC metadata.xml 388 BLAKE2B 9fd8abe101834b8d24d232875dec2f2e84e2d2983b7fe27243cbadb60208df63e7fbc9b450c7587df71a3ad488b104e43b43ec0e013907006e622ca5cac7da73 SHA512 96cd8e9bc7391c28d2625f02521ae93a1ae901c04c144288cfb5a7d7c0de70d2e58f73a51071b4f82f3f043c4f6c94bfef67a2e29ff7187302dedb3a421117e7
diff --git a/dev-python/pylama/pylama-7.7.1-r1.ebuild b/dev-python/pylama/pylama-7.7.1-r1.ebuild
index 550f02e50c98..ac4144373038 100644
--- a/dev-python/pylama/pylama-7.7.1-r1.ebuild
+++ b/dev-python/pylama/pylama-7.7.1-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/klen/pylama/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/mccabe-0.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index 1f103d8aca25..9200f877ce40 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,3 @@
 DIST pylast-4.0.0.tar.gz 40044 BLAKE2B 89402027494d608bffc4738857d8a7728175cf29a68af259aec1d6ab3755c5e02268bbacac2ff9bd8d8c6490b86ae200aeed59f34c764a4c2f90ea59cb732070 SHA512 093845c718269ed5a0b5223182e60192a71e2fed9270fec453b96b0b2a5488a0c5a8f6386edb42ed183b97cb7ea00397b4491ff72cbf72f9e7d42dc90fae66e7
-EBUILD pylast-4.0.0.ebuild 801 BLAKE2B de4f41caa3406a331f3ec4585eb312b006c6cd5b3bed66943a73053121a6ac0c11055ccffd31fda5122f9bf5732c09fa7fe91bd9e6c0da088b20cb9807633075 SHA512 6a0e9e3b736a4c20a093ec7f21a48adfff16e504c98b5f1efd61a12b6bc346363b551eeea784d41ad405cbcb7b3cb558a41616fa8b8bc72b537cc0398d826d70
+EBUILD pylast-4.0.0.ebuild 802 BLAKE2B 097c6a3bbcb5c6c8dffa96d4c5aa96e097643ca8e7676e792988ab3ffecc84880812a7a7458c5d7a426b88cf1b527be56369815a658ef53e42ad6f5ac24b41ac SHA512 b03fab1b424b07d4b8411c029e9ca121b42564679000c866d42885ddb720c228f387435f7feab3bd4f241fc3d8b0a50e4bad048540ea510d2deebeb6735240bb
 MISC metadata.xml 906 BLAKE2B 6bfe370296de02da86dbc7d9b193ba499a3667cd3720014bdea0c37e51b0c945564e9bf5f2b6ef65008dbc58ff7b7799e5464b292ca1d3588898849123fe8ff8 SHA512 15294c8d03e6f8a9571f2610bd8ed831e0c274a124e4533f7375b0a753e95d2277503ab38541c1dedc1e810fd87a2bc154424e39b52135b07f06f788165f8619
diff --git a/dev-python/pylast/pylast-4.0.0.ebuild b/dev-python/pylast/pylast-4.0.0.ebuild
index 7cc2c9192cdc..1e4b885f9d02 100644
--- a/dev-python/pylast/pylast-4.0.0.ebuild
+++ b/dev-python/pylast/pylast-4.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index 40cd58de9bca..14026ab43d79 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -3,5 +3,5 @@ DIST pylibacl-0.6.0.gh.tar.gz 40231 BLAKE2B ba76f5540de62cec8572960b65f65289d7fe
 DIST pylibacl-v0.5.3.tar.gz 32792 BLAKE2B 005785dda2b7933ff71dd1296b1d4315a6492fc893aba56136c775f78b9aa3bd8f9d4898bbe0160fac53a306329977ddaecd073739531ba42dd0b6cc622b9eef SHA512 ea648acc3df9e1cf2fd68576b0b691a353b257d00b74fc80aa7f60089b9dbc912452ebe6b84da2930cac888b9047740530dd0e38b4d5be52c37fc6d3a29a7ce2
 EBUILD pylibacl-0.5.3.ebuild 928 BLAKE2B 306b483fa1d85458b90480b771629ffd7ae18ef3dfa2a6d8084ec697e0812e13e380f1ce77cbcbf34082aab983fa0937fe71707d0f02d348dc2ea6ad4c3945e2 SHA512 496633a731bbe0c05b7350ff14ed644039a48f9c2d55e317dabd3cebc36ea08e17fa8b4e38d1acaa324ba674944b99cdd8181ccff9f30998efc84db752c9f97e
 EBUILD pylibacl-0.5.4_p20191217.ebuild 1009 BLAKE2B e2a5a73bc61d3243b26c115a7e7945260e59a9bedaddbf88affb5bdf5c8348d3db4d200afb96113f6ac05b87b825bd74f8f672d3aca0ab25e6516377cdf36cda SHA512 ea5e810818be787556024c6264572ef32a0dfa0c3013f857186586545c668cbc7bd24ee1b8430e632abf1ff06bbc8a71f6b4ab3388137472c347f9521cac7949
-EBUILD pylibacl-0.6.0.ebuild 916 BLAKE2B ceda85abf946e016856f5cb7d555c79527e132ed4fc1279c55d41a9f81101bc1c17c1e10151f7b1ae63f5773df2565acbd5d0d0888dbca3748c5d725566e3571 SHA512 b601d44f42c0f31411ed3397cc421c2d7607b6cb0f5a15810a97802f462d369ea5fcad706a5a71dfcce6b90375b11657e20bd76ef9017f0c7b87c99d3359a6b6
+EBUILD pylibacl-0.6.0.ebuild 915 BLAKE2B d06d6a41c0439206c7b3e04dd18e56a652f601af7afe4c8233aba2f4343e16bedbae6459df50b0587ae2f5801742c9492e0e95da3e1fd274b4e73684e7620f28 SHA512 5b4ab9682154d71b2e81d3c5e09064fa9e3e81595eeb721fbf22a552be1d00e7bd86c7423ccb8e73f5b089219432bc97806485ac91b9fb7ca62005710750a9ea
 MISC metadata.xml 445 BLAKE2B 01fa6d3dbb4f640a84c7cde4fc2c0c2691345fde557c7d26af9b5aaf5f64ee281a9c50eb273471ef3ec1a4c7cdfd8b48bccfdf3e50804f88981353a7a5433ce8 SHA512 b5fd28a88149cc0afb3535daa5c5e8f67f137e98c0671595a381d9d748212ed93a3226339b4999c7cfce1779fa6fa0cf568f38610ef77fed685e62dff9f9a344
diff --git a/dev-python/pylibacl/pylibacl-0.6.0.ebuild b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
index 5b4469c6178c..aa12b7d0e363 100644
--- a/dev-python/pylibacl/pylibacl-0.6.0.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="sys-apps/acl"
 DEPEND=${RDEPEND}
diff --git a/dev-python/pynacl/Manifest b/dev-python/pynacl/Manifest
index 86db4bc87156..adcbe84b2fd0 100644
--- a/dev-python/pynacl/Manifest
+++ b/dev-python/pynacl/Manifest
@@ -1,3 +1,3 @@
 DIST pynacl-1.4.0.tar.gz 46396758 BLAKE2B 9575bca05ecaf33e798f2abfee7a1af26bbb10b5dbd4e7ca70af8032866e26b88736c2a2ff52e4496e4862f92042fb125df7cd1f1427b16a2313926162466343 SHA512 2a11a623452cea60199cdff83db6f5922698237267c11f055f2fd7768e0875a819dcc08c477113ad89461797ab36d66e0b9c7700eee335eb6b16af6b378b9e88
-EBUILD pynacl-1.4.0.ebuild 954 BLAKE2B 12124857b5fdfed995069f8d6e0b2107845c8b239bab722d185cc5f210215538a1909738cdd8f9a8dd882f56bbeed263a2b4810e5d3613e7adf982255342b13c SHA512 92f6c7d63fca8d8df9e0a5936ca2e9256ce15f4c339c4257eca6c23d8c8f306970043e7b9a40e2d9b432110b0530359cc367929befab5a6b03c69d5e2073a56c
+EBUILD pynacl-1.4.0.ebuild 955 BLAKE2B 06716922193d71e11417706e47a9817f42a2cfbfdda9d60db3271e8822e2d38becd42d64828c7c261613ecc8b6d49bdfc47eb3272a64e7c0084616973e0c3033 SHA512 20f9d5d35758715d3f7ed46ac8c60bf67e9592bc0a184fa6bbe04b41509140a110fbcc0bc1f5f1c948341073cbd6dc79a7d0f17d45911281bea30faa47ab693b
 MISC metadata.xml 753 BLAKE2B a735a91bb099911df938224e8f89baa564a86855655a5fbd2d9027bc108001052c7793a6675dd2d301c083bde38d4eb03015628d733055d1938e2dee12f8e784 SHA512 f9c8f52b3c9069f3500c5e7023636f9866c90b5c904e7d66443b620f523474e3f695f66e666de679b3b8b4c362cfbc5c9268727c68d3d1ca462b1ef93b0ec6e4
diff --git a/dev-python/pynacl/pynacl-1.4.0.ebuild b/dev-python/pynacl/pynacl-1.4.0.ebuild
index d791a662f273..2b184f6cd119 100644
--- a/dev-python/pynacl/pynacl-1.4.0.ebuild
+++ b/dev-python/pynacl/pynacl-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyca/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/pyocr/Manifest b/dev-python/pyocr/Manifest
index b3e2517dc2e3..ede42fbc24e4 100644
--- a/dev-python/pyocr/Manifest
+++ b/dev-python/pyocr/Manifest
@@ -1,3 +1,3 @@
 DIST pyocr-0.7.2.tar.gz 65376 BLAKE2B 065084c19c7722e590c5f20abe5248b2be0c76dab864b4a4e2c457770ff61dec84df7254f19e4926753f39a5d1ed0618ed87827b85773ab96a51e3f7798c656f SHA512 002c3302ed20e19e06dc6fd995ce30150fb95650824df9e0a3d6b2bdcb4c0ae3f2295342c2df44e0d5a9c9bbf5432f47a9d7562e4866b87738ac3436a8c0dec9
-EBUILD pyocr-0.7.2.ebuild 705 BLAKE2B 0db9154178a980ca063236671911d023001461c255837e7d87453adf11c6858dbf01b0faccb7f8326223d10135b0ad0117bfdc92b4f4fba51295582dbcbe20fc SHA512 4d43a465c4a11d6c4ea0d02cb841fcb1da8a8b5849db4ed02785a93cb45d96791720ee9059c4c97b4ab6988078372a87985285c5ec62a5e7a6024d89c6352a67
-MISC metadata.xml 1111 BLAKE2B 600c0dd7b6bd10906b03db7aa0963b440eb5cd8f2f06a4a8672e0f63960838881d735fb2268f652dcc1a4bf865fb71eef6bba888c0ee72c88d472c0184c80889 SHA512 ff3ac9646095f8434423a5fe098563c7662dc447be9ba395879d5b66dc76236898e94964cfc2f5034b2bbd08caecc3635adec65369dbb5c21ce1ae2e23fb7cbf
+EBUILD pyocr-0.7.2.ebuild 719 BLAKE2B e10434699e78349ac1b48d5dbfff2de8f3c80ebb6e21b62657091332d6241e75b82a801a39a7659bc0098756ed0ea0738fad4241ce1695ca59d23464219fe01c SHA512 4725dc3b876070863a4caafd74218b38a46c424bf11c23b78306cd88856263ee3c45ffcf05fd4da823fadcfc66d704cbf53f1ce42142d0a59a29c79c7ea9ee7b
+MISC metadata.xml 1052 BLAKE2B 6899cd20551d02aa5f94143d47b5e32133066b235a5c12feea9f7438648372fa3a6119e6e3db8e42d27a81995ea08b60d9e51585d613e87a9c1067b931c524b8 SHA512 2cdec5344e8bce0cd8736a403b7c7be94eb56cf44ec1ba35252ca4f0baff1e912933151f1e22267c3b01ae7cb6960523e54b5b818324d6d186d3fcf5aea3ac1f
diff --git a/dev-python/pyocr/metadata.xml b/dev-python/pyocr/metadata.xml
index 1940c9456760..f260241d12b3 100644
--- a/dev-python/pyocr/metadata.xml
+++ b/dev-python/pyocr/metadata.xml
@@ -18,6 +18,5 @@ Pyocr can be used as a wrapper for google's Tesseract-OCR or Cuneiform. It can r
 	</use>
 	<upstream>
 		<remote-id type="pypi">pyocr</remote-id>
-		<remote-id type="github">openpaperwork/pyocr</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyocr/pyocr-0.7.2.ebuild b/dev-python/pyocr/pyocr-0.7.2.ebuild
index 61bf3561dff9..1489cbbeb3be 100644
--- a/dev-python/pyocr/pyocr-0.7.2.ebuild
+++ b/dev-python/pyocr/pyocr-0.7.2.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
 DESCRIPTION="An optical character recognition (OCR) tool wrapper for python"
-HOMEPAGE="https://github.com/openpaperwork/pyocr"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/pyocr"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
diff --git a/dev-python/pyparted/Manifest b/dev-python/pyparted/Manifest
index e77856433c1b..f5fb7182664e 100644
--- a/dev-python/pyparted/Manifest
+++ b/dev-python/pyparted/Manifest
@@ -1,5 +1,3 @@
-DIST pyparted-3.11.6.tar.gz 105633 BLAKE2B 8c74fb3521f94cf726365e91954c56a60bc418c0e18c3401dc525f942169b1c03ade5fa35d5053daf4a4568b373e9a8771e50c76ea5b51c2f6351ce62ed2bb21 SHA512 8c3a86efb21c212a8f227ae324896552f45568b8facdd76729f5acf15bf7d691c1b9ab9e46885e4fa4e0c4c7d60314e2abfcbff212e5dc158d27ce716dbd50fa
 DIST pyparted-3.11.7.tar.gz 105671 BLAKE2B ffe7869c7ac85f291314d0381e18ca6a732eca2cee3d31fe31a89b8b1c1c671f97a06a586f235ee67244388ab214a7e51c67951a5c1eb79fb1b448f6a004381c SHA512 147fdc45d47faaee574a7b0268a218eef49be929a147d20adf85cc0302d94e57e98e02072591ca035cad7efe164e7dd87bd1a31504f5cff8575f18d4469dc2b0
-EBUILD pyparted-3.11.6.ebuild 671 BLAKE2B 5be9c6d5cfb65c7a8a4702fe0eea20e39ebf768fb144d88e228f7646bfefe3c3b64ffd588e56f15e5cfbe24a92feb803db8cb691278ffd73e8b6a000ffb3e165 SHA512 280a9da40c537cdfc295dd0df09e9ed97f2f119eecd7555d706bd67d9b725722a32efe34970e5114c374819cb121785792f74cca92f28126c90fadffd956c222
 EBUILD pyparted-3.11.7.ebuild 672 BLAKE2B fd7cb2ae2bc2b064c9b6f39f4739ff1955aa4aabc0818d1a823e0a6a205d8b28dead7f7a3c8195f72a688b66d62f3ef52ea0b3102acc791614c49b6ffb7ee099 SHA512 0f7186e43c389f7f2d95594aa1fe4a59c2da2acd5b342ce5f139137d6dc4ec5ace94edd544c24fe616f2dcb05c2346823768dcebdbf13d601b654cdaada2fb75
 MISC metadata.xml 376 BLAKE2B 6f05ffd5c5420323e7cc8a583190efdc30e16e20d38f73765b1eea2a9572c265bc3612a3218eff6544da134850bd75863cf3c155791767efd45559ac1f1c049d SHA512 afdcbcc3d388fc555d0036416b9190e8c610a78d890b817a031f18c622c80b25cb30a73d98607fa402c548d944cd82fa9f9ed7c35899e2de20b2422f99325476
diff --git a/dev-python/pyparted/pyparted-3.11.6.ebuild b/dev-python/pyparted/pyparted-3.11.6.ebuild
deleted file mode 100644
index 4a444d86b0c9..000000000000
--- a/dev-python/pyparted/pyparted-3.11.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for sys-block/parted"
-HOMEPAGE="https://github.com/dcantrell/pyparted/"
-SRC_URI="https://github.com/dcantrell/pyparted/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
-
-DEPEND="
-	>=sys-block/parted-3.2
-"
-RDEPEND="
-	${DEPEND}
-	dev-python/decorator[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? ( dev-python/six[${PYTHON_USEDEP}] )
-	virtual/pkgconfig
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pypax/Manifest b/dev-python/pypax/Manifest
index e500585b4dce..4608f4c735f8 100644
--- a/dev-python/pypax/Manifest
+++ b/dev-python/pypax/Manifest
@@ -1,4 +1,4 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
-EBUILD pypax-0.9.5.ebuild 1115 BLAKE2B 16fca02b16acb057405e4ea69a99942807d641dc69fe6740026700e26abdc9f42906a8d29360cd7ef02116cd258e4dad32fe57faef254b164afc66673e1ecc46 SHA512 8e4067f16c52547f5df040507956990cdde4080b7d42995567393d8dd8a775e947ac741731d6dd5d18c2d4444099d24ae64c5b26ae650701ae9896af5278f4a7
+EBUILD pypax-0.9.5.ebuild 1116 BLAKE2B 04da14e6c62ddb8a25020cee821120c056d49bde22a318d9058375f510297e167c7c17a4c77ddbc2e55604ecc5408e97e4488f578f5625e682b4d743806616e0 SHA512 f9a3335fcb621501029cef696ba622d9248018f1f1667c9918ad47acc488d3bb0f87d2221d130eb9461fe92e222083eafb9fd0e90dc6745f2521359dc71430c8
 EBUILD pypax-9999.ebuild 1123 BLAKE2B 5de2dd6289791bd31a3c0e90ffbdb13e32076ef90fabbf03b9dee14f3e1d40f47fd48804f6dff6680f359d594d4555e8427e1c9f8df87f26f493b4c9b6ec0282 SHA512 6c08e87b65476d2443c78f251d548493d47daa3bf3d227ceb4e4460c95fa266f576861567dbecee73e392e77ed9d53efded6138a9d96a57c8103d85a177626dd
 MISC metadata.xml 597 BLAKE2B e154315aac17c35f33adc8dd7e33a6427029a34629979d2a7cfa6f373a56a9dbb6add22bfb359ba4126a29b172557393b96cea123224551d88894e5c5f637bbf SHA512 d5820da1b741114d7ecaf7cb7f0b6f1c08d675e53992c8fbf87f562c3b949ff7336e093a3a502202e671be299310c14a2a38b8d54d3485e0d9064964eb1ed87b
diff --git a/dev-python/pypax/pypax-0.9.5.ebuild b/dev-python/pypax/pypax-0.9.5.ebuild
index bfa8924e39b3..49dc6c16c48a 100644
--- a/dev-python/pypax/pypax-0.9.5.ebuild
+++ b/dev-python/pypax/pypax-0.9.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/elfix-${PV}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 	S="${WORKDIR}/elfix-${PV}"
 fi
 
diff --git a/dev-python/pyperclip/Manifest b/dev-python/pyperclip/Manifest
index eae5221b994a..377b63e3e327 100644
--- a/dev-python/pyperclip/Manifest
+++ b/dev-python/pyperclip/Manifest
@@ -1,4 +1,4 @@
 AUX pyperclip-1.7.0-test-pyqt.patch 1098 BLAKE2B 4fe453df11842615f1c2f2206553b3b98642bef61cc596bf7951f3dca2f15988e5a41bf577a4543ff692ddb7ef22e184c76f53dc982a5c658f067677cc563098 SHA512 4135204bb98d4148524bc6699a39917d4b5d04f5a686e61d283414889a4b6891c3ec5c0a7492a7a0ca95eca12bcce4cfd80beb3c2420a7fc6f4512efa30e2706
 DIST pyperclip-1.7.0.tar.gz 15977 BLAKE2B da1473f71bcadcc6dcacdfb6d1a1447b055eb1aa7b31fad76bd3a51245ad9b1e512335f9799d7d416a53b8471ab66c28afa5f9d3f3ee2b39e85d9c239a7e2c79 SHA512 7f22227ea894a236703f61ab950e198fab969fac5713ca8eac6df213183a47a244add88a462b9ddf63ed5bec36af5bc2578949f01ed31e0b63316d1761a935bd
-EBUILD pyperclip-1.7.0.ebuild 1223 BLAKE2B 299fede05e15289a8cbe50859862e5a6cc1e10114e554cb184c554416107a91bbfe100797f7f4bb0558c9b0a0049c317741c2a387d49e39680db47eece5d0385 SHA512 d94bac216d464a6f886444d325eaf3e88d0369036c389938228f9db2893d2ebf381fb97d547306465e0c378be65f6b1c7258275cc2ecaed5e5a7f895531d379c
+EBUILD pyperclip-1.7.0.ebuild 1224 BLAKE2B 5a843e5a84237168ef2567f7826a331ef33d65c32b3d0c273d021025e09b43177940350172d1b041ae6f56fe2628ceccf6e92c064f7265766d58bea7eca22452 SHA512 ec4e033d9dca182f5605e648ce347bfd3ecbd8ee4e540859f38624bd567c0d2d0f9eb3d38d2c713bdc9c234d6b08202bb7c946e59f6f5756722078bf3451df2c
 MISC metadata.xml 429 BLAKE2B c77e5ac40cfbc1893883c615eed7bc511ae3d146a2b2350516e06bcb08fd50872a53758c0be0750ac70950dabcdce986cea5c8d52019930ac74be9e25ea9c259 SHA512 38ecc541684be21065234c1ea7939ed99e4abeac6cce9b1fe1ee8a05ab487afdb15c57736dd2c4e111502751fd38fe98e862d1433c2cb58812f020476a8b344a
diff --git a/dev-python/pyperclip/pyperclip-1.7.0.ebuild b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
index 8e4042f67f1f..10e13b49cf3c 100644
--- a/dev-python/pyperclip/pyperclip-1.7.0.ebuild
+++ b/dev-python/pyperclip/pyperclip-1.7.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc64 sparc x86"
 
 RDEPEND="
 	|| (
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index efd270adbe25..fa74f9575f68 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,5 +1,3 @@
-DIST pyproject2setuppy-8.tar.gz 9501 BLAKE2B d0c168efa2742732710a7d967ce0783a942d4718ae2be75e6263bb560500527ee11260c9b7362d10cb059171475dc647c0bc97e284554f2e159f470e3eb7f569 SHA512 527e2de790fb02373150db834d1a007a63b71f87ae01fef1dd9fc86a51ac6cafeac28fa3f39a2d484e7a9f84549d0ba285894cf9201f3b2b2a47965be29913cc
 DIST pyproject2setuppy-9.tar.gz 9611 BLAKE2B 448e6ca468c2a5c1097e63316bf1a2da41dfc4a8dfa756553b56ebcbb66c43cce7dd57aeacce45491087b956a01b8ff2707fc5f60ada10a4f496c9c8f7c722c4 SHA512 bd337f392e3dfd686039714687bd8a57b7b946b486f5513bf603e322843a4d8f4c2fdca747e61090f00f3ed4a5284a2b182f064412a3c8e70f278a2be7551d93
-EBUILD pyproject2setuppy-8.ebuild 671 BLAKE2B cdf5334ea39ceb5493c7998264cf1eac9f259a78b739347b2727133344ba44c74d27fca18d2ac22f4ac76d3f057a6fae641734db4a034cb03b27dc048ec080a0 SHA512 33af5fa08bb93018d3eca50cb90db9a7ac866615e3435aca892417a0ec6c999914d2a8051dfe0c22ec216a776c162fbb48cbf49f668547afee395814ba63077d
-EBUILD pyproject2setuppy-9.ebuild 697 BLAKE2B c99c9ba316f61305fd9839c4d2e426987169722865252b0b8165100c5bc7b2b6a32a7d11c190afab647843c192d0bdb551e1d3f6354d8451a000bd346b74cf7f SHA512 beb82f145429588c2c5e464f5e3dfff2fafc4d025c3a1df2bf8c6c244c4fcf19c2481ad14b9d0713c07606791d4ddf3b0685a08ae8ee74762367b4e54ea69b9c
+EBUILD pyproject2setuppy-9.ebuild 689 BLAKE2B 1d3921f1f806b512efe03dd5554675cba0da0f59e4cc453826de4905b7f8956fa5a73339eccf46d3f8bd1170c1cab45f5994814c7952dbd9971c36e0c8522572 SHA512 67dc43be7bf098757ae8f1eeee9fa66105fc46842cda827b2eeab5f0ba5278491c1286b780335c15cb97b608d2696045db3596a88618cf94a5f69dfa9f45a5ca
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-8.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-8.ebuild
deleted file mode 100644
index c406e09e27ae..000000000000
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-8.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
-HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
-SRC_URI="
-	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
index 3ee2d749f83e..8f7a54f0c19b 100644
--- a/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-9.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 5460678a6c09..03f4f00aa646 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -8,6 +8,6 @@ DIST pypy-exe-7.3.3_rc1-1.amd64.xpak 13533939 BLAKE2B 9b959a51e5e896d68d5321ac27
 DIST pypy-exe-7.3.3_rc1-1.x86.xpak 10254396 BLAKE2B e3fa75dc753cc64baca69f802f2f52557b4b374801df7ede216c10f485130b2beb321d404e592e5de49d048de89f1a4496e946ebc8e7a831b1de7806d32e99a7 SHA512 6fae90183fea72dd913342fb230aca09091d0ef94f81a62750f39885bbaec78e227eb282372fe9f869ade1abdaac0ee7c93900311d495dc10735fb4573aaf52b
 EBUILD pypy-exe-bin-7.3.1_p1.ebuild 1086 BLAKE2B a331d825f7906c1685f4b387d4e6c50b9d82296d4d3c7d1d24f5de50d7ee65f02bfcd2b14f0b57cd2a73a714253a18e5a7f09fc122a5ba033965381a71a57144 SHA512 fe49f4895b502a6d0a2050bd0aa4e6eab616026a875905b46443fbbc4ef378329e3a56ff641541210fd613f9a8bc07317e9a639f1ba187cb2b4041fce321b687
 EBUILD pypy-exe-bin-7.3.2.ebuild 1081 BLAKE2B ebd50d6abfd93b8e1a3abb52e45eb2685778a05687efe0a43f363cd9f57f18f1517d40bbed0b5b0a5352ff5b0dee90a3d9a8a015b34a8bfdbd1ad847068792dc SHA512 bce00630db8b75dfa6874fb903ebbd0c92a8d7370a0bc0231fa83f3d5110fe5a7bbf2ed464a40d86a01f7e7721a0bdbfd4f651ed9f0f0cf91d4354aaade01019
-EBUILD pypy-exe-bin-7.3.3.ebuild 1081 BLAKE2B ebd50d6abfd93b8e1a3abb52e45eb2685778a05687efe0a43f363cd9f57f18f1517d40bbed0b5b0a5352ff5b0dee90a3d9a8a015b34a8bfdbd1ad847068792dc SHA512 bce00630db8b75dfa6874fb903ebbd0c92a8d7370a0bc0231fa83f3d5110fe5a7bbf2ed464a40d86a01f7e7721a0bdbfd4f651ed9f0f0cf91d4354aaade01019
+EBUILD pypy-exe-bin-7.3.3.ebuild 1080 BLAKE2B 47f5fdfb78dbbc2b18c01f9e76506cd25a1f34bbb2d0ea683f5e37ceacd50d06691ecfecddf1e84b2043e2aa07e0bc95913cac67f7d3fedb765a1709e909fb4e SHA512 05b9b8013b61c88c5a362a666ae9b4976a468bbf6f66de40db08595c75e22150841a769e2ecd002c9e911bc3b73eea8c24cce85818dc425a5f523ae2870fda24
 EBUILD pypy-exe-bin-7.3.3_rc1.ebuild 1070 BLAKE2B 7422e4b71923a835cb047369819044933619fc06a8e07856576f355b9c6f0655f8e304fff99173d65bbcc786e279f58e9c950df4134db90fafcfa0e6d99066f8 SHA512 9ea465569938ecfe31f8eb53d3b92814afe3aa122586ffe584c184329ae664036f75bfc7268b6bb55af5694977f28662b9e35285acc6e73b0c53659eaf952c17
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild
index cbfcb9fce7dd..55eb713cb96d 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.3.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index f1b368df293c..19cca5c4951b 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -5,6 +5,6 @@ DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84
 DIST pypy2.7-v7.3.3rc1-src.tar.bz2 20933100 BLAKE2B afbf3c15924e6a215b6323fe97e9782912f09ba1e1db6652b37897ead07deaaa97f591a91f3695e958e8e2dee2626bbda94c4043c025b3f52a12279dc66e483c SHA512 0ddbdcf7ef825888ff748ebdd84cb501653e3a4a0e506e35810f9693b5d3b388c2f636396616f0c8fcc96dc806fa02d74830c1f37ca11fdcfdfd32c3bcd1fdd0
 EBUILD pypy-exe-7.3.1.ebuild 3891 BLAKE2B 1121625d5422a1d52114e58fd7f1632f175fc1623b2b931c3fb528acb1f18fdfc1a0859218330fe3e7c20bc539ff2819ea21cac2cb41328a4d295e7f5e9f684a SHA512 6bff225e427ae47b014a20ae7ab3893e55a893d5ce0670dc0474b4e6626113f5cbeef893e8585d42c8be78a64a051addbbbff1eb90b2266284d6064e73feeb2f
 EBUILD pypy-exe-7.3.2.ebuild 4134 BLAKE2B 41a510875ed28bda552ddd80609ffe31c2d5eea78416af1dedade3616cca89f472c96968013b4855a7a2f5367530ca35a773cbb25cdaa7b6fb60d4de2ee01ae4 SHA512 addda776a9aabdcc9dcfabd2b59ee1d6b7c1938824abed3e69e912d09325669fc61959edf74c4ba15c1704e7e7282c7de386dcedc4265ba62868dbf01a7c1b99
-EBUILD pypy-exe-7.3.3.ebuild 4074 BLAKE2B 2e5f26deca32905d708882f50edca4ec1af675c61a4284f6a6cd174ca7d7dd09b9b2693b67afedaf30fca54db7640c083d88a69ae6f1e75b30f5d4ed0f575a4f SHA512 bb74c3250fc5d9d9d393923925a317b2c155c209f54c97f7f353a5860c778e3a0b999f4f58cbb89cd94204440c91f4cc70ffa96f99fc61e986cbe9e49898d994
+EBUILD pypy-exe-7.3.3.ebuild 4073 BLAKE2B 5910415342588e30e5a2222f581aed45b141219545044406552b0fc03e08863927d9bf6f0efef96fadfe46a97c4268b8c9d33ff1b8a4f45bfdce21507cb7db3b SHA512 36ccd6935458c136936691a88c05c2d197708e0d565f493825082a007cf967cf62acb4367effcabbc7aacf1f0e7ce30483f84c581e6d2124331db129c6e53bf1
 EBUILD pypy-exe-7.3.3_rc1.ebuild 4025 BLAKE2B f383d2e0f5f5c2041998e5c2dd2bdc77fd29a29895cd78bcdc4ba4f831bd675dc7b1d09e04f58f86bc72467fe076cce01292faaf79a373ed4c1dcc197253b63e SHA512 6a470cd309e2bf810afe9b903779ac1f4894da9acf50dc5afcc0f5d2e4fc0d70d59df40507ef15eb9412957c38c0c4070289dba86347f01940780791fed0bd2c
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild
index c0dee5cf1c60..3f210433ff4b 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.3.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index c802bfc29c10..e945be5e6910 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -10,6 +10,6 @@ DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0
 DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f
 EBUILD pypy-7.3.1-r3.ebuild 5851 BLAKE2B ebc9ea70cced86be882e8b58bf810b417b36463c9559b7a7816b4560fa0a03ca79489c9c9ddc0f5b7b9d3d5bddf36f7afeded2f8bfa2eb71e52738a2e03a8948 SHA512 71a7a5cf51767c1913a96af6afb03a91f7002c5d0c98aef66445e27d1e9cc6eda6af9c9c3267db2702f6b288ecb65906fa60df69b5d2f2287a838d4ff7c91576
 EBUILD pypy-7.3.2.ebuild 5573 BLAKE2B 8003673bb846858ea9718eeab505d4eb333c4aeb433f2c9f901f0fea2eb66b8e5d1a213598d4381903536a6d217d1e64bd01071b2ceaa37280d90908958ed156 SHA512 53664dd522887de6b54a4746f54a96c4f7bbe3c39dc935d285acefa989c651d1eefdc22a3a7be88dff15d7536db390c7cf25e1041ba4c2d63a5ba02cfc058092
-EBUILD pypy-7.3.3.ebuild 5590 BLAKE2B 5ca78c00d5325430b76d24ddec8d65414d379bf3618f394a76dba98492fbac71905d87e1fbce343e33fdda5cb51e2701e4c64f26edbe17edf4cf7bb6c5d30c21 SHA512 55bf654715cee22d61f53feb8602cd8a29433b1f9acf04765e32410616493b040e3b6d1fdb8cf84471ed554b3b22475cd8e3cce71b0da8faca512f7c3a922caa
+EBUILD pypy-7.3.3.ebuild 5589 BLAKE2B 31619cce78076ea225afce7c40938bbd309c74b8e1d26c4f330f698cdf8290be6664e80ecbda3ad443de745eb57dd3a8612b20553077644100859e98910bb166 SHA512 2072f86614b09a3cbe7b34838d130fb77f096db5e2dffd42e9e0364f27a31f9f88f5e2a1c67b81581612bbb55c35a2e8c77deaa6dc7122103b87e15643f38901
 EBUILD pypy-7.3.3_rc1.ebuild 5541 BLAKE2B a06a6d4cc570c52aac68a86edc25537d36df47ab3131ccb655dc712ec338f0511d379b51f57a03bb525359965ff66011269495782653fd1a1499dae8af72c44a SHA512 d66499412886a6a3a317de75e1e5992f47950f602055a65a71914651dc5b1754c9335aa9a1154f8bf847b677ef9ccb8031721af4e6e22b6f9775daa4c2afc4f5
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/pypy-7.3.3.ebuild b/dev-python/pypy/pypy-7.3.3.ebuild
index dfe53d9ae357..2e4a1964ef01 100644
--- a/dev-python/pypy/pypy-7.3.3.ebuild
+++ b/dev-python/pypy/pypy-7.3.3.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index ba36d197cc39..c7b68eca6e62 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -15,7 +15,7 @@ DIST pypy3-exe-7.3.3_rc1_p37-1.x86.xpak 9131518 BLAKE2B 8ee4b2f2daefa62fa05e4aa1
 EBUILD pypy3-exe-bin-7.3.1_p1.ebuild 1093 BLAKE2B 7f26dae3be0bd6aa84dbf76aa8f6bbefffbbaf71701dc5f032ae62d36022214fcfcf977512aeef1e5de96f174922fc1ef94f416eebeb42aedc379eda371f0f3b SHA512 fad45a0aaa788da299e62bb367391795a9300a1acec31b202c90edc35d4223cfa4ebe734f58615d1741f221f798da3b977ddc2e248b3a139852cb4caa2ba235c
 EBUILD pypy3-exe-bin-7.3.2-r1.ebuild 1091 BLAKE2B fb941e5aeecdb46c84d7ee5ad7432affa896e2aaba6d673080c598a74d5f37b22e3bc53332bc0aa0d4d68eb09fcc73417badadaf25bd4d9def82e314497ece35 SHA512 4ab20126c65a0669003d9f8957d34123405bb9752dbcd2a27d28a8765759b62cc9c9ab33ff479e7048e6e48d7cd530058ef3b640396bb3ecae93ba5da2d8ff56
 EBUILD pypy3-exe-bin-7.3.2_p37-r1.ebuild 1120 BLAKE2B ac61c77f569ee62c875df290b724fef626a78cb8d4f256ece004292ceaa806655ab4ef5fc2ecb13f0b4fea2bfbecce48c5a87c4d2246aab96d55cb170821d9e9 SHA512 0e7e41ecac34706a61c2c9412884beccc8bd4cc47d206972beb5bece65d59845eaf151964e637ff76abf8edde0395edb65ffc18339f4d47d7772a9dc80129398
-EBUILD pypy3-exe-bin-7.3.3.ebuild 1088 BLAKE2B fa81b28f520227698b80f0219a9e4a02134d151ebfeffa940661f7c8f25cb76d18c89a303919673f7f46631f96e62d9314d03611535143f963fdd4304c21b678 SHA512 176008be08c86b6c5dc7412409e9e16b4702af20b95d80c8149272f54ba4b63a4301a2c75ef74045aebc67d0200b518f551a5d7478051c4a0c40ceaa43e41f15
+EBUILD pypy3-exe-bin-7.3.3.ebuild 1087 BLAKE2B c9a81a01473f7fd9b481dd14c24db8c68eae0595c2852ddfe1d058123516e271fd8208c82b76761ade3d50f8141b4d6b39942268c4cf711f6a6b896f44cf6d90 SHA512 238992dea08e288f964d0ad82499addc4b43fa92ac8278590b23e0fe1f54f25ae7c9147cc17b98b7cee160fdc3092c5053f8895f54a6993a6ee693809d28e53e
 EBUILD pypy3-exe-bin-7.3.3_p37.ebuild 1117 BLAKE2B bf745cabe2c1ed81a366fd5095c9a273877fa1e58f2978dc52d1ab2323d96345ead7ddf35acd3e6d86a3dc0eb6a7f81f468f9b19f3cc264120a9d75ceabf2ddd SHA512 ec5f2c73118651b2f7465a05c0fb59ad4459199a864830622ec08fb83487ea965ba7ed9215e146bf7f93c3f74a45d8b9986a2885059dfbee52113d0d66d43a4d
 EBUILD pypy3-exe-bin-7.3.3_rc1.ebuild 1077 BLAKE2B 4c4f85c8e15a36cd622a018dea8370965fec92cd271492610cd34018489d6e2b886790769f005427177b16f4e18583ed6c9bf3d3b0f276c41457ba576f21f5cc SHA512 0e3084f39f00923f2fa6b7e4a0d8fff84b12d7ed638a18c90cba99b26868978192314f52067c9d410352e4c9740ecdb93658b7e5bb7b85f19e77d8fd58a64393
 EBUILD pypy3-exe-bin-7.3.3_rc1_p37.ebuild 1106 BLAKE2B ee8a581a746f6e5c93a53a7dd82c58eefbb1a98daf201a0af4d92903a6044def98a305d1f4849a8e70c6cc29f784622763487ce0df4592dcb5e7ffc440c57532 SHA512 eb6956fa73450c0c95aa21bfcad494be68eac2470980062a0df6e21ceec586492d2c793809aa2b3ddab75d38a097a59cbe173784e18d4c9c7d72266e01547e82
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild
index 345dafd4e829..be9892c4318c 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.3.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 954b28dd7151..f07dc34536f6 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -10,7 +10,7 @@ DIST pypy3.7-v7.3.3rc1-src.tar.bz2 24511164 BLAKE2B 7fba1fde1bb248006f95fbb52dd9
 EBUILD pypy3-exe-7.3.1.ebuild 3458 BLAKE2B 70d5be9e72cdd482d6f2107143cd79ddc024d50ef242b7fdf467d91c9a2d3c1130510750c54bfa869220fb248aba7fb46c9ce7b50dd0cbc69d55c23c98a3b60a SHA512 2b986efb595c46e284e96cfba530fdb7f16a6d931f015b98ab1254ecb142064ca562e9cfa797d6b28dd942b74640ba5d7436afbc360c42582f45d1e105a2c7e3
 EBUILD pypy3-exe-7.3.2-r1.ebuild 3753 BLAKE2B 8f8509589f3c21378786ad7b15e18b310a3b7d19cd2e5c8534169d72b76ad844543185a5fa06810441eb44d989fb3d2c2a0934279acce9774ba4be01dcf52511 SHA512 5c5e6c7af37dbdf4ec865bae69b7f9f982663bba8bdef77a8bf8a88e5b915a314dfd2b32d25cef61e55321e2950f6ed75da170cfd7c3558c1690e5abe1d6b7e5
 EBUILD pypy3-exe-7.3.2_p37-r1.ebuild 3792 BLAKE2B 000a9bcc94aca80c657798185066f9752d571d61e8a4765b80cdab909ab19a04f7229e082ffd63918a1efef5259ba671f34536ca1ba63de3b8f6a471cd59b76f SHA512 0b2dadc820da3b1f1069dc9783dfc25f25f2e5c091dcfae275b15fe5a43f531c6cd674711b8eeb2895b27a3173659d7b98679ea447d803a41cb602ad740c6f4d
-EBUILD pypy3-exe-7.3.3.ebuild 3641 BLAKE2B 745f107bc0f5efe5e3a4ce67de747d3230111262787aca7e893edd181a1416f2a3c2ce9885d4e08e0d81d6606b74b41c919cc10d6a8cb7407fbf78f793554270 SHA512 9674383075e1861344854147e405fb9d31de7abda958095118be14af725f9ecb846881f49080e8fbbf2ae3ce4ca05ba7512c351ddf8338f0d9b2fbef93d5b234
+EBUILD pypy3-exe-7.3.3.ebuild 3640 BLAKE2B 1293b75a909363684cb16711bd1bf6acdf5060fbf517835daf299708aa288fb36056f58424968fc303005a88ab8a0eb1d58ff5b0b14f1226bc8d2da486244824 SHA512 dec71f9944b957f368b9015170181cb3ee2a03c08792fe9015c8c653aa4aa011dcf8d218c1d16d9215c1fc6726f045719201546e2e78dc49e620f7d0bf92797b
 EBUILD pypy3-exe-7.3.3_p37.ebuild 3680 BLAKE2B 37640296820c961bfb69fd153faafaa03693758be90ec58c5b5bcb586fd12d4af9033e5a39a3bcb671c24f1e51781b793a97769494fdf482c2fb17dd8883513f SHA512 bdb87e56c6577494a6044157b8f065676cd331be132117155a9d2f1838719afb0af84b5f0344e84b16ed7f1e27326de78550da8af642e0de66be150b484fd8fc
 EBUILD pypy3-exe-7.3.3_rc1.ebuild 3592 BLAKE2B 4c593f15cff4c0c5989d66637a58f69d34c9c4de34c26ea438b81339df0514bca86af8d40bf3f0511a4172e34b330ac916596ca87255c09e20364ff54a550f6e SHA512 d0ec75c3deef8fd3fdc3fee3917f8c9ca9da6d9e5baad3e40db9d023c3ac00c808a03d254b06f91883c7e20fe63225866f4a866b190bd714896bf8fc11ff1596
 EBUILD pypy3-exe-7.3.3_rc1_p37.ebuild 3631 BLAKE2B ac13f8855d41d44c58f9adab48b3cac4cbcb51d162219fbc4419186d0fe3f9c9afa35435860e0e5d788ab0d5773ac44efddd86c81d9fbeb26a80fd8c9a3256b4 SHA512 f468cd7444193e384a5177bef63cca69e8799673c51ada60cd8378899ca3892701f2db64403ba1375042cb03ec1f63047aaac904006622b3c4b7c9e47b4f62b5
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild
index a8648c1e6ea9..10af12924c3a 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 65a1c2eaf42e..3cc38edba725 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -13,7 +13,7 @@ DIST pypy3.7-v7.3.3rc1-src.tar.bz2 24511164 BLAKE2B 7fba1fde1bb248006f95fbb52dd9
 EBUILD pypy3-7.3.1-r3.ebuild 7051 BLAKE2B 06171de220f62a018089cde90e190412f3e8db71163368eb0af7e8c6b6cec4c7f7d90f448683063f15e38323ae98ce5bef24e9917dfcf7ccf30baeebcbd9b708 SHA512 f82b2cb6e45768a58757070550c11056b010a4bc627195319ecca16ed7d1d1c225b08ee7eb7121c0bd9169e15403d6c8ecd5a38d5c2e7db705ae92039f367353
 EBUILD pypy3-7.3.2.ebuild 6594 BLAKE2B f49b8c3f494bae513df46e3b13109550858382e46a0575ca2da01c2de8550e30f2bdf4627e12f4391e94fa5c05a1afbb6eed5a7f8cd58e63b27dda877e6fc28e SHA512 c48cebb3c91c0f9612299265b513734c27629ec509275e2c7ac3862036cd648f516ab2ef38dfaff3c3b23603709f445ecd158bb2c652c0ce0d9834f4a3ed528b
 EBUILD pypy3-7.3.2_p37.ebuild 5423 BLAKE2B 1c0a61ad14c9f76d069aebf3c7d2f55d4278936f3a591eedcf10d58070d3508504122e5e32775e1f262ad7eccdb7c26795518b1edfb8e162aee3fc6324d3533a SHA512 840e0fc134f7523e0dc6780c7ff38b81c1033468570f3b48326de5f0ea5c64ca9c34e7cb8603ba85084a412c84f44043f966ff411b632388752692c8feb30896
-EBUILD pypy3-7.3.3.ebuild 6594 BLAKE2B f49b8c3f494bae513df46e3b13109550858382e46a0575ca2da01c2de8550e30f2bdf4627e12f4391e94fa5c05a1afbb6eed5a7f8cd58e63b27dda877e6fc28e SHA512 c48cebb3c91c0f9612299265b513734c27629ec509275e2c7ac3862036cd648f516ab2ef38dfaff3c3b23603709f445ecd158bb2c652c0ce0d9834f4a3ed528b
+EBUILD pypy3-7.3.3.ebuild 6593 BLAKE2B 0aab10767a4367b9b31bc0117e5858947422f9b8ae707c286a52f43080102983702414962ef9979798c0b690293dbc58916f11301a59f35f0fefdecd61724ac1 SHA512 f5b5720605ff5cf7b44a9ed4644896dd179de2543e594a093213416653a7357e34fc24e7ead01dd2c5f8284117ee402685ec23d32116050ceb78cd70b5534db4
 EBUILD pypy3-7.3.3_p37.ebuild 5423 BLAKE2B 1c0a61ad14c9f76d069aebf3c7d2f55d4278936f3a591eedcf10d58070d3508504122e5e32775e1f262ad7eccdb7c26795518b1edfb8e162aee3fc6324d3533a SHA512 840e0fc134f7523e0dc6780c7ff38b81c1033468570f3b48326de5f0ea5c64ca9c34e7cb8603ba85084a412c84f44043f966ff411b632388752692c8feb30896
 EBUILD pypy3-7.3.3_rc1.ebuild 6545 BLAKE2B 41de7a0c30fad8e307be1c53560810acb5977a577d08afc889f66c1d6a1a97e5e0a42ad7230585a9e7848543c768ed898dfc4f564ac03e0b4d9a366016bf5185 SHA512 92f87d3c59b5ca3dc8c1fc689926fdfa49b432db466fa69815dc163549e095469a241d4f10d3bb2e03eb06ef1371212868918099082991effa7b64a3ea4590ab
 EBUILD pypy3-7.3.3_rc1_p37.ebuild 5374 BLAKE2B 39f7db0c018bfb1c0b23e4312abafce87e98db8a7d539d8221a839bd34db95ec5792ad641d1841f5871bd83eb4db4afc47c483199fab1db697316480134626af SHA512 4b16352a2750cb5b8c5bb46e9f236089c0fbd740434663959ced853fc54bd23a00d088a40bc3e95b76ee162538a21b60b0882e8340f41ec026a3dc63c2a8893f
diff --git a/dev-python/pypy3/pypy3-7.3.3.ebuild b/dev-python/pypy3/pypy3-7.3.3.ebuild
index c0706600dea4..7d7af4a7e963 100644
--- a/dev-python/pypy3/pypy3-7.3.3.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 SLOT="0/pypy36-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest
index 6796b03c103a..bed11b434699 100644
--- a/dev-python/pyquery/Manifest
+++ b/dev-python/pyquery/Manifest
@@ -1,7 +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
 DIST pyquery-1.4.3.tar.gz 47448 BLAKE2B 32451dfc8f8160207b4be12006ceba3098b8cb344bfa3e80ccf75f8cfca9542614ae78b9bfec773139cbbf12434201f92f8b4738e7d9e6241b3addfeb1bc8dda SHA512 cb61326e38f78763ca15de09e3a56dad776b3d4831b54eabf295db0f9af8bf04599642c73f5db3e3172b86d7b66ba2ef626c8cba2dfb458af6ac432d15ea7cba
-EBUILD pyquery-1.4.1-r1.ebuild 1166 BLAKE2B 2e7107a78b04b8140578938eb5adb80da02bfca536558dfde1a0480a44250b25a31893d160c634716a5fab06864e9a3a7ee0ab198a09b644bd21f27c79c2f5a7 SHA512 58c3304621c3c380e079defedcac926c1abe7f4f1e80aa6593115214aeb2357887ff83d052f1d2546c640a4309744e0eb771085ae264693520cac700eb2aa4e6
-EBUILD pyquery-1.4.3.ebuild 1186 BLAKE2B d5c8a701e7b0e30200477ad94c00abb120127f30f151124b489025b437371e58dbff2fac8b57de62300508256690f20991c87b9691d4ca4e68ccc28b56cba4f4 SHA512 e5bb4d22318eb2f85885c9932ab5d79639b6fd02dca288bca2e10c1c027ba928da9716701834dd3833db056f016d539277e45483c116e8c999411ac970d5e76b
+EBUILD pyquery-1.4.3.ebuild 1177 BLAKE2B 3a8b8d26e933166ca4fb56042a198e031f016cc70343af44834efdbac638cfb34af1f608721de8c08c947faf7a55cbf5f046ae204cb0d47712bbf20c75a55e4f SHA512 b2b3d79fa769fc966d2996c8ec27dbd137f3f69f45eed646f2b52dba0b1261bb0a0a8c823f72e98c184326566dfd49e4b721baf1978255bbf526506c0587128a
 MISC metadata.xml 400 BLAKE2B d2e08b1b84985d34ddaa36dd90a890915203ba89a477d9ac2254f19b21070dc7fad74c1d51b8ca19ef56c6dadafac3a8b98fee11b9fe0d28c73a1b1dfe9ec109 SHA512 1045e3c9056b6724f1a3457d908e8a9bee0167f34db8aa45f269d279396b3a7ff42709ca42768f198e61fc03063add0a05791ffe631374b0e65328f28ad80ae8
diff --git a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild b/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
deleted file mode 100644
index 613b1dc5b19f..000000000000
--- a/dev-python/pyquery/pyquery-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,45 +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,8,9} pypy3 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="A jQuery-like library for python"
-HOMEPAGE="https://github.com/gawel/pyquery"
-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"
-IUSE="test"
-
-RDEPEND="
-	>=dev-python/lxml-2.1[${PYTHON_USEDEP}]
-	>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]"
-DEPEND="
-	test? ( ${RDEPEND}
-		dev-python/beautifulsoup[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/webtest[${PYTHON_USEDEP}]
-	)"
-
-RESTRICT+=" !test? ( test )"
-
-PATCHES=(
-	"${FILESDIR}/pyquery-1.4.1-network-tests.patch"
-	"${FILESDIR}/pyquery-1.4.1-tests-pypy.patch"
-)
-
-python_test() {
-	# The suite, it appears, requires this hard setting of PYTHONPATH!
-	PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup
-}
diff --git a/dev-python/pyquery/pyquery-1.4.3.ebuild b/dev-python/pyquery/pyquery-1.4.3.ebuild
index 8c50606b60bb..a9e3eb86d2d4 100644
--- a/dev-python/pyquery/pyquery-1.4.3.ebuild
+++ b/dev-python/pyquery/pyquery-1.4.3.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 0537063aece3..ee0c2c0144e7 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,3 @@
 DIST pyrsistent-0.17.3.tar.gz 106911 BLAKE2B 90a05617ad1e32801286d3da834bf52b4ea864e7463a0789904e4a3bbfda2f7b987e13ea93e16980f2cf3b5d999e6040b7c5980a81b516999175b4e5f2ed392e SHA512 2d18e1d4cfe9a0a576fd363f466ba920094af0b1cbbb49aec11b32df6c23e59f6552235a496838dab00928cc7f6dad2a4a8aaa0b52cb6a38eba6faedd12846c8
-EBUILD pyrsistent-0.17.3.ebuild 601 BLAKE2B f5c0ebefeb24020ca9fdd0c2db4b3fd2f551d66dd914a18cb379ff136ac4a8676588c8de01a2ce708a62c6f19c6ab13133cde8bfa842a0bf5844e6e62278d322 SHA512 bb9cb9e4179534bd24d92b0e36aba5fa0c551a50e6a1c9a46679a184edfa3f90b2a2c26894cd886cda2288f5ff674c5153ff60ba4aa33ce7e58268de1f3aa367
+EBUILD pyrsistent-0.17.3.ebuild 602 BLAKE2B 76b7e44e9ce5030384b97482c5f1f4252e1132946b0faab3eced0bd8258bee2e3b2d30ba1fe74dcec3586dc11d912c82024dbcbebd95c8d67273694db8bdf5af SHA512 dbe8b65d9057598f99b430c2affc1d450df92bcf18e2ff7436e517c9aeb162c5b778c6d2b56263892220b445900106baeea4c56a9e1d9b1734a1ed3743dec4e7
 MISC metadata.xml 521 BLAKE2B 0081a54c9db451d020647e808b80c47e590530bc952c40d3dc6c11e187cb6ff4c644c9c8c448b206ef3036a3a0ae07760e23ba88d41938667b0a83ab2299cd9d SHA512 16d13966bbf6d52360d9438a56a949e6e31a9d2ace85e319db27be14f85c8446ee28e00c6bafc9232b3608e3a209396dc601cb3ce193d3cb4e8284cc8b3cfef1
diff --git a/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
index 86d45df960a5..24abc2a522bd 100644
--- a/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pyscard/Manifest b/dev-python/pyscard/Manifest
index 51d8f6648953..f0c0998180a9 100644
--- a/dev-python/pyscard/Manifest
+++ b/dev-python/pyscard/Manifest
@@ -1,3 +1,5 @@
 DIST pyscard-1.9.9.tar.gz 145428 BLAKE2B c62d9c2f13d9f19df1b7399509efc9df2baf2da00a9dc0bd9a0b440dcef232beeb0f7da88b12e3fb8ecffeb28f268eaaa04c9d45dc3420a1071835afe7a36c95 SHA512 88c7314c10153f509eb9bf6318e62210c7182e51b531af752a402bf8d05cfa2658cc1a4e7b9385a474038ddfa5a1bfbf1f208fcd9abe02a60161ce7c757c67b2
+DIST pyscard-2.0.0.tar.gz 148326 BLAKE2B ea9e3fbe404dedd7e7290743da4dfe51196beaa7db7ce69ad47316c70afe044cbf3e32666d32786e0d68f225cc6d552b7bb5c79fc62132c6fbee502868d3a205 SHA512 cf2cda96cdbc8f1abc20f969355a9c07698c7c13d826482170f7114962cc683b3c9b8a39aa19b76b6ae1e6c6e8875407bb9fa04908a0b22c96d0b3cbd234fe0b
 EBUILD pyscard-1.9.9.ebuild 762 BLAKE2B 411f0552544900fa1cb3422555594feb25e64a3d10836693a8a5f813e4b74f4297b090e1bde71a15a969d95426c6c1def54815b0eed598bfe70ea6a34bbaf3bf SHA512 5fc82d785e6a3c5b60fe4a58e91f324355c250dd9279f12aad5bc90d00aa0425ce002f8637f9cfac898f40e1e3ecc1950f3f8e25a6cc8ca53e7f3a6b513717f3
+EBUILD pyscard-2.0.0.ebuild 693 BLAKE2B cbb90572a7b5240a973c307c579565853af266f2674b5eb9780a261233e4ddfb346de52b36012b94c9cc7643d3f1023b5ae83ea61165066910a33fe86c3e8eed SHA512 2f6fea59c156c5af6bf35209793ede245e49df28ece53665c90846a07bbf14939acdcb09c001f8a441715a1b09307b2802e4f30093e47ffd936072b57098a9dd
 MISC metadata.xml 425 BLAKE2B d08b4263a97d671761cc9d5ba2084ce7ecef3d10031371ec4bf5deb4d43d840dbc34787d69c353ff0b2acaade7e50c512c15fc41cc7ee6a14d295a7ccc9f3019 SHA512 75d4e0a2023ee036c4b48f3fba331c9b97dafcc53cc9d071196bf08a5bef4e51c254eec6a1d7258b5bf5b14b93860ff5f16262983cef7b7cfbec9e05f6a806dc
diff --git a/dev-python/pyscard/pyscard-2.0.0.ebuild b/dev-python/pyscard/pyscard-2.0.0.ebuild
new file mode 100644
index 000000000000..2c0b3a74b911
--- /dev/null
+++ b/dev-python/pyscard/pyscard-2.0.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 optfeature
+
+DESCRIPTION="Smart cards support in python"
+HOMEPAGE="https://pyscard.sourceforge.io/
+	https://github.com/LudovicRousseau/pyscard
+	https://pypi.org/project/pyscard/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+RDEPEND="sys-apps/pcsc-lite"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/swig"
+
+python_test() {
+	esetup.py test
+}
+
+pkg_postinst() {
+	optfeature "Gui support" dev-python/wxpython
+	optfeature "Support of remote readers with Pyro" dev-python/pyro
+}
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index 7c1fb895851b..690a192b9e6c 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,5 +1,3 @@
-DIST pyserial-3.4.tar.gz 151657 BLAKE2B cf47aba4a6f3bb2fe39d99e72907496faa1c9f37857810fef4d826cca72c361d0e43dbc33d9cf2291a589bf0193d17355d149e6eb61b4f9e28250207708ef09a SHA512 d71dffc330704e41caac6054adf192bee2f1c119691faf2ea93fe22e8e3ba000dc4a1434293f6f80d05a5577d85b96791f656e28d5c63fb0ce6a6605467a117f
 DIST pyserial-3.5.tar.gz 159125 BLAKE2B 6be1930afc6cfecad54cd7a116a0e93085d166907acb4c2fa5b7b9485ec28cfb6dc9e7ffc13ae5628c344ef0f78c15bdd828b8d51048a484548538cf14b9da20 SHA512 c8df5e50d952d5a6dcf1d9253a6ba953e9763c545a867da66c22c90dfa015aba0194f2a8f29a229d0a5f4dc8bfeeaaab8bcfda4066ed78a18b151bc05e6ae327
-EBUILD pyserial-3.4.ebuild 820 BLAKE2B 87bb59de2c81aa2939ccdeb0a29192855dd53341b1cbed4af3e08ba566d3c58e986130868eb754e9df07f316af910702c83970773c7ae46e2b9a94837510b5ee SHA512 e335e40a6e90ef7ad1ab4ebebfa67bcd3b910a8694bb3c0b330a5af488cf01ffa7a1df6caa2ce68762d802e0b4c8593ef5fa1500016e511eeb996edf088a5741
-EBUILD pyserial-3.5.ebuild 874 BLAKE2B bce8ff314f34603c8c5797e307fbb4ef38e1640ebc09a932d1f12fd6158838983854d62f8af93715ba3233808ab0c8443e309e07e8b3db5f3d2af38d50a8aef9 SHA512 d2b894dfb6a6178a84f997451e0c40a8a52bf695c3d062ddddf592025b669339c5e556e8600c07146e06725ded8ef15988fb53b7c11803514280c2afc716cf33
+EBUILD pyserial-3.5.ebuild 865 BLAKE2B 97a8055656feb92d902e7069e5a07a63c417bd92cb3bf37f4578451ed3ac79251cfb3551949ab80f485375465f09170c39cf002a53ce3259452afc7101b8bfe0 SHA512 aeb5227da6ac248b0c123933f94e603c77d03034d4eb871fb5b8cb606f978e8fcb5b20ac30cb82ee9b1a844f715d32c2ab5235c16ca4ecabab8c78612723782b
 MISC metadata.xml 445 BLAKE2B 97ba2ebe1dfa4c6efc0225dd2f4f41638bb890fe5d81ed855d67c5b0dffeb45070a2938a1d2c32c2be4337891132a09b29d558ce541ce5951e24dd7f44ea7a0a SHA512 1b74a8d88afc2dc709c2e2b7ce18ae341761e3e76d19bafcdffdaf4169651f7f570d997435ce8321e93b692fe52e218ae4cbfa7f34bfac992ac477e4168bdd24
diff --git a/dev-python/pyserial/pyserial-3.4.ebuild b/dev-python/pyserial/pyserial-3.4.ebuild
deleted file mode 100644
index 1751f98a277e..000000000000
--- a/dev-python/pyserial/pyserial-3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python Serial Port extension"
-HOMEPAGE="https://github.com/pyserial/pyserial https://pypi.org/project/pyserial/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
-IUSE="examples"
-
-DOCS=( CHANGES.rst README.rst )
-
-distutils_enable_sphinx documentation --no-autodoc
-
-python_test() {
-	"${EPYTHON}" test/run_all_tests.py loop:// -v || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/dev-python/pyserial/pyserial-3.5.ebuild b/dev-python/pyserial/pyserial-3.5.ebuild
index 075de9a06f18..28dbfa2a9b01 100644
--- a/dev-python/pyserial/pyserial-3.5.ebuild
+++ b/dev-python/pyserial/pyserial-3.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-macos"
 IUSE="examples"
 
 DOCS=( CHANGES.rst README.rst )
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
new file mode 100644
index 000000000000..39cc00fe7413
--- /dev/null
+++ b/dev-python/pyside2-tools/Manifest
@@ -0,0 +1,4 @@
+AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feabbc752bb4bf0af30b645736b9895fe96063dc4a9d5668866523e567f723693b17c6da4101d28713cfa6ad8adadb78e6bb99756d7c69244a2 SHA512 c8b17db89f42a52f4191dda953d7228eafcafd6afb6d7b70527cef090ffd1f073970010a817bede941de10b4e40e41d35fb99b74091baeea6d237c08eb7f225f
+DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
+EBUILD pyside2-tools-5.15.1-r1.ebuild 1660 BLAKE2B 4d6b707ceb2208488c0a23e4519e79bdf60bea7d34945b038d3ce619b06c98ae97f70819aac59b5862d785c6da86c2fee5d081db183e4cd4bee751715c8cfa84 SHA512 e5945c553d9d1b1f4b471cda801626614f5539d04db0418d64475a529d5a10338d9dfed11c7db10a69bd5d43f4dad9bf2cf519ce8b78d1e4ff89d8071f9f03c9
+MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25
diff --git a/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch b/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
new file mode 100644
index 000000000000..60de6aa07ee7
--- /dev/null
+++ b/dev-python/pyside2-tools/files/pyside2-tools-5.15.1-dont-install-tools.patch
@@ -0,0 +1,58 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 20a5e19..575c1df 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,38 +55,6 @@ else()
+     set(DESIGNER_PATH "${TOOLS_PATH}/designer${EXE_EXT}")
+ endif()
+ 
+-install(FILES "${UIC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-install(FILES "${RCC_PATH}"
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+-if (EXISTS ${DESIGNER_PATH})
+-    if (APPLE)
+-        install(DIRECTORY "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                FILE_PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    else()
+-        install(FILES "${DESIGNER_PATH}"
+-                DESTINATION bin
+-                PERMISSIONS
+-                OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-                GROUP_EXECUTE GROUP_READ
+-                WORLD_EXECUTE WORLD_READ)
+-    endif()
+-endif()
+-
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake"
+                "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+                IMMEDIATE @ONLY)
+@@ -113,14 +81,6 @@ endif()
+ 
+ add_subdirectory(pylupdate)
+ 
+-# pyside2-rcc, pyside2-uic, pyside2-designer, shiboken and pyside2-lupdate entrypoints
+-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py
+-        DESTINATION bin
+-        PERMISSIONS
+-        OWNER_EXECUTE OWNER_WRITE OWNER_READ
+-        GROUP_EXECUTE GROUP_READ
+-        WORLD_EXECUTE WORLD_READ)
+-
+ if (BUILD_TESTS)
+     enable_testing()
+     add_subdirectory(tests)
diff --git a/dev-python/pyside2-tools/metadata.xml b/dev-python/pyside2-tools/metadata.xml
new file mode 100644
index 000000000000..11287d1296cc
--- /dev/null
+++ b/dev-python/pyside2-tools/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fordfrog@gentoo.org</email>
+		<name>Miroslav Šulc</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
new file mode 100644
index 000000000000..06fccffec6a3
--- /dev/null
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.1-r1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# TODO: Add PyPy once officially supported. See also:
+#     https://bugreports.qt.io/browse/PYSIDE-535
+PYTHON_COMPAT=( python3_{6..8} )
+CMAKE_IN_SOURCE_BUILD=1
+
+inherit cmake python-r1
+
+MY_P=pyside-setup-opensource-src-${PV}
+
+DESCRIPTION="PySide development tools (pyside2-lupdate with support for Python)"
+HOMEPAGE="https://wiki.qt.io/PySide2"
+SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${PV}-src/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+CDEPEND="${PYTHON_DEPS}
+	>=dev-python/pyside2-${PV}[${PYTHON_USEDEP}]
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+S=${WORKDIR}/${MY_P}/sources/${PN}
+DOCS=( README.md )
+
+# the tools conflict with tools from QT
+PATCHES=(
+	"${FILESDIR}/${P}-dont-install-tools.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	python_copy_sources
+}
+
+src_configure() {
+	# The tests are only related to the tools that we don't install
+	local mycmakeargs=(
+		-DBUILD_TESTS=OFF
+	)
+
+	pyside-tools_configure() {
+		local mycmakeargs=(
+			"${mycmakeargs[@]}"
+			-DPYTHON_CONFIG_SUFFIX="-${EPYTHON}"
+		)
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_configure
+	}
+
+	python_foreach_impl pyside-tools_configure
+}
+
+src_compile() {
+	pyside-tools_compile() {
+		CMAKE_USE_DIR="${BUILD_DIR}" cmake_src_compile
+	}
+
+	python_foreach_impl pyside-tools_compile
+}
+
+src_install() {
+	pyside-tools_install() {
+		python_doexe "${BUILD_DIR}/pylupdate/pyside2-lupdate"
+	}
+
+	python_foreach_impl pyside-tools_install
+
+	doman pylupdate/pyside2-lupdate.1
+	einstalldocs
+}
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 550a6a6ebef2..b7e2d2835cd4 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-asyncio-0.14.0.tar.gz 14796 BLAKE2B 0a110dabde491293dc10452239971809ec6a4006a2036e848aac067df1af328d0d1d5c7afae8cfc1ecf5c919c0922050e2db182065500ec614a8094d3799c0cd SHA512 d1fadff152a0c94f80a8272a0dd293bd9d9300ad9e79c69556b5901c1a8ce00545f7715e503a383e3f4f35c8090d8f9ec33d16739b85378b59b1786a50441fca
-EBUILD pytest-asyncio-0.14.0.ebuild 822 BLAKE2B 4f121100f7a9c06bc9c12a70d34f6d0cbbff41b699e420b7d0a4d718037a20e47842478d4ee0e12d1a9e674ef513603f193ec7420a232e8451ebbfb85640b3d0 SHA512 b9f0365b879cd5d2b78ffbdb1372fb19e99819debae1e2e1b8332323a5603124d6e729a870cdf020b15d3522abc15aaa775b7b6dffb8c8ad286a1455049cd3e5
+EBUILD pytest-asyncio-0.14.0.ebuild 818 BLAKE2B 3cda40ee80dffe9a69def2299a30d5962f97140190b5fae2cdd1cdaa370a22dafcdedabfbd09ee4d64314880e4d48a647a7c8d46eadd25059180a57e8d0330e8 SHA512 40db5c05d6745d1dcfe292066036141424f1bb82a05f349476a0e886d1c8733d975084cbb41575999ec73eb4e74b5d136b9713363b5f624ace210152c92ecbbf
 MISC metadata.xml 384 BLAKE2B 72efae7dd0c314cd8f6e9e5b53fe94abab14fd591954474562ad4d6f5d485eaef9f324900cf79f3b857fb58e0b033ac496661e020ca9c88d2db0f1f8242d25af SHA512 ba2890b3bfba36b90098a578018c2fff627dd2537ac1c5dd90632c93df5a24a295050ef142caa5217d9a51da802aff686d9ea0318a1af7fcbc01e83b456848da
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
index 3e38abcb5a60..8de7d3b559ec 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.14.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pytest-dev/pytest-asyncio/archive/v${PV}.tar.gz -> $
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/pytest-5.4.0"
diff --git a/dev-python/pytest-salt/Manifest b/dev-python/pytest-salt/Manifest
index 23d4e19c2943..3f0cc41d6006 100644
--- a/dev-python/pytest-salt/Manifest
+++ b/dev-python/pytest-salt/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-salt-2019.2.1.post1.tar.gz 63824 BLAKE2B 684e1dee6df8f7459bfa1747ea017973d72bc69b87d22c65509ecada47469a94ce410034004a5df1396d5ed05557ddec90e34cb18792235babb5e0cf6d72d776 SHA512 7b9939c3bd1cbcb6d6d0b086c39e02deadd8b3c6fcc359924af7fa5afc2e443b927269b82aa5575413e4e6bbc052f4035fb17ab68dac59ea309320c0a647d36d
 DIST pytest-salt-2020.1.27.tar.gz 64141 BLAKE2B 2b9261af2de28f8dce1abcd71b586594075916c8a5dbb27a24f15b9d95a575624be118d1c742f02020d3b968ffa4654cf6cd0dabefffe6876b87a4d1d58c3d60 SHA512 b0632e21f1ea5c3b57eb681cd8b270721cafd270321b708fca65427fc89817ed9e9a4216a520f35988c6866b1ed76ed84838009da9052a11cf8782d4dcf118ba
-EBUILD pytest-salt-2019.2.1_p1.ebuild 578 BLAKE2B a1535a842ab15429175c931ed36342041b9061cd42730df43639928b0b0122fe209ed2b34b397f5f11e8b98f15233cf51ea6d13dd959b20fa839e25a3ff62af9 SHA512 a984989a933648f8183257b0d69438171691beeacef2158e8b876ad76ae3239308dd1061e5a4143e09714825e36eedc883dca3e179fde5599baa586af1749026
 EBUILD pytest-salt-2020.1.27.ebuild 891 BLAKE2B 12b8f649d918922ce5beab45f680017a23630bfbb3fec143b70ff91954f9108541aa1c01d69c3fac705c61548efba5ffcc09035abe848752962609f801a521c2 SHA512 85a2c12782cd99221e8467a0f07186ec06c762d9523853396baf87c44cfb4403888bebea8953f705cc06d70d5ed6990407cad6a0c1ee5e67e0dd719b539148c3
 MISC metadata.xml 323 BLAKE2B 2eede80f9d146aa2dc511191d1e1ef7a689786878c2ba77ee62dc181d49ed07475f657886e6f9d662140ff378ddeaf65f979a6e483b92ff97834e934b225b430 SHA512 ca8b7955dc3025e3ed15ef0556b02a80b033dc2003bbb3030b42112e04d1945436a3ff2224bd2149ec34210d50a66fcc0b1577dd1464fc8e1e4ed097286e02a1
diff --git a/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild b/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
deleted file mode 100644
index baf5647849f0..000000000000
--- a/dev-python/pytest-salt/pytest-salt-2019.2.1_p1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_6 )
-MY_PV="${PV/_p/.post}"
-inherit distutils-r1
-
-DESCRIPTION="PyTest Salt Plugin"
-HOMEPAGE="https://github.com/saltstack/pytest-salt"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${PN}-${MY_PV}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.2.0[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 1aeeab81ad54..5e9ae3826d34 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,5 +1,3 @@
-DIST pytest-xprocess-0.16.0.tar.gz 17218 BLAKE2B 60411ed5af2add7f7c7f6b6e2074f9703cdae8a450c65eda483635a1cf8f60a3dbd84218d9e99bb3783ae00ba50b3449335df92397dab0fc7281ea72d3f5696b SHA512 3cf5d05c6693ebddc91fb2ad62eacd5b8f231e78ee82908b20268367649d6d73f0c1fbbf93a31f97feabe8bddf02cb176b2ffb9f6de4387b46cd0b97ad3c3eea
 DIST pytest-xprocess-0.17.0.tar.gz 19186 BLAKE2B 071063267d88d8ddd56c3b8ab7b2e6bebae321ac741e63336721cd13045688cef56909737c73b5cec27805b4f7dd93cdd7f467071966b3d864d0a1f270e821d0 SHA512 c85bb7bd8373b5b5119083fca46b8f173efe3b6f6cde5db8365e567e717f47f6f9230d2cf5ecfddb014aedd628aee75023f4da3077fa3ffb26b3c7bfc61d57c9
-EBUILD pytest-xprocess-0.16.0.ebuild 630 BLAKE2B 43440cb9b303a3c2abdc4f29eea0f8a37a05dda6030d72a9632fdc4a6b3acbb7327be5121cfa051143a104edb9c141e991c3418162e6ae811e07c639c83a6466 SHA512 0694a9b4e2f5dc1863d9b826eb043bc27b5e9b5ca3bbbbe15f5f90640e66f16ba781b12778ee7d6501e9c5d53eb7cd07358ba987a753d1df5eaee183570f3e8b
-EBUILD pytest-xprocess-0.17.0.ebuild 638 BLAKE2B 57a2292c5fc28288bfbee85a36e17c803b2b5ad0923c559cbc64d7546d2855b9f1041fffbb80870682ce8c7ab40e86e7915a9e4a3bf834fa43ad8fedae30d6e8 SHA512 15a917078d76247016db8108becdc434c944965b9e63e6939eefe976fb5942793010933a7534a507eaf6340aff99b42c25c2beb289edf851719afa0d525a01b9
+EBUILD pytest-xprocess-0.17.0.ebuild 630 BLAKE2B 43440cb9b303a3c2abdc4f29eea0f8a37a05dda6030d72a9632fdc4a6b3acbb7327be5121cfa051143a104edb9c141e991c3418162e6ae811e07c639c83a6466 SHA512 0694a9b4e2f5dc1863d9b826eb043bc27b5e9b5ca3bbbbe15f5f90640e66f16ba781b12778ee7d6501e9c5d53eb7cd07358ba987a753d1df5eaee183570f3e8b
 MISC metadata.xml 421 BLAKE2B 616045f871631311e9310ebda14f2bcd936b7a721196f9312b6270bbf8713789329b56ba058cb412d31e68e91957666ce9f44043527efbd0842dece87ebb5f5b SHA512 4d5b9f41b7aaebcb87c8718a98b1dbb3df0f199a5f6940bd12e3504ff5080a0ed112b315c89e2af1a5a3220829879afa0cdf931828359ff98732311200b76b9d
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.16.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.16.0.ebuild
deleted file mode 100644
index 63ce134ecb3e..000000000000
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.16.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=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Manage external processes across test runs"
-HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
index d9f406cc465b..63ce134ecb3e 100644
--- a/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.17.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 4f7404743da7..3281810f125a 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -3,9 +3,9 @@ DIST python-3.6.12-docs-html.tar.bz2 6013089 BLAKE2B dc1c9f702bdd8be619c3cd6fd0f
 DIST python-3.7.9-docs-html.tar.bz2 6285801 BLAKE2B bc76a90bed3f9126a63fc76bc7ec858b90dcf827eb0af19652ee987aa3feeef9de71be0e14b33f98ee5733b9eeecd3d6ec01837fcbab31d505e389ea99d6fd0a SHA512 243327bdcb85b696fccf20b3cb841b398a672f07e34f441323418651ead58ab3346eff39e78501130b5d97e5d87fb72c945a9c4b9082b26577f33bd095791d55
 DIST python-3.8.6-docs-html.tar.bz2 6578280 BLAKE2B efdc62b2d570cbe7e69be1cf118250ee89f1b09af7e7db306970e764dcc9e6f20bda9230fe934ecc0891a1d79370294bc42170713b9471d05f23a468f09015fc SHA512 be0d61a9556fbdd24ab124cfdf220b3bdb537cc02d5896f8f4c75cb73e3cfd5c2947c060d049b57bf5576b4b2d1c7f0f3987070d70ce883dea023e1feab1a630
 DIST python-3.9.0-docs-html.tar.bz2 6771373 BLAKE2B 301b8687043277a3d11dc497985769efdeaf33f8af2fc3d52b8a0b50322851402c1a1b273e782db6bd7ac51bbd94f7345c0995d0dd4f4d37bce10351620c6f6e SHA512 d04957f4895ab8f6bef8467d8b5282e0b3e5c453e2168c25123ee7aefd7a3d6d8b918e9f455bbf82913370a00181b8c00998ec2ae67c763aeda237c5b3a42097
-EBUILD python-docs-2.7.18.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
-EBUILD python-docs-3.6.12.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
-EBUILD python-docs-3.7.9.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
-EBUILD python-docs-3.8.6.ebuild 626 BLAKE2B 56e37a00df4d8e75d59546d78e625f73f68c31b6f34659cf889ad3677306c85ed1a594200fa7d9421fee88727d52462bf8a4df982f66e214a1a038c1281748e3 SHA512 5dcca24641374fdfb531306b64b929ec01c8876025090cc304cc0838957bcf09725826328916534b75e3fb9700a58f30b38227fd24146be69005c6e69e9f2fa9
+EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 0d27b516516f8a1d978a409506a92b4d0b9ad9df348071ce56ec9efadd7c280fa1ba5ffef69c422487188a373a084cfefa6a4ab5cba30caf6a16e15a4b0306c5 SHA512 5e7cea1fd73f582a2f8c4ee939fe59c2f53a12e693af42112e485313096a5293a0bc6fa34e619b06179c63c33d092c636445650264bc212324db5e0cb5b9e62b
+EBUILD python-docs-3.6.12.ebuild 627 BLAKE2B 0d27b516516f8a1d978a409506a92b4d0b9ad9df348071ce56ec9efadd7c280fa1ba5ffef69c422487188a373a084cfefa6a4ab5cba30caf6a16e15a4b0306c5 SHA512 5e7cea1fd73f582a2f8c4ee939fe59c2f53a12e693af42112e485313096a5293a0bc6fa34e619b06179c63c33d092c636445650264bc212324db5e0cb5b9e62b
+EBUILD python-docs-3.7.9.ebuild 627 BLAKE2B 0d27b516516f8a1d978a409506a92b4d0b9ad9df348071ce56ec9efadd7c280fa1ba5ffef69c422487188a373a084cfefa6a4ab5cba30caf6a16e15a4b0306c5 SHA512 5e7cea1fd73f582a2f8c4ee939fe59c2f53a12e693af42112e485313096a5293a0bc6fa34e619b06179c63c33d092c636445650264bc212324db5e0cb5b9e62b
+EBUILD python-docs-3.8.6.ebuild 627 BLAKE2B 0d27b516516f8a1d978a409506a92b4d0b9ad9df348071ce56ec9efadd7c280fa1ba5ffef69c422487188a373a084cfefa6a4ab5cba30caf6a16e15a4b0306c5 SHA512 5e7cea1fd73f582a2f8c4ee939fe59c2f53a12e693af42112e485313096a5293a0bc6fa34e619b06179c63c33d092c636445650264bc212324db5e0cb5b9e62b
 EBUILD python-docs-3.9.0.ebuild 635 BLAKE2B 65e9b1107639426d2bb5c56fa323ca49a7aa584378f2ecbfc521e38fe3629e039815843001ea0b8e484f51288543ee2b093013b22491091b0a98ca155c6633ca SHA512 d1e6f0e50158e757d64bda589ad07589761ada99de48f83236665eb958f83baf952abe3b44180ba4b5ca30497090ad4912a602b2f8e4ea49bf11b53de11181be
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-2.7.18.ebuild b/dev-python/python-docs/python-docs-2.7.18.ebuild
index 2804f868635a..06d23092b3c5 100644
--- a/dev-python/python-docs/python-docs-2.7.18.ebuild
+++ b/dev-python/python-docs/python-docs-2.7.18.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.6.12.ebuild b/dev-python/python-docs/python-docs-3.6.12.ebuild
index 2804f868635a..06d23092b3c5 100644
--- a/dev-python/python-docs/python-docs-3.6.12.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.12.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.7.9.ebuild b/dev-python/python-docs/python-docs-3.7.9.ebuild
index 2804f868635a..06d23092b3c5 100644
--- a/dev-python/python-docs/python-docs-3.7.9.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.9.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.8.6.ebuild b/dev-python/python-docs/python-docs-3.8.6.ebuild
index 2804f868635a..06d23092b3c5 100644
--- a/dev-python/python-docs/python-docs-3.8.6.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.6.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-gflags/Manifest b/dev-python/python-gflags/Manifest
index 924d73e07839..3edae65ce2b9 100644
--- a/dev-python/python-gflags/Manifest
+++ b/dev-python/python-gflags/Manifest
@@ -1,4 +1,4 @@
 AUX python-gflags-3.1.1-script-install.patch 1178 BLAKE2B 26f5694548762a2d6b8e6787027862edba91e8baf39a7c8dfc573be61af48cebf7a280646c948c0b59fab48d3b46fd4049d8422f8d4e6d9a57afe6e363c63999 SHA512 7247303c33a845949b1db7104f3170497da980334cb02155501d194eb53eb61ae2231cd4ece06194ca64514271252f8f1fc7c7683cbff2bb8f96d6d4e88123d5
 DIST python-gflags-3.1.2.tar.gz 52093 BLAKE2B 4275b43ecf2c58f76fee0b1ff4645eb3176a9ae3b68fdd4a059c2f6f659ca1d9b6e4fad152a2fa48f1eb22c467dbc006835c241c21f89c0ca92367e484f34c6f SHA512 7a3c08b6b212cdb9cb7feaa48e3875d1204a4b3a57182508a078331565f70509d00c315400fa0316dbf61ed4d6a6a04ca8c1a2303567d37650d8dfbb329e2f6c
-EBUILD python-gflags-3.1.2-r1.ebuild 846 BLAKE2B 59bb7f01095993596e59b32962d843fd9ec5746cf7c187a417009345c7e27a261928c32e38d4172b81ef07ac6993797f0bb27f5e7217492fca9e3f9c5645d7dd SHA512 d3cb20129e1f78a28ab23962660fc97377ab3f88707516f4b5614077a1eae872e0227cf36bd136d66d149f7fce6ccdf722a1916a9b08d0d55bcc0ce6b6c45876
+EBUILD python-gflags-3.1.2-r1.ebuild 847 BLAKE2B b0171ee8bd284cc641754d6ca0fdfd7246cbb895064131ebb1c9520841c355dc403d4ec4608f1f3ec2924831d9b7cc929c5e230480e6941dc24c2d7d5ac125ab SHA512 ddc9a7b9c7fe3b90f612cc743633905e5bc216cd4b64d5f1d27937ed4df9bca15530f0365cb5c702a7186b731a22169cf8499ce7c1d47b14fdeb1fe5290a973e
 MISC metadata.xml 400 BLAKE2B d273614233adf08aa64eb4339fe8c55899901d86405dba1be0a80e20b3efcb9856a399fa76883bc96e4dbe66b52e223b990d638fd4523c0e1e974606ca2902ed SHA512 35469aeba6e9273b765361e6543c6019bacb3a1a42c5aa232d62d82284bc59f5e04c392f3934b3097fba63d9101530046f1f93119561ea0d426259374c5d6fb9
diff --git a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
index 97610d54c1da..0ee952e696db 100644
--- a/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
+++ b/dev-python/python-gflags/python-gflags-3.1.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-libevdev/Manifest b/dev-python/python-libevdev/Manifest
index 4010f94418d6..889a53d1d257 100644
--- a/dev-python/python-libevdev/Manifest
+++ b/dev-python/python-libevdev/Manifest
@@ -1,5 +1,5 @@
 DIST python-libevdev-0.8.tar.bz2 30375 BLAKE2B b59a705d49a54d5f98bca3bdf97038128df35294d4e62ffe058021c4da846e75a372660a4beef7e83dbf5b16a4d7d9195547f713bd290b14ca28ecd9291ac641 SHA512 c3c35e82b78f8968c930883a99def348a012a05ea122ac24e757441e81079f7c12bd50d96e8cec7b799a2d775d834859f924e8d1dc5841c718c050287fd1beb0
 DIST python-libevdev-0.9.tar.bz2 31496 BLAKE2B 4802f1528c104b0717f3f3a450e6e704232d5045ac285b96eb3eb690f120969ea0f23eae1da6013b260627f18b3e58e55a5017401928149e9cc581d9a84fad70 SHA512 77dcb18c393fd7962887d477292ec359c65404ae126624dc5ab201528e53b9fab565d5c6acfe2908f4a03a29e09fad862220246b91a92cc5f69768a31d1ca808
-EBUILD python-libevdev-0.8.ebuild 586 BLAKE2B 870fb3bce4a2cad92e567cb97156237bb6ab1fe4413df91cba9c1f83b390ca2402a492686f9e9f6dbce3d0ce9f744fdb06d805f6fdecf5853f7eddb57973fc2e SHA512 dcbc32c74d6cacdbf5594bbae0a884ff40231d70b8263b1f1cf616b858063b283b05b0f40615848a94682c6f03c182153126f9df89c9dbf8ffd2960c4a26704d
+EBUILD python-libevdev-0.8.ebuild 587 BLAKE2B d0950a9154a3cc41322cd943cc6bb86674fe0b5fa5250807af8412e724ada02d286b364d2fdb658ad4d2e3de994ee2107256e4b1dc204848988c734c418f5801 SHA512 52b0f2693be24c8726d8c23992588448c95f7a6bd9d3843e755f7eafbca6405246f475c00b5d4ff662fbb29836dc9575fd18faf552937add1323ea4d464cd7b9
 EBUILD python-libevdev-0.9.ebuild 594 BLAKE2B 72776095d4db596ff83964752c8b6bc57e501fee0e779819b5bf83107ba3ee2eeac8f2cc5330bd73e5969213eed0fff6cccf2d49284ac341c7f46a51dbe2cf9f SHA512 a2d90aa03669860b78683a641a280c9a4cfd426ef2c3738ca283f9ba4f97006dfbc2f4445418c54d5406b6ae047182b45cea2a672218748439d65f0bafe4ea24
 MISC metadata.xml 305 BLAKE2B dfcc352aa29bf0497e41b9ce993e525211a1d673fd3c7ce75712ba1441faae1841a57885fffa358674dd03cb67b0e2c423a90b047c3517524a76f97ca1e9ab0f SHA512 e4f77ae903c4df549c7f730b37110adcab750d694a9d66d4d1c8c02fe327da783836e65edfc91fb131901154cd69c19fa250c9a000103ab631897e358fab0ba5
diff --git a/dev-python/python-libevdev/python-libevdev-0.8.ebuild b/dev-python/python-libevdev/python-libevdev-0.8.ebuild
index c1d9bb0d9d4e..b8acf30a5d94 100644
--- a/dev-python/python-libevdev/python-libevdev-0.8.ebuild
+++ b/dev-python/python-libevdev/python-libevdev-0.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://gitlab.freedesktop.org/libevdev/${PN}/-/archive/${PV}/${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-magic/Manifest b/dev-python/python-magic/Manifest
index 8b98dbd0481d..c588b1b4aa63 100644
--- a/dev-python/python-magic/Manifest
+++ b/dev-python/python-magic/Manifest
@@ -1,3 +1,3 @@
 DIST python-magic-0.4.18.gh.tar.gz 856291 BLAKE2B 882c86d3e8995d1e1b6168637a01f4f8bc86f23390b1c67248baf46d16d574a41789938ccdf0acd83db0652678ab0fa0f6e043eb2c4a75743e5d448e80530da5 SHA512 d5f0047c7537ce0598537629c60aa708623480792d489fa003328b5c6c5b0d42748b6e996f27dc2c164c598813fcf19393567e7ea266a9f0718cf2ddafbd33ac
-EBUILD python-magic-0.4.18.ebuild 747 BLAKE2B a1f9decbf29900b1a33b5d1c03374b391a5fbac2660ebe441648304ffff901fb82da1dc4d14f9e19d4f068e7c4aa48e7916264b5d6da1ca048000bad5fede7eb SHA512 7d937b866c98c3838c509c9a989a7508d0c85a02ec60c2a45b7a4280576acd88a3457503a597dcc266f08ee40a908e197655155b96ab96b86f4f5352a7dfe51d
+EBUILD python-magic-0.4.18.ebuild 748 BLAKE2B fe67a830827bdaddad26786095e639605b7203633c9349973109e7efcaeb1ad90eb18261ecf3e8ae35598340bb09cef37ae27c3acd2b54949e9704a817648b9e SHA512 eb90d9967e05f7bdc41a4bebc3e0a98c752490508263d6ba48a2c6413278957d8e90507e03fb84f989e6b4f22e23fa8d158beec7c1e735f0780f3632ec246a27
 MISC metadata.xml 523 BLAKE2B 6f12df0b77967272d055c9841d681752ded29e31d7e93489403e7117f111b5cdf847675897880354c08674f15b4d33aac348f0ce8ed7f04762b471f6a3667ca8 SHA512 9e503b941a7e62f21ef1417de1659c8135249027d59961486ec128c95239f56051dac67980e728e8cba73f7160259424e3121f007692f68f9c7c13f86b5060fc
diff --git a/dev-python/python-magic/python-magic-0.4.18.ebuild b/dev-python/python-magic/python-magic-0.4.18.ebuild
index cba012d735ce..407282b8d8bb 100644
--- a/dev-python/python-magic/python-magic-0.4.18.ebuild
+++ b/dev-python/python-magic/python-magic-0.4.18.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ahupp/python-magic/archive/${PV}.tar.gz -> ${P}.gh.t
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/python-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
index fc7e7215ffc3..4a6ae91debdf 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1,3 +1,3 @@
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD python-mimeparse-1.6.0-r3.ebuild 584 BLAKE2B 3921d7a0777cde65885a391fdf8b9e11d1e4e3782398ace5a68a463bc9d9ea2da7763697a39678078d56e412068e92c418bf9e0f475546beed60920894828d7d SHA512 48a7e28733ddbe929554a78dc522e8e179331c2b5b658ac12e7604f0bdc52dd9e07b71b1858a95a07374bbe3bc9ce60af7a734a77b6e1cc3b8fc65ae55da776e
+EBUILD python-mimeparse-1.6.0-r3.ebuild 585 BLAKE2B c2d159aaa861c388ca127058f3f510b9a5eb6ffa8ff2c48b5d597063846659612a71f8ed69140c2aafc870fb47ae2f9de636cc68351c0884ed74f3ac5a5907a2 SHA512 db92fb1a66d52e823286e90cd87ac179d51dfd855e4be60bf92ba7147867ae8352db1ed39fc7a8017919758fcc529da802f9c38fb39e30addb21061eeb7d6f85
 MISC metadata.xml 419 BLAKE2B 83547a7d24cf4a47a5c32e83aec0fc78f286d0f92252e637a1542d5d9a1d011c6b68c4ef4fcfae376edfbd82a3970673f4f50abe8272560fd14640f7537bcaac SHA512 9a18a36d9e0b85be5f1bc2ec6f8279089e4e5f73b5d77c634b2bc2ca0b39b29886f7e0b4665d4570772f2a1ed68a8e393de80ad0fa5d97145f2bac6366f08b0b
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
index 08aed71f7cd3..be14ec02dc81 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 python_test() {
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 5b8b85c54eee..4421aead1f27 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,5 +1,5 @@
 DIST python-xlib-0.28.tar.bz2 203306 BLAKE2B f8916fd0c62c8b4546f1c381fc9f13b1e86c4ae6da06434b666f4952ae6a28f06389b006d48dc3139f9018cc3c126ab8316b968e64da7b2f4d22bcc2a2c83bb9 SHA512 69c17486ffc465c2f5ca740761f52191b4ba86b1e11b047f146f949d8431a0ad7fb1007b7fe29fd659dc2e7be6facc9ea1d7b1e87cd534ae425555f0d512c4c2
 DIST python-xlib-0.29.tar.bz2 209322 BLAKE2B 4d94d99c8094947ce1acb84f3adc28ab4b6e9d6aaf61317b625e50578ece3800f6462551f8656b194d5635e3e35a5d6fec86d4eb553d7b65684a7f74fdf0dc14 SHA512 6275deb2c1e2068d560c45803e651fef9910b5cb921e043ed8204878a1f885b92122b6af3d4ac33f220231c1933d3150524169d0078f64b74df29a8f617d953a
 EBUILD python-xlib-0.28.ebuild 864 BLAKE2B 58f7ff16cd873fe0d46ba832080f7c5716250ff99d1b2f95a078b3ef324bebbb6fadb750c74045c29f2e3e5221466c760c4865c0695defda6c8728b251350515 SHA512 9709939fe00f4efbde974b5ff009d9c262679338590cab04d584dd24aaf327536f71f24a9d970c4c974d961c5a8f4bdf4b9950b6a1dcfaf085c895672d31a75f
-EBUILD python-xlib-0.29.ebuild 834 BLAKE2B aab42e68cb82aab4bbc753bbd039ca78ded9dda7d9c24d823fb42e925a1753f98e7ad8f11e4dfb430921877dc17c9e58581c4d0106ec0e3330bd15910bc6d496 SHA512 b45f4e2b6d3f8fc92b63e921e8f35a0f76c2bd8c6e24117192738b574774e0418671a4038019cc8613f21a3e3dc2c95744fd307e8cdaede7022cab97b8565f6f
+EBUILD python-xlib-0.29.ebuild 832 BLAKE2B 16521e926bf0286f234e0384cb64cb35eb9493f2d1c21139bc83599eacbeaa1041ad941c461a8c1aeb599d7f77aaebe048be7be3f9f6b2cc4149f857df390e44 SHA512 ede0121a4305de4ce191966cea9a20a89d898328b88b52a13b9175031cb512dbcb7f4b315a4b5466627f701f43c728854b035c9d406bf30a5ba0e140d2d58d7e
 MISC metadata.xml 433 BLAKE2B 7ed1d8e54df6935b05b4ef997ed50a0df4e5178b8bf2a48f8d67a4ac6a4323ee8646c4fa93ecc6fa70aefa14d0b5039ff99183c3710b7ce689e5b73b8a5affb5 SHA512 29095e67eed7821c4e447579662019fad67c456f6ef6cd5a00f51db7e6c4be297cd48ee7b4c2ada10e59a5d829dc33fe503e7d5daa924493d050ce4a256411db
diff --git a/dev-python/python-xlib/python-xlib-0.29.ebuild b/dev-python/python-xlib/python-xlib-0.29.ebuild
index 576677a71c44..6e638adf57c3 100644
--- a/dev-python/python-xlib/python-xlib-0.29.ebuild
+++ b/dev-python/python-xlib/python-xlib-0.29.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 ~x86"
 IUSE="doc"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyxattr/Manifest b/dev-python/pyxattr/Manifest
index c3df9de25e41..d025e8803ee5 100644
--- a/dev-python/pyxattr/Manifest
+++ b/dev-python/pyxattr/Manifest
@@ -1,3 +1,5 @@
 DIST pyxattr-0.7.1.tar.gz 30580 BLAKE2B 748ce0610ebc1a074dee87dffc67a88e1def0ea467f13758d2d85f9f5c37954586d85dfb8ceb1b77f4ef637295d57a153849b00d773e2e79b06902974fe01663 SHA512 093cb3f9b9637194b9737c07da7dde45b3d5083ec16a9209af80d30c86da8f93badff5aada395415be3dd48da73004286e47d0aa0671c95e65b0492d02e86009
-EBUILD pyxattr-0.7.1.ebuild 823 BLAKE2B 43d40a0701f4d8ef869655a5ba8c4dc337f6045a60c0eef7799d1c42e3d9eb71ddc41ca42000b1d5741c751d94b1cad8bee97d6e9242e23172baca39d6155c5f SHA512 b980df47ba500ffc800ebed6ebc0b703c9befd7f88429741f4eb03aac68bfcf226cc91a05e5e26f5037e708617f10286ec36012dd8d47b1e0b489f95ee78d924
+DIST pyxattr-0.7.2.tar.gz 31550 BLAKE2B 3505300d7a50dc305068740379bb8edbefa29f228c797e2e74467a51f4b0a6b740203f89b8ed461218978214213a6cd778107f58eb07a64d6b45e25d0fb769ea SHA512 fb9b36d5d2fb9ab674daf40d6f5c7dbe50d847dcb6d9955d270ef3aed2d8e3540f8feebd934009f47d63f3c55882846a20f7ed733b0d0c004e7a1984e7106206
+EBUILD pyxattr-0.7.1.ebuild 824 BLAKE2B 87abaf3c831944d6fcea7c6bccc9f902fd94d13006fcdcf694c3838d111b2685d93f06ff4191d3c6f544be43544338f1db74739dfb3a9d41334831811990499a SHA512 8ffc69de19301753118a56dea34af877138562da954846d5563e38857d694098e12de68d6b8e5c4b98e0bc8c95419825c519601eb8ce1fa4591c26c0c65552b2
+EBUILD pyxattr-0.7.2.ebuild 832 BLAKE2B 31113787c61c14e3a9b5f9eda5fb49b206393815f25a1c9a0011c6c422384a88c8e74f2f73f35a43a7f1975e990bc596e5fde077574f019225286c356f36593e SHA512 9c9a5faa130eab889b982cfd85aaff72d3c0a9b4e7966f72041e0dac8200fcdfb2bbb94854e8cacfa2222c7fe609878d341df90b78e299e7fceec66d50a8f11c
 MISC metadata.xml 609 BLAKE2B 8f3429390129e4438c5bb4c8d82ae11e9824863d4b200a57d660d0ae93692711b96c6cbcfd9e7e8ad46848beba86dd2ee971acde59c08c9fc6f317283358157f SHA512 8a18175143b319bf6f623304ad8f534ad34eaf8b67c57ee1addb8886e34d79bd3a74723bce4f66fb5e9e3dad4768aaf253cec8fb8e97365f152d0b8f772d7df6
diff --git a/dev-python/pyxattr/pyxattr-0.7.1.ebuild b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
index ed6d57bbfa4e..8831758f8cd8 100644
--- a/dev-python/pyxattr/pyxattr-0.7.1.ebuild
+++ b/dev-python/pyxattr/pyxattr-0.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="sys-apps/attr:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyxattr/pyxattr-0.7.2.ebuild b/dev-python/pyxattr/pyxattr-0.7.2.ebuild
new file mode 100644
index 000000000000..6202df6da8ee
--- /dev/null
+++ b/dev-python/pyxattr/pyxattr-0.7.2.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to xattr"
+HOMEPAGE="https://pyxattr.k1024.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	https://pyxattr.k1024.org/downloads/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="sys-apps/attr:="
+DEPEND="${RDEPEND}"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/recommonmark
+
+python_prepare_all() {
+	sed -i -e 's:, "-Werror"::' setup.py || die
+	# Bug 548486
+	sed -e "s:html_theme = 'default':html_theme = 'classic':" \
+		-i doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index b2cf10b2d9af..f1cdb029e3e3 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,4 +1,6 @@
 AUX pyxdg-0.26-python384.patch 1782 BLAKE2B 61eccc53300424879b2ff88d0f8e11654616dddf045d7edc3a67a8edf063b8517676276be6a9ee94de69243524cd46dd082846a13f2304b84d26a6f5bb31944f SHA512 e6d1af2b0fe52c85751e6e468576533bf0e718e58b74623fe7e84e2004f7a19353dc16591fe054cb78719318f1f5a70e96f4a009a292f1f8112592ea938eca5f
 DIST pyxdg-rel-0.26.tar.gz 68435 BLAKE2B a95948db17da9909554e82c0ccf590c3f94ec26d1e34d5ba335868233a649368c08ef30cc19e878310ef038e5bdb6d18cd0e15e9413d9c54b70931f25844ee8c SHA512 0c11bccb74b8c0d98f3c63c318d35d08e1c3bbea128bf7b82792e1bdc0a60c8c4d6414b0612b19296cfb48f7951dfc6dd55ac8d23238e370e7faf6c4f64d1fb6
-EBUILD pyxdg-0.26-r2.ebuild 775 BLAKE2B 282ba568722d9a2c0a7a85b4d4bdc8e57281c700fc641e4911338d01665b3360a4fe182df8df4488609b326b7a25e3f96c7f902b525792b754fe1f125eceb542 SHA512 d954a33de36ff5479565bdffeff9bf75df8b40f797f3e5e1967eec7700e4d7d00749fbdcd8500b147d3f173d0fbe0f1ad762f4cd35c320843660a7f2ddb88472
-MISC metadata.xml 487 BLAKE2B 4967a9b3c1a439c3cc53208ad2095031b08c4848ade6f2bb08a69aedbef5f5046f28764db62bcf3cac4c1c33c68958a7d2aba03a3b4cb7b7a407e41eddfec5f1 SHA512 f00421023d46b9aa32d8038c5ba8bfdb1b60a732932d64f7d11fe6f0c163b734182e2162dde2ba663d7c74ba8c754ece721dfbfa0b8fa3081be622dfff3949ea
+DIST pyxdg-rel-0.27.tar.gz 75385 BLAKE2B 44c275ad7f698ffea6963f67bdce46e4faed5c7ae7f6a5aeb03f31dba6358c07263ea826458982cc4f88c0e163c2732f5b498a8d38b5881433e5321cfb181ac6 SHA512 fa3b046ce741574a6c71ef9d1e57752f6c9775431110f6ea38dc851780b5e1f9033eabeb15c67c91bc9bef68bf8f545a25ef856c60e16ab2c4fcbbb053d8341e
+EBUILD pyxdg-0.26-r2.ebuild 776 BLAKE2B 3b59c66a3e701d5ce6ea1f6b737820d03fc36990758c2ddd50313dd0c0aecc71354a4db95167318cff747a91d0dd2ff07608716468e40512b8eb770d8655240a SHA512 df6d3007729867dd8afbcdf8d4c934a6f968c21fe3bde3744b68d5ff7cd4cdbe7941d3c91413afac4b3adccd44f711a128ed0405552d30fde4aaf646639db781
+EBUILD pyxdg-0.27.ebuild 610 BLAKE2B f7a89034ca14e11ab0ea0cd66e8ccb8559cf95fee07c128035212b9aad1d76180b64315e778af040f776a5b3cc1420cd7c595e9c17af877e92d98f4ec21b769b SHA512 de663c7579fbff03f6e7563270c0a8b7788316ef20b1d69dbee4b867a45c16760dd5e9c087b3b3566ef5b9b780ef4bd10b3346e5f3a8579728b2ae61cff0fb96
+MISC metadata.xml 512 BLAKE2B 134a7a97dc07dfa10dfc1f9684a0d9ef1cf059966ca3a569762dd277145d19dabf02987553ef6ec60083cf7ea5dd754ff64a735ac4cff8045415657c0a5b1f33 SHA512 c1f7bdaca58f1e63fa5906edd0d626413174742e68da597ab28350fc1f917d9c9c77d0fe7ec0aadd008525cdfc1fa71ff3558bb738f60d129be198844549a39f
diff --git a/dev-python/pyxdg/metadata.xml b/dev-python/pyxdg/metadata.xml
index 967f6f4f3925..e797bce5d14c 100644
--- a/dev-python/pyxdg/metadata.xml
+++ b/dev-python/pyxdg/metadata.xml
@@ -5,6 +5,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <doc lang="en">https://pyxdg.readthedocs.org/en/latest/</doc>
     <bugs-to>https://bugs.freedesktop.org/</bugs-to>
diff --git a/dev-python/pyxdg/pyxdg-0.26-r2.ebuild b/dev-python/pyxdg/pyxdg-0.26-r2.ebuild
index b86bc4b81e90..26e5227df657 100644
--- a/dev-python/pyxdg/pyxdg-0.26-r2.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.26-r2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyxdg/pyxdg-0.27.ebuild b/dev-python/pyxdg/pyxdg-0.27.ebuild
new file mode 100644
index 000000000000..b348a84228ba
--- /dev/null
+++ b/dev-python/pyxdg/pyxdg-0.27.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="${PN}-rel-${PV}"
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python module to deal with freedesktop.org specifications"
+HOMEPAGE="https://freedesktop.org/wiki/Software/pyxdg https://cgit.freedesktop.org/xdg/pyxdg/"
+SRC_URI="https://github.com/takluyver/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+distutils_enable_tests nose
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 448196cbfe70..f2a5fa6d5700 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,9 +1,5 @@
 DIST qtconsole-4.7.6.tar.gz 424919 BLAKE2B d973b3b94dfad1b38603695e22927bcdcb8a4f2db9f4a638d5fe6a83c24061153dbaa36c26e632708953af32a015af1d40ecbf175dd5314a3b954b15a6625cc0 SHA512 e4e12eb90533e922786b5b6517fba5d9c4dfedf00547f1403c8cd65fb464f5c1a13517df69924e4428e9a8a811dfc359a7768fbaa90adbe02d79cba9a5aa852e
-DIST qtconsole-4.7.7.tar.gz 425068 BLAKE2B 61fa3bede2d531e294e8a272287885ffeff095bca8b998b2a28fd3f4d912b20aa30807fe7d4caf15f8594e7820e037b3c9955ad76e9dd5eb1da2cbe00ca9a941 SHA512 1f04d54138f37b32c112db2cbbc8f79dc16b13bf5dffcc3dd872d43d48ef9ed5454d660e4fab08ccd71344153de391d91558edd0f71a2b626da47779f0f0bb53
-DIST qtconsole-5.0.0.tar.gz 424609 BLAKE2B 0aacc5e274a8a77da6e6891d823fe2a7710a7022f4633ef7a2edd843da5ea314884713356e92016a0dbb58b38ec90bda72fa63f11699c719e1bfa1e64ca61978 SHA512 4fa6a45c7171af57f893eff8bf2cbf5466c7235c2134c8be071e47253f3ad84b951e4c52a1e996fb1fb0233a57400972c524569baf31874f6f84896a6c443823
 DIST qtconsole-5.0.1.tar.gz 424682 BLAKE2B 46f2cdea799786d7b2e9385a5b73ac397925eef9c2403f4d9ebd4ce89241cc1ca6ec494450759db4e017c16abc525505dacaa7452018379da5343c2b1cf24f86 SHA512 4fa7629c68ab7554c20bd8ef885bf4073d64d4c211a0d9035faaa7e4122bd5d182fb97773c8a41f215f9e299309ace591081a0673370b55c796b241211bb4ccc
 EBUILD qtconsole-4.7.6.ebuild 1251 BLAKE2B 5abc609de0126c2838c063fa637c814c980209738cc03569eab99bc799e9e904e2fe19161751811031d7653261e2df9487483b7efc867055fb834bb13a991278 SHA512 95a8268f168336bdc7a613b3dab0019a658f5fed6a1285554eac8ffcf78129d4222278b54a631826a510699872f4e91ff98fd19eb3e8d17489e022d46ba6452c
-EBUILD qtconsole-4.7.7.ebuild 1251 BLAKE2B e9d90a46e866e1d7eca2102d084ea5c2e053bc84f14d087d66e4f6d1e90783cc63503f1a5577282f97e32c35ae4c39737484cfd4c75fb661b379d13c9c5847ec SHA512 92f8f6a41ad3baf41cbfb31446378c72f2108cc238c58393843ceb416808e20c2061446c22d290a18136f6611261675fc07bab77cd39fa2b399af38b3caccd02
-EBUILD qtconsole-5.0.0.ebuild 1273 BLAKE2B 0ee338d565e209d4e8175428e5e4d4f9ce154a0ed6b53d08a26cedfedd45f9af9e1426976d28970ecb394187ad9b655f6b6325f8e1c7539cddba4bff11c6988b SHA512 3c5bda5424808e955f70e25757ab695e4aa7f6393a7df2630e686ba798bc979aac049ea1d83aa01d0269d9e5803dd33547fcd5118db77bd98783d2e0b213bcc5
-EBUILD qtconsole-5.0.1.ebuild 1273 BLAKE2B 0ee338d565e209d4e8175428e5e4d4f9ce154a0ed6b53d08a26cedfedd45f9af9e1426976d28970ecb394187ad9b655f6b6325f8e1c7539cddba4bff11c6988b SHA512 3c5bda5424808e955f70e25757ab695e4aa7f6393a7df2630e686ba798bc979aac049ea1d83aa01d0269d9e5803dd33547fcd5118db77bd98783d2e0b213bcc5
+EBUILD qtconsole-5.0.1.ebuild 1270 BLAKE2B f5013655e9f312ed38b416a8080e68f3f831fe10f510487dd1d1659be74ae136019adc546647505a2128fe954ee9bbc334ce4e684bde5fe9ac0f271b21015e93 SHA512 bff26c72b85e756d23c4466cf463ead6383b4805c5d567c511efac7d31b190c5682d83df5a26fbc1fed71d7192fb38267914ab50236a9d1511fb412e2d8e5ed2
 MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/qtconsole-4.7.7.ebuild b/dev-python/qtconsole/qtconsole-4.7.7.ebuild
deleted file mode 100644
index cee68e3cccd4..000000000000
--- a/dev-python/qtconsole/qtconsole-4.7.7.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-BDEPEND="
-	test? (
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by removed tests:
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	rm qtconsole/tests/test_00_console_widget.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/qtconsole/qtconsole-5.0.0.ebuild b/dev-python/qtconsole/qtconsole-5.0.0.ebuild
deleted file mode 100644
index 83816f809467..000000000000
--- a/dev-python/qtconsole/qtconsole-5.0.0.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_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Qt-based console for Jupyter with support for rich media output"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-RDEPEND="
-	dev-python/ipykernel[${PYTHON_USEDEP}]
-	dev-python/ipython_genutils[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-4.1.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	dev-python/QtPy[${PYTHON_USEDEP},gui,printsupport,svg]
-"
-BDEPEND="
-	test? (
-		dev-python/QtPy[${PYTHON_USEDEP},svg,testlib]
-	)
-"
-# required by the tests that are removed:
-#		dev-python/flaky[${PYTHON_USEDEP}]
-#		dev-python/pytest-qt[${PYTHON_USEDEP}]
-
-PDEPEND="dev-python/ipython[${PYTHON_USEDEP}]"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests pytest
-
-src_prepare() {
-	# TODO: these tests require virtx; however, running under virtx
-	# causes pytest to segv on exit (even though tests pass)
-	rm qtconsole/tests/test_00_console_widget.py || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/qtconsole/qtconsole-5.0.1.ebuild b/dev-python/qtconsole/qtconsole-5.0.1.ebuild
index 83816f809467..b629a8ca22d6 100644
--- a/dev-python/qtconsole/qtconsole-5.0.1.ebuild
+++ b/dev-python/qtconsole/qtconsole-5.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/ipykernel[${PYTHON_USEDEP}]
diff --git a/dev-python/re-assert/Manifest b/dev-python/re-assert/Manifest
index 095be5bcfde6..7e0bca9bc349 100644
--- a/dev-python/re-assert/Manifest
+++ b/dev-python/re-assert/Manifest
@@ -1,3 +1,3 @@
 DIST re-assert-1.1.0.gh.tar.gz 5010 BLAKE2B fc65f43b3525d02d877d51f0a1556b6b205dd1126fc205b775f5c0b6c34ee7c3e8d224fc3f46a80e8df4a366674be90221e891e19e12072c87ff82451ca8676c SHA512 fc14267cc68a12ff7350982f0bf54c77107809c9f0379ab3aa73fa1b7cf5ccabb130fcd35ab75bdf183e69c802a041deac707e1f0bab1c3815d4146b4e320c07
-EBUILD re-assert-1.1.0.ebuild 548 BLAKE2B d16b92710889271da0e75b81903a384dd0186a7bc05f61ac5dbebcf3e97d2ba7561c7c605890df9008d05fd832195c2370ca9c82921873d68e7f9ace24441ab3 SHA512 dc430c98858c0deed19e3f36b1eb282500d185e820230294ca0bf1b5bf167c985836502473ae65fe16217bccede1de0623002ef67f6c3d1160f8d6454ec55641
+EBUILD re-assert-1.1.0.ebuild 545 BLAKE2B 8e4eecc953d20978d4fb9e00200115574cd691bf3e6c7520caeb5a0aa39746cb00fc5626bf3917a2a9e42b3a5717867a3c72268844043e0774a0d10d75dda13f SHA512 ccf53b68b0e1aaacc368f6bcbd1467d6122604b20f04efb824f0beed11b527ec5c044795997b3495c0a7fd43e5ab68034afbc15daac06b4285a50bc4fd4c4d61
 MISC metadata.xml 314 BLAKE2B 0f8dfa9c8b218264084ae736d762c3a052dd103bbd4072fc528683ba99b4ad3d5b6d340a6c981054ef96ac687f51df87796380f8583fe218d61d462463dc31f1 SHA512 4996c48e1786067d96c143b2e089107a0c822613c708a9450fbe7e34907ca626cbfb19437bede9a0cb59f976b2c3b8641026521864803382af78a8c6acb68ad0
diff --git a/dev-python/re-assert/re-assert-1.1.0.ebuild b/dev-python/re-assert/re-assert-1.1.0.ebuild
index e4cc4c60682d..e2189bb59d09 100644
--- a/dev-python/re-assert/re-assert-1.1.0.ebuild
+++ b/dev-python/re-assert/re-assert-1.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/recommonmark/Manifest b/dev-python/recommonmark/Manifest
index 5a18a045864a..18532a42d123 100644
--- a/dev-python/recommonmark/Manifest
+++ b/dev-python/recommonmark/Manifest
@@ -1,3 +1,3 @@
 DIST recommonmark-0.6.0.tar.gz 24537 BLAKE2B 47f667ca0799394dc88964709efc59d1e2a68973b1c00fb41abfb514166e939b8dd0b6a0827285cfa1bb60669e08868b7a0993b6a32880fc0dd22cfefa6cf273 SHA512 44005b3fd0052cd8d4fce8a64f9d66a1ac75dc3041a28c115e922254956b2143296cbfbc0a2396b9f95691145645c4242e3be68e695b2c62ae37964014511679
-EBUILD recommonmark-0.6.0.ebuild 953 BLAKE2B 5530ec34d228ad652abc76ea3dfcf121f8ed8d53cd1abfb42fe33881bc91a71e9019e87c4d4c572f31f4db0f25a4ec207698a188219826d7af66bb4533f68a33 SHA512 8a06402b132e7c8aaee4e76984934db8a3b191555da3591f9e931336738675577af10b6bc742b32d649eb1e08801a9c6e4418522f4671831d90c99119e52b70c
+EBUILD recommonmark-0.6.0.ebuild 954 BLAKE2B b4755972a28c39af96cbacaac8dbd71ace74fba027e51497236893e3904c4f03c984a77cf59d2eba86ac636afd14a6c5b57a97493c9521b6bd8979efe8ae7ae1 SHA512 181b6fe9db70179a231cbc57d3fd4916b6034c6c269ad2ce88ee4cc6ada1587597d5b16dcb3e9cf37fb9b4c791bdae8f42824d444997709003078fea48f1817c
 MISC metadata.xml 416 BLAKE2B 5bad43d7b568ac13930ffb19460e330e651f7681ef216f4f8a095d181007633ba49912b847520bdfa3a42f41bff688d201977303114f72a3075d20b42c442fe4 SHA512 03d09c52d6e3dc5297c5e4e57ed87ebb376ceb1d244a07bcdf5def6193ec1dca22af943264e28314f05875080c3e9c0630f6f4914e73b179930776bad0b01db5
diff --git a/dev-python/recommonmark/recommonmark-0.6.0.ebuild b/dev-python/recommonmark/recommonmark-0.6.0.ebuild
index 64174d85879e..85c68e4eeec0 100644
--- a/dev-python/recommonmark/recommonmark-0.6.0.ebuild
+++ b/dev-python/recommonmark/recommonmark-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rtfd/recommonmark/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-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"
 
 RDEPEND="
 	>=dev-python/commonmark-0.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index c234d3c011e8..8a36d224c0e3 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,6 +2,8 @@ AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79cc
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.48.tar.gz 2890211 BLAKE2B bf0cde9b9e80459caee37949dc90a777a56da5d2c8e6dde09bddbdac2f2c55031d92b3c7c6346b6f563904525020c0e4f666b5e2effdd761c81412df21ec60eb SHA512 ce31cb7e9e2226cb6d59d446f90c1df94f0f84077d298f7ba862f5c75995afa20fa077b1ee1ab9a145c9276cee0d75fe61237e001ad0e5b96dfb0027adff3db7
 DIST reportlab-3.5.56.tar.gz 2899527 BLAKE2B 83f14c472a8675449e2f50f806fc5136fceb2c2f307ebd2d34ecad98ce6a67f62971869e05b7d4fe7017b5e728d21d16037ef6f04c3639b0cec8069851e46b64 SHA512 49bafe1b1f0067df1d76a8e61b35ec7062dfffa608f6086241dfa589244bef5784180de7c3d86dc62334282a40a012f7579f5c3cec3c4b0387ba2c482a04c010
+DIST reportlab-3.5.57.tar.gz 2901465 BLAKE2B ecb0459414d359b8feb048ad34cfd782a6913f2e254f6d8832dd076fe63fda82d24c4dda28da9c0cc6765c284d51a45d44459d225899574625212c33800116dc SHA512 d325e389ddd7d3c4d98e462956a3c4b7237c9219728577a1e0599a137d19a27205b223fd13c5c260e2968c435bc06b2e4745945ac056926543a47e52868e21db
 EBUILD reportlab-3.5.48.ebuild 1430 BLAKE2B 2f1ce1e0689bcf583f179c753439b7e434c6ce79148b1c1eb095970320cae46a9c78a34cbd4dfd0d0effde18f6286c06a23f6be41810c514d37a1da72f9b633e SHA512 6ceb40f8f1bee537767df4f502bf131ff3aba52d50a4665a07a369f64dc7593dcadbc67ff8798fa7853dc22abe995dfc5fb3483c669ec5e357e3880c6debe5d2
 EBUILD reportlab-3.5.56.ebuild 1435 BLAKE2B 6741aac70d54b18f42ecbb21986b432e952dab18511367b2f3bf37862099b9032c0afa4af13065ed1a76b2c8328f5d5434178b481035a7254977dfe37874a932 SHA512 576b57a9432e84b28f9c25a9b5a883eac70c5804b43332bc436e70480bb4ea2d013c3dd2f8a9c07a49063b07e2c589275f73b5e87941322b5ffd1afdae26d796
+EBUILD reportlab-3.5.57.ebuild 1435 BLAKE2B 6741aac70d54b18f42ecbb21986b432e952dab18511367b2f3bf37862099b9032c0afa4af13065ed1a76b2c8328f5d5434178b481035a7254977dfe37874a932 SHA512 576b57a9432e84b28f9c25a9b5a883eac70c5804b43332bc436e70480bb4ea2d013c3dd2f8a9c07a49063b07e2c589275f73b5e87941322b5ffd1afdae26d796
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.57.ebuild b/dev-python/reportlab/reportlab-3.5.57.ebuild
new file mode 100644
index 000000000000..687a502c68a0
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.57.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="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip
+	test? ( ${RDEPEND} )"
+
+distutils_enable_sphinx docs/source
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
index b75c03a88438..40059a3d5481 100644
--- a/dev-python/retrying/Manifest
+++ b/dev-python/retrying/Manifest
@@ -1,3 +1,3 @@
 DIST retrying-1.3.3.tar.gz 11648 BLAKE2B 2c518ca887dddc35bad421ad75c76cb88f08a0965272816af8667b1b151eca2dda1b0b198607f26dcda2df547ba2cb317ac927ebfc5891cd8c6203ded619f1e1 SHA512 e053e62cb71b31573b89b8fffa706c3410794b5cced829582c373a09af78158f7a16948e6ce52078589cf7d8f5bba726c889180588a2628be343f242bc40c035
-EBUILD retrying-1.3.3.ebuild 552 BLAKE2B a52a7fce05520eddd153d83bed0dc7c5ad08cfb10168f63f3b4da9b5750895b0e015893915b68e32e4ad75318729ff80dcfd52651c3257f6340e2db3cbecd673 SHA512 949ed46222f22aa341e6c065b246a03a1ca4f0f3588d2e4b6383a47021493a2ae75e1efe4316802970099dab305c685ed2ef42059b7e945af1a920a3162811dd
+EBUILD retrying-1.3.3.ebuild 553 BLAKE2B 492108bd57cfcea3cd70b689807b040ef02c6cc586d0644f78bd7cff7927941022171093b076b09e0313015e4fb7417ca40e2a26f1d2005342338960acf1bcc9 SHA512 ad0ffab52eaa28071db22ce4a158e3e16a6d32eb630a8da1b814fd8b8baef93ef67bd670af5b6af8a4aef2ffe24388863d48ac023e2eb89ebfa3cc4e6cf1320d
 MISC metadata.xml 696 BLAKE2B 66dd73d35f5f4fff4249e00dd76c8811177cd017b2714663aab2fa418e00c83bc596f8062a5e55b48a901b5b04b5debf947f366da9fec8809cbfc23316bb241a SHA512 e397e072f8f140fa55db71a21156adec37d615f41cd07dd07d86c4d77c7413b675e6a3032f63b5dab11f1f64a4f1ac547c2b8df685500304e9db48c3c5516289
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index 6af95ca658e4..567cd3f96008 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rholder/retrying/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=">=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index 85cae4dbd839..004361d94aae 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,4 +1,4 @@
 AUX rfc3339-validator-0.1.2-remove-pytest-runner.patch 551 BLAKE2B 4ad2e2d740b38c0628d321bf77f0884a0c72448b65296daea25217725e526de27ffd5927a9ac52cde0bd9cab4ee46b6cdd0608657a4edff4d5de5b04fe0a5813 SHA512 2ebb2eaca9311944283eb09feca1796540298b16d99480931deffea6a441093f33c48437a2d4a6e44aa3293b2e984db1a00028e9b96805d284223090e5321f89
 DIST rfc3339-validator-0.1.2.tar.gz 7429 BLAKE2B 9c08ae6ebe12af043ebad82a716e359f323f318d44e1f23a41759773e1927f90d6dde95566ca3c9463db6ffc9f2c3a31925ee4668f7fbe1defc78e09949ac391 SHA512 42164f8258025b056a6c5584c1c5e76f4c4fddead1a18199cd5b115a5a576d8863676d741e5e9a12bd4b41cbf55e722632a57dc3f76688ff0ad886615286c567
-EBUILD rfc3339-validator-0.1.2.ebuild 737 BLAKE2B bf2320a1bd1dbff60b0c10c370f87132090b76cf847b665db94e511221e34bc28d6e5ad03dcfb3b3ccd3bd7525f7d66007bf3d8ea46da94aa41de60e500bc403 SHA512 f31bb5e18401bf270dc47f151dc00837e97d03e3c0c1294d408c49c27ecab2b8830341e8d9d16e584d919ade817947a463e8cdd39f927855dc54b8aa733071d3
+EBUILD rfc3339-validator-0.1.2.ebuild 738 BLAKE2B b4877417bd950837af03cb24239648ef2bc3bafd13d18136f44157121cab71a7bc7a6355acc3fc37be915e325ea1d33df9d6749a9327fb8b1f2d3dea683f0378 SHA512 2b143989f4f513abc02091d5155832c9d23f1d49bc3a55008f04b42ff0a093fa0bfe95097f79f93df62a428e51dec8aed94c04debd3b34860993dd310031c652
 MISC metadata.xml 374 BLAKE2B 4b440428addb3f4f1ee8556ca6fcf8ba55eb64571381eef4bac2b7744d13d8538942d0fefeb1513d558124e9e6806de73f81e39a84afa30d3de3634319b2b518 SHA512 579adade6871bd44f7cf9759c2c46ebaffdad553c78eca373bcce4b143fab229f7ccebe11c25884e6721736a506f03bdf2e67057f58cf8b18dc8af6d4de008c5
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
index 274d6435e51f..35605579b37d 100644
--- a/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/naimetti/rfc3339-validator/archive/v0.1.2.tar.gz ->
 
 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"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]
 	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
diff --git a/dev-python/rfc3986-validator/Manifest b/dev-python/rfc3986-validator/Manifest
index 80b58229dae7..bbd537408d7e 100644
--- a/dev-python/rfc3986-validator/Manifest
+++ b/dev-python/rfc3986-validator/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986_validator-0.1.1.tar.gz 6760 BLAKE2B e54b54c296310043f67a1187a110c6a34423f79a73dc64898d6d11d03eaca213b38da4722640595994bdd459bc1bc12c326d2e1f731e1846cdd723e232408e8b SHA512 b679e3c1b38d9ecc633d7d9a7179711d5adc50d38a51f28972f668e098058b92ec9f69e947fab7eaa3863377f35c3f13e5fd1ae35da2175a01170f2940360c2f
-EBUILD rfc3986-validator-0.1.1.ebuild 919 BLAKE2B 8ae391ed333d3e1e9d1ac5a012284938e80123ba4463e0b92e5074a6a3203958fc26c2b2d50e7c857f6a8fe593c84404e3f628757128936c5351d3cc903d4d99 SHA512 377f26d0c587479ad9c25185a0a7a8c6f1fb9e94a0361bc37ed405099fd2f6adc007718090f156cb873155bc370474cae183159af760744eab258a4e5e539015
+EBUILD rfc3986-validator-0.1.1.ebuild 920 BLAKE2B 590bf8348cbd91feae0e7ba63bc6b9995adb226a1d0d42887f4e0a3fb6c807fa60d2ee94ea6f8329ef4a92af06661d83d4b0da514c32ff821efd0cbea956dd8c SHA512 f7b77ec7427d5f8063fdddd0c8d99aa1ef078bf355db0d2ae7591e5a9a4dc56b8e6f818ae537a01120cca61c80d9b32a75a06b3016f3149c0000387fc2837d37
 MISC metadata.xml 374 BLAKE2B 154fe16f9c96a002adf4615eb298678ce77c21773cfca30ea239fc344e68ec2f98f104f79f078949b89606a3c2e1987f626bf3408d87d7ce4262980297945ccc SHA512 f5748ec0ac65035732c227f2eff35bd7e12abc04cfc6456ea9aab1d2f5dc51bfd6041a47f460df454c513735ebffa7571f1fa83cf7c5ab7db2f03f32a4524e87
diff --git a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
index 7e9370a47288..ac645ca0b276 100644
--- a/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
+++ b/dev-python/rfc3986-validator/rfc3986-validator-0.1.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="dev-python/rfc3987[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
diff --git a/dev-python/rfc3987/Manifest b/dev-python/rfc3987/Manifest
index 43004722b3f7..81773b5876bf 100644
--- a/dev-python/rfc3987/Manifest
+++ b/dev-python/rfc3987/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3987-1.3.8.tar.gz 20700 BLAKE2B 0662a5f376680a18eb58c76b5d1d4df653f62df7175f8c3f828cf8a410f900ba8feb81faf4ce40fabeecb74047e6b1542e170fba946d3189b18c553f16eda1e4 SHA512 0e81b8dbc8c410f08b1efa7ee1c90174ed6e70bf7622d3748f598d383583b439908e1b5da1e1a1eb22af4f214ae08680a29f00b253f37808034bae8a1808c32c
-EBUILD rfc3987-1.3.8-r1.ebuild 657 BLAKE2B 702f1be94f1a22fe549c323a5b0b3362e9aa61e53dd1ea617ec49219b70f9cd224d11cce9c068aa03a88c8634f1ac5218a3d780263f5249a1cebe97b810a6a7f SHA512 c98a1c3bdc00c3f3c5d6125e1dc3154c29e3a7e73d93d15c461999e369c6aa993b8b7039f238325381b73566b7c2551acf60adf0dcd553b0044e40226018613b
+EBUILD rfc3987-1.3.8-r1.ebuild 658 BLAKE2B 20ea36c10e33212b43cd3e4508702c49886ac27c6f290fa2c7fdf384ab6be91e6a26f6d4c19f0874d039c2911e49e81dbe1156974feff255b8e84d5be138aa13 SHA512 b49ea17f6d4b6bd8e142dbdd87288d98ab525f6178d21240fb7b097605abb997ab6ccb282f92102a4490c77cbc739904ce4bbb2cb44abefa6ffef13dfb8be0ce
 MISC metadata.xml 596 BLAKE2B b92d5182b2d55042b83fe9f1b02ec4b9964c760e8ef0a8a410a26846f2f82cbe84d0149ac155c55b0d58894aa9bda2505ab349369447eb278c66cd7a88be1c11 SHA512 10d16ba72a9ad425a9db2b2e19a589f446d093c527512896bcde00f56d4d39c8f6b94482a5a5a05b694df745b3e99b139bdd059e7ee033618aebae2ebae44b93
diff --git a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
index 13c0c19af804..20544ad761d0 100644
--- a/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
+++ b/dev-python/rfc3987/rfc3987-1.3.8-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/regex[${PYTHON_USEDEP}]"
diff --git a/dev-python/routes/Manifest b/dev-python/routes/Manifest
index e38f36082c74..897d8b6800fc 100644
--- a/dev-python/routes/Manifest
+++ b/dev-python/routes/Manifest
@@ -1,3 +1,3 @@
 DIST Routes-2.5.1.tar.gz 190905 BLAKE2B e1498d0a26c7ebb1ee423ad211221f648d5bab4d37effac8c34a5f5189558a62c3ab34780f98f6a1620a261efc6085afd54f0827ac0e7a80217de7ae2226580a SHA512 06ec9a8426ced86524096703de47e3da2fa08bd0ed8c962d451b4338966804245b5074077021fb58a5afcb63acd6dcffa05a89703b8b54841a69a4cdff12b755
-EBUILD routes-2.5.1.ebuild 1473 BLAKE2B 1f04e90a1a2da982e519c04d4bcdf12f597c1ed9e263f28edcd9c2039023cbfcb7596b1931f588eb91523fbb3ef035658004dc349ec568bdb2d340c5925bf0b6 SHA512 a0ed88d4f36c3ed1599e5172177a536965e44f73cfaa4ce82725f5d8c7f256cdbf8dd92766b9fb3bdd3a3ea7c946c4b7104058e0ef90d2661f759e76ac027675
+EBUILD routes-2.5.1.ebuild 1475 BLAKE2B 16db2915b241b414e5ecfae5b878a9e92c043b29087eb34f7a0eb67f38dcb66f6285ffcacc07c22a1edbedc5bbc415cf0357f0cb1ae350ca8396a44c7bcdda0d SHA512 f6e85c0daf2e793c33ded438dd14d47991d20abbe7659d71c5339fc710957a722c47f33ae90593c706fbf53833735b6332b5de2870f8c4217629d1eaf10694b5
 MISC metadata.xml 333 BLAKE2B 894039eb9f3eb4315a4dffd10e6e3cbebc93fd00aefcc75fb416b3f6f7c903523b2948bac6dd7670c98c6993ad3ffabe6687180199c4dc7c7613c89b3c2990c0 SHA512 55e3e96b801df914092aa8dce25bfe06894fede931263ade1643a8ea762cb720c4d9da14980dd03ad1eefc838c78757a3b768942b0baa664fb7fc6efe30fb8a4
diff --git a/dev-python/routes/routes-2.5.1.ebuild b/dev-python/routes/routes-2.5.1.ebuild
index 39460443ca9a..bb4c3b2a904b 100644
--- a/dev-python/routes/routes-2.5.1.ebuild
+++ b/dev-python/routes/routes-2.5.1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
@@ -31,7 +32,7 @@ BDEPEND="
 	)"
 
 distutils_enable_tests nose
-distutils_enable_sphinx doc
+distutils_enable_sphinx docs
 
 # The testsuite appears to be held back by the author
 
diff --git a/dev-python/rpyc/Manifest b/dev-python/rpyc/Manifest
index d567b80a1a1b..26c393612d2d 100644
--- a/dev-python/rpyc/Manifest
+++ b/dev-python/rpyc/Manifest
@@ -1,5 +1,7 @@
 DIST rpyc-4.1.4.tar.gz 1251969 BLAKE2B 8d77d6c80fb69d96847878830c8fd0b8333223b8a2f13389de250bea6c8d9fc79477ee9ddd738776c1f1fdb4ed6d9d349a2d5cbdf3dd4486fe9b11113df0fedd SHA512 50b146fa07c213ad51cc3ba5e29264e5c16a6061fb109b94b9183582399495697c73c38e6e4958989a90080a88155bb140bf8e1ca43e0c6fb1f72eda2795d71f
 DIST rpyc-4.1.5.tar.gz 1252268 BLAKE2B 3669b10e7b9dc28feec33cb8472e74087fb31801564fcd9d9230f88a44dca8c7100a6134ad5c0e4974b8252e6c2f8d33877550facfe5f6c21d8a388e38c9e9f7 SHA512 27f67c7e7bf6f1e94815b3124f300da5f1317e7b454280953d85eca8c7146afc33937ac66a1bb8ac2344b73532ae232b190a647ef90aa723b8b5173b96877454
+DIST rpyc-5.0.0.tar.gz 1257159 BLAKE2B cc1b9465745b22ba8d21a11c1f1b874e62acda6ee706591d4cf4389e5be36c3b39b24e6790356f8f5c5ad03c9739a3f835abd5e50768403e35731afa78bc608c SHA512 dadacd7bfa5c564843fbad377b7f346f582640e91b8d3ce1625e537625d448f902104b376203d026fcd08b1a89ddc8cfe2259fa035a16f0184d227543fbc465f
 EBUILD rpyc-4.1.4.ebuild 525 BLAKE2B 3f7c2ad7f390bccc52cc9311523565e56989b00be475f2577c3c499b1f8c7b67caf8dbc1bf8318b25a6c4e3bb7b23fb6fee8a81d3ab3c088994ad114f69a977a SHA512 9bc70196fd12ac1483397fb901ab04c5e9a1b4607ab8f5393314759ddd1196e3ea967e4410e869c9888b81c25607acf604893da0e207aef0c8e36c9888149895
 EBUILD rpyc-4.1.5.ebuild 526 BLAKE2B c901e812d13e6f6682b867aff0f847de111e9deea828a5c0faa84cef92ad9ff47651131e2fa72dd8e17e3db238fb5588e627d4bedf3d5eb943886ef15638b736 SHA512 8abb54bc947ffced70c416cc5dabc7d5a60fc092d7a5550a89ce9a8a4987f02bc338a3a6dab0b0dd14a0df0596bd6bbbe3c6dd0676be217f347392a8d9c088e5
+EBUILD rpyc-5.0.0.ebuild 599 BLAKE2B dc4875ad59c7bcfc8b63a6028aa4e2b5e1a8ecad7873e9b83c719019f05dc96b134c06fd7e0609456f6ec9128a6ce041b564ab2437f91ff077aabfffd4828177 SHA512 4f4b8bb2ba5e3708fa55b8422a3d60fb38f8602b90646cfb3561a45e31188c33ff6ef9fd1489656d68a4d658e6152b4e8775e7fbcbe536520c6d87d535fe5f49
 MISC metadata.xml 519 BLAKE2B bff6efbebeaa170cc6f51bb81a8401dab34bd7e9ff6c0f4419099904601bfa1170ca7c191ad0da665176662ce8fe4ebdef911b8abe04280d74924865d4e64264 SHA512 797220200ee9ec3d52d30f89e719394f548b8b030390aa8834cb7b1022ad1b1e7b0b8b2dd3a4b9aa4e0b95494330c21276597287132ba3254a333a0ae51f2670
diff --git a/dev-python/rpyc/rpyc-5.0.0.ebuild b/dev-python/rpyc/rpyc-5.0.0.ebuild
new file mode 100644
index 000000000000..bb29a47687ce
--- /dev/null
+++ b/dev-python/rpyc/rpyc-5.0.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Remote Python Call (RPyC), a transparent and symmetric RPC library"
+HOMEPAGE="https://rpyc.readthedocs.io/en/latest/
+	https://pypi.org/project/rpyc/
+	https://github.com/tomerfiliba-org/rpyc"
+SRC_URI="https://github.com/tomerfiliba/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/plumbum[${PYTHON_USEDEP}]"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 724abe4ab52d..4793210c4b39 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,5 +1,3 @@
-DIST rq-1.6.1.tar.gz 572668 BLAKE2B 4a1990492ed0c5e999fa918cdf49c03cf664e809b74f75c0aa941a72d9f3f45481e66c0d04780b88efa8e8ac2a8a94b11a0ad620d4c5f99e8abb3582db28e3d3 SHA512 8fc5f0cb87fb43fd6a0981dfb24a21d858e2d9fb2003c955d6d83b33a10b3cbaa713c11e422a91b4e020073d931fd3942530f3368fc8688dcff1a71fbe83fb15
 DIST rq-1.7.0.tar.gz 579373 BLAKE2B 835868a294478af07b9fa97fef14b0f2013abe125263efa15c4988eeaf564ee61ab2e8d68842c730a0f8b02a19a4d66f328828fb939a05b9d3b36996688192e0 SHA512 4027a8e1474cc350cf539ecf5734c2f851ef4e61bf0e106e44f359736f4f1ec4e690af97a119d12b1b7614b38ec4da286acff98b718ef604b5c367b3cc2af741
-EBUILD rq-1.6.1.ebuild 1677 BLAKE2B 09e4379d3c505cf371e987e1a48eaf91674f9192c582ff9d29b9a1ddedfff7076d698e6893f763f4bfa80ee07963a9f75dcebd05c853c392350287e2ece3e8a6 SHA512 dc188d58eb82b6550ea9d47c58cfb7016f62e97345dce00911e902bdc826b835bb234ecf9d93b403301523c712a4be8b5692fa79eb37d7e434cbc6dfb8e7bb49
-EBUILD rq-1.7.0.ebuild 1681 BLAKE2B 8b9dd9da0c13a06976a334221a39d5ec81d18ac6f730912829a5c06ba7b06d10e2714db1105e29a1b8148f009e8515d18c8b82b0979c498b7a2d13d3ba88d562 SHA512 9e5ff8a18088cb154d773b55ad65570efeb1f860e9ed32c482f22ada6ba180ac2a08cb6b34b1fb7af6cfc6fd11a0ddeb5025518563cf7fb556879514956f3af2
+EBUILD rq-1.7.0.ebuild 1677 BLAKE2B 09e4379d3c505cf371e987e1a48eaf91674f9192c582ff9d29b9a1ddedfff7076d698e6893f763f4bfa80ee07963a9f75dcebd05c853c392350287e2ece3e8a6 SHA512 dc188d58eb82b6550ea9d47c58cfb7016f62e97345dce00911e902bdc826b835bb234ecf9d93b403301523c712a4be8b5692fa79eb37d7e434cbc6dfb8e7bb49
 MISC metadata.xml 561 BLAKE2B b0f95e81961b91a9ee8b6911f12a4ae0738dfb424b18f934a8a113dc509a31f87c69cbb22b8e049b82f847f34509b222baca3985b3873567cf7089238d6568ba SHA512 bf1c6bc1794ae0e20f6622c9bacc501bb6b0d9ddb4f1caa2de64e20b31f050a6329ecaa7baf26159f24f04a2b75798693fbb3071554d0fbbb9f8577ce8d91797
diff --git a/dev-python/rq/rq-1.6.1.ebuild b/dev-python/rq/rq-1.6.1.ebuild
deleted file mode 100644
index f318a1bee1e1..000000000000
--- a/dev-python/rq/rq-1.6.1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="simple, lightweight library for creating and processing background jobs"
-HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
-SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
-
-BDEPEND="
-	test? (
-		dev-db/redis
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/sentry-sdk[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
-
-distutils_enable_tests pytest
-
-src_test() {
-	local redis_pid="${T}"/redis.pid
-	local redis_port=6379
-	local redis_test_config="daemonize yes
-		pidfile ${redis_pid}
-		port ${redis_port}
-		bind 127.0.0.1
-	"
-
-	# Spawn Redis itself for testing purposes
-	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
-	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
-	elog "Spawning Redis"
-	elog "NOTE: Port ${redis_port} must be free"
-	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
-
-	# Run the actual tests
-	distutils-r1_src_test
-
-	# Clean up afterwards
-	kill "$(<"${redis_pid}")" || die
-}
-
-python_test() {
-	# Tests needing rqworker:
-	# TestWorkerSubprocess::test_run_access_self, test_run_empty_queue, test_run_scheduled_access_self
-	distutils_install_for_testing
-	PATH="${BUILD_DIR}/test/scripts:${PATH}" pytest -vv || die "Testsuite failed under ${EPYTHON}"
-}
diff --git a/dev-python/rq/rq-1.7.0.ebuild b/dev-python/rq/rq-1.7.0.ebuild
index 031701f5d585..f318a1bee1e1 100644
--- a/dev-python/rq/rq-1.7.0.ebuild
+++ b/dev-python/rq/rq-1.7.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index bec384ab85e5..fd87db8cd302 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel.yaml.clib-0.2.2.tar.gz 179914 BLAKE2B 90fe272c3c4f8943e944d43dcf1f61367600bd3b1fb296d7434b27183433267a510b6e41cfd50fac8e17bebcfaa51d7d1ca89d4d23da0b1107c468cafa65ac3f SHA512 5bbab2a23c65b1416480758cf0d0a75dcf8ddece0f8df603ce90f2b1c54356bb6876ac113d53e01c4869e3c9fb22b13ea29e66dc31a09144d4426c3e0f3b9399
-EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 689 BLAKE2B ba62ab7833384e6260ef20519c1537292d47e9e2f0cc1b747a12ecdb81f72759892a7582f197cc25ebbfa8e764f783779564152cb747d0f161b861297555d172 SHA512 d82b819fdd489011f2e05021e22fe38e463748a915789333781ab7f9d83467a49b947e683bbd18a68b8f4a44984d056945f7b360ac8c0f24ed9e8f730066da8e
+EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 690 BLAKE2B 89a308bf6053f054f00514aded17dc2be778b6c9d46156b3146664864b8a02c692afd6e678bd30bd2bc4c7b84d6940ff16cde6da23eeb9b9032356845facc047 SHA512 7d7798ed45d84b9920f7d73614f675ed509db41c0da1bb7994b40955443795b27cb25fc37c7a95b4b76ab80b429b506d1eced8a4f27f2c94a9a1ec639da67342
 MISC metadata.xml 1153 BLAKE2B 58de7fd7876683773ffee4304160d3a5207855b637b7116b83af5445d5d79636e39176c0d8c69f61ce3c728f273f16be0a6f39292464abc010b5e5c693c27c4d SHA512 eb4ff5e5bf91ede5c09114a76233e43913416781eb477032c4e04e4d1b0c0ab68969a6574319cc4a95f4db0fa426e831c4f9535393f9f7252b29189b1db5a47e
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
index 3c80bcab45d0..5e4eec45be71 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
 
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index adae2c4fbda7..4ce4415b1fd2 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel.yaml-0.16.12.tar.gz 147355 BLAKE2B 6e91116029dba57b81580f4ce34a066fc49ec2c6167c2bd6ec2ae940b16bc12ba53cbd4c62f9ae3975664917ce990b050e9f15b434f5ff66f9dece5426049c9d SHA512 21be4d956d01164b84233c3d3945a4e56351a8fc59c35a8e71b1276da84aa43b125e3860f9884e95a1f895bc53e0b85b6d3f0f4b03512d629a892d8664e3ecd6
-EBUILD ruamel-yaml-0.16.12-r1.ebuild 739 BLAKE2B f14e4e7fa7a884a2585e55be095db1876e9800e73e1b721145c50c06870f7a025120e51fbdf0616ec874c0ddee30ae83ceb609f98c0f016b84892463b77e3e5a SHA512 97c36075437363c50ac71f67682f02bca2d6374ee57178fa9bb86f5f247d2e1d67d7838eb009cebb70d803d9b20350b501df8a9939c9aa5d768209b64e9a27f5
+EBUILD ruamel-yaml-0.16.12-r1.ebuild 740 BLAKE2B 182510d50d372fe4c8f7cd0a283f0fcce6da7517e7fcaa2d02d32987e8436c34881ade0c8eb1eda3cd36efdc039bffa63f458519e27f04564984c0f2292f4c23 SHA512 6b924551408d886af31fb0fd2a269865857bd5db7ff632599885b28f04d67087db31ded6beed0eff75611c90fc52e71ab35f9766099e9661a33c65719d25f1e4
 MISC metadata.xml 715 BLAKE2B 8adfe458db838b8217c79ae03ba0133fd7aabd143c99f2177debff61e8960bb9b89df4e7bab27eb392127bc95a34ec7ab2a7e2ab96ec87adc28ea7453bcce6b8 SHA512 bb76d173705214d1df3e44032301d078ea0f1abb41ddbbe743d4ae3928ade3fc3622b26bc54d8c66f47ef2e2f445180aad381bccdc18a6e5fc512c9e83826a9f
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
index cab8a4882127..0be5c87c224a 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/scandir/Manifest b/dev-python/scandir/Manifest
index 3991b1449e60..cfb0802df485 100644
--- a/dev-python/scandir/Manifest
+++ b/dev-python/scandir/Manifest
@@ -1,3 +1,3 @@
 DIST scandir-1.10.0.tar.gz 33311 BLAKE2B 47576618c41a477ff7bab9daecf2e4719ed0c497a25fd68b4bacae073fc418f9fc51503812af726d1d124f07cccfb418ae09c196cf7ce283abf5d3bbc36b7e09 SHA512 42a570320018ffff2172ada67002334446c73c53813b36d63558d3854ded2fac0b266fcaf399cf9a735ceba110636b6901683fb26cde1e286ff476bc37e3d335
-EBUILD scandir-1.10.0-r2.ebuild 581 BLAKE2B 12ae1193b329ca8de10398d504196cf5c8ebf6662f332ad996e937a59e687c9575904c9fb682bdb95f07688d6f39415dc5257a59e7418f0a70ef414b1ee10c28 SHA512 d3d736f33875711d56646639c7c47d49a0e80878a69ffae574825ce54bae04dea409a0c9499a5fc07aea7a81380b6a405eda132fab027ff6fef7f5830eddb8dd
+EBUILD scandir-1.10.0-r2.ebuild 582 BLAKE2B 51faf78d5f395ed77d8414b365aa39f45c3949a8a1dd66c07bd04d080047555a9a68811525714b8b26a332d8dadc8e9fc1bdc82c6c751b0c955119b73af3d232 SHA512 91702233cd74346fb3aaf62665e53df2de8434dc6056f9f7c78e611e69ad5b52c1a1f9f7df43977f3ea5f9f851ce359e5dfcad848a582949a308c76c72db6703
 MISC metadata.xml 495 BLAKE2B 7137cdfc395a1e80576885adb3c870ba25034a657c342b3819328f276d55ebf6d7756e57644a6ff4d45ca07cdb561078dbb1deb1b993816c7088850dee45c3bb SHA512 e762fa761b5b00288870eac3af8aed0d05efba207d83138adc873da902a7e197b710caeb87a3083e5f23436f4a2c799996fe07201195de065bd430b9c35183ee
diff --git a/dev-python/scandir/scandir-1.10.0-r2.ebuild b/dev-python/scandir/scandir-1.10.0-r2.ebuild
index d7671f8bd5fe..c50cb1493526 100644
--- a/dev-python/scandir/scandir-1.10.0-r2.ebuild
+++ b/dev-python/scandir/scandir-1.10.0-r2.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 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_test() {
 	"${EPYTHON}" test/run_tests.py -v || die "tests failed under ${EPYTHON}"
diff --git a/dev-python/scipy/Manifest b/dev-python/scipy/Manifest
index 2691ddbcac1b..289774220a4f 100644
--- a/dev-python/scipy/Manifest
+++ b/dev-python/scipy/Manifest
@@ -13,9 +13,13 @@ DIST scipy-1.5.3.tar.gz 25234560 BLAKE2B 734f29b7e3f6591b265ec43e173d1303683e2fc
 DIST scipy-1.5.4-html.zip 23175279 BLAKE2B 79cf621daa4c41414cd6d52364481ff5df4a21232bc37a5c60f9e63b60e9ad9b07a1603865fd60b2041375ae12791d761fe5d3cbd1f5c0977a37e8bf497c1e3c SHA512 eb93b2ae1dcb916bfbe77ac0ccb7f7f66af3ad3965d397c84dfbc725af08060dccf3fb0988961bf2051f0236c64066dd28f01d85484babb3ee997a9d0bab8069
 DIST scipy-1.5.4-ref.pdf 33467477 BLAKE2B d7a110258d6fe0430c380b34e2053b6b0ef8da7a6b3bee35314d55beae887afb32d01479f1ad6b8bf6847c2225890c20c118e3fd692dae55292793f38b484a9d SHA512 7f98b5014553f73880fe18d942684b8282c6aefb90b329865b65d45cfa0cffac0a8808e970af291a96e4d326ec8b284dc4385ffa5469049b4f643be8642329e7
 DIST scipy-1.5.4.tar.gz 25237512 BLAKE2B 719cfecd6794b037dc636793ba38a3b39f5fd1a44ce2fd2cf2418b0ca6d1a7898b34c4cf684752fdde635107744773c796b998418d5a983450b70beb461e32df SHA512 d23f68911a8880f87767819750d4d175ba8f9c72fcb9b8080305ee65722c046d4485fde4f0c85cc53c46247dd99813afe675a38b3b0569a683ddc2c2e021b8fc
+DIST scipy-1.6.0-html.zip 23941941 BLAKE2B 3222e9b1e1aeebfd1ab0f8d179d25c25d6ab26a54c3d6c7f12d5cb24dd59af216685cb1db1d11980ca32c8e14595a1753b69438d8c7504f7c4fc1b386e1c944d SHA512 42cd5595e1f260bcd14d5ce159d9acd0eaefbcb1401270b90efe48b0e743681361dba5ee410e5932533bca03c19daaacb6042ef8edea9b2cccd5dae21a612072
+DIST scipy-1.6.0-ref.pdf 34332184 BLAKE2B 948a03372797915e47d5e8ce44a32dcacb3448a20e06c5233d3362f0f04f228e8f7505aa918dbbd9a50ad64adb7a17181acab6a726ab251b8e8acf245a1550d6 SHA512 fe4c316f91cffb10d14207882ceb7a1d3711b03ad74857d771d0ec244caad60f878902f7279f6688c947fd415762abbb5a7082c810dd85c73385e8f58fbc056c
+DIST scipy-1.6.0.tar.gz 27275413 BLAKE2B f65fca81a21a3077ead119123fc3bb2ed96aaacfee6f291473ef6780c291f3e9fee88d86501d4cb966f1d601fb7f0656956134f0437eb8fefb8030e762c363a5 SHA512 995ffaf56b713cdd4bdb98d8525b892e9ad84a511878b43213cb71a67f34d87c111da36cf1e0b044c75c0d5af64bfde4ad0f3e9c5e71cae2dbf053251f37064e
 EBUILD scipy-1.1.0.ebuild 4112 BLAKE2B 1dec8bf858c2051c3ca18bd77759b5add6ee996331e14f1a8c1831be44f5a5b95340bdefccfba44f0753bef43e07ec445e93d2955dce05e305dc5cba505b0846 SHA512 e99d842e6d558907e0e17164edba323e94ff8fe12bbcab8f9c3f840c25a36822f9d507a2fd3ae30870aefbe8e143a2b90155c8c094bb91b62f99b89edf2fa2d2
 EBUILD scipy-1.4.1.ebuild 4150 BLAKE2B 4f7ee074825feb1c58c2d297b6817137c95b2c12b97112adfe4006996e6ca6a20325cc2b7e19c99ba09cf0dd9fc42cec9c917bc3abae0a89e4152a834326c9e6 SHA512 2f7473b792726c709f1a62b2d465168ffeba66891117c1d203f1dc2f1b2de6f9dfd945580e539ffdc2e5d8254bfcd0a05d5abdc0b1216b4e94a5b31f2adeb5bb
 EBUILD scipy-1.5.2.ebuild 4392 BLAKE2B 51188b124be5d4c4c577caf30b8f4c813a4a14be9a51f5fb6238838b6acbb692c9d7b03bfddc09e9a4ec3a7e79b2a9581f7b2ab129ed2bb29d56eca88cbeed31 SHA512 371e38b7c270831675dbd7d5d42062ab0ae985d810fe239cb27e8a0b2c75a40904c6366f25db9f65793507683356b4bfacb5db08416a7803eb27d2933d09f645
 EBUILD scipy-1.5.3.ebuild 4393 BLAKE2B 2275f198af444b4650a3cfedba5920d83953bf93314f281d451fe72cdb3aaaf1cb9b854f5a654e39d2056a8975b081bc79d90cdc58144f5aa10650d706487db5 SHA512 56762eea7116319f68c5e058a40800f461c08726682845b5666db76116c1f315b7a1f5dad0118d36584c798b9b2ec0fd81d171b1d575e574603134f95c089d8f
 EBUILD scipy-1.5.4.ebuild 4393 BLAKE2B 2275f198af444b4650a3cfedba5920d83953bf93314f281d451fe72cdb3aaaf1cb9b854f5a654e39d2056a8975b081bc79d90cdc58144f5aa10650d706487db5 SHA512 56762eea7116319f68c5e058a40800f461c08726682845b5666db76116c1f315b7a1f5dad0118d36584c798b9b2ec0fd81d171b1d575e574603134f95c089d8f
+EBUILD scipy-1.6.0.ebuild 4222 BLAKE2B 61e20ca576923a3f15d5eec9d53adf6a3418e6260a645b9a9d811afb577cd269bbcdf8fee683997e8ebae0bcd9d641ea8656d572e96334794dac1b2626e5a3a9 SHA512 41c2c4831f9ba06f0856efca122d6197d26ff31ff5dc42f570756dab2a69647db6e15e91ce56f69d6063d4c31c15bf15fc0a4524788fb17460d1591be496b8da
 MISC metadata.xml 1038 BLAKE2B a17718312d2d1ead8646e838b2704c14a9f21be8c59fbc0cd8544ab45bdb28005443be05f3a9f5671581f0f28e3cf7507131e2baad5e7b128a452d1ca3fae19e SHA512 2ee6a44a4f32d34f52eb1a0bb787907c31d22c15af597c8db8820df72cafcbba72201c5157b60dede7df4ff0ba48847e8f764c5a67a0b7efacabe1b9fa9bd74a
diff --git a/dev-python/scipy/scipy-1.6.0.ebuild b/dev-python/scipy/scipy-1.6.0.ebuild
new file mode 100644
index 000000000000..8c943a4bf011
--- /dev/null
+++ b/dev-python/scipy/scipy-1.6.0.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit fortran-2 distutils-r1 flag-o-matic multiprocessing toolchain-funcs
+
+DESCRIPTION="Scientific algorithms library for Python"
+HOMEPAGE="https://www.scipy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	doc? (
+		https://docs.scipy.org/doc/${P}/${PN}-html-${PV}.zip -> ${P}-html.zip
+		https://docs.scipy.org/doc/${P}/${PN}-ref-${PV}.pdf -> ${P}-ref.pdf
+	)"
+
+LICENSE="BSD LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc sparse test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	>=dev-python/numpy-1.16.5[lapack,${PYTHON_USEDEP}]
+	sci-libs/arpack:0=
+	virtual/cblas
+	virtual/lapack
+	sparse? ( sci-libs/umfpack:0= )"
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-lang/swig
+	>=dev-python/cython-0.29.13[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]
+	virtual/pkgconfig
+	doc? ( app-arch/unzip )
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/${P}-html.zip -d html || die
+	fi
+}
+
+pc_incdir() {
+	$(tc-getPKG_CONFIG) --cflags-only-I $@ | \
+		sed -e 's/^-I//' -e 's/[ ]*-I/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libdir() {
+	$(tc-getPKG_CONFIG) --libs-only-L $@ | \
+		sed -e 's/^-L//' -e 's/[ ]*-L/:/g' -e 's/[ ]*$//' -e 's|^:||'
+}
+
+pc_libs() {
+	$(tc-getPKG_CONFIG) --libs-only-l $@ | \
+		sed -e 's/[ ]-l*\(pthread\|m\)\([ ]\|$\)//g' \
+		-e 's/^-l//' -e 's/[ ]*-l/,/g' -e 's/[ ]*$//' \
+		| tr ',' '\n' | sort -u | tr '\n' ',' | sed -e 's|,$||'
+}
+
+python_prepare_all() {
+	# scipy automatically detects libraries by default
+	export {FFTW,FFTW3,UMFPACK}=None
+	use sparse && unset UMFPACK
+	# the missing symbols are in -lpythonX.Y, but since the version can
+	# differ, we just introduce the same scaryness as on Linux/ELF
+	[[ ${CHOST} == *-darwin* ]] \
+		&& append-ldflags -bundle "-undefined dynamic_lookup" \
+		|| append-ldflags -shared
+	[[ -z ${FC}  ]] && export FC="$(tc-getFC)"
+	# hack to force F77 to be FC until bug #278772 is fixed
+	[[ -z ${F77} ]] && export F77="$(tc-getFC)"
+	export F90="${FC}"
+	export SCIPY_FCONFIG="config_fc --noopt --noarch"
+	append-fflags -fPIC
+
+	local libdir="${EPREFIX}"/usr/$(get_libdir)
+	cat >> site.cfg <<-EOF || die
+		[blas]
+		include_dirs = $(pc_incdir cblas)
+		library_dirs = $(pc_libdir cblas blas):${libdir}
+		blas_libs = $(pc_libs cblas blas)
+		[lapack]
+		library_dirs = $(pc_libdir lapack):${libdir}
+		lapack_libs = $(pc_libs lapack)
+	EOF
+	cat >> setup.cfg <<-EOF || die
+		[options]
+		zip_safe = False
+	EOF
+
+	# Drop hashes to force rebuild of cython based .c code
+	rm cythonize.dat || die
+
+	# TODO
+	sed -e 's:test_magic_square_sparse_no_presolve:_&:' \
+		-i scipy/optimize/tests/test_linprog.py || die
+	sed -e "s:== 'levy_stable':in ('levy_stable', 'crystalball', 'ncf'):" \
+		-i scipy/stats/tests/test_continuous_basic.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# bug 721860
+	test-flag-FC -fallow-argument-mismatch &&
+		append-fflags -fallow-argument-mismatch
+}
+
+python_compile() {
+	# FIXME: parallel python building fails, bug #614464
+	export MAKEOPTS=-j1
+
+	${EPYTHON} tools/cythonize.py || die
+	distutils-r1_python_compile \
+		${SCIPY_FCONFIG}
+}
+
+python_test() {
+	# fails with bdist_egg. should it be fixed in distutils-r1 eclass?
+	distutils_install_for_testing ${SCIPY_FCONFIG}
+	cd "${TEST_DIR}/lib" || die "no ${TEST_DIR} available"
+	PYTHONPATH=. "${EPYTHON}" -c "
+import scipy, sys
+r = scipy.test('fast', verbose=2)
+sys.exit(0 if r else 1)" || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && \
+		local DOCS=( "${DISTDIR}"/${P}-ref.pdf ) \
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+	distutils-r1_python_install_all
+}
+
+python_install() {
+	distutils-r1_python_install ${SCIPY_FCONFIG}
+	python_optimize
+}
+
+pkg_postinst() {
+	elog "You might want to set the variable SCIPY_PIL_IMAGE_VIEWER"
+	elog "to your prefered image viewer. Example:"
+	elog "    echo \"export SCIPY_PIL_IMAGE_VIEWER=display\" >> ~/.bashrc"
+}
diff --git a/dev-python/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index 2c981f15953f..eb0675df75e4 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,5 +1,5 @@
 DIST SecretStorage-3.2.0.tar.gz 19311 BLAKE2B 06c3d6137d814f6c2f0cd35927b84c33e09d3c934e4dabfefaa682f3b220045b223aaf06ec970ccc0d39a7388cf13579338299136d13ad2c1b57bf064c278096 SHA512 668f3847f573e1756ffa3a38c278e6d4895223553830d49969e979003d04ca04fb5eaf8dfcc616086a6020f6a73fbe71f7041d4c4ee574205f00fbde945298e9
 DIST SecretStorage-3.3.0.tar.gz 19352 BLAKE2B 8e870d4e95b585f4c5e78d9b11327f21ff909b746f035115bd75bde499f2161c0e1ab3640b3861fc54af67dd7d305f794a855430389c207bfef129f7c0439a9e SHA512 d33c11b98824d214eb67c5b11a7fe0d14af084edfebc1d83204bcfd167258fbc07be8c1de8824ec984d83d07bfd66271c44f751784429e574cb240b5add70e16
 EBUILD secretstorage-3.2.0.ebuild 1138 BLAKE2B 6089e6ecce166476afeea659d97855b350695e441b101f54096f98ee8f024e29bc45de8257fd9f13dcf027306d1f61ab12b25c0b07cb4457ce611ae84a009bf8 SHA512 cfaf8a6fd4b444db0b6ce6952ac395eac0240f90e8bef9abe824e9065109d2f48b2d275a79729416311bedc603555c9ecc3ad42401ef90f6230b94b1b6b6a608
-EBUILD secretstorage-3.3.0.ebuild 1141 BLAKE2B 7bd667b5f6251a1acd439d1c956e60c0e65c0c921ee96fc04b5290998180103e90b05600355ce09239f4d0ac16c3c57b7e7d61e99cc91538961090302c19c950 SHA512 a31a9b99b8f404cf3ddb9af529b3c5d0c95b660a7bcb30ee51d831cfb8508b7dbc0fcbddb81e5c17dbf2d0f64a8fbc9af21bd1689383adaec2867df65e87d495
+EBUILD secretstorage-3.3.0.ebuild 1136 BLAKE2B 6f47f697d6b4c24ebba5de4890e454023a01f3e273a0ec4ede2f9b65060387322c0fa60fed70a8878972b3ef9bfcd3ecdd262f553f521a276053baa20cd821f1 SHA512 f696fd9763aee630dbd0b5474c9f26723bf7b9eb27f02bf08f34a7dddf3de5cea46ab219cd2e170c3d029ef03ad48d4249f6a3758b35a338d9b2599246efbad1
 MISC metadata.xml 401 BLAKE2B dd985b75846d20aaa47a4c419e44ff481bcfe95b0eebd1c6c8c66e8d75561f6e583c188cb16e1adf6ee35f2f7aa430f5426215d0ba68f5bab5e3a501a4787efa SHA512 75758f0d9498d427aa39ce1c7ddcefdbd08de06a6b5a2bf7df94f6571ac0d2d3c7aa3dea0ed467179bdc6763704ddd5446ad004abc8618794222e51d9502ccb4
diff --git a/dev-python/secretstorage/secretstorage-3.3.0.ebuild b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
index e6cfc81f29c8..71a0ab3a09a7 100644
--- a/dev-python/secretstorage/secretstorage-3.3.0.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-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"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index 749296821d56..3f426d872ae0 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -4,5 +4,5 @@ DIST setproctitle-1.2.1.tar.gz 23628 BLAKE2B a50f078a08d2828b03b3cde261af419f88e
 DIST setproctitle-1.2.tar.gz 23454 BLAKE2B 4a69566e48a2985ae8add0341feba26f062d8345dd773570e0500795e43b349777d4bf557bd8b88d9cec37850c129009823a1f87ed6261a9709e84c8a6f56868 SHA512 7dc84ac0fc028ca71e786622aa6b649961feb816e0f03a3d52ab7b1a5d7edc0c932695687f1f5487d27104535a3db0c48d12fd69859478a604dbf60c615f4e01
 EBUILD setproctitle-1.1.10-r1.ebuild 979 BLAKE2B fe9fc378ac8bcaf931cc40d0f1bd9ac352c2439c4e2a6656363ba86b94ceb6799b5f6e23c62e3640d891381a99f29e1b1206669e8c6b619273e2645edb87026f SHA512 509a6fd30de205d52e29218831575bf6c1090f4d1fa82ad695fa10c3adc0c9b0186f196de178260aaa8be7f640b3ee28b65fb5ffd1f5fadce6a28874139a0bcf
 EBUILD setproctitle-1.2.1.ebuild 596 BLAKE2B 0d7382913c17d2dada55b71b18cc25b08a74649e41db97097707e01cf5551ecb1a957ed19d5aec3355cd78559d44b023b7a930b408901be3c304c45e4f018f78 SHA512 9b3d558301f496398cf6352580094029c4871369e53d36d07ae6519d4f651b5298c61aecf8dcee727ca8a0517093a07619be45710bf1845114ea274205fe7409
-EBUILD setproctitle-1.2.ebuild 641 BLAKE2B ce87b613f7fe566026005c06a2e511f39cb2d134e199944f4e8cca4cc25b757a2855fc5ac7e4efa72c6222f8ebeb1cfa1181abbf8e9caf25a5c8fde46f084b11 SHA512 51a8b22faeb1a1dc571752d7ed72aee0377670d52041ad5cf6baa8213050d3c174e1bf4b7f0bdd618512c64ed44bf1a00b6e057669d0bd243a9bc517a53b1621
+EBUILD setproctitle-1.2.ebuild 634 BLAKE2B 080296c253eda0f9abca0c5eb4178b7b17f5cd3286b08c5019b9028e5855eb5ea6e0edafeca73a79ce4f7851b1f0186a298380179a761b40745164b2f506ba1a SHA512 a6c0a65fbe85ab1839fa13f23b26ae76a0d4b380d9488dde9e62ef59655f6281c66eaa45a164a9ea0f69c8fdfb1f75fec4bd74d4f86ebb733592698573b799bb
 MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/setproctitle-1.2.ebuild b/dev-python/setproctitle/setproctitle-1.2.ebuild
index ca7098274771..15f5e9380450 100644
--- a/dev-python/setproctitle/setproctitle-1.2.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.2.ebuild
@@ -12,7 +12,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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 587d7f84a1cc..5f0f826ae530 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,9 +1,9 @@
-DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-50.3.0.zip 2169216 BLAKE2B 029ea0159de270af0078a4661c696b93681b33dcc475640c7626f5a40bf1bb4759e5915948696c03b76dca10bdc4e790e2e9ef9628f41abca9a6aa48adcb72f6 SHA512 f67a2b7d639e03bf8b3815133e128902a559baf689afdd5893844ddc7c83505d727a6bb30ced1f78c4d2719dd405d2f4c527576bfa14dd9cb50c8ec4a479683e
 DIST setuptools-51.0.0.zip 2059134 BLAKE2B 449e87e413490181136ffa80a109e68b086fd0b1b56b2391e8cc612fb4c9cd4bb89acf05b464a5fa86c3984d3f22bc103dc9a21a2948598b7a17f770c4037008 SHA512 ec8c8a43ef176b5a4029f42c900690c1b9cb304efeb2cf8d36f3f2cb4343af4c1b1770f83ffb0e80ef237f58e6eeb233a97d6b3b8c6c6a2557bc4f14ccff9e90
 DIST setuptools-51.1.0.tar.gz 2050951 BLAKE2B 58890bf458ffab84f93e68393a092c2b2eeaf28e9e443c9a3cf50fb4bbb371bfe28032d08c5ce92fc0b28ad3f9b718f02542f948560b2a8a57af1ada9e77a949 SHA512 914f0d7692f519b658a55e1c7d96b93a45f34c1682c564c6232cd3771db15c91cfee7118ed61f1ae4655a1afe34c9a9c37f293eb6408eeeeeae9eaa6f3760324
-EBUILD setuptools-46.4.0-r3.ebuild 2568 BLAKE2B 177c7c477880b56f4129ad7688448faf9344ec6e03fee0258bd256662f7861a82347089cf58cef8c08b9f4e513284d2ac42927456bc780d877ed5cfe61380bc4 SHA512 6f7cf119b89d73d1aff16a386f6d17b1af293fe2c079c4a8d57a42541e3b5b7cd0c11b5f1af1cdbeaa011ce8c249b1cde20632410de0b25bf86913d730b8e305
+DIST setuptools-51.1.1.tar.gz 2051053 BLAKE2B 182c8c4b4d3bb8caea8cb1812aaff929d7687942d3c469a7f6e0a68a0c5d3d001be2b42d0d131171815359f2c1d59a7b997c5deab657d2ec99c369c6b27ba03f SHA512 ef08f0ecd0b4a255a8e43c2785c2a1ce76f807322c3358b7955d2ea814f9fa3f52962f7cd0431439ef9ee910fd44922d1be1888c350703031cfcab8db0f60ce7
 EBUILD setuptools-50.3.0.ebuild 2292 BLAKE2B 8a1430f669e576149863d579de27a2c5ba7bdcb16e85d3d8853f6ec25834a28993666a53d9e77f5a1a46311d5cdcff382718968c3026cd62c708a472a3ced290 SHA512 f8e4145e7a84a7d067c2c971567a7178d07549a5f68d9ff9e3eaf6567fb5e658d0cf6a66dd3bcfb4a54dfcaf31e1ca39865c5b1ec2509ea8ab1d9438919ce786
 EBUILD setuptools-51.0.0.ebuild 2133 BLAKE2B b95b2f4e35e0e7beb2fac672e8ab6b1fb3d3e0775cbcc9bfe4dbf0c4e9af386e129351bc0a0cc471a0780f8e0d1a5d78e9c79c623e1d8fd8905fd21dce3278e0 SHA512 24b0679bffcdb137dd92bbfae21052711567b10bf00a145c910481695df5030942cb65726b4f996c9c15040cf4361327576319ae8793fba4922a4e5756de1bec
 EBUILD setuptools-51.1.0.ebuild 2066 BLAKE2B f38e82e08dd0ef1094d1332dfef9557aef41b99ce51284e84806a4859f776b84c091bcebef81c9ed44098d634f3a934f4e796ca2f64821ba75406bb1648e542f SHA512 e75a222873c6c2f628c8ba1ff70d7d9158901881ed512e88e7fbf11622e20e1345b6adbed8e15eaeb371951b862a963c9a148972a44e1aea2fd30633668f2d40
+EBUILD setuptools-51.1.1.ebuild 2148 BLAKE2B 86bf6bd7dc9a6bc96919e927f8307f0ceef6ba24f53a285ca766a6ef50704df83ff0f7d915fc8d00022d8a799e6cdccd041b11c386eae0e5a08dcaeb5e7be061 SHA512 69050ef6d8a4f56b56c08bb10860306646cda54483478e88ea22b382183be8e453f6886d323a969c97dbc4b5ff98ffdfd038dfda5f7fb263f1160c2d43a954e2
 MISC metadata.xml 468 BLAKE2B 5f9a9240795261f894d54130ba489bb18fd24f8f95f993b55d23136fb2b518f47b64494d71ab0f697ca64f4eacc8cb58487e8889a8de22e8e3448caba5498065 SHA512 e284933f2a5d11cf7bb483776b8de2afe96ccad15a0e0bf7c9feab05c65f4247c9b19bb60c04d699ba917a637ca470e6ba41a38795899e54179602b587efe300
diff --git a/dev-python/setuptools/setuptools-46.4.0-r3.ebuild b/dev-python/setuptools/setuptools-46.4.0-r3.ebuild
deleted file mode 100644
index 9819bcdb50ec..000000000000
--- a/dev-python/setuptools/setuptools-46.4.0-r3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python2_7 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? (
-		$(python_gen_cond_dep '
-			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}]
-		' -3)
-	)
-"
-# installing plugins apparently breaks stuff at runtime, so let's pull
-# it early
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	' -3)"
-
-# 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() {
-	# silence the py2 warning that is awfully verbose and breaks some
-	# packages by adding unexpected output
-	# (also, we know!)
-	sed -i -e '/py2_warn/d' pkg_resources/__init__.py || die
-
-	# 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::' pytest.ini || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	if ! python_is_python3; then
-		einfo "Tests are skipped on py2 to untangle deps"
-		return
-	fi
-
-	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/setuptools/setuptools-51.1.1.ebuild b/dev-python/setuptools/setuptools-51.1.1.ebuild
new file mode 100644
index 000000000000..69dc6ffd79a8
--- /dev/null
+++ b/dev-python/setuptools/setuptools-51.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+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}.tar.gz"
+
+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"
+
+BDEPEND="
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pip[${PYTHON_USEDEP}]
+		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	distutils_install_for_testing --via-root
+	local deselect=(
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+		# this one's unhappy about pytest-xdist but one test is not worth
+		# losing the speed gain
+		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
+	)
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/sgmllib3k/Manifest b/dev-python/sgmllib3k/Manifest
index 61a94723b5aa..18dcfe3a3c57 100644
--- a/dev-python/sgmllib3k/Manifest
+++ b/dev-python/sgmllib3k/Manifest
@@ -1,3 +1,3 @@
 DIST sgmllib3k-1.0.0.tar.gz 5750 BLAKE2B 188ac3c55245ff431e1ad7981f706f1a8fce3e9f3aaf844252c02da1189e5b9c7d29b76d803cbbcfc157fbb1ec7f36245186693472b95ed1634a2989185308ae SHA512 f9238afb831356f66b1c3e55975e0ea88007ffe1469b8b4e325e704d1915eb0ab120f5f9e98f36eeb4bf6204a1938d8a4d5a424f0cc054b141ac94adc8ef8ca9
-EBUILD sgmllib3k-1.0.0.ebuild 436 BLAKE2B 67e54bc52333d6036a3f9e4d6954f1925e8ca9322c2a1cd94e8064ffb5c0ef7a907a8d23ae20eb56dc4ec738856668b3ecb0288ae7fc5af9b9f216078dc59856 SHA512 e6614fbe2750b4bb26c4280125d62162987270f4dfd8b58b81d83c6cca645176c8c1e1e5d967fcf21c51ceea061ee8666e842c571502f5d3e9858ea3c34cd4c3
+EBUILD sgmllib3k-1.0.0.ebuild 437 BLAKE2B 3fe3308c3eaac302d5e9f46dd117898e2bcdf3b21519844087c5b167f9fa759d42d50e880b896f65d49ffa890abf0dbee57062a4b78e0ab1853c4b9464535343 SHA512 e405829e290e4e315d864298751e128373a8d955b37f668fea0cd66371278c65f287d2f1532d1e37a661f35058ea26df0754e84bd803ba4476d4dbef1b33c142
 MISC metadata.xml 290 BLAKE2B 4445241192300419cb2486ad41b1d0f84b946880eb462962ccbccd40249a677865dec8faee2cde394112eafbb8adab1906ae1c051b4ddb2eba2949026f449b61 SHA512 d71c4f36afff7d4ca0a6d80bb68268ae72f5f600e60c9844589207f4ab3c8f1cd86e353d2b7782237460cef225648f9cc0af2f438837c0fefd88e4d2d6b40ba6
diff --git a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
index 8db55fdd5bee..984388e9334b 100644
--- a/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
+++ b/dev-python/sgmllib3k/sgmllib3k-1.0.0.ebuild
@@ -12,4 +12,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
diff --git a/dev-python/simplebayes/Manifest b/dev-python/simplebayes/Manifest
index 92353dec90c3..fd280ff70f6a 100644
--- a/dev-python/simplebayes/Manifest
+++ b/dev-python/simplebayes/Manifest
@@ -1,3 +1,5 @@
 DIST simplebayes-1.5.7.tar.gz 19260 BLAKE2B 373820a19c1a3188f0dfb57cbe6ac8e27fc6a96e9d1686d698a1f109122afd5240715678d965d843482de3c12b8b806157acef17008d4c6fac0103b343dd44d7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc
+DIST simplebayes-1.5.8.tar.gz 5972 BLAKE2B f942ccde5f449d0ef8ef56fb83a07a8ab0421f43e5af40a3be30822a5d7299b9a0cb1d46397a55bcf7fecc92e40f49404f5bf29467acf7957fbce8619625b58b SHA512 0e39110432db561208cf147bccbdb66f64176a78c0e9ce8495a423ed0d6a027b45deb111d3c872faa10e158fcdaa5380f03a5e0602fecea1a0f00e528e19cfe1
 EBUILD simplebayes-1.5.7.ebuild 700 BLAKE2B 8d37c0c7b139165f4f42e58fe204fa3bf9ce3a035a13e794a07ba5b17d7ce569bad0990f6bbf75866c1a88adb53099638593412a380269a97fe0ea0f9852fb74 SHA512 443c354ac51bd2620e3feec2bd8a6a3b981ace110e379dafbeb0591a71cabffaa3b90c2f19b4c16c84dc07f36b7b9e62ae50fc08c64f21775311e7d0e1c8f9b6
+EBUILD simplebayes-1.5.8.ebuild 673 BLAKE2B 2b21235e3a20d64a69649acccd51038eef5e6b4f7a2ff0458fc2192842ff6958ded8186b3f6e8185fca2eb24a98cc1556a6799182e8b68b7f1eaf38577234664 SHA512 cbac880e4c23745c6ade6b92a26318c64b057a0f1e287ce726d2bda178e5ae3c0bece8231afec68f2bd014ffbbf591dad72dbe09fd3ecb7828f4c006d475a94f
 MISC metadata.xml 662 BLAKE2B 2bcf3d9bee30b2cab1146844b57345a35432288de430253a9d56a631e6d8d57c101ccd8b9d4a70e5af68643823ef410fb29a9461b1c3573cbe841bccf595f530 SHA512 43dce6ba6ef084891d6ac7ce8c24dcd44d73f8879f6269ccbbd3683b276ebe93d18088944107e809798eb10bda7f8231c1a98fba292de6ca29fbc1b52b97b2a4
diff --git a/dev-python/simplebayes/simplebayes-1.5.8.ebuild b/dev-python/simplebayes/simplebayes-1.5.8.ebuild
new file mode 100644
index 000000000000..efe01695e0b0
--- /dev/null
+++ b/dev-python/simplebayes/simplebayes-1.5.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="memory-based, optional-persistence naive bayesian text classifier"
+HOMEPAGE="https://github.com/hickeroar/simplebayes"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	nosetests tests/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/simplegeneric/Manifest b/dev-python/simplegeneric/Manifest
index 008bd6644f84..089d99ec29f0 100644
--- a/dev-python/simplegeneric/Manifest
+++ b/dev-python/simplegeneric/Manifest
@@ -1,3 +1,3 @@
 DIST simplegeneric-0.8.1.zip 12663 BLAKE2B cc3d70f8f4f04209b7ce259c6caaccec001515a3da04736cb8baa5fe7e6091f4f85bdde0c5c4227a01bfe52739f51ab0116d8bfdc4bb58bd2188c3a54c5eac37 SHA512 74c25d4e04fe197058cb43fabe3702cc5901989dc0b0bcf7511369f4f3d90fd98e4225174db0680c8f39389914f82824bdbdaf4c302b53998fbabbf0dba393e4
-EBUILD simplegeneric-0.8.1-r1.ebuild 544 BLAKE2B 296e8a9dcef14b85d65a25e08e4116a5b255c3de3d890a76d590448a3ff9a6492cce61b29984dfdc145752f3899aee5e2ce6f3f274336b34516f5d46a056eb9b SHA512 11eed865c9efcb4bfb1ebb6cf2b1bcd9323b03444c270daae10ba221b63d29115ac32f8cc322f448d8077a4f3a27828c824bfaadb3c6a5895a8ff951b1bbae74
+EBUILD simplegeneric-0.8.1-r1.ebuild 545 BLAKE2B 1853f81aa29f8aee27af1bba398bede3895d5104bd85f3ed0bddbb2bd22077955c3d5777651e0bc71cb3903b451ab522bb3bc607d5f6a24edb11e90d540bb637 SHA512 a9c8b2471f6779ea89a36ee4898664d5c51cd945ffcbdf32d040ef3900f79ec273d35aab1388b3a1928510deac0869478a1811e42e90bd498b80086950a1758a
 MISC metadata.xml 732 BLAKE2B 0547a9360068981db23bed7749d4043fdb9e1d42da49043a1b986e67598a613e2af2b7261b06bdd2070ff8e1b6c37522a023520f71e18c7d1e44170e49ecf09e SHA512 3d138aa823f1fa2f8384dc4a29039c8f143c3ee77d8f2b410be55b01dafb402d6b678272e0766fae588c12a6816a6df57f84823d8196dd4e748b9ab01742e50a
diff --git a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
index d719cc5e73b0..73fdc5eea2ed 100644
--- a/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
+++ b/dev-python/simplegeneric/simplegeneric-0.8.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="ZPL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="app-arch/unzip"
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 7f29bd66aea1..a303d59366de 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,5 +1,3 @@
-DIST python-sortedcontainers-2.2.2.gh.tar.gz 9228894 BLAKE2B 358a2028a00748c89046069ed7ff075350d4a93f98521b48a72ba466719fd8b1eaa023f4c9d93beec1538315518f7fcc8b5b02478b1506c65fafa3840081b668 SHA512 413212aa35a80d24ec208caf19314dcc42dae207ec4ea8fdd7dc240c6fbf17372cb4c3e2209f6e40094419fa3eeb2fc9b23ad8bd7fb4e6fdaca46fd2fb248281
 DIST python-sortedcontainers-2.3.0.gh.tar.gz 9228968 BLAKE2B cdff8230d4e4ac42a89ed3192666ebf22cd48a4475f1dc173cffb0339c7f27e9cdfde1fb631daadf04adf2c00bed8a924e1202712d0ebcbd591f5542de863461 SHA512 0488e2f9f07ea7e4737ade69441f02614b63cfccb32a71af4e5953001bfa840d2e113a36a0a0a6d4c1e7fdd920ac3937b0baaea522d742547a4d81a99b8d1a6c
-EBUILD sortedcontainers-2.2.2-r1.ebuild 826 BLAKE2B 4dd5bcbff2ecb66f1bab0821a47226c2e76626c1a5d2a97f8f0e6e6e19ec1b49963538a037af7f0ffcf45c8be951f999194b141e966b9fc397f632802678aa23 SHA512 1dcab88cc861d1375526d43a8b919676d1c2cb2bfea5e0dacc379ca95b00885b60c63fc5a1610a3c79f635175006bd2b6289756240596f2c95e6f7beab847b38
-EBUILD sortedcontainers-2.3.0.ebuild 845 BLAKE2B 0be5717261e3bd7924a136cdd8eef5af3dc4e8beda8f8fc2f68b09442a546d91ec2fc3d87fccea57c980e439c685854ecd1aeb6f3a03a88164a9bd0de24de3c7 SHA512 d632d8365304db06f123c6123c2b2b342d5379c7d4a68679857883ca6f66ecec2fb40a2ec893d8e47961072761e86399a95b96ed5443bb2a7d6687e2c9211c77
+EBUILD sortedcontainers-2.3.0.ebuild 837 BLAKE2B 6ae5994cb82f611e14c40985e81026795b6cdd9aef99201a1bf47af59099207f9b9b44888ee8317942d14756f2d08d9fef27699eceb510822671ec5a1d09893d SHA512 83e769b9e6a2dc5edccfeb601fca8bec8e0721f19d7c5db0d1dcb03ba5e75c458cbcca3203fafc4603ab04573647d2918cb426ce5dadb19b2dd9632cc3061015
 MISC metadata.xml 417 BLAKE2B 8f56ae7ddac9a7fab6b99e9f03cf53829a7a7543be90ce3b508af2d2cc912ddc4a41f80fe9e8d395f8e0f92cf08ec4d99023cc70a3cf089e9519ee958659243b SHA512 0b286e9c409d08a4448b377f46e0d8abed4c23910a09a770cdf9c2b2797318831570b79c082fc3b9e9e15bed338b5f283e6004e63771f2e52da2be6749554c99
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.2.2-r1.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.2.2-r1.ebuild
deleted file mode 100644
index e964422fcf1e..000000000000
--- a/dev-python/sortedcontainers/sortedcontainers-2.2.2-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-
-inherit distutils-r1
-
-MY_P=python-${P}
-DESCRIPTION="Python library to sort collections and containers"
-HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
-	https://pypi.org/project/sortedcontainers/
-	https://github.com/grantjenks/python-sortedcontainers/"
-SRC_URI="
-	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH=.
-	pytest -vv --ignore docs/conf.py || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
index 278fc88c0f50..fa356db01608 100644
--- a/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
+++ b/dev-python/sortedcontainers/sortedcontainers-2.3.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index fd1f80b31574..154c6a917665 100644
--- a/dev-python/sphinx-aiohttp-theme/Manifest
+++ b/dev-python/sphinx-aiohttp-theme/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-theme-0.1.6.tar.gz 10921 BLAKE2B f1a5a0b82c1a99e0afa2fa118e9b2a13d59d742634c8826c0f67f45bd049c96851f1ac694cb6ebfcee1f66b1e03d445b4a3eef676135076af99a1d30541a0a4e SHA512 58b3b595eed97de546484dae562172c7751a3d4d90a6a1ea885e86a44b78d9017834372179d2881e048c4b2916f2b53d11ddb9368a5474462ac9ef7d75925b7f
-EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 603 BLAKE2B 6c0eefb4f6f1901ba447c5fa805a5ebc591ff384ba1c7082483342f2f5b1257b6a49c7efe27e9cf096c78902708cfaceec28e7e1b2f4834eaf5d3b9e688cb9de SHA512 88d1d0d5f6cc9a24bd33b393c8025b245f0b71e25ac68993caf80bbce7c7810c6d61ed0373e37642fe0427438ddd407f12af4b85dd5720189582add66216d933
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 604 BLAKE2B 5db577eb4e1c11b6754a3d6bf5b661a8bb9a735ad1aa866f3fbc9ba0b4f094c7fd7d342d8238ec053200aecf2ad402f9f7abc000eb4cfe21f018f92028129f42 SHA512 b6d58d8ecd7b89524325589aa1325c89f111f5757a3a9b95fd1d31a2658e1345e52fd678c7609d57cfed6170c0dd6b303a3862362c1fb255e64891046356d422
 MISC metadata.xml 356 BLAKE2B c6f21942be22de996083446c4cf4d1d188e582ffc7550975b513475021f7097835512409e58eee10f86b205770734c968234d5fc542ec1a622d3883714685824 SHA512 9130b60a4ba5ad45d7bc2ae275485917c365933b215e9551ab000cd5a34a6932a07b02b7513d0890403fbf6a7cd713dd8cfcaaccd1c4819a0a9f15207f062d9a
diff --git a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
index 1fba1a3971ad..893d967c5804 100644
--- a/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
+++ b/dev-python/sphinx-aiohttp-theme/sphinx-aiohttp-theme-0.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-bootstrap-theme/Manifest b/dev-python/sphinx-bootstrap-theme/Manifest
index f077f903d01c..b4beb9b563ce 100644
--- a/dev-python/sphinx-bootstrap-theme/Manifest
+++ b/dev-python/sphinx-bootstrap-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-bootstrap-theme-0.8.0.tar.gz 1225612 BLAKE2B db5e65db732163048909903c7af0eb301a81b12fbf9ce299070d55ea8f949e2094f3c5624182fd8ac625d553f982cba6ef1bc0c2680de55993d57e82a779956a SHA512 25a2d05c424c52d4571e9a50a55be0c7f3a32aa855c3fe6fb642b1afcebcabb0fa715aac48da280a556b6c8d206b7018b45d8f9bd092123a9c03940290bbfc63
-EBUILD sphinx-bootstrap-theme-0.8.0.ebuild 666 BLAKE2B bc0e9008329f58a6984322e6100e2cf32e7b911be403c9b1b5617861bbaf06d291d4b0153280cecc5397a1c7f702be894fb9d3a6b9b41076b5172c55824758ee SHA512 089543ec635c099d7efa8dc268761f99b49be2f3e5c0c3948be202d10810c39406a1a4bc71bee94e306bffcc7bd814a997103cb0a47a9360def67aa9d4eac264
+EBUILD sphinx-bootstrap-theme-0.8.0.ebuild 667 BLAKE2B b9124e5429a7c6470b515be2c8107644fd9d5d0b9a80c5d9cfd8f567f9b9ba2a3aeb6e1ce31aaab73938e50673db4b82f014f7200cf35a6e9fb851724c744682 SHA512 b54f4decb60942225383c32e5f879d667f1182cfb64a823570b6c97ad88d3eaf8500dcaaf80883eb2cbcc3d0d9f776b6c5f7aa5432858869fb80eb70a23f6c4e
 MISC metadata.xml 520 BLAKE2B d404cd683e9e4b4fd2e14e6047bd19aa6998763327549b9b754225af61ec806f1972b64269312fd4d7f2b825d631424b22fd2920eb2667da40303d57c2f67da9 SHA512 f817dc5b0d031d5de0eedb01ad5c76c969c2355653b4ce9fabd905a0fa4aedd89772b814c79d8d58004e4d1eaee9ab9133c55f8199b9ac0ff7c66809112f736a
diff --git a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
index 7c828b373ab9..e595598b4e95 100644
--- a/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
+++ b/dev-python/sphinx-bootstrap-theme/sphinx-bootstrap-theme-0.8.0.ebuild
@@ -16,4 +16,4 @@ SRC_URI="https://github.com/ryan-roemer/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
diff --git a/dev-python/sphinx-prompt/Manifest b/dev-python/sphinx-prompt/Manifest
index 160aa074a0a6..07e1a1c790ac 100644
--- a/dev-python/sphinx-prompt/Manifest
+++ b/dev-python/sphinx-prompt/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-prompt-1.3.0.tar.gz 7511 BLAKE2B 3e327b93fdfba48684983b0524fddc2c70f5ca997364e58cddb4e1d1078f51fc73e0102b969c49fa6cb27154624cd0220ea244eb13a0f64444a4e252bfe3f9ca SHA512 21dad50833ee1e00493c208b844caa41420fc2874c48fcb9ce20168a4872f8dc0a654eeea6ca6159d5ff6bbac3de15c2633c2f5abd826ac352c3f0ced37f6146
-EBUILD sphinx-prompt-1.3.0.ebuild 545 BLAKE2B c788068c565316b492df425173c3696da9339a0c468f9994f5179469a8aa30a1be7da4751669398393d9d7d1b9cb104954487a1b3240fdc75a4800a57e6507db SHA512 5aa0eea291c7eb09805579a1bcef1ae3b87f3939966767cc909c7a048971408185fa6b3bc5de7cc846f6d4e3df6a0d669fe1948c24edf23b16f379f03127baa6
+EBUILD sphinx-prompt-1.3.0.ebuild 546 BLAKE2B 5aa1462b89470b8d13db9efeb53d55689f035934c54ed25074d04c163bc4ea3f829a56a12502455ab13eb622a24142ea42976dc1494cb90f4024711f50eb7fda SHA512 993c70b9da6ddd023706f8719c66bcff469c9ca811bf2711db9501d9784f8d580b72c0e8255c8d8b730439a13a0e890d7423dabcb83e279b11303dfaf89de4ac
 MISC metadata.xml 415 BLAKE2B 00d16da1c9b70e7dcb3da0bd1e6056944c9c011d99dde0f1e1a5a804ee79b8c9fc5e186f7f9d684401a7c360ec4ef2d367216717c18ea0464da944c0edf54fd9 SHA512 9002d60f91e3621e24a472a8c5bd512ab0b8364a82556b2be8b50d2c332aff3b8ea6f633aacf7d7d09101f2b354621291ffc35ef28103106c08df9558a74dceb
diff --git a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
index a2d48c1c62b0..44b7221ea3ab 100644
--- a/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
+++ b/dev-python/sphinx-prompt/sphinx-prompt-1.3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sbrunner/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 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/sphinx[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/Manifest b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
index 3e3299e9680a..441434273702 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/Manifest
+++ b/dev-python/sphinx-py3doc-enhanced-theme/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-py3doc-enhanced-theme-2.3.2.tar.gz 41894 BLAKE2B 9a38169b7e2c3331267f5c0a102d01cb0185689334adc98abe91626b27217add0abacde3422fe528588322ccc96f6976b80ce0e510cecfa80837d9b595cb2457 SHA512 efeeaf1bbb7f5557f5e1500dd0a49aa001b714f329f594e95676d8833eede7eb5e0fa978257caeab9630360b05f48132ffb00137262c7a5b663cae6a009ed42d
-EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 525 BLAKE2B 54c31d8064714ce34ae603aabbf68af10f4ad824912aa2640775aa42c69edcd16faa436bb5c8e36f7cd711783a0829ff4062ffa64acd5ab36402952b274d8da2 SHA512 b1a5beccb82946c8e3e3197a8c8e72ddff8c465e14940c82342860d721d422cb202bfb4f579d45ad5bbb30fbd499f10b09142367d53869dc57be603b5eb6bbc1
+EBUILD sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild 526 BLAKE2B 8637e683ac73d081b9eafed33a78758ccfc38240f10cbb758fc05719ec08fbec0ee91f671e9a666cff5a340e69a98a1e58876ca35ce7c46ded8eae564df573e9 SHA512 f2a9da97eae6029b19557ac4b56f91ec36a46ee98563389a1145be3ddae8c8f439b9ab4f86e9c1ea8e21d17c84a9ced0b6f0bc62e9b0a2a92ed27678bd56af3f
 MISC metadata.xml 539 BLAKE2B 7cd1573b15db32f7b02595889c0884dc2cdadd63786bb5693d33511009e90b2051192fda5ae13bcd21a6418ac030654948aaf90fcdadeac1f4f71f07d193514e SHA512 dc7fb701e2bf4b343606b3354e6eb58da85fcbca459aebc6c30fd22bee0a733b025ba1b9d648f16a55e0daee2f2f23fb3509faa09ca36404a6f887d834559e6a
diff --git a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
index 0acd3f879166..2a390be239a3 100644
--- a/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
+++ b/dev-python/sphinx-py3doc-enhanced-theme/sphinx-py3doc-enhanced-theme-2.3.2-r1.ebuild
@@ -13,5 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index e1fa052c3af9..4f2d5f0bf3d9 100644
--- a/dev-python/sphinx-testing/Manifest
+++ b/dev-python/sphinx-testing/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-testing-1.0.1.tar.gz 11513 BLAKE2B 46ede243507a0d90b2ad4b918deadb818491bb0ed15ce41886040c52650f9fd348ff57c03766fd1e7719bbb54726f8915e091cf94a5396da946102ca49fd07b2 SHA512 2d377c0c6fe8e34a463b35e96938507a3ca35fa06cd19a2682eb55825e1b88982a80a02ebb9a02a47f11ca5e8fe6a5b9e5c8114d955fa3b774e0148e82121818
-EBUILD sphinx-testing-1.0.1-r1.ebuild 829 BLAKE2B fb0f6376b5c57747fa5983581264a7b207abe772070c168aa9bea5b88d23a6aa434fb34c2967826786b35bdd39063a439cea34e800711341706aa29790257aca SHA512 2d1dc63d98db2e499659ff09878b1aff64ba8ff34d4102a2b1d77b932da45180a1b1db4b988424ca26682c3046e70260f646671a46b847b0fedd0df285b11a88
+EBUILD sphinx-testing-1.0.1-r1.ebuild 830 BLAKE2B 8e2a6f73773456d0be04378f93f7cd801b991cf359a11436fd015616e65cc135ba1e597a4eeede23a20c0b872ec7dab8f380e44fd960afdd461647255febbc4b SHA512 a3a17fed4aa3882e245b98bf17a4a9080aabbb81bf2445af861afba717f9240983b01e316d4b4979df3255c26e380b518e41b436c0570cb371fc61ae53246213
 MISC metadata.xml 382 BLAKE2B bc907f0063c080ab70373e0d2e67fa2ff2f16e2c93982da1769a92bc4f67a9288e9c4f683bba89aa9cab479dd793e4ef294a726b6532fc8031f5d397e2b8c1ef SHA512 8e617b870299fbfc28e7cb6e67ea8e772e97a4886d6de808614c72b423bf557ce46005b64e37a705333edd8064f873575ae6687719a1270b1fb78f0d654e087c
diff --git a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
index 39efbc90610f..619785089fc0 100644
--- a/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
+++ b/dev-python/sphinx-testing/sphinx-testing-1.0.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 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/sphinxcontrib-issuetracker/Manifest b/dev-python/sphinxcontrib-issuetracker/Manifest
index 8f01fc7fea60..c08fb61ad20e 100644
--- a/dev-python/sphinxcontrib-issuetracker/Manifest
+++ b/dev-python/sphinxcontrib-issuetracker/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-issuetracker-0.11.tar.gz 30351 BLAKE2B 304526543f5d24cc4b2cc76ea8d242d8942fa54737e3d1f0924e816d24aa4838e054b8af468837447d601cacaae987cd285fc706292b979d29dc84f1dbb77ddd SHA512 fb4a977bea22451a3d90b16821fc2a38ed53b17913666ca250e9aab8bb1726bbdb52fb2b6dbb2ae512a0ca6cc3d33dcddeba758c02c77b099180443d67e147c9
-EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1373 BLAKE2B f5b67511efbe0b45aea22d69eacdc70f59bcd143b12e04a19505dc8f68413f28abe53b8acf122b090f4aacc0a2f615b06a1980d7e5510d62cacf890dbb36f59d SHA512 45241eacd44efe42248a667518082588e732afa2249fcb8553fc55c0007a43be2d78dcb6dd5ead49da0aee30dfef1cbe2fda29f878e7a9ed52e2a33968be19d4
+EBUILD sphinxcontrib-issuetracker-0.11-r2.ebuild 1374 BLAKE2B 2402340926bfa595a7e9eab1f6fc3ae0a6a5e190e36e25d05685e9ae197f3123a41aece6b34b9df241b4270662c290b7e10989bc1424a309c1022c8e75656072 SHA512 5688e6f1e1ed3a6d67854fc8811981d92c2af1b23517e0769812bbf80c11efa6cb4295cf3d0cf339e30f1a0e8f15949fc399529960a74e4c3e39d9d8048d58dd
 MISC metadata.xml 278 BLAKE2B 6132906fa86a0a4f3ad9cba6e6758f88e74c26ffa1d652e8ada8ec8f01f2ad2077d7e4ed5e4cf83c8eeceafc4bd93883789d64871794b091ece2caef18053dd0 SHA512 1eab867621bc382951fe841d4bdf330357164af99185f33347cddf831dbd398265d1098a87557f9c272a6a0adea3a2dcecca6800f3bd938e80a12070d76ad64a
diff --git a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
index 733de788fc63..51cd358ad2ec 100644
--- a/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
+++ b/dev-python/sphinxcontrib-issuetracker/sphinxcontrib-issuetracker-0.11-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # ImportError: cannot import name 'SphinxStandaloneReader'
 RESTRICT="test"
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index c961bd1bd04d..7bca6893d5fa 100644
--- a/dev-python/sphinxcontrib-newsfeed/Manifest
+++ b/dev-python/sphinxcontrib-newsfeed/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-newsfeed-0.1.4.tar.gz 10862 BLAKE2B 708c7a725ac36f54ea735953ba9d230b05da95147eabc91de9d610d3e02ec7d0d1ab8f5882d4e97327da425fc49e1b1a1753e011445ede859edd4f3cd5fb2a16 SHA512 96d9d0c15fca8b62f945bafc8f0eafa62df9c471f7510e2f153e47b66534e5f3041e5c01df772e6c35a9f09baa70064642f7f0fa43ccfd33dd64c2604494f2fc
-EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 859 BLAKE2B 128d1d22249042730d3c9bac56bcc61ca94eb4e253f7de1f60c5591e81baa0da696b8484d74a0a04d2d320ef4f026904331d34cccfcd00d080b7a6dc1c27bbff SHA512 8ef8c62087a6aa20ee947195c63a687f6afcb35064da40e6a1d118f9b78b2f5dd76b4ab2e084f4c5540c0bda239448ebfebffe209c53ffecd6a9fe749beef10d
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 860 BLAKE2B babaa0869b1823de052362ab19cc8aacae49ab36055784af7ed1296d2365064c37dbc161762bb57f0aa0f5a1dedc9f38b3c7d082b833a4fe1068915f758aab81 SHA512 e1e149065ab1ab4135f2e9b13f30be43e72e8de3f45342ead79004a7ced9c59e84c78bc392d8a37cd35a8b34b6be89877a70aa648a1e7e3d861530c5444ce1f2
 MISC metadata.xml 331 BLAKE2B 9d40d757fbfbfc80c527481f0c1a3c558eee5829369ac3eda6ae4ed3ed63ef9b26a750057038aea1b670b48b9430aa6c4cf788d55a11ac7f072111c8a3437e5d SHA512 ec0eeb87c3e18a9ade919171833be4727e87d32664c83863bed8c33898112a2f237261b28e5b7a2521df495df61b9825cd8140352d9270e52412b53a1c5df3d7
diff --git a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
index f590afa8dbf8..e89c3dd2ec38 100644
--- a/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
+++ b/dev-python/sphinxcontrib-newsfeed/sphinxcontrib-newsfeed-0.1.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlalchemy-migrate/Manifest b/dev-python/sqlalchemy-migrate/Manifest
index bc063a64741c..676575e3b899 100644
--- a/dev-python/sqlalchemy-migrate/Manifest
+++ b/dev-python/sqlalchemy-migrate/Manifest
@@ -1,4 +1,4 @@
 AUX sqlalchemy-migrate-0.13-disable-sphinx-exts.patch 497 BLAKE2B d66dae755df49a2347e09045b72e85559278011c814c4ad209a193fd2912effab5a281e449e72e3185380e50371eba3eab5f3199cc280c4e84487fbcd02ff74c SHA512 8a8d3f4b075cb2dfd46ce32b228180826b93436da7cb9bb2ebdae14dc74a0a82817af1543862ef11d980efe7f37e3b838f3170cde6bcf2e03c388d91f2bf018f
 DIST sqlalchemy-migrate-0.13.0.tar.gz 131424 BLAKE2B 925ee05144360c469d714342005c8b79dc0f1ef7c07ec641c00ec39e4aa18046b3afa7524f4e5afeb292cf78b2b85bac714f44102e0daf799ce09f0af40f3047 SHA512 1ca826a5d80c1373ffc4b2366dfb6d5dd24204964462873451c97d8ff4d75fc6c63f663c4769b7f6cc00002f6a98d425f41d759e5c010b4b81a8b74ffbb102b6
-EBUILD sqlalchemy-migrate-0.13.0.ebuild 1322 BLAKE2B d9e8eeaa7f36d4fe463aaf2a61ef009d41013277cb8198cd87a34c692042464dfe4711709aa4ffaa8dcca2642468d25d2e8b6b4f544313c9a4e6616984a5fce7 SHA512 bb0aaeb431bc7c53ccb97e94063fb226448b328e34e75b81d4d3be8e29bc52a58be49ca02a3af33f29b047318846afa222d394f5b4d087e84952e4e55d7840b8
+EBUILD sqlalchemy-migrate-0.13.0.ebuild 1323 BLAKE2B baea882fb1fa921f410bad08b0b92c980b88c905809e9b1faf9b94bd567bc7aafacd4f20aa8d41ceb46492335c2009ebf50185763e10bc3c2da94e16e37c8c42 SHA512 440adb9b5b3cad4f3dad37c0f1b0e69fd82cc694bac5cdb3299e59426628d0eb9d9e930ee4072a6182e1d66ed8859c89aa0f4c67798025765b2ac9a5a2b98cf1
 MISC metadata.xml 331 BLAKE2B 0f9105a458c3ae2b81bc9d2a6697d5b3ca8f249a8111564d34c49850d9017f21f2b85e1d0f1f7e458546f1b28a1d90e5e5c33286e78b77695598ac85b7c9d53f SHA512 6c683c14c1fe2acf94b25f6d17cd02d3d74db9259df9d241b3a2efe9abab2076f04a70e00327a06a3d8411244323a3061cfd1bd82d59eaec8b56682e79e41fc0
diff --git a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
index 3c6373df382b..bad50d99e3e8 100644
--- a/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
+++ b/dev-python/sqlalchemy-migrate/sqlalchemy-migrate-0.13.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/sqlparse/Manifest b/dev-python/sqlparse/Manifest
index 4f9a22d162bb..18803b417c5b 100644
--- a/dev-python/sqlparse/Manifest
+++ b/dev-python/sqlparse/Manifest
@@ -1,5 +1,5 @@
 DIST sqlparse-0.3.1.tar.gz 67572 BLAKE2B 27c9267de1a269a4574019d457a3dad53ad805e56a57ba73e294c229a7852b7ca04557fb45d07566e94eba7593257ad7eb413b1e0ec04d1044838d5039dc8ba8 SHA512 4c56a528b43578a7a48fc31cee369215b15761d9903ea1d8e034c69f0eb6431dd15362aab13af25a36fccb361436f1cba746bcbb515cbab5d30319629dd2ddfb
 DIST sqlparse-0.4.1.tar.gz 67228 BLAKE2B 677b592af263e94e1f6d36242f4bf75d28d0466636c0c578b83f472acf05c357b6899150ce01b594db89f2844c1b85220429857583c79e6dbba34a75bdf54e47 SHA512 49f02a63ef490c2e900cea6a0882891cd1381e0f398c4e38688444300b0f0e961c91c4f1a2355704bba7f170083594bd9e26c2a6cac934da9d87ab291accd27c
-EBUILD sqlparse-0.3.1.ebuild 697 BLAKE2B 7691daee92bc6bd2a334bc65aa8c2725c2dc2c83abcd39b753c64cfa00d10b73b625e559dfcb9bbbee3d09c01483014981833e794f9c3e1d4f51c65639d32129 SHA512 722d1608d0f5c8c291e76d2478fdf9fba4a49a99ff9ab3580d48657e91da9c45d3a35c342a5c6b291a27d78a70653ccf31394f1d37a47eca0dcbd9b2f30fb520
-EBUILD sqlparse-0.4.1.ebuild 634 BLAKE2B b2f25a357b8ed221264fdb78bda114fa35de38af8be076fdc5ce9ee831f8713347f8a27581fc1c512322a23e6fae0586ba70949e048835069d691801859fbdfc SHA512 526327a01db04e44c27e0c37c558b8705db59c43416978ce69367a6cee6eac3ebeb1fd090710dcb1fa311e5002a8ea6942c0cccaf517e50a0bbe40aa3694eb3b
+EBUILD sqlparse-0.3.1.ebuild 698 BLAKE2B 0c534cfe92e80362824967c6d8742639d50fb88901635eef2409a8dcff92b23b1d5e898c50585727ebba9d0b1119fcaa7964ab9ad1bf384b70f93749c48afbfe SHA512 b9f40f92cfc9c13cd3b31d6c1cbbe349ad8f0f6c7312fdbce905de515e3339baff656cce795d42f9d2d75634a0976a941ae476b85ac364982d9bba263bdb2729
+EBUILD sqlparse-0.4.1.ebuild 635 BLAKE2B fc5e4078566cc79b696bb29883d1a88463592640e6177086ac0ce911cb04d6af953bd7ae56e89581f95f3b10a653dfb7e029bbd60045f54d1c7c0dd458c0489c SHA512 0d5243d75f4da18c5859cf1c6db6f34fae4bb504510788814b04fc2e9e4ae5ea9486ce6963ec8fc0f0f697740b2a899c30ba9e6c1586cbbf67f576e4747c9357
 MISC metadata.xml 409 BLAKE2B 921a0fd5ada063fa95826470a68de1f0407366089fe2b6d61d654c7e21c108dd5bb4a72020717d92c97534aaa3379846ed12ca769a89ad9e1a015caf158584c8 SHA512 34bf82a21222f379e0a6b20a537ed32a9ce8cfbd3904e675b778c424e3f1a038ce2337a91e18e0a0d59b0fdc4dcd771cd5eaee992cf44e2f8826e2d0d83c663f
diff --git a/dev-python/sqlparse/sqlparse-0.3.1.ebuild b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
index aa01d5650d65..ae26bce419d1 100644
--- a/dev-python/sqlparse/sqlparse-0.3.1.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.3.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${P#python-}
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 
 BDEPEND="
diff --git a/dev-python/sqlparse/sqlparse-0.4.1.ebuild b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
index 4f752d055c58..ca229d3806a2 100644
--- a/dev-python/sqlparse/sqlparse-0.4.1.ebuild
+++ b/dev-python/sqlparse/sqlparse-0.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 S="${WORKDIR}"/${P#python-}
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 LICENSE="BSD-2"
 
 distutils_enable_sphinx docs/source
diff --git a/dev-python/ssl-fetch/Manifest b/dev-python/ssl-fetch/Manifest
index 9113b3172c2c..e7cbc68ec03a 100644
--- a/dev-python/ssl-fetch/Manifest
+++ b/dev-python/ssl-fetch/Manifest
@@ -1,4 +1,4 @@
 DIST ssl-fetch-0.4.tar.gz 11663 BLAKE2B c75173f40367d1e84a0ed3e13dbc7e6b8270302bf64168487061195cd1d24a593630ca650bfac4ed867d4146e8bad438cac8bfecca86180d2ca23d9ccafa9e5d SHA512 6b31a5dc5d3a566eded6ca284a3edac8c308596dd5a1971d13223e55abdd2ddc4d3e1eca5f369c1c05540bafcb6c273e5ef1eae627a7a9170bc262a0cda06696
-EBUILD ssl-fetch-0.4.ebuild 1033 BLAKE2B 4aa6b08b571b6d0b40b041680aee60210d6f6dc293356b374b8ca7b00b12dad35c2d66f5424b1a5653f2a7d4b1685b49bd59c2085b5899362286c256b068efab SHA512 bf1c4dce083e28d2b19fb07248f8ef68a20ae2cb7e1cae601dc577f6f843063e988573dce50ba2afcbf09b44664fbe95457b8133694ca01bb6f943f823524323
+EBUILD ssl-fetch-0.4.ebuild 1034 BLAKE2B f25fe579d5cb6b3c1cfc3f4b63b8d1faa878ca09d3241b8657dda84afa176833ef7feb860359a29034b0b11ab73b927c75dce9aa11262846436fe0ef305f5b0c SHA512 40a2b850fb1957f8cb2927f06281e285ca93faa7ad958095f057db23ed4f6439b8da05f1a7a065fb9b9a047a066c5f2043008b93143609bc8495cea213f61f2e
 EBUILD ssl-fetch-9999.ebuild 914 BLAKE2B cf2d11609c4be83009d7256d9bb970944a39106dea193e88c231b277643bed00aaa8d96b76c484414283ffa540e1e36bac37ab874597c2c81fbc4d59d9726abf SHA512 04f49f4aa7163a63f5f2e3848f75a21ab4f0f32d3ba97dbf96448be88d8f3afa2f7a9534d69af39a579aafddbe678e4f391c17ba3d2914dec4c2060a81aa58c0
 MISC metadata.xml 358 BLAKE2B 7ffc5faf4b9819e2ea71b0e239205b95a9b3764c2fe7a5ce8fadedbdd4130fd83780a89ab790106cd353a0b92ccaeb63276bfaf8f993f97c751b7edf79043178 SHA512 5d94fbf0a6a28bd26bef445e216b8377b2ae116273644bc2fc930258ebcd0d0c59583de63726c9f0769a1d26e66dcb31d51a5237b2b2088ec11ef9aa4523573f
diff --git a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
index 51e45d0acb91..d7a82d943fd9 100644
--- a/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
+++ b/dev-python/ssl-fetch/ssl-fetch-0.4.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 DEPEND=""
 
diff --git a/dev-python/stestr/Manifest b/dev-python/stestr/Manifest
index 23c9f2087547..8199e374130c 100644
--- a/dev-python/stestr/Manifest
+++ b/dev-python/stestr/Manifest
@@ -1,3 +1,3 @@
 DIST stestr-2.1.0.tar.gz 103501 BLAKE2B 6b000b8e3d0a27a18f19510dd8d5de8641223c18ad22a3f90b73619aa41bbe1a51bcedba604ec448282fa41e2ae93b61fdd0e72e603a39730a59400fc15ef007 SHA512 a99d0659da0ca2b86703529df9ef6d135578bd8374a2afcbd10bd96f24f5e6dd1dacd5929d96a083881f1db2a930b039d9045348a0298d84d2480c6c9a75d1f7
-EBUILD stestr-2.1.0-r1.ebuild 985 BLAKE2B c1dd0915e7ef43c71abed309f12eae6b268007e5b07d89d61b2b35daf8aac56a1f47afad0d0c11b80389460a2ff0004de69712cf34bc91d4655c3dba878c85d2 SHA512 3b2182815dbf1a02acd2fabc34c900dfacadb511a6a19539083555d75599163dd9fc3124304cc84c379ebae08b1e47d5b7d5b5d1d6b2000969637e8f4cb45379
+EBUILD stestr-2.1.0-r1.ebuild 986 BLAKE2B f9762d229a63187185f0476cbb4aa1be96051e501bb6594078ff7897fd05c9d011bc2f6a991b05f43351ffd42c07a77b8f0060d76b0d2a48c4613ce91113910a SHA512 496907a962578b482d13b52a38375e7c546d9e86eda546433c61e8ac30b047f1aa78f0580d798b68adc0c47a85499a27012e7f0af15f14c6cf167b3808d55e51
 MISC metadata.xml 615 BLAKE2B 59ec048ea712845ca6de6e55aa4ca514da16e6c6387ce2324effc9e6eb82d99aa5d3601914fe78398fcc83be14c752a1ff4e546f36746f8711e36aaf4cdc2846 SHA512 d13186ab5353fe9b9310ed047a828b65f179b173c7c220fbaba5a80e36bda817dd44ccaeb4a9272b342de6246e44ead8d959fdc7a4b4e7f00c52848eb0a613c5
diff --git a/dev-python/stestr/stestr-2.1.0-r1.ebuild b/dev-python/stestr/stestr-2.1.0-r1.ebuild
index 7163c33b49cf..ad896db549c9 100644
--- a/dev-python/stestr/stestr-2.1.0-r1.ebuild
+++ b/dev-python/stestr/stestr-2.1.0-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 arm64 hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~mips ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/stevedore/Manifest b/dev-python/stevedore/Manifest
index 22bec9778f26..91ade0ac4aa6 100644
--- a/dev-python/stevedore/Manifest
+++ b/dev-python/stevedore/Manifest
@@ -1,5 +1,5 @@
 DIST stevedore-3.2.2.tar.gz 512174 BLAKE2B 60061f04cee8b4ab1c95ab7c02083abd15a623970168df379c82860bb2ea9b27171f5862851eb194c88001b02878eacab4428a76cbfbe528e7246b3e492abfe1 SHA512 1c3f81157b16af800c1caa971f063c50638a70eced582dbcffafaf7d9bbd4e402f75003fcd73b3cb85940bbe9027bac24e37754ffcacffb06d133e938e07ebcf
 DIST stevedore-3.3.0.tar.gz 513293 BLAKE2B c1eee40a451fd6cad033a618a15cb62e65dc4ead8d2dd9eced4278cd11b1daf0f6fefdba2f2fa8dc1a63b6c525b1a3cbb87c8db12945e7412ed76318ee42592b SHA512 4fdd13c08517aef69700566fc04fb26a29b5a72f73a476d656d134b0d99229a8cf0012d9f1ae4565ffab6fa30e745a013d96da8eff00f8316ae1b5010e4cfbb3
-EBUILD stevedore-3.2.2.ebuild 1119 BLAKE2B a542b4e9dba2e54def5cb10ad288ab2c77ba602c52d455ee7ad1435660423df4b81c0d8ef3663a07a6ee0e99fa9509566f61ddbb4046888d67a676046c3cca3f SHA512 9d2cf7d8898db0692176b1b7e6813ee3d9831510156931acca77901ad5743579cdc52c3c4e97c7d3c662b33e4a3f1076ba4f4655d06ed16370ea6c3a46864833
+EBUILD stevedore-3.2.2.ebuild 1120 BLAKE2B 263689a846992736b9514aa67039ef3e38a7605297476a4b463c256ebd1a384bdae16202a2245ae1941f92c6682eaf78ffb8711d08599d88c8c136a229d7b558 SHA512 0a52f5b0f77d2e5073b37e8b6cfab69d307ab5548fdc45579200e86307352820bba361ca3f47e990c332562067dcf5aa4e3de0bdd4b6f7148de03b5d9313486f
 EBUILD stevedore-3.3.0.ebuild 1091 BLAKE2B 856270458128189581884685eb74cdbc6f0c7aaa29d112f8faa81bf089ccbd3f2e52de3fa721dade6ef865a947a59a810ef9c88db67497bf9931455605c44480 SHA512 5314cefbe430e37afb01bc38e174c813b54dc99bfe6e04562048604e4b1661c43c3443a54ccb77d3d11256154fc57aaca525b3a139db45075944a374bc6b7c48
 MISC metadata.xml 521 BLAKE2B 6ac47530dc97a775a197bee97ee62ef419c402a134cb6785ba953a9efdd94bf0c4a79f01dbb7142774e9be25087334efbed7ad1f00b68544cdff9de8807078e5 SHA512 549144ae7c90fffb566c473e7301e3a461b47911cf7d2b1c03b5d0a39b1508f3462365e0ab27f5638d08c677556c8d2348a33b5fa018c68a5c64b2965a545fd2
diff --git a/dev-python/stevedore/stevedore-3.2.2.ebuild b/dev-python/stevedore/stevedore-3.2.2.ebuild
index 7241a0c841dd..56b488735a02 100644
--- a/dev-python/stevedore/stevedore-3.2.2.ebuild
+++ b/dev-python/stevedore/stevedore-3.2.2.ebuild
@@ -14,7 +14,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 ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/strict-rfc3339/Manifest b/dev-python/strict-rfc3339/Manifest
index 65020d11ee90..3d6a4d3e202f 100644
--- a/dev-python/strict-rfc3339/Manifest
+++ b/dev-python/strict-rfc3339/Manifest
@@ -1,3 +1,3 @@
 DIST strict-rfc3339-version-0.7.tar.gz 18756 BLAKE2B 45a38c5eef2b74225408e9a0de9e484cce24778eaf830d9cf052a26df4964c761d8349a71c892c5b4b5129f98802a9aae10b1e9205156bbc4eb6c8f5df7bfb88 SHA512 5db598b33680d60eab8c49dde9d831ece9632811c89552c7ccd9ac7cbc0f603bde5aa14434a388abe669181e643bc2fe97f3c48b08c88863f88e95f17d958bd1
-EBUILD strict-rfc3339-0.7-r1.ebuild 697 BLAKE2B 441a1ee5ed3568c1514b1a398ffb94273dcfc52f62f03ac940f80b2eebecfa62ab5ef7955dfc502383cf75cda89f6c01930bde41f06e7a7640426323542806eb SHA512 78240e39e0fe5f91390c8bd74d254bfbbf39150a635fade4471e1ce887e0e75f8ea5b0b889a107762f017acb2848d3a99959f47aa64d59ae76406fc27e9e96f2
+EBUILD strict-rfc3339-0.7-r1.ebuild 698 BLAKE2B 54301ae78ab29be2bee8a69639f052c54191736f112cb752ee1e6e0d1896ef088f93b11e65eb00f50faf043601283799444d1189a9194ccd44253aa3aa06e153 SHA512 8facdaa1a56a402b44d61b6fa1a2408b390cad99104cd1ee4cc97995bdbd921a45f3c14e7bd5533e93cfbc2fbd9ebeb65f55b84f1378f4b80ff47b6b0e2140fc
 MISC metadata.xml 409 BLAKE2B a83170ceb11e9949cd533ebdd75312b3944ff17f263d6ade09a67bfddaa8c51b86b64c36f29ce3f940d165b968f60ff61d198e9b1035210f6e0ea07fb286725c SHA512 cebb7901b80fa821caa7d7421f1701664176a16e4f3c78c0a3ab6d71d3c248720cd7f2c6aa9412e3770ca62a3a7f22a09f085093decf301b94d9c22aa9938a1a
diff --git a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
index a62e52e2432b..46209e0f1141 100644
--- a/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
+++ b/dev-python/strict-rfc3339/strict-rfc3339-0.7-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/danielrichman/${PN}/archive/version-${PV}.tar.gz ->
 
 SLOT="0"
 LICENSE="GPL-3+"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index d9fed030f95e..8764304ba611 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,4 +1,4 @@
 AUX subunit-1.4.0-werror.patch 1307 BLAKE2B e714e82827c0c30b514ea9f43dfcff1702bd93b9e4f1e5c44029a84deb3de8c84a351baec097b545dc00ac7f0d56f85b917a53c23d501a8b93c35632d43c14d1 SHA512 444b4d2755b395f904dd341992cd2d7df60924b4111e552b6a61b6c6113397b3b6e4dd12b2bab7d408a306b3037e361217c7cda5473d94ca746ceab4e1136cbd
 DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
-EBUILD subunit-1.4.0.ebuild 2471 BLAKE2B f9e767d024616ca8d504871903e1fabdb78e92cc126eeb9c0cacdf373fcb1ddcbfc147addab091960634cd28214ba8822bcad6aea176a717f06165106f0ea7fc SHA512 39b9330002f0d79a68519f6e4178b5085f12034659c8384d3b27b1d1ee081be72360098c6da60aa83845075dea805afef10a9080d6fd3aee98c9845cfcf10328
+EBUILD subunit-1.4.0.ebuild 2472 BLAKE2B 70400708a43575de08d913b7687262b1772f43186dab400c56521c23d3574fb351be3a458bf5d280e31a66f1400d760bd3180b010b4a4de8fc89b3c38099a1e1 SHA512 7da5f6baeff453690d745049ff65ae0683494bf10783d8d34394696e3b8b7e927034c1833f5dc71066a2dff1641f77df6d5640c6f612b46da218139ee30fcb9b
 MISC metadata.xml 474 BLAKE2B c6e5e74bfae996deae0adce7fbdd4262c55c67389b62e549cccca2d42a464bed2dd9d711585ca391cd30ef1f76da30beafa5a8d54ad8f79b539106265757c039 SHA512 d2041aecf3846526bdad951d31ca5d9014efb7cc711f5cb974cbaee3f87e9c705ff8ac6bf02433685d19a57ad7930ee1a25267fffe8db54341e0ca8812fc7008
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index 9962579f395e..a82c609c9d6d 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sybil/Manifest b/dev-python/sybil/Manifest
index 38d229f2658e..9ea6f72ecc1f 100644
--- a/dev-python/sybil/Manifest
+++ b/dev-python/sybil/Manifest
@@ -1,5 +1,3 @@
-DIST sybil-2.0.0.tar.gz 29217 BLAKE2B 90c60ef39a21f3d8a16d4bd29b158e8fa9f687b0f40c520105bb02c8f4ee131b4a131a5612a7edcd55936d415ab76994013a2098670bdd502988616fd81b8f16 SHA512 e260d55da9d502a38f527f4b460dd76bfe22029a73eb02006e16d61f3b2b445a82b154d6067cb1d2a2dc9785dae5af1c187534a37d890201cb04902c6e8fdf63
 DIST sybil-2.0.1.tar.gz 29316 BLAKE2B cf03bc1595efab535d1248b9d267dcd01547f02539977c12b8753e70d13ea0744a6ab76dc1e44fd1c46d192577aa4c1a9b5d5d52678928acfd63937358fa3e33 SHA512 4f3be7686c1acf6812623a756fa79b41e3fbe5d4c3b4c7cf5dfe39fbe56806b4ef3acd24e25968ab9119b2c65ad5c30eabe32f1a93fb62ba8d3893ef123e69f0
-EBUILD sybil-2.0.0.ebuild 410 BLAKE2B 8e574d33f2a9408e6499d55ecde667fc1c5059015b60fc2d6aced7ac0ce879ac2bd95c7b2ee7acf86091a0c12f60a3eb1b37deff23cdc09d8d40af8d8dc12ecd SHA512 6825f88b6e67342d2fbde9e5cc6cf74c028b20715bc52a1c0c688763851053900b2780f75c32bd6e4412a9b26d2200284fe2c4160fd41cb9852966e407b87d78
-EBUILD sybil-2.0.1.ebuild 412 BLAKE2B 5dff4ce186671c906fe921aef28819ec063991b234eea449c78da39d47c560526fbe8be61e91f99f9c84e42826d6fee194e1b7b15c9835d53df8bfe18dc3c9a5 SHA512 417f595cc8d682eb0cd4a095a8157ee54c6ce0bbb987f03d00764567378033bea93f9f9150421d9407ee66a11a28ae0fe18d14aa3174bd2f55e0f1fec3426c97
+EBUILD sybil-2.0.1.ebuild 410 BLAKE2B 8e574d33f2a9408e6499d55ecde667fc1c5059015b60fc2d6aced7ac0ce879ac2bd95c7b2ee7acf86091a0c12f60a3eb1b37deff23cdc09d8d40af8d8dc12ecd SHA512 6825f88b6e67342d2fbde9e5cc6cf74c028b20715bc52a1c0c688763851053900b2780f75c32bd6e4412a9b26d2200284fe2c4160fd41cb9852966e407b87d78
 MISC metadata.xml 397 BLAKE2B 6a49550b305c35a6fbb679f8b33a359e96067c3980fccb5bb4f46837f125f84d7c590cdff0b7e9edd08d27ae406ec2e12a00db9e5c266d83f764c213579b3b9e SHA512 85ed69ab5207b47db4b65e7a199639a5368cfc9ea03365ed62bf00c7447e5aaadee89b9827a1bbc93d035732b757a132e6e2992163ada0c2050be0983f3bc883
diff --git a/dev-python/sybil/sybil-2.0.0.ebuild b/dev-python/sybil/sybil-2.0.0.ebuild
deleted file mode 100644
index 9d329f682453..000000000000
--- a/dev-python/sybil/sybil-2.0.0.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2019-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="Automated testing for the examples in your documentation"
-HOMEPAGE="https://github.com/cjw296/sybil"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/sybil/sybil-2.0.1.ebuild b/dev-python/sybil/sybil-2.0.1.ebuild
index a315bc46b63b..9d329f682453 100644
--- a/dev-python/sybil/sybil-2.0.1.ebuild
+++ b/dev-python/sybil/sybil-2.0.1.ebuild
@@ -12,6 +12,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/tempita/Manifest b/dev-python/tempita/Manifest
index 383886bd87e2..5187169ad770 100644
--- a/dev-python/tempita/Manifest
+++ b/dev-python/tempita/Manifest
@@ -1,5 +1,5 @@
 AUX tempita-0.5.3-cgi-escape.patch 1109 BLAKE2B bf11e4e5c284709c62d6ddb5413bececd76079a84352c806921585fed33e77c9b4f34a032e60d18f900546ce4ef716532a3901744752cee2dbfcabfb383e981e SHA512 da9e3c8adf984daa3da2d695e56633ea45fb2424f1cf10d8e939cb915fcfda3bee67ed0039838916ddb05d749e4229336eea51b7878e5ece9a4c66750ecf8f4a
 AUX tempita-0.5.3-pypy-tests.patch 933 BLAKE2B 9b49ab761c894a54f883645bbae9eba938d412aba65392fd78feffee1feadefe6f34f63f4aa7d61c5437d6697aae0dcd89434789d84055b6c089721ddb559cee SHA512 bad83c3e05d3aa8d151403ca71c527663b2268c3fee517ab5778a169b497ab491666bbb9be627369f41ba8444b6e98511953ece2744582d1abffd1ef206de312
 DIST tempita-0.5.3-bitbucket.tar.gz 22756 BLAKE2B 59d273b1dc206eea452f7e5265d59b3ef1248b2d920eae559d74f4c569852b2a127e2a906f866cb748a12663dca944d9080413410edd5c69bd93b0d9574e3026 SHA512 cebe443bf0fc7705304fe127c796801acb6cdc54e79315c2afddb79ece1d04427852c1d0924ab9dd54520b584ae09a0644a20ff2dd6ed0408ee103f5b3fb9410
-EBUILD tempita-0.5.3-r3.ebuild 1444 BLAKE2B 9ff92605702b6b32b46a4327abe944d4556332087be1a0d6769e88beabdc489099e5537248dd7a2940905de732f0ac0fd4005457dbf2f5fd5f94a78c5dfe1121 SHA512 fdffa5e91670a718e96fe6649f83fcef1d01e285ea003fd7c8b7db44d186dec36a3f0d4d2246e103c1deb4434a61c0419ab44bab324af643a258ae6c80da11e7
+EBUILD tempita-0.5.3-r3.ebuild 1445 BLAKE2B fbe0808c3b27ee5b9927528ceec120a427daa5e738844edbb5f41b4fbb308b8d5563f775a0819c05d8ad182189b728c58c26c7390f6b1cc3da50d3ab57d7fff2 SHA512 e807070f276f6653bc1f6412611d5c530fd6bfbcf35fe88a2588576ad6128d1cebec6f040e9ca4326061eceac3f223464565cceec867bd8c3212753f40060fe8
 MISC metadata.xml 345 BLAKE2B 9886d3a48b0230f27c9b19491977ecbe80e6c7d54052193a4eeeaac1444e69abbd3da1687382b6900f4964b3bc58b373e107f323e97b88f41d4ee60aeb7999c4 SHA512 9421a8bc006b96fc511e5b27f4b95ec0b7b030d4d33030ac4ea2d2f35e0215d1bb2836b8c26fb7e765d7d8cd6834b373b5b0a233cbad6b627d57b77f72b01ec7
diff --git a/dev-python/tempita/tempita-0.5.3-r3.ebuild b/dev-python/tempita/tempita-0.5.3-r3.ebuild
index 60a47c8cddf7..b06f8cc5a4cc 100644
--- a/dev-python/tempita/tempita-0.5.3-r3.ebuild
+++ b/dev-python/tempita/tempita-0.5.3-r3.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/ianb-${PN}-${MY_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 6054e2791931..7e4f3bdb14d5 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,7 +1,3 @@
-DIST tempora-3.0.0.tar.gz 21500 BLAKE2B 7bf241d5ab60c78c0ea56df6b28e33504200eb5427cdffaf9d5f34da202c3ba4550fa4dcc48874ee870345fa5a10f2b874687fe7de2bbe049b1c14d05161b0e0 SHA512 2d397c1d17bb4c502817ad0278090137fb8ca00273c63a7336200ed7e621a99cd5c954cdc2da00d06eba34ed4f079429f5ddc68b928cc83feacb2335f995e1b7
-DIST tempora-4.0.0.tar.gz 47217 BLAKE2B 3f8489c584768c074874fd299d11ca71b51c646f07792ac910dbd3fa76c309a866e599204364bbc06e6589a6fa046d3150bff05c9d3beb9b427ff409e2c27fe6 SHA512 59792bf03b4ccbdd5b849f0f6b9a0b5f2672e1cc3076b85449b8f183524d23de05588c3a8185550cdb9e52cc610e29db18ed151b8c5f5f25438de41015cc595e
 DIST tempora-4.0.1.tar.gz 20978 BLAKE2B 1216472a3e03fe0856f598478267647a2a9f8f6b6e28a0e48fc9f66877303da053d1a7e793b812fa8b0909b219a669cd8d82759dfd2c0793d43cc2d086993a8c SHA512 1ee954a7053db2dc0a94637453613851806cc4582f04019e303e13566a842c2710f3c364fd54d8832d4ce2a5eaac29121db9c474b407d5b92e4f8b8ff43b03df
-EBUILD tempora-3.0.0.ebuild 1511 BLAKE2B 5076914b2292fad9eb845421042f05c19a8ccef702834ed5419c64051f7d3fc3bc740aaba6185d7b3d16319b705bb71f2feb3e9f39a6f4ab1fa929368f3530ab SHA512 c3fe5e474d92c3aa5ba417a1573648166b4d08906294494e4b726a0e2ddd6af726de1d5935619093ce9acaffd34586c30f36e121b56b9625b809f08ce12b3052
-EBUILD tempora-4.0.0.ebuild 1059 BLAKE2B ac937540f3f2e926a93c39b96770094a4484d351f2e76fe17decc6083c462de1f83d337c56111fac9b081259114dac4c415d0e357cb8884ce5ff580f25d25237 SHA512 6843bae826d91a924eab1eab61b4931df0ea7d96ade5bfce349adf65a6cfd6f352c0b81e5274ddc14cd4ff3836a5eadbf3dbbf37ee0afe2a6d96f1e255bcdcc4
-EBUILD tempora-4.0.1.ebuild 1077 BLAKE2B 6ae477171447e3da00c730e1b0dfa72a04d6a87cfb7040e1096b458db67b7721b17e374aab1dce690bc74f7544990479a3a9ec088b0e0f4a6ad708afe13523e4 SHA512 c6a6e68e5497d3b2d6a5eb3e56da72a007f5f74c386b197d51fe1531d806c191c6a405a0b78a0210411c6bf5db0b9c94a0e5453628db0252bac92a5ae078337a
+EBUILD tempora-4.0.1.ebuild 1069 BLAKE2B ddb5d0714e8491e10bdd5f5f97828a5a7bb10cf3c796999119c85d5362c7a5d04677df9ae37b49b158f58f148d948d0aefdf488e4ba162de55a5efc4a3a392ed SHA512 3748ca10505ab337a40f65fe0bf72472605d74547154fbb6d05ddeca3d4c23c65d3e931a231ad9bd46d11ab063a3dcc6d0c94ad3452281be622df91e5aaeec4f
 MISC metadata.xml 639 BLAKE2B 4c3b2d750f191352c17f91ec5915dd9469480057e5272a99e305cf7f2d54a2c631fb39007a49e69169f318392564c7a58974d9483c8fb94bebc583badbbefc6f SHA512 ee76c478ca8cbb146783f31893d9b330a0b171f753ec071df2cdf6ec2fedb28f6dbb9a7d047efe1fedfbf4ee1c3ec6d7dab2889b0f358074630b12d066e52d65
diff --git a/dev-python/tempora/tempora-3.0.0.ebuild b/dev-python/tempora/tempora-3.0.0.ebuild
deleted file mode 100644
index e457ce52409d..000000000000
--- a/dev-python/tempora/tempora-3.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		>=dev-python/pytest-2.8[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-python_prepare_all() {
-	# avoid a setuptools_scm dependency
-	sed -i "s:use_scm_version=True:version='${PV}',name='${PN//-/.}':" setup.py || die
-	sed -r -i "s:setuptools_scm[[:space:]]*([><=]{1,2}[[:space:]]*[0-9.a-zA-Z]+)[[:space:]]*::" \
-		setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Override pytest options to skip flake8
-	# Skip a test that requires pytest-freezegun
-	# because it seems to be poorly maintained
-	PYTHONPATH=. pytest -vv --override-ini="addopts=--doctest-modules" \
-		--deselect tempora/__init__.py::tempora.get_nearest_year_for_day \
-		|| die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/tempora/tempora-4.0.0.ebuild b/dev-python/tempora/tempora-4.0.0.ebuild
deleted file mode 100644
index e15f8e99b97e..000000000000
--- a/dev-python/tempora/tempora-4.0.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Objects and routines pertaining to date and time"
-HOMEPAGE="https://github.com/jaraco/tempora"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
-
-RDEPEND="
-	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]
-	test? (
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/pytest-freezegun[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs \
-	">=dev-python/jaraco-packaging-3.2" \
-	">=dev-python/rst-linker-1.9"
-
-src_prepare() {
-	sed -i -e 's:--flake8 --black --cov --mypy::' pytest.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/tempora/tempora-4.0.1.ebuild b/dev-python/tempora/tempora-4.0.1.ebuild
index e6008d6693fe..3c97c0d002b2 100644
--- a/dev-python/tempora/tempora-4.0.1.ebuild
+++ b/dev-python/tempora/tempora-4.0.1.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 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/testrepository/Manifest b/dev-python/testrepository/Manifest
index edc0a2655311..e7380b6b50b2 100644
--- a/dev-python/testrepository/Manifest
+++ b/dev-python/testrepository/Manifest
@@ -2,5 +2,5 @@ AUX testrepository-0.0.20-test-backport.patch 1970 BLAKE2B 33cbca7f9be488ff5095e
 AUX testrepository-0.0.20-test-backport1.patch 991 BLAKE2B c6318f8bc90195d71304316cf1cb5ca53ff553f9898da5bc70727d4d3aa2bfdd20b26d255806354f9edd9f681b027a6650cecd72154ed09e10605a9a87a909df SHA512 0bbeafcd9ee399a47f1a6ec7249ce9412a6d154b2738899bab75b9593a0703bf297c9a6654e8c4131ccef6daf7c111ed3033e6e3263b5cace28f135bc9593b3e
 AUX testrepository-0.0.20-test-backport2.patch 2270 BLAKE2B a34bf9c2ca3f0ad81958d0e7e30b6ded6f463877ea1315087cdcc3feee234885b2dc5282e6c9e8e09f6f9a552e94efa48bd101b6532caa6148927d533a4a48c8 SHA512 a5c41912d9dd73b288504b25ee1ae6faabbbe75d6992485a69c61d63b762c900567ea2bdd7ca9a11904aaa7bd41f8983d50a5fede05b4d94096a0681a486d200
 DIST testrepository-0.0.20.tar.gz 84956 BLAKE2B 9b9a8e0c21754fe8ba019b58024f137e72b4341cb368fb48dc48039f512b232ca4f03f16c2596aa34b428d69097db939e5776417a7d26f5a8508c8f0c1f1a5bf SHA512 df14500e2b27b6f39d9d4c4f42961efd63dfe25186e561eb1678952a8ab9311f17c36b78819fea33e0ac879c47a33d45c31ff58be017609c8a6157905ee712d6
-EBUILD testrepository-0.0.20.ebuild 1303 BLAKE2B 8657397539ae90f44f4f6402013817ee5947bf899d3a11401f03a38c96a36cc21707584cd79ed0e924d8300c3c75545c449c19110a32a1f2a6b2c7911f7b6b59 SHA512 dd4a3c1ae8b61edda2019d4605355034995d3d9330223b3eb1d44457fd444d68582185dd652d5b3ed62cb90fdee66daf641fd3b5ce91e99e9c8c8e206ba71d0c
+EBUILD testrepository-0.0.20.ebuild 1304 BLAKE2B 789dc0398140749fab26f09771a44eb351acca718d5b2afcaa4877b555b9b37459d5c76f850776756fbcce26ccd511e2f6faee1d46283041ed76713ea837aee5 SHA512 78c748fc9299b0fcd39992c9203ae40b48fe2ea5d8e5bbe416e00e99e1d387a1e2029682dbab9fdbfa377702dc449d3b2436f8599b379c859c9c6899255eb2ec
 MISC metadata.xml 494 BLAKE2B d26f98d320a598eebbb31153fa26df1b04c2f8958197ae9b36d3d0a709285a992da88a19e45d488e9616e7d9e28873e89dbd0878fc188e7c70e2465580faf6be SHA512 2c7364c1e50e4409875f0e474de61a204f7f7af9adfbd75e02fbcd6b8794e5d946c0ca4f9100fe8cbe22cd77dbbf0a1b9c2ae8324aa2348ea54a769c53098146
diff --git a/dev-python/testrepository/testrepository-0.0.20.ebuild b/dev-python/testrepository/testrepository-0.0.20.ebuild
index cb87123a6777..abf3f3bc7349 100644
--- a/dev-python/testrepository/testrepository-0.0.20.ebuild
+++ b/dev-python/testrepository/testrepository-0.0.20.ebuild
@@ -14,7 +14,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 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testresources/Manifest b/dev-python/testresources/Manifest
index cd2065657b1d..c6b38be68929 100644
--- a/dev-python/testresources/Manifest
+++ b/dev-python/testresources/Manifest
@@ -1,3 +1,3 @@
 DIST testresources-2.0.1.tar.gz 41948 BLAKE2B 81f597099eb17090cfa759c2fc4e30be2de3f749760e6a0e88e4c5484c91fe6a00d1296ec6ba7dc5aea1bcd0f9239989fab8fbb4f211b6c5bf031ff1be4b803b SHA512 0b23432b019400fe378e957d14a91083eef7fe1130a494b567a5274d69e4e8e09ab75861e5453c3f217507e144cf179c908f84dd1a807992d4bee0b8d32cb0f4
-EBUILD testresources-2.0.1.ebuild 938 BLAKE2B c18057c32b0bbd0e81312f6426ed4111b88429da553c5574723f735aa0876da9d7bae188872dcb13f83175192704c07cb65c7899bca4e9891fcaa4650b119093 SHA512 a46f3d8416b77e67d32cbfd7754871e0a75b8a6da86cdec4ab6f57f5eb9455d5d250f592fce5aebbd63fc0e5cdd670a948d88b0ca79fc35b458d2dc1a9442646
+EBUILD testresources-2.0.1.ebuild 939 BLAKE2B 1f89b2bd17ea943f34d11d4259b3cbc3f7c010ef7fef66b7530f24c0fc78c5d9a4823fab17c5ab08a6525321336240906d261ee1c8cfd34d8e1b7993dcf91a70 SHA512 7d962469f26d74de8af302e4ca9c986493966940f0ae36458d3e5fabb09c2816821c8dc43dd0cafc22b0c70f95e35a0a19383a39a3eed436035546c3be43734e
 MISC metadata.xml 939 BLAKE2B db25bed8c4a747daf38631903c47491d4cd5ceeed168eb14c68ca0894c271d866616d9a2704beb446a1316a710c98b73a5e224afee7d1e6ceea092de834b958d SHA512 5962ed430ea8163666e9cf360a456e48b38bcba0b85466d01a54fe4d2aacfde98484d4c0740f5ec29393d6291ab14c4da897976201667d22c76ffa56aac402c5
diff --git a/dev-python/testresources/testresources-2.0.1.ebuild b/dev-python/testresources/testresources-2.0.1.ebuild
index 2656fe9e2c07..faaf2bc0aa89 100644
--- a/dev-python/testresources/testresources-2.0.1.ebuild
+++ b/dev-python/testresources/testresources-2.0.1.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 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testscenarios/Manifest b/dev-python/testscenarios/Manifest
index 68b94be7656d..79e101af606c 100644
--- a/dev-python/testscenarios/Manifest
+++ b/dev-python/testscenarios/Manifest
@@ -1,3 +1,3 @@
 DIST testscenarios-0.5.0.tar.gz 20951 BLAKE2B 154915281456aad3353e144ffec8404514622fdeb8d2129ba530d3d5a02814599c2fead9dc25ab4904bad68b2892a435f9cbbcde92503d71477624bbec154f53 SHA512 f08b868babf504482369c5cb945d3e95bca1cc00f92d5013f6898c488051be0c26dc49aaabcef362aea45450a8d041d9826fb6b5c848beec013fb102d6935521
-EBUILD testscenarios-0.5.0-r1.ebuild 883 BLAKE2B fee6ea768d51760040ff23717b5540c1e94530b258e15cbc63038f72838197d3ad7f99a0c6ca8f7ef231cf12edb1bcefd3f197d2bd870257c3cdce0ec8ad989c SHA512 535cd5603a9c1f322a073e8a2542f8022d89ec26e9562fb556d88038594fafa6547117d334958e2ac32b8a0d877ba1db5bf902189bebe2e7baa869c1d2a695be
+EBUILD testscenarios-0.5.0-r1.ebuild 884 BLAKE2B 5821141044b468c6cc7ab069f8d6a04bf4ef34eb5cd593b00753e26373e13750bcf144ec3d68722a707d9e726afd2c84f7d8ee77158e643ddcf163c8734df37a SHA512 287948d89869764d3d1fc908d76cb7346660707cfcee053b450d3d23e1ecdb74aa5144151dfe044aadb0980f64bff8997a31caff04c5f85abdfd29a6e0c3a9a4
 MISC metadata.xml 979 BLAKE2B ab0d7bfbefdae5ba546ff15669d1caec70e59bf398e6e2ae329821bb141aced038cc946fc309b79a0348051352f7d758e24c081348d6a7e587fc326df14dda09 SHA512 f043d2244673a34d80a88f07c79ac199ad6b2509c3af7a7e934c94330bf745e2dbfbf78fb7f38508cdb1968a87e30cea3e346aad63eb93f94ca762461b3d20e4
diff --git a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild b/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
index 1f9874d77b65..721a6442626a 100644
--- a/dev-python/testscenarios/testscenarios-0.5.0-r1.ebuild
+++ b/dev-python/testscenarios/testscenarios-0.5.0-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 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/testtools/Manifest b/dev-python/testtools/Manifest
index 7e3d17ef3cc0..53d43b5e891e 100644
--- a/dev-python/testtools/Manifest
+++ b/dev-python/testtools/Manifest
@@ -1,4 +1,4 @@
 AUX testtools-2.4.0-py39.patch 4816 BLAKE2B dc5198c0c8baab37ae645d97cb93c860e737142b691d00f96e35574dd0e77f8a163d4031a4b96aa9f28664af1a3a58552565bf5d887cef00c72e13ba9c3b3ea9 SHA512 a554d49e74f43269a847d767611f86fda655fe9ca27cf182c91975702b6928b4161e12d78283113b88b4d50b9fce240cd4fbf236e884e8b92698bdd512c42598
 DIST testtools-2.4.0.tar.gz 233032 BLAKE2B 8b0559039bfc5e18dfe8d70cc10f6e43ad2e1fbebf7d20d9c6c876c5672a6149064f558150d8eb09f569b82983ffe67e06143b14a1d8869efcc585839d6216ae SHA512 af26e163a4caeb207a554b19f86c7892ab5ebe904c144d85273464e880cd18a991c70a77ff817aefb15768fa38f382e9ed853cdefb212dc697b24072e17535c0
-EBUILD testtools-2.4.0-r1.ebuild 1249 BLAKE2B d7b7a0feb35695b235f6f12fea54c76a7e9574e0719144a0f8297a4b5b5b7cff9f2d01736282d1826fcb4c48f15b39dd4413481243c3ab1357b4fabcb33797e0 SHA512 4823cdaf0478587a68f367801b15ff9d6e82697b5fb27674a7c8f43adacb0ec993ed4a523127b38ec2f4194c3b6c040be3915d6d2320ad8d74e8b127c76cb56a
+EBUILD testtools-2.4.0-r1.ebuild 1250 BLAKE2B 16e6904e076b32f40309f1767d8a3ff47a07ee3d4f7714adda02dd2c8426476bc0b544e33ff7d6f229c3ee22010a86c73fb3ce947ff619cb68ac9bb9047a4fcb SHA512 0dc959907bcede1b9566d8ba1528216d5e89ac1234edbc8effa763cafc142a6b7ba4989a80c642620bc010f606b42c8406c7e992fb9e3f8dce0c934cd4de001d
 MISC metadata.xml 579 BLAKE2B 60320e15f2101c115cbd946efe6a2c8cfc12645a005bb9727f5c4fb7d28d91081f2b96b6120ad9a36a7bb6af61d7110afb97b7985306dea3d57427af834a8112 SHA512 c3c8805d1a8d7cc406104548d1d89ce8074ef989a623b5190da1cc1bbe9ecb8e6f181a6c05e5c74b87bc3a3fc27c6713642070f34d4961e385a470820ceda0f0
diff --git a/dev-python/testtools/testtools-2.4.0-r1.ebuild b/dev-python/testtools/testtools-2.4.0-r1.ebuild
index ba14ced54848..7cc18b4fa643 100644
--- a/dev-python/testtools/testtools-2.4.0-r1.ebuild
+++ b/dev-python/testtools/testtools-2.4.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	>=dev-python/extras-1.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/theano-pymc/Manifest b/dev-python/theano-pymc/Manifest
index 5eaa3101ecc9..5a8348cbde7d 100644
--- a/dev-python/theano-pymc/Manifest
+++ b/dev-python/theano-pymc/Manifest
@@ -1,3 +1,5 @@
 DIST theano-pymc-1.0.13.tar.gz 12975871 BLAKE2B 71528868885084d7c37f1f5cc5156aca5e764d09f0dc57aa46e21240ee2959aafb5882aef8977d9f215b051265d0d9bc3a7097ac0bb6d427cfc076ea6f591905 SHA512 da25e386965695a5630c54a671a7a573d0f0fae2eeeacf4f65130e4e4caf416373852ac14b1eb07ae39c194febe854d71fffe2adc24c348f64a4b73b43564229
+DIST theano-pymc-1.0.14.tar.gz 12979426 BLAKE2B e6db87a348d6e7003f8b1ff4e0634335d53d734ea922951edeaab06ec54d51f1d7930a03f6dca14979930abb6212f873d606a9adada46d5b606854c5d8a6c6a5 SHA512 4ddfe5978f33cea96b20763cb01eecf1ec6c0c6b97ac892d647e28b607e61b11862739e5836356ab87e2002e992febe35ce9e1e72d37732074be2dbed64b50b9
 EBUILD theano-pymc-1.0.13-r1.ebuild 1228 BLAKE2B 4c54029fa720820f537d3e0655278167a9308de193afeff044203726b0539a3d41e916d4cc7a7f289a6d02878c851f7701f0b974454c58b4a1ec84986d04fa84 SHA512 ce0851f9e57c6b6c9a458f437f22d47841fa281c10b14b1a641eb24275a88b8091e12a07ec59f706fc6469fc5c989f98ba0055d7a75fdcf9556a236e82036957
+EBUILD theano-pymc-1.0.14.ebuild 1228 BLAKE2B 4c54029fa720820f537d3e0655278167a9308de193afeff044203726b0539a3d41e916d4cc7a7f289a6d02878c851f7701f0b974454c58b4a1ec84986d04fa84 SHA512 ce0851f9e57c6b6c9a458f437f22d47841fa281c10b14b1a641eb24275a88b8091e12a07ec59f706fc6469fc5c989f98ba0055d7a75fdcf9556a236e82036957
 MISC metadata.xml 400 BLAKE2B a9f06ebe35c874d15d1a6608e8398a79480b24cc0ec1b7a45db8c8d18aa24d26817c47a62ad13fba1f32286699749679568b75593c0909dd2ef5785450b379f2 SHA512 530f9e294ab4481624cd9757d67a9e8a67dc2a023002a7f312de619bf05bfd1a06c30ecebd0606f76a1dbe37176697e990867c95de9f411b7631bcc341192e93
diff --git a/dev-python/theano-pymc/theano-pymc-1.0.14.ebuild b/dev-python/theano-pymc/theano-pymc-1.0.14.ebuild
new file mode 100644
index 000000000000..695a31afb335
--- /dev/null
+++ b/dev-python/theano-pymc/theano-pymc-1.0.14.ebuild
@@ -0,0 +1,42 @@
+# Copyright 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} )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/pymc-devs/Theano-PyMC"
+SRC_URI="https://github.com/pymc-devs/Theano-PyMC/archive/rel-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}"/Theano-PyMC-rel-${PV}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/, 'flake8'//" setup.py || die
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 39fc758bb30a..ad11bf76a05e 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1,3 +1,3 @@
 DIST Theano-1.0.5.tar.gz 2842778 BLAKE2B ee82e9487a5265a1040750ace70465c450134e70eba4e58752cbaa7d487be5fb3cce31b838429cb52f7bc31d32a20379e158ee289dd5732dd8b86a9ee36b6d89 SHA512 6bb27753957d32392ea793e39ea56eff94baafbb55e27488f9c0bbdb387172a6829e64f461f83dae192486d9764b72d815e3b8dc059b2af116b024fc7228a118
-EBUILD theano-1.0.5.ebuild 1086 BLAKE2B cb47517b406226e9f4e482c32b0869c8868831ef8f38b583328d37ce3c0529a0225d24ec1832dada6f8e3e9aace3cffa87f7352c7db279f3bbfd6b814df2c99d SHA512 c5baa77b452175df7553a051246e3a99aa0e0bd835176d944e47da4b6d6813ca7de445451ada9dc91f804359dc210da57f87347bbb86430d90344eb8ac0e2482
+EBUILD theano-1.0.5.ebuild 1223 BLAKE2B 084ca9f712a6ae2762ef7d0494a8b94fe3279f5b80eae69a9ad4eb940d2c99ed0adaeff9c8a2fa0d4fa945b9bc025cc09ee02e2de6797c0b98f9cbc922fa0345 SHA512 024b7d55bac38f186c393807dc8b56182b39c438acb672743d80c3c34c73bc60e15f8b345acebae9e4dc61c916198a2a2466f658ecd966381a651692589faff1
 MISC metadata.xml 632 BLAKE2B 2bee1d4912596b45d3f5cc0528a927078a072091148dfce38892319b91a0635859fa91dea32565b4a7f5ed02726364a50870bab22197c57ff33c88a48ad9d223 SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7
diff --git a/dev-python/theano/theano-1.0.5.ebuild b/dev-python/theano/theano-1.0.5.ebuild
index 3b60986763ca..10481daa6239 100644
--- a/dev-python/theano/theano-1.0.5.ebuild
+++ b/dev-python/theano/theano-1.0.5.ebuild
@@ -18,6 +18,9 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+# Tests sometimes hang. dev-python/theano-pymc is better. #738416
+# This package is on the way out anyway for that fork.
+RESTRICT="test"
 
 BDEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )"
 RDEPEND="
diff --git a/dev-python/toml/Manifest b/dev-python/toml/Manifest
index bf4229260a6a..0399b822b0f8 100644
--- a/dev-python/toml/Manifest
+++ b/dev-python/toml/Manifest
@@ -1,7 +1,4 @@
-AUX toml-0.10.1-skip-numpy.patch 1105 BLAKE2B a3cb255be800f833a5bf32b3860b7d6737b1c02b8f42079b99393ed49daac05659cbd9b9961de86160dfc7e995e5eb783c855fe2e4a3f1e75597e672dc8b3a4f SHA512 b51112969c531d465e83616690dc8c0098c3a3bee6ac56771beedbd92a0a0e7d79a4ee96e2961881a56b166283c2cdd4ecd75bb26bd0173c405e3fbe738b7f9d
-DIST toml-0.10.1-1.tar.gz 22559 BLAKE2B 17d9d9c78f2b78a6fc5bc0efd8530af5514d2f965eb1896a0eaca9a6d8ce1dda3a5dc825a8b6cd2a2096a582bd35952e6f0a3372021c739c69186d5a2c5642be SHA512 0a2348bffc889e63f4c6f8ae4faf022cceff069b178d086a37ff03e97e0f24b4b5a72810a345692f21810f3f41908b6981da902862adb06286bdb2941e9e0d60
 DIST toml-0.10.2-1.tar.gz 23325 BLAKE2B dedab7d08dadca963e62d64e9108e254dd73b78761985faa892792823027befc6473ae02c35c275a216b4544d1af8776afa78e39c63c95eb856e2bccf1de49c4 SHA512 5c706a3ae336e6b29bdce9752b91c677f7610cbcc1af4169cc24779e248031406cd19ac367725b2aa7903e4b1db71fa59255238c0270b2c146fd5d7e12d9a5da
 DIST toml-test-280497fa5f12e43d7233aed0d74e07ca61ef176b.tar.gz 19593 BLAKE2B e9deba7c5d1eea7bd87fcf5e5c74bda4c2b9e9686e597e3ad51516f60eb8d192fb01d052ac57729c6f0851e2715cc6409a904affd637c9b099cabc1b12ad5d52 SHA512 7bd69b8c14f09bf431094b52d988eb233922527719ba5047ff769d2e709c2039fb6fb1c8144e630ad2a58835d19e0e4cc51433a427596d37f8eccb6d73d7e5c0
-EBUILD toml-0.10.1-r1.ebuild 1056 BLAKE2B 4d18ac31dd79412cc0cf7bb68bd3c0dd086452bc0c80b20efedc7a2f8456d5c834a82ab0fe1718caecb7f876e6ebc43ebdd5d51408b42fb442a3c219e029f2e7 SHA512 ba7fb9b2f169b73c3074f97f0920221a2cb01b255a6b085863a449524036d2052103dae995ce160a13f0d015bbc517062c1bfe832c4cfb201fedde46c2c56a48
-EBUILD toml-0.10.2.ebuild 1011 BLAKE2B d4f650c986a6115b4312aba7a3f3335ca3040309e551f30120615fee0730df9267b2b226832fe09ecd4556694b32d9042de1ad0839ac3b10be19b1f41170727a SHA512 31109b68c6f0855132c8f8a1df6e41e872e7a91e5512eb89853da5154c3db2517f120d544c0319c654d982d1b1504902ffc4508b118e7ee07df59beb1f3696d8
+EBUILD toml-0.10.2.ebuild 1037 BLAKE2B 525379828bf3ee7166e4fa574c700fce7e3b6639179382f913c59b1d1e62ad1f8d934bf81807a9ddcba837e9c860a50b8d64c8adb55a5b930a1d53529d9e2f62 SHA512 ecd38b22c796adfdeb72189ea988a24248be520a4b8e93f9bd61223c1141cc34ee5fde56a75d31105ac37e048100ebb6975a20c054ae8f6b8c5fb6ae75a3cb5b
 MISC metadata.xml 380 BLAKE2B ec4806e600de8ff5dc0ce341d90563166feae233c7911cf6c396ffe3b1e80b30fa1ac0b1a8c7b99a3e690cabadd8ae098882f53ca415377e54f08d37028e0b4a SHA512 09865620b098af31212c38a6aec4e5efd3e1725ed3963dcf7382aa815f0b607c4c4c4887d43ac678feda5165c9a3eef879c877b7853d133635023f7fc8f0b3bf
diff --git a/dev-python/toml/files/toml-0.10.1-skip-numpy.patch b/dev-python/toml/files/toml-0.10.1-skip-numpy.patch
deleted file mode 100644
index 5c6808d2daf4..000000000000
--- a/dev-python/toml/files/toml-0.10.1-skip-numpy.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 93901215b45db2ab9d50987ac109c29acbe34600 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 25 May 2020 16:38:17 +0200
-Subject: [PATCH] Skip numpy tests when numpy is not available
-
-Make it possible to successfully run tests without numpy installed.
-This package is becoming quite hard profile, and being able to test it
-without building numpy first would be a nice feature.
----
- tests/test_api.py | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test_api.py b/tests/test_api.py
-index dd12eb3..67bcd88 100644
---- a/tests/test_api.py
-+++ b/tests/test_api.py
-@@ -103,7 +103,7 @@ def test_array_sep():
- 
- 
- def test_numpy_floats():
--    import numpy as np
-+    np = pytest.importorskip('numpy')
- 
-     encoder = toml.TomlNumpyEncoder()
-     d = {'a': np.array([1, .3], dtype=np.float64)}
-@@ -120,7 +120,7 @@ def test_numpy_floats():
- 
- 
- def test_numpy_ints():
--    import numpy as np
-+    np = pytest.importorskip('numpy')
- 
-     encoder = toml.TomlNumpyEncoder()
-     d = {'a': np.array([1, 3], dtype=np.int64)}
--- 
-2.26.2
-
diff --git a/dev-python/toml/toml-0.10.1-r1.ebuild b/dev-python/toml/toml-0.10.1-r1.ebuild
deleted file mode 100644
index 9e2ffd0b5013..000000000000
--- a/dev-python/toml/toml-0.10.1-r1.ebuild
+++ /dev/null
@@ -1,42 +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,8,9} pypy3 )
-
-inherit distutils-r1
-
-TOML_TEST_VER="280497fa5f12e43d7233aed0d74e07ca61ef176b"
-
-DESCRIPTION="Python library for handling TOML files"
-HOMEPAGE="https://github.com/uiri/toml"
-SRC_URI="https://github.com/uiri/${PN}/archive/${PV}.tar.gz -> ${P}-1.tar.gz
-	test? ( https://github.com/BurntSushi/toml-test/archive/${TOML_TEST_VER}.tar.gz -> toml-test-${TOML_TEST_VER}.tar.gz )"
-IUSE="test"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/numpy[${PYTHON_USEDEP}]
-		' python3_{6,7,8})
-	)"
-
-DOCS=( README.rst )
-PATCHES=(
-	"${FILESDIR}"/toml-0.10.1-skip-numpy.patch
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	if use test; then
-		mv "${WORKDIR}/toml-test-${TOML_TEST_VER#v}" "${S}/toml-test" || die
-	fi
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/toml/toml-0.10.2.ebuild b/dev-python/toml/toml-0.10.2.ebuild
index b62d25f5d86e..d4cff4d117ce 100644
--- a/dev-python/toml/toml-0.10.2.ebuild
+++ b/dev-python/toml/toml-0.10.2.ebuild
@@ -17,7 +17,7 @@ IUSE="test"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index efcbd3be94f6..491ab174f9e8 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,4 +1,3 @@
 DIST tox-3.20.1.tar.gz 297516 BLAKE2B 2a13059bce229f30670e247b17ffd03d4b0d907b2fa7eb7d2f6848ada8d81e1a0aad983748c4346dfa61877f88edd22e4616ed20efcbd15da34fdc1c87b4439a SHA512 0989cc3dfd25eb3d1236d973d490f12c81273c93e84140b54342217eb73dd944f446c7ce9fe228b644d764b94300f1c6ccaf94e442d0e34835d05de84cccabd6
-EBUILD tox-3.20.1-r1.ebuild 2339 BLAKE2B dc4a8ef172734737208279b9c7a649d400252e3272a84f8c6be738b7e3db17e34fe8251bf356b030dc20ed32baa184526bb2b310ca79c7ced8bee3140041560c SHA512 d9abfd9118a8d99e5c00b49fac114beee9d4138f669e05bcb9842dd9554b0e0ab94363cbb8719efaf50fc7b4bc2715921d92a471c53f73a097a5b34f6ed3bace
-EBUILD tox-3.20.1.ebuild 2229 BLAKE2B 40d7b8dc05367102a5c9442187bd4ef3b1f8a2a0708cd751a9b009723896b67b41bf9705870457d5afc93e05397ff6c944e0b72601b33162377e3ea480bfe5e7 SHA512 f5488902e1a68cabfde1eef47b6180d8ab215ddee2d3788b9f803933b7f4372d9424eaeaaf1bebc653c68bd1dc4722e8e787aa70cdf221ae70c55a11abb2c20a
+EBUILD tox-3.20.1-r1.ebuild 2332 BLAKE2B eb9ebcf84c28955db84c9408224f414ff3086cf8ce299330f99e92cb46e28163037246e916f5c6c8ac53c0067f630cee2996fde80673c195f30b188f69e49100 SHA512 a0670221cb4ce80dff378e5c3c803331deae79100f18e030a98119fc10f4a4dd4ed2c28afb95141f93859ac986f7a3d98096ce2b9d6a6c608dd04365fa66c099
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.20.1-r1.ebuild b/dev-python/tox/tox-3.20.1-r1.ebuild
index 22b449c05966..e06ea801a01e 100644
--- a/dev-python/tox/tox-3.20.1-r1.ebuild
+++ b/dev-python/tox/tox-3.20.1-r1.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"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tox/tox-3.20.1.ebuild b/dev-python/tox/tox-3.20.1.ebuild
deleted file mode 100644
index 8fcf947120f9..000000000000
--- a/dev-python/tox/tox-3.20.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6..9} 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 ae05d996c631..530c88ef808f 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,10 +1,6 @@
-DIST tqdm-4.53.0.tar.gz 179940 BLAKE2B 022fd8eae70a38306d201981bd6c2e469791abc86e3e10bf2bcbe4936e4e6791dc24b3e064c6adb830fd908a1544389fdba8f7017bee17632925c1bcc3d42349 SHA512 ffb06058a71e31497ced0b6b5ce8671a7e958968e0a08e1b68dc9f3a9acac415c1708f6669d369ab484bbc07a8fc06716ed32fde70f22c0dbd8242417f95a713
 DIST tqdm-4.54.0.tar.gz 178664 BLAKE2B 68d0f054b2c95079e13ad9df3e9467f48925311151e5eed94795d3fab232301da99c2704daafd80f748037a467d25416913f0921d6b7c44d725c5ed6861fe347 SHA512 dbb2a61df848ebd84ab805134b7e7297e1cf7626abaa830a08159ce7b1852eba40a6a7f2cc7c8445294a184bbfbd69bf08430371f3e2d71f6a622a271ba49e95
-DIST tqdm-4.54.1.tar.gz 178633 BLAKE2B 10a9314405f1565a130baaef3b4d23fb8606b954fb6e70ec1fffd21a531957432254d3081085f8cb2e55ab103ac17ad23683a5a945917e278fcc61760ee69b90 SHA512 ba9dde2bd2f39d10bfdb0f624f1e60db12fef79732aee1fa21049e37ab60ffafbe097ab124bb3fbd34d9f4efa10e317ab7d594551ae612c0f6c37c2ce9395997
 DIST tqdm-4.55.0.tar.gz 161594 BLAKE2B 890bbb47db356678be2c3edd893d70b085f5bc8fefbf87f12ba8c69fe14ac523a1eed6e335fb84f2ff43b2b0fea901411f8a72b24212cb2ad5ef4955ec8f2df5 SHA512 84062f7d2a109e4067e0868990b6e53578c7c2ec2b81a0cbdc980c91d2d82a8bda37e0c9688777fcf14cc80b7ddf7b28b7a5acfe37608e37903fe45908103913
-EBUILD tqdm-4.53.0.ebuild 1119 BLAKE2B 1861f8c52aed05e631c50fbcb42f49da7de15aa6969205368155f40cfc38981e821f3eced0dd01867429906cb867fa961a941631440877c78d8091db3b8e879f SHA512 585591f7bcde63dbcfc329faa46b29ecc74ec32c8731ad82a88f2c039b2e1120b235ef17a392c89517936ad7367060c0ecb1ef7b7cfbb8b13ef36e5a368f1e39
-EBUILD tqdm-4.54.0.ebuild 1138 BLAKE2B f7ac9812c91b2490729892e257dfbc0a573b0915486cadaa1e0fb28b924797c91ad69c3741ff342be24a5f1ce903c54b16fe5cb6a206520bfd3ffa4574d4ca80 SHA512 6015b3906b0a3a300b3dda84d09221309b2e931d9afbc4dc28334117ca2e0e0b4d2d9aaea639d480c39c00fb7627e12bde919399a89282ac5d092ecdcbf7de98
-EBUILD tqdm-4.54.1.ebuild 1138 BLAKE2B f7ac9812c91b2490729892e257dfbc0a573b0915486cadaa1e0fb28b924797c91ad69c3741ff342be24a5f1ce903c54b16fe5cb6a206520bfd3ffa4574d4ca80 SHA512 6015b3906b0a3a300b3dda84d09221309b2e931d9afbc4dc28334117ca2e0e0b4d2d9aaea639d480c39c00fb7627e12bde919399a89282ac5d092ecdcbf7de98
+EBUILD tqdm-4.54.0.ebuild 1130 BLAKE2B be03c0c9e9bed758d0a04fb4d2cdad760ead9dfe3ff94d3508582dd70fbe3fdb26a2bfc2dc0528f47289a4757544ccfdc4d65f3c9d5c86cb830d3b5dd3e56238 SHA512 4b93d83f7c5f9f32d563ba4e578aab6ab30b80404a2f093cbdb418ffd65ccc2660d5fff0311c441c5a948debb230c0a35e3e791ee392bd542b39cbb0ad4f6738
 EBUILD tqdm-4.55.0.ebuild 1138 BLAKE2B f7ac9812c91b2490729892e257dfbc0a573b0915486cadaa1e0fb28b924797c91ad69c3741ff342be24a5f1ce903c54b16fe5cb6a206520bfd3ffa4574d4ca80 SHA512 6015b3906b0a3a300b3dda84d09221309b2e931d9afbc4dc28334117ca2e0e0b4d2d9aaea639d480c39c00fb7627e12bde919399a89282ac5d092ecdcbf7de98
 EBUILD tqdm-9999.ebuild 1326 BLAKE2B 984897423b7a16d82725c544ff1efa1984545d9438ce8e857eb9f0170cbbc18337c18d7d4af30dbe9a462948bef89c6bea81c74ee2590e4f3955d308649f5086 SHA512 a16afed262e1155ad2eff7ea87b4974d4632bb62ec42761902f9648509093857fd28e7878816f9f8bef2245643453feacc0a0d50454baaf5ea8e7e42538928ef
 MISC metadata.xml 827 BLAKE2B 58d9989c380867ec71e25ccd9bb5818de73112978d422a30bae0230ae1b87af04e3e999d6dc5480303b0caea284ec1387497371d5698e63c65bd07b5ecd8c07e SHA512 a1a68e4bad52c71f46664563338b2ea5273d603a914bee55ce427f23ac6bd29a452a0a6dc8375ce9f4bd77f2b9386972cfb6719aced4964d9b9793cd0aa2e270
diff --git a/dev-python/tqdm/tqdm-4.53.0.ebuild b/dev-python/tqdm/tqdm-4.53.0.ebuild
deleted file mode 100644
index 92584dcfa9ae..000000000000
--- a/dev-python/tqdm/tqdm-4.53.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	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 ~ia64 ppc ppc64 sparc x86"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	pytest -vv --ignore 'tests/tests_perf.py' ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
-	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
-	distutils-r1_python_install
-}
-
-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/tqdm/tqdm-4.54.0.ebuild b/dev-python/tqdm/tqdm-4.54.0.ebuild
index bfed1d06c33e..602af892bba2 100644
--- a/dev-python/tqdm/tqdm-4.54.0.ebuild
+++ b/dev-python/tqdm/tqdm-4.54.0.ebuild
@@ -13,7 +13,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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.54.1.ebuild b/dev-python/tqdm/tqdm-4.54.1.ebuild
deleted file mode 100644
index bfed1d06c33e..000000000000
--- a/dev-python/tqdm/tqdm-4.54.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	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 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
-fi
-
-DESCRIPTION="Add a progress meter to your loops in a second"
-HOMEPAGE="https://github.com/tqdm/tqdm"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="examples"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	dev-python/toml[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_test() {
-	# Skip unpredictable performance tests
-	pytest -vv --ignore 'tests/tests_perf.py' ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
-	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
-	distutils-r1_python_install
-}
-
-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/traceback2/Manifest b/dev-python/traceback2/Manifest
index 9450dcf26cb8..b98c917d71ff 100644
--- a/dev-python/traceback2/Manifest
+++ b/dev-python/traceback2/Manifest
@@ -1,3 +1,3 @@
 DIST traceback2-1.4.0.tar.gz 15872 BLAKE2B cd2e1fe91e1e71a6dd764675e083857f359cfa5aaa3d2fee7f1709e24c545bb9e337f0af1d87f9e286fa2c36dfa12dca84589a936dc9f9805a1c4891739f337b SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342
-EBUILD traceback2-1.4.0-r1.ebuild 991 BLAKE2B f94d22a809a0839278fdbf845dc8cb78c7ef66714aeb2f4b9937bda66e72b2a8c11fe12717b0fffe1e8ba3b7c75e0761cbc4f1a537bba872e2924606ec58c0c0 SHA512 ebb7095d32bcd6c870524c3b1dada39f567e315bb1ca4334270265ed319149e187100f6650932515f32c29defa4605c4056fa5f3001caf80cab957f0efe95cf6
+EBUILD traceback2-1.4.0-r1.ebuild 992 BLAKE2B 07fb2b57c3b4cb68435ff4aad8010a18f824a7287b1b08a9531f12b5858e9633418f8afae5b8154d045a997a604a5987d0b581f6ddaa841ff45b54f62d52b9f5 SHA512 b5f6eeae788fb0e4d44c9808ba132869d2a4651eeae65831a0c7d3cca80cb9ca7c8a5e763714f754c62ca374e409ca761f3f8b07795a8ab492ba463c4dc6ab15
 MISC metadata.xml 377 BLAKE2B d9559b04f5b5494558e9441673f5f903a07e14d4f333a48c6b0091d1e254ac555f26d9fa4f48a794f197026f8683d80c7bd80020233839840cbf277bd72e3c9f SHA512 5323b19aa003404610d2ddfff36c8e7117412afa058486b02dc949e6b39a8a52dcad78aaec92ba62fed72f0dfe5ef501905ade41a3c018dfeffcdbc8ab9b6378
diff --git a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
index c2e7b42a2335..99c4bd09cc68 100644
--- a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND="
 	dev-python/linecache2[${PYTHON_USEDEP}]"
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index 1d6447da1f6d..5e64395db536 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,3 +1,5 @@
 DIST transitions-0.8.2.tar.gz 1084797 BLAKE2B 9ff6284e7c42365c5a169388057acffd53dd31c3ca6d9dee240b253ca34118a67d3f070fd8b6a86cb6a01a2e15023e0bad02ccc07813ee0855a54008ac3d7597 SHA512 d10e513806801d0c874be3eb59e92ad61584b5f7992ba26db8828848df1225fb806621abc118a8d43f2efaa353d988b5becbe4296bc054754e551c86495a540f
+DIST transitions-0.8.6.tar.gz 1092437 BLAKE2B 14a8f50bb3ab34e5a6589c1ccc14482373fcbe670d64cd822ef483da10d5e19771bea28ce26690907862422a7687cacccb8c82f5f623ba34888e88dbf2601945 SHA512 9ada9075074a1201c0858786ea446e5dd36576e154238dccbebc2523da0bd46cb676e7eb4abf1102207b2e674d3214dd4869b3c51a6b9e9799c38bd6be8aedac
 EBUILD transitions-0.8.2-r1.ebuild 913 BLAKE2B 97c2df5a1661bf0ff2571fd539f87903d9bc542a7fee8f108d5f5eb90ade23a4f9172a3dc6bbfd5ab30832ca5e9c4b959ef54a16479369af09c2044540453b02 SHA512 7ee29369baa5a7d1c12162e62ce505e3192089d3f4f6f6812b167c08fca23c4becd76261470af8b2ac501def0a09d79a5c563bb1e0778c521a41d435b5fbc0de
-MISC metadata.xml 761 BLAKE2B 8711cc2839e74b99f5bf61be04a1ea9096a0cfb67f66826dae6db22ec4efa44577dfd6c80d457d811c0af8a3e5b9768f5121fb26c7c5e680de075227a7493c6f SHA512 124dac18d42e7aa25c9e32bb40eae7d9b00b18f07fce5c951092024f6a6c2d047b0740447bc40df7c061677f9d6a5ddde1266d7d8ae69abd4aa0f9ec0c851e81
+EBUILD transitions-0.8.6.ebuild 850 BLAKE2B 84be1fdc6dc21fe6679f869255420d525a15a9a34573819017c18aa74b18aeda92d05982e9681b3185628decc181b6631e8a1d100ecc0a10b40d13b9af68be32 SHA512 89d4393f2c4229cd127793c15f8546646022e3259cadf2ae664fb6b9376e0810c49362b73842cf1508f272d27feccf515b9ef82b651adede53d92b1677ffdcd7
+MISC metadata.xml 862 BLAKE2B 32352ca5b3a7877cee77cdbde85ad75db077f8b9de8e7d38bcef726db2e071095fb17c41075c457c226a0756ecc321cae83fdc2b82a21480a30cccf2e7b4ccd2 SHA512 23ff20aa82f9d97efc8b0a396f8dc289c91d3e8ffd3335757369bc45012319120614e276c719d9e5f61b7877ca37689a7f6576ad1107bd8d5135857f2fbe0b7e
diff --git a/dev-python/transitions/metadata.xml b/dev-python/transitions/metadata.xml
index bf02683f0971..e2018492cb4b 100644
--- a/dev-python/transitions/metadata.xml
+++ b/dev-python/transitions/metadata.xml
@@ -5,6 +5,10 @@
 		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription>
 		A lightweight, object-oriented state machine implementation in Python.
 		A state machine is a mathematical model of computation.
diff --git a/dev-python/transitions/transitions-0.8.6.ebuild b/dev-python/transitions/transitions-0.8.6.ebuild
new file mode 100644
index 000000000000..cf203ef1f988
--- /dev/null
+++ b/dev-python/transitions/transitions-0.8.6.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_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="A lightweight, object-oriented state machine implementation in Python"
+HOMEPAGE="https://github.com/pytransitions/transitions"
+SRC_URI="https://github.com/pytransitions/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	|| (
+		dev-python/pygraphviz[${PYTHON_USEDEP}]
+		dev-python/graphviz[${PYTHON_USEDEP}]
+	)
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+DEPEND="
+	test? (
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	use examples && dodoc examples/*.ipynb
+}
diff --git a/dev-python/txaio/Manifest b/dev-python/txaio/Manifest
index 9e1a825d7541..cc24c0c72671 100644
--- a/dev-python/txaio/Manifest
+++ b/dev-python/txaio/Manifest
@@ -1,5 +1,5 @@
 DIST txaio-20.12.1.tar.gz 53200 BLAKE2B 0bbcf8a64fec668c2cf128a390779ca81033d0f43f02a341c46fc392254ff011df13a1456757e86dc5c4c15f18468698f4da85cc830fb2e52e4e620f7a8767ee SHA512 efde6115b8eccba94dce736fffe49f280ff49e9738f3299578cf41641c3b6f1deb5b1c0f0c8c6fbf85c8d8adbdc2d3f67aa256335d63a5977ac0bfacc98f909c
 DIST txaio-20.4.1.tar.gz 52580 BLAKE2B 28d745eb9e8a0df1ca8748ce455eb122e240505f31464fcc0e66bafcefa8a01a356e44a46d9a5a1b1c670df46ca0c2ea9e66d29436bf2668e5614c5aa8726cee SHA512 da0269d13d72f4ea14f2e67585cdb74ec5105884c31d81157fb85e92d4eb935b1c13eb1222bd5ecd57a8caa36008cf49de85321e7b67e94159330e1d592d42c4
-EBUILD txaio-20.12.1.ebuild 867 BLAKE2B ab74ce109414d325c6b93341a42a82b79acb5b1cb26809d9e414e5b7093e7c6d5e18ad5a0b569985dae1ea64a44e3d3cff0fd581751a31c5c107d76ec59b330a SHA512 d2719b71993f213ad55df85dca8d36392be0ba4dd89d35bc8996bc8cb665bcad84df4491e083a686628b560cf1580b44ad567ddd4708c71b5400febffad49df8
+EBUILD txaio-20.12.1.ebuild 866 BLAKE2B ad7b2aa8e6f20e0451ef708317612092adf4da81c0498360d14a07f1d29a731bf1d83c65752aa5a7ca1088ab83155df7ee7747ca4a756b76bc7b1dc76f198c3e SHA512 58e375781a327f050388ddf5da550b808e03f89a6088460ed1deb501ad653df41dfbcde9f146905f469426ebd1555465a0602c6a767d74cd7560c7501258fe3c
 EBUILD txaio-20.4.1.ebuild 1248 BLAKE2B 97bd4fb4d67b25f5c7354ad2db0cf455e45dbcc09a5a60b78de6607069597a237f9a1c4af5254c0871dacb11d84036f803655befef85e2de26bb331b521099d8 SHA512 79466def4ee99c900e3e89ef7fc1462c5f5db19f92802efdb3961fb89930604d54362a3decc835cf01712edf9a38c67c044a5389dba5c2f074dcd625f87d4c53
 MISC metadata.xml 593 BLAKE2B 35381e8ffc7b26577752e5b659d76fe07e6680518231665285029e817502653f681ed15c352981e999d251e5ece41d0b3fb6bd7e1bfc22464a5a1f1189705101 SHA512 0c84e60ef241789017983d1cea79bf429c48549ab0d0447bed2cb90dca619fb1a469490734a0eb75392cf12c9dbaefda1563fd30e65dbd1a22eeebb9e9d0ccc3
diff --git a/dev-python/txaio/txaio-20.12.1.ebuild b/dev-python/txaio/txaio-20.12.1.ebuild
index b2b1b45835a2..f592667df305 100644
--- a/dev-python/txaio/txaio-20.12.1.ebuild
+++ b/dev-python/txaio/txaio-20.12.1.ebuild
@@ -14,16 +14,15 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
-distutils_enable_sphinx docs \
-	'>=dev-python/sphinxcontrib-spelling-2.1.2' \
-	'>=dev-python/sphinx_rtd_theme-0.1.9'
-distutils_enable_tests pytest
-
 BDEPEND="
 	test? (
 		>=dev-python/mock-1.3.0[${PYTHON_USEDEP}]
 	)
 "
+distutils_enable_sphinx docs \
+	'>=dev-python/sphinxcontrib-spelling-2.1.2' \
+	'>=dev-python/sphinx_rtd_theme-0.1.9'
+distutils_enable_tests pytest
 
 src_prepare() {
 	default_src_prepare
diff --git a/dev-python/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index cd97f6b3e0f5..e66d0dba8d8d 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,3 +1,5 @@
 DIST typed_ast-1.4.1.tar.gz 208587 BLAKE2B db874caf459cb73345305051a7c4e97244e92b28e94e82f59b38bb91b7c6c69a2531a81c84d483eca8d641bc947f6aa1b98ba59cd880f7560fbdec55bce41787 SHA512 a3154fe723aeadf998694aba0faf516e5b9abb876e4c7d91843b3694474ff6911b3e77a6cb7366cfa8e5a573b331906b6a0b134b25627aaba0dcbe92c4e25590
+DIST typed_ast-1.4.2.tar.gz 208583 BLAKE2B fb94967409c073b3390a133232259605aab0ee893fe53deb0e97a07c814b1c2021815beab4fa680653f75a44b53eb3f02d7c9e330cf51195c2dd668762c9e0be SHA512 9a46f2a4c48bd267445a773463771824be958dfdd1a2df21356d0a763ee2029b51d5b0fddeb16df202f89ba86019640ab45ba520fdad5c550250fe2a135605fe
 EBUILD typed-ast-1.4.1.ebuild 586 BLAKE2B febabc33ed2726f68456a56c89190fd62a5cd2dce5809d99ea1cec283aa89b1bccd0272d59d2ef6a0584ec681192f47625b2e5b08429e716ad838c38bcfd4b96 SHA512 50ad5ef166d759b9a06f384441fd3b6910f3e594257eede921120a7270e5385813b55375430ac88539db6093ed9626d1018559bc193cf195aee533a07676c0ad
+EBUILD typed-ast-1.4.2.ebuild 594 BLAKE2B 1e7b29ad943da0492dd859a99e7438853291823ac2e928fe3909e9c3e7a71a8db90464fb0d84a72a3c937e2f1095666d4c09fd7d5d6f8ba1bbe565d8b7ae4a79 SHA512 1a45c843952b0436e9bfe6d59613b1203d44540f7c7246ad1860b75896a99a026f9c6c27ba8e8c083944ec8b0cf5c87b445efee5b94158a7a66cb5faa4f4bbe5
 MISC metadata.xml 368 BLAKE2B 857d763576c4a8d9d13016cdb5c18b5bf343012143e58356e823dbd40e0899e2b31cabdbadedd7958b45f7fd6c2cfe47995b2f8262bcc596047f15375e3807aa SHA512 e72d87878400135962ad878c3bb8f44b267eb0c733c88a1f53f3459744a173a8b7fab2be08a3eb33867dbb2dbabcbb023e9293bf00aa2ac8beb2951a1e334009
diff --git a/dev-python/typed-ast/typed-ast-1.4.2.ebuild b/dev-python/typed-ast/typed-ast-1.4.2.ebuild
new file mode 100644
index 000000000000..0a929c8708f3
--- /dev/null
+++ b/dev-python/typed-ast/typed-ast-1.4.2.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,9} )
+inherit distutils-r1
+
+DESCRIPTION="Python typed-ast backported"
+HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/${P/-/_}"
+
+distutils_enable_tests pytest
diff --git a/dev-python/tzlocal/Manifest b/dev-python/tzlocal/Manifest
index de4655edb5fc..ead74af8e6f6 100644
--- a/dev-python/tzlocal/Manifest
+++ b/dev-python/tzlocal/Manifest
@@ -1,3 +1,3 @@
 DIST tzlocal-2.1.gh.tar.gz 18463 BLAKE2B 73e886cfb6d13bebc1a15a222da60f368a15dc5a097acac74990b1d76bdaa229be8f12ff735d1828ccd78c4c8d06eb5bc0a07da695d70251af1e67e4fb71037e SHA512 2679cebdc2692d9e0e1c9b714994ad881896f53e75ef407229a67c9fee9d27617638a2919865cb67e21e2bbd6e3bc13f2568343037e06603236f25a96aa6863d
-EBUILD tzlocal-2.1.ebuild 547 BLAKE2B 033a8b495d5263e88265fba1afe791d6091a2403b3f43ffb4a7aae1bbb06a7113e7d1162e0ba857973569b317e6fcc1da3941fb2099bba3f2479551ce5c91540 SHA512 7ef867d3c0e0b8c7436367c5493cada1ef3addaf25a2ce4fce85dd66da244e21bc9fb48f755aa5305dc4934f28de7408f50ed3223919587247c72574177a7551
+EBUILD tzlocal-2.1.ebuild 546 BLAKE2B 52004defadb027567398a9616107f1ace42d9d425064148f6cbce7b2f1faaf96bdbd01506cf1ab53fb82db9d82ec864127b67df35342cc1361622b819bb0b13e SHA512 b5ffbd4c1bf2671884c28224407bdeef4233849ae1eea1c30d386894f5d3f2cccbd54c3cba8907be0fdcd6b8869f6c118f4569c46638f786695eb57219e66f4c
 MISC metadata.xml 402 BLAKE2B ffb6b7524232f23d77799fb244ee455c98bf36b2284d2493e79b9fe6e41327fd9e2134e9e036678466226f895c481d81dd351db3294da3ccd7a7a0a0360daf62 SHA512 c29fedcb3c915065ee5fabb28b9bbf8cf9ec4653f9d3ac076706f3cfb9519f376756d752ce51ec15e4421842228693c4c24b3a15241ec8feee283172a3c00963
diff --git a/dev-python/tzlocal/tzlocal-2.1.ebuild b/dev-python/tzlocal/tzlocal-2.1.ebuild
index 6bda305afd91..2ed9a380a2a3 100644
--- a/dev-python/tzlocal/tzlocal-2.1.ebuild
+++ b/dev-python/tzlocal/tzlocal-2.1.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/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index a6010febdd3b..f0078929159e 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,3 +1,3 @@
 DIST unicodecsv-0.14.1.tar.gz 10267 BLAKE2B 06a8dcd8de319422fe85b10e87fe759ae23f0f375bef3c03fd7b2bd37c25a8e2b46d632e1a4849f0799a9702fd8f1d2d0ddb8eb9e8f41d7b3113e92bec11828f SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9
-EBUILD unicodecsv-0.14.1-r1.ebuild 643 BLAKE2B 15ae8014583c85c16e8be8f9cfff7841dfe47834de6daed133ea27d0e75c2046460b4e0e38bde81cb7a4435e0cf8b111694d71fdcc96e5fe7a8baf8b63561f0e SHA512 6ce5480859006a7980930fa4ca521a82827103e5cf6e32c1311f203677cafe29fe8f29d2c0360e889959813f15fbc3dab1ea80c9d064c3b4f4473a549f919994
+EBUILD unicodecsv-0.14.1-r1.ebuild 644 BLAKE2B da6b9b6eee41c76861088a10dc5e4f12ae8786581f7bc95bcd629b9f5a3ded4687b750eb4f5291566a8c5ddcc17feb235dcb98376db8849f305d6bbe29de066e SHA512 c1465582531586bb58f196c6227ad9ca0af1465b1457387ec9fed9ad8d1974f076720f933503e36fc4b54c70fa65248e77bf415c6c5f71d925cc5fb8687678e6
 MISC metadata.xml 401 BLAKE2B 3780bd09f7854a00d0273bad436367a685bb6c6711b78397f1ecbb58482975ba003faef1adc427eb406507b9a404e4ae0db27b97d5a34dbca52e1434e7caaef3 SHA512 4c1c5dc2ce0d1a546980202d0cefdb3f4a8c70780eed3fff94862ca361df47f2d6258d1ac206e83db8c7750bcd9632705c144f98b9f8358832f7427df772f834
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
index 50fd55ae79ed..03b7b2cae862 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.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 arm64 hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/unidecode/Manifest b/dev-python/unidecode/Manifest
index afe4305cef5b..ad81697d9caa 100644
--- a/dev-python/unidecode/Manifest
+++ b/dev-python/unidecode/Manifest
@@ -1,5 +1,5 @@
 DIST Unidecode-1.1.1.tar.gz 212151 BLAKE2B 9884f89bb45c7c99569d42e0b287731638b8b1b697afab2c812b56340c6bd12dc3214b42177554f1b0aa214ce1b73fe1f05208ac6fc33d1949ed1200e42914ab SHA512 5474f04be843ed94ddceb1a7e5f1ca986ee5f2e88ee35bd9347784c7a11b51e1d94d61e1a2a10dd2e71b3587c5b7b76717756f6cf4e2446d83222178c2360696
 DIST Unidecode-1.1.2.tar.gz 213644 BLAKE2B c4a9ecb441eb05800d931ccd43843d19ae07f74829d43bc3c24462955e8872f4edf4bb9b3909fc5155b13676b8d255848cdd90772a88cd453152ca13af0d3fab SHA512 8ee45ae05064612638ecbaa4eb74759580e5ea5cba9f3116b8e63db4af13affc266c7a07aaefbbd70b50ead7e483a72d7676c64e20b5bee2a6ba831aaccd6748
-EBUILD unidecode-1.1.1.ebuild 581 BLAKE2B 034ad186c81dc6763c3262846a39dfe7e660a89578983133f3b16021af74aa90d7eb79ab4c40555f3a1437fab203074a1682b10a96fc43a689a873ec32e7f198 SHA512 1b121dbda93fcd818afdfc629a6b154573bc5ca65787f623093adf28bd393cb45a46ca828b8c39be7b080851523523f4d3cc043e01848bcc5351f9b0f52e6d13
+EBUILD unidecode-1.1.1.ebuild 582 BLAKE2B 662ef882c44e4c5b8267082910ed1dc432b1c667c75d74046d37e3a4652ef251d8499314b41ebec8073dfdcb39222dff69ba694753f757a5cd0f7e92a142bedd SHA512 cb3bf3defe154182ed0ccb20009be197e6d75675c1846acdeb672b278da13776ca3eaf4e808254f68524c2d349d532db9afb51da841d6e7a5f16ca0552e627d3
 EBUILD unidecode-1.1.2.ebuild 589 BLAKE2B dcdf45809a8814e53481dc32ab1199b14dc3c8c5eeee6efb156ea11cc4d7688e455322f0c0e45db0c228474309c820067ac494641ad039718744b490d8cd7670 SHA512 1bea49afb6b70ca18c4dd1c3c600fa2aca2c92124e1d8e703f8ecfb2863cbb32dd10bb036100e9f2b4415ffe6422196139c3e9990f63964fc6fdadbfd4ab1293
 MISC metadata.xml 446 BLAKE2B 7a9fc2448eec29f2f2f3a7d068677800e749a88690a1291e74de3202f9ebb1ddba62486bddd77faa989028826cc5e055a7b10f32fc08cc4e50fd4f68b3fa3c80 SHA512 51b70c9aa1cf8fe9a094c80bb6c0895882661804af4e9becb0c37bd85852df37303988d5c3313e17839f99ae1cbec7d866d72c5c39d31a941f2b9aa5a8e1dd0c
diff --git a/dev-python/unidecode/unidecode-1.1.1.ebuild b/dev-python/unidecode/unidecode-1.1.1.ebuild
index beafe7f03beb..1f405239af20 100644
--- a/dev-python/unidecode/unidecode-1.1.1.ebuild
+++ b/dev-python/unidecode/unidecode-1.1.1.ebuild
@@ -17,6 +17,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
 
 distutils_enable_tests setup.py
diff --git a/dev-python/unittest-mixins/Manifest b/dev-python/unittest-mixins/Manifest
index 11aff96497c0..3639816e1ca5 100644
--- a/dev-python/unittest-mixins/Manifest
+++ b/dev-python/unittest-mixins/Manifest
@@ -1,3 +1,3 @@
 DIST unittest-mixins-1.6.tar.gz 14156 BLAKE2B f47831355cb3f6606b36124af7d6634b8c012d8f85ce843fbb2882360006eaf3b964d6d2ed718137e0c37d330cfbabbafbfa75e4b1217f2a5546027f7379ba53 SHA512 0d4a0bbf80264f34a03aebbb2668733cd3753f99b24b006ea6704a2b97df9fb51755e8c4efd0094219e65d25756ea31ff27d3892b32ab6829050236a6bcbc986
-EBUILD unittest-mixins-1.6-r1.ebuild 639 BLAKE2B 8a94d7ff43468d4c481faf86178ff6665703382f93149297fdf032695b25004cfbd15b4e659aded7027794276a509ee40a868fef3120dcd18ac1cafd591789a0 SHA512 fa288714431037dc6dbce1020d5667a0333358d4d38c874592efa3c60c6f226b64b50bb832287d9ba95aac5855bf97e68fe38d1bb67913f7ccd92bc24608b398
+EBUILD unittest-mixins-1.6-r1.ebuild 640 BLAKE2B c17b875750acf4c0fc9745013acf8b172f56000ba4aba18413462cedc7862d7f7fc9385d49edc37e51a08da98d771e42a979d9f2ad46cb16ba99e85543b6ae44 SHA512 c10ee8e71322e15c53e0714063e6f1dca17b18ab40d21f262b3a1b3e434b00f27081d7e08c7ed85687eecc3feaf77c90ffbcc9688b91c4b50ad5ed85caf32d10
 MISC metadata.xml 380 BLAKE2B e11d1ea8ab352e953fb5de15031c23c8ad94b21420abdbd1e4b843aa7498be70e6c773bf5dafacc9da805c7d201027c91691067954e8907662f0a4aea7057b88 SHA512 3cd32540c94dc1a2b2f72f5cfd85192a94fa716cc37d70eed9b028fd1ce120d3f821b2d059465e7f26f4b7d75b8f3cb4848a65dde921d23bcb9b4e56ae321934
diff --git a/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild b/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
index e3ab1a0af3b3..fcca60f9444b 100644
--- a/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
+++ b/dev-python/unittest-mixins/unittest-mixins-1.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/nedbat/unittest-mixins/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND=">=dev-python/six-1.10.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index 82cbeccdf21f..d7bab6294602 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -1,5 +1,5 @@
 AUX remove-argparse-dependence.patch 424 BLAKE2B 6b59d1913f24b336f9cd8bd40a0d42f281fe452937be9b1f2b7187aaff611c07de8bfe138ce9bbd42c5c812d217400d4a49ee991e44821020b5d3a131b5dea18 SHA512 e4a7b803ba5e77484f4e800df4c78d5b4d35f2d66e5c416c256bd6e7fa3db193c32aa0a455aac66b34f27c1038accf7949f64d98bf4a31a896a43d790de810f7
 AUX unittest2-1.1.0-python3.5-test.patch 1304 BLAKE2B 390a1972a4f24ca348f6d1d35badd2fe9a88fada8961c16e759f39da6843a1c931040ea3cd236f20b9671efa505c58857a2872553029c88a98b75c8358ac7281 SHA512 502a72811581e3551ab8fdd80f0f72ee4f6be9a3b0ce01a131f240f2199babfa115ecb18c5d4efe297521e6951f9371869b9419c829396720623bff548f09398
 DIST unittest2-1.1.0.tar.gz 81432 BLAKE2B 02bf191baaa895689078e8f484bb368cd178ea2d1e275a5adcd3413eb25d18b9109c353046f60819c7ec26cd233867b7397e6e38004389aa928b4c53cfeb637c SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa
-EBUILD unittest2-1.1.0-r1.ebuild 960 BLAKE2B 5141b2f16458c0af60cb3f4bf5e29563dca49948c896177888c6c307b715d5b7d476a24a7087fe04e806abcbfee39b31ba9ee5276de4e9efb27895689f1c0756 SHA512 3855b86291666f021769c9e4c6b9f7add3c4f6d2c0ae71f1a5690aa493b3a6a8963ee9a13f2b46dbba905040252bf5a8262a24f4c3fb0460c5c6909032081faf
+EBUILD unittest2-1.1.0-r1.ebuild 961 BLAKE2B cf04f068732f888d77e5908b6b3d01ab3d2fe5005281085faaa8aec9441be8ac38e608e50c6c9a427b42c4148325c4c51766417869a164dc1a6fc4628f327bce SHA512 269e71b7768feabc00ba68d0d416d145fde100cba079e787b32a870f58441859d861448423674678e8f6c04c4d9c50ba92e52665791453ccedf5e729186eeb87
 MISC metadata.xml 378 BLAKE2B e0a0ad885607d8593e090798b8facbacd746a69c3325f6d429743482a6265bff57b2d0fd6d12122e15336e063c4c1e539da10cc41ea5ab159b2c5673e8316c8e SHA512 b1db02e32f39f739de9a077d770579cd1adbca7bc7b9c1eb3e5800f5242a1706ec5a61694b98ea7e3e6f6099b128d22e731f4c49cf3c719bb38be52679845d34
diff --git a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
index bbb6babbcab2..95cad45483be 100644
--- a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="
 	dev-python/linecache2[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 6132abce0da5..8cc351499937 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -2,9 +2,7 @@ AUX virtualenv-16.7.7-tests-internet.patch 2103 BLAKE2B 56ac246fb6675c273e288b23
 AUX virtualenv-16.7.7-tests.patch 2092 BLAKE2B fe9eef6372958265ff4b0b919c424a16313934973f29f15f726541cf3a32a9e49d163a40ff0b2d08d17f6521cc7d651fa092d66eb196261706d8d11a9e590e31 SHA512 f4c8a46d5d064672bd154beb0c1fd4a368e9879046931a67fc053e314b5f8510e825cbb3ad3d7e149a19745149a47d4e694b0f6b9f771dcf55e35bcc0871eb59
 AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014ee6091d4b4ca5155da86280aaebfb1a8d26ce9c6a055e47b11129509d7d00abcee0e3a915bd6ff4665b289cfce399f2dfd3b6 SHA512 f99cd435fe9fa98465addc6b22310e5d708c87edef224cdf540556a2ab1a70bebf06e828c02148bb597d163c31b2816845c0c8126727d1d25b38ffcb91c2251e
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
-DIST virtualenv-20.1.0.tar.gz 8284462 BLAKE2B 4356c9c49f7bd2dbb6cf8998be5cd3970804bdec5e3c1223439700f4b5597cd843cdb17b722d54f0181094296247d1f2d4c27980679602b94020fdf1e95dd73f SHA512 740bf8ba30d836c240d248dd2fa31a8702cfa8f96a6192dd6430dbeff3ebbf0fe67d4fd2439ed4961869731520b097783a29381eae3f81f6700b6050b75422c8
 DIST virtualenv-20.2.1.tar.gz 8286055 BLAKE2B da77c51b352e979f05515107df49101a70f97da01862ae92aff0e185065edf1d6d517ee68057f1f2efe5ee999dd9dec24c0f2967b1f10130b446e83e478ccbd1 SHA512 e7877a9766bc47f47a07219258201ad8457ca587a04d61119a0516da43016dda4b5cfeaf725dd0b06f1f896ac8af0f3d7a2ceed3d3f35ac7a4b6ecc607c84118
 EBUILD virtualenv-16.7.10-r1.ebuild 1959 BLAKE2B 90c31ff96e46d24169602a0f034bf02f0d5fcc4132b1ef12a06226580ed2737398c889a0f752cd14c99f310a72642664aacc27024a65840a8541e580ef601deb SHA512 ab7f3e64008dc6320e2d0a280087b7ae26f934eaa7d571e2f8e01c4e21db7356476fd002918b6217bb52827f22bcd6f8e527e53c1011824d8d32be99c452bec8
-EBUILD virtualenv-20.1.0.ebuild 2561 BLAKE2B ec380a7e74f591487018c4c6a52aa2913fa3569dd8773f0a825c474465ec8f8eb043cc6cd11627d16235a53021980798fd504d37e40df557594e433c27489843 SHA512 f238950a65644f6898d49085f99a7eefb57d7a9ecaf9fdb0ccbf727e5c3076f157fc0bfbf2574850e5a3eb8ec1aed50390e648eb199aa3d8dacb34ddc5e5c51a
-EBUILD virtualenv-20.2.1.ebuild 2594 BLAKE2B 187dc3590dbb7444e4767c0c74dde8ae694aaff4d09d36d8068aac1af708b6a55986a00be2c00559f8eb8380cd30f32ee68279542b425e579a07f4facf6d643e SHA512 5110935f92b0b6d1ea6ab93c5b5908ed7ef456493d88b2eba77917afe587e0e3033c6828d7d10f81a2f6367eab7188b7af4f8db2c4ed74b6ca40a79c037d2fd4
+EBUILD virtualenv-20.2.1.ebuild 2586 BLAKE2B 652c6f2eb11138cc38e12dbb3fd7111732f002667fecb3dc4044fc156040c4db9b90f63270607b11640f635fc722e087b0107225f26ed6f22369ae5e76a7bc53 SHA512 9f71abe175ac56f48166bf7339adee6df0f427623c686e6d2c840592ada29f092af00d768f578282d96f1a36484fa00dcb1c6a711170197b3873e6e87db00904
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.1.0.ebuild b/dev-python/virtualenv/virtualenv-20.1.0.ebuild
deleted file mode 100644
index 6a3cdc836d9e..000000000000
--- a/dev-python/virtualenv/virtualenv-20.1.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=manual
-
-inherit distutils-r1
-
-DESCRIPTION="Virtual Python Environment builder"
-HOMEPAGE="
-	https://virtualenv.pypa.io/en/stable/
-	https://pypi.org/project/virtualenv/
-	https://github.com/pypa/virtualenv/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3[${PYTHON_USEDEP}]
-	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
-	' python3_{6,7} pypy3)
-	$(python_gen_cond_dep '
-		>=dev-python/importlib_resources-1.0[${PYTHON_USEDEP}]
-	' python3_6 pypy3)"
-# coverage is used somehow magically in virtualenv, maybe it actually
-# tests something useful
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		$(python_gen_cond_dep '
-			dev-python/coverage[${PYTHON_USEDEP}]
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
-			>=dev-python/pytest-5[${PYTHON_USEDEP}]
-			>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
-			>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
-			>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-			>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
-		' 'python3*')
-	)"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme \
-	dev-python/towncrier
-
-src_prepare() {
-	# we don't have xonsh
-	rm tests/unit/activation/test_xonsh.py || die
-	# require internet
-	sed -e 's:test_seed_link_via_app_data:_&:' \
-		-i tests/unit/seed/embed/test_boostrap_link_via_app_data.py || die
-	# TODO: investigate
-	sed -e 's:test_cross_major:_&:' \
-		-i tests/unit/create/test_creator.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy3 ]]; then
-		# TODO: skip with better granularity
-		ewarn "Skipping broken tests on pypy3"
-		return
-	fi
-
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	elog "Please note that while virtualenv package no longer supports"
-	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
-	elog "  $ virtualenv -p 2.7 ..."
-}
diff --git a/dev-python/virtualenv/virtualenv-20.2.1.ebuild b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
index c1fa5db5d6ae..d5ab169c87e5 100644
--- a/dev-python/virtualenv/virtualenv-20.2.1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.2.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/voluptuous/Manifest b/dev-python/voluptuous/Manifest
index ebc3f6a54e77..0d6a5b47c809 100644
--- a/dev-python/voluptuous/Manifest
+++ b/dev-python/voluptuous/Manifest
@@ -1,6 +1,6 @@
 AUX voluptuous-0.11.5-fix-doctest.patch 193 BLAKE2B 7880210f220cc65a4ac3692da728fe607e2accea6722232dd0bbef2fcc29187e661afb326741caa0d47f9dc96b6b5bb1cfcd064019dae66636054e1b2704f01f SHA512 d261e24685e551de96cdd68e1e0090aa639198f2647ad5d68f7d0d45b834ede99c52e5439ed0b41f3271aaf934519105c8e0820ead288b1748b18b0ee734e977
 DIST voluptuous-0.12.0.tar.gz 46958 BLAKE2B ec41ea9d5775bdc443153b913bcef7e73f14e29d47c6997e5597958b59c2b1143c83b65ca08d2a06aba3725f76f9168be4f46f68d91d87ceb4e4e3b6643e6800 SHA512 7c72d965f2a2eeb2ad099a19b41e2249b9921e51985ff975ed62fe5a6d5b3f2d5c2a7d6fc2cbe3c80abbea17cfc46c39f1953db5daecc0faafb348c838f80417
 DIST voluptuous-0.12.1.tar.gz 47476 BLAKE2B aa991ab2131e478eb06909c8b7ca86158980b47431d7fae82f41ab2c09b2d23c21d6da937394732cb479436fc247268947c3b31701c6260132cd6f9c7f7e288f SHA512 14ead6bd99c9238318e7ed39fa543cb3363cbb0716a251061e6f533b8fae3fd5e754bd6b2756b6d76745da0e02236e04bfe0ae4e25dd87d291bb2a716660eebc
-EBUILD voluptuous-0.12.0.ebuild 535 BLAKE2B 7a44f9d16a2b5ea9e8210e6819b642d40fb736fa1a5049d6afa8a13d58faee85fcd4db70bfa5b3640aa2c973f069ca7a1ad9ae9db6f8458d4b9a6fe14fab4b51 SHA512 464e35ec91ad0d87ea802153c291c07d6a61bc8a64af059bbb512c1adbcbc36efa96a82dbb88d1e0afccf55ebde3209b5344616e53417478715acdf8d8e1d1ef
+EBUILD voluptuous-0.12.0.ebuild 536 BLAKE2B f52ded10aba3136d29ebd56cce3c4b5dafa111a31d04af1fe664518f5d08a26f52dd82bf70d9b28864b26850bf81ee812eccbe0e43a88c6a3755110351d66acc SHA512 c961f8585d643803952428e044f07237ff7773697abf60d014f8ba2ba2dc7eee47a34ce2949dfb6f78d8e4ef5b1b61c8cbc703bdd5c1c047988d7fce1cc1eb9e
 EBUILD voluptuous-0.12.1.ebuild 541 BLAKE2B 3991e82383c6aaa9df0e8f49a1a5aa8cf1022a1201d99e8bd33039955d3f292a37e971d13391efd85c023f5ad6ed20529078707494b3816fcb519442a34bcb9f SHA512 a926c4c872edc46771b37f74b0bd793299f8f7bbb311b7262fc11419bf33c9224408673e77825c4428dde61a40524b6446e0d8a673da1c18feeb3252ffc3179c
 MISC metadata.xml 715 BLAKE2B eabd841d6e3b41642a3572c0f46f0c22cfd61f7afc75e53992dd3e32a3f94e0ce5014e6fcc2bb40d01ad53c7afca5806cb644ce432a40105d574f81bc0830ccb SHA512 4e17933aa52bd1ae97997122285712acf1bb1cf6b40e7ecc454a55b9fa729a34bb8bd0173f949ecfd9adf80f19e6e2d8b4c173b8db599d4cb434b5aa06dab9ed
diff --git a/dev-python/voluptuous/voluptuous-0.12.0.ebuild b/dev-python/voluptuous/voluptuous-0.12.0.ebuild
index bef18fbef06f..6b4352adff2c 100644
--- a/dev-python/voluptuous/voluptuous-0.12.0.ebuild
+++ b/dev-python/voluptuous/voluptuous-0.12.0.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 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=( "${FILESDIR}"/${PN}-0.11.5-fix-doctest.patch )
 
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index 55a298008a02..b3f642255dfe 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -1,11 +1,9 @@
 DIST watchdog-0.10.4.tar.gz 90303 BLAKE2B 0c057fe35383deaa6b7a66c24c07b2260153e94072b2769dd023210e0e5af90b4556ac18a4e8cab8af794c9dad8709205d9f48022458ee6c93fc0f2926b6f372 SHA512 abaadebd74dd869af545b5a3f10edc9d58f4f0f31f43aaf2244aed2c0ef56828f0b4cf9eda919727c832b20c79e95f50df7193dc8ea9d05d28a52dc322a3a497
 DIST watchdog-0.10.5.tar.gz 91432 BLAKE2B 0f10a94edf4cb79d68b83f0cc6eebc1eae9a00a0fd7b8164977a2511b952b6dda9d0b26404ef316a57524f948eb6676a5da65bb711530f64a4a37ab82576b9a9 SHA512 b107fe23b123360ba8ad049576bdbbb40061c70157bee0663bcf9ee9a9a9f65b95234540a477ba9ae6d617199ca1d77fe30b3b9dc4868bfef08a6b9099d6fe51
-DIST watchdog-0.8.3.tar.gz 83154 BLAKE2B d5d0635e83bbcd31544d5ea5811c2f202b0da76bd7a4086e8fc61e3293640e701b04599f95decaa82bee3705dbd6b91ad24b9dbd20edcfc329913600c8a3c932 SHA512 61f1db886e8e9a6d78b569329f4d5944c296778a5a34f94fbf115a748fb4c3be422bf4d3cc828e22fcdcd380fdf9009f5bd91a8a5edc87089afc58297a0b946f
 DIST watchdog-1.0.0.tar.gz 89861 BLAKE2B 79734397fc91e3c733fd28e8c607c07265230f8e7949b07e4236e4fe38af48cd0f758270990b384ccee88bc88311291cc3758f29296edda2dff06dc757d6d492 SHA512 e89f34aba7547022a48ff16e36e6a2eea340e80a4b1e1f8657d4e70d4a451ac43351aafc76978fb4241c583df11c2dd6c53cb1a03c43c2734f4a8a07d5b2604f
 DIST watchdog-1.0.2.tar.gz 91796 BLAKE2B 001cbe82ff8aff0c4e56e4d1f02519047580cccb48466566ad7c9c1f462f90a9a036cf90846eb38ec4fb24ff1df2a1ddfec20b3f0587afdc1f938ada1bb0b1ef SHA512 e87a0955ce822daabd7d030804876698f98ed2aad58486e26a94585763655302063f091b653abd385ea99642361b6253d8e051d96019b243a77b078ba86b0d6e
 EBUILD watchdog-0.10.4.ebuild 1019 BLAKE2B 888374141f9292a2819ffeeb1fdc0cfdf123c27b088e000bc289339d2e2e30ac8572e14b63682326d7135b46fc29fe85fd3bf19fd8fd69a538da12fc48ee1214 SHA512 6256dde0f54409a5735473974c7d23cd398a4ba94ef9759dff0bf62e93f8e7572259cb3215ea5211742d7e9b36b36f37d23b02182cce72883cbe838a751f33b0
 EBUILD watchdog-0.10.5.ebuild 1022 BLAKE2B cd874ee4aac68a46c9103e478609755737fd08bc0bac6aca82394663011b515a4f07d7e281673bcc273d253282069f16161db6b5ff906bd6dbf7aa39df81010d SHA512 3f2a4892632e4b4173a27c27d2235394874cdf05ef158b47d8f5a2f646747fed2d393097ad6ede2b19489aa1b32c07909e1f3ff73c84bba5f9f5e60c2f3e4396
-EBUILD watchdog-0.8.3-r2.ebuild 866 BLAKE2B da2e726c073a1a91556f91aa35e61fdeb7314a414a2f144d4b16e0e4e9c2a14160f69641fbebb0fc257fd4f49eaf833da54b195c668eab2fa11818b82df25b7e SHA512 aceffd14697d54e2014bce38222d59d02a9321eb2388dc7e1d8bdf94369e3834a80de27efc121db2229f5a28d1eb363458a00fd2fe3a2f55c820f81b387de457
 EBUILD watchdog-1.0.0.ebuild 982 BLAKE2B a66951e4b2839a12b87699dfbea438ef864e27ba2e74da619d74dcc4c365e6ef0cbb6fd0b9ee50f69ee5c784db5d7aa8a8f08a7b79de175215e30675072abdbf SHA512 0baa9dcdf57b8acaf3de940b4518931b0d423584e3689f7dff172200a35d744f952cfb0bba888fe2ddd195f1d0ef9bb63e44ad857c26deb69a38aaee465aa164
 EBUILD watchdog-1.0.2.ebuild 982 BLAKE2B a66951e4b2839a12b87699dfbea438ef864e27ba2e74da619d74dcc4c365e6ef0cbb6fd0b9ee50f69ee5c784db5d7aa8a8f08a7b79de175215e30675072abdbf SHA512 0baa9dcdf57b8acaf3de940b4518931b0d423584e3689f7dff172200a35d744f952cfb0bba888fe2ddd195f1d0ef9bb63e44ad857c26deb69a38aaee465aa164
 MISC metadata.xml 409 BLAKE2B 066a5f62332bfdbd1ee84be547214935022d96e8f51d270302fb891d8c9e438141bc4d42cda84cdf02ec65e80c5ad5dbdc8aaeffbf777bb7ee9b153c95cfdfa7 SHA512 dc751fd76505ab72f2e58c28fef326745ee464749e3640510679e852af6752906312f3d8c82b3b0220a120e0112c96e83d62738321a3bc7b71fd6aee803fea9a
diff --git a/dev-python/watchdog/watchdog-0.8.3-r2.ebuild b/dev-python/watchdog/watchdog-0.8.3-r2.ebuild
deleted file mode 100644
index c171e12e9e4a..000000000000
--- a/dev-python/watchdog/watchdog-0.8.3-r2.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
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Python API and shell utilities to monitor file system events"
-HOMEPAGE="https://github.com/gorakhargosh/watchdog"
-SRC_URI="mirror://pypi/w/watchdog/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dev-python/argh[${PYTHON_USEDEP}]
-	dev-python/pathtools[${PYTHON_USEDEP}]"
-DEPEND="${CDEPEND}
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
-		)"
-
-python_test() {
-	esetup.py test
-}
-
-pkg_postinst() {
-	optfeature "Bash completion" dev-python/argcomplete
-}
diff --git a/dev-python/webcolors/Manifest b/dev-python/webcolors/Manifest
index eb4a3781279e..4649dcd07b37 100644
--- a/dev-python/webcolors/Manifest
+++ b/dev-python/webcolors/Manifest
@@ -1,3 +1,3 @@
 DIST webcolors-1.11.1.tar.gz 309399 BLAKE2B 6d07160f5e071dda348959008185b85240252e2636a9eaf89cefc768e734b5c789ac3650fd4a3a88972d144fb2703682a1a750f8136b5a2ac8e2d84f86a19cba SHA512 b8d9146e31292b41c3f3a501ca5f0ce5d9c21ec08dc31384bf6bfe06ccff202b97592eaafef0cfce9ddef1b674bf19a527225d67ecceb92bdc514a050a02524b
-EBUILD webcolors-1.11.1.ebuild 605 BLAKE2B 92eec5251d209b91b48c9c23465f0bcf06aa34ea60ff341630bb59c9f020c14b5e20bbe4813990abcffdc410432174992742bd2fc899a07b552d95c7859bb763 SHA512 b4b3c1cf081986e27cb797c9d5ec2765667502c276425c81b79878657a57add681cf50927b3a78cb868fe999e4ef11762e9b542d78127445ae2bcf15b5271f69
+EBUILD webcolors-1.11.1.ebuild 606 BLAKE2B 25f08ab127543fe870503d288c5e8003a14e1ee3bafb0b9ceb3fff0a17643c179e15d1280b8584ee1e6e239218ca7c1050e9b8f59ab9eb594e5771dbd79ffe17 SHA512 d4f89c42959ab45968c4a7e6772b59ff1ac59d6881758414a31dfa1e8417a8a7768e0a64faf969daef14151fa2992587da66d99131ae61799e5dc226ac4b8261
 MISC metadata.xml 397 BLAKE2B d7490a40883b9fc8ed2871441e94afa18011e33f8d3d2bac6a08b4312b06599e01a176630c6492899bfcd87d3b48c62365a0a676a3c99b8e1cbf0dcbb64da08a SHA512 adec8b9b31a3c7ceb198f236366cb1bbbd40948d3fc21e6366b9a36ea12e41268674bd5bf0eee1854f0e5535d24e31c2c5cbedca5bf5f2e10d798e5ce296ae4c
diff --git a/dev-python/webcolors/webcolors-1.11.1.ebuild b/dev-python/webcolors/webcolors-1.11.1.ebuild
index d59f5a1b988e..b3c3b3d6650c 100644
--- a/dev-python/webcolors/webcolors-1.11.1.ebuild
+++ b/dev-python/webcolors/webcolors-1.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/wstools/Manifest b/dev-python/wstools/Manifest
index d7c8ab6551a6..61ee4b2931e1 100644
--- a/dev-python/wstools/Manifest
+++ b/dev-python/wstools/Manifest
@@ -1,4 +1,4 @@
 AUX wstools-0.4.8-setup.patch 648 BLAKE2B e2c1cbcd8a1fda7fc9a606add1a0171bb87b58a93e65b02960d29d50b64bc46023596bdd46f4d8c063e7d06f74f734ae22c71ba751c87b99d90000f946f2daad SHA512 2dbbe6a4b9de7e79334d63e083358253249a73f5e37de71d62a2aa8f889bcc5f76e5842e505a161e08398c572b9cc71a259372a6cc7689206498085c12ff578f
 DIST wstools-0.4.8.tar.gz 199688 BLAKE2B 3b5137dd135ec8f0e6d69f94275d45367e609adb9763624fcabb899f84c6215c2df26485dcf32d44d6683bd97cd00e2d283cf9096b6f58414f2eacd9e8b93a4a SHA512 0f86e91a2de7333aaf5a58558a715edd6a0cf97150f6d0cae4ecf8e0702648a98e610aa6d3295444079bd616656efcb2823ae7c02c5c3ffcb4789548ac40cd0a
-EBUILD wstools-0.4.8.ebuild 767 BLAKE2B 81b0fce596e1ee93c4f0ff636221a9e223a74d0311169439ed12cfc84bb4a5601f1805e7017b8080836c64c997fe31b18be54dcc0347c8a78f7b5a0422733f75 SHA512 d22b93b19b37b59ca9e6dcb5ebcd4863c8b7b6037bdce625670c1e4e8f2c055e87a823f2c6f80808ac45fa14f37a0e71a20f21f759b4a36d94c99dbd88b6649a
+EBUILD wstools-0.4.8.ebuild 768 BLAKE2B c34e5485cdbc95b132296151a846687f610b4459537bc074ab4ae466bcf82144d96e4cc5c66afe5b13326abdd05d7d6fff1af1c756cac778baf6028dcecb58b6 SHA512 b55b45346066d5c62135d6fde549015b14eb45779163f0f754143ce0ce09ea3d761aa8542b2f674411d2b046f625749c0095f8c826f308193978fb000f1fb4ae
 MISC metadata.xml 405 BLAKE2B d69d3c4e1719405f04df6f365e85a006018c2901f07b60c5d14ec82c85ca8b976315cdc0c50d5afea0dbcaa433d688a8942214138d31e508787be95e94c135c2 SHA512 1048dfaeda9e0c1a2adb0d723efeafb6aad13d12aef2f5d88c5d23f5ede7b3aac3133272c87f2309dfe10022ac5e1ad4259b02aa37f5b4370fe3fcdb7054e2d9
diff --git a/dev-python/wstools/wstools-0.4.8.ebuild b/dev-python/wstools/wstools-0.4.8.ebuild
index 97a2acd7dd53..83ee889eeb4d 100644
--- a/dev-python/wstools/wstools-0.4.8.ebuild
+++ b/dev-python/wstools/wstools-0.4.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 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="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xapp/Manifest b/dev-python/xapp/Manifest
index 8bca3fa649c1..c2f949ee867b 100644
--- a/dev-python/xapp/Manifest
+++ b/dev-python/xapp/Manifest
@@ -1,3 +1,3 @@
 DIST xapp-2.0.1.tar.gz 19839 BLAKE2B 692ef5a560681f415ab211b6f2870339dc80ca3ce90ac860637ce6765309b03f8ac41499ad5bcef51cde194b7cee2e3366abb3ddb5ee7e2212e3dac0da625387 SHA512 a529680ab2adbcd829ec224b7dafeb5f641afaabd51ac6cea154d1adf46772b0f2c58a78c6f136d3c6dde0b5d69a4e53a988f69d282af852ecf9ffa130ec1fe4
-EBUILD xapp-2.0.1.ebuild 559 BLAKE2B 70ecb291a7ef6da01e5b9c5db22b86aec6d071316dd3c5f16f9614858106f1961160f8421e99abd363fa801977dec980236a676daf728130cfa2791b2573ed45 SHA512 948a2a1787c537738561d358bebdfb4d73346067e2920848083296c070d14452d64e6994c48665012e43d6a4846022a8ad7f5c65d863808c333bf1f7dc6f4d15
+EBUILD xapp-2.0.1.ebuild 558 BLAKE2B 8fed8069d74018295c7e71825004d28368fe5b73ae50363b438e915c3ff8606fd99b64fa39b4113c4464233590952137d2c1f6ca0e90b056d1f52f1b6fe46acc SHA512 147485cd76626aee6cb4b3ab7ea65d470c5f936513282ec9919c2e8a58735c39ac4cfc352a205550cef89dd8d20dae40b79e2cd3f88099603af1089cc8ab1094
 MISC metadata.xml 584 BLAKE2B 7b0110a8ad67b0faa3125ddd088a8d019129d239cc541a08b4443f8bddd3c1efc1891ccbd935309fd13c940b1cf95bf6f1e769c078e895393f7bccf3a366a0ea SHA512 3273919c56af741c5cfde4b69180c20a2defdb16a59f34c0a57147f955c8454eb73cd20f5d02fe827432b7f7310e9a313b324832df96c724300cf3b05cb30141
diff --git a/dev-python/xapp/xapp-2.0.1.ebuild b/dev-python/xapp/xapp-2.0.1.ebuild
index 44ea64861489..013b945816dc 100644
--- a/dev-python/xapp/xapp-2.0.1.ebuild
+++ b/dev-python/xapp/xapp-2.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/linuxmint/python3-xapp/archive/${PV}.tar.gz -> ${P}.
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE=""
 
 DEPEND="x11-libs/xapps[introspection]"
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 2781f99aab05..569cf122f9f7 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,5 +1,5 @@
 DIST xarray-0.16.1.tar.gz 2007111 BLAKE2B 426485a921669e2a5c92eec143d5470c5fabcbe9c0ec440c39b27b3b95aa2e87d494397c3b3ad69b0856a2c467b025beccd188aee40a5b96a5d411bb2d66ada6 SHA512 b02dc0a0993c1a41b839d693fb1b3639cfe2a449ae53da39adac01a19749e7945217716a8a07bedd9ef4d63f333a0ac4ce3fed6a8da9042468fdce2290656321
 DIST xarray-0.16.2.tar.gz 2018053 BLAKE2B 3b95c688a3979323b93ec46c9f218795fbf9df56a7ba1459a507ac36379b3240c351cbb3f1907a204199c6c0c4c0c1c516552548d1e03fb987ad718561aa9772 SHA512 f6cd3eee2012e3b544874388c4824e911ce5d213cd393bf01b10deb9742a1168f41629e4f1e49220228771cac920980eaa98a599a6d62c383dd3da7b3bfe0dd8
 EBUILD xarray-0.16.1.ebuild 934 BLAKE2B 495aec100f0d8e541397ccd53fb0f56995f087e73ee5d6428080714e93dca94423c021778fefd9520c11aea249710f8bef0bc35ab7b806141a9539ecafc76ce0 SHA512 90b7b8af54625edb445033b755d360dbe8fa9b253a65b1eb6102d7c3f5e46700121610766731335ae968dcd5a96a1a7157e6b65c9755ba45059a1f03c6281c30
-EBUILD xarray-0.16.2.ebuild 936 BLAKE2B 530b0210443897ede392262d6f439046c3adac756ab38786e01b48ce61264b087475e6106e33f1559193c2b778060dce3bebdfd4fa4c1f89ebbc3941630adcdd SHA512 ec036c61b4a8f514fef95680b3a49b6cbe2d2965183d954d200eca8e86b0aee5d8d09673bc35547f4919c42002bfdf792af5fc5aed67f7d0762d16e4dae5ee90
+EBUILD xarray-0.16.2.ebuild 935 BLAKE2B eba45f22e6729d45c973a7dc0182b86857e98caff650d6d8f9e6310275c622bcf22cd45a88e4c1a35cd37c2340673f17aaaf72772b05dd9734790a325a1c2d1d SHA512 400680bc75d1b97a9f59e407189a88155e457c6e8605a0f7fd6e8bb717b3f31a3687fb365600038c85f32f9ba7147ddbad6b9b75900358694bf2e3c5d13a7008
 MISC metadata.xml 508 BLAKE2B ec48fcbe3d7ecc1907ba57f065ff83affaf8a449a50d39faed113192bbf1dd60ae145550c4794b0fcc000a20f1701a5e9cebaa01782e294ed5300ed5cd82704d SHA512 937f1589c8b6eaa65f70d7b273e60935eaed889895996e5f952dece64a0982130fa5f50f09f25041a86f88f7646e76ba9ca3580ae8adcefa1f83a4effc5409c3
diff --git a/dev-python/xarray/xarray-0.16.2.ebuild b/dev-python/xarray/xarray-0.16.2.ebuild
index e4da2b36730c..2028b99f72d8 100644
--- a/dev-python/xarray/xarray-0.16.2.ebuild
+++ b/dev-python/xarray/xarray-0.16.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index e6c18e604147..eed973f1e0aa 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -3,5 +3,5 @@ DIST xcffib-0.11.0.tar.gz 84750 BLAKE2B adc1faebc8f0e83150f50e1b711175f5f4617124
 DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
 EBUILD xcffib-0.10.1.ebuild 669 BLAKE2B 053ad1204935b13c10a8ddee72fed71ac8ff7b0cf1ab5434ba28668279d293392ebfe6a228de641aac9cc0afc91c0a0dd0fbfaba0b0c428e38e0fbc05d63dd13 SHA512 ecd0dc08026ecad9944a64ee45eb604682513c6bf00633ea5bec86e6c398be8a0d86bbebd48ba03387561610ad38a103f2d0a7313b0af97e642591195e0809bc
 EBUILD xcffib-0.11.0.ebuild 673 BLAKE2B eafbe77a9b6d9cadabfd393ea2789e18799593bbf7efd665113700639be1b6df89374b6c4d978cad4a9dd487676f2e9ee314034aa38dc7f6c094dc175450e556 SHA512 d0f3a1c49ec07ed74a4bb6f98a914fa94e400a6642e384c0c9a06a556239d0c1b509beeb7d1700eac0e48737b9a4b99b19a9f65f616561570f3a7cec0df39cb7
-EBUILD xcffib-0.11.1.ebuild 673 BLAKE2B eafbe77a9b6d9cadabfd393ea2789e18799593bbf7efd665113700639be1b6df89374b6c4d978cad4a9dd487676f2e9ee314034aa38dc7f6c094dc175450e556 SHA512 d0f3a1c49ec07ed74a4bb6f98a914fa94e400a6642e384c0c9a06a556239d0c1b509beeb7d1700eac0e48737b9a4b99b19a9f65f616561570f3a7cec0df39cb7
+EBUILD xcffib-0.11.1.ebuild 672 BLAKE2B 9826d1b5b016d76e541d087e310e1089bee956f724c07aae49dc6d4fe62589c763683c725a349066d8552928c0eeee961b82331da86ace057360e1abcc600f98 SHA512 2db711ec81a04e11aa1b622c63c96c7dbe08a990dbe350220b53574414225acd63b285162c34c7a4d2067ebc02228c7c3b1f77f306bb5689ad087844a03bd54c
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
index 790a52834b15..3d4483b6a1c9 100644
--- a/dev-python/xcffib/xcffib-0.11.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 640b54974c8d..c50c791332b9 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,3 +1,3 @@
 DIST xlrd-1.2.0.tar.gz 554079 BLAKE2B 57c956139a3e2239c9caeae66b36e384458f1f2060422575dcb63fb09b7f9050f669154d1479303640cc45fb5716e027d3b5d07282b08bd866c4e5366861ecef SHA512 eea14845701b86a2679f140c9730e8ee2722b4f859cdd870f86bf54df522d54fc3c78dc4354aeb958c72596a6349995e9d79935efc734de096f6e007945fc1b3
-EBUILD xlrd-1.2.0.ebuild 658 BLAKE2B b34b4dae617c34f64572c6cd8d102c0bace5fa7086d111cf32aeef80761a8e64d28a304cdc6f819af837c167ed6248cd832842b01ec797b7dddc6ec1aa5781a1 SHA512 16807742ff8cb604088f21b9e5858a85ca8cb6487c136f1f6776fb1d4da515884a6ced8bc3f8b00a97af78599fe594e72effc09f997641708690b0ee7ec6a08a
+EBUILD xlrd-1.2.0.ebuild 649 BLAKE2B 086bc0499f0deae085cbf8a1f21dccc6be401b2abfe44a067e89b06fd59674ba1a77aeb63caa5bd737fc02ee10c35dff7dac4fb45119b520eb618d67e43911c4 SHA512 fb68fee447b381157dd3bf94dbb619f50cc5f746851f7bcc9dbe09f799e0aa60b9f191d55de3d0a35661747e76741a026f8c3cc86679af965c0173def0c9902e
 MISC metadata.xml 551 BLAKE2B 5c29003f7780590817cba46e664cc2475a7b00dff75dddcfb492928bfb8dfe1b3dbfe666beb9a159c3734f7c918e7115f95c79c530bd7b0abbf06a068f0a7411 SHA512 2b3c90ab71ffcca19fd58fb7b6ac173f149497e00a31a8e6c3ed14f512d34c990904f40e2828ddf9babb448094e026ed70c4afb3e76bbb9585c9e4b4b597149e
diff --git a/dev-python/xlrd/xlrd-1.2.0.ebuild b/dev-python/xlrd/xlrd-1.2.0.ebuild
index 8b8925aed733..91dc8c176590 100644
--- a/dev-python/xlrd/xlrd-1.2.0.ebuild
+++ b/dev-python/xlrd/xlrd-1.2.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~ppc-aix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 2639880763b9..74cebb9ff934 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,10 +1,5 @@
-AUX xmlschema-1.2.5-skip_network_tests.patch 488 BLAKE2B 0be194d30f0155492f486a5e485de57c17aed76777c808854eff074af7d775a54596621d4fcc9416c4dc9e5f808a747d0037b4dd53365cfa225a431dc3c01d5f SHA512 1781f91a190fec6b9ecc754e36035312e4b68644a5c2343868fc076fd30021317e8d5b85365b44a5eb186c98b60d27f265729a46a5234078c98680a6453d73f1
-DIST xmlschema-1.2.5.tar.gz 290750 BLAKE2B b6fb6722f1f9468cbae6507522c4398a7d0aff11918479b8e89e24986df2ad1ae4fe8640c5fe532319c6e7dbdb958d81df8cf81f1ceb18db09c406fc6a137219 SHA512 f821f041b7be483039746d7c7771117d4cac6189dd02a0f95235ea6597300dead39813b1ede9b6871fad93e50aa55f01f7da4e485c7074f66d78a76f1b57e7cf
 DIST xmlschema-1.3.1.tar.gz 318853 BLAKE2B 1f2f960c5dad0c82a7ca0345bca052560d39f07b3fff9f443ec5d206a2ec92743462be2209e69a9330f432dbeb7e5908dae4168f7815cf64c141047876844453 SHA512 3bd2ba3004c1a397aff1c81c1105a603dd219f9c2c4afd0742aea3d7263dd0c50adbc05f4ccf96ad0a0f8bd5c116002152eba8194619e6bb636ef46111e6a2a4
-DIST xmlschema-1.4.0.tar.gz 329087 BLAKE2B d41d66ee2f572d382aeac45369774caeb216aed8fdd679efa3fdc45ae81d4858e9c63cd17355b46f7378d0754a0307cc66d0f256c689a322a76d561b8c5d42f1 SHA512 572d317f92e6b881f8b95ae3fd6f663c947ff7f48d21f34e356b7fab91b167fe7557cd06bae9907804be95cdeaa7916418e8a4ea184aeae761e60cfb6016c2d1
 DIST xmlschema-1.4.1.tar.gz 329488 BLAKE2B 80125c6867facb8f94574f4aa210239057f6c8429ff52daac047457eaf6c836b051ccf8e0dec751c1bc57e4de7343781849fe88290117b8546ecd9b8ee99859a SHA512 935e4bffa5361e87fe0656c04b79fe50213098db86e18de38d82d9c04e45557b7ce9468379644c202ab25bdbd6f430bf85a639c3aa7636833d4bbe8533738e82
-EBUILD xmlschema-1.2.5.ebuild 884 BLAKE2B f6854e571012b091ee18bbe586dfa6746d743d855a30a7420e1b7f223ab7bd5f054e186b83768c856819cb565a508ed96f85121e754b46d4700f473e9c78dea6 SHA512 58b4c2da6c7a39864f0272819fed4ea09d666263d28f3a6543523c00a46444af1ad95c77090799e211781caecd3d3805f3b70f93a89e9a9947ea0f14b803e32f
-EBUILD xmlschema-1.3.1.ebuild 780 BLAKE2B fd341466fc0e59b4721c3c2a92e04f6196ddb92255285229be982c6c5e99cdb0b31a5ad8cc258df978a49d10cdf7f4c14a5f8827d42bd4f71ab94e6a04db7353 SHA512 5c2a1fdaf9aa7feb4551aa96bdac6bbcf6028576f67fb52641f4035d78f4e04d894bf71a48f72d4d8a201ad55f581f452912cc378c599aa1e6d4d30e9ef90f48
-EBUILD xmlschema-1.4.0.ebuild 780 BLAKE2B fd341466fc0e59b4721c3c2a92e04f6196ddb92255285229be982c6c5e99cdb0b31a5ad8cc258df978a49d10cdf7f4c14a5f8827d42bd4f71ab94e6a04db7353 SHA512 5c2a1fdaf9aa7feb4551aa96bdac6bbcf6028576f67fb52641f4035d78f4e04d894bf71a48f72d4d8a201ad55f581f452912cc378c599aa1e6d4d30e9ef90f48
+EBUILD xmlschema-1.3.1.ebuild 772 BLAKE2B 5e9fc1b2c80267f292f91d05c4b3ae4ea645dd0cbee13a3fb61f4f1fffca5821bfe6858bf718019fa6b9438cb6bdbf45ea6c59979c9ccf295998602732d8d813 SHA512 ccb0c26873c0cc64fcc3dea1e4c06ee025a6b1cc196ce471574e03812916cc09bd86ed95ab800807171b12d18ab18033a9374007d34447088415dbc1d0485617
 EBUILD xmlschema-1.4.1.ebuild 780 BLAKE2B fd341466fc0e59b4721c3c2a92e04f6196ddb92255285229be982c6c5e99cdb0b31a5ad8cc258df978a49d10cdf7f4c14a5f8827d42bd4f71ab94e6a04db7353 SHA512 5c2a1fdaf9aa7feb4551aa96bdac6bbcf6028576f67fb52641f4035d78f4e04d894bf71a48f72d4d8a201ad55f581f452912cc378c599aa1e6d4d30e9ef90f48
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/files/xmlschema-1.2.5-skip_network_tests.patch b/dev-python/xmlschema/files/xmlschema-1.2.5-skip_network_tests.patch
deleted file mode 100644
index 4dee9a4ef107..000000000000
--- a/dev-python/xmlschema/files/xmlschema-1.2.5-skip_network_tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- xmlschema-1.2.5/tests/validators/test_schema_class.py
-+++ xmlschema-1.2.5/tests/validators/test_schema_class.py
-@@ -261,6 +261,7 @@ class TestXMLSchema10(XsdValidatorTestCa
- 
-         self.assertFalse(os.path.isdir(dirname))
- 
-+    @unittest.skipIf(SKIP_REMOTE_TESTS, "Remote networks are not accessible.")
-     def test_export_remote__issue_187(self):
-         vh_schema_file = self.casepath('issues/issue_187/issue_187_2.xsd')
-         vh_schema = self.schema_class(vh_schema_file)
diff --git a/dev-python/xmlschema/xmlschema-1.2.5.ebuild b/dev-python/xmlschema/xmlschema-1.2.5.ebuild
deleted file mode 100644
index 65ccfa46c57e..000000000000
--- a/dev-python/xmlschema/xmlschema-1.2.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2019-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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.0.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-# patch from https://github.com/sissaschool/xmlschema/issues/206
-PATCHES=(
-	"${FILESDIR}/${P}-skip_network_tests.patch"
-)
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.3.1.ebuild b/dev-python/xmlschema/xmlschema-1.3.1.ebuild
index 008edc769d93..a64f1e1d80d3 100644
--- a/dev-python/xmlschema/xmlschema-1.3.1.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xmlschema/xmlschema-1.4.0.ebuild b/dev-python/xmlschema/xmlschema-1.4.0.ebuild
deleted file mode 100644
index 008edc769d93..000000000000
--- a/dev-python/xmlschema/xmlschema-1.4.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2019-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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.0.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index b706856e57bf..1894a8a6a5ab 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -2,5 +2,5 @@ AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405
 DIST yarl-1.6.2.tar.gz 177534 BLAKE2B a7a587387c8030737874b445007aac4a7bc7f5552238fb892cbb99325e9a3862c599a11df5738d79e47dd1073e29731f80bd941f351e4a7b1867780fba9986ce SHA512 5e3ab46216d567583558a6945127d0d8d758475636deb0733bae25fc869d842f05e996f06aa4a7dc6fd067f7e38afdc6e328cc8019735819d2a1cebc50ca165d
 DIST yarl-1.6.3.tar.gz 176823 BLAKE2B 58d36c6d18ef661cb08074153081f541fc98968107d71e7b501297f45f38de092804bba2ae89ddcf0da79b5d4fca62292a4c460bc9dff9d723d3958bc64ff84b SHA512 4c76b94198b8e334f4b4e71d92b0fe23f752d35e0c29bc68df99648b3f48fbb6e3dd8d7339138544e5dc8fbf64c15cb61678052670ac47edc5be958df819d42e
 EBUILD yarl-1.6.2.ebuild 723 BLAKE2B 8897a20fab2df6b0adf8be24cad4981e54584aa95a376d0cbd41df756b825a03800520a3d21c25e5c349b622610766625c87a93b9346e5cee1578d3284abbe04 SHA512 61108f5fb825d7ef083e78f95ace2ce6941ccf0fae2986b5793a75346f233ec7b98df5dd3d5eeda6dee269c7736367371f9152800f14aa9059b9818122e72490
-EBUILD yarl-1.6.3.ebuild 742 BLAKE2B b6f227246bc82cb11fd0ae4e959c57d0e57bacc8d7658c98cc4c112c64807d47d4644821620c490034f6d96c14ab2e7debc8e2ccac38f0443906677be84df678 SHA512 652da71cd21ba08d43d085df2f76da1890903dd3bed0c0efaac51c0b0ed81f63a4611c19609c3697996cc145ec804abfd8f4e25f78b3777716d7da6a3fb74ac5
+EBUILD yarl-1.6.3.ebuild 741 BLAKE2B cf0b659038d741e87aa558510593be1e49e697d21c36fb27ae0ecd7d1eefce5c20359cf74d736ff03e6d263bd18287343a613ad869bbdba9f6b57f5de6b24f4b SHA512 6bd29ece430291dab8b55af8da9682755aa25c887a3da23ea2424c96276e4cd5843a077b07af98930b6e3dd1252f2b54681434fe03f1a2ad27095b73d70221e4
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/yarl-1.6.3.ebuild b/dev-python/yarl/yarl-1.6.3.ebuild
index 71b49fc69adc..2e284005052b 100644
--- a/dev-python/yarl/yarl-1.6.3.ebuild
+++ b/dev-python/yarl/yarl-1.6.3.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 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index f8134145b508..241617d1d254 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,7 +1,9 @@
 DIST zstandard-0.14.0.tar.gz 676761 BLAKE2B f90fcee6571f89eb5964ba50c722be8f3b846a0aaa6f79bd41389131ce332a4c6f7ec3d2eabd16268a42d211c7c02c2f7379019ef44272eb23cc74a20e5e9b3d SHA512 57c62eb7dedde2a2178f79a5658b87b5c5f176b282311273953003824272afa03e126a79b57fc8b75e9e15585d44d6b9931318a8ea5e7c75ec0feebbd7eb6cf0
 DIST zstandard-0.14.1.tar.gz 676849 BLAKE2B ad2a89371301e64428de90adf8770ebb7b43b06d720f5e0e9b490dc8771c55a974625105128c3a8052d68230d2670a802adfbf64708729440fdf624ca8d4fccb SHA512 e49f294816f0c7da35914363dbbdfcc4d432f7fa8367192e07a5d0c093ec8af76966fd0a95b4e8316091f056a8027c383ca73cc9ed506b29e2f9a31bc9ad3379
-DIST zstandard-0.8.1.tar.gz 463785 BLAKE2B ac4dce58cefa05d265824004464bad89a7f4c4e5f19ac1d8b5b8b0ad6f806318e2b82ffb6f3a290e3605961801909b339b1e5d89fdccd76fd28c75a695a92e0a SHA512 0ddbe22381397443c6c9f84e64f9358160bede104c4f48351119d880ac4f88994739b0b3915454567d2b2b04930c6ead5aa290a40323ba4b0bacf5e97809793c
+DIST zstandard-0.15.0.tar.gz 990208 BLAKE2B d31a4c3cec60b642ec8c3a85b9038d6b0153e2be25696591db1a8e8f45b44018e370eb10bc4a902df3da03048a26ad55b2358d3b9912b1802c61bb63ce920523 SHA512 2de5a2047b1a9a146160bfa1cc50adb0ae1ddf23ae346b22d49b04e38987f90dcbb1f15d75c486fb37bf7084de66ebe19d917a37515dedac462102543533c407
+DIST zstandard-0.15.1.tar.gz 992126 BLAKE2B 7f6e987402bb5ddada70b56660d6e9d4eb5cd17dfa0041323ba2ef75bdb5362e7bc4fc8415132079a929e34fefdb654860088356b38dc0546b7c4f7108f93252 SHA512 7aabe647fa8c9a696084da6544c27287fe7d57e3a0ce2594c061fd20136e147ded4ea3da3648f6ef93c49636edc1d04ca4f29561514fb13f1a5d0340cd51996b
 EBUILD zstandard-0.14.0-r1.ebuild 788 BLAKE2B d72c1baf43b98f514891578bda39897d893ba961a9544c5fd9e3c756080d57504ce23e869707f3a94e43f0e9d2381cc328f360bb725cac421e6f68e98157cfdb SHA512 fde59fa42f61d83c6fe405b130a721b5baeaaf2013f69abf583f50ee4d0f42f84ee557060429a75f0d55b067364f6434d64a24f3e6e0152327619e2f23044415
 EBUILD zstandard-0.14.1.ebuild 794 BLAKE2B d767bc9c845e52b1a1aad45e6640f09073ec46b0f9798d1c0a31160958aea1660eea5d361e6a020e72f2aeecf4df16a54bc494ff1208e89955a6a310e4c95fa3 SHA512 00df3555231d2b5ba43d0fd497191ae72ab9cf7a1163bed326cb01b31937d6b3417001994e3ccbd34f217b2fce3c049132d7660dbdffe5b9319d00b275f71b51
-EBUILD zstandard-0.8.1-r1.ebuild 658 BLAKE2B b4f3e0ad9bc4312b80c5248d0423215e67e9d2044b1f3c3eef5234a89a525dbae2708fc76d4f128ddb5f57e9d2993450e00f1804dbc8455e1700f5d268c4a1de SHA512 0d12ac97dcfc60abc8a1ddf33e11d846e5d8aaa46362bd5eeb535de0a8e049b9b1a9a3a75cf6f16c165a5ad7abac996db77712fd3684706cc39f3373ca6ff4ec
+EBUILD zstandard-0.15.0.ebuild 794 BLAKE2B d767bc9c845e52b1a1aad45e6640f09073ec46b0f9798d1c0a31160958aea1660eea5d361e6a020e72f2aeecf4df16a54bc494ff1208e89955a6a310e4c95fa3 SHA512 00df3555231d2b5ba43d0fd497191ae72ab9cf7a1163bed326cb01b31937d6b3417001994e3ccbd34f217b2fce3c049132d7660dbdffe5b9319d00b275f71b51
+EBUILD zstandard-0.15.1.ebuild 873 BLAKE2B 4299ddb3f09dcd41d7aab3ad121a358ff36dab559605697ba93dc3fe168cc7c0161bd4bb271b3c6d5cd675870dad628c1bb3a0721f3ed0e9f6cf5ebd8bc310f4 SHA512 10dad90c8007050727bf1313cfea222a9d36b19434fbcf57f0b8dc91dfb5b581bbbecd90cde4f732d39c66582c52626aa541b8082a5ebc39dd5a673d5e81bfa5
 MISC metadata.xml 377 BLAKE2B 987c1e1f5a7a37a8686acf05929a8c7cfa702358d5c8fcb678ebec0e28ab590d2dbfe92892330d006b202cc4fbc22eb4fec8876902ab56f44990a59932d6c0f3 SHA512 54b4b2a4b98fda27659ac1cb39e16ff788687aa814d882822ffdfa9c085b04bb3a24885f9a08ea73b05b959ed6441a6ff5090c1159300c1d024f1abf239cb141
diff --git a/dev-python/zstandard/zstandard-0.15.0.ebuild b/dev-python/zstandard/zstandard-0.15.0.ebuild
new file mode 100644
index 000000000000..86f9c0f9f030
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.15.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Zstandard Bindings for Python"
+HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+python_compile() {
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile
+}
diff --git a/dev-python/zstandard/zstandard-0.15.1.ebuild b/dev-python/zstandard/zstandard-0.15.1.ebuild
new file mode 100644
index 000000000000..8929862e726d
--- /dev/null
+++ b/dev-python/zstandard/zstandard-0.15.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Zstandard Bindings for Python"
+HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests setup.py
+
+python_compile() {
+	local MAKEOPTS=-j1
+	distutils-r1_python_compile --system-zstd
+}
+
+python_install() {
+	distutils-r1_python_install --system-zstd
+}
diff --git a/dev-python/zstandard/zstandard-0.8.1-r1.ebuild b/dev-python/zstandard/zstandard-0.8.1-r1.ebuild
deleted file mode 100644
index 4ef0edb1d776..000000000000
--- a/dev-python/zstandard/zstandard-0.8.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="dev-python/cffi:=[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${RDEPEND}"
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /dev-python
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)