gentoo resync : 02.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-02 14:09:07 +0100
commit: b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree: 9026dffec53f92cba48ca9a500a4f778e6304380 /dev-python
parent: 3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)
397 files changed, 3478 insertions, 1682 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 4cb52e0ae4b5..fc9a76d5788a 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/absl-py/Manifest b/dev-python/absl-py/Manifest
index f9a8ff49240a..69655aa63fb1 100644
--- a/dev-python/absl-py/Manifest
+++ b/dev-python/absl-py/Manifest
@@ -1,3 +1,5 @@
+DIST absl-py-0.10.0.tar.gz 234053 BLAKE2B c7d85d7b351ec5d67ac5e98d5103b91ee7b91d3e01b15fff86ead2e177ba596719af8668f2ec1dd81b278557d902a90705803f5bd6aa7576b302641129eed050 SHA512 92862cc7997f469d7121746d1a8f8fcf99a4983eb033dc936e2ef22bcab896950a5e2bd8ce7fe6660b761cc16a39145104a7e2ba3588f38cde1964505d0265c3
 DIST absl-py-0.8.1.tar.gz 220234 BLAKE2B 5ce5bc83bf456794f1e38a00ac7c52397e262c8d69e35248b008a5f682fdd8d1cfc33fc5313783644a6baa0be7f32660c4eb2b0e72d86259f40abbfbc1eb868b SHA512 84f751dde2bf725e08adfb8bd34e3d43a13bf557d2c2e3b3fc98ec4fca78c8a17a714cd7804cdeae86dbf758c5021d1d92c688df25f7eb83e633c312303efd36
+EBUILD absl-py-0.10.0.ebuild 554 BLAKE2B d1b9e9568bd39799bf89b546f53215e5b9679325cebbd68c3e1fe4925585a6c4bb20f117151c6026c9b6ada3798b956b48776cdcfa4a778d665cc4c2432fb94c SHA512 865f715f1a1459e4a7494a54b1074a3efc04fe6ad37697d28046bd07a35b8e41edbf3a390949ede6cfc7b290c7166e4f4f3a714f283fb666ebdeae0273332301
 EBUILD absl-py-0.8.1.ebuild 550 BLAKE2B 2399a7ead37d866d8f06871494c4bbcde2ccdce723091b668129a23f2725414f51b2c4ec331f813cd9776391dca99cfd5c80e36d10cf5df18762e99e96751979 SHA512 2f9627b6e1782a40cc78a6056d45b1d8bd6a398207215ebabea7e48b35b131a16600fc5370b9a9346cce391c6e1d6261d36535edfb7041e71e9aa3effe089eff
 MISC metadata.xml 531 BLAKE2B 3db4e14f8e949a75079014a516b9644b1a5fb17d7c3ca877cc8db4681a8a80c37641363a91ba84000bfc4b11d33fdad2f68f637a29233267be16caf287a20a3f SHA512 a66b08837eca504da558917c1a6c9a7aeae5d4f52622b74ecd365f89268b19f1b569478d7d1468b390a74a72ddd4f67f206d4b9932c7a32fe6e92e7bc4fcfaa1
diff --git a/dev-python/absl-py/absl-py-0.10.0.ebuild b/dev-python/absl-py/absl-py-0.10.0.ebuild
new file mode 100644
index 000000000000..4b8ed50b4b74
--- /dev/null
+++ b/dev-python/absl-py/absl-py-0.10.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Abseil Python Common Libraries"
+HOMEPAGE="https://github.com/abseil/abseil-py"
+SRC_URI="https://github.com/abseil/abseil-py/archive/pypi-v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/abseil-py-pypi-v${PV}"
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 27ee467c3c3a..7c3780aaa8eb 100644
--- a/dev-python/aiohttp-cors/Manifest
+++ b/dev-python/aiohttp-cors/Manifest
@@ -1,5 +1,5 @@
 AUX aiohttp-cors-0.7.0-py3_7.patch 991 BLAKE2B e2a08dab701bd31e4a9008c8f89ae97508fb6b99b89db69a05b731849e09c6f04e8b148d82d38f2093e00bb9bee03e45f230cfc8eff4b71ca7797a95524732e2 SHA512 efe7c488d9f30da7eebbe355d86c603657bddc75c88f5cd1bb4b0e76b17f26f5827cc2f42ab8766767a4ad16c08fa636a4f61e50a8c478e7f32eb2567e26427c
 AUX aiohttp-cors-0.7.0-tests.patch 2422 BLAKE2B 4660be793987dd0cd5c945703aa4d6d4b499ba0ab1c305b80e26bac9cc87d811131f6ab179e402821740f193bbfc86a384b58e35aaa453fdfd5d4db3bcc44b23 SHA512 b3fa463b87a112529443f516fe1c37ffda092e8a0133a6d37f407519e32842f65773c87e939082591edb969ee243170be3a4828896ec5ffc1150c3f43aedd9d5
 DIST aiohttp-cors-0.7.0.tar.gz 39728 BLAKE2B 747499856272f551cf8e2e0911ff7cbb2c7cb8a1f3159327dd8f0d40cabbbd9713a1a9e30ef9c99f3f9642567c99025e049db837c89f907d6698a27005ac2632 SHA512 72e0b365b952c08a02c1123d7672cfea01063e2ff01743a71e10f804d22178edc0f1c6b7f87b7ed484ca7c24e89a32de90d0d279f2f5c060427319182f9bdd3b
-EBUILD aiohttp-cors-0.7.0-r1.ebuild 931 BLAKE2B fe97c51de95e15e1212ef84a57513f7ce3687f9948a83df7bfa67f54948f565a6e7787f08263834a1682f843b9e1f04a2d60b4dec97e4d61ebdfab9f6a4280f3 SHA512 0012a81168ceabc54a53fec54f2aa0e65197687dfc8c5e47c9fe5b664960b5a762fab58491da55d4b455e0c8baa0ed0bc37006cfd6665794d4079798cb3327bf
+EBUILD aiohttp-cors-0.7.0-r1.ebuild 938 BLAKE2B 9da6cd7d4bc50b7af7e6a9a4b65b806ecd472b8c1d2bcff235f9e1b98d9a91aa3395ba4fd8d3fdb132a50f2a8e2f9a6eb0caf4c8c3dece41d1bf64de68668c8d SHA512 e890513320ab4188b9a336ebf53ad2e934aadc8420e1b41bf84c406654ff9e0c09f027f21cd1bc2f6f16a65bbadd38a50c03d31eef3384ec09c1ffaede01de1c
 MISC metadata.xml 453 BLAKE2B 425da23ceef20765f00fd1f15b34bf99166f66dc7d6cdc0ee74a7d6439ed912ebf79c365daf9cb50a918802706aa8782d88cee3520b1e37bf3e6505579521263 SHA512 690dfd58364f19eb58ae3348b9b2a8d64fdf4324dd26fb63cf563762f4f8368437fbae1afeeffeb0ccaeac100d793008e28b66309139e27418ef5cd70daf0d8c
diff --git a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
index 09c67cd66d23..41ae8c343741 100644
--- a/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
+++ b/dev-python/aiohttp-cors/aiohttp-cors-0.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/aio-libs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
 
 RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/aiohttp-socks/Manifest b/dev-python/aiohttp-socks/Manifest
index 64265d369432..d472c4ffd356 100644
--- a/dev-python/aiohttp-socks/Manifest
+++ b/dev-python/aiohttp-socks/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-socks-0.2.2.tar.gz 1351798 BLAKE2B 40c9e033de523cad365e95051d48dee5fbd3d964e7b3864393c54d23394a5cfcfcb46cb9d78f25a6101bc97034c77c5a75aef94cfb962054c29bd804e387b0a9 SHA512 218c262cb3eab74166686614ab5a720c31d1ce886cfd655f296c930f648b1d94e909724346769a46b600b8f1bc8ddbc498ee75cd5854e409566a8ead6a7efdab
 DIST aiohttp-socks-0.5.3.tar.gz 1360418 BLAKE2B 7282a4952d5f0301b14291a1892db5ec058af91cf553e4a17ab0e933bb327d1fae9c015d25ff7405ef69cdf56637140fefa9bd1ab1e6f2e224cdc94b9e279159 SHA512 2999f850081d05c31535c24c0fcf0948dbaaec5e421c28ed4ca68b4bfb122f881942e7e829cefc01377212b4579547aafcf273fe5a999acb3d158ee1c3f0a888
 EBUILD aiohttp-socks-0.2.2.ebuild 910 BLAKE2B 54c6dbbe842bea798ec60d15e6cf1621db8a389237b70234d0b1932207729f5f8864bb83ac9880295e144a5711191bd33658f321199ab6f7f5df063cb6afb78d SHA512 c8b121e6f22b6d0a8ef15c616483ab90afc6142e59cf74982b1942fc17331cfe502fa43cb786cd82161857ab392fe928f5c92b8533404c32ea71c3628a8dea10
-EBUILD aiohttp-socks-0.5.3.ebuild 1060 BLAKE2B 16d9962b6763a77a3aec39bac71d26feb2e781f97a1438e4da1805f7caa13f853eea7dc3df8ac4c30695f396f54142f687bb19f0310db00452d09d0ed5bfc452 SHA512 3933ddc26d565605716ac7df2e60be94859a325b9498d0fadac05ffa8a0fc87edeebf6b041d9b91698e15cb18421fba491dd818138e38a94fe7964d8defe9c71
+EBUILD aiohttp-socks-0.5.3.ebuild 1058 BLAKE2B 3461bd234b16dfbe7073c74e4350fa7babb891ffc6525f1d3c4caa8d3f1d2aa8a674e6ce1773059c977019da5383e5bc91f5979d732b590820b57dc6434b24ac SHA512 0524811144231792ff10e2f6f74e6b9a3d1f1fe9b50551baeba838525394684ea3df47d82f4d400ccf134521a1646e2ce4e4e4326d72fa4f13acb98f91686abb
 MISC metadata.xml 416 BLAKE2B fd462ceb91bb4032d944cfe0a6f040120e2492a2aab5a34e6d6416ee9dceb51df7fe3b12cf125415989ac7c2be72d609a1955ebc825cb8e9eaa16dc28df89532 SHA512 6712e24058ed1a73dc03eaca9537df0f6ddaace9a5391cfb01453a342bd8ee5d81ba602e582490bf647bce3665567c6cdadcf4d2b92730f77f79654a309fcc20
diff --git a/dev-python/aiohttp-socks/aiohttp-socks-0.5.3.ebuild b/dev-python/aiohttp-socks/aiohttp-socks-0.5.3.ebuild
index 2be59ad90cdf..4aa9106f7924 100644
--- a/dev-python/aiohttp-socks/aiohttp-socks-0.5.3.ebuild
+++ b/dev-python/aiohttp-socks/aiohttp-socks-0.5.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/romis2012/aiohttp-socks/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # Tests require Internet access, also they started failing when run
 # via ebuild (but work fine externally)
 RESTRICT="test"
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 04ac86d81f29..c7babb1ac1b4 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST aiohttp-3.6.2.tar.gz 1076923 BLAKE2B 14327a0bc5b5fffdf436a4c3525e4c25d80100aa464ed652316f7724c2bea6de4ace6c27e8a2a8cf9d895673ed63ed52e8c958ad611636e1e524a4e40efa4735 SHA512 49bd3089158c05ff6312420190ccd7fed95efb4a18b8aff7497d5507c71c692080d6949801edabdcd95379ca8e6614398408118d72ff1e782399e059e2cfc1a8
-EBUILD aiohttp-3.6.2.ebuild 6735 BLAKE2B 00434ce6c8b45397f0889f5197ca10e0ce3de1c2f7eb5741028a1b615376f8105666b0778614e6131c10d628a97d7c9287345b5fa6b536800c9d5cd5fab4686d SHA512 f5bdf64d06cbb164664b0acc7996eb3bf3f0d6917c16072eeb7d345e3b0b469eaad1360226264610349b6f8317222d7254a6cdd89224e9d5a886eadbb51a371c
+EBUILD aiohttp-3.6.2.ebuild 6742 BLAKE2B e8467540f7d1b56620e389ac86386ba65a39bbc1a45472e0e555c75f2711d63740e0098a543976d912d568cc879db6442cdd221b4180571f5db12bcf0ab0f4b0 SHA512 71300a7d91580047c8f29f101f168b857d32011ca972fdf018558dda0dd0beb4a48868f4783a4747053046ec53c9501d482808ab45bf56683656f9ffa53b3ec3
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.6.2.ebuild b/dev-python/aiohttp/aiohttp-3.6.2.ebuild
index 2633950f67a7..237e921f85ff 100644
--- a/dev-python/aiohttp/aiohttp-3.6.2.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.6.2.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 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/argon2-cffi/Manifest b/dev-python/argon2-cffi/Manifest
index 14863bf17b0b..309621d4b74a 100644
--- a/dev-python/argon2-cffi/Manifest
+++ b/dev-python/argon2-cffi/Manifest
@@ -1,3 +1,3 @@
 DIST argon2-cffi-20.1.0.tar.gz 1814415 BLAKE2B c216349beffa263fd96df23f40a8102b56a88b8320e64ac062ecfea4582efa34b298ba223437bfbfc422b68a3d9b9ea769c384db078c633103f2aae3cd38bd5b SHA512 d1d798e3e51ed67c4f523a66081fea99479ee986b5cfc36b250954e757b9846625681445447f9347519d9988f8a2ace2e3c8ce5817c5c6b4767819cf56ee0af2
-EBUILD argon2-cffi-20.1.0.ebuild 765 BLAKE2B 79572018db95eb7e529c935c78351a2db27348b2e46de5ac0e153700fa17f25c101d96be8ccc2f4f36e811a5bcd4281d61834e2f29981aa51428c04995bbc28e SHA512 e900e8a0919df77c7dda29c1486de27e8f9336a5f795184f5aa4864b0ed6ba624fa7ce24d912ee585229242f4843d6665b059d05472225dc5cc4cfa35b86ad97
+EBUILD argon2-cffi-20.1.0.ebuild 764 BLAKE2B 9cfbba88171c4dca594c26cb91255ad363758cd814ff3c7b229fefe259b3453d73f2153773bc6dbb90224999e0a0f941e7e6bbfb5c5a768bc54207708dd3d326 SHA512 0ce6cddcec4a8f94bbafe6652f1b37ad81dd3eee6ca67946e1259e6e72b62d317ca626924130cd1685bbe9aea75c7c541c64717a7d11ecb17485c6fd95c32059
 MISC metadata.xml 635 BLAKE2B f81f4a8996795ecf69d31587e460532fca7861c8bc5546c7511ee19389406601e0cfe84d67e9387163247833f4032c8c00f3c4de7fcdf8b9f4a0ff405a5299b5 SHA512 d50d5dbcf728218f7fa3accb7b105b6c879a0fef1382868a1d30159e91dcbb3aa818e986303c0c694ac3d8b00b53e17a66d6b9c9d69bfa8a8d20157cacd5f706
diff --git a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
index d738d22c5c6f..0affd4f5af9d 100644
--- a/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-20.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 DEPEND="
 	app-crypt/argon2:=
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index f2a92d4d2d6c..7cd3639f0da3 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,7 +1,5 @@
-DIST arrow-0.15.7.tar.gz 89278 BLAKE2B 591fbd63aaeb644ab21f0499df7929cdafe181ad9065459677c84347395dcc694e39db47d596b4d3f920e32e3f1e03da1d9e85c8f197d545dd335e9055a65f47 SHA512 28cfc9edbf013ee03bb52c9794333d725a4fc967f0c8c6837931fc6994e08c367763deb193b8eae8b931cf849294bfce3470316c0a1b73340eb96ca1c9d8959c
 DIST arrow-0.15.8.tar.gz 92220 BLAKE2B 8650d31b5b75c6222d86b5e13f253ae6baff66e91044a74235eda4589a47ebf680b31e2007fb13c83287402ffeaa446437aace9124637e6952ef139388aa51fa SHA512 93d161cbeb48636f2e3f91ebcc51cddbb3b21175ae31f5d9251a22358c7d1934663a8e47a82efd8773bf30c28efefcd8d2a3baf581fe191777cd41f12f29d4d2
 DIST arrow-0.16.0.tar.gz 94403 BLAKE2B 9d2ad18732cce5bafdb628a2e9b825e6d1ebd94f7848391c0a0752a802a7e2e8a34afe0da7474df0265c4a83016530a1c070f4f1629c8fee8172812a53a3a7af SHA512 e48316bd31a86d640e50987010bd56c6859e972522e753c00d83730f1ce4764716eb9a22c4aa9aa0d64949f25acb7e1a3479ce0e1c62058fcb887a442f2247d6
-EBUILD arrow-0.15.7.ebuild 693 BLAKE2B 1a17920f4be6b1636a112c4836fd5df0d70752cf731cc5dd6336cacce74a0b7582b74464b153c4665651c9ac9c0c7edb486bcaa8a107e168052a065c54c00bb3 SHA512 737b3519042b7f72f6fb36a03f3cb1ca99940ed6bdc1daeb7b3b0823ad97a4fcc6cc0d5fd2851f9e4f26ff52b40d42b7a857ca8fdfdc47de87ee2005bfd5b0fa
-EBUILD arrow-0.15.8.ebuild 695 BLAKE2B 3f2eba848502d058d2858188e71a227d7f82a512865c3e63a08f5efa3049a002bbd87b93c01880ab4f4253c77131be8368f3a272c6b3cfb399deb3c612212804 SHA512 44d62ab72071526f7fe6a95e0201f5b2d34fbfea7b23ae508417ea7cf32c535810d3910c9ef72638e670bffe834a76d59d4f985a340963baaa724a078583b1b8
+EBUILD arrow-0.15.8.ebuild 693 BLAKE2B 1a17920f4be6b1636a112c4836fd5df0d70752cf731cc5dd6336cacce74a0b7582b74464b153c4665651c9ac9c0c7edb486bcaa8a107e168052a065c54c00bb3 SHA512 737b3519042b7f72f6fb36a03f3cb1ca99940ed6bdc1daeb7b3b0823ad97a4fcc6cc0d5fd2851f9e4f26ff52b40d42b7a857ca8fdfdc47de87ee2005bfd5b0fa
 EBUILD arrow-0.16.0.ebuild 703 BLAKE2B 5974df6331c78efa84ef7dbe22555d20bc963a327446445688199003bd5c539e8e012839eaf24d0358d59ae8494012d46927231bd8ce4a29f9081c403242eb88 SHA512 52894163dbc1fbf14d6f489d1c5300154a57a8d7b243a6b79b4d5c0aa3622e051bc7081e8090e849fece78a9efe0cb7004ab0b4156d415ca116a12e0ed643573
 MISC metadata.xml 388 BLAKE2B 68ef136715f60b69973bcfa1957f23ddf81a8d1cb99d2edaf955562b78f6d92a6187b97f208366b320c0bf140d2ce0d9b62aa9a8d6631b9277f58dd60cfdf5bf SHA512 66f3d1a07042e4e935dcac1e5417893b9fd7b9e97b9f7e3670c85960dc2344e101715cfc11fd2776aeddad8b622c4e8fbe509ee5d93c5250183486a7dd53e16b
diff --git a/dev-python/arrow/arrow-0.15.7.ebuild b/dev-python/arrow/arrow-0.15.7.ebuild
deleted file mode 100644
index 575b3b8a087f..000000000000
--- a/dev-python/arrow/arrow-0.15.7.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="Better dates and times for Python"
-HOMEPAGE="https://github.com/crsmithdev/arrow/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]"
-
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	sed -i -e '/addopts/d' tox.ini || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/arrow/arrow-0.15.8.ebuild b/dev-python/arrow/arrow-0.15.8.ebuild
index be803b27abc6..575b3b8a087f 100644
--- a/dev-python/arrow/arrow-0.15.8.ebuild
+++ b/dev-python/arrow/arrow-0.15.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]"
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index cac8c9b0ee87..3cd2ee35ee6b 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,3 +1,3 @@
 DIST asgiref-3.2.10.tar.gz 25669 BLAKE2B 2cd0328054b218ae8abf840f85c7da6d9183dd5a52cef78176756020eb1f565fded9717fced3bc7fc4b85f9f1ff34b46ea95231b74afec0cbcc5000f9468c28b SHA512 8688d71103dfe569978712481161a88cce9aa6587eacbf29ea42d585817c813625360724d1d561d12456a6580647f9d4a098f194bd780f3c9f7e52a1e0aa8c88
-EBUILD asgiref-3.2.10.ebuild 548 BLAKE2B 7c776c87ea7924f04ae2bcac60b42ee9203e1ea453ce99162081334a705656bd32df039411c87120e45308b5e5cacebee079b2ebca70ffdbb37ee3ec86f847a7 SHA512 1afc809b2684b352f167cab9a846900ae04c369808381c249f48eecc42d7a610014e899b5de88ebb5125504f4a72bfd954cec0f2ea046d558576234d63477d8e
+EBUILD asgiref-3.2.10.ebuild 553 BLAKE2B 2cdfb25bd9f40cb79054b7d3702dc693045c66476d32921d086fdce5fbed39ef69ab2140adff05f3e071d139422c03376bf4f8582585a98bb4387de68a9daad9 SHA512 634b888ddfde6ad601e0c7d7d751b302ba74732c3ad440eb0434da0f1b03edf33765acfb6b855584a39e07ba16450dc4a4564051ab1c17b30f931b7362385921
 MISC metadata.xml 264 BLAKE2B f956660bd90e0c6757ce9a7284329bd8f9d14053624a6ac4a017e5a1ffba57ee084542dbc9ac887756dd64930cdb00e33dd56361404bbbd2d2d27213f84da4c5 SHA512 4d8147ee0077ed9f48ca883928f98dd317506bc25a1ba5c96fcd32870dcefae56ff47560cb99eb23a5339f893d19fa4529cc432afb7999dfa04c727cc6989eaf
diff --git a/dev-python/asgiref/asgiref-3.2.10.ebuild b/dev-python/asgiref/asgiref-3.2.10.ebuild
index a0f13c87fd5d..1990cf757f75 100644
--- a/dev-python/asgiref/asgiref-3.2.10.ebuild
+++ b/dev-python/asgiref/asgiref-3.2.10.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 BDEPEND="
 	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index cc50490fae6e..6b26a908798f 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,3 +1,3 @@
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-3.0.1.ebuild 978 BLAKE2B c7c2fda29da3d3d15f29c059b550573afc57e937de9bf0b071629fd51369d3773a1bac90a07f102b9595cc52c73d6337e61b2036dc50ecc3095f2596530e04e8 SHA512 5bce4f60c5db54a94dec2a95cbe11fe370e1e025310910bf894c8b9f54005b65595f147d0531eb4829244eaf70f6259edc54a40d0ed5dc516791ff0c0273ac34
+EBUILD async_timeout-3.0.1.ebuild 985 BLAKE2B 267484db01e79adaac3a944ec3c40a532aa081f9de39d28519b612da3dd756f19d2cfe62f63e5cc2d83ca57a05b7ec606024acd4a2362d854bbf6464835861f9 SHA512 15a9b00e5bc3bc069aeefdf89f9f01a531995e0668089e5450447783c3a9470cecb5150589c3a6f2cabff3269004454f477d4112c704aee468755d535770e829
 MISC metadata.xml 435 BLAKE2B a3bf9896730a3f697c6a41257e9f3c168154760ffba1cc5d5660a1442a3b5f5f8032d48ae0b069a412e3ef2e792376e29d3a0867a46576bf8b412acca0798388 SHA512 a7a43ad3fabf98be2d846d8a4bea1ff2a867f934e27d9f88b1c76daaf4d4195f8ffc6039f283313dd009566c732bcb0ab8a847e0b6424afdce902539530637dd
diff --git a/dev-python/async_timeout/async_timeout-3.0.1.ebuild b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
index cb2456d5cf47..6bd8c5425b6e 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/backports-abc/Manifest b/dev-python/backports-abc/Manifest
deleted file mode 100644
index 9707e7efaf38..000000000000
--- a/dev-python/backports-abc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST backports_abc-0.5.tar.gz 9807 BLAKE2B 1ff59c61ed95f535d89afa1a6f6c4356bfc76de88e59618f950a536e9d44ce4093cd91ea61a4574c0d2e40c638f90961db8c6e1659996821f4b8532bfdf60972 SHA512 5c2bc01bce8d3ed482bf5d8361a20f9afa3edc1c50280f0a01ffb890690b92296fcbfa68f79677fc3ebba851617f339cb6367ccdd0fadf1127a4e3c030784b7d
-EBUILD backports-abc-0.5.ebuild 672 BLAKE2B 77d7df3b159200dc806f9c4e3eac05227e71c48a36ff78b9017f420d1a7dca80369592dc450a7072b29102df58b63fce10eb4adf74e08e1641b978ba5a731add SHA512 6d206b99eb66ea2fcdb7fcc09e4961691c71175aa33c9f48ac66a1954ee76dc22bb840f50350d86f6958077cc1f8f73df9382fa4fce99e7bb7fb1e419578f6c7
-MISC metadata.xml 458 BLAKE2B 9b218899826e360d19ef39e1efabb2141e6a11a18a4a7887202796680c642525a69f0d925c82323debd4971fe729c5be7e45ccc44b121bf18c5c22db132e7eef SHA512 c9a1b4563f13e731a6b89b0d67a64a30918ff4d8248e36cad0e11e7f040aa268326e98cbd50d507583ecdc5b288473b5c7a5c0be14387ae5294ad607330ed42a
diff --git a/dev-python/backports-abc/backports-abc-0.5.ebuild b/dev-python/backports-abc/backports-abc-0.5.ebuild
deleted file mode 100644
index 5595d053e656..000000000000
--- a/dev-python/backports-abc/backports-abc-0.5.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/_}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Backport of Python 3.5's 'collections.abc' module"
-HOMEPAGE="https://github.com/cython/backports_abc https://pypi.org/project/backports_abc/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-python_test() {
-	PYTHONPATH="${BUILD_DIR}/lib" "${PYTHON}" tests.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/backports-abc/metadata.xml b/dev-python/backports-abc/metadata.xml
deleted file mode 100644
index 06d5bc5e40f4..000000000000
--- a/dev-python/backports-abc/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">cython/backports_abc</remote-id>
-    <remote-id type="pypi">backports_abc</remote-id>
-    <bugs-to>https://github.com/cython/backports_abc/issues</bugs-to>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/backports-lzma/Manifest b/dev-python/backports-lzma/Manifest
deleted file mode 100644
index 4767d145668e..000000000000
--- a/dev-python/backports-lzma/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST backports.lzma-0.0.13.tar.gz 42552 BLAKE2B 85cff01ee9b5481a056fe6fa993a44ec3799eed3ef8e12f98f7b94d8af85c196c3244df4555b957fbdb566416c1bfaa4e8654e16115c9bea986a72bb9d834b3f SHA512 e022de691bc1eef917286da40e2c0ee477300a0af20fba9e972bffd3d0ca1155d5d2607e7601e28d70d1e721b93c785f81adb1c7c73172659ab7615708e55aa2
-EBUILD backports-lzma-0.0.13.ebuild 1188 BLAKE2B 53a9de35ae4e7fa6a5e55dde5f2b1e8dc7da19937d8fb861f6655f83e067d8902b5a9f4c0e8768b295fce4131d3a21cadedbbbc7b8f9c84a7b751c54387e2c20 SHA512 e1ad1c476e4b2a9496dd386a1d0d9174df42fb216ec5a09f416169798a1e16d5eb143a4991c0bc93302e50d24f39d4df17577a895186d0cc41fde508fae1c872
-MISC metadata.xml 391 BLAKE2B d3837447c0258730ec4e5d45fb0e341494c8b29388d9cdb2e212e1118a9be1ae836cf8b5cc0d7ce652aeef359d6650f562385a884a9698c79518066bd9c9b96f SHA512 382866a463cef16a42a0a89b3f1af18565a8e72858ab1c55d7c89e9c8bf87224b3d5beed52beb46ed83b8e8f55bb02a5aaccf15fe027d21de138fed5f9798cd7
diff --git a/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild b/dev-python/backports-lzma/backports-lzma-0.0.13.ebuild
deleted file mode 100644
index 38f82d82fa25..000000000000
--- a/dev-python/backports-lzma/backports-lzma-0.0.13.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=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN=${PN/-/.}
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Backport of Python 3.3's lzma module for XZ/LZMA compressed files"
-HOMEPAGE="https://github.com/peterjc/backports.lzma/ https://pypi.org/project/backports.lzma/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="app-arch/xz-utils:0=
-	dev-python/backports[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? ( app-arch/xz-utils:0[extra-filters(+)] )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	# unforce -L/usr/lib
-	sed -i -e '/library_dirs =/,/\]/d' setup.py || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	"${EPYTHON}" test/test_lzma.py || die "tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	# main namespace provided by dev-python/backports
-	rm "${BUILD_DIR}"/lib/backports/__init__.py || die
-	rm -f backports/__init__.py || die
-
-	distutils-r1_python_install
-}
diff --git a/dev-python/backports-lzma/metadata.xml b/dev-python/backports-lzma/metadata.xml
deleted file mode 100644
index c58f6b910a2a..000000000000
--- a/dev-python/backports-lzma/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">peterjc/backports.lzma</remote-id>
-    <remote-id type="pypi">backports.lzma</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 4f08e88349a0..621944202621 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,4 +1,7 @@
 AUX black-19.10_beta0-setuptools_scm.patch 706 BLAKE2B da031160089a1bf505656b301c0d8b43736a4dab641d4f1ea9cd5c98286e9ed10415cfadbd2197499d8b91553ff8f664a0e782593fe7ae10322b149001a2133b SHA512 ee8356ddf6208a20fc93e16142a5ccc37d471dfddf60e0b40fb4d03045ab2fc7e5f3c547a0cb1dcef032d8a24074d60e8ec413be36e981d2d9dfc39d7f93e5c2
+AUX black-20.8_beta1-setuptools_scm.patch 467 BLAKE2B 4dd16dde09bdb9c9b8480eff2542f11cbe712919dec6678193fae1dd2d58c646c76ecc4831a6bcbb54ed5a7f3692f61953bbb8856e8dcf6b64918ccbf32fe69c SHA512 47df09f60aae9ebbddfdf513d9b6caa30aaf60d65cd21027e965b0544085d63312dcbdc54906a0d1ef0edfaaf00f3cc753a7af3c113f4001ef4b48ca53e04c6d
 DIST black-19.10b0.tar.gz 1008099 BLAKE2B e8a6e286e7a60f880f8b5d37a2b07278faeb4efffd15feb511764e449c36b4e54d5ac5b910f583a15948a2f92eb5e61ae210073be7a57251b2b01e69d2e5b373 SHA512 778909c26afa65548a77524451b50a2692a7b4e297fa52fc80567f7fea94dd5aae9e61cf0f1de718c28a733f1813c8e2c6974ab58e6b0e891de331bb4f245968
-EBUILD black-19.10_beta0.ebuild 1711 BLAKE2B 543b88e3f24b7ba39485fc96013c47f36238b59ac02d457d6cbd0eddcb85d02abeacc688460d3035e70791b453c652f87c538f0393692b7a32a6d2fe6a65b668 SHA512 07b09e094417b1f36128fd27f4bf7d7b3401985ed49c881e56779e1934730a186056583c1f629a24b3e8b79fb1ec6a6d745ce71c9102ac588dc54421bac50a27
+DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
+EBUILD black-19.10_beta0.ebuild 1718 BLAKE2B 3899e9bffa845f2b1353038ff476ac84c4527256f1ed6f2c1924a9c09014744b36b12d5fec28cb9c87a6e84140dc11e6329ada16e6ca3ca1efe4aa9618187b01 SHA512 9485c06c19a2d33dfa628b3e7a705f0c542697c192938d6f025f89e277fcc2669927ca6ecffbd37890cfad4ea490d17371ff9a3b9ba5b828afa5ef0e0a51b6b2
+EBUILD black-20.8_beta1.ebuild 2166 BLAKE2B fe7cd69eb48311e08f0dcb02076e37fcc50c20c1e2a3d5434e7bf33316780d482aa167cee8c13c3b36e7be849c38a52f8e4d80a1ed62446f81ca134dc4c6fe2f SHA512 3cf13c896c167e5bb55dba000a5278080f2cf337c5df7779802b226f5601f5303dca226d7e271678e86801e45bc20d0d0b12b4f4be769af522516e6bcd69367c
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/black/black-19.10_beta0.ebuild b/dev-python/black/black-19.10_beta0.ebuild
index ff49d1d84e1d..8098148cd15e 100644
--- a/dev-python/black/black-19.10_beta0.ebuild
+++ b/dev-python/black/black-19.10_beta0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild
new file mode 100644
index 000000000000..bb2b6a73f63b
--- /dev/null
+++ b/dev-python/black/black-20.8_beta1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit eutils distutils-r1
+
+MY_PV="${PV//_beta/b}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="https://black.readthedocs.io/en/stable/ https://github.com/psf/black"
+SRC_URI="https://github.com/psf/${PN}/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.10.1[${PYTHON_USEDEP}]
+	dev-python/typed-ast[${PYTHON_USEDEP}]
+	dev-python/regex[${PYTHON_USEDEP}]
+	dev-python/pathspec[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/dataclasses[${PYTHON_USEDEP}]' python3_6)
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/black-20.8_beta1-setuptools_scm.patch"
+)
+
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	local version_path
+	version_path="$(grep '"write_to"' setup.py | \
+		sed -r 's|[[:space:]]+"write_to": "([[:graph:]]+)",|\1|' \
+		|| die "could not find path to write version to")"
+
+	[[ -e ${version_path} ]] && die "could not find path to write version to"
+	printf 'version = "%s"\n' "${MY_PV}" > "${version_path}" || die "error writing version"
+	sed -e 's:setuptools_scm::' -i setup.cfg || die
+
+	# don't version lock dependencies
+	sed -r -e 's:("pathspec>.*), <[0-9.-]+:\1:' -i setup.py || die
+
+	# make sure that setup.py can read version
+	export MY_PV
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	cp "${S}"/src/black_primer/primer.json "${BUILD_DIR}"/lib/black_primer/primer.json || die
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" dev-python/aiohttp dev-python/aiohttp-cors
+}
diff --git a/dev-python/black/files/black-20.8_beta1-setuptools_scm.patch b/dev-python/black/files/black-20.8_beta1-setuptools_scm.patch
new file mode 100644
index 000000000000..368c21812e24
--- /dev/null
+++ b/dev-python/black/files/black-20.8_beta1-setuptools_scm.patch
@@ -0,0 +1,16 @@
+diff --git a/setup.py b/setup.py
+index 12fde25..340d2c0 100644
+--- a/setup.py
++++ b/setup.py
+@@ -47,10 +47,7 @@ else:
+ 
+ setup(
+     name="black",
+-    use_scm_version={
+-        "write_to": "src/_black_version.py",
+-        "write_to_template": 'version = "{version}"\n',
+-    },
++    version=os.getenv("MY_PV"),
+     description="The uncompromising code formatter.",
+     long_description=get_long_description(),
+     long_description_content_type="text/markdown",
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index 0a0bf036ac0c..1bcf885a13df 100644
--- a/dev-python/blockdiag/Manifest
+++ b/dev-python/blockdiag/Manifest
@@ -2,5 +2,5 @@ AUX blockdiag-1.5.3-py2_7-test-fix.patch 551 BLAKE2B d7e44b823390b6338bdb2d33cbd
 DIST blockdiag-1.5.4.tar.gz 2693073 BLAKE2B 8a825742b4144667153af00d5e334325f8a3b49823355787dbd577729da8b0fc221ead14ab899ef8aef1800bbc2cdc47f060330bf0a2f2f1bcd055d172d8adbb SHA512 0eef8b3837282ed611e044ee618abca1f799b4a151bc2d7cece140c97ac728b2f3b9a3bb6877d3fed42a74e0173d0cbfd2966521c4dfb21c266975b4062405d2
 DIST blockdiag-2.0.1.tar.gz 2694776 BLAKE2B 289bbeab89dff4e8274efb9e2061b1e412e29bfbd663f64b55346ee09d09279e0813347c51b6cdc9e547b417eba637a85f7cb37f48006467bfa1c9875a113971 SHA512 07690882b05d4cf7be04245e183a7c54d9cd4acab3bb4b5e170b7b0f9229d6ea42eba4dc9fab47604c1572d3c4b09de96cffb610c0c31882b9c0b150f0e76d89
 EBUILD blockdiag-1.5.4.ebuild 1750 BLAKE2B ece073452af02fe443aeac91de5684691fd0f7cb61a59d3ffb115e68c9a4c450c652ba9ab6d0decef9bc37d44ccb4e723ecfe9702eff91a975d7e2758debd854 SHA512 14d788ec56261ac0ee8d7c9c64bdc3e57ca04e5ae1c17c114ee239846cd0e1e0fb8b1f071587207968abb4f4d34f67a7ca481c2f2d6cb5bcf8faeae211744fcc
-EBUILD blockdiag-2.0.1.ebuild 1679 BLAKE2B 4cae7b80498e67fe1710d71fddfbb4821aa3c53c89cdfc6fe2765c132b367fd73c1c003a4df823b7a19672a422b1a568b9ba77418522305a1f2d5655f48f460b SHA512 b7c6a838931d5d53b5351d09b3f5792fde701eb8604b4ac5ab5f9f8e7555cff49a28a9f3297dc2cf0832bb4e8eea760f237bbadc69f9ca83bb94c1cf681333c6
+EBUILD blockdiag-2.0.1.ebuild 1686 BLAKE2B 22f52a02d176b94729e44931300f55cdf9f0ed305e373445e916eb62abdd40a5a7cd09dc5bc6f308be459496a516cfc4133d2b50d65ffc809517f04c55ac4e04 SHA512 184c036ad8a93e5fb9ea71031165e69ff1b6b084483064c22d59df325956274bbb11655127d05a9c329d761fbe2df43c9b848c5420eb807fab976ca06e7950a3
 MISC metadata.xml 749 BLAKE2B e61c5eeedb3b8fbdaf84f013ae7b59c9502385583fb24728810acb9bf1996ad6fa45a4719b1f34d59081ddebd331b161e43c1a6fc74c357ee138e646f20adc22 SHA512 f3733f81850b4e1c332207c31ffe1a371e021fc9628246dea2a74f45cb0aa2812afcbf7311279fe618071fd3da876da6d4343a057d7c939fe20bc15d052cca72
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
index a7cc79d4de7d..ccd2cec158a2 100644
--- a/dev-python/blockdiag/blockdiag-2.0.1.ebuild
+++ b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/boto/Manifest b/dev-python/boto/Manifest
index 9348d7b1083b..7cca41d5478f 100644
--- a/dev-python/boto/Manifest
+++ b/dev-python/boto/Manifest
@@ -2,5 +2,5 @@ AUX boto-2.49.0-py38.patch 2061 BLAKE2B a17cc48925216f333a12631051f177c9d91199ed
 AUX boto-try-to-add-SNI-support-v2.patch 4329 BLAKE2B 3be0a3a88bc252bf8cbf316d3198b58ca86ee61e991400ce1e27854433bcf3709718593c58ffc2e2ad16fa41630a54670a4b7d42efde572073adf5f5f95994e2 SHA512 48b1fa089138a22ca9749fe82a1d92abf7570edf87a6ffc48f9b2389baed8982092afc2cbf1e35bf0661f185e96ba2b2b6d21cb2c553d6d884e800805f013a9a
 DIST boto-2.49.0.tar.gz 1478498 BLAKE2B 6a897ea162f5f4bd34a2d488a3e3897f7f2f5b8707dd0922c01b6a0b90ea577223bf3e588b6685bda1f2bc0e92af426711fcba67a70377183465a530065c6c84 SHA512 2175cf30cd25bbc05812e83e5ade7668c3e21b1bb09aa1b43f0f0ac7d6967a646394fb52c9be673ebb65618c5b33a52d6f31f6da702f5cd1d6c9a18169476dd4
 EBUILD boto-2.49.0-r2.ebuild 979 BLAKE2B 08fb685e67b9ee564a1dc69591361a8ea49b9f2b5368f373aaa7a6f9f3ba936c4196d54880074f12fc51129c3839f22abf8d08626698169fc92d745e6e942b05 SHA512 85ca95a2a703e2a49302917cfb6e39b5c65301495d9191c2b64066f29e17bfc324a6c7ee70ec147917f90740153fa356b9aa86eca9e8132839a34a5812709c96
-EBUILD boto-2.49.0-r3.ebuild 1312 BLAKE2B 50b28f77c15a23b978defca25439735b27168253a5566e3fcc4e81de3d914e0cb235f4f02fd457c73d37ee05cbd0f5fb626893d0e3ef5d68ee97ec235d253407 SHA512 a86ac0d9fa6761c10d4e456c380c8f3ab36bdd9045677aa56c637624f6b4d8c3f2bf5bbf860e029192a208bc6880329eb9b369b063e6d5a266337e240f74f905
+EBUILD boto-2.49.0-r3.ebuild 1310 BLAKE2B bd06cb61e052ba15060dc57c3081a2c9182e93c87c14d605fbff0d8788e417ff7ac6e1b5e16f1eaa2cbae8efc1be0e849e54f6b195a451a001e85e95167366ec SHA512 13dfbd1d01e47416ea93b6d3e0fd2d5f06bcf97801dd50634d76021e43bc94044047842c0316010eaa7d01d63c6c5577db0f47da36c0937d500b903d8415e954
 MISC metadata.xml 419 BLAKE2B c6c19e4ba3ecc5a36b535267b75cdf3afb7317e577e8f0899d43a334632633d771b5e5216517537616cc99c7766a852d2b4c5b132e174f8481d86649253e0897 SHA512 ee5587224538b14f67c30eda60c161e4c07c801c4b4edb24bcb0350e17c4d655c4d9a6907ebe5913d7689e1b6078ef25f47b4fe0a7c655cfa8d5ea775b4d0329
diff --git a/dev-python/boto/boto-2.49.0-r3.ebuild b/dev-python/boto/boto-2.49.0-r3.ebuild
index f95376448ca5..11eb86131a9c 100644
--- a/dev-python/boto/boto-2.49.0-r3.ebuild
+++ b/dev-python/boto/boto-2.49.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 PATCHES=(
 	# taken from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909545
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 2e325f51e797..fa8f4b37f0b7 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,8 +1,12 @@
 DIST boto3-1.14.23.tar.gz 299581 BLAKE2B 57cbb3fbd9a84f334b5874ca96490cb0269bb79f3fd2b50d4c51efcfadaa41b2e11853266ba12544b77999fa85fefb0bdf84d924667c4092b3deb72f41e33a21 SHA512 263b2abf3c220d3fb3d7acf4cd87266c11d3dcd5d7ffcafb0aab128b1e324d6f99c44de8abfb621b153b5fc51b9823b6b79ea5c529f6c59c548c900015bcdb5e
 DIST boto3-1.14.31.tar.gz 300720 BLAKE2B 9dbd002e299c629f28037572c615a00612c80773006c344797d0ad56c81c240b56bfc56e8ffe52e3b404c77a56318532aadfa2d008c254e70f7bfa91e40b7e1a SHA512 e3fe0041bbdc67affcf5d5272c26aa14ef0fa546af2efb99187311bee23531181ab1f1ebc69f2c3ed8250140642f4402334ebbc9acbf422641fa6abed5d5815f
 DIST boto3-1.14.46.tar.gz 301815 BLAKE2B e389e7e0cd9ed0907fd13a948bf37e00040e32029d7720f5a720c8c9cb3cf1fb157bb665032b4ba594b3b5f50129088f26f004535fc4f8fe72f32ab0be6ce9b9 SHA512 aa1aa0155fcaaaddcfc24697211e8f5a69eab1282a185f0cb76b02d63d1426c02ca3be71be980214484a351159f6bcc34c3422cd11b9a556d67802c01a06aed0
+DIST boto3-1.14.49.tar.gz 301978 BLAKE2B ab27aab54b7e1b531ae063e3a84691820208d5d229664d07aaba4c184d5344eb2a620bd2cf4cd4dc4555cf014926c56c89ee29a9832d7ede4fa46b025914a135 SHA512 bc66702f869cb41c6c6dc7d6f82eb09c962122e108d02daf2c4ee408b7a805193f2f4f9af0c5c96775c8a79975142d1154a32c2fe86b0c6aacd18617ff2934c8
+DIST boto3-1.14.52.tar.gz 302219 BLAKE2B 97b93e7e203aba7e0dad8bdace83ac41fb85b5880473721543160dc19da52559db3e095edfea8e0946a8915e1a3c396de598b76a35221a64226d602199b8301e SHA512 f65473d91d45bfbd036413b63ee62688bdf9318a09fb81d7e83d5655b785a7b6b626ec7b61ddc1fef8f3fc46c7acb7becefb632d4ae931335a4568451596673d
 EBUILD boto3-1.14.23.ebuild 1229 BLAKE2B 96cd59f3b6d4e9be48608381293cfef71ffc5fdbc4785e0fc61e7550a150219ea392724d60258c71a48798adf7c865301501ded5b6157731a6a8b278b2a07e9a SHA512 76ceac13c7b47f2653146eb37767355e4585931c5272c78645802a4f61744c765eda7d961b29dd114eff4b41f2309150ddafccdfb5dc94538636099b809cfa0c
 EBUILD boto3-1.14.31.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
 EBUILD boto3-1.14.46.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.14.49.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.14.52.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 32d6cf48455240fb127d359f94ab09e45ec78655fbd63a5a1f29cd5a2b3de2941599c7d7068abc186b6e25baf13456b5e52958879871a5a8fc338b87e087fceb SHA512 58d3f3b2a1c04252e9c7527ccb094ec7ca41c9191de1aab85b4f6b2c6babe0c95d43f189031d2c8d1da2b35689d3ece1c27cdced6ecdec596a286893e05a5f55
 MISC metadata.xml 668 BLAKE2B 0fd93bc75c34b2348e49e39aa58d6404fc0bdeac1129a1c5644262973b08fc3f9afe371fdf9ee87ff00fd0aaa18b86bfbdbf86394434661b5253ae9b5b9dacd4 SHA512 ab5ea5b31b95ce548c12ec80f2261b98fb0e51b34218c23bafbe7cc0ac792b0680b5886062c2a016bd58ceaf1cdebc7fabade37edae756851895257b1ef1fc59
diff --git a/dev-python/boto3/boto3-1.14.49.ebuild b/dev-python/boto3/boto3-1.14.49.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.49.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.14.52.ebuild b/dev-python/boto3/boto3-1.14.52.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.14.52.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/botocore/Manifest b/dev-python/botocore/Manifest
index 5a3b647473ce..0a83b3e05e1e 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,8 +3,12 @@ AUX botocore-1.16.7-unlock-deps.patch 598 BLAKE2B 27b0c4d42da15c009c1a9181a757aa
 DIST botocore-1.17.23.tar.gz 6564852 BLAKE2B cc1da91f4a45964fe684b015de9db253059241f654dac93901cde5dc24f3ab3595ecd201be91bed36236bb885c7ec7aed998025f6c0ea8b050c13d17a6431238 SHA512 93af672e8d110ab4989e9abc20b3bbb1a6c9050c379bb1db8542e9027e6a4ee82083645c59211204d7110e112d393f80f87d15b77337a4d73358f43d39f6e52f
 DIST botocore-1.17.31.tar.gz 6665851 BLAKE2B dbc89d1216f9fda89c6185baccfdf2878c265d8761e4ad1349a45d334f9a4d5b79ad1ce06a19a7a706b75be1a6d7f2a7bf5bc33d8ffbe7ad8a016472edf0432f SHA512 ab1921fae887846d1c224d624e8d5dd888ab9c0c90a415ac97e5ad2f7563131b199e8870553e7f3dd6f5ff4c7901aa04bfa99160aca4e9da8ef3096cfd922ec9
 DIST botocore-1.17.46.tar.gz 6738493 BLAKE2B 2e5ee1241af91c19cef0ac575c5ad68d46277e8b2f0f1f719428f7b4026303a47e48b8a8240c1121cfe35c6310be5fde3f0cfa2aa3f3321249811eb510b47f94 SHA512 a11de252454477d478f2b5d0b5978b24961baa3942936ef5990c421709d0b8081e8dbf020b76cce5c3c43d3fe0467cedf5441918767163712e0ad178c9cba80d
+DIST botocore-1.17.49.tar.gz 6765351 BLAKE2B c5c40c37d1f1f0f1d7e059a1b88025039be6021723d244725de28d453789a51b19c4feed35d7c862a8238e5d2b4d77fb83f0b0052ce7a7b31c26e024b7be4321 SHA512 912a25c98fa08a89aa8511f00a83712525eaa11a1c8137da3e569a993c54d2c2a3c9566ff88f91cede34dc1d1b155f21ac037f2396b3b3339ddc2c2be7c400d1
+DIST botocore-1.17.52.tar.gz 6778122 BLAKE2B 4afb88a7990ca4cd04f113a75f00dcc26569102a3a3b8ad991073577178a86b56b607888ed8d70569affb03fc77d3f89060a1a34059dd33a457eff4f3c31eb5e SHA512 97de510725dcc2db9c57d7e9415f5c22fc30a2737c3785ffc32e53a56cb542dec06468b3a06bf03ae0ae2eb913628b68ca104b1e8f211e5c580606422e5f3267
 EBUILD botocore-1.17.23.ebuild 1597 BLAKE2B 7b0b186045fbb385188e87b9f81699e4392f667b870870fdff142b83e9baaddbbe6d6003466326f6652ebc9b274453b06a2d9c1a33277c852193a46170df493b SHA512 4d2900d96ab5a9eacb101f75543b47ff4069fe5d52ec5acf239ba432cd12abe53b655f7d291551a7b4485fe5022cccee93caeb5470214b5c1e20d4421a40dfc3
 EBUILD botocore-1.17.31.ebuild 1606 BLAKE2B 15b1624c806724dd4cf8f86099a4f9049214ab9c0afa47f0211c0a5f66fe37b6ecc03db5448bfb3b4764f8eda23e19ab9f37bbe1461837bf0dccfae7da17faa7 SHA512 b5e16cf97b370e96e814c413d80793684a1579d293bbaf16b435de83af274efb299dbe42fb824c955b28099c50841c46124c8212bd539861ff01b278e6a7ee3d
 EBUILD botocore-1.17.46.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
+EBUILD botocore-1.17.49.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
+EBUILD botocore-1.17.52.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
 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.17.49.ebuild b/dev-python/botocore/botocore-1.17.49.ebuild
new file mode 100644
index 000000000000..8737f742498b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.49.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.17.52.ebuild b/dev-python/botocore/botocore-1.17.52.ebuild
new file mode 100644
index 000000000000..8737f742498b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.17.52.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+	"${FILESDIR}/botocore-1.16.7-unlock-deps.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# py3.9
+	find -name '*.py' -exec \
+		sed -i -e 's:cElementTree:ElementTree:' {} + || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/cairocffi/Manifest b/dev-python/cairocffi/Manifest
index 537e50dc265b..3a0cb78634a8 100644
--- a/dev-python/cairocffi/Manifest
+++ b/dev-python/cairocffi/Manifest
@@ -4,6 +4,6 @@ DIST cairocffi-0.8.0.tar.gz 79217 BLAKE2B fefcee32e486c150d089b7d13b046c864b83fc
 DIST cairocffi-0.9.0.tar.gz 84652 BLAKE2B 9f09c038619b0f44c568d6636861b0e12ffd7e9ab546f3a65bbd8e77eee7ff5f0c6f4d92a841696492b786d0067af86e25949b723ef6ef73ede370fbf2576d6d SHA512 0d3d54e0d54b3696c8336d8b3a6d745628da51d9d9f8c50f36006c007e1432a95dd9bafd8d865923059d040cc4e9f7989b3670a5318383b357ffc979eeb920d5
 DIST cairocffi-1.1.0.tar.gz 68744 BLAKE2B 604812572bb1a39ab52e41e03714acc93ddc7532e07ac36b693f53ad71cf0bcfd5d2f3bceb56b8e352fe7f179b174a244238b9cfcee690cbc0cb96e5b2934c75 SHA512 a9bc9ec5be767388aad9d06cc3b386b474dbacf097d3558b4033834cfb2f5418eede2f4b4080bec7e4725c6821f6e54d6c3366e8c4ee73bd3fa1cf444b395197
 EBUILD cairocffi-0.8.0-r1.ebuild 961 BLAKE2B 1d0a9cb41737b18a356c3edf2b3659007fbf4ad3ebd161fa10cba51c87f1d9135368e6dad1e6d2018c7602313bb263d7becaa34675da26da2f44c108cacb2026 SHA512 75161a3bc22139d5196831ea4bf70a61fcdf7b04c54361da157e6d903ab463e7a582c475a0220065c5f8250a383d9c8dff881bce8e7cab939156f0f6ca6276a3
-EBUILD cairocffi-0.9.0-r1.ebuild 1146 BLAKE2B b6f2c3a480e75ba1dea7ac544bb6a36288437b9b02b0b4a8d0bb0654f0a61305cf04ba67226aca73b270763f0dc0347a2f1d8058ca8e26772633e2041eca6564 SHA512 2551858fc4cc26cf16fe17cdb5ddb5191a7da822f479d3905b0201613eadcd9bd46f5e7a5b1b1818263d65027c64e8ca7ffdc3e48cd5384e227cbb26858e5b32
+EBUILD cairocffi-0.9.0-r1.ebuild 1143 BLAKE2B 9358b64213b6a41020163076b88f9e553462e4fcceca326c10eec0203d9e4d058218164b94aa348ccf19b5fd082d4a9345f596809d2032dd3f4f07d10b6d80ba SHA512 83defdcf8d2ef9db15b6cc388a5bac489f0423929d0a271601cea2078bcbf407424726a31dca2c0f579739d181fe2b615754ad10e2055e7d6770ee7222f7775f
 EBUILD cairocffi-1.1.0.ebuild 781 BLAKE2B fd97362eea8415a40d9cc60e7bfca532b3f095c2ce3cac892269c6bfd6865ba8b79fddbcb1640ecf8ecb798d5295dc311a7fa47d3d50d87f601dab22257e2d8a SHA512 2a0e41a651bc2918ffe90624ede77ae31d6a7e6cba871ac0c416efcc22cff4f6032817438a67a8e9eb9af2d0230c9bac580cc5f79c29e64cff9d18f9003ee8a9
 MISC metadata.xml 379 BLAKE2B 75baee69a9fff6d3c571bded0b1e6cfd8abbdfae7262faa2215fb3251ace498c33119ebe3bf74e4e4e0b2d1ba620b9bc60d4daf244917098e17c62af24d4b401 SHA512 b0bdbb3b144675f9e90a0421c694e0f0a782dbf315dd8203574bea69b9389d49d377797a28d9d86588d062e15071c1fe226dd4166a4fbf8e95a852d46cc20215
diff --git a/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
index 6793e7f9b0ea..876b548c4b6f 100644
--- a/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
+++ b/dev-python/cairocffi/cairocffi-0.9.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/cddb-py/Manifest b/dev-python/cddb-py/Manifest
deleted file mode 100644
index 096fc44c1041..000000000000
--- a/dev-python/cddb-py/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST CDDB-1.4.tar.gz 39562 BLAKE2B eb78c033138f18f3105e4a40823e2ec5f09ea57e3f6a6c4b21811b4f79155a068b9a3fe13f505aa76006e5d3c9061bd3df44d0f9808281e64a44f68a4e51a313 SHA512 578ef74313cd164f28682ed7e8b26e7c4e7fbac972f7c3c2fecfe31e6bc2ea8dff0c79adf9b6fda77402f9855d809819f56c23e4ffa68404d8cde479a15f740a
-EBUILD cddb-py-1.4-r1.ebuild 448 BLAKE2B be4f3d5ce1957cfc239500a3c413eb4620d9bc5bfdac7c3c3211941b15d7b1bb4182ed72e49509437421cd6a8b8fa426157cdf68168c0cb1d353dff07cf305c9 SHA512 5ecb50ea2f1b913ccb632f12d6fc3a816f9a5c6a1e4b6dce6347bac40a697c40e9cc0bb5c348d541a97932af088068407851be0daa5933fc9bc7398c506112d0
-MISC metadata.xml 317 BLAKE2B 2a0fa025b0009e3ea93b32fe28a9ba149ab9957f5e80f9cc5c72b26c93b864b0f84578e8d239a1a68d1bc5b4ed3bc79de27ad6872f9e547f8b9d9a5822c36550 SHA512 0d75c20dea50472709d216688b12e2e3781ce50bd863b7d90d9e42f5044dd723913cc874e3098c18aa52e26521c5ef533284ddd1e59e78abd8760dac4bede756
diff --git a/dev-python/cddb-py/cddb-py-1.4-r1.ebuild b/dev-python/cddb-py/cddb-py-1.4-r1.ebuild
deleted file mode 100644
index 4653bb79ced6..000000000000
--- a/dev-python/cddb-py/cddb-py-1.4-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_PN="CDDB"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="CDDB Module for Python"
-HOMEPAGE="https://sourceforge.net/projects/cddb-py/"
-SRC_URI="mirror://sourceforge/cddb-py/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/cddb-py/metadata.xml b/dev-python/cddb-py/metadata.xml
deleted file mode 100644
index e2b55b3f3ece..000000000000
--- a/dev-python/cddb-py/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">cddb-py</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/cloudlib/Manifest b/dev-python/cloudlib/Manifest
deleted file mode 100644
index 38a1475c39cd..000000000000
--- a/dev-python/cloudlib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cloudlib-0.5.0.tar.gz 117422 BLAKE2B 358bceef2a5331fe75a63469b8562bab7136f3608d5f695e9cb86f498fa06299fb767a0148e67c1a6911838b30ff354a0e8f5c5114039323f19b9e59be1f8b7d SHA512 fc400b89045706638fddfed5a6bc5e48995106dc02a216bbe8ae32e7a01c1d4d4fd2a22c7aa914a7fdc8197639f82d41cc2d7071873234e171d3fb7f434cdabc
-EBUILD cloudlib-0.5.0.ebuild 627 BLAKE2B 09bee8276264573bb54c8481a5df1facd2925b982f0bc234c481b2bc9d8558b56419e7b054a83902bd8bdd8435dd002c4e421486e7b7a0fac6bbcf9c2684974a SHA512 30da8fde3aebf91b49eadca72d9b38647aedf7991c9d6fab0bded4a6dadcb1704f4bbddcec04d957d136da2253ed6b6593af388dc33c3a68677ec8b672657310
-MISC metadata.xml 597 BLAKE2B eb76497b06f3ba5007a38c13f57b099a037d75ad14c5cbaa42e3352b7c1bc05df41d6e1ba4c1f4626800aebbe95003a409b9ef6ec927ce15bc62c5a0de5a1184 SHA512 94c2a4bbbc2e6d33444e1afc6f18923a35fd8c3794cbb59ef5d08fcf8bd9ac029901b0b4b78ff75563eed0afa707083e9188408d2b54f137da710e3cbaba0074
diff --git a/dev-python/cloudlib/cloudlib-0.5.0.ebuild b/dev-python/cloudlib/cloudlib-0.5.0.ebuild
deleted file mode 100644
index 32b98be82734..000000000000
--- a/dev-python/cloudlib/cloudlib-0.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=5
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="Cloud middleware for in application use."
-HOMEPAGE="https://github.com/cloudnull/cloudlib"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=">=dev-python/prettytable-0.7.0[${PYTHON_USEDEP}]
-		>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]"
-
-python_prepare() {
-	sed -i "s/required.append\(\'argparse\'\)/pass/g" setup.py || die
-}
diff --git a/dev-python/cloudlib/metadata.xml b/dev-python/cloudlib/metadata.xml
deleted file mode 100644
index ddb35c23b3eb..000000000000
--- a/dev-python/cloudlib/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="person">
-    <email>prometheanfire@gentoo.org</email>
-    <name>Matthew Thode</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>openstack@gentoo.org</email>
-    <name>Openstack</name>
-  </maintainer>
-  <longdescription lang="en">
-Cloud middleware for in application use
-</longdescription>
-  <upstream>
-    <remote-id type="pypi">cloudlib</remote-id>
-    <remote-id type="github">cloudnull/cloudlib</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/cloudpickle/Manifest b/dev-python/cloudpickle/Manifest
index da509e8e8ec6..8d9e44e1bfb8 100644
--- a/dev-python/cloudpickle/Manifest
+++ b/dev-python/cloudpickle/Manifest
@@ -1,3 +1,5 @@
 DIST cloudpickle-1.5.0.tar.gz 50992 BLAKE2B 8536362d455c5688134ce22d0bb2c5786da17336c8a907e8cf9e39833df03a6061ac901e45e85907a54e8d9b404f21132d4d944adf925a9056f0334eaca50904 SHA512 75356e3e5ade2ee5941b4cea576f1ffbab5d9b1a86eff23dc9275974f592c947d0b3b29d335b4dc38be16e36c89c8fc65b2883ae90923960e605502c777d9816
+DIST cloudpickle-1.6.0.tar.gz 52743 BLAKE2B 9007ebd4464adc0cb203e596cb756176d17ede5cfb90d172e11630df3e0a93dba471d8b20aaf750701cbbf1fdfb4a5faf24a75f8df82aecb4b77bd62c8979027 SHA512 3b663a013d1512b732b13f38bdf2d5d89704a73577c9fee2a6e808882d42ecc1bdb3589b1cc61279ec621b6dac27d8e223b2fd839442e2d5994892f04d015535
 EBUILD cloudpickle-1.5.0.ebuild 802 BLAKE2B b542010c2ff549e6938b99289baa5a334d84147bdd43cd675553b0ca0301286a99ac1709af4705092c258009c295404a317879af2ff6beab5ac3177d29b3da3f SHA512 8c9d3160b2106cfe3bc0040110d68e7374e1b327253219b6825df8415124a2fa4645cafd00771c0c404a0714ced80312456051717aa8234b57beb30e87b6b86b
+EBUILD cloudpickle-1.6.0.ebuild 805 BLAKE2B 174372759bf858c7fcb3342b0c3b1998fcca22c53f709af0458880210c7c39066786769525e5aa84f8317eb7346b0b902c8951a6dca2c95e95930ef9a31f225e SHA512 2c6f12a485943ee98fb68067bbc5df1e14492c105d566acab6350d3f20dfe8516564ceb6ec80afb8ce65230d3053de3bf254a5fb34e35814fe5df4951a761ea4
 MISC metadata.xml 349 BLAKE2B f7eeb1b4942b76c75c613e051071f3901bcd71892208d6a27121a212854f1b840914fda091f7ff7fbb085c07a38b4bfb7bc10131f82abece68d136b13199f853 SHA512 8321d76e26a00e6d3f27179f0fd158e2675c5d577861807251cb81664408b91e43d6a4e0917c2c846570a07388d6a36c51c6c3739c91a8d148aef9d6549b3623
diff --git a/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild b/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
new file mode 100644
index 000000000000..198841d7c8ae
--- /dev/null
+++ b/dev-python/cloudpickle/cloudpickle-1.6.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Extended pickling support for Python objects"
+HOMEPAGE="
+	https://pypi.org/project/cloudpickle/
+	https://github.com/cloudpipe/cloudpickle/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONPATH=${PYTHONPATH}:tests/cloudpickle_testpkg
+	# -s unbreaks some tests
+	# https://github.com/cloudpipe/cloudpickle/issues/252
+	pytest -svv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cmd2/Manifest b/dev-python/cmd2/Manifest
index 7bb09a849cb4..4c8b2587aea6 100644
--- a/dev-python/cmd2/Manifest
+++ b/dev-python/cmd2/Manifest
@@ -1,5 +1,9 @@
 DIST cmd2-1.2.1.tar.gz 623518 BLAKE2B 69aebdb6350c453001b6101988d9b0d3d96ca7970c54cd59d3aad6e01b3e7133d62b57cb44588cec786ea21818d8c5983e5bc64510e8c6f07627505f14c28651 SHA512 5f7259111ed8f5719c230c33f6131c8464f5500ba14869d26e9f52850ea619c2b97ed950774930d9e19621e98c64b50c67eaff34277cd81463b60f8dcf6f04a3
 DIST cmd2-1.3.4.tar.gz 641801 BLAKE2B 0d85cad11613aec5d58d9130f4edb46b038abe3ba02aa84570cb5c34100d02f7b5d0fa92cbc49a71d3be19b15f5b380e42d4eac28a609fac4f1e9d0c8b85fc34 SHA512 a8fcb7448e5afde392921ad15c0848c3396b91922f10fcee925721860ee74f678fbf43d334091e201b9e6612e4d70825762a03a870f2e4aa1f82a43b37c5800c
+DIST cmd2-1.3.5.tar.gz 642337 BLAKE2B 85003cbe6161b280421ef05280171d4c76092240b6b060651be58dd7ca25562ef5666760d5261bd6e94d76598b24861eb1986ec8046813f698d2d789682b2b1d SHA512 39d0142eaf238005787786e2033187d512073872a032d5bd973f81ef07cbc43a660c2c0c44175115ba25892aba9407789c21864ad19ea2ff287a44f37da6929b
+DIST cmd2-1.3.8.tar.gz 643320 BLAKE2B ca9eb089c4d1a5922d3f762e9fe118168349c807b770265d2e565a183447b938f08da578e0dc7de4a59a52fc39df2b53a63c84c1d86efd75c0ba58950bbe9a9a SHA512 af2b56234e0b257c4de564d46f4be83b56c37fd903ee737e825779558e44a9b60164bac1c0bc35a79c8aa1ba80155331c496c310e5ecad94f984673a30ef6976
 EBUILD cmd2-1.2.1.ebuild 1231 BLAKE2B 94e7f09cb9e2fc73c5e831ab193be8a723cc66fba42dcbdbba7f51e2733f6b736ba6117366a81eb35fffcf80329201ad4a1280ea1dd189ee3b96c926c268c2b1 SHA512 4a746cb023b3ce7afcc383bfa1a4abae0e5be4b0bb3ea90649e474fecb2a16b7c7767b636a3c8ab7150ec75c3d2dba80a07e055720d7f900020a5ccfb6f10879
 EBUILD cmd2-1.3.4.ebuild 1237 BLAKE2B 6ba444387e36ebcc11511c30b0f8cf9577ed63744081deb292a411a2ca195b1c58200f496841390305945d6f0bb31cd993ee98f7ea992e2a51c3adf0cd157f57 SHA512 6ad20be1300967b792426b458dfbb8d7578edf96e8dcc4e592188a62a3e997e2b869bdf04009dc367ebdd53a40ff73d020e3d0683f378263efb5b3be51dd8254
+EBUILD cmd2-1.3.5.ebuild 1237 BLAKE2B 6ba444387e36ebcc11511c30b0f8cf9577ed63744081deb292a411a2ca195b1c58200f496841390305945d6f0bb31cd993ee98f7ea992e2a51c3adf0cd157f57 SHA512 6ad20be1300967b792426b458dfbb8d7578edf96e8dcc4e592188a62a3e997e2b869bdf04009dc367ebdd53a40ff73d020e3d0683f378263efb5b3be51dd8254
+EBUILD cmd2-1.3.8.ebuild 1237 BLAKE2B 6ba444387e36ebcc11511c30b0f8cf9577ed63744081deb292a411a2ca195b1c58200f496841390305945d6f0bb31cd993ee98f7ea992e2a51c3adf0cd157f57 SHA512 6ad20be1300967b792426b458dfbb8d7578edf96e8dcc4e592188a62a3e997e2b869bdf04009dc367ebdd53a40ff73d020e3d0683f378263efb5b3be51dd8254
 MISC metadata.xml 521 BLAKE2B 0246c37d4e3d54c54b632fc75eb51b0b6e1ff3fcf6be8218a958c9483fb0248bfa3238ed31ab9631f41b12bdef71704649423bd2b44a322ec0b4cfb20a6026f2 SHA512 6a94c23d403d07e6d8e980e4c11ed1a1a0de4707417d60b539a4acc50312d1a9604d9d7ee55dd232c51c8fa6fc24f10bd28e9cc80e2a6f143086da448f78f924
diff --git a/dev-python/cmd2/cmd2-1.3.5.ebuild b/dev-python/cmd2/cmd2-1.3.5.ebuild
new file mode 100644
index 000000000000..cdd3428887c2
--- /dev/null
+++ b/dev-python/cmd2/cmd2-1.3.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/cmd2/cmd2-1.3.8.ebuild b/dev-python/cmd2/cmd2-1.3.8.ebuild
new file mode 100644
index 000000000000..cdd3428887c2
--- /dev/null
+++ b/dev-python/cmd2/cmd2-1.3.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extra features for standard library's cmd module"
+HOMEPAGE="https://github.com/python-cmd2/cmd2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/colorama-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyperclip-1.6[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.6.0[${PYTHON_USEDEP}]
+	' python3_{6,7})
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:test_which_editor_good:_&:' tests/test_cmd2.py || die
+	distutils-r1_src_prepare
+}
+
+src_test() {
+	# tests rely on very specific text wrapping...
+	local -x COLUMNS=80
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index 9d6dc307626d..d91d6ce1e6ba 100644
--- a/dev-python/cookies/Manifest
+++ b/dev-python/cookies/Manifest
@@ -1,5 +1,5 @@
 AUX cookies-2.2.1-fix-warnings.patch 9038 BLAKE2B 78692c413a2a5495dc43c544cbc27410a341088c8ffc8cfb8543ef0a6f7e7393ae37379912dada2cf0e4ce8b238160244305869a12629ede435dfcb6df334910 SHA512 cc18c782d07bda0518a1d0824281ac068bc97684abc505ba24bc895e6f43f70bc16835c9781ffada42175ac2cb9dde7a200b0746910e7106c3b41e8a9a0cb382
 AUX cookies-2.2.1-tests.patch 1131 BLAKE2B c98b40cab2a20b5779e670bfb481f34abaa080d0780a76127f12783f0fd108b67c590d01304f2f173ab5808fd8f9ad7ef65d0227a1f31eac4296302b7610ea81 SHA512 ff571d810ca576a9dbcea1960056ed05ceaf738148324d434409b03cf399d43ecb5b13fe228da54465d020c6cabe109a447f1a04a37d1276feaf5be6cf38eea9
 DIST cookies-2.2.1.tar.gz 40704 BLAKE2B 422d70f15e93193ac9c4865f988b22a895a81c59ae98a86cb90289940c283f3998a7e1d3b7ecc0a4f4b004d6b4b64de6743cae7a10f45d9bd1e6136ff35518c0 SHA512 76f362a9a1d74b87c90c5b91ad806d872612d31f487e4067a627409316f6099602c9e5a429f85ce20adcb0a7b63dd131b9e1ecc5c0c6444d1569367432a719de
-EBUILD cookies-2.2.1-r1.ebuild 612 BLAKE2B e039d848f775cc16dd2b2dacc25f17bb7d23efc2bc9f23a2261c427d8cd100e55bb43d32fa8ec8acadbef267b4753d927d2fe982e5911409214cec592edb2443 SHA512 78d0acf3a57630f8d341d2f77ee3294cd03ba8d0a9db0b22a78475e0f5443989129ea083d312dfa5f4ac7e32f500ecf715cf975d88e7c5e4dfa6d89c661102d9
+EBUILD cookies-2.2.1-r1.ebuild 638 BLAKE2B 3f8a22f4d89f1aa95bf0bf36b2a26f1c54b472a382720b7377c0826137e37635c44f597580dc898bc660a7644d699ef5cb500206c17c65c6f3bd8eca089ed7b2 SHA512 ae8625938440b4014c75e0818f8bf116dbeaf5e7ba99df95034f56f5ba1b4400c32da7af4fc57baa269ad5f6ebcb502ee6398174958cd4462e98972ad156b0d5
 MISC metadata.xml 310 BLAKE2B 3f44f9692738692ca4eff801de2fa67bf33220d8b5a94985dcf33c21d1b18b78f6dc8f13bdc42b4edb4afa96a869583c6caa0643190ec68a24c57852c4212d8b SHA512 b98da30bc8b8f3deb352a59ca73a88a9640cadbc20b3049523930f6e671cd057d19b4dbd559702efdac09ba1ed238b7df95502e9203f1d34147fdea5a308c82b
diff --git a/dev-python/cookies/cookies-2.2.1-r1.ebuild b/dev-python/cookies/cookies-2.2.1-r1.ebuild
index 7c8f313228b8..3619a599b5ad 100644
--- a/dev-python/cookies/cookies-2.2.1-r1.ebuild
+++ b/dev-python/cookies/cookies-2.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 7b47a0c1153f..6f646563a28b 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,7 +1,10 @@
 DIST cryptography-2.9.tar.gz 517211 BLAKE2B 3889812dadce01f09c509f5bcdf26405fd1cd2de7064cdbf0f68338894cf65dfe0c6a607867db614b35ad11da4546af2371cf59836dbbbd3037db84241cf71ec SHA512 7db2846b901e42ddc4caa9851235e5a0894ef702d4c4692eb60fcae17bc4e7833782a8001679ea41b78f9273d7d68a4b85810248590e12ca33cfade3208e2849
 DIST cryptography-3.0.tar.gz 534725 BLAKE2B f6f4d5cfcf42a9ca2288bdc7c61bd0ae2f98999868951798f358d6ec9dbbcddb31102b0954f983bb9c118df53a8483e74aa2395ce366a9a97b6b9164b0044bd2 SHA512 4fca5d0e59f02f23c7e2d5c80f86e4cf36eeeb9a128e7b3332a91aa0b9dcdd3282a882a88ea34ffba1e91687eb6d1fc1042774f1e30970e9bf56ee701c32ac15
+DIST cryptography-3.1.tar.gz 534747 BLAKE2B 3225625a69ef3279ae7f763e04b884c0d46a0524624685bba1836e8076d13a7a360ed75f69e62427e191eff86fd9882bd09a5352492ea8bd558842ca67bf3b70 SHA512 c015df3a71e4c274b2fb8fd954d264c8b56443644048139113f548c69cf83798b73c9f0993609f338044df92b609723b0281ce61ed2751309a122de22060037e
 DIST cryptography_vectors-2.9.tar.gz 35140661 BLAKE2B 870245659f6a64566f823116d8b4ba017981eb41148e9dcde9cac372eb6703a7b4580040b487cd8773160d5bd989fa9d5bb1788ac550b28e76bde8c9f6cd56c7 SHA512 025ed48855f182b926e3eeb5dca1033eb7f43c419bd6ea71accfed38b4d9ef4cbbf5af60bc28a39e3d6723de2d4091bd226e30c0e572a2e0d43a95a12c1bb7a2
 DIST cryptography_vectors-3.0.tar.gz 35156155 BLAKE2B 987fa88873bb3ec9745a150906e868c1aea14bb9e618c5c65348deb4e8618f89b15a8d70ea6ed0760649505f5649dd2fbf1e40fadad193faf3a92922ed234025 SHA512 a24c6f25c0acf79cea534fc86d61d9697c004a18204043457cf1a955751e8313893c63258f82ada523a9608b7ec0e5a7a7047ddcbd20e0c55d7c6392bc61c24f
+DIST cryptography_vectors-3.1.tar.gz 35163687 BLAKE2B c381781950bf5399c15fe329fc28cf35933936a2130bbf18909f31f1bbd764a69a8816327e968d3810790b8404e3ae5af25b3d390da3015533f5c52f8a0cd0cf SHA512 094076a26ba4cae1bf0408844abbb9b3a5634f97657e4627e10b8a7c7424b69574fd9d719d5c258aa02244bee8b395f09c51af79350971072b2f9719446743c1
 EBUILD cryptography-2.9.ebuild 2048 BLAKE2B 13d5aa1de69c55a08312a302f96069f1a76e78cdd998b0255539656e425f7956788ab2c2b5e776434fff3deeabeb2d9e7c3152acfc42b78910a91bf50aae7947 SHA512 8fd34e0c4009ed7f276a5f562d9b6df1bb782c5ddd8ea73e1240e414ebc7f6fc352217b5cf4a721b87b1b390ba7695f1459c19c58cee797ab1886fd9d523d693
 EBUILD cryptography-3.0.ebuild 1968 BLAKE2B da1ea5be9d78dc8ba42f9824f4f231e038a73c47c3bbfba2b0f8cfdd7dbfc5c1503fb8b8bbac4eef02b945d3a722fc77a8293471c378d008569181954d11c754 SHA512 0453f407e632f30d26f5e13390015613c984ed6afb8856bf9057fe1cde1e856641862d396dfb225a579e04d36d49a28f78e69e279ac51519c3d98a197389952b
+EBUILD cryptography-3.1.ebuild 1968 BLAKE2B da1ea5be9d78dc8ba42f9824f4f231e038a73c47c3bbfba2b0f8cfdd7dbfc5c1503fb8b8bbac4eef02b945d3a722fc77a8293471c378d008569181954d11c754 SHA512 0453f407e632f30d26f5e13390015613c984ed6afb8856bf9057fe1cde1e856641862d396dfb225a579e04d36d49a28f78e69e279ac51519c3d98a197389952b
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-3.1.ebuild b/dev-python/cryptography/cryptography-3.1.ebuild
new file mode 100644
index 000000000000..c2571ae27052
--- /dev/null
+++ b/dev-python/cryptography/cryptography-3.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 flag-o-matic
+
+VEC_P=cryptography_vectors-${PV}
+DESCRIPTION="Library providing cryptographic recipes and primitives"
+HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+	test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )"
+
+LICENSE="|| ( Apache-2.0 BSD )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="libressl idna test"
+RESTRICT="!test? ( test )"
+
+# the openssl 1.0.2l-r1 needs to be updated again :(
+# It'd theb be able to go into the || section again
+#=dev-libs/openssl-1.0.2l-r1:0
+# the following is the original section, disallowing bindist entirely
+#!libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist(-)] )
+RDEPEND="
+	!libressl? ( >=dev-libs/openssl-1.0.2o-r6:0= )
+	libressl? ( >=dev-libs/libressl-2.9.1:0= )
+	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
+	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/enum34[${PYTHON_USEDEP}]
+		dev-python/ipaddress[${PYTHON_USEDEP}]
+	' -2)
+	$(python_gen_cond_dep '
+		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
+	' 'python*')
+	"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/iso8601[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
+		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
+
+python_configure_all() {
+	append-cflags $(test-flags-CC -pthread)
+}
+
+python_test() {
+	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
+	pytest -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index fe6ccbbf0933..351b8bb2acd0 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -6,5 +6,5 @@ DIST cython-0.29.20.gh.tar.gz 2087315 BLAKE2B c429dd2aec6c6dec0a3430ad8aefd17b62
 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.20-r2.ebuild 2007 BLAKE2B 5697ac1ac8003ed42aa63c72bca396bff005570be18f52b1a796a82dabfe0e684cd9f89c42f4268e995df24e6e25ac929c8af4543c87343ed95b62eb36f08bc0 SHA512 d40ac7f143feb16f357327be4d1d29771deb488f1dccf91d42eb1170bfe05631b83de35c74b713480c4533aa443a3c68663f595c99bbc4946bbbb54d15949b8d
-EBUILD cython-0.29.21.ebuild 1967 BLAKE2B d690a465c8f1fd3f3007c3cfb0abfa4b244b8aef3139aea0bd99776c4e23f7ee3080ecc5a30751769dd136967a336f438a14f95d52e9c53f49b94b167c871317 SHA512 d7b97d70d5c6791e991d21bce85f42570c6109f31afaaa1426b9e6f4b219613e852bb73bd27c3fdb92880b3c684c6a79c05d257e192af419bf1b1716d53cbaab
+EBUILD cython-0.29.21.ebuild 1965 BLAKE2B bc1fe06112e8817406fbfebbe38628fb977d8c244888e9545ba1d2fc28ef7e5bbd2cfa47678c66462c74185518cfb6cb6eadb8ab6008ef014a45c070a20c8368 SHA512 e545e4ecd8e555934468ef92656038a4793fbb2a892d0b2c9ffa74411b2a62a6da2635d89a826a1bd51e4bd15f637e1736a6d4e94c09f5b7d6d66a350ca57e15
 MISC metadata.xml 570 BLAKE2B 078d948ba14cbbfb98103ee3746f773c12d35c91e64358950aa0ceb78695e19d8ca4c0c33b388c2c5cd54b83856430a8934d8a40aec74c3aa0d761e0a4a03add SHA512 73c65ef6b088cb50125dd662f263fb1aa1d60c3631aa8453b9ed2ede6bbd839235c6b37c3f8d1a17618c167874d64a3aa6f95c9141c8b6c921eaf4c1c4d68dad
diff --git a/dev-python/cython/cython-0.29.21.ebuild b/dev-python/cython/cython-0.29.21.ebuild
index 5216fe8a9b75..4dbf7fe71f2e 100644
--- a/dev-python/cython/cython-0.29.21.ebuild
+++ b/dev-python/cython/cython-0.29.21.ebuild
@@ -15,7 +15,7 @@ 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"
+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 )"
 
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index fad209c4c3bc..7b6f7a8544a0 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -3,8 +3,10 @@ DIST dask-1.2.0.tar.gz 2381831 BLAKE2B 88d48b9bcd4444dfe066c8049eae2a8b65e6ae1a7
 DIST dask-2.22.0.tar.gz 2831467 BLAKE2B 641f71c868fe49a027adab11b0a84c091537bfe56a786bbb00215ade5ba5fa7687176f70f12802b06bbcaf00db76f0c97eaa5b87cb65fc28bbe3e37c8b55f2a6 SHA512 90d6391a8dfc36788e819bf09f4ea65a89f37b14d0755fe4ade9179e5d3edd6dada30d5c08ad730f4ac9e08a0cc64a354933f52b92eb13fb8e60093dbcf28567
 DIST dask-2.23.0.tar.gz 2840133 BLAKE2B 2fe8e4007acf2bbd8bfab889e4d912a15518318dc019573ce6deb7f3a64504608e1e27c3bd9c6766dd98a071ed075065da9beda3f2e5fef27c7bfc9918516d0a SHA512 6ce0f1471357cfa4f5c7f2e2ab31009e68d3e5de363569867d67038ae2e1a9c69552797fb232fb92deafc3b57aa040df9e60669c1856cbb53505a905c4f4b052
 DIST dask-2.24.0.tar.gz 2826106 BLAKE2B fc63bf33f8441a70412e7872c696c071c5e156137fe767007a57f6d2c6a976bd29fff4db20f42c76014bbaf8b763f0a9d974ed1fc62530a3a91633ab97a1a466 SHA512 cf9a781c64eca4be84b82d026cfa1883d54ce18c93625e28c085a7bd63ac129befeded808c817e4adab790c28aa2eeca4f79c7086be683f1a7d30c6d1961c0ae
+DIST dask-2.25.0.tar.gz 2842089 BLAKE2B 048a116a60dd98c7c1f3800426af13c2d8d116772a6b3133823b9a78ae6fcd34ab32dbfb9ae8db9eb6c948bce381e5d6e91caaab78203ae56159493ed7689038 SHA512 0d6e8e8c1efbaa4dc77e1a505e5c2df45eefc43868ce923ec674c5f768f12beb30e06c8712f621e44a826fc11f86fd50e60f0f6a78e261d74273f73b49503301
 EBUILD dask-1.2.0.ebuild 1204 BLAKE2B 9acad86af714eaf0f95d3bb857bf2bc6ae960316a0304a6f3b1a5b47b0b0e063347732b2cfe116de9ae69b3a6413729b1c610bea08e8c8813ca14e8e352e2b2c SHA512 364829d15951d615f25fa31cfd95134d338f292fb75deaff6c50cc558d934c3c99b4ab046c3cf5d155159c1f3f54beff37361edff0172dafc811d1f62e794f0c
-EBUILD dask-2.22.0.ebuild 1342 BLAKE2B a05b2e6e44122abe9dc1c3c706a3272066e33f6683a889d8ad352d5e33f1a2f3ce64757939b673082870383059f3a71560d2b0c1476ce6a4cd46b8b1293f02a1 SHA512 3a3e11843ff169ef5a06112b00d2552df74d8dd260165d8ac33bd72adedaaa7bd6c0cc23c2907c4acf7a2c28e0cddd920272cb50927b4860150d04bbf0557628
+EBUILD dask-2.22.0.ebuild 1354 BLAKE2B d3025d5df58ed2653ab36973b0c0f1833e8988ec6f085016db1125e010ed7e30cb24f5d89d7e587591cadb7b12abe0f7aaca8ef7bba4114df8e1e2da3d063b07 SHA512 c197be6f6c26a1b82aede6a1d5516e5cd82398cc6624b3cec4910790cb41c9a190a6977bf7a22bd3b8251420442524eaf94d85b1bbeed4697654ac7b2e173771
 EBUILD dask-2.23.0.ebuild 1417 BLAKE2B fe14aa208dc839483cfea6cd4aee744cf79f02d731856c0ecfd691f7ba0c50162f258ed8a1e36cb86691e75ae2cbfa69ba223ea14ef507114e715d8ffff00d91 SHA512 411a347eceef785bf805c39841031c37b3a58c0852fc9f13cee0339b658374759e90e3fb0ab27751d9018499bffd57b1193f8c2894f04e232eb274334ab69c5f
 EBUILD dask-2.24.0.ebuild 1270 BLAKE2B 064240ed65711f6446b5fd312d3828e1f5f52d911f6fe57ae0556463c29596a5d4b7b5513b1438662117b8897383811e5230cee75150028e3f643ecc8cf06968 SHA512 b1d2f50d76b9f4d826e9cc9e3eb33f366a42540f4b44463ed4b98dbe4d5f863b3cb7b2f62fc750a937f80cc064bc01516fab73fa57f19d5768d7266655cba94a
-MISC metadata.xml 777 BLAKE2B 5574aa56065f36366ee721e25b1bfe06127a22a94666bfdcd1b62e4d03456948bb22db23f64ac7ffbab9816ad508f97fe23a2c9a0e34cd58a61946c6098585d7 SHA512 0ec3d7886c54dce68d7aa90cca45e54b37a000617d4bddd88c1d06ef7db50c23a077b8967acbfdc475cfafe444edd2584500867f45f9e89721f259d3dd330850
+EBUILD dask-2.25.0.ebuild 1183 BLAKE2B 59af442edb4594bee4bff5f81bd36dc2ee8732e5ff643806b347417be8c58416cc219cf4a4b667886a287288fe8350adae32afe5aa74df8b8a7d8e3eae4a489c SHA512 e82eb8e98fcfd572af2e1418625d5ee27cd2ac8d14db7fcbfde80353bce4394bbd4f0075f35a5893399fea31fb0ed93bbc960f74822489b9e40734676191a70f
+MISC metadata.xml 738 BLAKE2B 7fc68719e62b0af7e8b81c1264c5cd59294f56c04958516d8c5a80d3ff56495957eee60a258328c840016e674b97c1898ce5cde4b3564377093b9a6533d4b479 SHA512 fc576c213621f285d74e94f156390c7831d28cf66303c6b06fe4d8f99c244c94fdc6a38511c1135d44d4e1ddb4c6febf469cefeeb122be6edf238d9a07ca3c6f
diff --git a/dev-python/dask/dask-2.22.0.ebuild b/dev-python/dask/dask-2.22.0.ebuild
index 206edb645a45..b4855c7b7821 100644
--- a/dev-python/dask/dask-2.22.0.ebuild
+++ b/dev-python/dask/dask-2.22.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="distributed"
 
 RDEPEND="
diff --git a/dev-python/dask/dask-2.25.0.ebuild b/dev-python/dask/dask-2.25.0.ebuild
new file mode 100644
index 000000000000..eb47b5d4660c
--- /dev/null
+++ b/dev-python/dask/dask-2.25.0.ebuild
@@ -0,0 +1,43 @@
+# 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 multiprocessing
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.13.0[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+		sci-libs/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv -m "not network" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dask/metadata.xml b/dev-python/dask/metadata.xml
index f0bc14a57bb9..d8ed7b4d6f52 100644
--- a/dev-python/dask/metadata.xml
+++ b/dev-python/dask/metadata.xml
@@ -18,6 +18,6 @@
     <remote-id type="pypi">dask</remote-id>
   </upstream>
   <use>
-    <flag name="distributed">Add support for distributed computing with <pkg>dev-python/distributed</pkg></flag>
+    <flag name="distributed">Add support for distributed computing</flag>
   </use>  
 </pkgmetadata>
diff --git a/dev-python/dataclasses/Manifest b/dev-python/dataclasses/Manifest
index 5ddbb65e6afc..843db4092d25 100644
--- a/dev-python/dataclasses/Manifest
+++ b/dev-python/dataclasses/Manifest
@@ -1,3 +1,3 @@
 DIST dataclasses-0.7.tar.gz 35690 BLAKE2B 8d3c60d1e2ad4c9ceb3c502fa74f8fdae75717e52c698984b6def96e867cae633864de711856a69992df6a207617d17d7116f5e0daa7d757076dc8b97d7e0e9b SHA512 ff921237a99bac21e091ff253824eb07eb09be7e7ec02b869da9c68c35141fc1bee526b3d2942963bac7762827438ea8fdc89fa72404991b78d1d063a3c18661
-EBUILD dataclasses-0.7.ebuild 513 BLAKE2B ecb0d14b9e33b754d01f3c13b740a5687f28df636afc671cca3f3d9d03a07d25fbc0fa5127a0769c7c049297e59aed41e2c8f18a128c2762aa4a0dd88d186cc3 SHA512 1178f7be729d8eb88ee179aa31b172a9e5277127f2fe321722d64c7f558858e48c1cf14cdbce2829f2327e44922bcfcd322f3ea312dd78ccc4f0770df2d83cbb
+EBUILD dataclasses-0.7.ebuild 531 BLAKE2B 402bbdfb9bdd5ae539ec23444c86b2fd2d3497a26d820ce43931b9bd64e9e6d2dc1cb115a6b0c3b0ff6a903892ae2c20a30099cb72ec33670d2460ee209a5b0a SHA512 f80392e2c36737ba85f3a01f0185bc981b6b7357fc6716d51cfb099d1fc5b84d479ed1f4dd85b2f64591d6ff5ec9396d3fac41ca55558ffd7f176ba0ad102a97
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/dataclasses/dataclasses-0.7.ebuild b/dev-python/dataclasses/dataclasses-0.7.ebuild
index fec19caab774..5d420c62dddc 100644
--- a/dev-python/dataclasses/dataclasses-0.7.ebuild
+++ b/dev-python/dataclasses/dataclasses-0.7.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
 
 src_test() {
 	cd test || die
diff --git a/dev-python/dbusmock/Manifest b/dev-python/dbusmock/Manifest
index b7f3788d1a06..a005f8ba06d1 100644
--- a/dev-python/dbusmock/Manifest
+++ b/dev-python/dbusmock/Manifest
@@ -2,5 +2,5 @@ AUX 0.18.2-disable-polkitd-tests.patch 372 BLAKE2B bb9b33df485c635a080c41d4bea53
 DIST dbusmock-0.18.3.tar.gz 72049 BLAKE2B b5ed8ebcae51fedec75fc810e07dc9a38223bcde541cbfddd5d3fbf1ad45d1458e6ad39c1fc69ee77165d751f978cb4483929e823eacbc99a7ae414aebf4d0f0 SHA512 6f7b42eae578ce03024b3b5cc85e82f04a467803f4c8b4cb5193454dcd849038f11e6ce5028ca9dd57ea5a9380c1b754d8fc644b4a24b51deee9e87b409115c3
 DIST dbusmock-0.19.tar.gz 72567 BLAKE2B 973cfa02d1aec29f2151ce077471c49f7def3cee079eb975bbc1abca39cc6d391f5dc4aed40fcd9c9db3fcc25429e689f130dc495b94428b73c64f3c650a9c3a SHA512 9f49cb1818c0de8b774d4ccd0eed35de3b0a95de669e70539699237b5cdfee993da7747dc28375c8f1c26fac83d948b7ce25107d866e28b833b556c6f654706c
 EBUILD dbusmock-0.18.3.ebuild 1071 BLAKE2B ceac7e1a85ab974743225c48b6d76168b69cc55b703b59dc29caa6433a7c7b5ce13edb312355045d14eaf8a58d9d47ae86c9738eb93e07f64ce6c3878d728c54 SHA512 74a0aa6c85d547eca93f99c9e27fe9cc13136a74b963ef315ee560a332f7a809e4d7f154d2809a3be720cb1f7ec76b7e97becc32fc130b0c45bf4422e8b6663e
-EBUILD dbusmock-0.19.ebuild 1075 BLAKE2B fbd2e36f6fa61d99efd48c713e4874ec8bc44feace59e64cb73db931ce1847ab3c29b64c0874e2086a4842027837719755358b8d391cb9f92a48b5a8dc5c202a SHA512 a90c99e26fa2fe0dc79f58c6fbec2e90867342fecbdb7f07c49b10a9f63c8fc3707bdec5030601a489299ce4ff1ff27f39d56a85552d4cc0b157235435ff8663
+EBUILD dbusmock-0.19.ebuild 1072 BLAKE2B 46eb5cdbf0f93de37e4cf995a1668a5c8d8f261db5b8ad3122b519b1af76add03c64564f7339d238cac1f1b232061ba420f160c0c245b131a57436eb51b3f82e SHA512 e472e723f795ad1ea4943fa7f9b29766a62f15a0edc11fbc7fee1c7aa7bc808950ad82138bef8c930d2683c4ad41ff8c7bd49699be6b23a5cd5fe62ee06a7110
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/dbusmock/dbusmock-0.19.ebuild b/dev-python/dbusmock/dbusmock-0.19.ebuild
index 6bd966090cf6..dfaf74e260d9 100644
--- a/dev-python/dbusmock/dbusmock-0.19.ebuild
+++ b/dev-python/dbusmock/dbusmock-0.19.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/martinpitt/${MY_PN}/releases/download/${PV}/${MY_P}.
 
 LICENSE="LGPL-3+"
 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/deprecation/Manifest b/dev-python/deprecation/Manifest
index 872fe9995e89..72b1bd717ffb 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,5 +1,5 @@
 DIST deprecation-2.0.7.tar.gz 17077 BLAKE2B da3fb5db53f281c29e2af40335ef4038e37d133563b85d0ea795a314fd9f2d725a98c100aca338dc9ebe60bb1000476e0debcfdc9c4583108004df207cb36747 SHA512 4412e2e95f4aa4b3d5598346a6649c8d945d7401ac2d0fba3b6f6eef567403c8454ebe537e8de646903cd0c2308f48ecb949dae3015ba7617edd2fa3a26ed429
 DIST deprecation-2.1.0.tar.gz 173788 BLAKE2B 444c7ff688d6eab7dfcf58ad24580b5a6df39a5749341b28d6d5b9b516fd6aa7a462d7f644e6cba596bbf289be0224968f579837c6c71dbe7b36b65588da6eea SHA512 c184665d210c6eeb3f055b23e75c3714f3b18050e03bfe1384baf6c2504f1370116ae0e8c53ff818ccc54c0d633bbb3ba5791fe20b8029f3be0207b019a00275
 EBUILD deprecation-2.0.7.ebuild 573 BLAKE2B 35adb3a4ad5fc675d03536e189a2f9b10d87f7fb4d93e47f9f3e45aac89012cde5279d45e716affc7666a81ba2272f6d669e0b0a20dda589d9217df12ae19311 SHA512 9b16106b78a448ad6e7135310e50a0aadb33ae4622325af5b69721381711339b16f23f5ed11349217c8793f85ed4cef76d3a5959acb414181f423c383d6e3317
-EBUILD deprecation-2.1.0.ebuild 582 BLAKE2B 3314f5d283d1fc7118a115f8f2a74b3a01fd0283ad2b0e3275289739ef6e94f173bd3ef0c86aa04f6a82651c5f9a7f934563dc23f470a72403693189a1cd22ba SHA512 452015d060fb37d99a04b230a49770944a1f8f61ba998e3d9e805febcd4d813701422058c7d80371cf062d379afba49e0d3ba130dd69fa89bb9f19f77135a539
+EBUILD deprecation-2.1.0.ebuild 594 BLAKE2B c162d24896474e2ef1b5479b44b61130c50eec2c861cbae113503b2fd39c5e5c5dfd1c3f921f8155cc87bc2c480286ebd0464d1ff0ebc3114824df56b72a493c SHA512 e9e5045f85219ca5d1a32f63d1e16bc3db3f8604968e299d9a365183c601aa41f2bb75abab86a0609898f05b585f353d4e7a61bcfbd2b2058d63344af9ae3901
 MISC metadata.xml 541 BLAKE2B 709794874c752bf9bfd7c4869969c7f5ae80779d2bdaaf2c49cab8abbe3c4b8b4a3f62683961edbb00ea260d933adce5d3da5f7b8be9532ab5e016fb35dc94a5 SHA512 78d8d2f01e9b6d3bc0e6c2edcc05593ce877d15fbef65a55b9302565e0a8b6f933fb12a3fe280111ddd415ba959ef816cada9c5e6c84f369bab4f0e1c8e3c74e
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index 6f0a706779f0..d70f3219ddb5 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 ~arm64 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/diskcache/Manifest b/dev-python/diskcache/Manifest
index 87e96a24e624..75cc55e7cac1 100644
--- a/dev-python/diskcache/Manifest
+++ b/dev-python/diskcache/Manifest
@@ -1,5 +1,7 @@
 DIST diskcache-4.1.0.gh.tar.gz 658268 BLAKE2B 7712892a15e0f7b34b05c48071b4ed22f94ff4c8b6e66dff5591296d7186c686958ef3ec19994b6965319ba3e601850a1782f7ac8ed09090afda4b75ae16a12b SHA512 3871e56fa9a50942e29e200df74d7f4312d21a0f51d6be2041ce71efd3c1d0c204cc1df5ac1f92825314c742bb48bf8b0a3929cee225055903953e095701c8e3
 DIST diskcache-5.0.1.gh.tar.gz 656475 BLAKE2B 1926dd40564130a24f211a1962c9a9e4ecc640ecd55d2bae5057ead787df0cc64634be8a798202702a7810612bece0d45202bb12d495da1863c8b10e645cb7fa SHA512 9e06427e8ff158fa186ed161b7e90980f1a1d866164d6018a522f80a323be981f99e4297b0d90106dfb08b5d2d0babcb5a2dafebcc194e2c282c30bcf3e0f1a1
+DIST diskcache-5.0.2.gh.tar.gz 656471 BLAKE2B d4aa7859bbefdd5aedf8bfd81ee9763890371a7667216a0d4a1728d5eacb643749adfb9f7324745f67c145ed6d61f50c449d1cc20ac9b77386aacad639fe1856 SHA512 79fc94be90517a55cd94f67b5c33279925beaf6cc38027c26603b67527b49976c3aaa80368db2671cce7deb4e933aacb8f89ed85dafe3cdc2f99862b2b49471c
 EBUILD diskcache-4.1.0.ebuild 1165 BLAKE2B cdffc7e266f9c1b19b1dde1d6ebad0760c296c03d5a200f8d48c8eedb9d61ab781a7a5a6fe2029a43b484f420d6067b8fa24611a782d2859c229b5ea021e4227 SHA512 417b23597e292910883249505c249ff9b15324119e896eb9b5398d7b7feef385a7fde8d08b70f3759e47a265a472762d11b9b43bc915a344230416a3cd1f3e18
 EBUILD diskcache-5.0.1.ebuild 802 BLAKE2B bb75be194dff99e889efba4875121ba23b386a967f932a2f628b56a5035366d614b5dbef8e5edba4793a23e4b813c49a23323398eb96784aed100ff7f2f28c92 SHA512 f5b6ef9363372e042977aa1056f89fa9c5572914f881837734a1dd743a72cc5389a3b567c4e7a9adf7652b2aa123ef140a97dd0d206914725e6df9e2d03e5e02
+EBUILD diskcache-5.0.2.ebuild 807 BLAKE2B f25648d1fda9da9d2d9c78f15450004a81d02ba50c500bcf97dc60e3c94c74e4c3bfb9fc92a5cac28ef06d7417d95957aa666352f8f0a8dc5da8b9be536ec6e8 SHA512 9c31f7e9f957ef600815eeec30a917d0a56cde7a68fbd03750cdb270c0bf08cd546741bee80a7b8a7c039d5315fae26a70185c16471f8d4eb17c673150660c8e
 MISC metadata.xml 391 BLAKE2B 74eba8c76944b17dd3b7a446129b9786a56e1afa0a787af75c8e832317b5051afa7e527ac8e7c04a2f9f4c36b0eb3bc72a61655f7de4a5caf9048c50f438d745 SHA512 0d088c14dbbf7c11541b5f47d193280c0f92f8f1b3ec62c8aad49648b3fbcc393ce639b5b9ae18533a4d4b9cb5ad536a5a847b705e2b4bd385d3b90d48f812ec
diff --git a/dev-python/diskcache/diskcache-5.0.2.ebuild b/dev-python/diskcache/diskcache-5.0.2.ebuild
new file mode 100644
index 000000000000..c57b662ad91a
--- /dev/null
+++ b/dev-python/diskcache/diskcache-5.0.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="http://www.grantjenks.com/docs/diskcache/
+	https://github.com/grantjenks/python-diskcache/"
+DESCRIPTION="Disk and file backed cache"
+SRC_URI="
+	https://github.com/grantjenks/python-diskcache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+S=${WORKDIR}/python-diskcache-${PV}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove dep on pytest-xdist
+	sed -i -e '/-n auto/d' tox.ini || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/distributed/Manifest b/dev-python/distributed/Manifest
deleted file mode 100644
index b0987f7d94c6..000000000000
--- a/dev-python/distributed/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST distributed-1.18.0.tar.gz 395888 BLAKE2B a1f84f93130b4e878d2b6a2059e71330fd10ac7be2c8e1d3fa06984e34dda4984180f496b9513f531ae21f3cc978f71f8e9492fcd5d644613a7d9ececcb5ecb6 SHA512 3603b22a454c7010c64fceb79b4aa024476bd038f4c27585c8f2dd51a2e4ace1c900dfc7c3bf096d4274be985003b72e9bd16af7b351ec9a65c6712a1f5e39d4
-EBUILD distributed-1.18.0-r1.ebuild 1277 BLAKE2B 7bc66f2947d9724f8d7a9b1fad56ac48e2181d6916685c7c180df18421bd3265017af6db3dfa456f7cbadd0ecc2b596a264439bfb43b782600d3611e4cdd1f52 SHA512 ddd3269ce8bb6dfb45dfde7d240b2e07481cef494978ea3b0ef43fc7dcc4966da40582377fbe11a6e67fefb64d59cc04894a903d66756317fde2522b9951cf34
-MISC metadata.xml 511 BLAKE2B cd7c1cbc44915c6a922c188703d69260c85f0f1d4a97606fccec97b2d11deba4ef25f91dffe7fbd407a93dffa4f69f50f9289d948ebf4764da2980acdebe5ffe SHA512 b512481cca22a1dffd5620312825bdec9348b1a469be61874211dd25befb2111fab1ea79596087f5226b053a2ab660174508828d5300de9ff24119880995a296
diff --git a/dev-python/distributed/distributed-1.18.0-r1.ebuild b/dev-python/distributed/distributed-1.18.0-r1.ebuild
deleted file mode 100644
index 373381fe29f5..000000000000
--- a/dev-python/distributed/distributed-1.18.0-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,7} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library for distributed computation"
-HOMEPAGE="https://distributed.readthedocs.io/en/latest/"
-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/click[${PYTHON_USEDEP}]
-	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
-	>=dev-python/dask-0.14.1[${PYTHON_USEDEP}]
-	>=dev-python/joblib-0.10.2[${PYTHON_USEDEP}]
-	dev-python/msgpack[${PYTHON_USEDEP}]
-	>=dev-python/partd-0.3.7[${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/sortedcollections[${PYTHON_USEDEP}]
-	dev-python/tblib[${PYTHON_USEDEP}]
-	>=dev-python/toolz-0.7.4[${PYTHON_USEDEP}]
-	dev-python/zict[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	cd "${BUILD_DIR}"/lib || die
-	py.test -vv -m "not avoid_travis" distributed \
-		-r s \
-		--timeout-method=thread \
-		--timeout=300 \
-		--durations=20 || die
-}
diff --git a/dev-python/distributed/metadata.xml b/dev-python/distributed/metadata.xml
deleted file mode 100644
index f21b359c5020..000000000000
--- a/dev-python/distributed/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>cluster@gentoo.org</email>
-    <name>Gentoo Cluster Project</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-
-  <upstream>
-    <remote-id type="pypi">distributed</remote-id>
-    <remote-id type="github">dask/distributed</remote-id>    
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index e6a569cef054..7eb924e3293a 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,3 @@
 DIST distro-1.5.0.tar.gz 54340 BLAKE2B 2a5bf45cdf41b9772a2e164aebe96a4e9952893b7462935938fa4939704c8dca67acc3e0a52e53d8722aa4405abdc7ad2c8d600dd397d1243bcceda4d5ceeb75 SHA512 14831fe1355e9ef4f58f273ce4a548a3fe438e95466b4b4f596b8110da51305d66ed77c2e40c3dbfbcbd1a66c74e23a4d4244c8bfdebc4b49b3e7ddcbff55b8f
-EBUILD distro-1.5.0.ebuild 534 BLAKE2B 8a61e5948cf5ebcdd298d65b90dadc5bf24fe1a649dfea84964edf8f0bcf589b8b03967db2cee8976ffbe65d22d453c19df6f01062307afa554444fd289f83f3 SHA512 3f22c3a3b8baee8218f9b7022a1ca91163c49e15031bd2ace30d1b74b8ab49a57a67c46f72aae6ad21a01afe3b1d1560481b18e14428502875ad4120dd175849
+EBUILD distro-1.5.0.ebuild 533 BLAKE2B 33914cd224b4af61fb2906d5af941e5f5ccad603e04ca641e295c6ecc1978011345c8fd5cecd2333f2f36142d787e10c88266c2f52d71d40740aef0906f5d53b SHA512 ecd0960607a5afe8c30c064ee50cbe7cc7c76ec77e4e69d56a6c0316b1e8672d994c2f0595229190c916ae523a74c93b0d9f9f0ae5e5bbe725f044d2e95d2938
 MISC metadata.xml 838 BLAKE2B 899bf57efe9358f0f33df59ef8802cdb0e9d26c05ac99289b7d3765ddf2a5cb65452874aaca7db3774c76564c4761c4f71ee139bad080cc1e62472794de29b8e SHA512 55cab917a2b67bab65c1fda28693020efde74e905c09d077dd2562c2e78171ab33a2a4190b458deb5bfbeb3b9ed3fd66c61e69cbe569f1640d135c46a66477e5
diff --git a/dev-python/distro/distro-1.5.0.ebuild b/dev-python/distro/distro-1.5.0.ebuild
index ed96ef70587a..d8dd48a3bb5a 100644
--- a/dev-python/distro/distro-1.5.0.ebuild
+++ b/dev-python/distro/distro-1.5.0.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="Apache-2.0"
-KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 8cda7d051e22..435a803fdc1e 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -3,12 +3,18 @@ AUX django-3.0.6-bashcomp.patch 2060 BLAKE2B 6bff228193b4cfe4f0f4c3d727146dffdb4
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
 DIST Django-2.2.13.tar.gz 8879757 BLAKE2B 4a7986805c6a3674d47aa82b97f31ae63968dd7c0f12db672207cd1d97076acb681fe44e730147122911684b36d7f1e9d5ea18c054d4c40c68b460300fd9294b SHA512 6daf3486d2f19eb159193df77a7525e5173ba5889ad5c587a6ec6bbf02c4ea94fa90b9a30a5310932fc9353a22c413208ab724c05740f844eccfe610da3ca68a
 DIST Django-2.2.15.tar.gz 9023679 BLAKE2B 9619d0ac45a8256a1e605f447b89df6266d67d98969baffd41a9184165e14d57d4edfb898f64a6633cc0f4c23b24a35b16cb446c920d8baf58f771c69d8697ee SHA512 bb91e5b621be54570f8c7676f820ff93fbf0546dea79e035eebd60b70c5c872b0de65395a4606f07af7b9c77de2cf218aaef8ff489fcfabaf5c9b75d28e42dc2
+DIST Django-2.2.16.tar.gz 8884774 BLAKE2B e65074c44e35921f6c40ca9e2a5fee53ce9a956a7503b96a33c8dbb4588bb0928d2e2b605f1117c3c75cdc84d6c7d1bfe52f4e7888fbe300adb5411a55b0ac27 SHA512 eabcdfc17e27c579001e4739268abd13bebbb018db1a7dbe4fb8482d32320b85bd16b3b18428084c0df947094f23f7cb4b12a3a55bc370748d7d8746af22bc3b
+DIST Django-3.0.10.tar.gz 8958332 BLAKE2B 0ff17da9d9175b080d81e334e46ec6daaec5e4cd48f5d9a614c84b448a6d4b93d304b3fd25bcee665d65f589a8f94cf83f002bbd7a27975d23e3516286784e01 SHA512 fcce2815f966a5eb0f7986c16d065b352c73ea2ea4fc1422d440487d84162c5a93aa45b9173ba5d62d6caee2e976a9ac818f228b47ed7f4f50deda27bac995e9
 DIST Django-3.0.8.tar.gz 9080731 BLAKE2B b3276527c9c5eba18b380204c498ebd5724e5211640ead9e05284eb013f907ce6799125b29e2030bc37ecd5a1022e6eb3f193eca5e2c6520adef630d6d2114a9 SHA512 92d169fb37883355f1898fc13b54b6732ec14d71f77e4b91db30dd9bfb5df8b34c1c9566af6ddc37e00a9e3eadd38b6a51ff604a4da4285167f66b55215be301
 DIST Django-3.0.9.tar.gz 9081099 BLAKE2B 502f9cf1fafff50d92c771e845319f5406722cdb8ca0570688bb96e7fbc765cee319325b0340b722afeb0a304316d30408ca92154623ad4934877cbdc8ee9259 SHA512 1244b9cff26b9e8d9a3d611e0a39981bd1a46d68fa734a58ba12fd51eeb023fb053605372d7b41b51027e4e609f1870d25f7e0584d0449ceeb8d877f674e49b4
+DIST Django-3.1.1.tar.gz 9250616 BLAKE2B 220c53873a70bb30f0ea9b48a70ba71b2de517c11f238e6dc2be20b0e85c99dfdb2ea3b9cfe7b164c7141e0857f19d9d8f93390d7ef36bf34e915ccdb449e8f6 SHA512 5da4282c2ae712ecb2da654a99d46cd60c99aced90f75e681d5a0765b8c08669f27b6c38287bfe7bac028f12ae0643e2be06742752bdc83c62daf82fee60281f
 DIST Django-3.1.tar.gz 9382872 BLAKE2B 31f2a45cf31f87401ac1834be81cf207ca48f720bf6d6885b774fb51f42616be1346b8ab71d6c0b605d99bc7422f27b21665729b78e00c9cc0ba9cf3e4d788f3 SHA512 31f0821966f4ebc6b2a719b69f1137a32a7228414221e8938a66c9b940465c008761bd380ba9ea603e3693d38c233d6f23afe0cbe5647eb2478844ce2d0e7fd4
 EBUILD django-2.2.13.ebuild 2329 BLAKE2B 318f88cb8e0817dcefd31d0a43ce2b1067c187ecb27deb948df7c12633e76fad8f1298b3769bda49082a2887f42ca6088387bf0c9816fbed899b0207c9e452e3 SHA512 3f5f6c0e3576f74a1f0d0483e3f9640ea38d228e54f9a302ce33c2cf4805a56405c33777295cbfd6eba3ce86128a0acaca10445839b2de2918225420aa4b2b0e
 EBUILD django-2.2.15.ebuild 2338 BLAKE2B 021702600dc058b29f671f64f165985528d5fe93357d9577b9dc0c6bbf8ae69483bae62d820483ba976873ccbbac8fda0e5bf66e480369f18cc30051a6c07328 SHA512 04cddd1785450b0e02b0d838e653a616f7f76a396a769901d6100c518e94dff438dd79cc4972bf59f65c57943d1601fc5de07609e54598adc7297a17d85c62fd
+EBUILD django-2.2.16.ebuild 2419 BLAKE2B 755b1d0dcdbc60d5edff14f81bbf85e4017c8ab87717fb313116742a0907e770aec5fc66ce02d44f2586540877e9829722fa02f44ea50e0482838c3a0258a975 SHA512 99e5bad3f8ad9637b4f1adff22bc1b36306c55bbec5f5d36c668989a48cac5edc0c82e2232fb0a2d15960a64c65de4d551b7adb6a2a48a3e64d48823f4ae3df0
+EBUILD django-3.0.10.ebuild 2400 BLAKE2B 0493dd61bc7f97f040863ee8771461c40450d0e1273bb19f7f967aa296ae459ace1de71f1311abe4507dc4ba0e92ac8053b284c8c36fad98fac550621629224c SHA512 108e5fbbcfc0b20047194846c3553c49aa911dee9dded54f9c8453630549236755b995cc62cc8278dc950e3919675d0adb10b9d671852d25fc55fd9b609fe4cd
 EBUILD django-3.0.8.ebuild 2317 BLAKE2B 8855c8a746876f491588b1dae108ca528f8e90be8a75acddc50559f3e9ad7e11e9b7580adddbdb391a7c2dd9f98f04f6a9696cb73da28d1c5331fac6759c114b SHA512 ed16f2d2ac738b0e404ee2c0cbc5c3877e751fd8ed160366f6b3717f48ef46a9ac4a072e56d691f73cf7d4386f25278edb49e55d825f32a462f1ffe2f763b265
 EBUILD django-3.0.9.ebuild 2319 BLAKE2B 0c243aff451ef7259ef835dc60a3d57c6d8f4a1727d29891fadc491cf45b5ef5f561e3d6b5cc9762fc16a8a107076df330492f3044c4896d69c0136144ade43b SHA512 1ce2b6f417296abf924eb75943fd5bb7eef7b0fd4bb66fc0a6e5891433958666394c44b982d9bf56218ae60fc2b70763b0cebdc4050a20f8b075ea8c778bd18c
-EBUILD django-3.1.ebuild 2317 BLAKE2B 70a8b128b5a8c21c25119559de5681402e964148185fe33bf6511e3b5b676fceb55a83e6065dc7c2e12820f6180fa0e8ba5532947c1e3dabeeb4d98874a06c1a SHA512 5bf6d53b6c4ac0cf1321071aae536fb95ca8d90366a920def8b455fa8ad256453903555b68b5acfe2bf41fd0484d87501e2604e3ce7e1ee5e1bc5b2a89065141
+EBUILD django-3.1.1.ebuild 2403 BLAKE2B 3bcd54c65fcc0bd2d3cdd977a323fbe32b5a941262e76d75143cdbf6e4e8726f3d4bfcd792946246592dec6efa4290c6d490be99ee965c62d2f70877ecd8a098 SHA512 8614a935388f9aff62589d8b223b78069190218f4221d04e5716a588d8a3423330d26b0b586e8a1e3b84d817775cc5ecb6a2f51f8a6f181ca11bd4fc52345cd8
+EBUILD django-3.1.ebuild 2322 BLAKE2B d18f22edeef15aa49418d3e6e2bc3370cbc2b5fac6d7dbe724a0686aadecc2a6753d09c12b812f1ae5233ff20e2933ad4998ba77dc4996456e8b1a71311a7a56 SHA512 b3d92430d7befd22369d958410c2769bcdce949eff10518708f80c1b9472b6b14382ea2737bc9d9a4c8289371ca69835fc2adbb4b0fe9dc0e70f335fc7bc6aca
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-2.2.16.ebuild b/dev-python/django/django-2.2.16.ebuild
new file mode 100644
index 000000000000..332ed12688eb
--- /dev/null
+++ b/dev-python/django/django-2.2.16.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+# gettext: https://code.djangoproject.com/ticket/31850
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		<sys-devel/gettext-0.21
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.0.10.ebuild b/dev-python/django/django-3.0.10.ebuild
new file mode 100644
index 000000000000..c88f68b480e4
--- /dev/null
+++ b/dev-python/django/django-3.0.10.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/asgiref[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+# gettext: https://code.djangoproject.com/ticket/31850
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		<sys-devel/gettext-0.21
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.6-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.1.1.ebuild b/dev-python/django/django-3.1.1.ebuild
new file mode 100644
index 000000000000..722cccf60e2d
--- /dev/null
+++ b/dev-python/django/django-3.1.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 eutils
+
+MY_PN="Django"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="https://www.djangoproject.com/m/releases/$(ver_cut 1-2)/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/asgiref[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+# gettext: https://code.djangoproject.com/ticket/31850
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		<sys-devel/gettext-0.21
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	elog "Additional Backend support can be enabled via"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	echo ""
+	elog "Other features can be enhanced by"
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.1.ebuild b/dev-python/django/django-3.1.ebuild
index 04d8f1897c18..24e2cdebd36a 100644
--- a/dev-python/django/django-3.1.ebuild
+++ b/dev-python/django/django-3.1.ebuild
@@ -23,7 +23,7 @@ LICENSE+=" Apache-2.0"
 # admin icons, jquery, xregexp.js
 LICENSE+=" MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc sqlite test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/doit/Manifest b/dev-python/doit/Manifest
index a503c6639b84..400cc566a1ea 100644
--- a/dev-python/doit/Manifest
+++ b/dev-python/doit/Manifest
@@ -2,5 +2,5 @@ AUX doit-0.32.0_pytest5.4.patch 2862 BLAKE2B 3a3859fc2a5a2c0f533a3c4a300744d5c4b
 AUX doit-0.32.0_unpickable.patch 1371 BLAKE2B c03d757a99e44bbf7c7dbcac84295e7514055921d2c3a12bb3fca2fbc7e8320c8be450a5c101d39b51b8f0bb7fa1b1faa3c58a455ab5c27a68f6e03a70ea9763 SHA512 2d17f32876897a6b73ba7936eade594a0a40f38a27d08e14603f3aceb9b36426d810e0dc0b13b385c8e4cab830976637ed4462014dab7202226d3bb3f745cc8a
 DIST doit-0.32.0.tar.gz 1437939 BLAKE2B 39134341582cd964630a1667c78b0e44eeb32406a06e3567123b820fb61cbee0f6a7c8879a84eed750860a365aa4c792e461bb1534c66e4f20a6289522dc8183 SHA512 d5c28a0c6a38648aeef58027b2246fc26360e133e91933f2244bd484f70d6d26110acbfec19c74d53c796e0bbae07a4bf6d76542d45e8b1a6b503c186bf2a68a
 EBUILD doit-0.32.0-r1.ebuild 1382 BLAKE2B 35cdaa63fa8da7d22a56b437ce9fcbcb725d19e2c1160c50ec771bc5b9a3e3de1e7307fb9fbba77b82b6bce1f83db4689fee1d7d22847a6d38de048c7e45a2e8 SHA512 0d096d420e41893f03ce6faa3173342cce5842987cca597044f9a76a40095774c15636f34a151932a9768f1309878ac4b0c2797b239a8f18620de92a0b5cd854
-EBUILD doit-0.32.0-r2.ebuild 1385 BLAKE2B 75ed0c32a81356a8a80cb359350da4ac07a9e864806d76782f1f59c1810eb17dcb9e7f3c984d97200c09b8eefd9d4ead6dfb1cfe241a45e2d93418665fcc745c SHA512 50cf8363038366d276dc01a645a1cd027af6e0476c741598db25c824113ff45b796ff47748f090cbd8dc70e7035db3c4e16acb219ecabc23f502421dd9c05da5
+EBUILD doit-0.32.0-r2.ebuild 1383 BLAKE2B 5eee1bc202fbfaeda4ad8197837a3ee5187fb8aa14fc3f52f8b0328bbcc5f242a835cd3ebdc2bbda0419d99d7f9a58398c73ec860663d866eb8c16cc3ae6d762 SHA512 7c378f54db8dc84737c34a0cf96e8a9082a4901cb8bd5201a145f300456affaa741ebe853a5bbac4a37ab5fb16100ad671d5b894e424acae9d2f01388d266524
 MISC metadata.xml 512 BLAKE2B 2d3624f36a7a3919fc3c7afbb459f811234b52f8e83c025d3211c4160c78151616bf1545ea4157dee5742a0267f23879a777b470d4c38746fa512ea3e2decf02 SHA512 52e3181b83ec7fda098ee42d3c61270a32b2170bf48d711d52d277b4448ea1d2672ff8017735cd90ca410fb6996a6547489f873ee20ca35b0246bb6a5a8b82da
diff --git a/dev-python/doit/doit-0.32.0-r2.ebuild b/dev-python/doit/doit-0.32.0-r2.ebuild
index b59594aad9b3..8fde29a909b1 100644
--- a/dev-python/doit/doit-0.32.0-r2.ebuild
+++ b/dev-python/doit/doit-0.32.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/cloudpickle[${PYTHON_USEDEP}]
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index c4a26bed0ca1..a0b1bbe987b1 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,5 +1,7 @@
 DIST ecdsa-0.14.1.tar.gz 100303 BLAKE2B f7f02bcd99752a7e0c7ac7d22625f5a42638fefb9a92fefda3da279cdbb76d1a5337df5abfd43eb1edccf794c5b2fe34e10df876696d74e921c5ddb35f61f3a5 SHA512 6a66e07ec75e93af73d2363dfd817b35a103f8ff8d62c5ce3af9e98e917d38213aa4f80d570f81c830938123f9599e24d96605a36650eaefd806ed07ab0c14a5
 DIST ecdsa-0.15.tar.gz 122119 BLAKE2B ceeb0204b15d75ada1b201321caff2eb28080bbbf5f6436e6cb50203828eb318d9fe8b8343157b59370183d122e47399a3d2cd6ae569b80d81809d7c778639df SHA512 7b7491d1abdb5ca43456d943c96525fa5d722635c496bbddd04ef8e1baad9dc0aef3d1752afea7820f7796421b18295ee260657ec1e8faf7564613b316c0d603
+DIST ecdsa-0.16.0.tar.gz 125851 BLAKE2B d7fce3fdb0b6e37edb62482bdfc1df6b02f9fba677a6370dd3cb19f04be9cac62900d8347b318bf1d1e39b2af5672d0dde620dedf7b2ed6aefad3392df5279fa SHA512 94ccefe19899a5e56393bb0e6624e9af66bdc60ad370d65900a24a0465c430a3a001ed9c25970e48834cb25ca730bc9279af98d17ecd3ad66189c64c8f864b42
 EBUILD ecdsa-0.14.1-r1.ebuild 859 BLAKE2B 46eca2099f4fdf9531bbbd33228b02bb04222f0ef16102eb11175652569d56f2b499c0a8ca67c186ef8f055a140f3d8ba7f782e1a5275daf8aae0da507da0622 SHA512 cb1fa9526d8347163bd098ddff6c1e61276169fa355825785be57fa7760a921c3d42223eabd5d0a7164064cb65a650ad57b45725236cd0beb437a1027378b790
 EBUILD ecdsa-0.15.ebuild 934 BLAKE2B 4e7ee1b42ece0a8cdcaae48ddda4c8f18c0e48f763c48d9f7b3ce396d43955e4ed998ea869ef75f17f50249c3d47e681bd8f3b7a1a8533a3f56121b5862e1c52 SHA512 8bf9ccf67d04902e24da59894f430e04cc72ff33c8042f72982a7defbcccb07ad9600bda0fa28e88c889d20658d5e97fa9c44a5d8f6b632258c88fd518060623
+EBUILD ecdsa-0.16.0.ebuild 941 BLAKE2B bc129008ac3a9ebc66783256f2e32ca4c5ea87b436b642daab5cea01d242e13218aef76299003f022f35823b357a629f9d253b041313b42201b6f0e550b28a19 SHA512 950de255b4994e8e5505a38dea95e44f19eb062db4ee502c3dcbff46a4ad45cf613fe1004b6d9445f6e45e2f67838e9e1c3f097c369af78b11c46354f891b7c4
 MISC metadata.xml 404 BLAKE2B ef1491349f83c10a28862359dcac0fabf0cd453c75c1ddcf8598e66782e30917be40798f9816a96f0862f89ea2ecf2f77744cb939da4212a6a9dfb9ffa223a1e SHA512 a609ab61800cb403d82a0e63d5b44e26b8ffcb984ef216ce894aaf3a532fd124ac012a764d1b76b7ea03f3202f736ec3eafea20277b00f99d43e2b6c2e2ce299
diff --git a/dev-python/ecdsa/ecdsa-0.16.0.ebuild b/dev-python/ecdsa/ecdsa-0.16.0.ebuild
new file mode 100644
index 000000000000..b52fc50c087c
--- /dev/null
+++ b/dev-python/ecdsa/ecdsa-0.16.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ECDSA cryptographic signature library in pure Python"
+HOMEPAGE="https://github.com/warner/python-ecdsa"
+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"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/gmpy[${PYTHON_USEDEP}]
+	' 'python*')
+	dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pluggy[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/idna[${PYTHON_USEDEP}]' -2)
+		$(python_gen_cond_dep 'dev-python/unittest2[${PYTHON_USEDEP}]' -2)
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 0ef0e6f2d391..97839f05bd52 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,7 @@
 DIST elementpath-1.4.6.tar.gz 121815 BLAKE2B 09014fc503c8a3a6a6865572fa48c515af19fc009512369d8e761ca5b4e516de1add7eb14c0681114331c4a8ef08cccb5fac8f4ce2b436523780cb4e41e2dc00 SHA512 ac1d7fc0ab07f22fa02550ac77f4067b5564f78619bf98d6fda257751d6404684622580002d69beb769fc471500ee0c08f6095b05ddc6b7d81276dc8e158c40b
 DIST elementpath-2.0.0.tar.gz 149239 BLAKE2B 6963429ee127ef2a293da6706e6d1bc13be4d864d7da3d7169dd81d0a430156684f0977076182ec7aff7622940dbc341b84fab3eb488bbe6470476c4d30b6d4a SHA512 bb29c9cf30e9a414f9ddc7e29d3ae09af74302ed9c0bb98332b4fe01bab2e043cd5adb59b20a0730218d79b9f2ae42e9f2ad3ed7e4d0ae8ffde1800c96ee00a9
+DIST elementpath-2.0.1.tar.gz 186127 BLAKE2B db2e566e3032881d9db57d3951371dd4321baf3c3246a1a882c8a1ee9dafee2c2e4c2e8bb35cea7452ed51779a91c85976847cb46f18c1c6683c7c501961b2ed SHA512 77bf895c9d509dec57dd9770ebddf8ad58eca4aaee46c3372fead2d0a5109ff27e183d29a5bd5ef1a2ad203c6c64387b11b8bc0b2e96786843d24faadc3274ad
 EBUILD elementpath-1.4.6.ebuild 664 BLAKE2B d8d91a1dacd4a0b0000700d6fb35101b969b65529903588462b26570135811e40d76692eda1f7db1b367a0acf5fdae5ab94676bc74e3b632ac3d7ea342b1b9b8 SHA512 d96ec68d52c9910d1c9320538d9347c78ded4c6a47a99d5c12cb53fcc5302dad4dcc8de53bf66fb549d0fb0a71aaace2c6e1121cd3a36c409e03b2e5e3c677f7
 EBUILD elementpath-2.0.0.ebuild 672 BLAKE2B 9c0b90acb8f616c3d019513e589f4942a5038877df436575379909eadaf3fcdc226264e97003be0d99fbb8fbc3efb3bd01d8866c25f8dced376dd67aa848e506 SHA512 852736112ce064bea6ba97c8b703175c956adfe4b3de67ecd9fd31780127ec9c44c3672bcb501cfe70d4ca66c2f3db76f0fe2bece37ad4733ccfd27f938a6a62
+EBUILD elementpath-2.0.1.ebuild 672 BLAKE2B 9c0b90acb8f616c3d019513e589f4942a5038877df436575379909eadaf3fcdc226264e97003be0d99fbb8fbc3efb3bd01d8866c25f8dced376dd67aa848e506 SHA512 852736112ce064bea6ba97c8b703175c956adfe4b3de67ecd9fd31780127ec9c44c3672bcb501cfe70d4ca66c2f3db76f0fe2bece37ad4733ccfd27f938a6a62
 MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/elementpath/elementpath-2.0.1.ebuild b/dev-python/elementpath/elementpath-2.0.1.ebuild
new file mode 100644
index 000000000000..64b4b299f7fa
--- /dev/null
+++ b/dev-python/elementpath/elementpath-2.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 2019-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="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
+HOMEPAGE="https://github.com/sissaschool/elementpath
+	https://pypi.org/project/elementpath/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
diff --git a/dev-python/elementtree/Manifest b/dev-python/elementtree/Manifest
deleted file mode 100644
index f03fa302624f..000000000000
--- a/dev-python/elementtree/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST elementtree-1.2.6-20050316.tar.gz 41752 BLAKE2B 41bb745d5a5f0eb0b3da96b3c6eccf97c23b45d2c886e0a6160fdc72c4f299419b2e7f1e36a6ef85d329d2b44e58ad74e105fd385fd3318d77bb6db89a72f508 SHA512 f213cf5bd9a79b59a2033c652d9d53087fd07dd3550db1771b8ba97168c3a5722d31ac5ff8699830df0f14a1d9f0caf8d237e8c6153568e16347d8b212771baf
-EBUILD elementtree-1.2.6-r3.ebuild 957 BLAKE2B 9319378a64d26cd722eae3e63aabf8e55f542aa7ef851abee056b6ee4d4acdd276499459abbc10ae224175419b0c68cb0b7ebbef4156cd313e91105de9960299 SHA512 b00c39b6d8d9153e9b8f9f3e3fad56dad2bdd763d40be2318599480553330a81caf6a44d122471cfd6c2eef5aff216a32200338a7948fc3ca1698352df0ea879
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild b/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
deleted file mode 100644
index b26eacf67177..000000000000
--- a/dev-python/elementtree/elementtree-1.2.6-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="${P}-20050316"
-
-DESCRIPTION="A light-weight XML object model for Python"
-HOMEPAGE="http://effbot.org/zone/element-index.htm https://pypi.org/project/elementtree/"
-SRC_URI="http://effbot.org/downloads/${MY_P}.tar.gz"
-
-LICENSE="ElementTree"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	sed -e "s/distutils.core/setuptools/" -i setup.py || die "sed failed"
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" selftest.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local HTML_DOCS=( docs/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/elementtree/metadata.xml b/dev-python/elementtree/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/elementtree/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index 4584b037ddea..56eaad2fec9a 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,3 +1,3 @@
 DIST et_xmlfile-1.0.1.tar.gz 8427 BLAKE2B 39677f4e8101eee012427bbc2959a187bee96bf052e14c47a2d5fc9000d62243e3842ce20953f7541ca534b151c025ee8cd8da96ec8bd82d926a21c68e8a0a04 SHA512 551fd87efd961b9c3202154dea9468aa97814ab8f6e5efc00962a651b17400866f2ad4fc85484a04c183c85a06375fd1c576c425e2e01bee4395ccfb680ce39b
-EBUILD et_xmlfile-1.0.1.ebuild 492 BLAKE2B dd0dc69871fc6b6777531d4009ba475b6d8c0eaa77b7b7d18a16ac7021746f157dfb32576d1533ecd1beec10e1e0b8d7d012da7f6b85557ce71d9d774b625449 SHA512 7c9ecbde8be3c3715d600c797ec16879c94f7a2ab37da7e7d500b7c93f78568b6005e91c08e8be0ffc9de3bc597eabcdcd077b8ae2f8482c0a6a1dd8e0a9f3a7
+EBUILD et_xmlfile-1.0.1.ebuild 499 BLAKE2B 6c42e4c8922ef6cf709adcc01fb47ee7f2b94ef96209aa634b985f82aeed5261e35b4548f66c32865d9562337d9766fc93b6b8ff64694607bc1bc50298b7a7c4 SHA512 2060d5f34e54dbfff86129ef3cb0c7b49aa327de3036671fdd5f6aec202306c3bff7c052f069996a43d6a0d598ada0d80f556e060481309342d7b69412575b32
 MISC metadata.xml 323 BLAKE2B 4f38c09e5189542f3e9c953ca83a03472a2d8a4fefbfb045667c171d1874543f612d5e8f36e1e38783699e8129c40ead88d5f0dbb86a614147a5f74565122ae6 SHA512 2294368cf12d187380ad7f33ec620c92275cf6870d61d5949a62f9307275151cd795c1bdfe75e2b818154dac4fd63e30f595fb656d3073c37ac229b6f73bc6da
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
index fb1f2f3687bc..63f6479c130c 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.0.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index 1aa1304e9ae9..a6f249309d5f 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -2,6 +2,6 @@ AUX eventlet-0.25.1-sparc.patch 4901 BLAKE2B 5c2db6c09e3123c6ec655480e5f440f0940
 AUX eventlet-0.25.1-tests.patch 1428 BLAKE2B be4b0e0104473e8434075175a85cb658e7257eea6bb554f92160d308649aa7faee6f4db7d2aa8a3df54e22bf6689d649dec6b74d523425a27bc1a77233b5976e SHA512 a7a413cce99def526ed63b79d1f73d270db9332ac88ff83a830fdc4106ffa20f2e14dfbf8d0dbdd071d39c4d2f161250bd8e7c0681f187fa0736d8184cccd872
 DIST eventlet-0.25.1.tar.gz 392719 BLAKE2B 7dbc23e63e9dc8b8bb0b4a53fc07cb467661bd695b6c778b973bd690bd24f3dd0f867d7ed803e1a89ffd36e5597fd244ef2c616c663d3d9130033f5f5928e816 SHA512 936aac45e24b2797cc8b6cd6238d493ce5eb60a47096e13827b8be145bd8dd14503f5ae624485c87b163718a85733b2317688366ef5fdf347f7d367fbf4d521d
 DIST eventlet-0.26.1.tar.gz 398200 BLAKE2B f14024d0825fb5530929766c63dceea7446057d9ad5dfb98ab013e96cab9b0eef5440f2d4d7ceeef17691c8a2a9055cac2b93fb23653a6facba4967c4e7cb0b3 SHA512 55b9b214130d0482ea005ea570a5aa3eafdf66e6d315a95c5ba60186a2d9a9df5c2638c86d886968954ce39e5ac2153e1f9e11631e6aef237078c3776af7d6c5
-EBUILD eventlet-0.25.1-r1.ebuild 2141 BLAKE2B 7d33066c473b8794dc7775956b852a9673a56167e12afcab1a5ff7cefc1341160b8de4b56d325102d17549631bbf1336763aa8ac609c56e31df555fb87ce00d6 SHA512 d4f66e724beaae255b249d39dc492d3f50eefb80ea066071cd30e3300423bef4d1b4dafdf0d1e0060475d46b6aa467c7059b2d2a45084a097b030af2638433ea
+EBUILD eventlet-0.25.1-r1.ebuild 2140 BLAKE2B 4b5d9d51b061217813cb24a6634d560f4830dd46ff5b95522e19884698f8f1917114a62cb90aa9a10e936dcdc9d9776b83c4f6157a2666a4a82874c44b3bd8fc SHA512 1760390c81442add9b8146056422897fa4458364356ca4e6e90e777b8c579936051031f9f99fdcee94ef1ed38c0ffa4729f39a3d8e8a497105030b33d09394b1
 EBUILD eventlet-0.26.1.ebuild 1774 BLAKE2B 22a756d64b34b85adffaba54988bdf23784610cd68d8dd45bb751c78c9922fb7d02adf01e6bf19a2e3953d3dd217dd358a4ee3141bd57af0dc3c3a9a8eda46c8 SHA512 3f97f61ddb215541713a9c5f13858bbdf742d6dcf93a350635fbb518cbd1b9bc096977d685882e4b6e348c39d42a284e46c7720d02e32b60738e2b8e9924822b
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
index f00090d518b8..8f3f5197f916 100644
--- a/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.25.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index d48f6d84255b..3bbebf3b6386 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -2,5 +2,5 @@ DIST eyeD3-0.8.11.tar.gz 215807 BLAKE2B e289a274198a4adceb0ec3b77a5c79f50faaa320
 DIST eyeD3-0.9.5.tar.gz 222657 BLAKE2B 3932c1b07e0961773a1cccaebec116c3b51a8c4560850661e8725efb3f4c5716b43ba610e35a2682f94b0e3b72513fbf108ffbc8c436a52977c308ad82e59400 SHA512 be89a2070b8cd5d70b25ff24e508c35e4e0ad20bfbe7bc91e4119614c1359cbc7a4ba812066b608f310abfd027d34b7bfa13f9dae8f3ab54f3ecfc9ce47c07e4
 DIST eyeD3-test-data.tgz 97281754 BLAKE2B 9b667a5f8be157ace06d773d575c08f4a8e8b7a7b81ba9cb39b1e2c924b2e3f98597607ed3076b13150e02ef7768e89d1ff8a9913021e5f4b9ac6b59344ed397 SHA512 937971dcefc53812c59adb97df27d200e92de04e12391c735ab85cd547e2a168aa1212d88c206ec71ac2fa85a504a9faa91dcc444b45149aca7c8f3a794e9a95
 EBUILD eyeD3-0.8.11-r1.ebuild 558 BLAKE2B 38f36e5f8c769a1e228f834495b4d56d9b9ab3dffc0211551d4f65a8a7288c969119d0b690f3426c2a2221945233235a87d6d6447f966105ff518dca683b82fa SHA512 70c13459cd085dc0cfcc844733baf13c54174b514d9ac500c76f0f0ff4430943e6a433429bf27acefca420064b0df680ee8f432248d3f9992808d102e341ac61
-EBUILD eyeD3-0.9.5.ebuild 1205 BLAKE2B 1b882fcfbb96c731f8909626173b8f59597d32159012087d3dd1e1e83e8464614eaf1773803c56593ada45dbe253b5ae9e3c69b157b294f0929543f53789cb56 SHA512 39c357209b6bb1bdfce03468d339ae7bcf3db2fa2fc96559696009da1f37552a6debf9616aa09d429580bccaf2f986326d8872cf8ca62e1d002fb51e7157bd00
+EBUILD eyeD3-0.9.5.ebuild 1222 BLAKE2B 77457248d113664846e08ac3023c0e2acb9e44c1facec25a44ef3a0c5ba802208a59352f0b93ffe39d5bc0581889921432e4359454cdaf4847ed1e056915bc94 SHA512 b617ab3a7d0435b3727a03a90fd36305ba8c69728386ae74bc925f4b102bbef5b488c7a1883880cdd24d71d5163094796bfc59f3603c718999b41852d2196bc0
 MISC metadata.xml 353 BLAKE2B 936234dca3e9cd646ab403b630c1dd05eb56bc3648bfdbda6fa31b6609334dbf04622760ea00d78f3c9b2bb37ab3c3d8e992db3210bcaffdaecbd5bc3e538fa0 SHA512 5d9b0061aaffcdcaa374f9ebe83ac47d7d6acdd28a51452f68d3f43a5e7b866639b9edebd82c20a440fe4e7f54a93567219a91cbf524218276c6c17df8b605c1
diff --git a/dev-python/eyeD3/eyeD3-0.9.5.ebuild b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
index 48379da94fa1..c3e639317a52 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 ~ia64 ~sparc"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/deprecation[${PYTHON_USEDEP}]
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index 96fe715b0bfd..960b7a59f08b 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,5 +1,5 @@
 AUX filetype-1.0.5-examples.patch 452 BLAKE2B b99fbb4ec4fb1ac75aa9f33bbcb509f9979ea23d47eb4d86b08a4c61dadae3aa27ab116d389d6f9c9c8787247d8e9febb15e06281de5ec82c5aa1c8d5948de75 SHA512 a2d9263958dc8a2927f9221758bba634106abdf041ae0f1c2092181e9ea0f9f3bc87d133eb107a92ff3fdef537ce3e2269fd8bc22ea4c5d3c669ccaf4003c5f5
 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 510 BLAKE2B 5bdaaf46296e43863a6086ca1f3310333103f298ebbada217855ddfa510b56d4190e7411407aaf82380b6bec92db4e95e0f880ae8d648bf400900c7de0a46b73 SHA512 8af6c570733812df828d8393c69a0fc7f24641e81befbe8baf0739bef9ac5c77f0f26422fb459bbd237b46b594e6529e93998bd48262420ac67ade306516216a
+EBUILD filetype-1.0.7.ebuild 522 BLAKE2B 3236ed3f5a7f0e804dac64d1ed25ddaddc181b1eec3297c28346692293b4f562c14a4a50b9e56dda7f2e44cd1fd3a02836d3156afbd6fced9912bd7bece2e0cb SHA512 0901e6a1a813bc2b698bc8bff040ca3f0d4bd20705727f20158eb4b1aa8ef217a6468496f1eb4ee53b09da1d5f6f24cae3df63d532d72f0f688670ce2a46d75f
 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 92e0bc748920..efe38c69fbf4 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 ~ia64 ~sparc"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc ~x86"
 
 PATCHES=( "${FILESDIR}/${P}-examples.patch" )
 
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index d8af2b1ff5d6..39c4f4976ba5 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-Babel-1.0.0.tar.gz 49680 BLAKE2B 29adeb7b4a6892fabf6e85da9f2fdb72f3871e3c3728c7521e06ffd80d8da505045eb1ef7a30223d8ef40064bc78514f6fc9acd1b8640232adb203ea55876e93 SHA512 3624b2e4877821551267e2719d76b714bda0a1da24e5a3c36d045273039823c4f3bbdf28cad5d8e0d4f0c896578248bfc40aebee720b543e500edf6de607ad8d
+DIST Flask-Babel-2.0.0.tar.gz 19588 BLAKE2B dbd5d6f3af38fad15a4eb6d674222473d673a9002ced21ce09a913e0bce3285b1eac9a5a85ce53c1dcebf648444164f33a5c790039a7d01184d45c7734dac05f SHA512 2ad8f80b450db0cab7dd57f46158e7e653556d60869acdb3c2469d42dceca3fa97237cc960986655091c84a1a67a057d72ed510787ccb065d171e6f35764cb1d
 EBUILD flask-babel-1.0.0.ebuild 947 BLAKE2B 830deb1ecc673a4609257766ac430a048d4850ba64f67330785a8e96b405839c14b47052f8a5dfb355c95c1f0637b6a365d3cc81fca9a50e83d37bfcad07c4ce SHA512 877d3a3a50810465f059ab832916405b580c244b79e12c42e4879f9ee6f11232750cda2e251e2488e172fb8be5c1510f7d237627c000b17529770f487b6bb328
+EBUILD flask-babel-2.0.0.ebuild 925 BLAKE2B d3b5a3f1251d4159d2ee1f36869d5a162b11880e49030b4af22f9074bb4d6a3ec59728d8968a3cf3d3bf1c5d53cca525e90988d10979ed8cae52f62baace5d38 SHA512 fb0ace5636a8a2d68da208744bbdb77319fef308be985ffa32a1a16e7cbbfb452ddb58980ab386e5e0ab8e13959a9508a40251ed44d2fb63cd1030b0292edd7d
 MISC metadata.xml 474 BLAKE2B 36e79f81c6890109b98f7ab2da037e18fd85cc34f1cbf6f8ecaac683284b3385fa15848922d725feb08a063100005dc2d159066d8ff37199cfc5778474d6e442 SHA512 a1f2ada6b9ddd886fa70b3d79c6afd3c066dff22ffb7bcf8ad8b8e02353a0910b96c25c8320879e5f3c137c41bb52d7c4249cb3fe486f13336e725f98df25f2f
diff --git a/dev-python/flask-babel/flask-babel-2.0.0.ebuild b/dev-python/flask-babel/flask-babel-2.0.0.ebuild
new file mode 100644
index 000000000000..5cac5c6bc9da
--- /dev/null
+++ b/dev-python/flask-babel/flask-babel-2.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+inherit distutils-r1
+
+MY_PN="Flask-Babel"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
+HOMEPAGE="
+	https://pythonhosted.org/Flask-Babel/
+	https://pypi.org/project/Flask-Babel/
+	https://github.com/python-babel/flask-babel/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/Babel[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/pytest-mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_sphinx docs \
+	dev-python/flask-sphinx-themes
+distutils_enable_tests pytest
diff --git a/dev-python/flask-security/Manifest b/dev-python/flask-security/Manifest
index a15133caf48e..a0fb2a1c81ea 100644
--- a/dev-python/flask-security/Manifest
+++ b/dev-python/flask-security/Manifest
@@ -3,6 +3,6 @@ DIST Flask-Security-3.0.0.tar.gz 160367 BLAKE2B c2e1449dc2807c2c40519fa3afb89415
 DIST flask-security-3.4.3.gh.tar.gz 346540 BLAKE2B ab3b037282bc5b7777ceeaaaf869996f471bc3b954f0b2cf6d17ba44d4014c8c3ac8e34618bc7347bbd1cd6b1c649b49407cb05aad9bd748191c08b7326f679a SHA512 23ad8bc91df418361a556827ff8369777f3716dfd1c97fef6237ba9cb07813eac4033eb3fed80e9ebadeab4f2d2a956b5a652bec80825f939a9fc7d817aa3d90
 DIST flask-security-3.4.4.gh.tar.gz 348525 BLAKE2B 77a851c2549be9ce8612e3b186ad2d83d272b277f286885da491f3f0fe99e8836d145749ae137f1e75625c34b2214270ba4d24f1bfaa514012064dd38f083230 SHA512 1c1a4f079199704d7a2a4e11351cd199e3a790f5d0c7f68b240c299e83b129227fac4ca00caf45401efbf14520c1d65d3b710b85e8f53b495283b94a164f97a2
 EBUILD flask-security-3.0.0.ebuild 1341 BLAKE2B fda0b3ef0eb3905478e61b3dd9b0728f974e090009af723aef9d5707196a875e992c0603f459cbc6c413ddae9bf4044ab6dbdf2dffe0f3deb5a02260eb28430c SHA512 9baf9297cc339569409cf9403bf9bf986433b236499e758406ecfb56751849fa3d1a2197da8e88f1aa64751224969c32330a6284def06806154f3a378774c90e
-EBUILD flask-security-3.4.3.ebuild 2137 BLAKE2B 541017d82745dd97953cdb88760b3991613aeb0c1d01e9e5c5cf7d1dfa19aa89fb001d51f439152a68bbd3a99b1c61232a2c1b246be90b8092f0f5a111cb057f SHA512 bf7cca110f94552e6836b424094687ebabf37180196fb461a9c10589f51fe225233d0196ae952b80e262a75fc8df98426f38929ccbfb834236ae3281c26ba55e
+EBUILD flask-security-3.4.3.ebuild 2136 BLAKE2B 6027b4ab95385e35ab71af98197d336c3ebce93f984d67d862bd0ef10786a5caf3ec2406cda8f8ea67c82f2423ce4ac8a7c49d0f17c002dbf758550e96307914 SHA512 596b1c877dd94f2fe2ca30cecd9790cf2f2725e0c2cdb33f0ff3922903c67bc3b852c12c71ecf8fcb85ba4197b4682af1818fdf0c0df3c73a6f479a8b2d35a3e
 EBUILD flask-security-3.4.4.ebuild 2144 BLAKE2B 2aaf0c0290e6121c14325c1f4d158c646028ce871051f96d6027dffa095b035b20547e46cfdd11b9ba37bd8275e782c6eb64df75724f5243753c8dabeb3c47b9 SHA512 c1767593e7d093e61f94a8e36ab995debe7ba352d420412d8eff61a942bf2aff86b9753dfcde8d9487bfb212daa578e67a4c3b31a1b5c2eb3c610e28d980db13
 MISC metadata.xml 341 BLAKE2B e33881ccf51b30de5fa6831f144035f0e895f2e1720ef7ca9360a1196b7d6c587f736d4d868afbdbd6678ea020f41164a41c0ab99069bdddd253b7e5b9d80d04 SHA512 ec87dffdadc946be52ca0a12d9265250f5a0e08e833c0cbd6deda1e8eb70354c2fea0bdfcdbe86fc16072138972881112cc5a5b08f4179b85f89695b5b22f30d
diff --git a/dev-python/flask-security/flask-security-3.4.3.ebuild b/dev-python/flask-security/flask-security-3.4.3.ebuild
index 3044071d1a63..04b6f4e7b4c7 100644
--- a/dev-python/flask-security/flask-security-3.4.3.ebuild
+++ b/dev-python/flask-security/flask-security-3.4.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-python/cachetools[${PYTHON_USEDEP}]
diff --git a/dev-python/flup/Manifest b/dev-python/flup/Manifest
deleted file mode 100644
index 10befd5dadfb..000000000000
--- a/dev-python/flup/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST flup-1.0.2.tar.gz 49051 BLAKE2B e3acb1c1a4028ed8eea5381c55d25f2cebb050a5ce9e18f74612d50453238338aa52b268059581a56438a1a0e42ecaaa0d747bc3bc2779ec0646daf1df3ce02c SHA512 65c610f9ddc3df6ed6deb6753b2b15ce4f4579efd9dfd25166d3b6803e5d7058fee6617388c9c67c39f7db54da5c918181dcbddfbb7be4a78cf8b65501af4c4a
-EBUILD flup-1.0.2-r1.ebuild 533 BLAKE2B 7a7be9c4aa76c5e22711676eca1bc32f706d7159620684767f200edf722c45cdfe5cdd403f13dd3f23c145f2bc3686736eed4afebc57613b13a348f8c0fc6d93 SHA512 8a360dd821003e639443813372882fe544958b10ab55f372db3440f32570d1a46e67f5fbaa6a64408e579abb94ce7612ef5a3f327982c61bf1d75ab03294d704
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/flup/flup-1.0.2-r1.ebuild b/dev-python/flup/flup-1.0.2-r1.ebuild
deleted file mode 100644
index 858d8de998e9..000000000000
--- a/dev-python/flup/flup-1.0.2-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=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Random assortment of WSGI servers"
-HOMEPAGE="https://www.saddi.com/software/flup/"
-SRC_URI="https://www.saddi.com/software/${PN}/dist/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/flup/metadata.xml b/dev-python/flup/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/flup/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index a446a3a901d5..1c7d13fa6333 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 702 BLAKE2B c69c8e22a840bee0b3a710cfe247df7844bec0abe877766313468cf50360ff0ed025001d1cc3c68f75a948bd28f57a2abfab8eeff008a214828acd728cdb7892 SHA512 f2ad04e89d6f382a4217e9bb6b527bd71fd1f93577a83a27eecdf4dc592f45a430768b95c7de8db58f64034e877e4b4e941d6fb338b288d29e5518920c38eeae
+EBUILD funcparserlib-0.3.6-r1.ebuild 709 BLAKE2B 0edffc36086e5971d03b9f99f52cce39656b0516aaa23100db7adcaca84c1b9bf84b0d7dfaf45698c2703a7ca3999bb6d18003bc111780dbdcb727c1caa0badb SHA512 d05d121826b7e9680d782cae1ebc6505af419d86576b7d8b56b1caa8d8505e9654aaff07aa6cd29c33338262645e43e8770b09ae1e7c8ff2ed63e59eb7dd4810
 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 5f5bac093052..b51cad0ac5dc 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="amd64 ~arm arm64 ~ia64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/gevent/Manifest b/dev-python/gevent/Manifest
index b861be38f3fa..46b9136565aa 100644
--- a/dev-python/gevent/Manifest
+++ b/dev-python/gevent/Manifest
@@ -1,5 +1,5 @@
 DIST gevent-20.6.0.tar.gz 5803237 BLAKE2B 97b988964ef80fcc1c3238718b6802016fb46742c94e7e56b5196139181ff82ce60816e0a8ccc5c3e1c3b73ec11cc705884b5ac5524dbd5116dc0d8722ccc7a4 SHA512 28ee030934d3c379577c9f86b76838e5d76c7ea7c0880cdeac9dc5ead497ae0600fb02b2984c7312fd42319142200c674b75da2e93b58fd4a99882d601a95108
 DIST gevent-20.6.2.tar.gz 5806612 BLAKE2B 8b1fbd991cb169292d33001bb0df06702d36eb3849c9251e4fac9e2fb5826eda3435971e39e209f1f537536081ce2730e561e91c398ee66a9b1d55c9d0e5a81a SHA512 65caa9caf8a2913b4c3bcc9a303169ce5837a0d7ccf4fb6b7583bf4ec3a0b288d65fc7e28399f0715e61aed128ffc6e67fc9b455474e47263236136a492021f4
 EBUILD gevent-20.6.0.ebuild 2297 BLAKE2B f0d2a4367a77c22341cbdce9345f0208c9ba01bfe0062532dc4696d49de5f5c01d23b220991d88deb92cd706fa8fcc6e5812579b4468ee532de5973fba3cff13 SHA512 51aa1c880970f350206d762c9ba1fd33d63424342f961e1ae7d2ed26ea7bda278df3a72c41b6f8e955c9af658d83fd482a343a280bb2322360193160780c1501
-EBUILD gevent-20.6.2.ebuild 2298 BLAKE2B 43803f5074c3b748fb16644f22ee632c8157f57c935a501933a324fb8ebbe8f90920d2b3c3060073430013308af0eb02066f1a40a1d1430d2009450246b6c576 SHA512 a7c177cc29b56bb4b22f5d5b042ec1fd98d0ab7cc718583079a58e04d23c9e5884f6201e71fd0bb0870d4906956bd5f0dfb09a327ee6c3842b651b7917d68e5b
+EBUILD gevent-20.6.2.ebuild 2297 BLAKE2B 86973db907f34ea0a3a58b2fa395ab995254f2a596c18deaa3f0cd13edd5ec448b2c2928ef47f613dcedb0e2682b0f0d10d0743818763d7e79ec85d7f3e9dcc9 SHA512 edc043e20c7e7bb4ae6721a2a1b8099ca0fba1887e6df4445f54c2f0c97fd3e1cfabd5c5b6c87146b0d18e21951ac3128abea24d1fa8a2f805cc39edcb097225
 MISC metadata.xml 374 BLAKE2B 87fe7f375b08bf4991954e018241ce4b150365409df516a12b79d221a037d718342dae60461663fac1d5af34458d352e287901e15fe68b1074927680055c204a SHA512 443f847333d35cd55f9c33624664569ecc8c2d0b7c74a358a716e0e133072edb0f29abfc36d6fb446db6890ae1319ad9d719a6e65e2bb35f9c9e9259379241fc
diff --git a/dev-python/gevent/gevent-20.6.2.ebuild b/dev-python/gevent/gevent-20.6.2.ebuild
index 9f3895b0cea0..9fee201e0534 100644
--- a/dev-python/gevent/gevent-20.6.2.ebuild
+++ b/dev-python/gevent/gevent-20.6.2.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 ~mips ~ppc ~ppc64 s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~mips ~ppc ~ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/geventhttpclient/Manifest b/dev-python/geventhttpclient/Manifest
index 401ef51b45a6..c7528e2071a9 100644
--- a/dev-python/geventhttpclient/Manifest
+++ b/dev-python/geventhttpclient/Manifest
@@ -1,5 +1,5 @@
 DIST geventhttpclient-1.4.2.tar.gz 57535 BLAKE2B f3c17140698b1609d9953110790fb536d982782c60165c717b6cee290c0b8fa5ae99cd6935401b6b617f0bd021783dd3f836c7cff775f513b9084714da1575a7 SHA512 3252d27f07a4642ba34d449664f50451b2ca4e44dc508345133d21acf659251a66be72784bacd312c074de4025dd5e080bdf35c84d9f7d40057132184a4d285d
 DIST geventhttpclient-1.4.4.tar.gz 57620 BLAKE2B 20b60cfa7e8221b050bfd95a6e23c2f3eee87c0df1e93171719c7ba1804e88c918471cdd01cf4c6020fb6d44d0a1b911ee09dd44cc1e150b5d18d6052f2904cf SHA512 c6a8580707f3178a3a55eb638b9e3f36f82aecbd8a5ce044f0b8c167d88ad2bec584275bed6b720a5f7a546b0ffd113bec28dd2e1ff4290c60f0b5e13542b737
 EBUILD geventhttpclient-1.4.2.ebuild 1527 BLAKE2B 6e6a17d12cebcc4e355bd35e7030df325ce028da315f76274d8ca95015488bb650a33f8ee64a0e0b7298a250e018a9778020bc511ed500bc1f1a12cfc0018afd SHA512 33a0eb1d558e10a841a09511f0c3ab48453c2ed66c38304f981f0f4027a9eaa77550b44384245377dde4fd61c4a260510577b0b7b68e5dbf41b4506b47483869
-EBUILD geventhttpclient-1.4.4.ebuild 1537 BLAKE2B 8467945c669e1f480c5f167bb0245f7fca2f984b1033e211b53a5903e2963adb18cef4a6f19e44bf70685903f981561a4787e81244317fb56c5f748c938ad7b5 SHA512 f36b9bb59778cb75e28155ad92b74ef9a680c2d8b6c0a1fb37302173740a5c687119e801b39d4d834962bda8c78037869480af84eb29ec839168b2e798dd401c
+EBUILD geventhttpclient-1.4.4.ebuild 1535 BLAKE2B f0b454451021ac030a18c97900d557135f1ae65066a970fc224b45ed0107c6b886cec11906999cc90241c6b452b06a7d062f602cbb67c8e6f762d06a9e4d4455 SHA512 edf6091fd6a6bcdf21fe1e5344998312269a46e54ae7d59d3a0714e2d5afdcf0f31468447831cd577245fe525d26763ea8d6eede701ec911d1d3fec8e5426577
 MISC metadata.xml 555 BLAKE2B a747ad2f270f2267b197d8489d253c18bc6093063f9cbc037afa0598931a244aa9da1d0d9d5c8e69a98c4f1fdfb8275917b9493dec895db5225a8918c51d0f43 SHA512 61c8affec2fd6d68f40d721842d7a121f6e24fdad560d131acf9e8b0f1a229afd2580fe9f78095da9a77b8dd9accf72b180eef797c4e143776e8beb7b7c36fcc
diff --git a/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild b/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
index c92490bd271b..60b9abfec4e8 100644
--- a/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
+++ b/dev-python/geventhttpclient/geventhttpclient-1.4.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index e99132602683..0539c7735b74 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1,3 @@
 DIST google-api-core-1.17.0.tar.gz 98660 BLAKE2B 7959f429dbbfd8de658b11d0ee5be253cb53d930f8b37a140dbdc89a0d25ecdc640fc91476138471603efbe1e6078d668bc3f0e06c1fb1481960970a6f5632dc SHA512 fd609ce85bde22b09653bf46dd7bcc504ed93b19f8832c28f1d26ecb38a01e00380bd715191152a8d109e8c3235951b60525d4692fb4ba0eccb11a3b1df58cd2
-EBUILD google-api-core-1.17.0.ebuild 1191 BLAKE2B 19bcdb5575b237a35c3ac0ada18e8bc24e840fa501fdd41d0efd6c490ddd55202bd12d21c8cc9606e34f713c8fb6865a18c2ac2ee7f5012d67bf18ab74c814e0 SHA512 ae5014c5bc75efa358cff7143edfb6e4b1b75b7416a6b48b485f74acc0b786192bfb093cb84e97ea739de4a1838cc75eb0dd68efff7512430f67d903e92619d5
+EBUILD google-api-core-1.17.0.ebuild 1225 BLAKE2B b4848e21c84711447ef731e0923080749f2fff42847e3a70f118a1ad5dc0223c6ecdc03b58795bd9b5990d0c4c36e072f505ba03d1bbdd21c481fb9f55621dce SHA512 5b6a24e5682add7fc3567f79460bbc9df0178ddd695f2e62f48a2e01feff223078bba6927363c85d5919621eaf958526989282ea4ac2798cdd1cff31c999e728
 MISC metadata.xml 280 BLAKE2B a1973c7508f6f1a2cca51eb3bb625257870e00e31e6227f20a34611c81141e812e6a38ff6e66bd43abd0b238b1f5b36b262cd08a69e606f677ab6b1a6a68fd05 SHA512 7bfe4f6ad469f5ecb38967b5a2413baee476acfabce20cacbd0e784aa2e2d3636ede1a2b97088bec5b6c249c7ada0be3b44218686d1d8663e54f57f2eb6ad765
diff --git a/dev-python/google-api-core/google-api-core-1.17.0.ebuild b/dev-python/google-api-core/google-api-core-1.17.0.ebuild
index b0eee1f185aa..b341f71e4d5a 100644
--- a/dev-python/google-api-core/google-api-core-1.17.0.ebuild
+++ b/dev-python/google-api-core/google-api-core-1.17.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${P//google/python}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
@@ -29,6 +29,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index f5d1d7a44043..d31fa150f599 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -2,5 +2,5 @@ AUX google-api-python-client-1.8.3-tests.patch 1118 BLAKE2B 41900d0b335812862609
 DIST google-api-python-client-1.6.5.tar.gz 4255929 BLAKE2B 4e2197fe56f25cd202f7a0b3f64b3796158d798bfedb9c0690a59c24bd5ce10fbe0300093ebb76cd343dae5eea2a0a360903cd0890834241926fd55a7dc07ea9 SHA512 b2f2be81e6f54ee3065e75ea064ea3ae49cb983d401ac46dca8459409dbd6df7c3ba07798285b5177bfa632a20d43aaaef3a7c73d5d565796567b8b305737565
 DIST google-api-python-client-1.8.3.tar.gz 13537177 BLAKE2B 00b1d46f349a8ad66d08a01da31aed224260ad38f0ee2d7a5b68afe29264234475d28b33cd95addf9f7020fa052e9528b01a4c9cdb73e2ca5742134c4f8f86b5 SHA512 7b9138b27bf032cc1b8beb321459ba5935ed31e4965fa783e472b9483cfd0e97c1da6a34e84fb8c939c462fac462d3f0d853266586ab37be8f890a6b873cf4e6
 EBUILD google-api-python-client-1.6.5.ebuild 1201 BLAKE2B 576e80db7392ff11fc7b3d65ef769ae93ac90957517a68567d0fea4495b0f762d74f2bfa09f05a5f1ec0c7d1ac268fb0673d0eccff1808e92bdae647f49738e0 SHA512 97dff39cfaa8821667295567b3b832033e00cddfc13b9e22442ab528be6f0bcc582ecc5ef06bb8d631086756dcb93afa3284e9985a6c24ec8b922f9d69a3b271
-EBUILD google-api-python-client-1.8.3-r1.ebuild 1355 BLAKE2B 10c56f73d832a6fba703e62a2f5a994bec366499dac39fcedef4d1c04b297e7269ebaa8e495185f06c6357353fe4a313a6656957f3353c5d94c20dc6e0c51ac8 SHA512 e879486e21b41db2c6691c2ea1d720dfeba5bf99a82a6830287aacf8d48b6bbc89a33364789166a69ea6d0d78b0b2a6874b20351b081c3edfa3e130b277c06e3
+EBUILD google-api-python-client-1.8.3-r1.ebuild 1389 BLAKE2B cf9bfd315bee8538b3d85710977924c06f7458b311464d0ecb976a82eda71e24a303384d18b6ddcbedf02b2c3efe8cd1506eb6f8eb85850f3ddd4113183fcdaa SHA512 dc330915fef96b34ff477a593a65e734c99447f318c28c4f78664f470a445b2a64dc48f5ffba7dcf5a7bb94feedbb4109e4b410785b652f89e12c27b74f71874
 MISC metadata.xml 381 BLAKE2B 2a802e6c566da699864dd520badb0a91eed1b7a1f26e3f20d6bd6bf7993325d07859034694d7d510984835369ea27a0c25241d9d202b3fc31fa2b52d26e42b6f SHA512 02a4ce0b16adaeaa44e041a2bfc0a4f97eb63914d10064403dae1581e3fdfda93673bb750a60e56b83c0bee46395266f7a5b846dfd65bf157253c733c8077216
diff --git a/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild b/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
index eef43c9585f7..5a8857a1343e 100644
--- a/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
+++ b/dev-python/google-api-python-client/google-api-python-client-1.8.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/google-api-python-client/archive/v${PV}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/google-auth-httplib2[${PYTHON_USEDEP}]
 		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
 		dev-python/unittest2[${PYTHON_USEDEP}]
 	)"
 
diff --git a/dev-python/google-apputils/Manifest b/dev-python/google-apputils/Manifest
deleted file mode 100644
index 7d680840905d..000000000000
--- a/dev-python/google-apputils/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 0.4.2-sh_test-env.patch 754 BLAKE2B c44babbd7f1ccf7a9a6ed2f1885e30ec6287eb48900446ccebf1699a5afc0bcea6e5079716e8aec064553d97fb03c6e2a42286c8fb769e9eca552696633fb3bb SHA512 a8a84c65d08c7574f4e33c6e6c0b75d1153e192e86ec37c0e74754cc84f45b081b523ee2f1919f57580ba5bf6d849922dfaf62bafa00ef098cb1a835a929331c
-DIST google-apputils-0.4.2.tar.gz 81095 BLAKE2B d99c2fe8081616ee2891718fc3d00d00bcd703f694b9419bfc7aaebe75ba8cd0de12e8461dbc6459c1b7b88abf6e7af89972368c565565cb5dfb810938e4e1d2 SHA512 d7579ec461292bb01ad5b8e1b09e161c66af0e85361f43f6065b837c90bddb9711a2d56db2b73d780dc25945375d4dad2f646507512b9acfeefd517613feacd4
-EBUILD google-apputils-0.4.2-r2.ebuild 1131 BLAKE2B 7c8978faaf6ea91f2a01628596b15351ba4d27ab35134eff4dee209a67bf436d7d510269a17ac78e1c39bfa674b4c44ee1e7b51de2f0c1ab686fff5bac6ab2e2 SHA512 3342b1207e4c675c024febdcfe21ef6379e9cdf2b5df2a1329fe01c30cdebfa7f47182d6b0ce05f77e55863368b9cc3f7ec664c12ce6ad15f80f2b9c7202c576
-MISC metadata.xml 392 BLAKE2B 5282cd7dbe47082409723576d76c9a8b9126ff1c9c6adca6ea6c1d07e28169a01725cd6e24e407392c42703ed848626feaec4e134ba3bc0731f9488f8593613d SHA512 7ccba7bf0fcdb9da27053154056eb947ad07ce01db7ecc41f5a7e58bf75d15e71ce08ff420ee70b8169e5ea44d48d04d529acad65c8280785e0bd21a21bbcb9a
diff --git a/dev-python/google-apputils/files/0.4.2-sh_test-env.patch b/dev-python/google-apputils/files/0.4.2-sh_test-env.patch
deleted file mode 100644
index 69ebe6278f9d..000000000000
--- a/dev-python/google-apputils/files/0.4.2-sh_test-env.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Prevent the environment from being clobbered during sh_test
-
-diff --git a/tests/sh_test.py b/tests/sh_test.py
-index ab41055..d1b08c6 100644
---- a/tests/sh_test.py
-+++ b/tests/sh_test.py
-@@ -29,12 +29,8 @@ class ShellScriptTests(basetest.TestCase):
-     path_with_python = ':'.join((
-         os.path.dirname(sys.executable), os.environ.get('PATH')))
- 
--    env = {
--        'PATH': path_with_python,
--        # Setuptools puts dependency eggs in our path, so propagate that.
--        'PYTHONPATH': os.pathsep.join(sys.path),
--        'TEST_TMPDIR': FLAGS.test_tmpdir,
--        }
-+    env = os.environ.copy()
-+    env['TEST_TMPDIR'] = FLAGS.test_tmpdir
-     p = subprocess.Popen(sh_test_path, cwd=tests_path, env=env)
-     self.assertEqual(0, p.wait())
- 
diff --git a/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild b/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
deleted file mode 100644
index 638e71945913..000000000000
--- a/dev-python/google-apputils/google-apputils-0.4.2-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-# Python 3: https://github.com/google/google-apputils/issues/9
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of utilities for building Python applications"
-HOMEPAGE="https://github.com/google/google-apputils"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/namespace-google[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-1.4[${PYTHON_USEDEP}]
-	>=dev-python/python-gflags-1.4[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2010[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( ${RDEPEND} dev-python/mox[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/0.4.2-sh_test-env.patch"
-)
-
-src_unpack() {
-	default
-	chmod -R a+rX,u+w,g-w,o-w ${P} || die
-}
-
-python_test() {
-	esetup.py google_test
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	find "${D}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/google-apputils/metadata.xml b/dev-python/google-apputils/metadata.xml
deleted file mode 100644
index 12da0e45b5e2..000000000000
--- a/dev-python/google-apputils/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">google/google-apputils</remote-id>
-    <remote-id type="pypi">google-apputils</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 8347ecb10958..fd09751666ee 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,3 +1,3 @@
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
 EBUILD google-auth-oauthlib-0.4.1.ebuild 629 BLAKE2B 0cb2298c2fecf924e22458c8652d9f9d461f183444c234e4f5817954cb95e498630ebbfa4b75a2d38995cbd74b946518729bd47f6a45ed0ecd48b8fd6555e95b SHA512 41d56a3d6105833824b666862769d6a2c4ffc8e60abbb4f10f98cb598915d07f66cc34067a6537726ef6a299e32d35313d3f097f2087ce25659df9d0778784ea
-MISC metadata.xml 470 BLAKE2B 36db489a9e55bd13107658ae61a02e1ab39323c8eeda79b918b193471664adb2ffc2457324be492619a387d600e5dc72e08df323f17e0141793a12cdda79b89d SHA512 79b59e2f899a165f0e3a98ad3f3e809e264fb6d9b0d399329b19af3d2ab2c1628d99d9574fe4f9532646c648b6392a9cdbd9bb21739cf5d37b19c56438e185b2
+MISC metadata.xml 255 BLAKE2B c4c803a94d6885a8abc62874a17e76c1a13cc6a00ec4584d189c44c3e37fc87ef14b803739705e4e0051f57fcd1e475f4374ba28eb4520590b990ca53b16b272 SHA512 aca82b710a2d8d4338aead6d3e0443bd3d2175cc7bb4e2e72fee0535d0f0305bc55b87bbd9c87cc2385d7a7d4cfe81a4f123f9ba9010f667fcdc892a9883a362
diff --git a/dev-python/google-auth-oauthlib/metadata.xml b/dev-python/google-auth-oauthlib/metadata.xml
index ce124ee72b82..dd996c7c52ff 100644
--- a/dev-python/google-auth-oauthlib/metadata.xml
+++ b/dev-python/google-auth-oauthlib/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>linder.gabriel@gmail.com</email>
-    <name>Gabriel Linder</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">google-auth-oauthlib</remote-id>
   </upstream>
diff --git a/dev-python/googleapis-common-protos/Manifest b/dev-python/googleapis-common-protos/Manifest
index db4ac89654b0..a5fe7f9d1f7e 100644
--- a/dev-python/googleapis-common-protos/Manifest
+++ b/dev-python/googleapis-common-protos/Manifest
@@ -1,3 +1,3 @@
 DIST googleapis-common-protos-1.51.0.tar.gz 35176 BLAKE2B 517004426bb04dc58b85a43fc4268407bbb3a5b6abc1949bda39e03a08a506e727e2bd1741180dc03695b09f4f094c55fe836d275b2c2de146459c399f584355 SHA512 31b6754d5541de4a6ce13e1e54dc54ee29c8153b57de3d0faf40bb236b6af9bee0516957f4b1f64f4404d713e3185126ef782a7825747fede827a8a8e604e303
-EBUILD googleapis-common-protos-1.51.0.ebuild 683 BLAKE2B db2489f6aa8fc6bd05ea341922ba20e97f373fabb0925bb4c4ef9ef890239d6a11e5eb394f6e90515f0be91a94764b3a8afc39220fe7c271a965df579d73ee6c SHA512 34268347a52c9183f130f39d4ec426bca50290a042d44860a1c48352be1bcb0e8c079dad87a1bd723c9309ed970dc796671af2340c65e06823d09c86b689a5e3
+EBUILD googleapis-common-protos-1.51.0.ebuild 682 BLAKE2B a42d7764303439f0b7afbcfacb6a563b5793291a1fd879bf6b44c2c9e037b585e03d507f35d8170c8f66511534fe3d3455a8808f2ef4a64b3b1b9641f55edba7 SHA512 b113facb7987bd83e227c8815091d78b1a380fa474bb37cdb11b1d7676d009d51ef5fb4314811cdbdab19f2ca5c9952739ed6db67ed0ee4195e1a2838aebd1e7
 MISC metadata.xml 280 BLAKE2B a1973c7508f6f1a2cca51eb3bb625257870e00e31e6227f20a34611c81141e812e6a38ff6e66bd43abd0b238b1f5b36b262cd08a69e606f677ab6b1a6a68fd05 SHA512 7bfe4f6ad469f5ecb38967b5a2413baee476acfabce20cacbd0e784aa2e2d3636ede1a2b97088bec5b6c249c7ada0be3b44218686d1d8663e54f57f2eb6ad765
diff --git a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
index 1c0536a357ba..b9a4c475a7b3 100644
--- a/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
+++ b/dev-python/googleapis-common-protos/googleapis-common-protos-1.51.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/greenlet/Manifest b/dev-python/greenlet/Manifest
index 85952ec726b4..abb3dd2257b6 100644
--- a/dev-python/greenlet/Manifest
+++ b/dev-python/greenlet/Manifest
@@ -1,3 +1,3 @@
 DIST greenlet-0.4.16.tar.gz 60576 BLAKE2B e0c53af4b6886fe00f0299a1779e478b7cbce5ff733669e8a62757cef49f034e19b7b932e7900b09e288ff4ab7e883fc2dd5f97f78c0e1b5702e5ba9c9f62fa1 SHA512 0dc473c05c1d54a830c009fe8197fd2017b8f3117532af0fc7970eb5abd93a82bbaa1a8403375a0ac7148fcff63cdc3faa663d0c5e442f3dd10ea3b2f98b306e
-EBUILD greenlet-0.4.16.ebuild 837 BLAKE2B 40883c0cd53c7ad52c6282d682e214ce4e1b0fc04388ead4c734f4bb1ec45b475ecb2a4f6469b985e3a46218631a91045885ab347895f2fdb777f77e56dd40be SHA512 65023c2536a3ba02b47bd4d119b0610a4fee03f5f176d8ce105b7c657383abeb584cdfe933e10d538f332577d28bd1ef1d0a7a5c0a306b2aad6de84dd0eb6c9f
+EBUILD greenlet-0.4.16.ebuild 836 BLAKE2B 77054541432a5bf5be6ab7533e8c8aa5bd156d0e475fd4d28156ce36aab2d803ddc8c51f0b9f282d4badbd1a0a8fe1a824b63cfc28678945dd0ad34a52559dd9 SHA512 a425cb0f954ae0e35fcdc1fd3f5a013616217d060638bb22933196c380734ab62b5d1af4b2e96bdf95283d50054f17debffd520cc3657ce29d7cf564894c74f0
 MISC metadata.xml 321 BLAKE2B e625b0c7ecad0e1755cc398a1111c93434bc16c848ba4c15c11551ec1f9367c71a8f1f081409a7f09f5a3c5c6a693d5702fe2d30d371f4c431a6147b817621e6 SHA512 39b920fabdf3e6ca67ead606a859b66dfa19ab532a798755fc9406b850372d238b774ebe82e107e89b4e8e0447e5e48abb259047df62b4cd5009396ecad74548
diff --git a/dev-python/greenlet/greenlet-0.4.16.ebuild b/dev-python/greenlet/greenlet-0.4.16.ebuild
index 6372f318b5e7..4766b676c6e4 100644
--- a/dev-python/greenlet/greenlet-0.4.16.ebuild
+++ b/dev-python/greenlet/greenlet-0.4.16.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"
+KEYWORDS="~alpha amd64 arm arm64 -hppa -ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 DISTUTILS_IN_SOURCE_BUILD=1
diff --git a/dev-python/greenstalk/Manifest b/dev-python/greenstalk/Manifest
index cdef026e895b..d65961fd7287 100644
--- a/dev-python/greenstalk/Manifest
+++ b/dev-python/greenstalk/Manifest
@@ -1,3 +1,3 @@
 DIST greenstalk-1.0.1.tar.gz 12898 BLAKE2B fc0b90ba95b09e1490025175339c3f9eb7afed16db40ec34031305a3d487582fc7305b1990424f53a06887a34c30ab4f957db01a640576aa1c5db30511161c0f SHA512 8b57ec0c7fd3a60c24e8ddd7d51f31c0986317cbceb0f7045bbd720ca58e8f3c896f2f9924de7b1e8693844c814ecdebc020972d895468d1b0e7d055bf628b16
 EBUILD greenstalk-1.0.1.ebuild 668 BLAKE2B 9c4e7f340ad96ecee86336847a48e89f87613bbfd39326fd0e42eae606b641dd66554453155d193b7e6135798ffe2cfa8ce477c8b087f5b9d29df9506bed46b1 SHA512 1dde1893e9bb0350436fd70fa53ed096dcac3a4b07259cb4776d9319bfe048735f3a3eb6733fbae6566a4a401d067b9daa0e6e5b9cd123a543927a21d4a4f32f
-MISC metadata.xml 468 BLAKE2B be86df42ba2a9a693ef6d6ff7dc2840a5a8ad749978f4ce6a77e43fa7ad1f0f14c0a3ef7fed355ce17cdfdf94bd40d1650851aa3910c6a7f85af36753f329505 SHA512 e484b320e2e44edc72cf5cdacb7355cfea180a3193738f233667cbc28384933d4defa8fd3415032cb863acd4d2cbbfa3992e116ec6b14f29a34078a56fab9264
+MISC metadata.xml 253 BLAKE2B 9e177062103bdcc3b73c3ad16693d30f52090aec4f4d9f4c1e29be57ad952aea6bad43d5b984bd292d2af420b2eff36f21fa8170108530feeb7a4d4330f21c78 SHA512 64f4f4c5f42c0a4a9375595c017bf03371f59c36b79da9dd0e819f50a2e9a59b01c96d1ce6dbdec306434960bdfeab97308dbbaeb4c58b7401a206c46599fb8f
diff --git a/dev-python/greenstalk/metadata.xml b/dev-python/greenstalk/metadata.xml
index ca34494621e1..1c4b1a9121ed 100644
--- a/dev-python/greenstalk/metadata.xml
+++ b/dev-python/greenstalk/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>linder.gabriel@gmail.com</email>
-    <name>Gabriel Linder</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="pypi">mayhewj/greenstalk</remote-id>
   </upstream>
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 3b1eac653b21..35451e8ebfc6 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,4 +1,4 @@
 AUX setup.py-respect-cc.patch 1152 BLAKE2B bc939dd5f28039c8d2a7c5ac40eaff2437c0cff1ed7859b150cc5865fa59be3410338d4507f1f0cc4ed1e36f8ba338840aeac3de847b43dba1e4a3fd91b345dc SHA512 93ebcffb27c0c30e282d45094cf21f9852a46055122aac37d8f6bdab8ff42410ed234a0c9bb661c05057d41a7c3291bf868275ef57a5e7c8ef3ad1de4ea074e2
 DIST grpcio-1.28.1.tar.gz 19511346 BLAKE2B 01ebdeddcba5efbb67880693ede04ccd828771fe73def24a91d882c28f5cf6f14215daca212df1d8bb9372f385aff1e31418870437c87343f218e7b78a06b04c SHA512 12feaee3816a5e7b20b648a144d37f7e550a057112f5460bc4ec016885461951148cd4d2900fbfc905f76059ef29ae4c4d1d5a3216e5e3a2d17048c8b45f394f
-EBUILD grpcio-1.28.1.ebuild 1029 BLAKE2B 0b24a24b52b21b5b2eed959c899627ec63f15f05de12f66ab42811b7273753ba2941dc65e79ef2cde848b120532e3393c42942c108da744c35a16469f77fd04b SHA512 b5a2d4a82ca3cb34866f07b54c7801e97fcd072e3d48be9a0fd97d04509ad67c8b5a39c22c4bf5a76c05b54504c69b01963194068b92cb5a913b813e196ca970
+EBUILD grpcio-1.28.1.ebuild 1028 BLAKE2B 1a2b0dba26d3d08f61d49df7f39a35e3ff35b8a142553fa04b59c2d4d72dc6eb2f4520f17b543c000a484905d89867e32fb862389123098237390d758126b158 SHA512 c2fa4000ea5b2944775b13049bc7970fa351285e638c92c003d51b80fc313a810c4fbf1fa68b9d347a7abbe7cfab152971af9e6fd3793e06c618535bac797a44
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/grpcio-1.28.1.ebuild b/dev-python/grpcio/grpcio-1.28.1.ebuild
index 0ed253b4d80e..31e4755f6bf2 100644
--- a/dev-python/grpcio/grpcio-1.28.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.28.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::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-libs/openssl-1.0.2:0=[-bindist]
 	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 3805a978080c..baff4de5db78 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,4 +1,6 @@
 AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65a82f8cd7eb7ef6140224070c0680b6c4646c111a063ec6a8c7d51ed2e56455eede1696abf6fb82f9d6d14d5aa81d58619b0c802bd SHA512 a1510a688d000b8f45ac48c39ba46336859f952356cf776d5204b512496c523e5dc622d16b17b50d0d6318bd94b817d52683e5f56287f0053ced2508cbf23259
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
+DIST hpack-4.0.0.tar.gz 5301419 BLAKE2B 0164f6aafc0d1f17f6c397efe710503a22501faae3c7dbba4e57ca2dc76e4d373bc5e65bf55acda8bc61975d12f8a2084de0e0c4587539e5a3102e3cf66d562b SHA512 f482d086d7a82649393e3cfea55c98966ce57055cb1826bc4dec1ea334661c02708e7903f2e8e588ee1c30df41373e1de9fb960c2e7bbc18d0ace0b8f97b195b
 EBUILD hpack-3.0.0.ebuild 1134 BLAKE2B bc24b1c99733ec94dcfa3c9377dcec18d66524991ae54fc3f6cd72807cc5459edf85ff5331bc15db7ebac20a6e30803ea1e817f48ca69b7474883756bfacfd34 SHA512 ecbb4218d5fb8bcf481ce982d732622efdd72f70967625e2fe1de26595fdd424735287531b6ff10000ecc2854adb39e1574d92ab14d38afb54714ad166d8c848
+EBUILD hpack-4.0.0.ebuild 704 BLAKE2B 7058a9975122825eff85502616b66f5c8c60880a90ad6c5ecf5b9c669ef89c3d4b6a3ba57882e19f3fe1bf091b407e03b9a13972fbe3a1b79903df052bfe22a9 SHA512 80ec08712faabf91b23f606e348ea4b2f9c35f22f29ab97f50d7d82445409254403d26cf1b57ae2cfe8b8387ecc06a775ef8c9c36e87ad35bc1f377bd0deab4a
 MISC metadata.xml 677 BLAKE2B 1440fcf100740188ffc8ae85da9bc014004feb2aa04d5f5db73546e62a01ffbe0975b9b588e6d579c45a2b1c803958999dbdd1cad8c1cbee597a3202556b7d4b SHA512 b7d64d3fa13e9e2f7a794aab733b511ec37809294b0c353d9cff55950dca47e57da8b5b5b80ffb0763f509a498816f94586c11dfdb569ecc6fa604f75c7a6132
diff --git a/dev-python/hpack/hpack-4.0.0.ebuild b/dev-python/hpack/hpack-4.0.0.ebuild
new file mode 100644
index 000000000000..3d2885a39310
--- /dev/null
+++ b/dev-python/hpack/hpack-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
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure-Python HPACK header compression"
+HOMEPAGE="
+	https://python-hyper.org/hpack/en/latest/
+	https://pypi.org/project/hpack/"
+SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+# dev-python/pytest-relaxed causes tests to fail
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
+		!!dev-python/pytest-relaxed[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index afda5f89c44b..0ddfc4ab0c39 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -3,5 +3,5 @@ AUX html5lib-python-1.0.1-support-pytest4.patch 13579 BLAKE2B 723c8a77f200897837
 DIST html5lib-1.0.1.tar.gz 252959 BLAKE2B d2a9fa19d6a18b9e0c39f737a22ff4d5a6533734843f787c083f9497fd94788dad0e1e96478fe48b262c208370cf58e91ab94cc06a3e2757a40e936363cd3148 SHA512 35939b4450893864da04e735ee5e0addacf1dd34bae6a6909c76572abf6bfded446a78a713dfde91c1485ba45867d7abeb6a45cf0545c16ea968707be7de5dd2
 DIST html5lib-1.1.tar.gz 272215 BLAKE2B 11a4fc3fb84bf8bab4af5da1de30b0892a9eb454505716b3db391187053c9aac159b1c82ae787896592b8fc850363bba9313b9d7fc617150771c3bfa1aeadefb SHA512 af7c29591007fded99be6c38e3d0ae5a4ac32d71d26046a615918ae732cb1c1ecbf754f47ceca1a53726c3843f3ecea7af87a7362281b45ff3af495815818626
 EBUILD html5lib-1.0.1-r2.ebuild 1000 BLAKE2B f9d18a3bc62939db608535664b81d2d81e10cac020b08ac940798a036145f9e1f0156a98d3d17dbc56ad25785b9078df99be8a213b0beff3a2d03b0af8878f36 SHA512 0812c6c817aff122c8edd70d85ba51dcc8d1a751ce1ad08cdd28ef5954cfb79135a477e2a046a08dcab99ff0ecf06860d79a381ee3706af6170cdb19c9313d36
-EBUILD html5lib-1.1.ebuild 800 BLAKE2B 053638a656bbda3f7578bd4a7d5ea7d2ae78e0cf633615664fb9f03041cb697afa2ba30c5790dfe3559ed645e39d79c1fca437a95717b8fbf83f3bac36a78204 SHA512 e6d840540e9548a270d5c794cc57d311f5f5cdac18bae47c39d4b8085513954393b5a0cdc654a25f9b3ccb7bbefa07c50f6ef89d79857677291c18176f1b45a4
+EBUILD html5lib-1.1.ebuild 799 BLAKE2B 4e60813b397d9b5c7ade6972549ece8251f1efcca0474e346ffea9c5d56ca6463a960771a21e815a6906e996aeb32c856cdcaab95e1efd0959e4097c0fc68911 SHA512 ea62cb737dd21d2fb128035d74162af8a8a86545398aa4659c408744e756ca9f8f5fc9c8435fae56474646285225b7e9082cfc07fefa4e6de7700abbf0a8b0f7
 MISC metadata.xml 614 BLAKE2B 09fb1e4c136770b5e53aecf3af9681c9155bad58e2720e6e1af9aa8d5b44c184a48bbe0d204f8af0d3e61ddf9d3b60f19ae0034d6e66b4f8683fdf7e8ecd919f SHA512 1cd9bdc5fbbedc67023c31d24901c873a9d644b8dc4f26bb5b19eda8f0fe25c413b9bf0e2b52f7e73517d744d5757881cd26bd939c39eea748dd2f84c25d983b
diff --git a/dev-python/html5lib/html5lib-1.1.ebuild b/dev-python/html5lib/html5lib-1.1.ebuild
index 939abadef410..32fe89fdf77e 100644
--- a/dev-python/html5lib/html5lib-1.1.ebuild
+++ b/dev-python/html5lib/html5lib-1.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 ~mips ppc ppc64 ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT+=" !test? ( test )"
 
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 0487aae1cd65..fb9ddc446e2c 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,5 +1,5 @@
 DIST httpretty-0.9.6.tar.gz 7147633 BLAKE2B e1d02ddfce5ca987c6ef1a17723544f86a8573c2a6a26ec197072021e52015efce5064af21bfbe1ec03f3ac11c21717a80f114b5be2526b113e3bc0a608702f4 SHA512 bc1c64d34370209c732bc12dd9935600b647507ab2c8f18c85f348e9b5e853618ba39e10e5a073b35036e6cbe3db2cb7a342a721d0e4affa81fe178fd0b75d92
 DIST httpretty-1.0.2.tar.gz 399185 BLAKE2B 033e954fccf6a351c09dac3c1585ddc65f064eca109dfd8f499fd510ea09ba3ce5198d3f4b54fb832b47425ab721ddc1b2da596b6066028bda1f0a1303cdc0ed SHA512 f9ef1c82f4fe3a31696e06228cea512664c5118b3c32910d7810d1fcf16b05d31b9b55db7bb6bd64967aadb162a2952757627439769db9117164b8248de9049c
 EBUILD httpretty-0.9.6.ebuild 1027 BLAKE2B 0309210657bdf6837a4fe2be9a7aca3ace9ef7483274045053a6b16d6f86268f0ed2c433bdc67c332b166da9e4525e3606d224091b61c4c3f92d2cc4448637e7 SHA512 5e8b08de759503299d45fe8bbe0e05dbc2669e98bcf923d58e45fd8c678f7e7fbed69139a31c65e92bddd816af9fb7b34582e6bb1eb81ed6179a22a3f00f8b8c
-EBUILD httpretty-1.0.2-r1.ebuild 1338 BLAKE2B 663bdcf6c3ddb239cfcd02fb41fcb09e0c5a18c711494e8904492482ad35ba4c684d4dd0520a463aed6db2b6f776a43fc4ab8a5e669a70b099ed4ac0ae38f394 SHA512 1ecf0485842babce7e52cc91245fea4ccdd4e47e5628fee0a5416b87886846de11e7210da770129bd420f195a2999ec3d003e411cef821fe2a6dc296e0ff997e
+EBUILD httpretty-1.0.2-r1.ebuild 1336 BLAKE2B 2925512848a8da4f8d707e8422f398212e146168d7eb669a6eef6f510d05a2822c43d595d6e4296e300249be3169260b8f7263e7a6e7a7d7c2b39041e9b4c5b8 SHA512 15b950045d0edf254f3349b3e0ddfaf241f824cb0f2273aa6a4351522bbd783b90eaa8f88b3dacd45de8df99e6a1f6e57bcc1d75a0672e34046c8ad0563a6bb3
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild b/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
index 1851a2c02fe0..12c6a2505f07 100644
--- a/dev-python/httpretty/httpretty-1.0.2-r1.ebuild
+++ b/dev-python/httpretty/httpretty-1.0.2-r1.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/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 65dc07c432bb..a65e3a0a4ed3 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -4,10 +4,18 @@ DIST hypothesis-python-5.24.3.tar.gz 9050345 BLAKE2B bfb47794edb3c1c6aee22e808a6
 DIST hypothesis-python-5.24.4.tar.gz 9054743 BLAKE2B 5c64c86ed58d8f0e4a07390b1b1b5e405878b9632bf14233e0515ad9d98ec6ddcc57bf39be6b61f53739d34e393b3af64c0d362880019d29a649a9523a0204e3 SHA512 147f4fa47b54bf3ec4dfcebf2a6c98cee26ea6780244ef99e181bada65978375ca7731ed05cb98f1b92f7a44a357faae374d97d489ec6e2318ff94e526cd9a40
 DIST hypothesis-python-5.27.0.tar.gz 9067945 BLAKE2B 29cd1fd1b7cd4a2258a84d4dc122284c1cc8f21da2604e3b6c800a3bb43687eed7a3eb5b33373000c7c1359a3ff08326107d878910a0d92817c0c29c743dd1fa SHA512 973ab33c69d2db58ca3550335be3cc4196ccf532ccc2c0aeb0b54459201904c06f289a9f6faa3bfa77f6704a6f43e253e34453110cda750a2a1a19a851038dda
 DIST hypothesis-python-5.28.0.tar.gz 9069739 BLAKE2B c7b404b815053441a7446c947a03a50eaf3030cb2b0387dda697e677af94b1b90e7570603ef3b4f8b26b9afbcdfc1b3708f713202c4a3617c73494f9e13781aa SHA512 7d3f7a88d70d48465a5bb6b995a73dafc4273f4a0cc3d3f2ee0ae125e1b2f52b9a840268acebf80f4dd1e86b5b5998996f2506a665f24044643a299aded0ced1
+DIST hypothesis-python-5.29.0.tar.gz 9070261 BLAKE2B 38781893d6fdf68deae890a150ca07ba5d1fb3c9ba717ea356af8b0b10b21c7e6a4b94b1ec9bca7ba5cb02b0baa18c5a773892fac342767b6dd79cbf2f89bdad SHA512 e3fc350181f86bb9669d4b0d0a43291056550bb73545070e2c7931006393895e7010050f90a063935bedb60bd18a3bad904ca92b147d81254ab50d4868adc8d0
+DIST hypothesis-python-5.29.3.tar.gz 9070885 BLAKE2B 6e106fbc6ed6719c787083c85e3047c49af94478148f4038b59d4ae130b272cffa86a2c117fd2a4f6a798255aa33b0f4714ec08baaf8fb1d5f1d0fb8d4de336a SHA512 fb820057ec257d4dd749f0c6caf10bdcc1e3a090c788900f159456620bec6bd2130e9ffad0ced0155a9f97e2186ed397fa72dbd5548b132ac2c129735c1e716d
+DIST hypothesis-python-5.29.4.tar.gz 9071060 BLAKE2B 0668f3c7859fae7024c15f693b1f56ce8d02d6f3b8187d24b2d84e38e7bdb73c0824d2b02cfecc6b40bdfbbb1c91c0aa83d40848c499a97ab7e9223aaa6c78d4 SHA512 9da4b487fd3c56540a20e2fbff635704f0720f422d8a398d0accd24a1fb9517476b0d29135b9113a96e8dc98fcfc31cc53215ad82cb727be54e4e77b44d4c8e4
+DIST hypothesis-python-5.30.0.tar.gz 9071239 BLAKE2B 7d46bc588d35bee187d9c19fafb41b290edb0e4b40022bfcdf502f96631aca7afe3beb6c4f27df27784ab1ef9903df7747284253906140835429e62b19eb1904 SHA512 03423b48aee71eceb84d838433351b48abf041ed1a9b617ea3e0059e8046f1cafd327e4ed4ec65c7893340602ea7d21572b3a8bbd059b27e1d0c9b867a6938b0
 EBUILD hypothesis-4.57.1.ebuild 1836 BLAKE2B bdb5dce13df4313f88387dcbde4209f31a7f23ddf9a6a5a3f886bf050b35f3b45e27ec349cd8baa1d3ba88e5e9200283df5b6f11c0d10fe4383d33575a682317 SHA512 b642bec77a742a13acfc480f02eec505fe0908071c55b58264e066e6ed3187ed0ed4b6d5a330db304ea45a1726f8c67a000e5ac179b63f72a79aaeda616ca2bb
 EBUILD hypothesis-5.21.0.ebuild 1604 BLAKE2B eca08db7b4e0937dbd5de78cdb420e2a5557105590415994db1b7f43b33dd006d64327c750414d076c42d609338309de94b831adeacb05c9d5c0402887bc4789 SHA512 d95ef55b76a3317fded4c9af28a4e75987263eec99063c25e926602a62a0016c09a8d7a877e43f715eb7fc4d4874388e02f01e139ca4e582ba0f658def9696aa
 EBUILD hypothesis-5.24.3.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
 EBUILD hypothesis-5.24.4.ebuild 1613 BLAKE2B 39dedc7960ce9bd835ae40279daad87a1a212f8800dcfb701cf4d118a67a7dd3807b4224ce775062d65ee5dd03447e8f02706b3c7a5c3583888be16f6ed1ed79 SHA512 4777e2e6516f0c1bbf91604e61fcd6892129cbd2af6cf27af1f4cec5391a805032f8d01f324c32348fae3856111285879f8cf89a80ecaa226b83eac222942884
 EBUILD hypothesis-5.27.0.ebuild 1844 BLAKE2B 7a25a5c1b07603bad7984ae2baf757d2ec0ff8c9f5142db0ebc94efdc0fc2000a17a3ec99680ea5a18b4f373749df79bec73b4825359dd39b8349132cbbf1349 SHA512 45da50147532aa3d2b427146e4379ccade85900069f210d515b48fb5774d3e8505966417238edfce8d026889c522ce2a93e6f2146fd49fc421da34f86e0db5a3
-EBUILD hypothesis-5.28.0.ebuild 1844 BLAKE2B 7a25a5c1b07603bad7984ae2baf757d2ec0ff8c9f5142db0ebc94efdc0fc2000a17a3ec99680ea5a18b4f373749df79bec73b4825359dd39b8349132cbbf1349 SHA512 45da50147532aa3d2b427146e4379ccade85900069f210d515b48fb5774d3e8505966417238edfce8d026889c522ce2a93e6f2146fd49fc421da34f86e0db5a3
+EBUILD hypothesis-5.28.0.ebuild 1851 BLAKE2B 51e077f925b25feadd790dc8865f76b33a3736c931e11fc49735fd809003025d0f4a72f1d49b1e4f8a393c17f2ba370a5c1acbc5b569eaa517b088acc9bb61b9 SHA512 bcb00e66dbdebfec49b463399b3f954314fd21dd5b08993cfacf966257bc0a39cbdda87cc402bd4048561d76325e4bbef885264bed2ce28f31e53473e8088f92
+EBUILD hypothesis-5.29.0.ebuild 1772 BLAKE2B 7c76cce2c877719567508154dd49205fdbc60ee451b16fb0d2ebb962d4578a908d95840ae922b5c35b030cdb81ff62e23e3c8d971d504707a91d04792ad292a3 SHA512 5b25512e3729fc58dc210a415543d9db565d72f927b534c8d86492c8c8ef4606d9c50abea19a61f97bb942a4e415c173863de1806c25a7e7b4862be972b609b6
+EBUILD hypothesis-5.29.3.ebuild 1747 BLAKE2B 02e1a719501fd340ee9ebe06000628e09974f8c74364bec4024b493e3249d4e4f097a11f70d7c4bffc79fb51bf2b69ea5f8a53a3aa477345c538ffd69fbf5de5 SHA512 af9963a79b9b14328db2a4459d4b84dacea6b8b89cbd9a84986889c4350b04ed994ed649cf7e30f0fcf327f1241d41836cacd82c74adca63dbd78b9a8cbe6035
+EBUILD hypothesis-5.29.4.ebuild 1759 BLAKE2B 7bac23cbf538ada8d1feccd7616f5d97803a73e8ec9ceea078d765674142650905e006a35eb68cd8cb1e725570352e7927e8afa5cf63a3167dd1e00d1cec2f9e SHA512 a914296368baa47e29afea7a95cd1113220a630fcb3281d52e9c407b885725d7007b9c4161bc04d927516636bdc6c0087b01b548e046730caf894590d16207ac
+EBUILD hypothesis-5.30.0.ebuild 1759 BLAKE2B 7bac23cbf538ada8d1feccd7616f5d97803a73e8ec9ceea078d765674142650905e006a35eb68cd8cb1e725570352e7927e8afa5cf63a3167dd1e00d1cec2f9e SHA512 a914296368baa47e29afea7a95cd1113220a630fcb3281d52e9c407b885725d7007b9c4161bc04d927516636bdc6c0087b01b548e046730caf894590d16207ac
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-5.28.0.ebuild b/dev-python/hypothesis/hypothesis-5.28.0.ebuild
index fcf6b2610385..c80c7aa009cf 100644
--- a/dev-python/hypothesis/hypothesis-5.28.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.28.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.29.0.ebuild b/dev-python/hypothesis/hypothesis-5.29.0.ebuild
new file mode 100644
index 000000000000..89b2b4ea6b8b
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.29.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..8})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python3.[678] ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-5.29.3.ebuild b/dev-python/hypothesis/hypothesis-5.29.3.ebuild
new file mode 100644
index 000000000000..19018a948f1d
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.29.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..9})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-5.29.4.ebuild b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
new file mode 100644
index 000000000000..9fb996f97f0a
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..9})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/hypothesis/hypothesis-5.30.0.ebuild b/dev-python/hypothesis/hypothesis-5.30.0.ebuild
new file mode 100644
index 000000000000..9fb996f97f0a
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.30.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 eutils multiprocessing
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+IUSE="cli test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{6..9})
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pytest-5.3.5[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+python_prepare() {
+	if ! use cli || [[ ${EPYTHON} != python* ]]; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	pytest -vv tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/id3-py/Manifest b/dev-python/id3-py/Manifest
deleted file mode 100644
index 6b1b09d0e73d..000000000000
--- a/dev-python/id3-py/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST id3-py_1.2.tar.gz 16650 BLAKE2B 28e61ab565f020bcea60488d430d3fbcfcd11ba3fe133d8247a8c14f759f1eb881ce4e7e2ab418f1c5115e96ca67ec3fee27939fcdeeed8894eba4b9b000585c SHA512 d629a964e9008be1645815d659b45b2c1cbecc4cb5c51624adb733e0a847198848afb3959f2342df9077ce01ee1f546997639c56bfc357fa9ceec7d01da8d4fd
-EBUILD id3-py-1.2-r1.ebuild 398 BLAKE2B f0f3db8c775438f01ddc14c36664da6c208a474d7199702ffc807b7900a87954ff4f110ab96af2189dbad82672a022b8c8d4324b5db6ec656b6c8a27882a2b8b SHA512 cbce875b8de3ab916bd5f9054ec95e62d9f9f6b72d10153e6995db2777dd85c9a914839f945c657d0e8862f032baf99feda154e20c5a594fd598a4193c68a5d5
-MISC metadata.xml 316 BLAKE2B 26aaa7b930be2b5ee9851894e5489560c4f76aa3ab4c927d15f0725ff2de27ad7817678bcb4f4ee2195e46671eb8374bac1b671b4c8e8f565b1baf8d546c523d SHA512 a256e8051e33604b9080c37ffad530095c8b13bd403168614c8a41255e939adb4d5a5b8e1c5e1dcf0f2b828d536a6e4fac863c8d7fe681552989160b6d962d44
diff --git a/dev-python/id3-py/id3-py-1.2-r1.ebuild b/dev-python/id3-py/id3-py-1.2-r1.ebuild
deleted file mode 100644
index 5cf103e808d1..000000000000
--- a/dev-python/id3-py/id3-py-1.2-r1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Module for manipulating ID3 tags in Python"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}.tar.gz"
-HOMEPAGE="http://id3-py.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
diff --git a/dev-python/id3-py/metadata.xml b/dev-python/id3-py/metadata.xml
deleted file mode 100644
index 490a10aeb337..000000000000
--- a/dev-python/id3-py/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">id3-py</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index 82539f45d9f2..77f3190f179b 100644
--- a/dev-python/idna-ssl/Manifest
+++ b/dev-python/idna-ssl/Manifest
@@ -1,3 +1,3 @@
 DIST idna-ssl-1.1.0.gh.tar.gz 5267 BLAKE2B 07912379da74e4711f291a54bd0878e08d8820005b055f9b978a684b8263a801a7fb9ccbbf395aa226e009b3ebfe4a7cca11861502a9b859446279b111911209 SHA512 01e58e9f32f7e02ef203edbd76e199916ea0b16d01a929ca2fb272d83988483c17e9c36e131f47bfba7f7b657bef9e2be222f81800716a5b87d5847c27cce34d
-EBUILD idna-ssl-1.1.0.ebuild 831 BLAKE2B 7c287e80c26dc5ebe2360f7d52daeac2abf2864e4008e0ddd2e8983b4c46dbdc0af769d999b13282b84658fcc6bff62769b10cb2497591e81929fe24db681709 SHA512 a8fd138f852495e1c02194276e6200d5ef9402dfab6d468b959b48446ed09c3f38e3788b7cec1f72f0bcf22c7d64144e3a644d0247902256f47c42a4d55fffd8
+EBUILD idna-ssl-1.1.0.ebuild 838 BLAKE2B 876e8985acc596d17adb7d7f5ab89211d197f6ad3597fa2aa3be50b2987c1b937e6557e5aecf344379ac8c044b2f5881d5201fc80f28813cf329ef326cbc174d SHA512 07f34216db9bb0d61961fbdd852a16e37348ce5e90356b3ee452fb83e7f203d084f3b1fa55e4915cfabeff4e9383947ddd286ed67d41dabd4f2e22bd6700a252
 MISC metadata.xml 368 BLAKE2B b2f78fb9dea9edf6f2b2a7fb72412302b014e8b1b536653ae12fcd2bc8fa94bb253ff780aedcfd32fcddfcc2030b363e12440dfa4efef1a886e99b8b0acd8dba SHA512 531bbcdb7ec492aa4c38f4352cb0a93c618c60d9f8920ff476f6f8b7991744ccba2188a9e441e696a02d1c4ef4ea9af3afeb2c81a0d046e700796ee45b7f3888
diff --git a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
index 62405f0a1d14..2bdc61050ddb 100644
--- a/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
+++ b/dev-python/idna-ssl/idna-ssl-1.1.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/ijson/Manifest b/dev-python/ijson/Manifest
index aba8b38cf587..3243b0aa3b8d 100644
--- a/dev-python/ijson/Manifest
+++ b/dev-python/ijson/Manifest
@@ -1,5 +1,3 @@
-DIST ijson-2.5.1.tar.gz 23258 BLAKE2B e41cb4d903399384a1a1d18941a2ecf36e80c762e5d4e3e854e9337f3a72cab3a61576d9d5170b11e1513bd82ca0e2158b8a88d4c30855674366fbc9172c5042 SHA512 f8d2cf0496357d3385e2744a4604cef1fd6fcd92cbd52c8803d7e831c091c18b718ad0c1dc8735c3f10df04e25fe69ef73d6935b2df6f67845493935e2ca529e
 DIST ijson-3.1_p0.tar.gz 123536 BLAKE2B d8ed0da77e219aee8ca287a2ede4eccd8e965a5778ff95485376bcfdcca07b48ae5c0e22b271fad0a489342403b11716971663158f340c97b80031bb2cc8c060 SHA512 af2db5b3c9f2cc93aa2d15462b6476a970e5c394a8f5bd9740ebbe134e8a2fa973c95057447bd02d3c4262ddf22fc7d231840d3a91b919a1411bae07d38cfd93
-EBUILD ijson-2.5.1.ebuild 573 BLAKE2B 0e03a71c06e4d071c81448415c03d42a4a35b4eeacb5a659fb5d44a4cf44c8718e921ab05a514a81873c2458bee0d0a981f4b28f70b5f549da6028b7578cc1fb SHA512 28bd571f432ea47009bde0107728162612156252c7dec85dd4e92ac14d366ac913af89ef6f77f3aa9a1f8a33b8a26c67b1547f8ba176d0c107661818be881569
-EBUILD ijson-3.1_p0.ebuild 569 BLAKE2B 1f0ffe19d38ad7c52efc2db2e6eea3e013c0334fafa7cddb0c1d700d9a82aa1ae6f55e3063240113d3ee695a6d7849c17943b5f170863f3ce9603e92fa02e241 SHA512 f2c41fb864bdbdec11258438f9be923f24bb447be6659bf16653f0e3918c8efdbca361ba2c967bd3360addda297529a206ec56bc5594f4c564644ae9529274ff
+EBUILD ijson-3.1_p0.ebuild 567 BLAKE2B aa5e2d500abc067150057f03d9a7f86075b3e73fc98ac8dafdd240cea6b0e8a9520e02076af4c5d82e4f1f0e7be6efa2711f821ab283bf14f591864cfae470ec SHA512 391cf793bed0be5cfc7904abbb32da7aaf0bd9ee2a177e76cf6b0f5bca0671a8e93254216110d18da9e6cb627c561c58033b26258dfe5f93e4792807a5da42f4
 MISC metadata.xml 371 BLAKE2B b69568a1fd9e7578de49b729826c1bae5b6aef3c6e34d3c32adb9745e4bbb0541fe1e43730fff84aa0dc85b3b116c1e4fb9d9301b3c0f1f8c615c24141b1657b SHA512 874354dc3c06b919b563b13b0b0dd64b9e5af1fd759d199691d2e45a3ddf3fac61412452a0c746c22cb43c3eef379f3c391c2cb04d109ad6859ca279566e1108
diff --git a/dev-python/ijson/ijson-2.5.1.ebuild b/dev-python/ijson/ijson-2.5.1.ebuild
deleted file mode 100644
index 34cef4c22654..000000000000
--- a/dev-python/ijson/ijson-2.5.1.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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Iterative JSON parser with a Pythonic interface"
-HOMEPAGE="https://github.com/ICRAR/ijson https://pypi.org/project/ijson/"
-SRC_URI="https://github.com/ICRAR/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/yajl"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${EPYTHON}" tests.py -v || die
-}
diff --git a/dev-python/ijson/ijson-3.1_p0.ebuild b/dev-python/ijson/ijson-3.1_p0.ebuild
index a8112d927075..ed45be42d976 100644
--- a/dev-python/ijson/ijson-3.1_p0.ebuild
+++ b/dev-python/ijson/ijson-3.1_p0.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-libs/yajl
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index c22942186333..928379acee5b 100644
--- a/dev-python/iniconfig/Manifest
+++ b/dev-python/iniconfig/Manifest
@@ -1,4 +1,4 @@
 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
-EBUILD iniconfig-1.0.0.ebuild 539 BLAKE2B f7675d976ce7f92c271ba38ad4ed670f3f22f68ce7d3eb13ca89681d7af0c72cc41ed56c499364e5af71a7180a5df5c9618c899583468ddf04c1c6dd1b2e200a SHA512 1c2841c5cb15658e29c7545a21ae4ee7357bc3700702a15f2c4031333f1d09a0ccc60bae649782fe0fe9553d6b175e16dfad67c821ed05a6431e12bf50cc99de
+EBUILD iniconfig-1.0.0.ebuild 545 BLAKE2B d41cce2f93f7a574e2c236aaa7d2a9061f773c73b9a11f1639050d8709b3eec7ae571970c89340aa5b6b75ad6f4f24bf20365c088dd78714d175d6e6dc1dc06d SHA512 7ce455d87894842b7aaa49d499f5913d2fac121657a250a1cae7df1b5b06e353ca083e5c69670686dce2921645a10c537c7702f45a2a7eece31a54cc3df79780
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/iniconfig/iniconfig-1.0.0.ebuild b/dev-python/iniconfig/iniconfig-1.0.0.ebuild
index d38a1313161a..a6579ae0b7e7 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="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~sparc ~x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index f1003122367b..5511348e919d 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,6 @@
 DIST ipykernel-5.3.3.tar.gz 111718 BLAKE2B 4295eab97c971dfaef797ad3314b9077f740ae102282553ae7265352b83c3d44a51e1cb696cdf161c612ccc1ccdbed39bde1ffe17d83aeb3f61c1cdf73154d3e SHA512 4c33e6db572e002c2ecda479a427a46707f0e162bac5701a5a079d6d5c1df2680b20bed2cd5b2aa7927e8efee0b0993dc78ba4090e7e053389e278f6116be1d3
 DIST ipykernel-5.3.4.tar.gz 108656 BLAKE2B ee2ff12e0a3fae853dfb16235bd14bbfe16b670ac93c572ff4e3867d5d2c451ed4f4800f3e501caf857405d0efb73a671c2966ea0fe53aa41f1e59ff68424cb9 SHA512 6865cb4cb1979e79ed532fabd59e55bd860df996f557e4c05b69fe7baf60301d70dc0657248bf75102285c68be6212787180b548d5125029991605f05d0d812f
 EBUILD ipykernel-5.3.3.ebuild 831 BLAKE2B 4d305566dc109c47e4ea3133b6cf2f357436fb5a85a629b1f1abf4ea8dd2f75d41dda911b793b81b2b68fd5478bd722383352b6113c86b019e9749adcdd894c1 SHA512 9a8875796301e1fec9be0e048e0b695fd7ae4da5e32032f25268c85fe568ca8b80673d510ec5d9199dd40a1c3afc5373b138e4d350edd37015d803b48a13cc9e
-EBUILD ipykernel-5.3.4.ebuild 834 BLAKE2B 4946c74da694b1d30f0287bcaa71c2cfa4acd8b516e53ce1040ce9903b116b9981e753fe7fb543a6604c9486f69e74ba8129759a05fcf831eb1c49806d9d6c53 SHA512 039bce41a7d824fe0a651d1ef44c1e035e3e6b4f34ae091aff305cb941f3f2a670ef3524cd64baa9bce0026f802f26ee57109cdffb3763600cc8e838ef27fb18
+EBUILD ipykernel-5.3.4-r1.ebuild 834 BLAKE2B ca7883f6f525dcb85646cb3df70e49dd011fff3eec26d9c3449bf1e6857c4290fbbda8c9b6ad343af63961f56201512c3c6faad93a1c59d4bf85f6ed4a1ffbb8 SHA512 2ec88fc3fbc371dee936751788f3c098e0fb0fe48640a4f5277fa60d1ccc0c81f137bd35c2881c2461a4ba329d58a9027ed2892a306d8fa231fe3ad33ecf6e32
+EBUILD ipykernel-5.3.4.ebuild 831 BLAKE2B 4d305566dc109c47e4ea3133b6cf2f357436fb5a85a629b1f1abf4ea8dd2f75d41dda911b793b81b2b68fd5478bd722383352b6113c86b019e9749adcdd894c1 SHA512 9a8875796301e1fec9be0e048e0b695fd7ae4da5e32032f25268c85fe568ca8b80673d510ec5d9199dd40a1c3afc5373b138e4d350edd37015d803b48a13cc9e
 MISC metadata.xml 526 BLAKE2B 736792bdddadea61e82623e7b510347bc00a8b0ac35fa6e10cb420fca4b3890bd00f26cfbc91eb15964a5718b14037cfc8066503345ceffb5c69214f93babc50 SHA512 33e7a9809469d373b1279395f3b09cb735defa451982b69059f10d334b449e8fb75851271db71315939b44fe4f1ac6bcdf988308faa05d705ccf0fad9887daf0
diff --git a/dev-python/ipykernel/ipykernel-5.3.4-r1.ebuild b/dev-python/ipykernel/ipykernel-5.3.4-r1.ebuild
new file mode 100644
index 000000000000..d8754af6f7c2
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-5.3.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/ipython-6[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-4.0[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/ipykernel/ipykernel-5.3.4.ebuild b/dev-python/ipykernel/ipykernel-5.3.4.ebuild
index 5504b53c5963..80bd239e6f7b 100644
--- a/dev-python/ipykernel/ipykernel-5.3.4.ebuild
+++ b/dev-python/ipykernel/ipykernel-5.3.4.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"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/ipyparallel/Manifest b/dev-python/ipyparallel/Manifest
index 42975162e585..36dc01351b12 100644
--- a/dev-python/ipyparallel/Manifest
+++ b/dev-python/ipyparallel/Manifest
@@ -1,3 +1,4 @@
 DIST ipyparallel-6.3.0.tar.gz 2380153 BLAKE2B b8312102e1d2b5fc963491ebe8530e2fd73e9f941f7912fbc72a8db51e7255f5cac95a853d15a57e384926ab1aff27f2a3ad13cc45130a8b612be5dc623538ab SHA512 fe621854b9cc3e5f88aeca2b06b63bb689dd2feee0da451a0a90800d8832f4b44b23bb9a15033029cc33179276f31e982a10fc7540e6d13b04f15d96c348a295
+EBUILD ipyparallel-6.3.0-r1.ebuild 1721 BLAKE2B 377255a22842e61abef1707ba54024bbabcc24af9d943af69c5697dbd7ed870ab743cf89503d051a3febd505334ac47cca54cd1ca713f193203415df1daa836a SHA512 7690b53d225b82108c0115d1ac32147aebaa58dad62d2e7d957dbdd3a48432c2dee032a745959375dc7cbbbf543e82ac1d3f2d14e4b4cc8a53753db44568f2d8
 EBUILD ipyparallel-6.3.0.ebuild 1718 BLAKE2B e67a1bf4043f42fe6e60611ee1c6bd1bbfbd56074f5328992ee01e7649b9d415dd173b15779af2fd331cb9368c4fb5c1130efbda2060edbcea303818b1d90d95 SHA512 bc731e2069ea2533eacc3967eaf705148ccd809d8c0d8746296c11097184361ee72c2d351a7b08b13077c2155037a169cde49cc70e7316a868881077556292a8
 MISC metadata.xml 505 BLAKE2B 3dc8a7d01f8d67619f064ced47674ad386c81e625d46b820a7949dcba68755ecc69d29166880d80ba8951bd5226d6a380fdb0545287c527a133c3645b6f2bee5 SHA512 d86601139ae4a5d2aaf7d69fdfd609450f12d03775276bb0b459728712a15803d7c3a6ec3eb73ca7a0802e4333809f2eff8f9ebc2dd2a2c22947262b78c3dea6
diff --git a/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.ebuild
new file mode 100644
index 000000000000..f478bc55e983
--- /dev/null
+++ b/dev-python/ipyparallel/ipyparallel-6.3.0-r1.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} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Interactive Parallel Computing with IPython"
+HOMEPAGE="https://ipyparallel.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"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+# About tests and tornado
+# Upstreams claims to work fine with tornado 5, and it's indeed possible to
+# launch a cluster with tornado 5 installed, but tests definitely don't run with
+# tornado 5 installed. Upstreams CI runs with tornado 4. This is why we limit
+# ourselves to <tornado-5 when running tests.
+
+RDEPEND="
+	dev-python/decorator[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/ipython[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	dev-python/jupyter_client[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+	"
+BDEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		dev-python/ipython[test]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+src_prepare() {
+	# TODO: investigate
+	sed -e 's:test_unicode:_&:' \
+		-e 's:test_temp_flags:_&:' \
+		-i ipyparallel/tests/test_view.py || die
+
+	distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+	optfeature "Jupyter Notebook integration" dev-python/notebook
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 77cd6c0c6a1d..ae1944a3775f 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,6 +1,10 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
 DIST ipython-7.16.1.tar.gz 5136303 BLAKE2B 9baf42c9befa50d78eec29d012aeae7f01886f29642a01845afd4a96d0efb7a4df5b14b68aeeb22d1d621e5427b219f717688a1d5074a6e70ad0509c7ca73a46 SHA512 60259fd6270b0355be67b4f620a58b56ae86e69e14debe2df86df6118548f2290ab3927b8dfab20db1ebd675df697d05eb6994b93625a7b8b6ea07112ddf63bd
 DIST ipython-7.17.0.tar.gz 5139470 BLAKE2B df7dfb00ed81d5c3db7ba1408df6a4e26ac8439d6d58c7f9214ae89e446951eadf3f0d4c2be0654acebc0429a77773972b6dd081ef8c009a9d177924968e7b28 SHA512 0dabc6f4079719d2dd75c5ee92e4523b016b4a790776ccc7130a60bdd4ca1b88bcdcfb9ddd192f9c1a4397c27a27e7f7297540275d06832f870af347e2f14dd9
+DIST ipython-7.18.0.tar.gz 5138647 BLAKE2B cb6e81468ff7b0d452bd4666a8dc47dda7a7ee7b4685391f222a84db6fddcffa3d41514c1d8a346f07e0c3a89a942893cc7e16ac5888e1c35cc2603698527846 SHA512 2c1cb414d0125aba54dcf98221011d3024d7db0779b2ba79d7c283e2fe918822b59a7771f67e45bf3a60d1a2582862ff3a97475163278961564644373b416029
+DIST ipython-7.18.1.tar.gz 5139337 BLAKE2B 936759db4377767537766a2baf0bff2adf1a95d17438899e1e1611d725e796d8ab78fcb8f1ca14d8d41171af64fa67abe9fadf84c6ca3cf17bb1d83fa2ba4268 SHA512 71f495021df56bbea97fb26b9274e54f7662875b7690a9493bdf682635e048d9ec53a947ee9b0d487634a3a8c639f0d93c6639b3a0dd20bdfefbb4c53fb53799
 EBUILD ipython-7.16.1.ebuild 3648 BLAKE2B d6a6667ec56db5adb9176038bf8e9abb3f9a2ddb69f181b73188b6e9afacffadcaba88a4f06631e5f2828a7dfe9a507068d16dcc5ebacf10e28a43137d6779d9 SHA512 99bd76b6778bd5b3a2a86be2217e9d1720d2bf565ef201a1acfdf39c9b450697c385b53844904f3c04788ddfa26df8e707221e03a22d284a02dc93fe9696854d
 EBUILD ipython-7.17.0.ebuild 3652 BLAKE2B 65972fa0122548fa440337d4584af6967a7fa51ccf09aea9027898e4c42c4b78add1bc88e1e59cb978be4a5d50b1e2228dd62005ddb2a5f18f7122c1a06ad284 SHA512 a1a5c4134cccdb45113f7267af59ac116f4e1de2d7d2a0964e80ea84701f0abb4cc123ae69b64b7297ee78aaabc82ebe8950f75e9cd3c31c595d8a0f09e7cc4c
+EBUILD ipython-7.18.0.ebuild 3628 BLAKE2B 5f462669da46286d71d5aa924441f8300f88172f7f4ad8fc01352141184bde9a9b7b14304725c4cea61bce230611ffaeb213569d118d6d154456e3888c3ea958 SHA512 4ce0be72dc3acf6f60b7e6d7a5b8971d4bfc013a8daf3049c9570bffcc34256222ceaa1bdbf7d39a59f3b7ca410a624cc0ddf6bf3e3dab38dae6ef9d7ef7d173
+EBUILD ipython-7.18.1.ebuild 3628 BLAKE2B c1e23ab454eccd6dd626c9676b2f450c88c96da1d6702e5cc33cb94457e302215cbb102753b23882dcef7ee0b7f3199cf137957049d646d6a03b2c137d3a9f9d SHA512 3fb8391ec4194cc56e2a7de51a0ce9af7c025b428718e24a6400f2c18a52894add99888d7276bfcffd81f87704ea5ec973257a8dd69adb57a940f4812144c191
 MISC metadata.xml 2857 BLAKE2B 89f6ea04a550e2e590f9e041c435fe578691118e24265d0f3c2465480cb32cbf4f5ca4d6c8fb2a08a665061347e19e361160f73aea080b1f67a4c9c743f6c23c SHA512 6b28c7f0be77e23656df143940074658a71ea872ba12238d3dc206f25662ddd589e3ebee11d5ca06498cfbbc651ae0effc95235feed91e853616706c87ca5bc4
diff --git a/dev-python/ipython/ipython-7.18.0.ebuild b/dev-python/ipython/ipython-7.18.0.ebuild
new file mode 100644
index 000000000000..cf8e9ceba1a8
--- /dev/null
+++ b/dev-python/ipython/ipython-7.18.0.ebuild
@@ -0,0 +1,135 @@
+# 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='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${CDEPEND}
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+
+BDEPEND="
+	test? (
+		${CDEPEND}
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${TEST_DIR}"/scripts/iptest || die
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipython/ipython-7.18.1.ebuild b/dev-python/ipython/ipython-7.18.1.ebuild
new file mode 100644
index 000000000000..474f4f5f8fb4
--- /dev/null
+++ b/dev-python/ipython/ipython-7.18.1.ebuild
@@ -0,0 +1,135 @@
+# 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='readline,sqlite,threads(+)'
+
+inherit distutils-r1 eutils virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+CDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.10[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="${CDEPEND}
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+
+BDEPEND="
+	test? (
+		${CDEPEND}
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+	)"
+
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	distutils_install_for_testing
+	pushd "${TEST_DIR}" >/dev/null || die
+	"${TEST_DIR}"/scripts/iptest || die
+	popd >/dev/null || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipywidgets/Manifest b/dev-python/ipywidgets/Manifest
index 2e9dfa5c0d54..27d00c9ea824 100644
--- a/dev-python/ipywidgets/Manifest
+++ b/dev-python/ipywidgets/Manifest
@@ -1,3 +1,4 @@
 DIST ipywidgets-7.5.1.tar.gz 5656334 BLAKE2B 8bd98f523b619bea02e01ae5faffb08040dc5011905dd69510728b02736e66444b3c3cdf1e7272884c1df97f610aff790063f783e1d0939786669ef39cd1fc94 SHA512 856b3e4dad331766eff6e5f1fd31984a4b6ede5c678ffd51a4896f6448dac53ba181ccec2821f10e07e0f1095318427affe19f1420d0337bc3d37ef1e0a9ea0d
+EBUILD ipywidgets-7.5.1-r1.ebuild 664 BLAKE2B f9002ab5e29c788dc83c10130d1e42e92c6094216593308ffaefedf5e9a4d6ae5d607a49665a548916eb2c8a406eb04ea3a2832abf4374afc674f0c4f5f299f6 SHA512 ea57701c1282fb716ba8746fb287e0fc46cdef092b969c92833b0aa473d443ec2356f1d8bfc4e07681b3d397050c8314d2102a7a86fd15e6312b30d04ba1952b
 EBUILD ipywidgets-7.5.1.ebuild 662 BLAKE2B bca9b4a4d217793b05b1eef3ff58b8a5c0958ae98ecb1acaa7f8cc6417755c9a00d04d98775860ab752ff79545b62814cd9ba994dc20be7816cef2f351a0afdc SHA512 b956f20f561e0d3a835d658adfe8454305a2b6193d0e0bfa5ed2b91b8bd43a8fbece646ccae88e2e9593a5d3b989262b952c7b648723017bce335fe33341e939
 MISC metadata.xml 536 BLAKE2B 885f71096220f3b226d03e8b44bfb31ccccf060a55c1de6634369d2570463912e19146577c10c0152ad0aac8c5d0a107317db1e2a2f705bc8a21efb6ac59a636 SHA512 2e7e02e4dbb0b2ef05216f597a14bca27af0526da6ec962da402e206ec5eb8a9b08174d52cf5d6d231c20c899a7e87a8f942c7cefb93dfa50eeab7bc65d61a05
diff --git a/dev-python/ipywidgets/ipywidgets-7.5.1-r1.ebuild b/dev-python/ipywidgets/ipywidgets-7.5.1-r1.ebuild
new file mode 100644
index 000000000000..feaa1edb8dc0
--- /dev/null
+++ b/dev-python/ipywidgets/ipywidgets-7.5.1-r1.ebuild
@@ -0,0 +1,26 @@
+# 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="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/jdcal/Manifest b/dev-python/jdcal/Manifest
index 9a469de2ab24..815e74058324 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,3 +1,3 @@
 DIST jdcal-1.4.1.tar.gz 7479 BLAKE2B a53954b12c5f1fed81fe6241b5097a7def4074ae83d6e31a528ac0fa87a3d90b504e2fe1a80b44cf19663e1402695460f9e3acb54a2333181f21e7cef47f737d SHA512 5e14f470f35764c0d76fcf0ee13f9ea0879e645b589a48636207b7848f3df0437343898595c8cf19b8e4fe8a172d4e82aa06e56284ed263154c93de217e24e39
-EBUILD jdcal-1.4.1.ebuild 445 BLAKE2B 5e45bc8a0e31edd65a846f09311c2a4b31b7e18a5bb7adb41f53a01f0910847bc0e9efe5432ab392d790e35f73316dd882cacf6930ee13fa4780ad87f4310ad5 SHA512 adc621b03122f6fc7d0e755e0653b9f2c11bbc95cfa6fd25fbb114bf6bce55e8f0dd3bc2c1f8f287df7bd9cf68d11cd759e308e9546ee91b41aa61ac2f2832d0
+EBUILD jdcal-1.4.1.ebuild 452 BLAKE2B 9b7e3125df49bdde59391f367032c281927d46bb80cf7494f06b160663fa7a10b88e03377acbf60d3f64f3abf8fb5853b80b4344851e01cfc2d7a577ab7dcda9 SHA512 70d621b04be7ebf276e7b5e8bf028214d25e7f5994fece5a5f203628bbea86f8d559792ea554d6c8d43879e9f95a452e9aa8c67d2183a45e9d90d6e9ce792edf
 MISC metadata.xml 394 BLAKE2B 9c35062d139a232a70be4bbf6daa238737a318061879c48e32b287e8269d5020f1698f0968e75c4077d8a92bd0048218dc6a5cc8c505aff393430b41f275b962 SHA512 d2de830b52671780250d301ad183337bf0020141abae9931183158f1222d0e46691054138ec283ea16ad31b3403b07d0d8313013067d4e6c51e54c4ae08b5688
diff --git a/dev-python/jdcal/jdcal-1.4.1.ebuild b/dev-python/jdcal/jdcal-1.4.1.ebuild
index 60b57f24139b..703e4e0f9a6f 100644
--- a/dev-python/jdcal/jdcal-1.4.1.ebuild
+++ b/dev-python/jdcal/jdcal-1.4.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/phn/jdcal"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 distutils_enable_tests pytest
diff --git a/dev-python/jupyter/Manifest b/dev-python/jupyter/Manifest
index 3831c9d79b4b..c73053961ec3 100644
--- a/dev-python/jupyter/Manifest
+++ b/dev-python/jupyter/Manifest
@@ -1,4 +1,4 @@
 DIST jupyter-1.0.0-file-colision.patch 1727 BLAKE2B 59bf5e567e6da9e9f3d84178942993072e1697c1c4c06e06d606dce7bdc76d296d10c30cdef2865bce7b4c26136a1b0a2860f009f1530c1815b48b3300401501 SHA512 a6b4cc6b91bb9941f029963cc3e3b7f415192f64788a34dde7828d450497987f92c25655c5ca183a7408fb1fb439917ba0f0a1ef1db3fe3bec1fc46d9ad2cf4d
 DIST jupyter-1.0.0.tar.gz 12916 BLAKE2B 36476eaf0119613ba6d9f153aab1658f43951dc3879cb6a9e90d8fba14cc1247305e18fda2251127faac4e68867efd3ef57129675bbe89a17a6469255efcade2 SHA512 1f0bc83f7a127c98ccf4b3868814116aa272ea5d0baac52d7a022305af7e2da28ca2b90fa3554ff085d8df3eb6d8b8cde80bf02b8e66064c59900b926d73c520
-EBUILD jupyter-1.0.0-r2.ebuild 1120 BLAKE2B 064d3e259174ae6208857dc0034fd4f42bcf8a5dd74458c47a72d2279f1d3ae858bafe04cc7517f2f1fae85d14513a473b4c3a98fb71dc86b8289d4b54cb14e8 SHA512 2df6a407c58b6a95f8734938726efbc92f98009bb59fd8fc6db65cd04fc9b6e1e8548ae7748d271a3b55ae455a20155cc20b5253b7e19afe33478dc67a4a354b
+EBUILD jupyter-1.0.0-r2.ebuild 1120 BLAKE2B 0d11b75661414fca66549a99c01529bd39fbf984cd5544f083fc52d8ea7d0aeb3c56cd833aa27a2ba013256870065cd9f8c2710bbdaf49d642a0806686e1b3cd SHA512 0e845fba31c5b09bd9aff42a9cfcab6ae01266ff6627a0dedc8eda6e6fb438f61c7020f7859abcc3994c92bdf612ebe1fc0582ebec1e0c0814736b985810e589
 MISC metadata.xml 390 BLAKE2B 1f4d29ef2bf8add19fc945beb9f7b92bc49ca189fafbb16bcdc2c25cf71bc5d248491d63bb88f67100504aa796723072342b4c225064339fefbce73905d78211 SHA512 e2b9ac43d44b647a247148e87403e8cb1aeb8e89f482740f489424caa3b5b0301dffcf2693297a0755b8ee3d6f82e519382b4b8bdbd760763a096cfebd66cbc5
diff --git a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild b/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
index 22dc270ed729..c88927ac5ff2 100644
--- a/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
+++ b/dev-python/jupyter/jupyter-1.0.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 5df1b199413a..5ef7be174798 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -2,4 +2,5 @@ DIST jupyter_client-6.1.5.tar.gz 290829 BLAKE2B 7029703ebf7dccafd9c90835d9ed3305
 DIST jupyter_client-6.1.6.tar.gz 292265 BLAKE2B 46f5b814577c8b1351ce42eb3de4a3032bb2917512f0c9cfc07fddc991698e192b628c03a9ce0d98817dfebcf4af0386fa4ee656b524f54c36de64781af3b8dd SHA512 9a443a2b4a86d823d1403a05d359b50ca95efb8e1dd992d331699e3fe2b46e5d4190cc55aa5d110a384fc0bb94abceaa4e36f67c0f7ce5a33f9ef3b11e682522
 EBUILD jupyter_client-6.1.5.ebuild 849 BLAKE2B 49328d173ac8e7f13e98e0479785d607bbcdf92de3b3642f94e3fb6737f4162debc0defd27043705212585aa8aaa4c48fc674bce6b36eb3cfc929b61626e544c SHA512 f527f2ab63ef66b74f6540db12896bc0a0ff0d3af5c4f82bece768c87471b810e592cf29e075e30372840b0408ac00593670b1602a88a7c5270d5420800af134
 EBUILD jupyter_client-6.1.6-r1.ebuild 884 BLAKE2B 17c74179956421da4617e2a4058dc05fced9860412c2142c0df8fd07cd7d7559cbf1224937fea1c7404ecee468bf9286440ec33809338e3386e46c603baa289d SHA512 1f1afa7805b4fba979bce7dc9ca34aafbe8c8d35bf6a0e54450e9b1cfcde2bfb7c72e01fbfcc02fab62f91d657e2b738048095f8ab55cfa829e82585d351189d
+EBUILD jupyter_client-6.1.6-r2.ebuild 884 BLAKE2B cb9f675ea4cb1e5d1fb26ceea1b665e8aa172cabe1d63d02121628e2c1f5f32cd48b03125b081212ccd412e0fe79922b7ce6506dcd0445cd26d1195cb7020436 SHA512 ef176b816fde521e550a5d27bd36e666983d6dc57de697d97f71c3849c855086d60b424f15d85be6fa99a12db4d51c859e289a6770f1a9f100d95494e55e159f
 MISC metadata.xml 779 BLAKE2B 43107b0b7e5e1316a386e41e99c482dd13eb753bcaeebf6b496d7b432b69aaee01f6777877033154b178b17bbef87cb019d4fc55302e089c69972ec7dd412c59 SHA512 4333a7a7ae831d4f12b09d3f78fea784c508ed1de502b71d5279c6574cec7808e0e13e0e9b59d3b6048788d406f617a883f753204eaa22c24218587e3e4fd610
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild
new file mode 100644
index 000000000000..85d8a9afd7bc
--- /dev/null
+++ b/dev-python/jupyter_client/jupyter_client-6.1.6-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter protocol implementation and client libraries"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/async_generator[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/jupyter_console/Manifest b/dev-python/jupyter_console/Manifest
index 82961d9378ca..302e2e1cb193 100644
--- a/dev-python/jupyter_console/Manifest
+++ b/dev-python/jupyter_console/Manifest
@@ -1,5 +1,5 @@
 AUX jupyter_console-6.1.0-increase-test-timeout.patch 393 BLAKE2B b4338c47a14170247b3ceb4d4e8ea861311e651840c1bb2df595f0384ea0e855711633c73e79a6624f82570a86dfcea80b94ec97eeb988881fb9ca5d88e33060 SHA512 7ed1cbb54050eb40456648c92b1471dd164217cb3abd3298327b9d5f20a809bd4dce792e98764f9f5d1b57de9ab118644005f2773e1603002547aef356eb24f9
 AUX jupyter_console-6.1.0-py39.patch 2284 BLAKE2B a54d7d6a8cee2e17bd50a73bf1e242995d3f0e1c375190ce9038560a532cff5d62d56d34afcd574b7dfb91fc2c224f2bc8ff0c8584f7592d933c016f8d9de4d6 SHA512 3b77e727ae62c56d713d9c9c7d8163ecbefaf916238c3964b47407edb166ec4448377c55623e4b0b25c4a491f310cf2895ec3e8e444e0ced09aa57196085ada0
 DIST jupyter_console-6.1.0.tar.gz 28468 BLAKE2B 08ef158de6a0eb8fe741dac00b74e11f7e577b5097f54aa16c47ae9e39607231e19a1fcd0a96cbae41d41fad891fefdb532d0f66bc03aa66ff99a8d3ff3cb28c SHA512 abb5457a90d109457e91071cd8b592a14bec7ead75fd667d656f9180a457e39bf470877b2e17c81ff512d1cc69b62a8f700996492f6164eb05a1581db82abbf7
-EBUILD jupyter_console-6.1.0-r1.ebuild 1131 BLAKE2B 42127f8853c46650d1db81427fce1a4f643523828560a29ccefd7c8ae51caf583b8b2ffa372746cc7862044171f72e5ec4d252f989b3c0b499e2b3d3e32b09fe SHA512 5322b9645b1fc8fe749e517f12c6c9fe7abf8dccc02153a509d8fce74456e213512a37ceb4fabbd798da92bce5192b215255c083fec976c6feb9399b9f987944
+EBUILD jupyter_console-6.1.0-r1.ebuild 1131 BLAKE2B 26ac084c60f23c58dad3de4ddc87392b0927eef4201b6416bdab90bb194265109e0c70321c10ae75033c0c5f0cb5f98675c6a94b3f5b9e569174de498752680e SHA512 8f87e8be83392605c3467b754d4e1c27380526d471fd890d2b22829644b242361935e20c34cb579383780b67155d0d5ec99d67d437dc70ac950a062fbf2488af
 MISC metadata.xml 701 BLAKE2B 04e5ee12062960ad591ca853b731b0f5ef797a3ed40ab269b1f82235dca406346db5997f91b58edf1961af2252109c71e510992050e6978fdd787d2c8886cdd4 SHA512 cf5598a16ccd18cbedee0c7403fdf957339cdb4b6c21499cef96273bd25c84755a2e841dde82192a9cf93c12c515334374bdec9ec54a13a8bd027c6540055fd5
diff --git a/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild b/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild
index fbea105a40a5..bf2123863415 100644
--- a/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild
+++ b/dev-python/jupyter_console/jupyter_console-6.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/kazoo/Manifest b/dev-python/kazoo/Manifest
index 7bf296cf219f..34226bfcb5a3 100644
--- a/dev-python/kazoo/Manifest
+++ b/dev-python/kazoo/Manifest
@@ -1,5 +1,5 @@
 DIST kazoo-2.7.0.tar.gz 163552 BLAKE2B d117ef62b324d074afae5d17f12e2740ab26076ce8e9ea5b0ec15400d2a57ac89053c92675c7e82f1b54e33d30d6029765ec29a72ad537b5d5cfdca976803b5b SHA512 04c3acef723ce306537114ed0f67e96d6c4c638d5dad12e38fcbf1b4dc3e7a972ca0c950adfbbbec7deb8da910e03e867e26ccb83d39eb1381daf0cb5dd2ac6b
 DIST kazoo-2.8.0.tar.gz 170037 BLAKE2B feded24671d6f4f5f7973b76048e5b8416e4b56aabdd9d32a8ff27283b5e8578545cee62a385f764202ffb4e58cf083bd2c182dff9bf255e69dd1de83e88db43 SHA512 ae244a70356274d6259d255e60a5dff00eb22bcf16d5b25f9d9a03178619dacb57414905b473801347b4ec1a19e5600be6c7040a5e53b67b81b440c304c95cc0
 EBUILD kazoo-2.7.0.ebuild 1215 BLAKE2B e5c07c8f5101d32555d79865687af23cd1fd64ee201fc56be1a2a9f68a7d8880b98836da2dbc195d05c0b240dab184fab3dbe104bb975b151a338de618bb689e SHA512 1e5ea79ec2afbef232b36a0b6a5cd807e86e86905c1dd40644254816d8c9f7746ef416a47aceb8ca0689fbc7501e4b41d76aacf06f3b224baea4e4d1108c7774
-EBUILD kazoo-2.8.0.ebuild 1222 BLAKE2B 46c1fb40fcb9f9809bb678761425ea8bc6ebfe40a0c4ad0b05d21824978d8234eb85c2162afa76d3b8d332394c25260368ffe209b2ec1bc07d82822236b596c2 SHA512 f14f14fb0c329322123344bf15bfad0c773422238649805adbc8b4057240543bab25c4626372dde23a602adfa784b4253d6b2a1a3fb77baba4d2ff40638f71ca
+EBUILD kazoo-2.8.0.ebuild 1265 BLAKE2B d0583e043d8e4f9bba4cc02281b8109acca86b54ac8fd151581aaab0a05eef72738e0c79032e59f49c535dc2ac4d429440fd0f7cdb680792bd273162c671c1fb SHA512 5f263bec4e701b57203f192aa64a65247318a73592dadada11ceb157773de5ef0ec01b3eef1615708b2a0dc6efc8ef5955bde0c545ce9c453412abc6737610a5
 MISC metadata.xml 486 BLAKE2B b2ab78deb7e21479cf9d2fff4c6d3cc8936ae3eb9cd0b6632a0f419002465712433d21b749eff18a5462fb770c0464cb8853f2b604633517a34349b40ff7cc56 SHA512 6a9d26bed9501a86bae735d8585fd3ac163b0cb914a7d325ef903e04dcdc570e65097bd21f25104dca194fa47ba3092dd78603d054efe5f05ca807c0be08636b
diff --git a/dev-python/kazoo/kazoo-2.8.0.ebuild b/dev-python/kazoo/kazoo-2.8.0.ebuild
index 9efc213e7753..781cd47ca653 100644
--- a/dev-python/kazoo/kazoo-2.8.0.ebuild
+++ b/dev-python/kazoo/kazoo-2.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="doc"
 
 RDEPEND="
@@ -40,7 +40,8 @@ src_prepare() {
 
 src_test() {
 	local pkgver=$(best_version sys-cluster/zookeeper-bin)
-	export ZOOKEEPER_VERSION=${pkgver##*-}
+	pkgver=${pkgver#sys-cluster/zookeeper-bin-}
+	export ZOOKEEPER_VERSION=${pkgver%-r*}
 	export ZOOKEEPER_PATH=${BROOT}/opt/zookeeper-bin
 	distutils-r1_src_test
 }
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index d31abfb683d5..41205189ab48 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,7 +1,9 @@
 DIST keyring-21.2.1.tar.gz 45535 BLAKE2B b276f5b973c418794561e0d0872761847d4cb81531dde61b75439c73039f49ffc8abf679d622a9381bc6663ffc452c8b6aabc0a4c8e4cfe5ad1c63566b78082d SHA512 35869e37b234d15799907f0efd0193ab3eb9c0799a6da2d843fdad24212b4ab983658b32bd8b09b658174dcb1ddb6d70a85d0af95730d34d8c571f2ecc9a7c8b
 DIST keyring-21.3.0.tar.gz 73120 BLAKE2B 6124e29e4dfa0b4c1f4ad3c1262c282935f860c0aea796a9e66987e64e4737d7f746c9c832b427e49cdadb87e61a33f7bfbd956299400311ff08e59f643cf6ff SHA512 85119a13aeb62456f8b9409990c3f5f6e0c83e9850466ee3b7a3d10e879e3b7fd6d723b2b683a8904b5d20c76fc85471d16aaedbd7ce04d8b88f1d1dd265f0ff
 DIST keyring-21.3.1.tar.gz 73553 BLAKE2B 75824dc1ce757501ed286a2dc5c49c644df0fd3278f7344bf42c8e687f51b2c488e038377e776b13f0d97b3f60d940467248689d8f1572811a15400a14d85529 SHA512 6a95d602eed052378c78fe3d8134eeaccd5fd13051ecda32710061c2b9348ebbfc350dc004ef41df94df28006ead4bbefe3bc968bdabd136acf27c469a87ee7a
+DIST keyring-21.4.0.tar.gz 73591 BLAKE2B ad8fe71a6a8bd3180b01ce3ca0372f9d1dc493d3eb58ced707d1869284d21ceaffaab314c1304b58461d771fa1a4a5981ec8fbcfaf333d602bdef7985d8799eb SHA512 149f1706296c830605d0ff2eddacf3d531c3d80f694465785d83e2af1d55a49204a2112db840522d4de10cd012073cafe571638e2c39a2f61c308821fe5ec901
 EBUILD keyring-21.2.1.ebuild 1267 BLAKE2B f1a95e142caf22676560dedffacecfd0d06d1097916190e8219bcf472b536239f1effd6169b60a1c6564a5e5c0180b8bf935d5ae303ac10d76425fce02d6a064 SHA512 3c174310a9fe8665993891684da99d7a3c304c73a191059d4fc8095117a56ed2623a42b333e8224b9217fe0c698a695804ade899f5c5c17190bdbe248c957d29
 EBUILD keyring-21.3.0.ebuild 1281 BLAKE2B 1e2e062a47177c8928df23e48fdb99917e51e7da008a1483fc83b09fa9a98b95f489a879db37b6de17a7365a6ef121a20ba3507fecbe32a5d346f3aa84fd4537 SHA512 c7916d84182970017e8a5a955ee260661f09ad75202a53b0e73cc3b306496eea5646157596c5b2e1a0cf4c37fe3eab9a3f90ca179b77472e619271bb546945fb
 EBUILD keyring-21.3.1.ebuild 1164 BLAKE2B 8b30b9f248e9517db0d4831b6d0d05744ca6d4b2862bc8066bd0ec9811b05d3f3bda31056064416057b9cc17a442d6140c0e348bad302f021d255fe27a50a964 SHA512 3828e321691678d215dc54ce441f7b9a36c4760cca8b7989abfed7d91f6914a49373bd163e7d05ff7bfcb7e73594ec050a4c9dff05f7a7222043cf91a8a86b0b
+EBUILD keyring-21.4.0.ebuild 1164 BLAKE2B 8b30b9f248e9517db0d4831b6d0d05744ca6d4b2862bc8066bd0ec9811b05d3f3bda31056064416057b9cc17a442d6140c0e348bad302f021d255fe27a50a964 SHA512 3828e321691678d215dc54ce441f7b9a36c4760cca8b7989abfed7d91f6914a49373bd163e7d05ff7bfcb7e73594ec050a4c9dff05f7a7222043cf91a8a86b0b
 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
new file mode 100644
index 000000000000..669cfb619df2
--- /dev/null
+++ b/dev-python/keyring/keyring-21.4.0.ebuild
@@ -0,0 +1,45 @@
+# 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/lcdproc/Manifest b/dev-python/lcdproc/Manifest
new file mode 100644
index 000000000000..8641309f8d64
--- /dev/null
+++ b/dev-python/lcdproc/Manifest
@@ -0,0 +1,3 @@
+DIST lcdproc-0.03_p20150508.tar.gz 337211 BLAKE2B 426ddb2e951d096dc8ec149e47dcaa4c31501c9993e27c6a7fd686baa7e0799c92f40bba4eb3250c846625e6f82d6a202dc9f55a7044e6d4edb08437edb9d2e9 SHA512 344a15566587a1f7e3a50314138fb320ee341a41484061cc143498c86e058badefd38589b74a6668e3c082b1cd4ceb3aaa8a9369eb9d8f900af5da0aa7823430
+EBUILD lcdproc-0.03_p20150508.ebuild 589 BLAKE2B d2c30f4b8cc66a41121e5bb5f6f779f0a371179a96d903f4cd806866792771449fb895ef0cdc0162afcb218c49c1988bdce9978cb13e314f98cdde5f798246c9 SHA512 929eb83305475534fe9398d1e11f07fec3c351b1eee3dc216e35e2e9b925532e13ee18cdaaa63f9b8718ef0f9ebe493d6176e8b22279e335b9ecc54cd4c75972
+MISC metadata.xml 577 BLAKE2B 02061be0f12439329385b14e9aa1617e52cba5504998851ebe0fbaf63ea30a5eda5484a96674719a0c53144222aba71c808258ba1d4c3119efba3301c0a2ca16 SHA512 82db5affeec0a6e1f007bd927e4ce8b68c15ff395ff39298b2c6dc3fed5454e46e7bbde0d746ebf12ff7b528d6bc889665ef4be01263b4f1b845f4ceef47d4e5
diff --git a/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild b/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
new file mode 100644
index 000000000000..677afeb84b7f
--- /dev/null
+++ b/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_COMMIT="973628fc326177c9deaf3f2e1a435159eb565ae0"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python OOP wrapper library for LCDproc Telnet API"
+HOMEPAGE="https://github.com/jinglemansweep/lcdproc"
+SRC_URI="https://github.com/jinglemansweep/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="app-misc/lcdproc"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+DOCS=( "README.textile" "examples.py" )
diff --git a/dev-python/lcdproc/metadata.xml b/dev-python/lcdproc/metadata.xml
new file mode 100644
index 000000000000..e62d5c1a6a04
--- /dev/null
+++ b/dev-python/lcdproc/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		This is a python OOP wrapper library for LCDproc Telnet API,
+		which makes it possible to submit own data to the LCDproc server.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/jinglemansweep/lcdproc/issues</bugs-to>
+		<remote-id type="github">jinglemansweep/lcdproc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/llfuse/Manifest b/dev-python/llfuse/Manifest
index 34f8df5725c2..c35e06e67974 100644
--- a/dev-python/llfuse/Manifest
+++ b/dev-python/llfuse/Manifest
@@ -2,5 +2,5 @@ AUX llfuse-1.3.5-cflags.patch 662 BLAKE2B 39e0c35ffbb62b4a6b7b7c5592da8c87554ea7
 DIST llfuse-1.3.5.tar.bz2 362266 BLAKE2B 561439e193470c047aa32b5b4ffd189beca2496b0141d9f0b0d4b494ee135025b174744ac3c90a0e5e8a17cc98f4ab2e8b4a9069f7d73e01a369f5013d036144 SHA512 d45c5fe7e81fd561e016fe99cc7bbac0cf6243e1517e992fe5b302b641aa93c8f95779cb7a4add7a7479f1ed6ca35e0fcf1e4da0fc46ee5d819b46511927613c
 DIST llfuse-1.3.6.tar.bz2 361750 BLAKE2B 74387a6aeb28c3f49234a4f430c3f2aaeefa2057d69e681405d9588c63b3a6e4a6daa58b8996541825c73ff4dabc5607874c2d7885586d793a6436e3f680aec2 SHA512 d67e39daf65c92ebb5bf69abb0c5dc3a88460228b5ec5ee762a11fc909369562411297e8ff9f512ee1ef539d8abec765924be581703fb7e99963c6512cb1f0bd
 EBUILD llfuse-1.3.5.ebuild 912 BLAKE2B bdb568bf00c3c4f6ec5188ef0258930ae8f07e715a7683d70435238d5ecbbed06f838d02a7db13411546a794669dcde1d8e25179b0ed2f60f4858b12b9588957 SHA512 603f7a3c9abd584eb1469ecbb4356ba1bfbd30fde9c0fe28e23f37969df73865012601bfc6f019c666050dd8c6b2193b3075484d626b5edb66d2afcbe0069841
-EBUILD llfuse-1.3.6.ebuild 756 BLAKE2B 471832db1ce533ebe7bc576b26c6b4302e80253f157b2d7fcdc9dbb507c3789458a636c6a6dac8a76758a496423b90e68f5fa64d6542f1d28e4d6557ba779ca6 SHA512 38d81841e11835e673bccc55627518861dd53648180e9f94facabd6deb0fb65b294f4427fb4c6f14f3e211fb1c7129a1289adc626cc3cb9839cffe222a210a75
+EBUILD llfuse-1.3.6.ebuild 755 BLAKE2B 43927421c5ffbf61a5bf895cd9b4470e5673b1054fc9a13e9e21e2484f7b0fb11fe6ff959c5f33f32ac352b0f8f47756964a470a3e8a69e1d17a826797e044fe SHA512 4b202b3ad7d1a48528bf6c7263e8d730d68b83cb70baa5130d95f0ef43ec873e725bb190025e9247ad7bd23f48015aa31a5516f23a4d77c77546f5d3883bc29f
 MISC metadata.xml 376 BLAKE2B 1af93242bcb6260813d1bfd9ea8705cd5aad5bd6832dc99d49b1ad3cff9ab85c59fa7e2fd713f3a30055d8e5a1c507b12a3cb8324c661062490eab6fb04f280d SHA512 f3283b1b857582140d4bda3c2456889e23e7c82d8a95efd9d9dabc18c49c4c37f160ffe082932eecc738d7b045f4c6607b09a89f0e8c414e0329834fd7588fbe
diff --git a/dev-python/llfuse/llfuse-1.3.6.ebuild b/dev-python/llfuse/llfuse-1.3.6.ebuild
index 962b4cdbe2c2..36cd2ebd58dc 100644
--- a/dev-python/llfuse/llfuse-1.3.6.ebuild
+++ b/dev-python/llfuse/llfuse-1.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 60903265d7cc..4506a7666333 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -3,5 +3,5 @@ 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
 EBUILD m2crypto-0.35.2.ebuild 1433 BLAKE2B 36599cd736a015dcd9a4b574fa127bc77e103c030830f19005135eb433f49bd57e0f7fbcbee5ea9a872415528415e1d3b81116de7dda18cf126036d0549a8491 SHA512 1138c7bad9f33994cea5f22d298f12c5f9f551f63851228e43137a85df125616421348cac4f375cbe7715e0e177c28fb34149f02df649d55f4c003a3174d6aa8
-EBUILD m2crypto-0.36.0.ebuild 1566 BLAKE2B 5e84731a51589c1bd70f6a40dbc75da2d6fc1c1937047db41477cda045f36abe19a1f5ee2e9a3d7445979a1a89f8bf7addc49960efc4a4b1136fa0c44a9dec24 SHA512 f1c7884557007c32ae2ab929565be7349a438725288dd2e33a2c4d6b59ce59e2a7957aec0d725a6b88e6d12eda2777a681fcb2823bedb7a450d4be394968a2af
+EBUILD m2crypto-0.36.0.ebuild 1564 BLAKE2B 77ef7c876640b74c5e6654cef8eba34736aa44cc5ada2ba0baa627fd966bd4af0548b482d331551dbe02187e12dd1089f231a987c8d51ef8cff3d760709e5320 SHA512 220486490a241c20779afdad3eb11a7398d05c01293943b4bdbb5c59d10ff38dcbb38f2f5e3926e46e56c3f01be3efc3c683be47a32d5b764317948661146f04
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.36.0.ebuild b/dev-python/m2crypto/m2crypto-0.36.0.ebuild
index 243fa4672aed..3331769e288b 100644
--- a/dev-python/m2crypto/m2crypto-0.36.0.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.36.0.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/markups/Manifest b/dev-python/markups/Manifest
index d9e0d91adb09..3461576299b9 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,4 +1,4 @@
 DIST Markups-3.0.0.tar.gz 16966 BLAKE2B 9245b1b0056bda9538fabf8540ddc41f2861a41c2ea42f29da195393bb85a63af1273109cb8f3d15ee4b257774512e3002d95948bab4a4493d89e18d687f19ce SHA512 3dfb97f29e801fa296e7ea22f2693d05fe9a9bfdf6c9b560cf6a44d04abfb6c2ac0717093732b6fbd9ea052ab9f8d054b3aae10a0c16516af3815ca1d720aef5
-EBUILD markups-3.0.0-r1.ebuild 871 BLAKE2B 44404c136dc9b2bb9ecdc1fa6974f6dc09628100d778178da2ecf7febb5bb3c5a40e7c7787185dba71dd03fd6b3f28e2683dc989cbfb2d5b55589331a00f7e5c SHA512 754c3a6927d56e7e04de1d7af646d640809b9be5e3254af4a2cca5287f69b2712ea8f6996abff2e6a9c64ef559c7bdc65535fe70523fa5f6f88541e783cce588
+EBUILD markups-3.0.0-r1.ebuild 870 BLAKE2B e685c504ff90b704ee0d33fb4e2930ebde2fe05df30669f43f6efec16bcac9f6367e8be177dd8f724e42fea915d2443de3181ededb486e308fd98b20f54d676f SHA512 0f38bd1acc36e8d5a2c7a300ba43e02e7adb079c6c417b4a5cb2ea00aad470ef957a6d3819ea4fb2a3a807aade67e182fde60ed4c27158449a01eb24ec812510
 EBUILD markups-3.0.0.ebuild 796 BLAKE2B 3319db8fdba0f385bc3522fe3059e6e33e50525bccd6589b904057c8c5754a4d202666a4317e6f498df2c566a055996f36f11738fd2d5c0e69dc62747747ac4a SHA512 f0a29debc1bd4ce4f076d77f97f39254b5c5aa734db45c8fd078bccd19ddbc52a9a375ed4beed4aaae8e27ce77736623e2110814c404dadbcdd4cf0907b01322
 MISC metadata.xml 625 BLAKE2B e700717385a02ed240f11bbbebfabf215d6bbff574ea2876035e300111490f0f477be1cab1224157413eba57f6ed4f84a166c2c241110b35db284c07818d64f7 SHA512 acf3002c22de1375c1a03e0a84765e52cca93b4ad1c6a57ee7f73e7e1616551dc3d6f61dcd1a8d9f31671d6779e19ec19041691bbb7eec6eecc0b66a280de9c5
diff --git a/dev-python/markups/markups-3.0.0-r1.ebuild b/dev-python/markups/markups-3.0.0-r1.ebuild
index 49bfc95f270e..7910938c8a91 100644
--- a/dev-python/markups/markups-3.0.0-r1.ebuild
+++ b/dev-python/markups/markups-3.0.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/metakernel/Manifest b/dev-python/metakernel/Manifest
index 511132f06bfa..4441f89f4bc7 100644
--- a/dev-python/metakernel/Manifest
+++ b/dev-python/metakernel/Manifest
@@ -1,4 +1,4 @@
 AUX metakernel-0.25.0-disable-brittle-tests.patch 762 BLAKE2B 440f29b4566beac51b5428e691c0fc6dfb13c2b3912486956589f414c44ad07ecb7ad23b5ef4b5e160bee15205c7b68b327c3bf612b81cda2a73fd51968ba83a SHA512 475829494bd4cc20b994f69428228a2d12a3a1b004e72be50ac5e2d746e37f9ae6203fe776e63a96e4d673bfdba814ca1ae1dc609392a4e346648a5b1471d314
 DIST metakernel-0.25.0.tar.gz 182808 BLAKE2B 40fbd44109e3b9e88fa8065138e7ffe3b42320651c1731249a10c443a456a5eaa5c91110fcc223f1d557aaa1acfee670a3a36dacf78e6bc9b2ecba0e39f7cc21 SHA512 89a46d3b746a0f4c435dcbeefdb485257c2813790849f95bc0508fee7c2a892e688fdbe2dc9db5f2a0c69ed4917e8de81753492e686337d5e1ab692e9e51ea5a
-EBUILD metakernel-0.25.0.ebuild 567 BLAKE2B 9c415d6b47b82b7bccc5059f05c7d323ac147c4f7bfa861a281bdde14c89a86545c995dad63d4aaa206ebb09384227b38447605f94a77ea36ae89917904174bd SHA512 ddd0fdc652e0d1a0c3a26d888d7c0b40d88a32fff43da36c67222689b8751076bab2e59dd4d18dad3bcebec6ef2f471997977c40d92f36e772b2971e5fd2badd
+EBUILD metakernel-0.25.0.ebuild 567 BLAKE2B a4746723d861dcb63c7fe8bccb31103e62e419783df07b2e7fd4f48edc15dd041135eab083fb12e5932af43a90f9b3a9de46b236c73530fa8474b407fa356d4b SHA512 f3971eea99d5b07bade4fa6af3629644225eecb0f2e428cf84b736c016901ab7f44f1d0cfa04de7df95243a810bf45ddcf3dbc659a85992f6604f14a486cbe43
 MISC metadata.xml 634 BLAKE2B 18f77a465ef02244b5ded5cea7751fabeb5d1fbad17c2e47239228e7512512eabaa79fab71f480fd11d33af8b43ca6859f4749b81c14c2e93384b051f1ea3590 SHA512 b4a566da04b0f87e979b4556d3fbe76d3716ef96b6b9e5222fb942b0d622d9acb98274b935cb2fdbbf01baa111df351e2dc3988ce494c1bb4b17a18f2115c7ad
diff --git a/dev-python/metakernel/metakernel-0.25.0.ebuild b/dev-python/metakernel/metakernel-0.25.0.ebuild
index 55484982516f..a0d19a5493da 100644
--- a/dev-python/metakernel/metakernel-0.25.0.ebuild
+++ b/dev-python/metakernel/metakernel-0.25.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mongoengine/Manifest b/dev-python/mongoengine/Manifest
index f2df58cf6b44..a6ba81601af9 100644
--- a/dev-python/mongoengine/Manifest
+++ b/dev-python/mongoengine/Manifest
@@ -1,5 +1,5 @@
 DIST mongoengine-0.10.6.tar.gz 469469 BLAKE2B 3930126d64e1b43d579412069da33a96e6c525d459905d05f677a406a262a15e16d8f6460637c253ace4addbe07655d194fede19fe050f4628aa17dbb6115038 SHA512 a8d16739892c64ed408afab49c6d33a4b438af83e003844caa101cd51366038ba75121d12b4385a546cf4d946a506bc11f173355f6855e740cef9fddfd6437e7
 DIST mongoengine-0.20.0.tar.gz 311698 BLAKE2B 11bae8d342a77bcc241884beb92d67a6d4f7112d0af3a467196eb94233b003aa27d019ab346140ce7430b4019879c8c86e01f3067677254559243b6d1f0ddc80 SHA512 ef973af9893f6e53811e1a47a131989f5a057af04ab9d512059f968af89fcd23f05d910c7de03330b5f4771db8e11ea2e48060f95ed790f8d238df6c6f7b9306
 EBUILD mongoengine-0.10.6.ebuild 805 BLAKE2B 2b0f1ed8ce17db744a0a329256234cf5074379da5d4808600c104f666e30c419befda185e473911adfd79173d842729e9a5e312e6b771498f6270754e1a84112 SHA512 396446adfd0e772b325bff46158ea49921b1adf48c434c9cec1cd231c7dba2c7634a6651a0be8c78fc9f13faf9276c84dda67cb426936cfe3e54b6dbf4449e6a
-EBUILD mongoengine-0.20.0.ebuild 1499 BLAKE2B e7e1f7991a765cd0e39accac336cc42484953a90f8ac8b0ac351b434d41610f301ee09e5076421ecb04ca21cf8329ac2edc2dcdcfcab2b2a4a56509f9f8c9e4a SHA512 03ec2d70d29d93b827f17cc7742184d6be0b76cf53ec3036772a39cdb8e7374bd5f949920411a653e12345e6c85cda3b4504ae02ef7cefe8023c74293951da4b
+EBUILD mongoengine-0.20.0.ebuild 1497 BLAKE2B 0282934e3d29ee3944cb62e5de1cf7a26e64f3b08325c80fac6459a47c3740689f431051837789ed75ebf4d93c3c39f730aa512ddb5b1aa8ddc5aa1ab435c87b SHA512 62fccab4b550fc85724528571b476f5c901ca6cf86725914d416b5ed4ec7726d8c576d73fb3bc8051c805e2dd92d3da345933f5aaa0367a6eb7a9bd0a0c35c5a
 MISC metadata.xml 338 BLAKE2B 5ecb99b784399bb9e25c094b38e6585d5dd6dad6bade4eebd9b986e5022ef89417e11151de2528439754717c76c9601aedf24dd3295eca09bf0c59f9bc1130cf SHA512 b25628f5af0a4c32d9ec8d7bc4e39ccf6bf2c9d9bdaa60bec2a3da846a9a290944822a1d8233cda735a4cf3a801acbfa47826f6bb537ce5c7efedc669282e523
diff --git a/dev-python/mongoengine/mongoengine-0.20.0.ebuild b/dev-python/mongoengine/mongoengine-0.20.0.ebuild
index 30844f5c2a35..55fa670b3f9c 100644
--- a/dev-python/mongoengine/mongoengine-0.20.0.ebuild
+++ b/dev-python/mongoengine/mongoengine-0.20.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/MongoEngine/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 # TODO: make it run a local database server
 RESTRICT="test"
 
diff --git a/dev-python/monotonic/Manifest b/dev-python/monotonic/Manifest
index 6da33449a422..48254adaf46e 100644
--- a/dev-python/monotonic/Manifest
+++ b/dev-python/monotonic/Manifest
@@ -1,3 +1,3 @@
 DIST monotonic-1.5.tar.gz 7525 BLAKE2B e6022a9c134031f1b89e643b4f7b37417366e08de213f580a39706e7cd57b1045e8f1625be213c90fba48b69c40461d0c90255e6a9f20e565ea9a857780e2143 SHA512 05485e0baa51df95f9812d463306ce0bbe7228170b43aed8faa9d77d2b613ffede6b57b3dd273c352e0d1c04782043bec2f36be88cb1acde182a5aeb0538f970
-EBUILD monotonic-1.5-r1.ebuild 464 BLAKE2B 15ee2febe06bf675ac87b6b07df58caf1d3b80fe99f549ba84e4d046dad36e98ef68598c2cd9aff9a69361685d6b008de6edc94f9c38cce3fe364f23608d5229 SHA512 1acc9cd45bf18c57c397aabead32bf8d1bc6da2cfb4c97d2e634eaea331471a5f6fe1f8761089216b01352fca3f381bca3da6070167e72d85e9297152c6700f3
+EBUILD monotonic-1.5-r1.ebuild 463 BLAKE2B 18c1e7f759d2a155c01f64a82de06edc5cab4dd99c8338763b67ad46ede894b98437cade45af97be864f952478b3b81aa24577f3abbff82ca6f5c09fb93f3735 SHA512 d7ae10bc4f6515a99dd4f3ac0ab482d4ffae604e8ca65ca39cd5c4bbdbaed7b13b3efe1822f79ff530403206e474d8107426f64b64a48885f527dd83faa25987
 MISC metadata.xml 366 BLAKE2B e8045b50a2eb6fa77f3f95b4dd4dd775c2c986bb80eeb1e91f8a775e5df484da48ba7ddf32ee19a35c5a09e340880cc27f2fb70c45a371341872cd22ad01dd74 SHA512 d58d7d85046c7ed8b0deef7fcce1e60c720b8fe4789a35b507c0d91c8d2222d01ffb4778986c9715fe61efbab3109278d1ce76433f39397e4865a493d794f94d
diff --git a/dev-python/monotonic/monotonic-1.5-r1.ebuild b/dev-python/monotonic/monotonic-1.5-r1.ebuild
index e85560961fcc..29daba27a01f 100644
--- a/dev-python/monotonic/monotonic-1.5-r1.ebuild
+++ b/dev-python/monotonic/monotonic-1.5-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 # no tests
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 687e1f5c5bd6..b63d9e3df54a 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,5 +1,7 @@
 DIST more-itertools-5.0.0.tar.gz 67359 BLAKE2B a2448b218eea4442cc4739a4df414ba69e0530cd6206a13c5c017a13daa297d00c08a94cec8aec0639d8b03663f4b698702f5e700ae118ae9fb5854a6d105b36 SHA512 f72c8d6c75799c39708443ba75862801ddd3fc0382c9eee7ed24ecf04cbc7d9ff6a8e35b6fff1eaccf45ddd470c2cc8959532eca32c2ff50b0a12588727c68b4
 DIST more-itertools-8.4.0.tar.gz 83626 BLAKE2B 84370e495a6f32c856f751907e45c6155cb5d6331a84607eba26842ee4e964f8f0a01d2c16d4c5446e5e51cc24aaea619105ae24b067b9fabe3fe8741de526dc SHA512 70bf72594cb92b165f1bdc5050bcd3d7d37eeee65db6c631b636222005f8d7707d0c6ab09a229e9f1a23fdcf2be948e96d0882f9fa033f29b7a472ec8441a4d0
+DIST more-itertools-8.5.0.tar.gz 86861 BLAKE2B 6c5d7e0e2bfa89b65636115d5539ca5a36de24b7e0971638721d8fa13f6ad84f0fc64b297b5c3c30d380f78e271f6b6622d72a41ffb8f1941945d5918ec6c78a SHA512 f11a4443d4d5e79fe241fc6e170ae51b08cfb1f1093dddad036e1ba043c30d03c53ab9fccbfb4de97279862c6cfe44759ae88ce6027d871515b032e7d9e435e7
 EBUILD more-itertools-5.0.0.ebuild 714 BLAKE2B 157f253d495410285f2c9c38f6487943eb2965ad1fc9fcb18ae4222f199b7db215995193f10b2d23163756a8ce5dc3600a7517cee2a2ffda69302faf204bf839 SHA512 75274ecf32e551be840489f74ba6d03c5c0cb3bbf85138282da5836b07f7b0555afad83d7640075e380cb90bef1db12327b44fd402a5b26c33ba085316b4c474
 EBUILD more-itertools-8.4.0.ebuild 660 BLAKE2B 9c1d96501f32515dfffb61e65baaf2c81daa7a8a9f94a582ef341ac00b2bb160c72200a9ef415f2e847e37d1dafab6032df192c1f48a429826b3a49fefc05f33 SHA512 31a0b198d7bd5533c49301b6abd83d2a5cb029dc3e4fc0ec566cb85a6c82bd648ba843aca19fc77275a7b1f6518dabce727493c716f2f9fb84173b92130a7b33
+EBUILD more-itertools-8.5.0.ebuild 669 BLAKE2B 365de101d7a208d6dfe8bc956a38110a95c25e2e152d564dd5ea5e8e29b669032d4d8d34ec4e813075bf08d4ba48dad57fc196fad8aef8b0f4dbaf636856ee4b SHA512 a53f2d0928535bfe5a80a968a01ebc3449f6fc153a79152643996e312be06056e58539c394e921b1cbb8f28dcbdfd5c31c3a85427d6e08afc5cb2218d8354596
 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
new file mode 100644
index 000000000000..b1c4f1688dec
--- /dev/null
+++ b/dev-python/more-itertools/more-itertools-8.5.0.ebuild
@@ -0,0 +1,24 @@
+# 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 ~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/mox/Manifest b/dev-python/mox/Manifest
deleted file mode 100644
index c3677daa2c6d..000000000000
--- a/dev-python/mox/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST mox-0.5.3.tar.gz 31266 BLAKE2B 7f8d22519a462270e08b5c126fa3afd38d6a643818c39c37105133583585e451f3447155b48666c590abe7166660ece33368b3f3f22690cda10ce4a4ff908ffc SHA512 122606264ea8bf83d38f8576c8208fd1bc17cd76009390f516ed4bdf705d49ccfbeed0fa3e9ac1940df3969e0254662c602c497d6c6833108dfcacc59f1c789e
-EBUILD mox-0.5.3-r1.ebuild 547 BLAKE2B 002e77473200bbb951c66467910f80bdcbec8b5d40d35874cd060f07e61a3d58f5fda4adc58902ca199d3600a4fe67a97d2e217e6ad312348299d76f23f93f3f SHA512 b54e13a60da73403e007b7a44609dfe900f4984c090affd5d3dc105ea7d54c7fa7662c28fe3bb39eadb23db11c9218c382be1f34b76c92274f83678b9fd634ac
-MISC metadata.xml 368 BLAKE2B 60b112ef7d37a6b06bcb2f459f45795baa307fae9edc7e159e8d3c13b475d92339838ce36851ea365c5b594aa7fc4883a8ae5e2187db03d3050c9471d5523ee3 SHA512 8a818882c4865dcffe190d21bd89abde52ffdec8bf1190653a011cab2c1e9182e4196d2dae54192fe8042573730cf878ee3e260308623bff6443143dee590f9a
diff --git a/dev-python/mox/metadata.xml b/dev-python/mox/metadata.xml
deleted file mode 100644
index 5c3b83936ef0..000000000000
--- a/dev-python/mox/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="google-code">pymox</remote-id>
-    <remote-id type="pypi">mox</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/mox/mox-0.5.3-r1.ebuild b/dev-python/mox/mox-0.5.3-r1.ebuild
deleted file mode 100644
index 9d146c82bd58..000000000000
--- a/dev-python/mox/mox-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="A mock object framework for Python, loosely based on EasyMock for Java"
-HOMEPAGE="https://pypi.org/project/mox/"
-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"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-python_test() {
-	${PYTHON} mox_test.py || die
-}
diff --git a/dev-python/mpdlcd/Manifest b/dev-python/mpdlcd/Manifest
new file mode 100644
index 000000000000..02e0d89de1bc
--- /dev/null
+++ b/dev-python/mpdlcd/Manifest
@@ -0,0 +1,5 @@
+AUX mpdlcd.confd 275 BLAKE2B 995143391e3c30486cdb98f1633005c9a059124ff2fe5a3c2eb9277769f253e9e505b22d6b45ab0f205ea2edb89d11653ae13610a48be6bc7951647787e9b8ae SHA512 ae86f6610ed529e09a365eaae4d1f503a6dc2732c7a26ef447a66509af181ee1ff64c5f4baa9b9f37bacda5f11547d911b34884a06294ead6bd9824e8f8cddc5
+AUX mpdlcd.initd 367 BLAKE2B 01dafb969e424a3dd57578890676b882e47757beeaa077cbdd76fe92cecd507901d01182a26ba7569975067548f3d24625736e03797f481c29ecb2d216e53f1e SHA512 09124a0b71a1425fb8a8bfaf0c021131a5e738856433a33e716eb691a353108b0bebff8459db190be5068e1dd5927a272cb859971bb7958d7e1eb7019325e8d1
+DIST mpdlcd-0.5.2.tar.gz 30748 BLAKE2B 5609ac149a9aa806e516202adf1b9d0f4fc88e8370f331edc836082d7b3b85c519097149dd2b5cb838d8a9ff353421e17daf9236397e4b37e2923948f8dc9dac SHA512 e000120eee1ce99b549c5ac0cd00fba394ce1a373cce3dde819f6aabd6fc3b616e59ade6d6868b1e9f14afea4897cf541f2c3f5d0eaebcbbd03b15781a63b6fc
+EBUILD mpdlcd-0.5.2.ebuild 694 BLAKE2B 14e4e2946aa271d98bcc5ab808d8e8975046584da0bf40fcaa5fb6a6e33fa06214ec690113103b60c98a58158828eb2378b5dbfa033acd6d6606584609e970fd SHA512 cf05a74eb3a2b9e1a14242405a4ea50b9660e6aded47787d55c6ee9771123269dc20fb82da8d72c01d0849c3a8ef98c057b730c8cccc94d68f49d530802396cd
+MISC metadata.xml 631 BLAKE2B e262838d612d40e33e7294517b2321c74c3a10e9e7757653db0d3206da191d239b717d8b63a67bbaaa8d90ce205665e175e7c7e69e936d900296727fd0218fe7 SHA512 755679357afeddb0ced255516a993bc6293fed76e2a876d8ff58e44b5292d65b2686f0593dd103460d64a83115094ec0257b053f7ffc88ab38e7d44cd4baeb0f
diff --git a/dev-python/mpdlcd/files/mpdlcd.confd b/dev-python/mpdlcd/files/mpdlcd.confd
new file mode 100644
index 000000000000..c7813cb0dea4
--- /dev/null
+++ b/dev-python/mpdlcd/files/mpdlcd.confd
@@ -0,0 +1,5 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Options for your started MPDlcd
+# MPDLCD_OPTS="--mpd=mpd.example.org:1234 --lcdproc=lcd.example.org:456 --syslog --syslog-facility=user2 --loglevel=debug --lcdd-debug"
diff --git a/dev-python/mpdlcd/files/mpdlcd.initd b/dev-python/mpdlcd/files/mpdlcd.initd
new file mode 100644
index 000000000000..c1e5bc7e1a3d
--- /dev/null
+++ b/dev-python/mpdlcd/files/mpdlcd.initd
@@ -0,0 +1,15 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+name="MPDlcd"
+description="A small adapter which will display the status of a MPD server on a LCDproc screen"
+pidfile="/run/mpdlcd.pid"
+
+command="/usr/bin/mpdlcd"
+command_args="${MPDLCD_OPTS}"
+command_background="true"
+
+depend() {
+	need net
+}
diff --git a/dev-python/mpdlcd/metadata.xml b/dev-python/mpdlcd/metadata.xml
new file mode 100644
index 000000000000..47a1342d704b
--- /dev/null
+++ b/dev-python/mpdlcd/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>conikost@gentoo.org</email>
+		<name>Conrad Kostecki</name>
+	</maintainer>
+	<longdescription>
+		MPDLcd is a small adapter which will display the status
+		of a MPD server on a LCD screen, through lcdproc.
+
+		It allows defining various layouts depending on LCD size,
+		with fix or moving parts.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/rbarrois/mpdlcd/issues</bugs-to>
+		<remote-id type="github">rbarrois/mpdlcd</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild b/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
new file mode 100644
index 000000000000..b5e77f3dc0be
--- /dev/null
+++ b/dev-python/mpdlcd/mpdlcd-0.5.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A small tool to display the MPD status on a LCDproc server."
+HOMEPAGE="https://github.com/rbarrois/mpdlcd"
+SRC_URI="https://github.com/rbarrois/${PN}/archive/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/python-mpd"
+
+S="${WORKDIR}/${PN}-${P}"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman man/mpdlcd.1
+
+	insinto /etc
+	doins mpdlcd.conf
+
+	newinitd "${FILESDIR}"/mpdlcd.initd mpdlcd
+	newconfd "${FILESDIR}"/mpdlcd.confd mpdlcd
+}
diff --git a/dev-python/mygpoclient/Manifest b/dev-python/mygpoclient/Manifest
index e93318f13098..d3bf6ae1436b 100644
--- a/dev-python/mygpoclient/Manifest
+++ b/dev-python/mygpoclient/Manifest
@@ -1,4 +1,4 @@
 AUX mygpoclient-1.8-tests.patch 1635 BLAKE2B fb92cd995755013dbb2b35424de88d5c949485e818be45e00c89192bb60b9506690b971fd586c08d7be31e7680c54586a015cd8dee299320fbbccf87c9ea70ab SHA512 9036f3328ed4980858db07f57661300e429c15ca8159118067d1385f8cf0ed5fcbcb7ef498dd12336c9fe2b8e5d22c944b8cd1f4043d418c5ce2b706a47aa239
 DIST mygpoclient-1.8.tar.gz 43671 BLAKE2B 0a1c10c00a9ee034acc17bb5e28d1ebab50a14f3eea534f4a4277172251ce567a26e7ab66859a66d89d4adc06f44dfe5899edb0aeec45e90e461a4a8cb3ff337 SHA512 1edecd5ccb116c7f4017ebe6572439d87ff76501ed0628934e548dc0c9c041127a11ec9f4def4a54a6f7fabe46a461c863ec2ff2f8c14c3c67b5d1fd9285bb9f
-EBUILD mygpoclient-1.8.ebuild 1162 BLAKE2B 421596e541fab433939909bb344f30728e484a9cfd71f239ff2f9630e9ec1844cfc71dafe2e26618a59c7fbe7e1d6e7d9cda2fedfb754c5a2032ab72d266fc96 SHA512 04c6ed5d717f4a6a60447cc8622295c6c3d2f661f50d5896e4ed95d7b66e3c9a61c30ed3ecaea6408170bb91ca249375c7fab18a55fb065eeb4e10b1d5f70ed7
+EBUILD mygpoclient-1.8.ebuild 1166 BLAKE2B 782fbeeb8c3f2d88e476ba6450b64ef94b17999a3cc6b99b08f8dd72d90962c3024a2b228b5a2b7078e50c8a7bc959a28fe4ea74d8cb532f08ee5929e60ad319 SHA512 b19c05cb7dd7f3fb231780829c4441e8a395352c914aeb31c744134a7691865ff9ebf3506837e474ccf8caccee4b55d51478c20535320886dfd05ad93fda9298
 MISC metadata.xml 346 BLAKE2B f7a2d7e94b509007e77797724c67413616c4833eab04227f65088bc01cee098da763738c810adcfd0be1b13de261240b24d80ca2940925a847df4638709cfa1e SHA512 83fb6ffd70d907e1fd4be3ba91e781cf9131a980338b2fe66874fecde7673bd40df0005b34f5f52c2a7ec88e4b3e92ef2417d293474c1b51ecd06ff4ee6edf2f
diff --git a/dev-python/mygpoclient/mygpoclient-1.8.ebuild b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
index fdbdb4a3a897..6b99d161726a 100644
--- a/dev-python/mygpoclient/mygpoclient-1.8.ebuild
+++ b/dev-python/mygpoclient/mygpoclient-1.8.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 eutils
 
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index 1a968a56605a..474447c44983 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,3 +1,4 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
+EBUILD mypy_extensions-0.4.3-r1.ebuild 785 BLAKE2B 93d2501047f437a250720773c964d4c81057fa5c4a30975a42ab0d2eaa8c878f3c46942b40c22161078e131f00e280d58d13b7204b35c6f5777526057fd9fc55 SHA512 7f586d22671227c34d0f76cad32516500c8132fec78c6352e8508877e80c4eac630678ba0dcdf5ce285c36a16a6f61f5f6c56b5f72c339594b9fec6bd94c3a6a
 EBUILD mypy_extensions-0.4.3.ebuild 1025 BLAKE2B 6e531146c9e8c331c64453e6701842bac7d4fb80330a103bdd897d11a10618202cf291a4ab5691b5e7f6ed7dd3c9986f66f9b216f9185b95e284e7784e6a419f SHA512 770e6c1ed105f69d7f8bbb33b6e16b9b5a906962ff81c65efbed6f5a2639cf469a49f09bb284aa1f078da36d7b7cc752e2410cae91d8c18fd979c40ee460c2c4
 MISC metadata.xml 328 BLAKE2B c8305ff15b161dc506756c3a5e9d06fd2d22de1789676d02b610377520d593a594aebe733dfe88d0c88bf235e7c0dbfc16309d57f729365660c9fe9284fa9830 SHA512 6fa42508eacd37f3cdb2b47371baa13f67d985bb4f47237a0f9be5fa27b2ce86670de842abb75ca6c21f8d4255e56be552f5415c66244fe0c5dc99865e61b252
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..5a2945009492
--- /dev/null
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Optional static typing for Python"
+HOMEPAGE="http://www.mypy-lang.org/"
+SRC_URI="https://github.com/python/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+if [[ "${PV}" =~ [9]{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/python/${PN}"
+	EGIT_COMMIT="master"
+else
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs \
+	dev-python/sphinx \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	"${PYTHON}" -m unittest discover tests -v || die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index 2108a670a9d2..d03a56454ed4 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,5 +1,4 @@
-DIST nautilus-python-1.2.2.tar.xz 269220 BLAKE2B 9f2b5acc20727acf4464297bc008e8be0bb45ed418601e3658405e90eb3d56306f9aece402948491d5423d58cd261cee5cacbd39dd185957c4d72c90f877842e SHA512 541ab9e6ac15b06994cf475237e5588d21f4b9f71bb562f4bd9d976f79849a29912080de0b16c14406b052bec15c2c754381bf36e15b340d1f8e76c83a2464bc
+AUX nautilus-python-1.2.3-gcc10-fnocommon.patch 6095 BLAKE2B ca0f7c2f46d3fc265cf2649c3f9f58d8bcf88212cd62065cb6f30adf2094e206eafb48354bc25bcc1afb887703b8d05d2a83020ff6382021edef130d5509ef38 SHA512 267171aadd5fcc825ca42e91f94dba72260017cc0aa4bc12874fef4773d46c6b47c1fc093e5043b3c77161cf2a51b78e6882ac8cc60c800c870d325108ce15c4
 DIST nautilus-python-1.2.3.tar.xz 269320 BLAKE2B 3d355bb8c0e67c488bb818d55c2bc97d8d4bfa14aeed8d6cb80d999a4b91ef5dc2f576d3dcca0e44ac004830ae326a93110aeb0cbe1987f100475cbee1b59ba2 SHA512 9c6a1a4bbf74a8c9c7d94a74c6994f0b1fc9de522c9f05d0ccbcdf3d60b1073dcf8058739ac0ee16f54b2632f2b9dd994bbe2bcd98cc165db543567bb1545443
-EBUILD nautilus-python-1.2.2-r1.ebuild 946 BLAKE2B 52f4f4077034a671568e4de1337a7464e62718ea2ce9db39aaaeb7ed53af42acd6c3c4870596ed14c648b8c2ed39c5c145d85599d184df6d3e049a8f09e504cc SHA512 6ea8233389a35c5114a9c73b29586d37c64974b3ab8589378a6d94466375eecea712f3dbe87cfa251f1eae6531ff43302de23b609984a1e5442b56756a68e059
-EBUILD nautilus-python-1.2.3.ebuild 950 BLAKE2B 2d627aa0ba9d3849551fc3c8c0d14ec0f0dfdbc34c726d12804934360f61977bf28476f8d48af7b2a69b814e8880a282ff813fb59697ff10cbd6e79ab669bff6 SHA512 a8bf41cb4c593e089e7f81268f982cb7a50ec269c79b127fe6548abd2239b344c944a1942dff3aa79ec74f361835aebb98fe15189bf90b8ad7a4f8504caea4fd
+EBUILD nautilus-python-1.2.3.ebuild 1074 BLAKE2B 0ba6eef9e27f28f2e09b27db6c140c8fdabd3f4d53dd1badc8792ac7ae7a34ca4e2631b87a50d4439271f27e1a771d4e0539d9d4b955a1b92b3cabf3498209b5 SHA512 c32e16959742d9b7380b7cacc2df7dbab8906adf6eb16a7002205907175a4aeeaa5696d66bb564936b7f6871804e9c8a1c43157e0ab6b0d2d19083e3ce6ab19b
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/nautilus-python/files/nautilus-python-1.2.3-gcc10-fnocommon.patch b/dev-python/nautilus-python/files/nautilus-python-1.2.3-gcc10-fnocommon.patch
new file mode 100644
index 000000000000..7e0f760aca2e
--- /dev/null
+++ b/dev-python/nautilus-python/files/nautilus-python-1.2.3-gcc10-fnocommon.patch
@@ -0,0 +1,147 @@
+From bd4820186751034c6b5acb9c71b1aeab03c56523 Mon Sep 17 00:00:00 2001
+From: Andreas Henriksson <andreas@fatal.se>
+Date: Mon, 11 May 2020 14:57:45 +0200
+Subject: [PATCH] Fix build with gcc 10
+
+Bug-Debian: https://bugs.debian.org/957578
+Forwarded: https://gitlab.gnome.org/GNOME/nautilus-python/-/merge_requests/7
+Last-Update: 2020-05-11
+---
+ src/nautilus-python-object.c | 10 +++++-----
+ src/nautilus-python.c        | 13 +++++++++++++
+ src/nautilus-python.h        | 22 +++++++++++-----------
+ 3 files changed, 29 insertions(+), 16 deletions(-)
+
+diff --git a/src/nautilus-python-object.c b/src/nautilus-python-object.c
+index f343070..da185ad 100644
+--- a/src/nautilus-python-object.c
++++ b/src/nautilus-python-object.c
+@@ -40,7 +40,7 @@ int __PyString_Check(PyObject *obj) {
+ #endif
+ }
+ 
+-char* __PyString_AsString(PyObject *obj) {
++const char* __PyString_AsString(PyObject *obj) {
+ #if PY_MAJOR_VERSION >= 3
+     return PyUnicode_AsUTF8(obj);
+ #else
+@@ -389,7 +389,7 @@ beach:
+ #define METHOD_NAME "update_file_info"
+ static NautilusOperationResult
+ nautilus_python_object_update_file_info (NautilusInfoProvider         *provider,
+-                                         NautilusFile                 *file,
++                                         NautilusFileInfo             *file_info,
+                                          GClosure                     *update_complete,
+                                          NautilusOperationHandle   **handle) {
+     NautilusPythonObject *object = (NautilusPythonObject*)provider;
+@@ -408,12 +408,12 @@ nautilus_python_object_update_file_info (NautilusInfoProvider         *provider,
+                                      pygobject_new((GObject*)provider),
+                                      py_handle,
+                                      pyg_boxed_new(G_TYPE_CLOSURE, update_complete, TRUE, TRUE),
+-                                     pygobject_new((GObject*)file));
++                                     pygobject_new((GObject*)file_info));
+     }
+     else if (PyObject_HasAttrString(object->instance, "update_file_info")) {
+         py_ret = PyObject_CallMethod(object->instance,
+                                      METHOD_PREFIX METHOD_NAME, "(N)",
+-                                     pygobject_new((GObject*)file));
++                                     pygobject_new((GObject*)file_info));
+     }
+     else {
+         goto beach;
+@@ -434,7 +434,7 @@ nautilus_python_object_update_file_info (NautilusInfoProvider         *provider,
+ #endif
+ 
+ beach:
+-    free_pygobject_data(file, NULL);
++    free_pygobject_data(file_info, NULL);
+     Py_XDECREF(py_ret);
+     pyg_gil_state_release(state);
+     return ret;
+diff --git a/src/nautilus-python.c b/src/nautilus-python.c
+index 843e3c6..510cdfb 100644
+--- a/src/nautilus-python.c
++++ b/src/nautilus-python.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #include <Python.h>
++#define NO_IMPORT_PYGOBJECT //To avoid a multiple definition, nautilus-python-object.c also includes and does the import.
+ #include <pygobject.h>
+ #include <gmodule.h>
+ #include <gtk/gtk.h>
+@@ -42,6 +43,18 @@ static gboolean nautilus_python_init_python(void);
+ static GArray *all_types = NULL;
+ 
+ 
++PyTypeObject *_PyGtkWidget_Type;
++PyTypeObject *_PyNautilusColumn_Type;
++PyTypeObject *_PyNautilusColumnProvider_Type;
++PyTypeObject *_PyNautilusInfoProvider_Type;
++PyTypeObject *_PyNautilusLocationWidgetProvider_Type;
++PyTypeObject *_PyNautilusMenu_Type;
++PyTypeObject *_PyNautilusMenuItem_Type;
++PyTypeObject *_PyNautilusMenuProvider_Type;
++PyTypeObject *_PyNautilusPropertyPage_Type;
++PyTypeObject *_PyNautilusPropertyPageProvider_Type;
++PyTypeObject *_PyNautilusOperationHandle_Type;
++
+ static inline gboolean 
+ np_init_pygobject(void) {
+     PyObject *gobject = pygobject_init (PYGOBJECT_MAJOR_VERSION, PYGOBJECT_MINOR_VERSION, PYGOBJECT_MICRO_VERSION);
+diff --git a/src/nautilus-python.h b/src/nautilus-python.h
+index 4c181f8..c940a06 100644
+--- a/src/nautilus-python.h
++++ b/src/nautilus-python.h
+@@ -43,37 +43,37 @@ extern NautilusPythonDebug nautilus_python_debug;
+ #define debug_enter_args(x, y) { if (nautilus_python_debug & NAUTILUS_PYTHON_DEBUG_MISC) \
+                                      g_printf("%s: entered " x "\n", __FUNCTION__, y); }
+ 
+-PyTypeObject *_PyGtkWidget_Type;
++extern PyTypeObject *_PyGtkWidget_Type;
+ #define PyGtkWidget_Type (*_PyGtkWidget_Type)
+ 
+-PyTypeObject *_PyNautilusColumn_Type;
++extern PyTypeObject *_PyNautilusColumn_Type;
+ #define PyNautilusColumn_Type (*_PyNautilusColumn_Type)
+ 
+-PyTypeObject *_PyNautilusColumnProvider_Type;
++extern PyTypeObject *_PyNautilusColumnProvider_Type;
+ #define PyNautilusColumnProvider_Type (*_PyNautilusColumnProvider_Type)
+ 
+-PyTypeObject *_PyNautilusInfoProvider_Type;
++extern PyTypeObject *_PyNautilusInfoProvider_Type;
+ #define PyNautilusInfoProvider_Type (*_PyNautilusInfoProvider_Type)
+ 
+-PyTypeObject *_PyNautilusLocationWidgetProvider_Type;
++extern PyTypeObject *_PyNautilusLocationWidgetProvider_Type;
+ #define PyNautilusLocationWidgetProvider_Type (*_PyNautilusLocationWidgetProvider_Type)
+ 
+-PyTypeObject *_PyNautilusMenu_Type;
++extern PyTypeObject *_PyNautilusMenu_Type;
+ #define PyNautilusMenu_Type (*_PyNautilusMenu_Type)
+ 
+-PyTypeObject *_PyNautilusMenuItem_Type;
++extern PyTypeObject *_PyNautilusMenuItem_Type;
+ #define PyNautilusMenuItem_Type (*_PyNautilusMenuItem_Type)
+ 
+-PyTypeObject *_PyNautilusMenuProvider_Type;
++extern PyTypeObject *_PyNautilusMenuProvider_Type;
+ #define PyNautilusMenuProvider_Type (*_PyNautilusMenuProvider_Type)
+ 
+-PyTypeObject *_PyNautilusPropertyPage_Type;
++extern PyTypeObject *_PyNautilusPropertyPage_Type;
+ #define PyNautilusPropertyPage_Type (*_PyNautilusPropertyPage_Type)
+ 
+-PyTypeObject *_PyNautilusPropertyPageProvider_Type;
++extern PyTypeObject *_PyNautilusPropertyPageProvider_Type;
+ #define PyNautilusPropertyPageProvider_Type (*_PyNautilusPropertyPageProvider_Type)
+ 
+-PyTypeObject *_PyNautilusOperationHandle_Type;
++extern PyTypeObject *_PyNautilusOperationHandle_Type;
+ #define PyNautilusOperationHandle_Type (*_PyNautilusOperationHandle_Type)
+ 
+ #endif /* NAUTILUS_PYTHON_H */
+-- 
+2.26.2
+
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild
deleted file mode 100644
index 1938ff3e5975..000000000000
--- a/dev-python/nautilus-python/nautilus-python-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Python bindings for the Nautilus file manager"
-HOMEPAGE="https://projects.gnome.org/nautilus-python/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Require pygobject:3 and USE=introspection on nautilus for sanity,
-# because no (user) plugins could work without them; configure itself
-# requires pygobject:3 or :2 and >=nautilus-2.32
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-	')
-	>=gnome-base/nautilus-3[introspection]
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig
-"
-
-src_install() {
-	gnome2_src_install
-	# Directory for systemwide extensions
-	keepdir /usr/share/nautilus-python/extensions
-}
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
index 8258df11b31a..a393d5a236b7 100644
--- a/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.2.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} )
 
 inherit gnome2 python-single-r1
 
@@ -31,6 +31,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
+# https://gitlab.gnome.org/GNOME/nautilus-python/-/merge_requests/7
+PATCHES=( "${FILESDIR}"/${P}-gcc10-fnocommon.patch )
+
 src_install() {
 	gnome2_src_install
 	# Directory for systemwide extensions
diff --git a/dev-python/nbconvert/Manifest b/dev-python/nbconvert/Manifest
index e6cdfacf2150..3699dc64ded0 100644
--- a/dev-python/nbconvert/Manifest
+++ b/dev-python/nbconvert/Manifest
@@ -1,5 +1,6 @@
 AUX nbconvert-5.6.1-inkscape-1.patch 6526 BLAKE2B f3baf2b80321e63a261ad281c81818d95bde8f719382cb8a4b2a2d4511e7c102658fcfec9f86067bb0c296caf9b164842986bb664ca7dc9184206e2a76b20221 SHA512 880385a0c42e185f01521ee26fe9d859c99c6ba3477e5b71d292cc0f6b4998a2b9c4ec0dcff5a30ca3fce261769c3481ec320b6c0ca0e0f46dd493e72b7267b3
 AUX nbconvert-5.6.1-py39.patch 1199 BLAKE2B 7ddcc42c81e9d86007142f3f5c6ce9a88b1ead4400c1e65f3c816e97fbc707eea3bd71a5bf64e6266678c1935a678321230a30d92522f6188f19d3273028647a SHA512 f9590d808cadea8a2c95079dbfe4aac4339ecddcb204e7b57a8c62f4cfd0545d17961b01599ec3f4ce52d772175be43ad441a0ebc56d52e6332fda11110f5463
 DIST nbconvert-5.6.1.tar.gz 703233 BLAKE2B e75d558aee6c66fe8e7455ecf22dbbcd2a0698380ffec80eff15aea6c70bc853daa9ab2fd1d114453bd5dfe7e75617afb9f5c1075704bfadbb59fef34bca88a9 SHA512 0c68adcb9f28ead9ec058fc2e02a9a1e6f65818709c99f7a006a59a7562b5f5ee74afe5287e41568c35542898dc1b43c4543d2386cc05a721b3f99d5cc789435
+EBUILD nbconvert-5.6.1-r1.ebuild 1776 BLAKE2B 30fd82d8c6793a9b2240019ff0f426202e02e4638077ec55aa648fb8149f7da9ec332fdd6eec015274c3adc56074d724583c0c50fdd3de8db3a684422504ff9a SHA512 b2fe3c48448cf9d4d1cd126b367a54bd3e0085bd23a8e7183d86a1ddb4f977e76581c4f9d3078d3c3bfdc27900239abbede3a3350517b2be6d1d9770fa106e81
 EBUILD nbconvert-5.6.1.ebuild 1774 BLAKE2B e63b986fd418ce6d54ee612cc2add3ec95c29608c158c07684fdfea0d068c7920039c8a557c28027c7e038cac93a50f47ac5f2ed9b2b5134c24411c47541f00e SHA512 769089b76c9c9d8c1ef6f982198a7e3cf309aca6417f9eae1424beac9d9e97f17fd6e0c00aca7c87df75e2aed1495750a66fd584d6994b98cd2e8d15b76a9473
 MISC metadata.xml 501 BLAKE2B a99beea687357c74454ec232dea268f95e9b775c882b1ea29e196ec124e829b9749d5fbc4c585f88e46c16bc868d57a757b6f9043545bc5905e0dc86c7f0b44a SHA512 d0735c82e490860baf8ae76f78058a9981dc345d7f5b06d54bbdfd1741a7619f68dbca3386f7bba12b58df46a1125384935de85dff3ad883fb11781df933a866
diff --git a/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild b/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild
new file mode 100644
index 000000000000..44cb131fda5d
--- /dev/null
+++ b/dev-python/nbconvert/nbconvert-5.6.1-r1.ebuild
@@ -0,0 +1,70 @@
+# 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="Converting Jupyter Notebooks"
+HOMEPAGE="https://nbconvert.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"
+IUSE="test"
+
+RDEPEND="
+	dev-python/bleach[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	>=dev-python/entrypoints-0.2.2[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	>=dev-python/mistune-0.7.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/pandocfilters-1.4.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	dev-python/testpath[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pebble[${PYTHON_USEDEP}]
+		dev-python/ipykernel[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		>=dev-python/jupyter_client-4.2[${PYTHON_USEDEP}]
+		media-gfx/inkscape
+	)
+"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-inkscape-1.patch
+	"${FILESDIR}"/${P}-py39.patch
+)
+
+src_prepare() {
+	# assumes old inkscape output?
+	sed -i -e '/SVG\.ipynb/d' \
+		nbconvert/preprocessors/tests/test_execute.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing bdist_egg
+	cd "${TEST_DIR}"/lib || die
+	pytest -vv --pyargs nbconvert || die
+}
+
+pkg_postinst() {
+	if ! has_version app-text/pandoc ; then
+		einfo "Pandoc is required for converting to formats other than Python,"
+		einfo "HTML, and Markdown. If you need this functionality, install"
+		einfo "app-text/pandoc."
+	fi
+}
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index b03a77922f4d..19cbdd528549 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1,4 +1,4 @@
 AUX nbdime-2.0.0-remove-bdist_egg-hack.patch 1176 BLAKE2B 49c2d31632b8341f7fd52d70f063d8229d74a65a23058fe24410fac62939bd64adcf9af419d6f7b626d67150e54016323f33c735d7a51e80b35403dee1055979 SHA512 9d8200ebf6c6d76d3efc89ae384586404fa2d9b345c16f63ddc93d76c8ac2e17e34099bc0b2b907723f6fe096f6c56273b423263f328bc5882046488c077bbbe
 DIST nbdime-2.0.0.tar.gz 7768807 BLAKE2B a92ed166ae863185d06e4b3e667df4323b4cd9af9211999109186c1b559522f39ab235b710c7993515aa3c44a55ac3c4b90c424cdc28d04cc013a58add7d61cd SHA512 e68e69e37f6ece701ba8d6e59d8ee321ddaca78d9338e0c52f92b6942bfd3fbf0ec2407e9ae98cb820eb4c26509644a1770f249b815c53265dfdbffbe2b55142
-EBUILD nbdime-2.0.0.ebuild 1514 BLAKE2B 1302952447550212f5ecab52bb21a0e36b656c77af163596731df05d9e51b44311fbda8583683320f4dd2b003dfedb02996a71a9ba52f224766f43cc8aa39cab SHA512 0ddf533cb3c97b40d3165f1507993365b8b2b4f48886a4754e77fb2c2ce7a9253b89a26f963602ecdb8440b01732634ae8ca6b9417666807ec1310ef16bed682
-MISC metadata.xml 601 BLAKE2B eeec61d75fb90ef3e0f0dd13264d7864a204f560c047dedf6a3ddb5a2df0faffcd344127d8a7bafe8a1f2d0b6382081d56901c6f8c5e0b9e94c8d52088f29442 SHA512 27deefa922e39c76bf3b3ea96aa1f1b5ef478a0b5cf6bbc9832977cf35bce6f9c0f38bb69fd54b0a27877087aab719c34b5811a6063890fdfebab28c57d6ff94
+EBUILD nbdime-2.0.0.ebuild 1514 BLAKE2B 117f17e07d1884532145be78e4a483ef95c48a9b93108e91a230dc47b19c568d6942782dfa2a5bb611f275b372be49d8b08a9b03deed9860143f77d014f15602 SHA512 ad682cd164be21c7ba8db6c8abcf61b7a39294fbf5b0815016df2deef35cd107b72198e2eff7dd71817263a28d81033bfa45ea2b2c279de5b7696f41ee3ce9d3
+MISC metadata.xml 488 BLAKE2B 09009f9ff2f65bc42c73932d08b655510769b97ebe47999e57181765d7ef98da41f6ea7b84e266adf27e86b1f033bdb3d4b608c7628e5824a5a22316aa937f17 SHA512 efed147379fa8694f1a04b84188feae93709ea1c78c1421f32292d1f23b656738b1cb27226987b7f7e8c623e45e49eb0fa9c63ea57718c1fb459e84e7de6a3a1
diff --git a/dev-python/nbdime/metadata.xml b/dev-python/nbdime/metadata.xml
index 9038be08ea0f..e11d50abc886 100644
--- a/dev-python/nbdime/metadata.xml
+++ b/dev-python/nbdime/metadata.xml
@@ -5,9 +5,6 @@
     <email>sci@gentoo.org</email>
     <name>Gentoo Science Project</name>
   </maintainer>
-  <longdescription>
-    nbdime provides tools for diffing and merging of Jupyter Notebooks.
-  </longdescription>
   <upstream>
     <remote-id type="github">jupyter/nbdime</remote-id>
     <remote-id type="pypi">nbdime</remote-id>
diff --git a/dev-python/nbdime/nbdime-2.0.0.ebuild b/dev-python/nbdime/nbdime-2.0.0.ebuild
index 29db8fbcd28d..13f592127ee1 100644
--- a/dev-python/nbdime/nbdime-2.0.0.ebuild
+++ b/dev-python/nbdime/nbdime-2.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 8ea6a1fd8f9b..836db950d862 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,3 +1,4 @@
 DIST nbsphinx-0.7.1.tar.gz 129553 BLAKE2B 635d102804a0e9d3c649707c874d28e8455d3e7082653cb12542a5fbe9cad991815f9f577333f3850347ccad46b77e880d40581a44e1e4fcc515be1ff40d90c5 SHA512 af03272459f5cc20ea2e0abc644ce602c6be5a21c7d3e81950ca153cc6e9566e89defb6f1cbb4caa154958f3e8832d0924dcd1ba5b902d2e1a4496f5c3ac6c8c
+EBUILD nbsphinx-0.7.1-r1.ebuild 630 BLAKE2B 4bea5e0e6fc0770d39ecc02e6f7e7c638bb720e9a29105d1ec728efc50da7c5a0969878c319a6f794c38714b012a05163f74903b2c5af23a9f741f5b01ab1fe1 SHA512 2b1f603ac3109f50e01a50086b17a944e8488051455e7839522c1d8acea309dd4ccdeca06c90db68fec0ac1887ba7e2d9c8178c1f7c1744fa930295ba277b693
 EBUILD nbsphinx-0.7.1.ebuild 632 BLAKE2B 9f4a0c9125368cd69a5b52e0f4dcde41d38b7eeeb0385341c7856a0a9d7bbc34cf134680252e7e423fb6cc14879d18c7648e2e87ca0d5a953143bb7ebf075a0b SHA512 a79724d2bd9dec926bd1082b6fcc27e1a2e65150372faa952cd72d0a734a9d6877154155218cc872233a18f07bbafb6a2d00b686cfee454a424a874598038457
 MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild b/dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..1bcfd4e9e45a
--- /dev/null
+++ b/dev-python/nbsphinx/nbsphinx-0.7.1-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Notebook Tools for Sphinx"
+HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/nbconvert[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	"
diff --git a/dev-python/nbval/Manifest b/dev-python/nbval/Manifest
index 7a31aa508eea..8784b6dc49f6 100644
--- a/dev-python/nbval/Manifest
+++ b/dev-python/nbval/Manifest
@@ -1,3 +1,3 @@
 DIST nbval-0.9.1.tar.gz 64476 BLAKE2B 299f6cb9a1e28b80b2e27a74f2b6614e83e5b571b1dc27d0f6829693dd0f6c2b59845543c91487615a8621e21ac2cbc2d34e60e62b7a646914283e23649d8bd9 SHA512 8ab0cb4e09907d99f898b148b635f0818660d04417c1c809beb93680862a5ecab14b606ecc3f90eff85e5f01de7dbf10954f1edf3629a1cf8ddac00556d4d6e7
-EBUILD nbval-0.9.1.ebuild 745 BLAKE2B fe9bab2d1fd1248317d982d7cefdb99e0b5d64969240f3aebc428a020c006ae2a28a231d7c3fa9637fd8e715639f54012c775a0a0c95b8406d378ce5065107ec SHA512 1b7549d856352f0b437f5ef2f7f95e9aec25d58c4e947cbb171dc977021b06aa8f52d6eeb0ba8f0c10a73867ebc67adcf381fc398909f1d076a0f989d3ccf559
+EBUILD nbval-0.9.1.ebuild 741 BLAKE2B ea91fba6b2812224b5fe4ba5cd6a40131e9c64fc43e5497c19d9324885aea95b94d98a41130228d72cd387e051e21fec92437c1d258c774480d22f08f20abbe8 SHA512 c4378dbf5267f26d9b66b5f8cdd6c1e6ba36d116ed83fc6e3bade9698806885e0a2b1ec9802ce2e4e92d8c8ccbcf0d684b0599b622158953ce402c0b49b64af7
 MISC metadata.xml 959 BLAKE2B a6a44c85198fd92b1b26ae2b110ee4f1803d8e6e7dd55860f9aef67f57b29369c31d26d85f27de5a028551d8ce7c502a82189cd0ee2ff127491a05f0d965609e SHA512 63debd61c5149c3d9dc97a10fb4e40aaf2debc480608319158fcad3a8aa39a7f0623470fe906a78ed66ce844894780aab65d4b7a3a4afb5fbfad8dd06acd7af2
diff --git a/dev-python/nbval/nbval-0.9.1.ebuild b/dev-python/nbval/nbval-0.9.1.ebuild
index eaae713d874e..53372f1f3414 100644
--- a/dev-python/nbval/nbval-0.9.1.ebuild
+++ b/dev-python/nbval/nbval-0.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 inherit distutils-r1
 
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index dd85724d460e..dac19f35ba6f 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -5,5 +5,6 @@ AUX notebook-6.0.3-py39.patch 4042 BLAKE2B c15f7e4779cc6ccc20f837bf7867eb4ced353
 DIST notebook-6.0.3.tar.gz 14048151 BLAKE2B ad4e433accc90acc13efc8005146dd8bcf2e645c104473f0e71d8d9fab80d7e128eb4e070b8aa04aee77e0d6115499e61beb841d94cf66b0e098dc50d3916cbd SHA512 fb56d0e10da3f8673e9578cdf04759dc3247547af6be4f479e9b183f3c5bd0a891fbfede187e0f5aca5c6ffdb9cae6ada23fe6dd159aca2d9cdf967f1f150922
 DIST notebook-6.1.3.tar.gz 13806042 BLAKE2B da63fdabd1a71e4247a9e340539e688410a84c58d94049dfb7e8e3fcdc53686a55eb855687df34ff48f599a0c5aececbd9a8e1aa1d2ff7baa2a6da1b4e1bcf24 SHA512 67a8feb01dfb665bb24f3ce1b28212e9bad5a188e8cef1d168c4edaf207cbc16d516f6024ca905f75f1c27ba4890da858c5278a3ee84a4c4ac1bdbf225afa351
 EBUILD notebook-6.0.3.ebuild 2369 BLAKE2B 89ebccda62bf6c1597dd015ed76fc9cf407bc3749a013c5762a530844528288bb8193c9454f604be02791b3d349227661dac899fee2030a250bcc558867e39c2 SHA512 7c17a5b0124fb1dc6af18cb9736793ea3a9b3e5b9179e64c7cd60311b1762e5339d4ac5c023d433bc57c2abd6bec5cbf65b91e167300ce139583e0ad7a33beb4
+EBUILD notebook-6.1.3-r1.ebuild 2589 BLAKE2B ba41ae96b619b3d1348c24604dfcd215cc25f89bd8c88b2fd76c9760295f09d7ccc88910726df55d614e30a7828c02f199dbfd268277bd1decbda8b581db5a1d SHA512 293d8e2ab1e28729414f9b7acb9af2198cc74ae18317722eaaf54338123e0bb8ade5e4ea38c1e02467db77c757a80e35ae2ec1b94b896f02603f0346c069fba2
 EBUILD notebook-6.1.3.ebuild 2589 BLAKE2B 111e1f31138241640409c8e08aabe188bed91c14d73c4962f021cc55e2cb015eb0638d10426bf63df30dfe935d6a84a9e04f1d3d416694abead8af75d616f1d9 SHA512 a26da170b99ab62deac489455a4139d04086bb525eb62c70f529f5063d4fb30a3d860a28bc3ce01015c16f5eb874bf542a850062bda1039df517331ee9933628
 MISC metadata.xml 441 BLAKE2B f744bd6821b3c38aaaff373d5e44b8b84d35bb50a58e1fb6515cc580727a29240a2394c0d6a0c846dd76062905a8de7d75faf96ddb0b23a0bc05b24875918013 SHA512 4f59ae02210d5df4c6416cdec8d85931577e931e885fe7807967ff708a7c5436fe246e152f060e99b0ada2665e8a0321bd4382640680a892ad514b16926351f7
diff --git a/dev-python/notebook/notebook-6.1.3-r1.ebuild b/dev-python/notebook/notebook-6.1.3-r1.ebuild
new file mode 100644
index 000000000000..2f974c926f26
--- /dev/null
+++ b/dev-python/notebook/notebook-6.1.3-r1.ebuild
@@ -0,0 +1,93 @@
+# 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} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Jupyter Interactive Notebook"
+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-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-5.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	# require geckodriver
+	rm -r notebook/tests/selenium || die
+	# trash doesn't seem to work for us
+	sed -e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_manager.py || die
+	sed -e 's:test_checkpoints_follow_file:_&:' \
+		-e 's:test_delete:_&:' \
+		-i notebook/services/contents/tests/test_contents_api.py || die
+	# network-sandbox?
+	sed -e 's:test_connections:_&:' \
+		-e 's:test_culling:_&:' \
+		-i notebook/services/kernels/tests/test_kernels_api.py || die
+
+	sed -i -e "/'bdist_egg':/d" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+	local -x PATH=${TEST_DIR}/scripts:${PATH}
+	pytest -vv || die "Tests failed with ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index 7065a2b267ee..2f570119fbfd 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,3 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
-EBUILD notify2-0.3.1-r1.ebuild 739 BLAKE2B 9832fe02bc2d9b5a961e6c5fc0819f86a1f060e82a99a5b6072fdba33aa311b6990e2c66da774613071f7a92746e3a078d5ecde443bf7dd72fed58d2af790072 SHA512 5e1d6d1570c494b204029ee1e87bcd24fc532f82ce79517f8d6e955521ef08a6757c35123df93912e0584de8c41ab8ae9568aa19480df35dde14dbd8d9305702
+EBUILD notify2-0.3.1-r1.ebuild 738 BLAKE2B 1050c727ef34716a21e4dfeb36a9834de07e110e15c9b68c7b91a14616646a6dc604265f574c9363ad4c7f2e4bbe299a3f81fd2ec9d8f0863a188d70055bc7cf SHA512 a794212cf4033def159205a3b8d4d7b8bde31ee375eb14bb5ede368005f93415cb94a2fe3fc512b902e3338613007b44b674b5f0b89f129f01522084850530d3
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.1-r1.ebuild b/dev-python/notify2/notify2-0.3.1-r1.ebuild
index e7caf510a82a..ac2db9b50d5b 100644
--- a/dev-python/notify2/notify2-0.3.1-r1.ebuild
+++ b/dev-python/notify2/notify2-0.3.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 IUSE="examples"
 
 RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index f782d6ebe1e3..021ff8befe62 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,5 @@
 DIST numexpr-2.7.1.tar.gz 99196 BLAKE2B 14912a0a50a46c085215f0a40467371859aedeaaf999f747d735df4c244529709b26c1257d3c5c05ed0ceea801d117bf6a330dbd30573fe274522e1101e2f4b3 SHA512 e8852ed1c7bd7f7e94ce5ad78de7a8a7ca30a5873dbfa4fae0a179fbcf956b1e66f2a09c1785f0d8d9e83a5cba359a55840a21784bc225aa01915a322709d370
+DIST numexpr-2.7.2.gh.tar.gz 118982 BLAKE2B b032f00c36ffadb88cf9a4cd6323137b920bce48ec73f88f006d3186f9a8c1d75a11ceb6bd32f412cba5c10cbe3cb518cdbdb19ef022100fcc408fc82ede9881 SHA512 41946df6d642e226b4a38b11d5db67ef91d63d56b33d3b52f09377c022d236ea4e9a5aaaf380737d18405ee25109260ae60f79d0c9465b95de14465f41c40075
 EBUILD numexpr-2.7.1.ebuild 1246 BLAKE2B 1e124b05528f9319c99830af4d83c5c433742bab7ae7478d5c470ee3db84404fe46ef662dad1b19d87a241d82bfd8f92bbc6a3f8ad7ca7da49c457d2ade8d899 SHA512 865b624119189e888976b489b6f3c41c10854eea18d760a99f50d0c20a6dc4f909357c0c1e23ded979873de7c5e2dd06af0fe076e6bd5466fdc1f996c674cf3f
+EBUILD numexpr-2.7.2.ebuild 1223 BLAKE2B ddccf664be63ffb3113bc7ce3291fc0764329664d9a397655b17365c72e8f36f1888c4d560ee30838b6fcaa8eac4ce7cf911fcce5904401dc6c4488e81f9182f SHA512 d46e9ad1fa72db29b06cf3a5601aec92806096af299f59f36e46f36b8456ff66ce5a6521e73906ac557f8568e5d354d1a1a6d2bbf537090a3d356781f57a1fbf
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.2.ebuild b/dev-python/numexpr/numexpr-2.7.2.ebuild
new file mode 100644
index 000000000000..81aa1d3663c2
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.7.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( 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}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+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/oct2py/Manifest b/dev-python/oct2py/Manifest
index 0ee6366bbcad..5865453f9f69 100644
--- a/dev-python/oct2py/Manifest
+++ b/dev-python/oct2py/Manifest
@@ -1,4 +1,4 @@
 AUX oct2py-5.2.0-mask-pkg-load-test.patch 384 BLAKE2B eb97b0f6fdf6df1bfc6907984ee1b223b9ec406c831c8c7f5908d3f5e130cddb85610487ee6eacf664e2e1859c3cc2ec1f5a22072d3dcac09b68bb631534e015 SHA512 44755cfd9725ef5e4dc572ac5e17954f023c4ae0bbe68ed984e696b485cf96bb15e11ee2d0a8a4a411237d0f5337269f13767af509554a9826fe572a7a2bfa71
 DIST oct2py-5.2.0.tar.gz 436128 BLAKE2B 674bd034a44aa9cdb5fd4258c96665fda1b1d79a13ae9fa8d36d168e39385a978ed75bf8748ecdd53f57720785ea8e6c5ffd85d81f3b3c307a748fbc8d328a86 SHA512 55c2ee68b4fd73a8901fa2f7f67fefde5fa37d5070434aee03bfa2a746ff5179f51ccb96541a112e416438eb912caa81e040a5a1cbcbfac36b0285d496ac96fd
-EBUILD oct2py-5.2.0.ebuild 1239 BLAKE2B 841a92e8634f7408e365705c35074559e40a5e9dd0e280988475a5a5fa93e996a78dcf4228f681985aacb2eaca9e30c37f648dfa5aeade4900851eab2ca65644 SHA512 3c1ec1c2c18279bbae0fc271addd4cb76486e13963042bcf1625a7d48fb75a4c9b61cb5d02caccb30c06a9fda0e5124c158e371d8a75264703ca4f11feb4a120
+EBUILD oct2py-5.2.0.ebuild 1239 BLAKE2B d5c658f0c11597c08d0a8bd6620b2e8f5a03785be3f2ad4bb39c9f7e2ab4e6edfb37c4ad3b4cc4dd9a76901bb05da9ff7c00203b27d343f01b654816748bf290 SHA512 67a5861a4b1c7edf646d3b9f466f8c955fb6245beae28b34d404ab3b1401cf1225dd73a78e4452de2200e99818ac3d90c66a090789c553c50e1e5b668285dade
 MISC metadata.xml 615 BLAKE2B 32a95461360131faf43212d3e419ba75a12f853749baf7f862499155d6f445492c311860ea5ee7c7e22c5e9586c722df8382cfe2eb6f67ac7bc1596f6cb9602a SHA512 e476f193cbbdefdf56caeb8a8a501f57daf1b74a12a32c426b6e9150ea0d5b2538b7bd9bbeb3b7f45ba01aa741be2fd0b4dbf8e8302e867230fc1b2512c10ca2
diff --git a/dev-python/oct2py/oct2py-5.2.0.ebuild b/dev-python/oct2py/oct2py-5.2.0.ebuild
index ddc73b701cdc..475ad273c818 100644
--- a/dev-python/oct2py/oct2py-5.2.0.ebuild
+++ b/dev-python/oct2py/oct2py-5.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/octave_kernel/Manifest b/dev-python/octave_kernel/Manifest
index 7c9533761e3b..8eab8ef83a52 100644
--- a/dev-python/octave_kernel/Manifest
+++ b/dev-python/octave_kernel/Manifest
@@ -1,3 +1,3 @@
 DIST octave_kernel-0.32.0.tar.gz 27353 BLAKE2B da8ddb0c50c65937b4c2b803b6ecc6c5627b3044597ad21377fae9aca5e0ad4bddb6ba65dea77606741c51e435d55c83770d7442de66874c2124f63fda333ac3 SHA512 de8293bed51aca9fe16c2969a467916c90c0c900c5818d48368cd4307bc2b5f0a925f85a0c824c4789d48f72bc31fd7cb341486e70c87a0ca6bc61c799da0ab9
-EBUILD octave_kernel-0.32.0.ebuild 575 BLAKE2B 33f5d0cf9e6a57896e7e450ede27126331d423da8ddda591ef0e89984b0a02465abbd6015cbb549043f72f60610ff18bdebae24e051110cfe2a87ff19cebae22 SHA512 ea9f6c1aaf06f51a437c1dbd9e5bc3f65362ba2099d73ef2240d200ff043d8239b725c630a503964b7217cdd005950ae34d2a97ffc27f701a717dfbf85e9c563
-MISC metadata.xml 506 BLAKE2B 1c7c71e71c9a75c082a771cfc01c2ac9d1fb1cf4d80ac7694a993380952db728387365b44939b398b22a3be589caf0c696cc010ae68562fce8b62ca0463c8077 SHA512 c53f4011a2474c2295d9e3a3f216aba6711b08304c6b59da8b81bc40aa2d3bdf7911e69b23abcec4a0e5e9a3c75663f0c7e693cb2bca6c59a108393185f445fb
+EBUILD octave_kernel-0.32.0.ebuild 575 BLAKE2B ead1b15fb745b2e9c44dec2c7b45c96e583ea5f2862857bc781ac7c7d764a28a3ec1ef8907c7a4eab28f42a704f6dd397f652aef26e5a9304c0427f81f624432 SHA512 e7701732a02423b9322d02b604bc6df5fa4d5567385424e9867f8b89b9eec477a6d5c59337dddca63291304bbbb92d0b916f64da75c851a769899a43e4b136a7
+MISC metadata.xml 418 BLAKE2B 1f29af2c31afa65190dd80d2f311b00dd31591ff38e8f1fa3fbce2c59bcaebad9381bff4205c63cbd600b57cee5165ca3864fbfea308ceee14c05b570ca59fe8 SHA512 224e53302cea053e81e7be5b31fe21b95f373e2465777d5ce3816c3c5109cd045f787db41d573f6f09ae56d99c2170cd37cbe58f38638b8e0efd2df7ed4911f4
diff --git a/dev-python/octave_kernel/metadata.xml b/dev-python/octave_kernel/metadata.xml
index 9d7952c3aff4..70577f81a818 100644
--- a/dev-python/octave_kernel/metadata.xml
+++ b/dev-python/octave_kernel/metadata.xml
@@ -5,9 +5,6 @@
     <email>sci-mathematics@gentoo.org</email>
     <name>Gentoo Mathematics Project</name>
   </maintainer>
-  <longdescription lang="en">
-    A Jupyter kernel for Octave.    
-  </longdescription>
   <upstream>
     <remote-id type="pypi">octave_kernel</remote-id>
     <remote-id type="github">Calysto/octave_kernel</remote-id>
diff --git a/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild b/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild
index de26b97c2fb6..4658ee510d56 100644
--- a/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild
+++ b/dev-python/octave_kernel/octave_kernel-0.32.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index b3812c9fd08a..14367429fb13 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,4 +1,4 @@
 DIST openpyxl-3.0.3.tar.bz2 2407120 BLAKE2B 8a746409d3424014150bad797923f076ac8ba0ab24ffe0ee75c1d65f02accbeecfdc0ae5d2c6025d0fa937cf0f1c75c8837a84ba0f9d63b3778c14c2899df4ba SHA512 7a17a21a4f3be391e7ab72ef6c5f6342094404f68a9e9ca69f874f1ac2441d81699b91224cd1ccd4fe3e7e5c99ca59088ee532bbd2e6edcab40c27a8f1898095
-EBUILD openpyxl-3.0.3.ebuild 802 BLAKE2B 435588e4dedea47bdf08abcbe46725ff78e962a859bcef3aa17e0c89e5e30c7143ecb21577d105398f4c3be1c72db5978a0308939aec8a931101381c1a8fab62 SHA512 f8c9b0f7865d4348d21fc32a7a3df61ba13ea278c725b83a50f1f12e7d6b295bd727f46286549facb0f8756a8de2bbfda46d495c0b6c6f83b1be2c6bcbc07482
+EBUILD openpyxl-3.0.3.ebuild 809 BLAKE2B f34bb1d7060b8d473d5e8488ff9cdffaab550a648109450f5b17ea37b97dc6551e31ade741ef8f78c40dc446c6ffec21db0b919cb878853d5ff53988620103af SHA512 7d171ddb051943e6c15b3a0c833dcb3ec58a333a64c0d5bdf7d001c9b917c25508d1f8b04cb9e1033ac360069c334a9896dab788af2b7d9fa6feba32c1656697
 EBUILD openpyxl-9999.ebuild 744 BLAKE2B 83fc282e5d97b801a2dfaa72f2e10918ce74ff4beadd3cd1b3235e60847dd8e38ce9289b955a9e9cc4d29b47d01524b36c31b902c1779926c6d54c4bb7e72ce0 SHA512 c8a857c719be0df90775c3709caa816e456cd1f3466931c876200d04c2bcfc1c3f90599a60f366be76364a870ae5d838cea964d16949fdf9663563364dee0584
 MISC metadata.xml 519 BLAKE2B 29b675ac6f0a0e38ae80b3f3f9d1a63bc2027f7d7def1f9dfac5fcb36cfbf19115eb9cbc94a98f1b99eca7557fd96b3d8c8c1aa00f67800de497671fff0a809e SHA512 e9d571588fa37161b57b5a65739ba59a9058392d1e96f004193054ac0605f1a144be1e0d1ba4b199fd1f49365d44e568b8ab00f3b051bb2a736c0c5926aa9f44
diff --git a/dev-python/openpyxl/openpyxl-3.0.3.ebuild b/dev-python/openpyxl/openpyxl-3.0.3.ebuild
index 19752acacd70..2b37df035a2c 100644
--- a/dev-python/openpyxl/openpyxl-3.0.3.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://bitbucket.org/${PN}/${PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 RDEPEND="
 	dev-python/jdcal[${PYTHON_USEDEP}]
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 00a0e8837bb0..bf7dd83edcd5 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -3,5 +3,5 @@ DIST pandas-1.1.0.tar.gz 5211071 BLAKE2B 538e7579384dceb29f1761e00181fda4f07556e
 DIST pandas-1.1.1.tar.gz 5213685 BLAKE2B 6604c7def761f8eef4596a9ad6c1afe1f59fdd6181f9cdc9edfa97939a9e668e745ebc0abd8664eda4f864be54740d46e4aa10f32728306b897e397bd6e1f682 SHA512 db93e66956d832da594f04aaa5cb895ea22f66acd0e97ad76f22153f9e872e46845dad5b952b54463ec8ef3e2a73a766eea8d53e980a5508e3a3346429a07999
 EBUILD pandas-1.0.5.ebuild 5703 BLAKE2B 8166d35533d3e445cc1a9cac416ad36e4218b2a7cc3482c158a18d646109752eee9c4f7fcc1f400e36b1021823adc2a4c5b9e8c71d9bed6c582d15cb4c9597e8 SHA512 4f71c014c4903b70971c14c77e1d1b2cc4901ebf941d95d7e62d691f469f28136a3b640ec6b91d7f93c06523cbfe7c262025822767db6b9ca6b0a46f8fdfcd22
 EBUILD pandas-1.1.0.ebuild 5746 BLAKE2B d0819597a8aaf55e162ac7b3667a4b9aa020520c79ab3b5c063a0bb06fafebb10f176fa56c2e3256029e8aa59f1252692da8143a3e25a2e515cdbddd84f552ad SHA512 3ca6b4e8753037479a9dc7d9e912418e3bc56cd55c96f5c85b0d82631aa9dd47c2ba56a9ed0723b4293e4cf426339103bd2bc2d0006e02d9ff537ac9e5a2d79d
-EBUILD pandas-1.1.1.ebuild 5936 BLAKE2B 6d263416a5ca5f2f57ae63a650212cae374c6bfc3da890239ed023caf189777254a14b34645ef80d3980ea7b50b308508817d6742e9a639061265363f9867ebe SHA512 dfe218d820824e65a1df1fba5d9e7133bf3f081745633687c69513b5a17c25080d990cf94739dc0c5a249039c04289775c44fcf8354a0c66be954f47f79bd05d
+EBUILD pandas-1.1.1.ebuild 5943 BLAKE2B 077adad2e53abed0d99e40ffcaec21b09228d1dd548816f91f53bb9fd1323460d717b7a6ad52e08d7f1c09a42d8fc5a72e77eda66edb8bba2823355e0b81dfa0 SHA512 c2266494fe0c851e911bc7c7bc11ebeb8e8a42aafd79da5fd4d487fb1d27aa7ab28ce97371169708e87389e7f6328a5be28fa49e2dab1a7d37611c8a3caf7693
 MISC metadata.xml 834 BLAKE2B b075b9c90c4f1be265117df2c47ace4c86dad3fec9945b5a483a11048211348ee10e433f378610de4a9b599031914b32992b9fad693b832cf0266b0f171b3e38 SHA512 85ad67a653f4ced5fb9331b778fb2906c253874cf8e522f1b67547ef8e2f49e084e84d9e055aee7e2a57c6e6e4e7f7791a4ce299fac7c74dd6448a94977e8f5e
diff --git a/dev-python/pandas/pandas-1.1.1.ebuild b/dev-python/pandas/pandas-1.1.1.ebuild
index 28940d3da4de..92a7859edfd7 100644
--- a/dev-python/pandas/pandas-1.1.1.ebuild
+++ b/dev-python/pandas/pandas-1.1.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 485cc43125af..52ca9bd1c215 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,3 +1,3 @@
 DIST pgspecial-1.11.9.tar.gz 45009 BLAKE2B 3ae53d4225d448c3291d6701caf7388023d140678461a5811673c7cc7ed242fb0c18ea38427210366f58f1886894def348051469c23aff20be7abc5e5c96622f SHA512 b07083ed715a6ac3d1b32ac954b83852fcb154f4b2757fae91ce7c35524576fa8caef5cb7201d313eac783bc956ea89c9d68f099a11c332486d677dfb185caca
 EBUILD pgspecial-1.11.9.ebuild 592 BLAKE2B c548518a8ea514a966c18745685cd35ab84ca681b83f1a3b32eac83dcf665fad182a8b2f745784bd3ac864da9a3422f8db291004becc8ee95a148ce08882cb61 SHA512 d95232a3a5c7773045a725b5b06af4c3370ff8a669a0a725bd6b2a0743cec4239669d41569f8b223487bed6447fda907ee74a1d676a2305acb2c24f0b1de1596
-MISC metadata.xml 467 BLAKE2B 4a1fe580d03eee97746d0b3f25ae0f33a693c5095fffbc30e41edb78b5cf48d4e8d39e1bdd6764956ba675c282548993878455177bb766d9f5bb333630925c25 SHA512 fa46dbfa82bd12f191d99d189a2286da31cbc42346df1072b3f445bcc1a79575a8adf17ad79cafd0a5a4a17fc7094a7f3d2e5fac642b2ad61ce84a2299a13f60
+MISC metadata.xml 252 BLAKE2B 3ef06410049f2fb424b0c05625f4713d633f0f56755817017edbb6dd335b73ea5f7d74c9d5dd4264ee1afbc4b44e425d062d026a12da84ccc1ee764e08de2036 SHA512 c4cc955c7e074d7173b983b935f1c1628d5d90c7eb640a7663b87509c8b68668cdbea2cae7b48add16ebaacb00dd178281b5793c181dd719537cf8b7b1412062
diff --git a/dev-python/pgspecial/metadata.xml b/dev-python/pgspecial/metadata.xml
index 97b02e367775..7afccfdce85b 100644
--- a/dev-python/pgspecial/metadata.xml
+++ b/dev-python/pgspecial/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>linder.gabriel@gmail.com</email>
-    <name>Gabriel Linder</name>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">dbcli/pgspecial</remote-id>
   </upstream>
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 7e858f4a0ecf..0b5c7abb37ac 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -5,5 +5,5 @@ DIST pillow-7.2.0.tar.gz 39125407 BLAKE2B f49015922c34473590740c9fa63435f85f9a51
 EBUILD pillow-6.2.2.ebuild 2648 BLAKE2B 759c37375cc6e360927e58a039a3d10f4b36e177553e05993cf685ec001015d956599c1a8fd6d94cce86522cfe0f8016b0fc7c9e35b90f42ab35d6c902a1609a SHA512 ad0aafc5257de131825fffe2aa8f18be67207ab7282f27a9b443f7db457e9a4f913fc5d4ee71f5ea141b96c5250e9479f85ec36de3f6cab0593935a1ce7ccf98
 EBUILD pillow-7.0.0.ebuild 2638 BLAKE2B bc13ea32fd5b0a25aad6c976bc4776ebadddd6fd778126e0995391e684bab49aac9c8681face6a2ff9663203d820de77a9c18b895ab6ccf48862ad153cc01225 SHA512 a709259b589008d5e745b6011b10f503db7664fd9e52b858e3c45ef91e428b531bf461da9962a2807a5c0058980cbb7b70e0a22b84aa624ecf9690075c202ff0
 EBUILD pillow-7.1.2.ebuild 2691 BLAKE2B 942d0ce65a6668f64fe150a0e45d41697a3b7cefab69c0accd2e431afd554a45d8aa79aab8c021af29b240ea6c48e075ddcbd06fddea43b54f63583d05727816 SHA512 b660e43ba44341ac0af2e99d2416348a1f85373a5f45b5bc4b87a99f83bb2029858c41e31236fedc56c601032bce1e9c62efb64f5b1b750c5bc818b89871a821
-EBUILD pillow-7.2.0.ebuild 2700 BLAKE2B 56f8080f2c77ad48d8d9e97a043e0be600f0c7aac4321a34c6a2084177c04ab4cc7d615b7031371b813c99e7957819938ac7d4126cd589bdc3b444e60f9a6007 SHA512 afb654f288949831bf8cb466070ee63ba9408e8b20d0dcb1cee5ef72b55c2dd51d6b23c52900d75ed626aabf931be8ad82fecb0db947b3595070b998cd1aa3de
+EBUILD pillow-7.2.0.ebuild 2697 BLAKE2B bf8f2ad857e8861f9c16f634b2152cd09d3ad5267a91b35fdab56c53cafbab22dd30ba23270c075cf3fd29d8987a246483e6a07006aeeb8666e57a7faf662cd4 SHA512 5e308b832863c2db20bb2eaf4f999afdea3857f0ecda813f3b115c5199cda526ae0a62beb46cd03b22e4253569d4faa86d26fc25ec4264fa84abc906f3806ba1
 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 aa9699f8eaf4..7f1a3bd72f1b 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/podcastparser/Manifest b/dev-python/podcastparser/Manifest
index 8fffd57d0efc..0247ead2ef19 100644
--- a/dev-python/podcastparser/Manifest
+++ b/dev-python/podcastparser/Manifest
@@ -1,3 +1,3 @@
-DIST podcastparser-0.6.4.tar.gz 22446 BLAKE2B b6111251c6ce325a91e763402d7f0a6cfd137491939dd581e1e4f1bb2458b741fee0a61eed009b61876224722fb4e43d289b2a294e02bccb724e2f0337786884 SHA512 c63065aa822b0210891c3316fc592591bcc962e16c52a86815637634ad5f02d3f559596e3727d56d191c454f28320e21ddb469ff8473fc99f57ea830fb046b2a
-EBUILD podcastparser-0.6.4.ebuild 378 BLAKE2B bddda81fea7c45709c509ffa0555de1a970afc80961b1bdab7362284f0bf52a31ea04a87db34916212af85a81aa23ac1bf1206df5e70884240bd528872217b23 SHA512 2143cb054fb4e644ab849e7fab84ea68acbd97196b50c0806204fbf5ca3c1e8942f43f73b9305acad3db7fb960c08e148c282c3674c6a07d40d654f78522d741
+DIST podcastparser-0.6.5.tar.gz 22232 BLAKE2B 1fcf115954e3394aede643ef28ea7eb13c2969ad3125f82dcfefbb457d61f768247d07d3150fe8adc7aeceb9bb9f0026a2e55f42b3f2a6da76b977528ebd013d SHA512 770d2376eb7d029dc033f46f55d00e02b8040c72c670338ad52ecf065ec4ffd291c6e2ec02cf9b038f8608c7c549808ff14f95017f508bb1526bb79b413e136a
+EBUILD podcastparser-0.6.5.ebuild 410 BLAKE2B f7cb1c4f0c7a7d085ff711e8cee8d2015662441d548368b9b334c18267e5a3cd75a7ab09ddd84fb8a4a7721b02ba5bc1c6758ebd0436f7c81a1aab5e01675f8a SHA512 38138b80888c0421b79d5de4d9ed79b7dd0228dbccbd54955b4f298ef0fcfe602100b4dd72052ce30ab8c09b22132b1b04cf4a6082369ccfceacff8c4c892336
 MISC metadata.xml 259 BLAKE2B 7339f463fc3fa87e1aba5665d97d0878dfd0ccdc4570e76adb531ce80090b0fd0eadf7ee78e3d081cd48083a800c5ecb395255df40d35f8745471346cf07ff16 SHA512 7315c86cee93f8109e30dd379dde35c51ad60e759a037cc8ee3feeec369434d65fecf785480861e7fc6a17baaf81517083284783b4b35143c911da98846d0360
diff --git a/dev-python/podcastparser/podcastparser-0.6.4.ebuild b/dev-python/podcastparser/podcastparser-0.6.5.ebuild
index 7a426e3289a1..ac7b3cfae0aa 100644
--- a/dev-python/podcastparser/podcastparser-0.6.4.ebuild
+++ b/dev-python/podcastparser/podcastparser-0.6.5.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
diff --git a/dev-python/pony/Manifest b/dev-python/pony/Manifest
index 02c0a4164ab5..bd0a924bd9c8 100644
--- a/dev-python/pony/Manifest
+++ b/dev-python/pony/Manifest
@@ -1,3 +1,3 @@
 DIST pony-0.7.13.gh.tar.gz 302541 BLAKE2B a1e6f82c6eb72f8626238cbfcc0bc01d1ad3498a75a5ce4c3b8a4511e6d1fbfdd39a239f0462458ae1d64dc9446b338bbaea33d6bbdd861c8d0738e50d58a717 SHA512 431d19e3297ba1cdae5313948123d8b8cd71ee8ad5868b8cc2f5447eb435875fdbcdc3768834b9afe22ce8e4c1abaabeb597f3e6974b00aab33aa61e497d6390
-EBUILD pony-0.7.13.ebuild 549 BLAKE2B 5a7fdeb57931b5e3b0869809ab212b4ec6fe1a5ae4bf8f717c1dde806fb4d81cd0e4934f1cc692ee9b30ef618fa69b4403fd0ebe37f3a91ca8ff8cfe7b35d6d6 SHA512 86fddc0b251162f6f87e5bed7f5f75003d7345528d1cda877cff954336bc88bd6f486c2fae38b139e14525b789c8c96cb4b1afde4af3566e9721ff0fecf7cf47
+EBUILD pony-0.7.13.ebuild 548 BLAKE2B fcb348cc8c3f8019cd9cef72bea1220d7715149b1dc089f876721267bf208724840a5792b888253a9ab0dd039102ef36b962514a0b6b2496782e2f9693572131 SHA512 5217b7a96c0f1f61974694b03eaca7648371ab26032d88a6b60f502d1b85d6caac63a8483d0a5b277280f72bf05ae63bbf3c2fd9c29ba6492fddc2060d439642
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pony/pony-0.7.13.ebuild b/dev-python/pony/pony-0.7.13.ebuild
index f5db45c4fdd2..a0c95cff3085 100644
--- a/dev-python/pony/pony-0.7.13.ebuild
+++ b/dev-python/pony/pony-0.7.13.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index ec8fcaad4178..ee1ceb334500 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,8 +1,10 @@
 DIST prompt_toolkit-2.0.10.tar.gz 347981 BLAKE2B b95cf000d5249da3710f9b51f72d41c3d552f1d3a35dea5493f565f0f62998d890bf2b81b3376140a4d16a19f2c5fd60eb0cb5f2f58180c176ef1543c6fc4ec2 SHA512 b91292cf43607b3a7018ca29827f0aa9bc90efc064c68faffe02ad28e4bb60f45fc2d25bbfd9a40a383a815cb08596975f08237a498f94a5c088d56d3a0a9803
 DIST prompt_toolkit-3.0.5.tar.gz 2999763 BLAKE2B 6c4c32583a363daf562d4fa29f697c3d38db1b84130f26167cae52ae90f5b34111a9785ed569d3bdb4c185271ef1a075144d1c53b46184c136e5f1af4713ecce SHA512 fe6cfc7223529b77bdfa34dbebc8f5690ac6a1d0082cbf3f03f49598408bcff082697df1bd7ee427c796fe0c8d73126a965269e77ed0e6f1519b338b464995a7
 DIST prompt_toolkit-3.0.6.tar.gz 369730 BLAKE2B 84f5f578a6ae5b8dbbf0ca244a2d3dcb9ecc858ffce3ca5e657f85705c9090d32abbdddcadbb8e139d980d87f279d998db874551be93c47b4a740cc3d2e99c5b SHA512 44c47f8f331b7fca3fb9449cbb9ad6b2703fa83bff30274cabfd888c1d149b1f2305f3a08cf53143c86d9889096775e776272ee56aeb1f3664a8399a4eecae08
+DIST prompt_toolkit-3.0.7.tar.gz 3018359 BLAKE2B c1d1f897a422df599d2bfbbfc53851489bf9f41a7ddb57fb1a03cae8411a7468bd047423922a5e95dcdcfb2730dee38029bdaa15eb7dc92ff47066b4b6edc6cb SHA512 3ee4cf65f175343273eb2c1b76250b35430ac3f3ee7cc61bfbcca86a717fdaaf74c723dba400d872b47b06883bed959b166df33b8960173beb466edf9266ff43
 EBUILD prompt_toolkit-2.0.10-r1.ebuild 595 BLAKE2B c30f5cbd5592319af4dfa452e8c7e54dea3996375710d0c63cabe9788728d2f641e815f89671ca8cd465a8c97cecc07b8cc446c6762fb1411347aec37eddd05c SHA512 f720ff243b56d393ae3e04c02375f4c5b9a25c2a0f0db3dea33938fcc1f30f83fcf467b33626a70f67ed3f85519d22f7030dd13a6d9a01d331b7ee554ae36109
 EBUILD prompt_toolkit-2.0.10.ebuild 594 BLAKE2B f754b76d11c1ee8b0919afe8da1d5ac2c0945cf710ae3946fdaf0be40901a60b37d66731b662474db8344cc6c1a52dbfa733ae66937a27ea24c12194d5650a0c SHA512 13c1ea9b04779452608c589e5f0a9201d8b0c1524f0bd0274763e54b40e3b0a4ed4383a3054a2f0ff501521440b8460ad934e8b7726292ee24a065a7cb2901f4
 EBUILD prompt_toolkit-3.0.5.ebuild 594 BLAKE2B a66ab8284b0d700727220737c34176c50d54bebbdc03f0f1f6c0ae3d536b07a9006a1f5af308bee829c66ddb577c92a1fa3919570243696006b7f9e82273247d SHA512 1ab3fda1b4232ebd0dbdb0aa24962de97c467ad96477d8e5ae9d343bb772b8ec66f983748d97852d03f0abe2ed18e53cbea4c76a3460f3a7a68f002191793e1d
 EBUILD prompt_toolkit-3.0.6.ebuild 598 BLAKE2B c1f6330a4ed45ac7a7a0261177ef49d58a82b01caaad41809597458e9926c8d9a24babcf8ec5ccd1a80f0b945a5b4902a69a30d7db566674377dfafcd0286296 SHA512 3aa3fc5300ec41bcc04bf58db1db4c29f8ae43372c0f482aa549edc10c8e44f9993eef0ec567f060fa13a0a1de2a318755b988224fb46e832be3f1e958b87d60
+EBUILD prompt_toolkit-3.0.7.ebuild 598 BLAKE2B c1f6330a4ed45ac7a7a0261177ef49d58a82b01caaad41809597458e9926c8d9a24babcf8ec5ccd1a80f0b945a5b4902a69a30d7db566674377dfafcd0286296 SHA512 3aa3fc5300ec41bcc04bf58db1db4c29f8ae43372c0f482aa549edc10c8e44f9993eef0ec567f060fa13a0a1de2a318755b988224fb46e832be3f1e958b87d60
 MISC metadata.xml 430 BLAKE2B d305130506a3f60dc1310ad008708b382100142ea6cbb50003b627858b85c86c151d2ba37e32b81f228c4e666be9b6a5d6ce499ac43a3776b113cec43c6c8470 SHA512 8b7f1d7f5a4b9bbbed80f1db3e4d79a7c9142e73790b4723d4ac4000eb3601f75310bc80436b4d1fe898e3468c6f695dc6d88b6570068e7fcdbfd00d19195d17
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild
new file mode 100644
index 000000000000..ecc349bd3526
--- /dev/null
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.7.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Building powerful interactive command lines in Python"
+HOMEPAGE="https://pypi.org/project/prompt_toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/wcwidth[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/psutil/Manifest b/dev-python/psutil/Manifest
index 4984711d91b4..611597f9950e 100644
--- a/dev-python/psutil/Manifest
+++ b/dev-python/psutil/Manifest
@@ -3,5 +3,5 @@ AUX psutil-5.7.2-tests.patch 4427 BLAKE2B 8b2847eb445eb39080123dc1018ccf8c68c0ce
 DIST psutil-5.7.0.tar.gz 449628 BLAKE2B 3bd07a0a2f95a539910fa1cef92e72d168c3ee7a495c0defd3fad307d96448d81182b7ccc5e4388d6726495a18df26b076e27b3cbf57096a5c3c8326c00f2dea SHA512 8cee64ab396dae79866e961aeabdb9a4174e1339bcd5c0a35f23fee97ca2a61c0cb08f7152d7e0db90c387400c5c6fb3da2dd2124ce9bf97dfffe6f3b4967981
 DIST psutil-5.7.2.tar.gz 460198 BLAKE2B 203445423ce5e0ef35bbee00a7160a282401108c161efa58febf0e84efeee1b9866e34ceb230bfec1b177a540558f2e0c9a55b1ba4e0b764e494553d9f0a5f7b SHA512 b0c9b6bceffc031b230d656f76eca555e5cd481d8dc70de1c6068ec31f1ffd74314aa35c8e11903901f58c326152128749ff9525064ecca117df258311d27320
 EBUILD psutil-5.7.0.ebuild 1295 BLAKE2B ac185c61234ac07cb4fa62d8afcd4546dd7eb882a0c96928ea4c64c743519f7f2f589547b849dbda6998f0c8869466cbcb82591f2fee66eb69546fa9f1475c17 SHA512 27ebe9f0471435c11e987f6b7a67ea627882faa0f379a3b2b6a493421a39b11ccf2fd3ffb21a6e637f73599be3f3616e31b6d39472d41aff6b3cd9d20e516310
-EBUILD psutil-5.7.2.ebuild 1304 BLAKE2B 850eb9dee1c36230987f69683545c48410e71d81ee48c768248cbe828241c768998032dc31d7ab29a64abc333fee1c57655a50e450199eb23d7ccad2fcbf720f SHA512 fd3f9267611bb3c4e270e1938ffab8ee09e169324e2ab64e7ef682598418574735d40241a21e34047d7bf93d80fec9ec5c46b960391625b5925255143c9761ef
+EBUILD psutil-5.7.2.ebuild 1346 BLAKE2B 2904016593d1709f2a06331e54e5805fe3bc2c3acf061fa6d04e46a32dbd4e24268ed40747ff8c65e2b80e4fe52e75bb538b4e35564f6c4fb48a5c17f0acec09 SHA512 5d3073e9334b2ccdaaa13cf0fa818de36d16540a9cff9d08820371b641e9f409cf5c013edf22ec3014cbf24553a0ae61ae2906e0c8658a93e7899c281af6b723
 MISC metadata.xml 377 BLAKE2B 0e671ef95025f24d295ceb5c5295544f4d68bf94459537537e229efd273bbac058b385fa94f1fa1191f23785d2572a5960d84a1d3ece41f10316b38101cb26d0 SHA512 a28e7a1e32a0b2750a4f0956d2252c73d20b4aa9817aac2e776365febd7d03de88e88508aabdfc29ae15d8bf7ebf1ed662c000e2ca8c79e3d50a3362ce1c2d2d
diff --git a/dev-python/psutil/psutil-5.7.2.ebuild b/dev-python/psutil/psutil-5.7.2.ebuild
index 9fd49a5a2ae5..1a02f15f462c 100644
--- a/dev-python/psutil/psutil-5.7.2.ebuild
+++ b/dev-python/psutil/psutil-5.7.2.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 		$(python_gen_cond_dep '
 			dev-python/mock[${PYTHON_USEDEP}]
 			dev-python/ipaddress[${PYTHON_USEDEP}]
+			dev-python/unittest2[${PYTHON_USEDEP}]
 		' -2)
 	)
 "
diff --git a/dev-python/pupynere/Manifest b/dev-python/pupynere/Manifest
deleted file mode 100644
index 492b91bcb162..000000000000
--- a/dev-python/pupynere/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pupynere-1.0.15.tar.gz 8566 BLAKE2B 1780b7c17868b77c294da0f81052077be22b72660b472a29641c8390d34a608fb0dc067fe942dba764dd5735ce034981c9b5e3b47825eb3be9ab94e46a71d972 SHA512 55b25ca4fb511d80b5eb11b8aa63949c80e9dda336ed1ad406314bbda669ee4ef836a3e01b71065eec0cf0b8556ef36c815a299a5620d50983074a2ff55ca5ba
-EBUILD pupynere-1.0.15-r2.ebuild 700 BLAKE2B 5ff9a8963e4da4aea5ed204771292878cfc328ac77e17548e13d46bfaa96d8abf9f8fc9c5a38c1778366279124070a5fb79342fdf9ce4957c311874f859a1080 SHA512 a31ec45a48bcdc8c032606ae7c3ac2545c6afd02437ef5aeecdbb8efe5303a21d5f46c3375f5f0c82e84f8a6da3292b0d69a8a008ca9f65af339279d83e32496
-MISC metadata.xml 500 BLAKE2B 27412e37a799d7931fb1f7d5dc712db7d6d25f44e166d7a045c63ed3c1f978f1dbbd15facea31d258154f6fe689cf148fee71acc33f6b653f4b9d0388c51ce44 SHA512 7aff7144c2be483bf339a2bc43fec68bde804bc43b1f13a462bd7cd617b53884de2791b6a3335fd90b38d01ce081b1246281d068254af0722731cafa17381e91
diff --git a/dev-python/pupynere/metadata.xml b/dev-python/pupynere/metadata.xml
deleted file mode 100644
index e6468d3c792f..000000000000
--- a/dev-python/pupynere/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-		Pupynere is a Python module for reading and writing NetCDF files,
-		using the same API as Scientific.IO.NetCDF and pynetcdf.
-	</longdescription>
-	<upstream>
-		<remote-id type="pypi">pupynere</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pupynere/pupynere-1.0.15-r2.ebuild b/dev-python/pupynere/pupynere-1.0.15-r2.ebuild
deleted file mode 100644
index 7f70dfe14fc9..000000000000
--- a/dev-python/pupynere/pupynere-1.0.15-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Pupynere is a PUre PYthon NEtcdf REader"
-HOMEPAGE="https://pypi.org/project/pupynere/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	|| (
-		dev-python/numpy-python2[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	"${PYTHON}" -m doctest -v "${BUILD_DIR}"/lib/pupynere.py \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pweave/Manifest b/dev-python/pweave/Manifest
index 8d603c743c07..cc1d93b95800 100644
--- a/dev-python/pweave/Manifest
+++ b/dev-python/pweave/Manifest
@@ -1,5 +1,5 @@
 AUX pweave-0.30.3-docs.patch 384 BLAKE2B f965c866a87e4ba7084767e73113d119ca6c1c7ce5d184d843f84cdf9f3237038a2192aa41b834d9b39f584ee5294d802857d1fb0f2d457721b2b82376b00215 SHA512 7a4396e2383c630e1bd8cab770952e8898be157b80dab23ce0f7cabcc1ecda4bed9a9cb4ad46d48e521b05de7de324106128d281ef88e06735425cc430f43717
 AUX pweave-0.30.3-rm-online-tests.patch 3991 BLAKE2B ea2462239edd8cf029a308a0fb3d3464a3932d6f714e7d6501730e62deb6b417482c5dc67a023c467d3efc1456674f0d31fa96f585ba9d81943e4c9dcf0aa875 SHA512 74f496bd263d87b9f63293be843eac78c40c6f66de5b493afe8aca893441e43bf02b157130b8252f893a928c8a03ac6b7594ae2876b4af1c1a2745e0aaf8d3ba
 DIST pweave-0.30.3.tar.gz 2173323 BLAKE2B 13aaa70d424026e58648ee949d8046d1f9fdf6e402df018b120dbb235c7b7a29846cb341aba1642c97be5a8ebafeea33a71be177f92498db186e8044624eebb8 SHA512 d2ffc2a6921837eff471041cc13789ac370d9e00c8a66f451ae53859c110c838e360b4bfd820aa33656fdf509cda8dc24a1d2c1bfcb44ae99de751726c33b3ae
-EBUILD pweave-0.30.3.ebuild 1367 BLAKE2B b34ae0b2b0b1f64764580a42d60d082713c90c6feda7afe131562615ff67c5f62ed655a711ec042e56ed07abf3bd204cd4472f0212ed00ee435b2edb192a4ce1 SHA512 4a70b62ce5bc87e7b25462d485424b26bd8961198c391793078727b1006e011f770bdef84f55a4b28d98335c6b6fa6553f3d2d4fb0df4b1cbb715eb5d95b7212
+EBUILD pweave-0.30.3.ebuild 1363 BLAKE2B 630b7131320b8a04c626a9ecc2cb88d446c116db652de839c3f0f752de2534c4a43a5724641e22faf9f1d463984fb64013b38b2c63f7cc5d0d5ee60cf1dc0e36 SHA512 12b1922d73b4102d10e5d8988b1ea5c14ac390fce9adb7ed6830083376e76c19fbabc064b39f94a2596dbcad507bb6040e3e3a1307b11b5fdfc8a2a4f561a7ab
 MISC metadata.xml 375 BLAKE2B d5aff616cc3473bac743c6d809eba454c54e2fc1514a115be5ae1ca11be7de212fe72f2ffeb520db05a11837d8ff93daa1128cdef7867244b9f829d8e52e6214 SHA512 c00656e8233157fbe266e364bc10a6b351063221b27a73d43add57a50d00beb2e540b491ea671fcc4b7acafd97c4a5e56c73a9937aab64ee2d79d553fd0658ee
diff --git a/dev-python/pweave/pweave-0.30.3.ebuild b/dev-python/pweave/pweave-0.30.3.ebuild
index 3cc22bcf1260..f85db19e41dd 100644
--- a/dev-python/pweave/pweave-0.30.3.ebuild
+++ b/dev-python/pweave/pweave-0.30.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_7 )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index 215cbd3d5eaf..c6ed737357af 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -1,5 +1,5 @@
 DIST pyatspi-2.34.0.tar.xz 314060 BLAKE2B 1d2c390c6f110a37e9553b1f1aeba75fa0585beabddb2d6db54aa8fddc671b844e7c670c7fdf9696e3833c8f9619dc8a2ecc364019f14703647e7996033c7dd7 SHA512 61b157f067e23b7a964cf8268f556ad059982f448e436ecb25c96915ecb53918c6ab7b29bfb4e7b85e25e6038e27678fbd3d0bfb61d14a038ab5eaeee1f682b4
 DIST pyatspi-2.36.0.tar.xz 315076 BLAKE2B f3f92dafab68ce003e9d63f8ebf901ef834eafb1fab3ddd2051dcfb308b79d7ce6fc4d9187ed51f3af8bebad5e6ef2296c19215ee209ad37fe717f332af8d8f7 SHA512 709236fd992f570426043e32b201bdfee06bb28faa3d1237778f4069d3548b88b8336e53c0951359f5c7e2914b90f6f682ac58e33c84e32f360bdc32662800af
 EBUILD pyatspi-2.34.0.ebuild 1232 BLAKE2B 43516e905b00fbf3686785c5f92c7f6687e8ad7675a81b515a34ef32c4aad5778c8caf28f4eaaaf1b0bbf56eb1c71517ce274254ec574c46d9c4d2e5cf57bec1 SHA512 fac094885ab5740b5dd759cd0fb32e98d412074df535797877ef09d884865e0c58eff5d454144d30fed4a0711d99bbb6d6de918590751ec7c68230654c457bd3
-EBUILD pyatspi-2.36.0.ebuild 1364 BLAKE2B 32d21c209bab222a89310ba3913d13f31637f3d50fe64ad1834e9c02bbbbce870b2f0337c97460aea5cca535fc3f4461b0c57d2ee37712362f4aca30eb867e6e SHA512 79b4200a1494060b2678c87347cc68d3d69b1513760a814f7bba0b90c63e0f7ba35587bbabe4fd49d445167129308ce2e137acf2979e2a6de768cf597c0dc710
+EBUILD pyatspi-2.36.0.ebuild 1362 BLAKE2B e0324ad84d5f7e33e80e17be002f21d3f72890285582fc8bb55dedf5839e45e0b49b8ab0dcddcc27d9b7b4c02b849ff38c06c551875a34e9832eafd36b5c070b SHA512 f26e07b2c896993d6531035baec942368b7a495be7324cded9ed236bda1a928aa2d8e8b911d1c849fe34d727e0ef809a2536d4f7e3a5d4e8d57fb622aeef755a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.36.0.ebuild b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
index 3e2dd64de8ae..4c5230acd974 100644
--- a/dev-python/pyatspi/pyatspi-2.36.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.36.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-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"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 9944a805d213..dc4fd91b43cc 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,5 +1,7 @@
 AUX pycurl-7.43.0.5-cc-cflags.patch 1145 BLAKE2B c67a94b7ee13c784d8ddd3870e00e5b0963228a0ce0080b6dae0b0919ff5cdf17b2c51112586e9e7ff1731862cb40a040edd158f551d4278a286b2af7895641d SHA512 b082f1987ffe6cd61b17fed260dd039acad446b597eb43d060cc9115c36fe38e0b1e61e69e81d725061f589c2f9aae76a4bf68f07c68bebd99d4b5c2cbe9d530
+AUX pycurl-7.43.0.5-multiple-ssl.patch 5530 BLAKE2B 2a6657c417ccba6d42cefc79721170c6990ef73c85361e31fd6090dfa4a8bd0a74f78343a46032cb550ace7812c5101b587aab24a9b7cf06307f24b1bff879a3 SHA512 2a0c49a95e922414b37ed60e133aaded631cf7b10d10b26d69b2fd083dc991a5170b56a1f28fd9d800c77c331f35dd6216a71699af638096a590f1d03c17bd4c
 AUX pycurl-7.43.0.5-telnet-test.patch 1561 BLAKE2B 640203da8a9b6a13cb5fce187c6699127d8492f0e5ab3a9b8d540b458416a095b474cc84e7ed2068a15e20860e5f7becfe42f010747a8c2a5fa551300e4082db SHA512 58046c87e42ea6f86ee3b23f541e616b33be5f09ee5a2d3d1fd6bce717f59dc52a56a3cd5dc3aaebc9aa5948e4dcad91c1841bf1e1b66f31e66f04d095820cef
 DIST pycurl-7.43.0.5.tar.gz 216877 BLAKE2B 57605fa3426a76e0cdcc1bb4f247985a27439d67d32769945332f94c49eead7fadb2847accf98f0d0994e461fc9d6fd100a181ff6d3ac0765dad31d546a75ff4 SHA512 835ed6cca25d2dd3e7084f905f3b0b082d4af04761fa9d4dc4714865863a97c095c08e6f55ada91b9f60ccad7838328a82fb2add8108aea12056200cf1f12845
-EBUILD pycurl-7.43.0.5.ebuild 3136 BLAKE2B c8529f93479c72e9a8908288448a827922a4e0b1a6f70858bea0d97c40bb40a67d5c027e72db318258b740837680d0102abddeec393c1be12713c3de716cf761 SHA512 422ad568a23dd20a72ae2e69ada8704802eede3e04ddeaebb451b930583a5cf05769b298b7045eb3dad572126c0fdfea8a3687c861cc41630f894ce6aa24f8ef
+EBUILD pycurl-7.43.0.5-r1.ebuild 3340 BLAKE2B 9d4b8b02f9c2f274d02a72fc67ac7a563d18b2926dee0ae2422ff94f64bea30da16d90d92504450af2a1c87e4f78870209ff7fc2b0d70763dbd703ff58f9f3a7 SHA512 538fe2175d4e7b4aa8f08ba8f17c8393c2190345a30e5a154b9f5f251f09940a60759c2723dfc9d69c1f4e5d161500cbe75af15ee61e699dc9c7f4b4212f2c2e
+EBUILD pycurl-7.43.0.5.ebuild 3282 BLAKE2B 64dbe0b8109bf5360c992912db7f2897bf1cc90162c3d13aff35dec07cf7d56a17e5367a18d50ce41cc684177b11a62fe8ca3248b08d13138fdf079d48a1ad68 SHA512 e948084e13314e7f30a45cd7775542a64317dcdbb58bde0b672752b7d09e52dc2bb723d776feed7302abc121e5531a6bfbd6e30a69e6d6d21ba61150e3f298d7
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch b/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch
new file mode 100644
index 000000000000..035ad6f9ca36
--- /dev/null
+++ b/dev-python/pycurl/files/pycurl-7.43.0.5-multiple-ssl.patch
@@ -0,0 +1,146 @@
+From 290d762ea13a1d95affa0888c5450b33b00241e8 Mon Sep 17 00:00:00 2001
+From: Bo Anderson <mail@boanderson.me>
+Date: Tue, 21 Jul 2020 18:28:31 +0100
+Subject: [PATCH] Handle MultiSSL
+
+Upstream-Status: Accepted [https://github.com/pycurl/pycurl/pull/639]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ src/module.c | 41 ++++++++++++++++++++++++++++++++++++++++-
+ src/pycurl.h | 11 +++++++++++
+ 2 files changed, 51 insertions(+), 1 deletion(-)
+
+diff --git a/src/module.c b/src/module.c
+index 23387ec..dbc5b0c 100644
+--- a/src/module.c
++++ b/src/module.c
+@@ -322,12 +322,21 @@ initpycurl(void)
+ {
+     PyObject *m, *d;
+     const curl_version_info_data *vi;
+-    const char *libcurl_version, *runtime_ssl_lib;
++    const char *libcurl_version;
+     size_t libcurl_version_len, pycurl_version_len;
+     PyObject *xio_module = NULL;
+     PyObject *collections_module = NULL;
+     PyObject *named_tuple = NULL;
+     PyObject *arglist = NULL;
++#ifdef HAVE_CURL_GLOBAL_SSLSET
++    const curl_ssl_backend **ssllist = NULL;
++    CURLsslset sslset;
++    int i, runtime_supported_backend_found = 0;
++    char backends[200];
++    size_t backends_len = 0;
++#else
++    const char *runtime_ssl_lib;
++#endif
+ 
+     assert(Curl_Type.tp_weaklistoffset > 0);
+     assert(CurlMulti_Type.tp_weaklistoffset > 0);
+@@ -346,6 +355,35 @@ initpycurl(void)
+     }
+ 
+     /* Our compiled crypto locks should correspond to runtime ssl library. */
++#ifdef HAVE_CURL_GLOBAL_SSLSET
++    sslset = curl_global_sslset(-1, COMPILE_SSL_LIB, &ssllist);
++    if (sslset != CURLSSLSET_OK) {
++        if (sslset == CURLSSLSET_NO_BACKENDS) {
++            strcpy(backends, "none");
++        } else {
++            for (i = 0; ssllist[i] != NULL; i++) {
++                switch (ssllist[i]->id) {
++                case CURLSSLBACKEND_OPENSSL:
++                case CURLSSLBACKEND_GNUTLS:
++                case CURLSSLBACKEND_NSS:
++                case CURLSSLBACKEND_WOLFSSL:
++                case CURLSSLBACKEND_MBEDTLS:
++                    runtime_supported_backend_found = 1;
++                    break;
++                default:
++                    break;
++                }
++                if (backends_len < sizeof(backends)) {
++                    backends_len += snprintf(backends + backends_len, sizeof(backends) - backends_len, "%s%s", (i > 0) ? ", " : "", ssllist[i]->name);
++                }
++            }
++        }
++        if (runtime_supported_backend_found == COMPILE_SUPPORTED_SSL_BACKEND_FOUND) {
++            PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time ssl backends (%s) do not include compile-time ssl backend (%s)", backends, COMPILE_SSL_LIB);
++            goto error;
++        }
++    }
++#else
+     if (vi->ssl_version == NULL) {
+         runtime_ssl_lib = "none/other";
+     } else if (!strncmp(vi->ssl_version, "OpenSSL/", 8) || !strncmp(vi->ssl_version, "LibreSSL/", 9) ||
+@@ -366,6 +404,7 @@ initpycurl(void)
+         PyErr_Format(PyExc_ImportError, "pycurl: libcurl link-time ssl backend (%s) is different from compile-time ssl backend (%s)", runtime_ssl_lib, COMPILE_SSL_LIB);
+         goto error;
+     }
++#endif
+ 
+     /* Initialize the type of the new type objects here; doing it here
+      * is required for portability to Windows without requiring C++. */
+diff --git a/src/pycurl.h b/src/pycurl.h
+index 02db495..a83c85b 100644
+--- a/src/pycurl.h
++++ b/src/pycurl.h
+@@ -154,6 +154,10 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
+ #define HAVE_CURLINFO_HTTP_VERSION
+ #endif
+ 
++#if LIBCURL_VERSION_NUM >= 0x073800 /* check for 7.56.0 or greater */
++#define HAVE_CURL_GLOBAL_SSLSET
++#endif
++
+ #undef UNUSED
+ #define UNUSED(var)     ((void)&var)
+ 
+@@ -165,6 +169,7 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
+ #   include <openssl/ssl.h>
+ #   include <openssl/err.h>
+ #   define COMPILE_SSL_LIB "openssl"
++#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
+ # elif defined(HAVE_CURL_WOLFSSL)
+ #   include <wolfssl/options.h>
+ #   if defined(OPENSSL_EXTRA)
+@@ -187,6 +192,7 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
+ #    endif
+ #   endif
+ #   define COMPILE_SSL_LIB "wolfssl"
++#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
+ # elif defined(HAVE_CURL_GNUTLS)
+ #   include <gnutls/gnutls.h>
+ #   if GNUTLS_VERSION_NUMBER <= 0x020b00
+@@ -195,13 +201,16 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
+ #     include <gcrypt.h>
+ #   endif
+ #   define COMPILE_SSL_LIB "gnutls"
++#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
+ # elif defined(HAVE_CURL_NSS)
+ #   define COMPILE_SSL_LIB "nss"
++#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
+ # elif defined(HAVE_CURL_MBEDTLS)
+ #   include <mbedtls/ssl.h>
+ #   define PYCURL_NEED_SSL_TSL
+ #   define PYCURL_NEED_MBEDTLS_TSL
+ #   define COMPILE_SSL_LIB "mbedtls"
++#   define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 1
+ # else
+ #  ifdef _MSC_VER
+     /* sigh */
+@@ -218,9 +227,11 @@ pycurl_inet_ntop (int family, void *addr, char *string, size_t string_size);
+    /* since we have no crypto callbacks for other ssl backends,
+     * no reason to require users match those */
+ #  define COMPILE_SSL_LIB "none/other"
++#  define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 0
+ # endif /* HAVE_CURL_OPENSSL || HAVE_CURL_WOLFSSL || HAVE_CURL_GNUTLS || HAVE_CURL_NSS || HAVE_CURL_MBEDTLS */
+ #else
+ # define COMPILE_SSL_LIB "none/other"
++# define COMPILE_SUPPORTED_SSL_BACKEND_FOUND 0
+ #endif /* HAVE_CURL_SSL */
+ 
+ #if defined(PYCURL_NEED_SSL_TSL)
+-- 
+2.28.0
+
diff --git a/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild b/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild
new file mode 100644
index 000000000000..e5a319f2804a
--- /dev/null
+++ b/dev-python/pycurl/pycurl-7.43.0.5-r1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=manual
+# The selftests fail with pypy, and urlgrabber segfaults for me.
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="python binding for curl/libcurl"
+HOMEPAGE="
+	https://github.com/pycurl/pycurl
+	https://pypi.org/project/pycurl/
+	http://pycurl.io/"
+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 ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="curl_ssl_gnutls curl_ssl_libressl curl_ssl_nss +curl_ssl_openssl examples ssl test"
+RESTRICT="!test? ( test )"
+
+# Depend on a curl with curl_ssl_* USE flags.
+# libcurl must not be using an ssl backend we do not support.
+# If the libcurl ssl backend changes pycurl should be recompiled.
+# If curl uses gnutls, depend on at least gnutls 2.11.0 so that pycurl
+# does not need to initialize gcrypt threading and we do not need to
+# explicitly link to libgcrypt.
+RDEPEND="
+	>=net-misc/curl-7.25.0-r1:=[ssl=]
+	ssl? (
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-)]
+		curl_ssl_gnutls? ( >=net-libs/gnutls-2.11.0:= )
+		curl_ssl_libressl? ( dev-libs/libressl:= )
+		curl_ssl_openssl? ( dev-libs/openssl:= )
+	)"
+
+# bottle-0.12.7: https://github.com/pycurl/pycurl/issues/180
+# bottle-0.12.7: https://github.com/defnull/bottle/commit/f35197e2a18de1672831a70a163fcfd38327a802
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		net-misc/curl[curl_ssl_gnutls(-)=,curl_ssl_libressl(-)=,curl_ssl_nss(-)=,curl_ssl_openssl(-)=,-curl_ssl_axtls(-),-curl_ssl_cyassl(-),http2]
+		>=dev-python/bottle-0.12.7[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/pycurl-7.43.0.5-telnet-test.patch
+	"${FILESDIR}"/pycurl-7.43.0.5-cc-cflags.patch
+	"${FILESDIR}"/pycurl-7.43.0.5-multiple-ssl.patch
+)
+
+python_prepare_all() {
+	sed -e "/setup_args\['data_files'\] = /d" -i setup.py || die
+	# disable automagic use of setuptools
+	sed -e 's:import wheel:raise ImportError:' -i setup.py || die
+	# these tests are broken with newer versions of bottle
+	sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
+	# temporary hack to make setuptools->distutils change less painful
+	# (suggested by Arfrever)
+	sed -e "/VERSION/s:${PV}:&.0:" -i setup.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	# Override faulty detection in setup.py, bug 510974.
+	export PYCURL_SSL_LIBRARY=${CURL_SSL/libressl/openssl}
+}
+
+src_test() {
+	# upstream bundles precompiled amd64 libs
+	rm tests/fake-curl/libcurl/*.so || die
+	emake -C tests/fake-curl/libcurl CC="$(tc-getCC)"
+
+	distutils-r1_src_test
+}
+
+python_compile() {
+	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
+	distutils-r1_python_compile
+}
+
+python_test() {
+	nosetests -a '!standalone,!gssapi' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+	nosetests -a 'standalone' -v --with-flaky || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local HTML_DOCS=( doc/. )
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pycurl/pycurl-7.43.0.5.ebuild b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
index 208be0af1b8f..321f11ec05b7 100644
--- a/dev-python/pycurl/pycurl-7.43.0.5.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.5.ebuild
@@ -59,6 +59,9 @@ python_prepare_all() {
 	sed -e 's:import wheel:raise ImportError:' -i setup.py || die
 	# these tests are broken with newer versions of bottle
 	sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
+	# temporary hack to make setuptools->distutils change less painful
+	# (suggested by Arfrever)
+	sed -e "/VERSION/s:${PV}:&.0:" -i setup.py || die
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 0d4283afa062..41ef38f3f83a 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -2,6 +2,6 @@ DIST pyglet-1.2.4.tar.gz 2122017 BLAKE2B 6e5e24ec78e24b9a9c8e9627791ede93d740c1a
 DIST pyglet-1.5.3.tar.gz 6356079 BLAKE2B 517b196eff334d572d4db181ce0480c3af8e2bc4a92e23e1fd7c335aedebe3afa493eb3f4745d8daffc3c7d930b9e333075014d2ba5d4303f4691c490a09f252 SHA512 12e7189272b9ab3b4bd3d713d0e979cfc1d76200fc8454b31573fca29b179f99242c34a1adb7a1c2fabb7b950cc3006cfcd8b188eb2c50ae95cca95b0e15582c
 DIST pyglet-1.5.7.tar.gz 6367378 BLAKE2B 68d4aa673a7463f7da0f4ccb7f413b602f32ecc423438326fc4262a4449fe22dff25a513074611ce2c77c130dfe9cc29e44e54a95169875208731f70803f1a45 SHA512 2c2a06636b1db788241028d1ef2290a774b98721ccc92ceed2b2895bcee81d4aa72b2111896091b54531936513772505b0d43003e412735d606130ed4b08f8c9
 EBUILD pyglet-1.2.4.ebuild 1033 BLAKE2B 4f8c751ac08ea2d5d6fc1ebe1d74143311a2fe8834c7ab447f9fd42e606371f463f39b7b6e37e2b3767213b2bd1455cdfe06c66c2020946a656fe00312d2d4db SHA512 1bfb9ffc5e0db92f8b01288989ba8726a27e1316168a3e8d836a601e379ac4c5d57665e002863da205ed1e7768b24987423ac24c88dab3b34082a6d5aa1e3169
-EBUILD pyglet-1.5.3.ebuild 1244 BLAKE2B 1c6b0c6025fc9ed2783d6f914a42e99b99dbea3370e2dbacce7f9d3e1cf4a0909ad99f1c44fa3a84baf474066b74f460fe141e8c374170cde1b284e981304d4b SHA512 0cdb680fc9b01eb2245ecfb8ec197d95f129a86f68f466aff99b8db453c6f70d0dc9a3770f10d06286a8b45cbd6d0be6d22269dd58f0e63c20214a24117ad53b
-EBUILD pyglet-1.5.7.ebuild 1272 BLAKE2B 55eb532479c81a520105ebd9d89072bf43f5b8cc92e5d51d092174ba54662e1a3979a64a2d495b57ae8ffa7e42ad95cc3ac27373772c545a51c00c1dedfd3595 SHA512 61499f10a820ede251828fb79b70de115c9b88737760c7516a7f28ee7fc52392a642a5dfaca2b41314ec302cb15bcd7aa90a0cb8cb677f6617b99b1d1a285e25
+EBUILD pyglet-1.5.3.ebuild 1246 BLAKE2B 350edfa28f84c2710faa23d3c220c2b34881359ee70b599fa6d407d3ae2f982704c286bc34ae967313a870ed3c5033dbf5e6262606cd4436fb917df9f705569c SHA512 7caa07d04e801c2f9eb70c99d3bc89798d9d0703267577c54c02774193ea9423b828a3ebf22e29d88121eb95f7c75317b1402eb4761822479d618e99f91123be
+EBUILD pyglet-1.5.7.ebuild 1274 BLAKE2B 2f1d6f2b348ece560e96c01258f1dcf3967de7eec229d95b881f8d23a3cfd12bd161272b8df42d4bd020c9b50bb233494d406ace3173d5c71aa79cb552b194a6 SHA512 d8d37183f45d77d2d5dbcabdeee663c9b64793bedb4e59a956eb4dbea058bb25d39c082756cf0e71516962571a58efdd7dc92ac47156dbd3cad16c2a846faba9
 MISC metadata.xml 996 BLAKE2B 74fda944aaa3954eafb31e21741f8cb599c9f8bff46c662a598cb384da9770d3160302b37ce8cbe9ddbc7dfe63c594614783afa568ab4be5e73db502fdc3a095 SHA512 a13a1aa2134de7bc7e007f81540631623c5a3fc1f5bfd4b6f7bc744eff8cc037da321292aa968184d324099dbfd87f608d7c0a2aeea90707c27aee5532a1fe15
diff --git a/dev-python/pyglet/pyglet-1.5.3.ebuild b/dev-python/pyglet/pyglet-1.5.3.ebuild
index 88a341edfa21..3c019ee11f70 100644
--- a/dev-python/pyglet/pyglet-1.5.3.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1 virtualx xdg-utils
 
diff --git a/dev-python/pyglet/pyglet-1.5.7.ebuild b/dev-python/pyglet/pyglet-1.5.7.ebuild
index c9b51798015c..5251ca366911 100644
--- a/dev-python/pyglet/pyglet-1.5.7.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 virtualx xdg-utils
 
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 85904d8a2239..8727540eae8f 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -11,5 +11,5 @@ DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c62997413
 DIST pygobject-3.36.1.tar.xz 556568 BLAKE2B cd38aec8e71ff230926327e77867d07ae0fd5549b71619301bb3be01821ea93e557ecf335ea238292176981a864b269eaa2a86da47e8fb320f187f54caf24dc4 SHA512 5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f
 EBUILD pygobject-2.28.6-r55.ebuild 3540 BLAKE2B d719fe69f2e35d2e77700f478230336ccaae8875b7b82ed65172bf236b0abf96cf47a67aaee844353d7719c03cf6f634b1b19da7950807a8233a191f6da6c309 SHA512 e62dd5e5c9228ce363385c4991a20264d1569c1f7640dc3564667d1d121123d1605bd9c617fb2fd8961d7b9de8b09e6a8833f94f77c679e2a44aa0203111e029
 EBUILD pygobject-3.34.0.ebuild 1765 BLAKE2B 970cf7614f18e3f4e1b227d06e135d86f26ae2d526468389d7275f9185688cfcdcaa6fb2b39932062e4bca6d04d610598e26d67555c45c48c6dac940e17f323c SHA512 890d6a11e87b2dc7e39aaa923f833fc9890323abeb8698692a6f78b532164c7c7d424b1520f96f4fede63f3deb3d35f7e15c2196aa4edd6edce1b02455575b97
-EBUILD pygobject-3.36.1.ebuild 1772 BLAKE2B 0477cb7e67110fc168fede7474a21279c914eb2a1debbe29ffc5532c0d5243546a293ab2bb620a7fe404b9880ea285f758065e4c3da8ff863b0ff609d8f2fb5d SHA512 fff445e106da763f40fba695e85e35ce633ab798e45a311c2e3ec6672825ecd8257d3925700e379ee69744394b1d268afb3e383d0f2c85d2d81d98717bc25373
+EBUILD pygobject-3.36.1.ebuild 1769 BLAKE2B 12a622462748170a3cde1c260ef954cc717b7e5689ae9c266c8c95246982e017f7b55ca8faad3bde7782063038d108922b841478fda6cd67f8d7df3ac94c6478 SHA512 d82c370a8021447b2cf1b6786ce3e19b881fe4fd5b53372b85c068b96845c3c707a9e98ba6658e1c81155c3f876da1a6e5709173c3c75adf14bcf2c614864876
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.36.1.ebuild b/dev-python/pygobject/pygobject-3.36.1.ebuild
index 8f9b561a5731..ad787fa51389 100644
--- a/dev-python/pygobject/pygobject-3.36.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.36.1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-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="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyid3lib/Manifest b/dev-python/pyid3lib/Manifest
deleted file mode 100644
index c367cdbbb5ca..000000000000
--- a/dev-python/pyid3lib/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pyid3lib-0.5.1-gcc-4.4.patch 404 BLAKE2B 24e81fe2c275895dadd68282296b7fd8035988f24aa12fb50c7919c55373a5b5f86b8d9a74bc971fbb0fb2017bfff91e5fc411d43a54af68f7afaff8a2252f65 SHA512 dec8d4768f48125f2707489355fe3c1a1c5c64c10c4f486a62f26ae55e05b78bf8b3b787f15c5d49c44383bbf3a5a0932e2c259b497983b10470180300330edc
-AUX pyid3lib-0.5.1-py25.patch 1307 BLAKE2B 8544cb7f4fe6b7b2c20cf10f2af135bc9cc952c3a5d3554ff3c70d43cd7f9ffc636161881b7bfa3e0c8cb79297b9349e20dda582bca7587105e2f570f0b6c790 SHA512 48da2449be6f7e711a3e9817927a9ed6aaaa2086c14e8674218993fce3f33816fb294ef70033de92950578e477998bc7b1cdce092f7a7e17f66dd24592d757cf
-DIST pyid3lib-0.5.1.tar.bz2 21207 BLAKE2B 762baa0d463c587d06eb12d84a25d5105f7f2a11e60ff7b8153f45a3bb5076b622297cbbbff7c01ce4cf3c9dea96f714c0787e990630e3addfa85dc79553662e SHA512 fee073a7bd87540a186122b477e918b2c3d8a234ea5ebd83207115b9d0503cc22645b93f6702b79a1b41104d0cbcaa3c47900bba27ce52d44195a8f8a6331c57
-EBUILD pyid3lib-0.5.1-r2.ebuild 652 BLAKE2B db717127e36eb54bc0529e28f985f6387c2d1e13763a237cf5eb85b4006080e60ecd040f26fc85db67376a2d5bfdc9bf054b4e0e7dd034d0e1c2fcd2c478f15e SHA512 a99af4f48626f55aae87eb184c4070cc15ccd1f9814550cdb34ef2235b772c5154f9c967030bb89cf195d023abbbac6766292483dc29bc5ba36503d763877548
-MISC metadata.xml 318 BLAKE2B a96955c26eb12dc045c09e3a73a6926ba4dbadef98376f4550df59ff039cb31b95d7e30791be6af18e4bcfc57583924b637f2c2867a989c4ad0428b120ce52d9 SHA512 1c0f3d96a5bfe335f0ab1c8f637ed5a06938eb53c8c9684beec4b264edea3a3f6360ebe1c34c7f0d11349480b0e20db9f18adb7990a28608dda30a9eb221fa7c
diff --git a/dev-python/pyid3lib/files/pyid3lib-0.5.1-gcc-4.4.patch b/dev-python/pyid3lib/files/pyid3lib-0.5.1-gcc-4.4.patch
deleted file mode 100644
index 04df9e0a6c98..000000000000
--- a/dev-python/pyid3lib/files/pyid3lib-0.5.1-gcc-4.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pyid3lib.cc
-+++ pyid3lib.cc
-@@ -920,7 +920,7 @@ enum frame_type
- 
- typedef struct
- {
--    char* name;
-+    const char* name;
-     ID3_FrameID fid;
-     frame_type type;
- } magic_attribute;
-@@ -1030,7 +1030,7 @@ static PyObject* id3_getattr( ID3Object* self, char* attrname )
-     {
-         ID3_Frame* frame;
- 	const char* str;
--	char* slash;
-+	const char* slash;
-         ID3_Field* fld;
- 	int i;
- 
diff --git a/dev-python/pyid3lib/files/pyid3lib-0.5.1-py25.patch b/dev-python/pyid3lib/files/pyid3lib-0.5.1-py25.patch
deleted file mode 100644
index c24cfc97d5ac..000000000000
--- a/dev-python/pyid3lib/files/pyid3lib-0.5.1-py25.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- pyid3lib-0.5.1/pyid3lib.cc.orig	2007-08-08 23:53:08.000000000 +0300
-+++ pyid3lib-0.5.1/pyid3lib.cc	2007-08-08 23:53:12.000000000 +0300
-@@ -10,13 +10,19 @@
- #include <id3/id3lib_frame.h>
- #include <id3/tag.h>
- 
-+#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN)
-+typedef int Py_ssize_t;
-+#define PY_SSIZE_T_MAX INT_MAX
-+#define PY_SSIZE_T_MIN INT_MIN
-+#endif
-+
- typedef struct
- {
-     PyObject_HEAD
- 
-     ID3_Tag* tag;
-     ID3_Frame** frames;
--    int size, alloc;
-+    Py_ssize_t size, alloc;
- } ID3Object;
- 
- typedef struct
-@@ -80,13 +86,24 @@
- 
- 
- static PySequenceMethods tag_as_sequence = {
-+#if PY_VERSION_HEX >= 0x02050000
-+    (lenfunc)id3_length,
-+#else
-     (inquiry)id3_length,
-+#endif
-     NULL,
-     NULL,
-+#if PY_VERSION_HEX >= 0x02050000
-+    (ssizeargfunc)id3_item,
-+    (ssizessizeargfunc)id3_slice,
-+    (ssizeobjargproc)id3_ass_item,
-+    (ssizessizeobjargproc)id3_ass_slice,
-+#else
-     (intargfunc)id3_item,
-     (intintargfunc)id3_slice,
-     (intobjargproc)id3_ass_item,
-     (intintobjargproc)id3_ass_slice,
-+#endif
-     (objobjproc)id3_contains,
-     NULL,
-     NULL,
-@@ -824,7 +841,7 @@
- static ID3_Frame* frame_from_dict( ID3_FrameID fid, PyObject* dict )
- {
-     char* data;
--    int size;
-+    Py_ssize_t size;
-     
-     ID3_Field* field;
-     ID3_FieldID flid;
diff --git a/dev-python/pyid3lib/metadata.xml b/dev-python/pyid3lib/metadata.xml
deleted file mode 100644
index 23324cab5125..000000000000
--- a/dev-python/pyid3lib/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pyid3lib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild b/dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild
deleted file mode 100644
index 3c7fa8639da1..000000000000
--- a/dev-python/pyid3lib/pyid3lib-0.5.1-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 flag-o-matic
-
-DESCRIPTION="Module for manipulating ID3 tags in Python"
-HOMEPAGE="http://pyid3lib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="media-libs/id3lib"
-RDEPEND="${DEPEND}"
-
-HTML_DOCS=( doc.html )
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-gcc-4.4.patch"
-		"${FILESDIR}/${P}-py25.patch"
-	)
-
-	distutils-r1_src_prepare
-
-	append-flags -fno-strict-aliasing
-}
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index cee20568d572..1f268d7fb37b 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,5 +1,5 @@
 DIST pylast-3.2.1.tar.gz 39763 BLAKE2B 1162efb68b89e381528b73eb5fb1dd45a15fcf8129b59fcae824ee78f100f6ea523207cda5b689b2fe66628b0aa5db313b5fa2f504b61b3b4ef6b64ccf13ea5b SHA512 e79a258e6f7c8490d98b4b737abae29cf763dcc5520f47dfe9fe7827f3163bc43ad7dc5c25edd1099cb4c4cd3483cdc5014331caba6f8c3cb29fb1394a8bfa3a
 DIST pylast-3.3.0.tar.gz 40209 BLAKE2B 45725d8424a54ac03b53a6c7fe79febb0038c07ee6c2685d7b66f29933f91fb4ea55818be1d02f8fb1126758acd1d9ce3366e8a7d84fe3082b9b3003a9b948b3 SHA512 8b0c089896d7efb37bdf3a701d150b0f94f386715eb73122a4a7618f5b1a514f9f7577e8c7c84eacb36b18e69aa064220403a578d0544344ab11e87e1b46695a
 EBUILD pylast-3.2.1.ebuild 867 BLAKE2B e3284a7c05c7ad2f7b9392360b79b8050d4961f254fa41abf94c466df0aba4cd3cb82d1aec912e8819b6e6389911ef5df6092bc67029d7dbce300a73ec52ba6a SHA512 86f2b4271a5d371048e82fe0e8e7a50523c273170bc06b37780b202e676a5ee7d13b71010be81b2f08abb15105ffeb211cd2bb84f3aa3fda5903bb626ee7ecb3
-EBUILD pylast-3.3.0.ebuild 783 BLAKE2B cfab283c777a3b6ac3bee72c69209356e175de67601404be1f2a2f44bb076914b1c26182cd74e8aee1dd37a434fe56d9bb5076ebc1e92642504ea97491352d34 SHA512 e022d6cf349cb94cb9c699d7460976676d9b2bf559fedd283fdf86f1049c4daa2e032cc398a95049fbd182d83b1bc7f369dad4e2473de2eb8241573618f449e9
+EBUILD pylast-3.3.0.ebuild 795 BLAKE2B 2906255c11201188e9975e8fcca4ab34dc9258a9ad12bccaa480344ffb6e62abc95348eeb67be3b44298cafff098b2cbcd04145c2ee14078ec0860de96490f30 SHA512 0db6fd5fae88b05d0049e2ecc9107438aa23d689393f4562c64b563312b2fef78ccbe6b65bac41d7a69bbe2b33dc6d5046cc7bbc7694da17199b8612bf9c9dcc
 MISC metadata.xml 838 BLAKE2B 6e7565ee2b6821052c09371d7cd6dd33964010c15ef8cb7b7a4a4570628683ed16510385f2a54c084ee605c590132a4bb4926510b9805ac7fd7238bb8d571537 SHA512 e0ed92b884e1a5be485ce44bf08fcb6c38068134e083423bde3e4a2f2180d0cb14f76bf9f154f69247a8008e5a952021925110cf1d0985a7a7d15f082150fad0
diff --git a/dev-python/pylast/pylast-3.3.0.ebuild b/dev-python/pylast/pylast-3.3.0.ebuild
index 126f06114b29..31901f1e1f6e 100644
--- a/dev-python/pylast/pylast-3.3.0.ebuild
+++ b/dev-python/pylast/pylast-3.3.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 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pylzma/Manifest b/dev-python/pylzma/Manifest
deleted file mode 100644
index 425d138e708e..000000000000
--- a/dev-python/pylzma/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pylzma-0.4.9.gh.tar.gz 4083321 BLAKE2B de9ec578665b05b9d13370293f1e119d9bdfd4ba63b3c9d5168b794f82cee5a1cce6dbe45d5bc92d6714c0b56759dab9e578c63b6821754bd01b2aa66c34895b SHA512 d2316fcab50e4571a590985db8f132488cc4e12a45ecbcd5d21c356c4867bad671eed2e4ffda64735eb5b7e34f173a77fad65ebac9915a43cc9a17cbcf1ac62e
-EBUILD pylzma-0.4.9.ebuild 811 BLAKE2B 9ce59a72ecf47d4fb9e13b73def22207b1e0885c7d3b94dd5081b20e49b02c3a3846c95352a3f4bda411e2adf3e734534c9759a4c1b3a9b1b08999fea3752e65 SHA512 515d31feaba0b163fbae7e06f72cd2fa7f5d2ba593fc522801b63d5c2aeb65eaa81649d9fe55027bd3ac92df4a7c3aca7cf2e706a6acd0a97f38fa875f16f12e
-MISC metadata.xml 309 BLAKE2B 7cc33bb32635e06c0b8aa5668260dbc03eb1fca3beb9eca60a10c08a28ccc9df2bf9a7b0009746b5bf5cabda9c0a5ae8b0b005d1e45770ac7d8202d41f0beab2 SHA512 2511d647822514d4571c14fd77677fcf275300b12c748645696218608cb0baea9603c1de13599f1ec839783fbe1a99447a0b9c5cfb6be3ed1b354420815daaca
diff --git a/dev-python/pylzma/metadata.xml b/dev-python/pylzma/metadata.xml
deleted file mode 100644
index 6171c645d955..000000000000
--- a/dev-python/pylzma/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="pypi">pylzma</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pylzma/pylzma-0.4.9.ebuild b/dev-python/pylzma/pylzma-0.4.9.ebuild
deleted file mode 100644
index 5385fb98accf..000000000000
--- a/dev-python/pylzma/pylzma-0.4.9.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python2_7)
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the LZMA compression library"
-HOMEPAGE="https://www.joachim-bauch.de/projects/pylzma/
-	https://pypi.org/project/pylzma/"
-# pypi tarball does not include test data
-SRC_URI="https://github.com/fancycode/pylzma/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=""
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-DOCS=(doc/USAGE.md README.md)
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-python_test() {
-	"${PYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pyode/Manifest b/dev-python/pyode/Manifest
deleted file mode 100644
index 1c78bbebf894..000000000000
--- a/dev-python/pyode/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST PyODE-snapshot-2010-03-22.tar.bz2 55651 BLAKE2B 4ef1337f4a4c7e2bcbece57af0eff4d2da08dce1ad63d6772fe76a473559a7b102c8282ada3abf2add2b78e8609ca3fc3d67e3f520bdda4186ff6a854b4a5012 SHA512 fd9457d9a9c42a5e9834ce45886d6b57c9ecfdc68868353d986fa219eb57246d4dc175ca5d12c876c359c5bdac5bcdaf6dfc2ee65fff52f53337b1d10458e54c
-EBUILD pyode-1.2.0_p20100322-r1.ebuild 1079 BLAKE2B fda8d5fe4e46b9d7753554c83b7b70cb08791da09d90b6a0cef554c338a5c9874c0fbda999773982da364a05a122b537450fabd4a2083892f8673869e28697c7 SHA512 ab397bf1e0adedeb816417b39d9299caec04e0c4fb306d811acb9c616f1195850238405ac27610c665586fa009ab675a45bafc85fb3825f70795486d1a931a1a
-MISC metadata.xml 315 BLAKE2B 152961e59a3cc5114f7372f271e7877477ec2e976a2ecd8ea0e7000ac512e569453da3316344deca3b171e8a0282459dfbe06ceeff50b500298d4dab2408da41 SHA512 7ba6e25932ddc1fd466396957779165b27dca693b347b459da8e774cda05e69dd845f11ae641dbcb3743d047688a2f991edb89aa296cbf3aeb3af5f06869daaf
diff --git a/dev-python/pyode/metadata.xml b/dev-python/pyode/metadata.xml
deleted file mode 100644
index d379d56a54fc..000000000000
--- a/dev-python/pyode/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>python@gentoo.org</email>
-		<name>Python</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">pyode</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild b/dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild
deleted file mode 100644
index 3b8fa61d3bb0..000000000000
--- a/dev-python/pyode/pyode-1.2.0_p20100322-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1
-
-MY_P="${P/pyode/PyODE}"
-SNAPSHOT_DATE="2010-03-22"	# This is a snapshot
-
-DESCRIPTION="Python bindings to the ODE physics engine"
-HOMEPAGE="http://pyode.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/PyODE-snapshot-${SNAPSHOT_DATE}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="examples"
-
-RDEPEND=">=dev-games/ode-0.7
-	>=dev-python/pyrex-0.9.4.1[${PYTHON_USEDEP}]"
-DEPEND=${RDEPEND}
-
-S=${WORKDIR}/PyODE-snapshot-${SNAPSHOT_DATE}
-
-python_compile() {
-	python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
-	distutils-r1_python_compile
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# The build system doesnt error if it fails to build
-	# the ode library so we need our own sanity check
-	[[ -n $(find "${D}" -name ode.so) ]] || die "ode.so is missing"
-
-	if use examples; then
-		docompress -x /usr/share/doc/${PF}/examples
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
diff --git a/dev-python/pypeg2/Manifest b/dev-python/pypeg2/Manifest
index ce9db91759be..9583d7596a13 100644
--- a/dev-python/pypeg2/Manifest
+++ b/dev-python/pypeg2/Manifest
@@ -1,4 +1,4 @@
 AUX pypeg2-2.15.1-test.patch 399 BLAKE2B 64afae813084e2bcceb3354d6a9819425f5454d7febbb3df12d7b7f73329bfeed1a93fd7bbd046c69899f26757d984fd70964e13809ba9bb30305b80d35cdbc8 SHA512 20428aa41858da3b73a262ec2f36aed0df8626999eae27438a6bad1908b1dc79056ab33069c273aae56eabc02dfd0c080daaf42fee7e7c92ec32b95244ba41c4
 DIST pyPEG2-2.15.2.tar.gz 40334 BLAKE2B 7a171824da4c0ccc3bfaef4e429efb16f5c8c4e03dd47c5cd59656a51fe37c9d0b3940e58e2f321a4d9976f66935fd5b9d526d24bd1e0342ef15a3a1341e77a3 SHA512 f78e3b1294169167809c5fe05f2a69af2bd6c7c4c1bcbebafb4aa6b8ae6ead181a46b051e41193bc31f49c4b4fa7b1ef231d172217c11d301d0ee21d8e411b6f
-EBUILD pypeg2-2.15.2-r1.ebuild 619 BLAKE2B 2738424b0783d4d648fa064b5bef3b6a0170e4ed18a7b3db618d55f27aec75bcbc7d038c677a5df6c7566bc107c745fb64d92514912589f6e44d9bee6615354f SHA512 48692461fe83d05d7a052bddfa18af31a47278115dfd3e5882cecd4f06ce7dcf3b26af6d38784d718537ffbac780f4410c81af5cb75156ea1283ec8478fc46ef
+EBUILD pypeg2-2.15.2-r1.ebuild 626 BLAKE2B b71659e86ddd76c8a9a37db0405ca735a04ca7834e74e9d9de5826b82bcb0eb66cef473bcd8659b601ba342a68ef4cc5e8422f4ae226137e12fdb75dc878ceae SHA512 bc693be3cb96d0ad72135df5da535bb5cc62ff9e72abd3808e71ac6175b82212a142061037da26e5effdb8b65c3d2be98f9c76db70948c551d3f8b3ecc81a215
 MISC metadata.xml 309 BLAKE2B 75ffd7baef25545d1992191ab4a1ee3bbf3108c30e0846e6410bc944a63c8ea0183c06cd6b004daa6e28556128f487f20d1a9a4105d832b7adbe3c837c17771f SHA512 b769260312197387a90d9fca69aaac96085eb36a84b66ff0ffedd4c4e7f1c7744a10048564a20eefe5a58f5de7a7ec8e6e7447eb20bc3d1cdc74a999a62005f5
diff --git a/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild b/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
index 3e14ba6c846e..75770fae21af 100644
--- a/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
+++ b/dev-python/pypeg2/pypeg2-2.15.2-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index ff155233afd9..f0e1abbf82c0 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -3,5 +3,5 @@ DIST pypy-exe-7.3.0-1.x86.xpak 10261761 BLAKE2B 60726089208c925baf233072de2d7f58
 DIST pypy-exe-7.3.1-1.amd64.xpak 13578971 BLAKE2B 6ff3c64ec88813ef68d325cff5e2dae0ef1f79ae33eeac3a09c1b8ee0a24b0447b2c633489311da3d62996d714bd3d5844c3b71b9309766ade2f06b79e20bb64 SHA512 b153a19621a6da51d364868c22e9ba0460d95203787753899ec50efb573b4e7262d323503be801c3c75a724761bcfda90d8d4668d84482e2db32104916bc7671
 DIST pypy-exe-7.3.1-1.x86.xpak 10239654 BLAKE2B 2588e879e2bd3ea41938ec21f55167d118cb493680f8e7aded6d6c01bed6499efd65f7d7f56e305a4ebc2aab02adf9d58fceccb503dd0ff41e93c642baf2191c SHA512 110b202c805729bcd6789ea0f6c7bffe62ab23cbd33fcff572254f56f4da82e25f9f7f617c5a4b3911044c07ea33ae8d17bd8547bb7779ca517b973b553e6b1d
 EBUILD pypy-exe-bin-7.3.0_p1.ebuild 1086 BLAKE2B a331d825f7906c1685f4b387d4e6c50b9d82296d4d3c7d1d24f5de50d7ee65f02bfcd2b14f0b57cd2a73a714253a18e5a7f09fc122a5ba033965381a71a57144 SHA512 fe49f4895b502a6d0a2050bd0aa4e6eab616026a875905b46443fbbc4ef378329e3a56ff641541210fd613f9a8bc07317e9a639f1ba187cb2b4041fce321b687
-EBUILD pypy-exe-bin-7.3.1_p1.ebuild 1087 BLAKE2B ecff1b13e5e122491c4693bd61e9695616d5c19e398c13a00bb14f5a4bd5a617ca4fee9664b3b76dc94f9693f4c539d8709f35d414f149ff8bae4233c731acba SHA512 394eac2883d5a944f994dcfee56ef1fdb17db94229cc263e2d7f0b5e7894f9f0589f0660bbb6b0269f8c165d8b613ac7d9b6c49dec80b8b4c38804525dda000d
+EBUILD pypy-exe-bin-7.3.1_p1.ebuild 1086 BLAKE2B a331d825f7906c1685f4b387d4e6c50b9d82296d4d3c7d1d24f5de50d7ee65f02bfcd2b14f0b57cd2a73a714253a18e5a7f09fc122a5ba033965381a71a57144 SHA512 fe49f4895b502a6d0a2050bd0aa4e6eab616026a875905b46443fbbc4ef378329e3a56ff641541210fd613f9a8bc07317e9a639f1ba187cb2b4041fce321b687
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild
index f173ae174f81..d44223c44fa2 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.1_p1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-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 73a0bf44f2e1..079b405746db 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,5 +1,5 @@
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
-EBUILD pypy-exe-7.3.0.ebuild 3899 BLAKE2B f8d1cb668f31ad5ef2a8529c0bbad3a6b608d45f49d089e33e4295752cf9df7293364c0d5f9829cd17c89d424fa28bad564fa0e7bbc91154f57657f97dcdd482 SHA512 f82913f0a1d98466f543a9bdd2da627ed4cd3299ac8c9c6031ffc3c87cca08b436e4634a0234d67b5b4313371483b47b2b22d06b8516b566ddbad428cb825d7b
-EBUILD pypy-exe-7.3.1.ebuild 3900 BLAKE2B 13cf54a9e1ea29486986261765d440c2c9a7fc031c4650cc8b498ee4e1aa8c274d93b2b9e857fa377900b5589a64fce45f5d13d4fac189efe202b11b0e5a03a2 SHA512 cf1c39a51272491416eac0f11f6b479f9caa487b589ac0169987306340d6a7c0d8e6574086fc937e5b9fbf09656764711c87c49629cf63686cfef1d2a56f3c6b
+EBUILD pypy-exe-7.3.0.ebuild 3891 BLAKE2B 1121625d5422a1d52114e58fd7f1632f175fc1623b2b931c3fb528acb1f18fdfc1a0859218330fe3e7c20bc539ff2819ea21cac2cb41328a4d295e7f5e9f684a SHA512 6bff225e427ae47b014a20ae7ab3893e55a893d5ce0670dc0474b4e6626113f5cbeef893e8585d42c8be78a64a051addbbbff1eb90b2266284d6064e73feeb2f
+EBUILD pypy-exe-7.3.1.ebuild 3891 BLAKE2B 1121625d5422a1d52114e58fd7f1632f175fc1623b2b931c3fb528acb1f18fdfc1a0859218330fe3e7c20bc539ff2819ea21cac2cb41328a4d295e7f5e9f684a SHA512 6bff225e427ae47b014a20ae7ab3893e55a893d5ce0670dc0474b4e6626113f5cbeef893e8585d42c8be78a64a051addbbbff1eb90b2266284d6064e73feeb2f
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
index 5907cdb4bdae..c17e889d43a2 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.0.ebuild
@@ -9,7 +9,7 @@ inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 MY_P=pypy2.7-v${PV/_/}
 DESCRIPTION="PyPy executable (build from source)"
 HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild
index e85da8422899..c17e889d43a2 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.1.ebuild
@@ -9,12 +9,12 @@ inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 MY_P=pypy2.7-v${PV/_/}
 DESCRIPTION="PyPy executable (build from source)"
 HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~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 66e84382a435..2abb5b94aa94 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -5,6 +5,6 @@ AUX 7.3.1-gentoo-path.patch 1575 BLAKE2B e374b879aabdb1a9b4d3bb07ba03510e9df7c00
 DIST pypy2.7-v7.3.0-src.tar.bz2 20328540 BLAKE2B 7f71c98f436f11e8f4d248b6aeb3e2f81962cdeeaf3eb534473f1c6b5e8cd37d9abc047d7fa750a1ceeeaa63fab6eff6e5f1e60394b8104bbcd7e1fc47885c61 SHA512 05f039f090d837a72012db55f23d94da3f21c7458f18bd1e8ba632489248eb6486ced07b786d05e573abf2b3def2a68d96e7e1109e6d189d8e6c303c60ee3535
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
-EBUILD pypy-7.3.0.ebuild 5894 BLAKE2B bec20881d6785b0b53a117f291d9a4ad369838042c0681c81b65a3d3d2da2532316d358c39a8f9fb4e10f8a86afa0bd01d32a374941037aa3a05f477cf3b51aa SHA512 5c831d1ea874862d101b54baaa7b7f15b9d22413f87650f3d330dcbd43b52028bbdd7d39cd5527a2984003bf69ffb4121f32807163c87359faa9edc42be79c1c
-EBUILD pypy-7.3.1-r2.ebuild 5681 BLAKE2B ffa54784b90b85e4550c576c4223f2b54bb84e5238ad5449e1ccd479b9ed708f501c7a39cb521d622501aec9726bf131b548961739e3b6bebfd2a7769e56a039 SHA512 6982bbca50872a6008cd008cba24db2142b6a9baacfe61b46c0e9f049b9cefebe09455cf17568a367b34fe5525f1e51c6582fbfe07e865c4dc1ac3d643ffe775
+EBUILD pypy-7.3.0.ebuild 5886 BLAKE2B 8ca542188afd20cdf3b44f3c4d2d12f62e4c9f936fd4c0b14fcc2afeb3bcff762da32ff9241593fb4de2a96173c9e39ae89e3f17aff78561eaa72191b62d221d SHA512 5d55ac2ef028570981dc3979bdf86950a939472e469f53f67ce8803f5cd07480ddff0f282686c18f16580087537db05659e26ce866707d5dfd2efe71b6c09e48
+EBUILD pypy-7.3.1-r2.ebuild 5672 BLAKE2B 4660915fbb37951e58b4dfc05b8c3f907a63fd5def51c0eb33508abbd168288b45b69f60b75ff39ba6a176a55aef4e7f5addca5e84b3a427b7877543e321c653 SHA512 7705c0690eed05a795e6d69d1ff0922eb800880705273a0976ed88bcddce30309614000fad4caee3fb39d54c107fe00f07caa411e2c73d2544e133d68f6974e4
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy/pypy-7.3.0.ebuild b/dev-python/pypy/pypy-7.3.0.ebuild
index 15a4ffa99455..d39cd6b286bb 100644
--- a/dev-python/pypy/pypy-7.3.0.ebuild
+++ b/dev-python/pypy/pypy-7.3.0.ebuild
@@ -11,7 +11,7 @@ PATCHSET="python-gentoo-patches-2.7.17-r1"
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python language"
 HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}-src"
 
diff --git a/dev-python/pypy/pypy-7.3.1-r2.ebuild b/dev-python/pypy/pypy-7.3.1-r2.ebuild
index ad8c9e1d85ce..59902f3b0a51 100644
--- a/dev-python/pypy/pypy-7.3.1-r2.ebuild
+++ b/dev-python/pypy/pypy-7.3.1-r2.ebuild
@@ -11,14 +11,14 @@ PATCHSET="python-gentoo-patches-2.7.17-r1"
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python language"
 HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~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 2be6b9797cd1..cf69ce202071 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -3,5 +3,5 @@ DIST pypy3-exe-7.3.0-1.x86.xpak 8953475 BLAKE2B e271c61341d2d92cd05c0e521d3ea1a7
 DIST pypy3-exe-7.3.1-1.amd64.xpak 11657579 BLAKE2B 1a037b447c7a73ac37bd7c33f4009442dabaf082a844744093dbb0f835b71abad48a6bfb28ebed0b02bb8a86f59f11b351768f152fd5db8b31ee010b14ffde79 SHA512 ee03ac675e6967d306136e79cbbb1554c44a32a21a0756b09dd7c1af84a9b3cb7e69a0094431bf6427271cf2fb1840e62935f53580e8d3eedef54d9bef2994e2
 DIST pypy3-exe-7.3.1-1.x86.xpak 8983621 BLAKE2B 00ea3210e040dd72f169eb2f162f032eb3ddadefd5f114cb4fdb052b40640235f866fc26f577eb22ff64025d2b4234a194529cbac6350aeffa17bb662e98c5b0 SHA512 caa6e4e08c61e3101aa7e971b2aeae04b41c57206327baefeee4a077d09b5bef28ca3518e6823bdf9907ccd4a8ee2b843369ffd87ef0bcb95a66f21ddd87c61e
 EBUILD pypy3-exe-bin-7.3.0_p1.ebuild 1093 BLAKE2B 7f26dae3be0bd6aa84dbf76aa8f6bbefffbbaf71701dc5f032ae62d36022214fcfcf977512aeef1e5de96f174922fc1ef94f416eebeb42aedc379eda371f0f3b SHA512 fad45a0aaa788da299e62bb367391795a9300a1acec31b202c90edc35d4223cfa4ebe734f58615d1741f221f798da3b977ddc2e248b3a139852cb4caa2ba235c
-EBUILD pypy3-exe-bin-7.3.1_p1.ebuild 1094 BLAKE2B 7e59bf1d1079c0587f35b8428622586cb9066888203290fbe99839d8958814d01c36ed8deefdd03308f13d2be9e669170ba4116d16dec34b954b3508e395d3ed SHA512 59f76e0c65d771a5031df942512989f4324d00218cdb88667e413053d02dadcd6cdc0914df6f0b8851e27d8f7188abdb6d1f33a2ebba1b8120754da32010f3d0
+EBUILD pypy3-exe-bin-7.3.1_p1.ebuild 1093 BLAKE2B 7f26dae3be0bd6aa84dbf76aa8f6bbefffbbaf71701dc5f032ae62d36022214fcfcf977512aeef1e5de96f174922fc1ef94f416eebeb42aedc379eda371f0f3b SHA512 fad45a0aaa788da299e62bb367391795a9300a1acec31b202c90edc35d4223cfa4ebe734f58615d1741f221f798da3b977ddc2e248b3a139852cb4caa2ba235c
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.1_p1.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.1_p1.ebuild
index 6d652e6df6f7..6cd2dada56ef 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.1_p1.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.1_p1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-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 1e8e8bf530c7..77b5677018ac 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,6 +1,6 @@
 AUX pypy3-exe-7.3.0-gcc10-fno-common.patch 1083 BLAKE2B c0601013dd4eb62df0eaef45b64d91d3a9b5d055b69fe754cef8157e1a0f03d28184d09d00137d170ddcf4aa7d3ece20071586d2fe998fd13150dd2c8eaa3159 SHA512 a4c797c31b2a7ead67c4c0b3e39bd3ab51ddf1554e33526057447d9d2eefc57425a536ba84aac060082f5eb24d6c6de40f82b5bee53ba4b12f5985cf27fe1814
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
-EBUILD pypy3-exe-7.3.0.ebuild 3563 BLAKE2B 7ba8ee572a79d0a9234cc163049dcb2f2b2660d271d009fcd9a325e22b485767eed0b547259de8d7d78d9efe43195657fb2fce3cbd957e6886bcf2e487ac4757 SHA512 0b21f82bfed20eb28173cdd38728cab084690325e00aed520eaeaadaf2f1f1effd42fd522d294ca8820f1ca69783eec28ad41ae93759750738e991de43984359
-EBUILD pypy3-exe-7.3.1.ebuild 3467 BLAKE2B e4a47cc1f6c3ae1e20e9b7e966307a3c86ba7690d37691b9b65be7786ad84c3294947ced5f001477089c750ceba0dc68ae088c55c1562d137d928d3f85cb64b7 SHA512 7c2cdc856e7bd52e5b2b154c4abf93a534c561a201023be813b3c226ab36686a73462fad24faf8484ded90d092319b4e9ebbe91e426916f57187543859b60b6d
+EBUILD pypy3-exe-7.3.0.ebuild 3555 BLAKE2B 5d87f3ad1c2a2b796b404c7ca210ebc97faf75e6f4f4dd691c06702e80a7c7d0b77bab7ee6ebfbb75cdf30b71aa91085bb416a2da0e80ca4481e83438ea18721 SHA512 f38f5ccb7d7512bb28184f7ba67b1ba031c06b640a65039685278fe40a794132c97817ca7dd799dd161d27eae1898abc62af8a2c44fd27ae6372153675546136
+EBUILD pypy3-exe-7.3.1.ebuild 3458 BLAKE2B 70d5be9e72cdd482d6f2107143cd79ddc024d50ef242b7fdf467d91c9a2d3c1130510750c54bfa869220fb248aba7fb46c9ce7b50dd0cbc69d55c23c98a3b60a SHA512 2b986efb595c46e284e96cfba530fdb7f16a6d931f015b98ab1254ecb142064ca562e9cfa797d6b28dd942b74640ba5d7436afbc360c42582f45d1e105a2c7e3
 MISC metadata.xml 574 BLAKE2B 780347fb0394d2ed8955c96b0a60c66abf4d5835a584dc666ee20d2eb45d6fe4f54800d6bdbedbcd986165c12d89ad5cb730c24c4d85dd67f2d4d85a925a45dc SHA512 32b48188c88a38a5f107a891519ca7749e3c0566f8f0b4a148e14fa31f762c90814d85199efbeae651d8191558b12a13920e899e5a8e2e07b5fdaaca9c4388b2
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
index c32d68fe827a..edc7a19739c6 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.0.ebuild
@@ -10,7 +10,7 @@ inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 MY_P=pypy3.6-v${PV/_/}
 DESCRIPTION="PyPy3 executable (build from source)"
 HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
index 98ede03bf607..2d660d05c505 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.1.ebuild
@@ -10,12 +10,12 @@ inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 MY_P=pypy3.6-v${PV/_/}
 DESCRIPTION="PyPy3 executable (build from source)"
 HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV}"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~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 745bba22e460..de881b2e310d 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -5,6 +5,6 @@ AUX 7.3.1-gentoo-path.patch 1565 BLAKE2B 3c444b8112fd40de747fae75cc6d6f5ff8d2ecd
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3.6-v7.3.0-src.tar.bz2 21937786 BLAKE2B c53ac32a9cca1c4624160eae9f11b5705a59613f1e5100fbb0ee86118de5a7845b8fa5087165d7f5a077d20337dfca14a1c7eadbe768995e20e249ec271ac10d SHA512 313a4254262dd8d8b995a50bddbc360cfb67add0818e51a3e9ce25bda6a9b639e9fea8efe7da6adda76dff0a86a364544a13faa516e51b9ea6c25ec99223b435
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
-EBUILD pypy3-7.3.0.ebuild 7358 BLAKE2B bef55c6f65e06d4b49199c394edbd5485262294d9d634853fb6d216c4353d7dda427512905bf4838518f70b4b1949ad214f9fd04c942dc88e8512d657d2860d1 SHA512 18e43cd8a90a6046aa638bb3fa157342255b23e33dcb186de4f482dda9f328aad099ebe3be4967903170a58c28d7054906de1acd73a9a7581c78e5679cf0a11f
-EBUILD pypy3-7.3.1-r2.ebuild 6880 BLAKE2B e41f5bcd08e80672b3e37bfbca12bf69e7e3a9dbc61b129d9313d162d992d6d676e783da88977fc8974b9543cf17715a2888d41f9b234cffa24993e01e09f4d6 SHA512 763db108e3d29d905ee1867ec960aa92e49a348c4229d0c22c32608f1020284388ae38a6fcffdc1b18360dd727563da60ec1ffde8fa326062f8e4c7a84eeae96
+EBUILD pypy3-7.3.0.ebuild 7350 BLAKE2B e025f75151c4e084575f6d52f2b3a4cbb8e5619db81ff5b962e6c431f3dac1a9fe76b875f7da00c08715c171bed054f03c9c92737a20dc14eb9050116cb0a836 SHA512 5aaae803d0b9a166bf4f95ef5adff413e1b7671731af0d003895b2d9ccceb7580e73e5f6603b38fc4194326c984a314b4d99351436ff50a2766f66dc520e05d7
+EBUILD pypy3-7.3.1-r2.ebuild 6871 BLAKE2B 0ae1116b88d0c4b15df7e6e0450e820f870d9050c311b2ca4f73a6304dbb2dd79672c427d11f061c5576952b221b33b0a1e7da6a0ac7080e8668bfdc33129e78 SHA512 c34f6ac05f31697a373d20eae53b54593b6c1c60376be67367972b6f30101661775a05e20836f09b0e84fd4f67341eda2a929150bfea32c8fd2972c5e4086810
 MISC metadata.xml 317 BLAKE2B d7be288f31d09754073e991e0f753e673e47fe1698408d13ce01dd58aa458e9ff9894973b27a293e426c074fbafaf5ca784fdbae0c784c1a5bf5d51bad1abd21 SHA512 65d1795605d0120c94911b2c295d8da13e01f9ac6b0750a7d536be64bf5244e20e2bb7286b33e75346e0dea333dc8970c4dcf0e98842e28f5a202ee2ddbba294
diff --git a/dev-python/pypy3/pypy3-7.3.0.ebuild b/dev-python/pypy3/pypy3-7.3.0.ebuild
index 1c5dfb210180..83c31b2ebd99 100644
--- a/dev-python/pypy3/pypy3-7.3.0.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.0.ebuild
@@ -10,7 +10,7 @@ MY_P=pypy3.6-v${PV/_/}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
 HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
diff --git a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild b/dev-python/pypy3/pypy3-7.3.1-r2.ebuild
index 5b7b8f814b77..3388f868455f 100644
--- a/dev-python/pypy3/pypy3-7.3.1-r2.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.1-r2.ebuild
@@ -10,13 +10,13 @@ MY_P=pypy3.6-v${PV/_/}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python (3.6) language"
 HOMEPAGE="https://pypy.org/"
-SRC_URI="https://bitbucket.org/pypy/pypy/downloads/${MY_P}-src.tar.bz2"
+SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 SLOT="0/pypy36-pp73"
-KEYWORDS="amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyrex/Manifest b/dev-python/pyrex/Manifest
deleted file mode 100644
index d85ab999a2b7..000000000000
--- a/dev-python/pyrex/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST Pyrex-0.9.9.tar.gz 255272 BLAKE2B 852e4caf784677742ce6e207d9556b64adaeb72dce7ec8dcfe008f37524890e12017babf74fbd022ef84b6736669692df7d60a9e3b04697c0e30f585a59207c3 SHA512 724b14278760fffb751bd9dc24e18dbe85732f069d186ee89bc9f28dd8f912d5f69492d28e705f55de2db56c343f10f21c6a1c39bda1d7c234d09a3d5e192f6b
-EBUILD pyrex-0.9.9-r1.ebuild 842 BLAKE2B 181526ebd63782e000076d9d99b8a96fac82e22649264d2dd3a6f588a712a54db361945a49e35da8c4fcfd0a5ed2c7268cbf2ee24d72a4a75df8401ff9ede194 SHA512 56d8c98bc6e763d04a33b2a0e98ad733b5b8e5debe7db348ed6b72c70b1fc7b3f9d7695877b61f358886ff7a8e4d96e0c38d4f26643e612f14f6822db01aa8f4
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyrex/metadata.xml b/dev-python/pyrex/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/pyrex/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild b/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
deleted file mode 100644
index ab58557d6399..000000000000
--- a/dev-python/pyrex/pyrex-0.9.9-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-MY_P="Pyrex-${PV}"
-
-DESCRIPTION="A language for writing Python extension modules"
-HOMEPAGE="https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/"
-SRC_URI="https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="examples"
-
-S="${WORKDIR}/${MY_P}"
-
-DEPEND=""
-RDEPEND=""
-DOCS=( CHANGES.txt README.txt ToDo.txt USAGE.txt )
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	dohtml -A c -r Doc/.
-
-	if use examples; then
-		dodoc -r Demos
-		docompress -x /usr/share/doc/${PF}/Demos
-	fi
-}
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index b9953d336625..a7208c96a2b6 100644
--- a/dev-python/pytest-aiohttp/Manifest
+++ b/dev-python/pytest-aiohttp/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-aiohttp-0.3.0.tar.gz 6884 BLAKE2B 02b50fcd14192d23a4b257c2b7cb235966eff52b1c0ac87a4c61a20bc0babdb22eb999938c63e267a797d52ce57c9fb471232db3d0bc6566168a2d73f6404cd4 SHA512 4164166465dc40ff78a86304d1bcd4db9fb3f7dad3188f8ebe2ff151ed51eb0bf9c1b7a608d94cfe3339ee3b6efd4d5abbaa0691388460d5ac95635afa14984c
-EBUILD pytest-aiohttp-0.3.0-r1.ebuild 537 BLAKE2B d6cf7880451f350259f1aa937cbc29825c4a2f7027b5fb62c4fd011a8bbffb4f968445642939ca440aa14d732bd66fa3c26073968e505f073327e65914743207 SHA512 217bab4486fac2b50629beab79c910b4a70a39ade1a5aafd19a1c991a947660b6ab319098ef37341a303f87154c8dcf44e23b3806b85360e9acd34efa60dd89b
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 544 BLAKE2B 84f90724d142b489924266c828a92fbd242a8ca1fbe27af32671d33605ecb463d5d4d07720be4fca8e4d192d09c0b821121bfd76ac21f663e47d14985cd853a5 SHA512 1aae874cb459a5498e3225329e2049025ebb31e44a0e0b973611e3839ed052eb45fcd39b3f6f040149481e9b275335e2c01e6d439e1e703062549293188367cb
 MISC metadata.xml 382 BLAKE2B 24ac18217bfebed19f5049bbaca9955da1a0eebe08b8fd3f8f870db50369ceec3e68f4fae68604a399084122a3e3ae460481f855e4a4a3c419e494103d452c56 SHA512 73da71aee91bfb48dc637ef0e4d47a4693ba602f8cb15d0056cc0a14f4bb74d11cad7edcee8a1e892eaf2c3cf1d85735c9f5745ea0ae8d5026a7776c0550cf3f
diff --git a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
index a274f95e1396..7ac6c22a0027 100644
--- a/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
+++ b/dev-python/pytest-aiohttp/pytest-aiohttp-0.3.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 3e10db82b844..f82648487638 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,3 +1,5 @@
+DIST pytest-django-3.10.0.gh.tar.gz 68995 BLAKE2B dcc9ddceda88c32dab559c065feb347582e72ec5fcd9929cb2bde091bd5c89bbe09879901daf5dc0adc7e38921de5b4989e0d1bbefaa5eb1cdce1dfd2ef58a11 SHA512 7f66fa9287fb80082018613ec3b15a0da3f7a13075e85f0a2eff9e13358c993e56245c441d952d13f232bf7e49a05c799b4affbb844e90abaac736d86bb0a6c9
 DIST pytest-django-3.9.0.tar.gz 70498 BLAKE2B 0f3cf7ffd528f00dd0c7dd6babcb64833ec3684c7b62dcb8757b0f90cdcdddabffdbff240774ed6fb2a294e27da2acd7f396298ff2884be6e5b4c8d9c632d008 SHA512 92985e66f47c91363d19fe2bfe8ccab14212be577692f90923dbbae4c8d406cf698796d485af2b721863392810fc07c6f11ada0c61589cd1861f0d34a732effe
+EBUILD pytest-django-3.10.0.ebuild 823 BLAKE2B c1a76f9442190c12b95448cdfca27664ee5be6a3a1428f426c0081d4545c5d6fb194e38806e711cfd75aa61ff487440a075db31b05712b679e384ca0901395f5 SHA512 f66c00d35964d95b6fa516711866bbc38b02d94172f77cb679f6832313aac6c98490b3c135afbd830e3c1f5fb6045c932f81f6f73bdd423c4908339c8a72459b
 EBUILD pytest-django-3.9.0.ebuild 727 BLAKE2B e3cb064747983e53a3e9245a2cbc872f3ba1545b89047a81143bd103407ea8d942b7fe0423b3038216eb42e591302bf360570be407be1edcf78a8c20aaff58e7 SHA512 da6f7f1481b82c9380485c595ac74baa46dace9b059e5fc56abaa9924b08c87e9debddc50e7c2cac532c0b06ffa19d5ce5b8ae5ebf55850a8a5f3240f33ea702
 MISC metadata.xml 404 BLAKE2B 24556c59793b77f5c6de6f5c1210575d7bf7b5dc55aa7427d630d21311a77b31e3c846d5198ebf9b0407a0b1a36eae17bbd37a988c376eda666680871de30ea6 SHA512 33db1ea8ab6490e9b09daf334f48aa8db16db565e264b47b120797aee63c08c99aa27cae3c0a55a21c87552f99ad1ba9a13ba3b53e4562608209efb87a227268
diff --git a/dev-python/pytest-django/pytest-django-3.10.0.ebuild b/dev-python/pytest-django/pytest-django-3.10.0.ebuild
new file mode 100644
index 000000000000..0dbf356c69a9
--- /dev/null
+++ b/dev-python/pytest-django/pytest-django-3.10.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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Django plugin for py.test"
+HOMEPAGE="
+	https://pypi.org/project/pytest-django/
+	https://pytest-django.readthedocs.org
+	https://github.com/pytest-dev/pytest-django"
+SRC_URI="
+	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools_scm-1.11.1[${PYTHON_USEDEP}]
+"
+
+# not all test dependencies are packaged and this package isn't worth it.
+RESTRICT="test"
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
index 3cb5b014dcc9..e2798533dd33 100644
--- a/dev-python/pytest-freezegun/Manifest
+++ b/dev-python/pytest-freezegun/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-freezegun-0.4.2.gh.tar.gz 7058 BLAKE2B 1c89979d85dbdedf87a26de57d1cfe120ed52831e8d69c42b6117ac49c9eb7376bab018a23ca10b582fc583ca61a03930a86878c141b0c5bf4d807552484fe70 SHA512 2bea7746e4e6a7f2a979cbc5c6d7a2576e0e2631a4e1d5abb7f27f76d6c32b0520a277474c092c5e05ce257f2ba19091918f67e28b7a2da1d5829037c6b70c55
-EBUILD pytest-freezegun-0.4.2.ebuild 718 BLAKE2B 9df6f62483dc862312fc98d17951536c6bd86f171965a931e9f73ab3138b472608dcefd803f2c381630a548ce8d77f05a1c34e1809d6fe6740971b940caeff71 SHA512 6ad029714293f5c8d88db61a14f71db94b820f0a390f2089d75cb838558e4b40e911c855c2e8d1ea8bd6b419ee86e1f394ca6b473038801b1f0b477a1a7457a5
+EBUILD pytest-freezegun-0.4.2.ebuild 716 BLAKE2B f20c5a2094d032dc8b4c55ea626e8925f81199a4e43abc8ddc3707fe1b62fefef95c533c409ed921e449a227353e8758d179f05dd3586c5993a15a51de41bd1a SHA512 9fa412a231fe345501d970f78bdbcb432dac2df99456ffd641e2701f6642b518f1f1ba4fd4e3147b2b7ab6df1ba278b7dfa16855451e999c571bacb0204a1da1
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
index dc3914fb1791..03a8461f53fc 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-mock/Manifest b/dev-python/pytest-mock/Manifest
index b0e1d2ad8d1a..0be0c9a21ba5 100644
--- a/dev-python/pytest-mock/Manifest
+++ b/dev-python/pytest-mock/Manifest
@@ -4,8 +4,10 @@ DIST pytest-mock-1.11.2.tar.gz 22825 BLAKE2B d6843d1cb1afc0d5a242103ec4900d56418
 DIST pytest-mock-2.0.0.tar.gz 24665 BLAKE2B 31a3464e8bff5a2109716e95492ce1d59f2555769e69cccf4012bc268f88c5eeca99924006bdc78cc5e20cf227860d845bead9656aba1c081da58effb38ea100 SHA512 8bd7f634afebeae628470270c81f0198647bf8cd5b0fac438891d881d9823e40e814d598670bb9c9722b864990958e69d385c7c6a6e2adc81d2adcb303fbe0b0
 DIST pytest-mock-3.2.0.tar.gz 25569 BLAKE2B e6a1ab23142cf3d7ac9385ac221bfce680c7b982cb489306557b60ca81563718cb9b7fcbb149cccb2cf6f06de5c3fa737d28b0711a3197fbbc86e432c5f4e614 SHA512 1ff442e26339ac41414a8678303fbc7eab573964661c664ef029c3b3377df4ab40173976316ef99e49dd208dc1e3c7cd0a0090f5453865343090cc9439f85fa9
 DIST pytest-mock-3.3.0.tar.gz 27139 BLAKE2B bd7295b00ef78f6a4c73eb732faa3573c668bf95884a23c6753d6674f082cbcc565e84c5598e6015c60323f6fba2b3d344c63009c353c5db84ade2b339d83970 SHA512 6ce63495e326101942d1808fe937547cca781dccbdf0845a6a70bb7c990f443ae16f870169c9c8c32084cf6d8ce7cd17f74f90504bd505a7f916c9376b75ac5a
+DIST pytest-mock-3.3.1.tar.gz 27551 BLAKE2B 9e3602b988c0e27caa295d42d7400cbe7e3e30392511e662fa6ec16ec9fa4ef776d3e64b63b0345d1b520f753c6776103f507f91f0bad022544bfccc510b7e6b SHA512 ffd53974f82f725cf3bdbe750c1deb568ad1a12a67532eca93ff28d80b1cbcd8ebf709985f5473717c9d54345b251c1627c0567821e9e8b9e102db5c16cf7421
 EBUILD pytest-mock-1.11.2.ebuild 1456 BLAKE2B 79673aaf4f03ec6c5475e68a5eb5960bea359f538af1f710daf205956cba1a6216f51656659ca17f6e2d52b64922be3c74499cfc85bc64cc937f1b3e7faead73 SHA512 77b1c578805b102cc04bb9f58273cbb238c128e2708968a3d9f27ca727a347cf3dbabf4d7e6bf7bf47f3356daa3345f62ae516f90c7f807b39e8c0a7089ba868
 EBUILD pytest-mock-2.0.0.ebuild 1112 BLAKE2B e84f9be37980feef82140399dc81f41141ce42d2b3304bbb93c31b444975a1976fadbff5ebb5a9d4a1ad5127a04172a8d88d4d2be7c176560b980cb1d20de160 SHA512 c726eccf84c8e58b34a479cc7f0741f1e80830f39f631c223399f851351426b3959293990348823e794bbe25e0c0578d9ccb0990d1d03f87947e1a457e557979
 EBUILD pytest-mock-3.2.0.ebuild 970 BLAKE2B c2d9bf51aa358b3748bedbc4b8fc73a47f1ae9c6d0af02d98847ecf72edca0334f7d7846b4ad2c95da73da2063ea71722926afe1eb4eb3a8fb29291858594920 SHA512 322d6aa0f181cf291d0a46471018d1ec717dc4c8f1122ad2cc71a8d1feac7f025e489712cae90769e287444055b8f2887a5a447828d2ebc16e407f575312cd30
 EBUILD pytest-mock-3.3.0.ebuild 978 BLAKE2B 121c1744dd24724d6573014125f7551dc519e1958df58c684da83850ea50baa0d545e1cc90360780442acd0df173e9d27a7c84acdf27c397b7d1d8f6e3b35c8e SHA512 89c6d2e5c974101ce96916c46a5031312dc4adf2e5d88082c638478595acbeac69f259789f85520e8577a8b38d55e46b68bdfc6337292fea8cd81ce76eb66062
+EBUILD pytest-mock-3.3.1.ebuild 978 BLAKE2B 121c1744dd24724d6573014125f7551dc519e1958df58c684da83850ea50baa0d545e1cc90360780442acd0df173e9d27a7c84acdf27c397b7d1d8f6e3b35c8e SHA512 89c6d2e5c974101ce96916c46a5031312dc4adf2e5d88082c638478595acbeac69f259789f85520e8577a8b38d55e46b68bdfc6337292fea8cd81ce76eb66062
 MISC metadata.xml 457 BLAKE2B 9ec62ff0eda60ae60bb1b63509ecc696ae4256d1b3ff00c9b7f834ffd735f87edef57ccbfb78a2f9002632c4287b581a8a81003c45601b314059675a8f2d288d SHA512 0defca8aefe2c6bb95d36112b14645d93c8bc5b8db08956b97b9a42cf4a7e1d97170068937e6ec818e43d4d6afd7ef414e1d5d7f4b72bae71291eeda9caf5c1a
diff --git a/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild b/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
new file mode 100644
index 000000000000..a646df8a08aa
--- /dev/null
+++ b/dev-python/pytest-mock/pytest-mock-3.3.1.ebuild
@@ -0,0 +1,37 @@
+# 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="Thin-wrapper around the mock package for easier use with pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-mock/"
+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"
+IUSE=""
+
+RDEPEND=">=dev-python/pytest-5[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	if has_version dev-python/mock; then
+		# test fails when standalone mock is installed
+		sed -e 's|^\(def \)\(test_standalone_mock(\)|\1_\2|' -i tests/test_pytest_mock.py || die
+	fi
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	pytest --assert=plain -vv || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 0a1577e5ac7a..5e2118098bf3 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -3,7 +3,9 @@ AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe0
 DIST pytest-xdist-1.33.0.tar.gz 65588 BLAKE2B 096ffa9295ec0ef4d390b714b02a4d126aa33475b55591b91375f2da0c957802e007b990dc2051d5198f223b250a4a7294367c9da8f8969313a61a7e8ef18ebd SHA512 5e5b23e60b546779d4bbcc9b86c004bdb084689ba006c8bb8a7db9be60b6080f04a5bb2b1f5b43a5062b82e35493331d1da699d8a36177307280b06aa23a1367
 DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
 DIST pytest-xdist-2.0.0.tar.gz 65663 BLAKE2B 01f4154ae77c0ca67bef9cc0c36f9e3aea03ea554ba45ababb53647720795eae85e6c884eee6cd14037d566dc7bc46f49496aaaecfaaa31322b045339e6c01e8 SHA512 ad1e22ec6963e16f3f1408f0ed39c2945da8f8d2b332b29c36151bc1245e1b9ab532315d8315c22f93f249a64ab508fd78bccd5390be7315d962dd2382f63e0d
+DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b
 EBUILD pytest-xdist-1.33.0.ebuild 1056 BLAKE2B 94e4bdef998cbe0fb49237c364223aa761247ebea7970720491113aaa11aaf65b8afa4cf11bae2be7ad6a980bd060bbc18ef0484c2803f67dec76fb192963b28 SHA512 64703fa61cd35fd69970c3574b38fda94fe534ab59949092d5da6551e9093596f00c0a0f896d862077f250eb8e934bc6a74c120c41c33b2a23aa2657abf8fc24
 EBUILD pytest-xdist-1.34.0.ebuild 1087 BLAKE2B 3c34ddabce31ea834e64d0d36343c57e623c6ba5993599db23e4cdbb6548c8aea84e5f2700f2bb05924ca3600d44bc5c93aaee0d4c96ef2463631c503f30760b SHA512 b5fba8ca40bdee2869a879b8309d8cac32cdfe8fabae205e543609299d1e83ca07ae9843a4f8affc3ef628eee394f7b8aebb7ab2eabc34755f121bb908da51fb
 EBUILD pytest-xdist-2.0.0.ebuild 974 BLAKE2B 787263f04153aa40ab2aaaa4387a88cf25eae00d5df9cde0540a5eb852e08413cd49bdfc0806206dc1c606dd2a319a060adea0f614049491d139b3210ed8bcab SHA512 0373a088d378678d4edfc9cff2e1ae2f3531e52c923c691436119af4c9efc87e7e2e445cbd5d2ed462bd00d67004ca492b5714975791879b58950c4c205ac429
+EBUILD pytest-xdist-2.1.0.ebuild 974 BLAKE2B 787263f04153aa40ab2aaaa4387a88cf25eae00d5df9cde0540a5eb852e08413cd49bdfc0806206dc1c606dd2a319a060adea0f614049491d139b3210ed8bcab SHA512 0373a088d378678d4edfc9cff2e1ae2f3531e52c923c691436119af4c9efc87e7e2e445cbd5d2ed462bd00d67004ca492b5714975791879b58950c4c205ac429
 MISC metadata.xml 453 BLAKE2B 9480ffb520fafac8b32ec407fb065a89b67c085c7474032528e6a7489fdb26d288228cb75a502e407d92f0e53283bda58c2632e552d4daf65d37b78d33b3598b SHA512 13ec72148a023c16de4b51f02f8a34f5a29ba26bae56aebd8a89ca7a90f249126f92096d138d41d770eb1053618e58679211f468e3136f594514a936f414b265
diff --git a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
new file mode 100644
index 000000000000..454164201554
--- /dev/null
+++ b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# 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="Distributed testing and loop-on-failing modes"
+HOMEPAGE="https://pypi.org/project/pytest-xdist/ https://github.com/pytest-dev/pytest-xdist"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+# please do not depend on pytest to avoid unnecessary USEDEP enforcement
+RDEPEND="
+	dev-python/execnet[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pytest-forked[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/filelock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv testing || die "Tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index b5d099fc2648..026306518e12 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,3 +1,5 @@
 DIST python-mpd-1.0.0.tar.gz 60032 BLAKE2B 9293dfc85363f83041b1d73046dabe6a3243a63de495ba630eedbda96d1b080cfb1cc635801794a91103bbd4b9145733d63ce3ad252748d01ed596cd3b0f7895 SHA512 5fab12d082be39ac4a3477ea10b5d1fa350ceac23c97fb12a46f6cd0cfa6a83999f31528d6d7f74c1ffe67f4e63dfbe8fd3debcf917a6e3705bcf84a55a458ce
-EBUILD python-mpd-1.0.0.ebuild 1007 BLAKE2B 8023ff6ff33e09d6186c4e40330996a943811181c5a5771b696610474763567e84a072adae261409b6e8be71505d492bca9a9df21893d7e58e0cddfee0e0cd6b SHA512 8f850493ae4ca365f4e6a276c85b95db9644b9005a9c86affe6386191c30a2d559078063d45474639e2b812297510fd05edb11ed35c8fe7ae05763cc3a77d272
+DIST python-mpd-1.1.0.tar.gz 61104 BLAKE2B 274a829a3fc1404a4e3beb4df3eb563c1f781325590702761d3b3b5bc42e3cd9f63809aab14bb98e4879c10ccd55bb9d7306485ec22d37538cc2e36006a3039a SHA512 65b17ae34b2c731b7d45801211e49eacfc18239d5575075be0c11ace350da19b82dd151fefc42077454a988d3deb1b489471f739ddea2d915cb3c241669dbe32
+EBUILD python-mpd-1.0.0-r1.ebuild 1020 BLAKE2B 8e0f736227abad803aeb3d94712607265454338f33f675511c650d0fb69c3b70b9a38f6dc32cceea89092257aa053645a716e1a394229283c57878164c49fd01 SHA512 35dba9b2f2a0e20fd2693e4e9988ac28c1d09b55d69732de9999778e7e87f0ae97005f466c9d0871906229688c62e4fc5056726d20f8deae3b328e71ecc068ea
+EBUILD python-mpd-1.1.0-r1.ebuild 1022 BLAKE2B 727cf4377c298a1bbd546dbdd28c1ae13f51e7784144d9ba9b219caf890068ad230a407281c59ff2da95207ea791b21658d85bdedd85f8c189d41879a1cb9475 SHA512 62669f31efb49c3b7630b61ff5fb7eb89499f8a9e014b1d59ed354cb25db5c0a40339914662397e723831622863d0d04b78ca7cba198384b82f08ba20173dff6
 MISC metadata.xml 438 BLAKE2B 5429aa3c88046640fb1349404a60f1508f5d86f698ef410210507df39fd5b2d2502d8d2dafde32c8a6f02c2d01e92cca1dc37255435066dfb3a41d26850a367b SHA512 1101d7830907a54a4ccfa1a1db8e6abea802fddd3ee0827770d9e15157be6a3e9b491eebd4b80eab38074fba743fc0671686806c27accd060bf3948736a86c44
diff --git a/dev-python/python-mpd/python-mpd-1.0.0.ebuild b/dev-python/python-mpd/python-mpd-1.0.0-r1.ebuild
index bca3a1df982b..9c0299e7da29 100644
--- a/dev-python/python-mpd/python-mpd-1.0.0.ebuild
+++ b/dev-python/python-mpd/python-mpd-1.0.0-r1.ebuild
@@ -3,41 +3,46 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{6..9} )
+
 inherit distutils-r1
 
 DESCRIPTION="Python MPD client library"
 HOMEPAGE="https://github.com/Mic92/python-mpd2"
 SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="LGPL-3"
+LICENSE="LGPL-3+"
 KEYWORDS="amd64 ~ppc ~ppc64 x86"
 SLOT="0"
-IUSE="test +twisted"
+IUSE="examples +twisted"
 
 REQUIRED_USE="test? ( twisted )"
 
+RDEPEND="twisted? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}"
+
 BDEPEND="
 	test? (
-		dev-python/filelock[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/toml[${PYTHON_USEDEP}]
-		dev-python/tox[${PYTHON_USEDEP}]
 	)
-	dev-python/setuptools[${PYTHON_USEDEP}]
 "
-DEPEND="twisted? ( dev-python/twisted[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="!test? ( test )"
 
-DOCS=( doc/changes.rst doc/topics/{advanced,commands,getting-started,logging}.rst README.rst )
+DOCS=( README.rst doc/{changes.rst,commands_header.txt} doc/topics/. )
 
 S="${WORKDIR}/${PN}2-${PV}"
 
-distutils_enable_tests setup.py
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	pytest mpd/tests.py -vv || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
 
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-	rm tox.ini || die
+	use examples && dodoc -r examples/.
 }
diff --git a/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild b/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..fd322f9116ee
--- /dev/null
+++ b/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS="bdepend"
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python MPD client library"
+HOMEPAGE="https://github.com/Mic92/python-mpd2"
+SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE="examples +twisted"
+
+REQUIRED_USE="test? ( twisted )"
+
+RDEPEND="twisted? ( dev-python/twisted[${PYTHON_USEDEP}] )"
+
+DEPEND="${RDEPEND}"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/toml[${PYTHON_USEDEP}]
+	)
+"
+
+DOCS=( README.rst doc/{changes.rst,commands_header.txt} doc/topics/. )
+
+S="${WORKDIR}/${PN}2-${PV}"
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	pytest mpd/tests.py -vv || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	use examples && dodoc -r examples/.
+}
diff --git a/dev-python/python-nbxmpp/Manifest b/dev-python/python-nbxmpp/Manifest
index 798149997ea1..518a9f5eb948 100644
--- a/dev-python/python-nbxmpp/Manifest
+++ b/dev-python/python-nbxmpp/Manifest
@@ -1,5 +1,5 @@
 DIST python-nbxmpp-1.0.0.tar.bz2 111378 BLAKE2B 1dd0fff8e14bb438727a05ba0bd3db3613d91fa08f593cae3e77aec6240ece41a403a324aa3fee89e3173703f185e65e875aa1a49d877d2fc0235d664af9d083 SHA512 4eb1c4ec33ea4008b8ef4cf57e2a7a63450008974ae109af70455a49e716ea5ad612629fb2c7e0b06e69a77ee28b592a089469a645ecdd1bc2160a907804c2ac
 DIST python-nbxmpp-1.0.1.tar.bz2 112700 BLAKE2B ea0d271961a7e15a374cafa42678429b9f3395a8921f7cb92ff20664adf17f0482235240f0f849e8492d20aeb23d99eabfb1375eaeb48d55bf81aed4e3d702a6 SHA512 f3bda30b08e48ce59c19b705d45efe13286b4f8a27f44a60fe5759f9e7915beb655166d240ed1f875615f5995764a28a3c5f676e84068aab870f32ecb7d684a5
 EBUILD python-nbxmpp-1.0.0.ebuild 542 BLAKE2B 4bf7d26b351b76f4f4d22b9218d7a86ca565f10628aa422468579065ff7ec7394ff10606b834ac357ad2788ad4951b850a49c47dbf09d197c29977946ce2079f SHA512 41c82248248fcfd63ed1aee3a08440edbaf65edb0ce702f5fa1b3022109481ee1f5f68d3017eac19fa0730fe34e9631bd1144851256beb8b1cc53a253f163e16
-EBUILD python-nbxmpp-1.0.1.ebuild 544 BLAKE2B 99054d04a2461455d0cef5423949a4040fcada83d0580104a9042ade7a56b2826e4de2a6d5180e40c7070e8d4ec1e6c63143041e0172ad66daff51e5d078873a SHA512 0adc03096c96bee643c9f7bd34543e0a8a2367efce88e423e531fd2b3f88d8619e2e180b1dfcb1418cd848c2d5071c2c868490b140bd0a735e065c24552c1233
+EBUILD python-nbxmpp-1.0.1.ebuild 543 BLAKE2B 92034d3ae5b060090b02fcbb4db9122d9f2609421fe071b74a077c3b5f20658f96fdcaa17206da34842b66ab3d23251a68dc8d63ec818a14da5e0a48a2d235be SHA512 09afb2000ce3d093d1e29a3c346264fa5a5d3500351da2fc23c982ba670ec3ad13c6f8f92243de048c42a7a49a49066f737e627c9c30395ddca9bde23c0bc19c
 MISC metadata.xml 425 BLAKE2B 6dbbfb9cbb285e3c60d69855db7d3d6f098c1e7eb9b26e3accc70b79e440450add7984d64271bac57aaa029ac375e3b98f028866bb70043ff12dc010de6eaa51 SHA512 7f93c232860052e3ddbcf369a7234790125a2ab1831624f80a07a1b34a11c261f67fa88ca13549b1cce774d6b58899d2b6f2e0ae60c0fdecc6d1b4861d2c41ab
diff --git a/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild b/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
index fb10afe54623..5081ffeb86a1 100644
--- a/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
+++ b/dev-python/python-nbxmpp/python-nbxmpp-1.0.1.ebuild
@@ -13,5 +13,5 @@ SRC_URI="https://dev.gajim.org/gajim/python-nbxmpp/-/archive/nbxmpp-${PV}/python
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~alpha amd64 arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/dev-python/python-openid/Manifest b/dev-python/python-openid/Manifest
deleted file mode 100644
index 68fafa0d4816..000000000000
--- a/dev-python/python-openid/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX python-openid-2.0.0-gentoo-test_fetchers.diff 566 BLAKE2B 01b37542799405072abd96a87f5ac52853c894ca658f6202e2dd8ba528a5e865fa527fcba463338a6685996ad68be51c4993c38accbc961c972de0b70cbcac70 SHA512 60cb8b12312b3727263808647dd592e295ead7cebb384f92a33afe71292267e0ab95196dfdb7a01ac8847c0565c5dc9ad81f3cb95c00d6e4c9d816941b71fa44
-AUX python-openid-2.2.5-tests.patch 321 BLAKE2B fd3d0daf69dc6287191bb1a7dc61523dc13f5ce95adf8e07e7bd17f37a5f27a5984e9c85c15eb5a9f394523f2be97db67583c250a5d276b05530e95eb4dee7b1 SHA512 2d0e65763ee5fa4325e03e524ce179c367a1ba3119ce55bec458ed37bee05bb655c6a4dbc0d57ad4c20ebe22246b87da458cc688eed7d10f2cd1003f0da3f70a
-DIST python-openid-2.2.5.tar.gz 300524 BLAKE2B 9431ba3947dd2d2f7717e3f64ae91e4c014b85d67e6ce9daff5541d107c35869863de79273e6f9ad433193324d44821ccf9aaf885a6541ff7a3636a31c6ee8f5 SHA512 46ffeb07dc0e94c6e1160c824dfafd4a125746a05af1541e112bc2691bf655f75d0431ea273877899abc2956bb1f82369dea75d9b54282f33875f333f5166e7a
-EBUILD python-openid-2.2.5-r1.ebuild 1596 BLAKE2B adcba5acddbffb3a7e6678ca4c6f18c377130d229e57ee8e4e293f5f5c1de04a44451562f85efd2a630deb5ab4a6eb0f4d72b1a5dacff9a6b1980d01904f03c2 SHA512 e45306f0ee66a784ee0e08a1fecb44e10a5cb3522c897d97413bab0436122032975b3dbef9bb2b2060d0e5fbaefd5d116915f5d0f2349c2fbd1ba0a8fd58d2f5
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-openid/files/python-openid-2.0.0-gentoo-test_fetchers.diff b/dev-python/python-openid/files/python-openid-2.0.0-gentoo-test_fetchers.diff
deleted file mode 100644
index 67587a98533a..000000000000
--- a/dev-python/python-openid/files/python-openid-2.0.0-gentoo-test_fetchers.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- openid/test/test_fetchers.py.orig	2007-06-07 15:53:38.000000000 -0700
-+++ openid/test/test_fetchers.py	2007-06-07 15:53:55.000000000 -0700
-@@ -8,6 +8,8 @@
- # XXX: make these separate test cases
- 
- def failUnlessResponseExpected(expected, actual):
-+    expected.final_url = expected.final_url.replace("localhost", "127.0.0.1")
-+    actual.final_url = actual.final_url.replace("localhost", "127.0.0.1")
-     assert expected.final_url == actual.final_url, (
-         "%r != %r" % (expected.final_url, actual.final_url))
-     assert expected.status == actual.status
diff --git a/dev-python/python-openid/files/python-openid-2.2.5-tests.patch b/dev-python/python-openid/files/python-openid-2.2.5-tests.patch
deleted file mode 100644
index e5d17463ac95..000000000000
--- a/dev-python/python-openid/files/python-openid-2.2.5-tests.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- admin/runtests.orig	2016-01-01 03:32:55.835000000 +0000
-+++ admin/runtests	2016-01-01 03:32:59.163000000 +0000
-@@ -93,7 +93,6 @@
-         'test_htmldiscover',
-         'test_nonce',
-         'test_openidyadis',
--        'test_parsehtml',
-         'test_urinorm',
-         'test_yadis_discover',
-         'trustroot',
diff --git a/dev-python/python-openid/metadata.xml b/dev-python/python-openid/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/python-openid/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild b/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
deleted file mode 100644
index 5279018236b1..000000000000
--- a/dev-python/python-openid/python-openid-2.2.5-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_REQ_USE='sqlite?'
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenID support for servers and consumers"
-HOMEPAGE="http://www.openidenabled.com/openid/libraries/python/ https://pypi.org/project/python-openid/"
-# Downloaded from https://github.com/openid/python-openid/downloads
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~ppc ppc64 s390 sparc x86"
-IUSE="examples mysql postgres sqlite test"
-
-RDEPEND="mysql? ( >=dev-python/mysql-python-1.2.2[${PYTHON_USEDEP}] )
-	postgres? ( dev-python/psycopg[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}"
-S="${WORKDIR}/openid-python-openid-b666238"
-
-# Tests depend on twill, a broken package. Bug #285169
-RESTRICT="test"
-
-python_prepare_all() {
-	local PATCHES=(
-		# Patch to fix confusion with localhost/127.0.0.1
-		"${FILESDIR}/${PN}-2.0.0-gentoo-test_fetchers.diff"
-		"${FILESDIR}"/"${P}-tests.patch"
-	)
-
-	# Disable broken tests from from examples/djopenid.
-	# Remove test that requires running db server.
-	sed -e "s/django_failures =.*/django_failures = 0/" \
-		-e '/storetest/d' \
-		-i admin/runtests || die "sed admin/runtests failed"
-
-	rm -v openid/test/test_parsehtml.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	"${PYTHON}" admin/runtests || die "Tests fail 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/pyvorbis/Manifest b/dev-python/pyvorbis/Manifest
deleted file mode 100644
index 68b3067bd8a7..000000000000
--- a/dev-python/pyvorbis/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX pyvorbis-1.4-python25.patch 1562 BLAKE2B 4735697a7f75f6ef825ae22769d226d69bd10aee71653bef0ce3b2573dad670105683259fece3225aa7625265a72b33a996520ec6c7b96d7f94b1c0a36e6b2a8 SHA512 9d8e6dfd5e72ccaa2cc4fe67941d44fd607824d94b8f9b62d69bda7abd05abe08f10492f2ddc8b2c11c11371417861f22af48411d51b9d81973dfd6e1af3f631
-AUX pyvorbisfile.c-1.4.patch 564 BLAKE2B 6efa9eaf588ec47227bdb3d90157c7a746818d79900de88135ba9c357098e7ad306454c0e1fe18f097e4b1eb87b68badf03f984d1626e39d756c467e14f732e3 SHA512 73426fc32dac932e548555eebbac3a2c2ca252f18882eb815d40da4238b3e0e544e993d395e2c0df04dcc6d2e7b9cdcb6f26417390d91c6ef11c24530dfa7ce1
-DIST pyvorbis-1.4.tar.gz 39045 BLAKE2B 57fe96085cfed822ee3277d59b6d8e0bb3c5b88a92c615da2159a23eab74b0ba30c693e1b3b41716c7eb4dcfbfe332956535845360a6c6b19df95c73f9634fba SHA512 c0b5ebb5d22f97b20f56a0b49e43675764fe057afa2d5de22eab9b8b73fb542186e7488cb0ba31b7af433cef1a88e815eb3e88a4609a2657ae5fba1017bdb89c
-EBUILD pyvorbis-1.4-r4.ebuild 927 BLAKE2B 27d1eff1543871876003a759ca6d279ee8f5fdbb728671891b6c7ab5feda1868d4733c855b8970f6d1b4f306982628720a107c4b9795c7ba801d7425b5ab623a SHA512 c86101f8ad03ad2a794f58d1cb705d1a208e70222fc8945b2704caf57f5e68423306b83fb896ecacee398792f8ec144dc5c17153b0bead4b6387d766772bf2f0
-MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch b/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch
deleted file mode 100644
index 18028dc7a8e7..000000000000
--- a/dev-python/pyvorbis/files/pyvorbis-1.4-python25.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ur pyvorbis-1.4-old/src/pyvorbiscodec.c pyvorbis-1.4/src/pyvorbiscodec.c
---- pyvorbis-1.4-old/src/pyvorbiscodec.c	2003-05-13 11:17:13.000000000 +0300
-+++ pyvorbis-1.4/src/pyvorbiscodec.c	2007-09-20 01:57:54.000000000 +0300
-@@ -118,7 +118,7 @@
- {
-   vorbis_dsp_clear(PY_DSP(self));
-   Py_XDECREF(((py_dsp *)self)->parent);
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- static PyObject*
-@@ -447,7 +447,7 @@
- {
-   vorbis_block_clear(PY_BLOCK(self));
-   Py_XDECREF(((py_block *)self)->parent);
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- static PyObject*
-diff -ur pyvorbis-1.4-old/src/pyvorbisfile.c pyvorbis-1.4/src/pyvorbisfile.c
---- pyvorbis-1.4-old/src/pyvorbisfile.c	2003-12-19 09:11:02.000000000 +0200
-+++ pyvorbis-1.4/src/pyvorbisfile.c	2007-09-20 01:59:41.000000000 +0300
-@@ -173,8 +173,7 @@
-   if (ret == NULL) {
-     PyMem_DEL(newobj);
-     return NULL;
--  } else
--    Py_DECREF(ret);
-+  }
- 
-   return (PyObject *) newobj;
- }
-@@ -195,7 +194,8 @@
-     fclose(py_self->c_file);
-   }
- 
--  PyMem_DEL(self);
-+  free(py_self->ovf);
-+  PyObject_Del(self);
- }
- 
- static PyObject *
-diff -ur pyvorbis-1.4-old/src/pyvorbisinfo.c pyvorbis-1.4/src/pyvorbisinfo.c
---- pyvorbis-1.4-old/src/pyvorbisinfo.c	2003-12-19 09:51:36.000000000 +0200
-+++ pyvorbis-1.4/src/pyvorbisinfo.c	2007-09-20 02:01:58.000000000 +0300
-@@ -134,7 +134,7 @@
- static void
- py_ov_info_dealloc(PyObject *self)
- {
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- #define CMP_RET(x) \
-@@ -418,7 +418,7 @@
-     free(ovc_self->vc);
-   }
- 
--  PyMem_DEL(self);
-+  PyObject_Del(self);
- }
- 
- 
diff --git a/dev-python/pyvorbis/files/pyvorbisfile.c-1.4.patch b/dev-python/pyvorbis/files/pyvorbisfile.c-1.4.patch
deleted file mode 100644
index 5d1d8ffc7c77..000000000000
--- a/dev-python/pyvorbis/files/pyvorbisfile.c-1.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/pyvorbisfile.c.orig	2003-12-19 07:11:02.000000000 +0000
-+++ src/pyvorbisfile.c	2005-09-03 20:02:19.000000000 +0100
-@@ -190,9 +190,6 @@
-     /* If file was opened from a file object, decref it, so it can
-        close */
-     Py_DECREF(py_self->py_file);
--  } else {
--    /* Otherwise, we opened the file and should close it. */
--    fclose(py_self->c_file);
-   }
- 
-   PyMem_DEL(self);
-@@ -260,7 +257,6 @@
-   
-   retval = ov_open(file, self->ovf, initial, ibytes);
- 
--  self->c_file = file;
-   if (retval < 0) {
-     if (fname != NULL)
-       fclose(file);
diff --git a/dev-python/pyvorbis/metadata.xml b/dev-python/pyvorbis/metadata.xml
deleted file mode 100644
index 9e5274c5b4ae..000000000000
--- a/dev-python/pyvorbis/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>python@gentoo.org</email>
-	<name>Python</name>
-</maintainer>
-</pkgmetadata>
diff --git a/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild b/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
deleted file mode 100644
index 8b1d096f03f4..000000000000
--- a/dev-python/pyvorbis/pyvorbis-1.4-r4.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 toolchain-funcs
-
-DESCRIPTION="Python bindings for the ogg.vorbis library"
-HOMEPAGE="http://ekyo.nerim.net/software/pyogg/"
-SRC_URI="http://ekyo.nerim.net/software/pyogg/${P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=dev-python/pyogg-1.1[${PYTHON_USEDEP}]
-	>=media-libs/libogg-1.0
-	>=media-libs/libvorbis-1.0"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS COPYING ChangeLog NEWS README )
-PATCHES=(
-	"${FILESDIR}/pyvorbisfile.c-1.4.patch"
-	"${FILESDIR}/${P}-python25.patch"
-)
-
-python_configure_all() {
-	tc-export CC
-	"${PYTHON}" config_unix.py --prefix /usr || die "Configuration failed"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	insinto /usr/share/doc/${PF}/examples
-	doins test/*
-}
diff --git a/dev-python/qtconsole/Manifest b/dev-python/qtconsole/Manifest
index 3fdc95449305..4da75e57cff5 100644
--- a/dev-python/qtconsole/Manifest
+++ b/dev-python/qtconsole/Manifest
@@ -1,5 +1,6 @@
 DIST qtconsole-4.7.5.tar.gz 424850 BLAKE2B e2d2ba50ce57b13504bdf8ad1ee3374b76abc980f0b74dfe1177c3f066ba24382bc51f8d3db2614a8d74b198ed20f01fac67c288602ae6e31fe90165e63ab9e9 SHA512 ee57ad2de5b840ee4e7f439be08a3c82fd39ef1bf6113b7eda95fa1aabd132c799ff584a2ac7f7e2c89df4bcd9a9409bbaeee108a6bb49e6197d2e3395336ad7
 DIST qtconsole-4.7.6.tar.gz 424919 BLAKE2B d973b3b94dfad1b38603695e22927bcdcb8a4f2db9f4a638d5fe6a83c24061153dbaa36c26e632708953af32a015af1d40ecbf175dd5314a3b954b15a6625cc0 SHA512 e4e12eb90533e922786b5b6517fba5d9c4dfedf00547f1403c8cd65fb464f5c1a13517df69924e4428e9a8a811dfc359a7768fbaa90adbe02d79cba9a5aa852e
 EBUILD qtconsole-4.7.5.ebuild 1251 BLAKE2B 5abc609de0126c2838c063fa637c814c980209738cc03569eab99bc799e9e904e2fe19161751811031d7653261e2df9487483b7efc867055fb834bb13a991278 SHA512 95a8268f168336bdc7a613b3dab0019a658f5fed6a1285554eac8ffcf78129d4222278b54a631826a510699872f4e91ff98fd19eb3e8d17489e022d46ba6452c
+EBUILD qtconsole-4.7.6-r1.ebuild 1254 BLAKE2B c07c73315ee0df652a09aed64be94b07a974f165bf27294ee5d38d05614fc7fa9e2da560cd99c4f25f8ae4dbbfd915c4a503b29391aa67d2defcefc93054b938 SHA512 784e2034469a9c1552010a766d91bb0e7cf33fed11d372c1442857f5f31e19b9d956632123d61a792475764e263c37360211bf1ded27c89ec4afbe4a705cc9d7
 EBUILD qtconsole-4.7.6.ebuild 1254 BLAKE2B 15c92570050a4b8552bfb34888d5baec793537525beed4c2e691cf48fb1425a0407ab6d0dbc2b56004acb6c9ae7c1e691aec9839d84be02a90831aceffd531f1 SHA512 ed4edb7506bfcdcc63ca26f9a7ef63069a8d24d4eaee865f1925404fbd7ecf3b01334b2663cc28028a9c4e176f07f7e75506d20fd822a1f8fa6fe9375e1e1055
 MISC metadata.xml 689 BLAKE2B 65c50141dd002a264402eb90385ad3203ebdec1fc47bfa0d94055a82bd98bbe93cc0cacdd4b0f9cab0cc36ad3ea22f500f53c55398347b6cc1cada2569abdb22 SHA512 40e7ef3f4437946e75f1a2be9373ba06b3c58b4ebae0cef8958e2c101aa855e4c92aa0a426d2a74d8e946d05e176690006324db1d8514598bb574f1071644d81
diff --git a/dev-python/qtconsole/qtconsole-4.7.6-r1.ebuild b/dev-python/qtconsole/qtconsole-4.7.6-r1.ebuild
new file mode 100644
index 000000000000..4e7d19048ac5
--- /dev/null
+++ b/dev-python/qtconsole/qtconsole-4.7.6-r1.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_{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/rarfile/Manifest b/dev-python/rarfile/Manifest
index 68756287704c..5fec6770c94f 100644
--- a/dev-python/rarfile/Manifest
+++ b/dev-python/rarfile/Manifest
@@ -1,5 +1,5 @@
 DIST rarfile-3.0.tar.gz 110665 BLAKE2B bdafa33600f1c7791af40f4e8c7b6a43e502980dab22bf6792a1b19eab53ea6c29bb6cb2ae4989b9f43d58c326b89ce466b9e2f82f60bad4892131895b15d400 SHA512 b0b816bf09fe455e4d8d35b447c30e7810468a6927555164a1b513d4161f3fd4e77a37439620bd935c3a12e46b1e5eda3e35d7d281899d2f9fd26b6e989aa6e4
 DIST rarfile-3.1.tar.gz 121579 BLAKE2B 3419eb0433866e060cc55fb94806a1ef0591c811e3b88eac97b05519e8e72cdb7da1e7f19fec1d5cadf60fa4caba4717cafe3fb1133556ef2d6f327da52c8c34 SHA512 eb910b0adfd1f28497163aa7994ab268d7780707e09931cb01014ffa51d985410b0bc17e5fb9ca133992b28115a0b5f443d01215624145d280f29e7065abb9d9
 EBUILD rarfile-3.0.ebuild 484 BLAKE2B ef54ff43da9b5c2cfc29f56d1efd1c98cde8394166bea02be00152a19772ef6fda05effc569c7efa6726ee95f0ad0927f25d813e24688d083b1b0dfe571b18f1 SHA512 0eacb1c5d1a69a61e0ea644d3236764100c58d9aae8da97f700970f0af101af482b83dc895fdfe3f13f1aca44b3bfbc524b60964b11749208f4aac60ed9fd15f
-EBUILD rarfile-3.1.ebuild 475 BLAKE2B 07ab2c877f2d0c35af4ab1e6c8dcd512b8185ab288aa9b52f3ed8d2ef2586a34f556a5dce240a2ca512eb2ca8e073515d557ce517086e3167cb2f5fda6d3dcef SHA512 952362ddefa6221f2c69efce8fa7efe2848669ef8bd317c5a0eac694040f40e5c81986a4ebd474963105dea165d03c13bbf0f37d32cccf867ba5a321d59488ab
+EBUILD rarfile-3.1.ebuild 474 BLAKE2B 35053b5a0566155c983f5c5decddef9062fc7ed0a919b534b3388fa12c49dd3c99f70210affcfbd2d4f49c737924df334656c66e1757f1d4abc0ff4702c46d4d SHA512 1723a416989bcbc4437581716f7dc6b8ad18b91950bc98aca54a7e65cbbb687d6de7362c196264df771ffe25ead591dce022b649b9ced8685e0154dc22454448
 MISC metadata.xml 530 BLAKE2B b0f4d62ebbfab89b9f927c24dca9b138d6a3b9c2754a9d62684e634e0868e5a6007ffb1f4c52a6568bdeaa8bc9095d2789f6fa994e7c6e1adb71566bac54b9f5 SHA512 714dab1f6654a89d13b5443b91a3713a360b8c73187513021cc97c1be1ec09628c78b01c86f84d886931614c83caea3496a11202f64c195d5ace4015a699a861
diff --git a/dev-python/rarfile/rarfile-3.1.ebuild b/dev-python/rarfile/rarfile-3.1.ebuild
index 7f2e756a2df7..3cb5cca0c8a4 100644
--- a/dev-python/rarfile/rarfile-3.1.ebuild
+++ b/dev-python/rarfile/rarfile-3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+compressed"
 
 RDEPEND="compressed? ( || ( app-arch/unrar app-arch/rar ) )"
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 8636a084ee46..e83a07f7964d 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,6 +2,6 @@ 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.42.tar.gz 2883081 BLAKE2B 22f4e7ebc233895a036eeb94c5beb9206be561a8a44895b36291a4f840603a2fec90107ac60e749f99be629202801c63ff67d5034d19b42383f2df12d457104d SHA512 f52717867190bf7812fd566d9ec3044198db809cdd0f53cc9dbfa92503a202540db659369e20bba3de07cd28eb10515d03b85700ac138c9394dc9eed1f08b8f8
 DIST reportlab-3.5.48.tar.gz 2890211 BLAKE2B bf0cde9b9e80459caee37949dc90a777a56da5d2c8e6dde09bddbdac2f2c55031d92b3c7c6346b6f563904525020c0e4f666b5e2effdd761c81412df21ec60eb SHA512 ce31cb7e9e2226cb6d59d446f90c1df94f0f84077d298f7ba862f5c75995afa20fa077b1ee1ab9a145c9276cee0d75fe61237e001ad0e5b96dfb0027adff3db7
-EBUILD reportlab-3.5.42.ebuild 1347 BLAKE2B 4da7e80b0fcfd338baab66c92ae0d769980174c2bc40bb85f226f30b1cb3dbbf2a8cfdc02f0c7a004732f1957f25ebb0534f1e6ea899c9de81cce72e25ae723e SHA512 f6da0177fc589bc60f8b21b312ed08913fd30f0811f0510a621c46d3f91c125ef8627bce5ddaec9ee2d41042ae4329159fa37fe8461a8617d79fb95bd4c399da
+EBUILD reportlab-3.5.42.ebuild 1346 BLAKE2B 3ae7be7013162aed337129dded6b65fe4b393ae0a90ec389d4cd3e8ad5db6b9c93ccd4191d91846e97397976a18c0832b0b5ff60c5cea8efc7c6acac195b486c SHA512 08bd12dd05d8ffebef0b43987620ede57e4da21de8326f428ae18980c9698b43c20309d1756a59a01df13932eb2629f73e29f6bc1342d0c2e471dc1a3ba6371f
 EBUILD reportlab-3.5.48.ebuild 1437 BLAKE2B 4dda551899e2d199aa8d6e444e237d305d1bddfb52bbc3deed7ff6a6cd43d2973770f9886023cb1fc2203f6348a621bf0acbaacde882dd350592e397528df41e SHA512 1b3637077286cfc8635ca4bd0c7da8ea9b1acba63c80b2dd40343085d1f985135cb0e1ebc97c75ab0363e74b71a082fb0be69c25423e70910edbc2e11e2513c5
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.42.ebuild b/dev-python/reportlab/reportlab-3.5.42.ebuild
index 14abd20e320c..5d22adf0bae2 100644
--- a/dev-python/reportlab/reportlab-3.5.42.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.42.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 
 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/responses/Manifest b/dev-python/responses/Manifest
index cc116a0a39bd..d0d5d67878ae 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,7 +1,9 @@
 DIST responses-0.10.15.tar.gz 25350 BLAKE2B 6d9dff99e2dc18b7361cb2b75f0438c62ab771364b1a572823cf1fb0cdb6175fee8c4cd372ac5d1b27ef31b88e66dd7d1410429213af240f6f743f0c85e36d1b SHA512 513df58b40968e271cfb429ee09ab2ca7c3cf2f6ebe3607276ed1b949670871f8d6993449cfd5871bfd119cda0c0628dce6ebe8ed40595696e550541413f12b0
 DIST responses-0.10.16.tar.gz 25420 BLAKE2B a71402d30a30be18a445f2377498760fb00c5ed1fe0f61503675b4d0730bfd305711a0d56dd972a7c1cb439c3202819570eee81b6214fa723725d584f96905db SHA512 ec6738d3f7a33f7e3fbc95b1aaa5a10aa038dcbd8c9fdc4dc0ffc263e0cd613e6f2ce8e2fc2b59c91a30dec9677219fbb2630ec4d5d8d4340526fe72e24bd89f
 DIST responses-0.11.0.tar.gz 26534 BLAKE2B f4558884bec08c21186f4b79dbbce1b87fac27992cc5dae5f4eb50291daa1fb3f69253309eeb25f5ed84419ac06290e3e81e3b3ea85aeed2691aeb975e91734d SHA512 8594c3a85fa43c1464e30620e8f323084cb3d9e528936abaa8a9b81a5f719511c032941e90a4e03170d066bc90b9a12c2ad0a804cb43f9d616b0f9735dcf90f5
+DIST responses-0.12.0.tar.gz 26527 BLAKE2B 71769b683f9c672d52844803e76ff66def61a2a56f788d93cfbad5a7e0f967b003244ee32f83430a97f7726c732b4e8b25baf65ec35535da1a6d609e4cfefe7c SHA512 484076f7942ff12977f06bcc850f1afcc9ae70ca2b7986a647c972893562d28cf3cd7226c87d8f5588fa4500be34dd5be0c7d1df6b8ddcd134455540d3dbe6d9
 EBUILD responses-0.10.15.ebuild 679 BLAKE2B d645fc1d382f505a1e6edc028ea85e21aabb3f3af20748affa0cb9ee5da00cd814b6becc8dfe064636ace682c88778620aee83f8716e79f215b1725a752c8312 SHA512 20d427ec114cb68fa7f1a711d21d489797ee8f9d9dbfcdb281be0c99c6e7920d54b7a3376cd8b761cfb7af5f3eceb404d9cfe6475d68f7d607e60f40d4e2e031
 EBUILD responses-0.10.16.ebuild 741 BLAKE2B f468d5cf7b8ac61d6712938ef415b12d4a92fb82f78bbdce63c67f073a7db5a2a858ed3bdb832e078fa09e4996f32702ae42506a359adfd2618c1fd1d9b1ea2e SHA512 7051cd03689b283a125be6e27f49b50120ebf675f221985f4fcae839a7239ecbcf2006026a56043f7526dc66feff2e3bb778579ddf05bd18cf06f228be5c61f3
-EBUILD responses-0.11.0.ebuild 741 BLAKE2B f468d5cf7b8ac61d6712938ef415b12d4a92fb82f78bbdce63c67f073a7db5a2a858ed3bdb832e078fa09e4996f32702ae42506a359adfd2618c1fd1d9b1ea2e SHA512 7051cd03689b283a125be6e27f49b50120ebf675f221985f4fcae839a7239ecbcf2006026a56043f7526dc66feff2e3bb778579ddf05bd18cf06f228be5c61f3
+EBUILD responses-0.11.0.ebuild 754 BLAKE2B b69e9ec2b714f75bd6f381fa5570ba8e380aaf34df52aa3c3aa9211f71dd00692040c2cd4da25ecf83208c2e2c6bfc4ec5f6428ac4ccf8148e5afe3c52ecaad7 SHA512 424dc0b08a0f378f7f3040ed1b046dcb931dc5005d33f0cf2eeabc271f44b3a3bcde4854a745094620180daf0917bf7f3b12869e99ae0272a22a8d10170b49a1
+EBUILD responses-0.12.0.ebuild 767 BLAKE2B dcd8765793b7a5a89c318765be5526b797d53792a186ac7e92cbce64cf7a1e9ae76a935464d9e6a37620002b6f14ac2cd7741f47f44550421e9ec3e17c2c2181 SHA512 b678427ef8b2578e06816921b223df22a172f493a6e7fa9f2f82c78fb8f91dc64968211dd2393669cd2e68f1c6d163e3a370f2f613292e21f0e31d86c05158b5
 MISC metadata.xml 462 BLAKE2B c0afeab502da79631572ffa360f5b5cb19d41be177e9dc028041642cc756e08df0df9685c49825a40f3f343a29defe87f1f1e4805568d1037eab73895606221e SHA512 1b33da0d6d1ea49e0f108362c903f3521704ce8eaf1f328441eeb6950c19900eae5abf08204a0402cf7387077f32da97e5a84b2b6bb7c347a39a38e18032de33
diff --git a/dev-python/responses/responses-0.11.0.ebuild b/dev-python/responses/responses-0.11.0.ebuild
index 7dc543a4597d..6b113d33a72c 100644
--- a/dev-python/responses/responses-0.11.0.ebuild
+++ b/dev-python/responses/responses-0.11.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/responses/responses-0.12.0.ebuild b/dev-python/responses/responses-0.12.0.ebuild
new file mode 100644
index 000000000000..e92b34b1dd04
--- /dev/null
+++ b/dev-python/responses/responses-0.12.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="https://github.com/getsentry/responses"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+	>=dev-python/requests-2.0[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index 08196bab5a45..9a1fa8d0c9f0 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,5 +1,5 @@
 DIST rfc3986-1.2.0.tar.gz 40162 BLAKE2B d51db37285366fdc7a6d25632afe440bbcdf4fbca46488082286824f046cfd81129b8f0e0695f986120276cf446dde5751dc52ebeb5f2f61f60c5acb92f2da1a SHA512 b88bdc47fa2daa6a9ffc339b1b997a85d0c8b3bf3ab271554e2a1a684c0394370e9cba07a82a542f39533a4c8cae69414234545db6caa2508e0ee7e7f8bdff3d
 DIST rfc3986-1.4.0.tar.gz 44912 BLAKE2B 595a644f8f92823ad31113ce88218cb30d16b37ec7303c0d8e89d2d2b1e18448d99003e95d61dcf09cb64aae517037bae798d1e89c74b652d517a648e80856e8 SHA512 dbcddc09331b794eafed8c2d7b81b7b632ba5cae2741e33ad12e781bc923427a05febd2f2715d037f35769b18c8d790546dfd4bbebe6e71d35777745e446888b
 EBUILD rfc3986-1.2.0.ebuild 695 BLAKE2B 95fe3ea442f935fece537c2f9f734505da65d160b86760fea67632660831b0d270d65b23987ffcae61df03e7ece9f172ae1a10e0b1279b7db2886332f909696d SHA512 3a2f6f515b046b9a22d83ccc33ff7aa6f5c6dd004931f938d26d902b9d3368cdb7ad7679e58c340cd4a104ed260e81d7669e76267b99e0e355b38bf8d5bf2b0f
-EBUILD rfc3986-1.4.0.ebuild 666 BLAKE2B 64e5a81df7d6ba6fa5fc5c7add12c4427391a078fcafcf5634c6ec4801ec62d177333787a7b5e69324dae4d7cabfeb70b85d7a4c96ccc7d8bed9b30b986332d0 SHA512 0898d752e55ffc867e775e0382889d4cff0a5620b50fc9857dcd352bba91f5ba8ff4d048ea364551b8f66f60a029622b5aab93bda5af0877e873cf1a0c9f2707
+EBUILD rfc3986-1.4.0.ebuild 665 BLAKE2B 6409aeaa2ce678f1500ab807365ba6922609e54e349e6336cf83a4f8332e5ded854eb7001bbad0d5ee8a75f02518241309c69c146f2b9ede65380f0fbb74ecdb SHA512 417b9080e7a40cfcb7648d739a7fa97781cfbf6fca8005d93818d42730eb2c3264ef28e8f8fe501fb76d6050bd6e20a996dbd47c4dc77d9d11923098eda2f750
 MISC metadata.xml 740 BLAKE2B ad52fb6e822fe4ab8e910af9f4896079209f0704c649d240464eb283c9796f5bead9303b7bb02f5db5049b9afa430bd190871c1bc391a21647eceb0d353c02c0 SHA512 3b74fb8b21300169b3d9da6c8a14bcd950d277c56ea242a73fc56637d853cba64de931567b19c0cd8b9acd6f7b8e486fb9e1ce0716b1c291669e6588caf6611c
diff --git a/dev-python/rfc3986/rfc3986-1.4.0.ebuild b/dev-python/rfc3986/rfc3986-1.4.0.ebuild
index 0c700a7a936f..c4344c9d9d9d 100644
--- a/dev-python/rfc3986/rfc3986-1.4.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.4.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 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86"
 IUSE="idna"
 
 RDEPEND="
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index dbaf78314a1a..38f072da5111 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,6 +1,6 @@
 AUX rq-1.5.0-no-install-tests.patch 449 BLAKE2B 3a69c2fcf868c21565b2660fafb519fd175cb375643f85d91754a651fc012d12db32c8875b8f8236407672aaa787aef1e4484a4e33b9582c65aad00c525a7180 SHA512 373b94f956aded0d54ecaa04250533f564f3a8e81d693353c4ce63dfd754f013e741084faaed976ae9b0aca4c0f2a21cf70f2118820f157282966a8446f7c1e8
-DIST rq-1.4.3.tar.gz 52258 BLAKE2B fd2bb19239ac3011005b34cf041e7736794a27b2097a7ff1808a716d45ad224ad349e316f172308175174f59ff0d3d2bbe0c6778bd66cdad6755da2740898c0d SHA512 177c748148a109efaeddf14b3847e7980882f385ba0e346ccfa72983d584f1c739417383c6eec83370a66f1ceeb5f955de9d5ccf87e4136074aa52e2f9144bd3
+DIST rq-1.5.0.tar.gz 569320 BLAKE2B 5349f6e806c5348e584513bf8fe8828c44909b8f4e53fcdfe40e0c617f162859dbc89d4595993c29227a25cef5b6ddbb758c51c3e50b442ada62eaca0585490a SHA512 87eb83de529afe3a1e0a9f2b1727aba97482e3e55024aede29ad6e12ed5b92ca147bef8d720a09b34939c04ac5e37642147aea5b1b7686ed4b2aaacdcf998f6d
 DIST rq-1.5.1.tar.gz 569967 BLAKE2B 9de43fa2d88a58186e8889163f4c1ea92da068c3652c5e32008a39c0e3b27e06f4a1c696a88d1dbf5b05d280bff9c1c56a1995673e9d0ff3fb3a50498729e96b SHA512 2a03b79c7f1b253e2974007616ad3342e0b98ef9f57b0ca9dd41ecb4319074cec3ae4ba5f8958f54a1c2a6342062d74a33ec6d03689f3a89074854483af74b4f
-EBUILD rq-1.4.3.ebuild 590 BLAKE2B da2d1cb2e88e755f6a5feb62a6183e0cb9368d81de90b028c28d8d3bff4650b3b98bd04a0203e555ddc17276a1d27291a04ffcad9590da5867951d49978dbfe0 SHA512 777bf196a20ad2266bbdedc1b37a6176c07e25a6e0defe08fd693b8ab5fa4ab599fb40b81414138bad6b7004bb4dfac5d6dad55954f196bd7d382b4827568a76
-EBUILD rq-1.5.1.ebuild 1705 BLAKE2B b44f5c73f0ac7fd44508e033a53e73969e96ac47d3ed18925fa48b9436455fc58dcd5997f64ec77d2645bed8925ba1557269e8d91aab5e0d819db3876126d34b SHA512 962f1f6d4ef16b9fa0f0a13657e8f7ecf430cfec7c67a16b6004f55a75c209993a74cf4fb061444a647f04b1ac8e97aa4566e5d36739a2cecdc43eaea2b5f3b8
+EBUILD rq-1.5.0.ebuild 1707 BLAKE2B fce5cb210014c7d1fedef4863a03395bbae186b4f11dec7dcd777a787e8c759899ec803654fbba9d34652ab2de05418ecccdd8de759c257074c7cc7f9612fa22 SHA512 35b86e12b4dde7dfb6e8e10f949ea33f2d96b2a5970f8e3e93d6a65d232b93397cc204e23058a97ebb6ec9b0ecd4a3a77d5203a569f699b6d00b781d102800c9
+EBUILD rq-1.5.1.ebuild 1707 BLAKE2B fce5cb210014c7d1fedef4863a03395bbae186b4f11dec7dcd777a787e8c759899ec803654fbba9d34652ab2de05418ecccdd8de759c257074c7cc7f9612fa22 SHA512 35b86e12b4dde7dfb6e8e10f949ea33f2d96b2a5970f8e3e93d6a65d232b93397cc204e23058a97ebb6ec9b0ecd4a3a77d5203a569f699b6d00b781d102800c9
 MISC metadata.xml 537 BLAKE2B cea9e02497c7b7bbb6201bd29fba755b56a3202e7442f3995eb33d7d7467ed8f52f6448fd351963e350bb3c7fd77ed94d3413f84a6cdaac0878d5872964b1076 SHA512 abff6d380c7da5b198297b9804e1ab8b950a051226f8f2c7bbbbc875dfe6a6efdb73f58800b21658406000280d91c401342552319e124b6fdc6c3e72d2c9cb32
diff --git a/dev-python/rq/rq-1.4.3.ebuild b/dev-python/rq/rq-1.4.3.ebuild
deleted file mode 100644
index 64bbcfda25c7..000000000000
--- a/dev-python/rq/rq-1.4.3.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-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="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-DEPEND="
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/redis-py-3.0.0[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/rq/rq-1.5.0.ebuild b/dev-python/rq/rq-1.5.0.ebuild
new file mode 100644
index 000000000000..f812fe5722f3
--- /dev/null
+++ b/dev-python/rq/rq-1.5.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( 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/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
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.5.0-no-install-tests.patch"
+)
+
+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.5.1.ebuild b/dev-python/rq/rq-1.5.1.ebuild
index d62e57cf1504..f812fe5722f3 100644
--- a/dev-python/rq/rq-1.5.1.ebuild
+++ b/dev-python/rq/rq-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index 4eca5b70a9b9..0ea78b628b8f 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,4 +1,4 @@
 AUX rsa-3.4.2-cve-2020-13757.patch 5806 BLAKE2B 45f87653e3c0cbe29054d0a2d4e4838dcd1e91aeb921b3abc540d1f9dec157a75559ffdd933ef406f053343721b0963e3e647ee1e71cccf28946b2a1a4a0f97d SHA512 075ce7a8c6a4eb3716e51c9fc1ca446f5a922d701158dab5beb745887083c04b9e434f2cd4c8468fb71c814a51e5b7d96161d44dddafc539fcb5dfec4bf2602b
 DIST python-rsa-version-4.2.gh.tar.gz 63280 BLAKE2B 1260fe2a0f34c16b3cd2e18bc642da2e9c6caad851920a4c010aaad31959d0baab397356cd2437eb4a9091b3f524760f45b8d46ff9a207be009b2613615681c1 SHA512 a4df2de41d252a42627e96298b044a50953c429b5062f02cc7b64a7e17f75b09bb8b0f9b371353e639d1daec7775c20f20348f45baf00f591514c54e1315f044
-EBUILD rsa-4.2.ebuild 772 BLAKE2B f4f0579fc70d638c8bc5f67ae953cd0d41aef5093e40b52b2785fc027ffca52b07ae99a376fcee4d7f937d2407ffbf872cb1dcfe0a8740987d2311f7c0194c19 SHA512 3f655483b66b8820f86f3dc8e748b38e99c27357e25d3cfbbc241f7d8aeb5c792eb56162e6c3197fe51fedb61afa05429abd5df0fd7963362758eab3ce05ab60
+EBUILD rsa-4.2.ebuild 770 BLAKE2B 04113beba14d1c9756ac2977b54e2f5af7fb8c54d00ac5f6eeefe9e9f813f603b6035c56cc3c0d90c401b73501a931e2a279648849a2609e91ca8f281d41c50a SHA512 214b60d5718324085bcb94f1fb67ccd04ee7567a6cb42c876e335e7869e8364368dcf831cb55515c5f56fe807ed85f69cdacbc7fc1b8971427000f8c28e043f5
 MISC metadata.xml 316 BLAKE2B fd1e4f7bdee45f5ab99e67cc3918634b9ac5ecfad75167aad5f2ee33cea308f99d8d03aab5b5e0c01e8c1bf41ca8a45f67146c5126f84af4b6d914f58af0ea38 SHA512 4d8c48ae8e4360727f5c4b83e426f42a597a175dfa2a965c9f966e5824a83291c78d3e8e636d21b4f28d73f7e912abc7db1b09078baaa0e3a1b25713abd3d0a1
diff --git a/dev-python/rsa/rsa-4.2.ebuild b/dev-python/rsa/rsa-4.2.ebuild
index f5a735633254..d9362be55162 100644
--- a/dev-python/rsa/rsa-4.2.ebuild
+++ b/dev-python/rsa/rsa-4.2.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
diff --git a/dev-python/rtslib-fb/Manifest b/dev-python/rtslib-fb/Manifest
index 4ee08f163007..e82806fc0f18 100644
--- a/dev-python/rtslib-fb/Manifest
+++ b/dev-python/rtslib-fb/Manifest
@@ -1,6 +1,4 @@
 AUX target.service 330 BLAKE2B 81d01885925feeef2a1fe9214b520d0d4035b971fea22f4efcbe295a7316568cc6b6e152aa53a7e7defa602e55df61c3a06f3c028ef20301bb0032a4c919a43a SHA512 3c634f1c466d0a8c3dd2b57a230438aaeeb0e66324863a2ded57dd69a2ca5946f83c4ab511766f510f3e63b43aedcf7e368bcf5bc325ee69c016bb0bb2612de5
-DIST rtslib-fb-2.1.69.tar.gz 69825 BLAKE2B d5bc7a526495922e9c00f81d11f5436b77a917aa1c29450a54a4099fc7b97f9b3c3b8d623158bd02f8c1080e5b646c5f67f673496b1bd5bef5aa664df43eeb74 SHA512 8ff956c8b593a1d0a79a9a527502ddd1422bc27f272bfa708d145a66779de1af65adb20d822bee59c5b60282fb16f15429c10477d3523c04b215f963ec850073
 DIST rtslib-fb-2.1.73.tar.gz 73883 BLAKE2B 2e1a9306386b019ed7d4f89dc976959020f981812a28f0a8f4c520f311ec6ce08da2e45115d394cab272296bd84e16fd1c15a6aecdf4650d52f96e294aed4cc5 SHA512 70bfad6a055af1242f989fcab706b5a49ebe8c1ed7183ac3f739eb54e0c628cc27efe9823dd017c33d735847888a142a791fdba3e5f4d4817290df7f8b6347f0
-EBUILD rtslib-fb-2.1.69.ebuild 675 BLAKE2B 74e94a2ed8e30b842a86c896f0c60520a620bfa74c2e78520ab918e4cb0fbdb590f75b60acfc1a17c4b3cb735f8b029ab4eca6490d48cf784407d436f9854667 SHA512 a2490189809ff5ecbb573503d3725bd4f525b34ac1d921fc6d0ca5484c83b7ed9a4868f549ad283cf6512761b2e5e89d2343f1e2daffc0b9ad7225d16219bfda
-EBUILD rtslib-fb-2.1.73.ebuild 622 BLAKE2B 3b3038ebbe1b35be0c094db9db78a1048281a98ba699ec479aa66cf82191e035da47f517d9a045dcd8bdd2b75222e5929cc3f60b0ecb104f1198f1e949a57d62 SHA512 4611d48e3c2add45f0477f6cc04f919d37e75a530316922742ad2fbda7d89bd380a6c6c89cfa1fd4e89b019cf0e6076cdb729176383009af3af77872a2595f02
+EBUILD rtslib-fb-2.1.73.ebuild 621 BLAKE2B 3d0b77f1fe867ac081d0a87dc9613603d013e78f9f352c11690b122f16d01e61c0d2acb875970b41767b937a1d10d787ae54c59098ea77c27e447e8dfcf1740a SHA512 01407f2658f90a2a2ace43982ae56ccfb16e7b1e983841631f16e0fe9d223dd60990f6b75770dcc4cf9988398a0c5a9ec2a6e70975713834ba007e547e935d85
 MISC metadata.xml 827 BLAKE2B 488d8f9e2e3cdbf10224b0312e83fa23887952e960b6aa8ff95780acbbd9ef96175aa51bbd14e934af300903cecdcc50795c6078d210e833b5db9654bd5f217c SHA512 2082be66a05829bef801444b95306dbfe427e11f3f3f64049c1e96207f62603708c503bae6c92ababb371e640a2c0a071bd07bf37e69d341926d5654c6b8337f
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
deleted file mode 100644
index 09e04b963202..000000000000
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.69.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-inherit distutils-r1 systemd
-
-DESCRIPTION="A Python object API for managing the Linux LIO kernel target"
-HOMEPAGE="https://github.com/open-iscsi/rtslib-fb"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-
-src_install() {
-	distutils-r1_src_install
-	systemd_dounit "${FILESDIR}/target.service"
-}
diff --git a/dev-python/rtslib-fb/rtslib-fb-2.1.73.ebuild b/dev-python/rtslib-fb/rtslib-fb-2.1.73.ebuild
index f8dd492afa9e..95ddca21b91d 100644
--- a/dev-python/rtslib-fb/rtslib-fb-2.1.73.ebuild
+++ b/dev-python/rtslib-fb/rtslib-fb-2.1.73.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 ~mips x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~mips x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/pyudev[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
deleted file mode 100644
index 1f2f2129921d..000000000000
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ruamel-std-pathlib-0.6.4.tar.gz 20719 BLAKE2B 7189b10e61c941d2bba9bcbff3b61f2ad52849d78160b181721fef3bf3a9170aac823631e1743de98d1c132e38092a38781c9c8d0d213e4b94cc1e6051edb2b7 SHA512 591aec63c14c269d6b0838ae4867d58bd0642cf84cff841eda53a4d60f076ba68fdcb54d7e2932b248ee61feb773bf28b6309947886d350af34ed9f580c9d939
-EBUILD ruamel-std-pathlib-0.6.4-r1.ebuild 706 BLAKE2B 1cb4dcf8286b5e22fd4b50d8a4212e0bbb4bfe7189b5d19479d6261a659205bb011e01457ae3b56f31e3f3aff2e01354b1d73e5323f8e2f03f1e950dc7f848d2 SHA512 9ee7c6c30b02c4bf2d86f40b8b374566496a37fcb9ed291ff95d9739b13b8ca26d77c4951f5d8cfdb6448caea81a10fee49bbad3b084e5282df3b7b73edce725
-MISC metadata.xml 393 BLAKE2B 2f631bc3bafabc04a0c4fd096a47e14fe8625234c0483ce68981ffb453fbfd8bc1638f7ab61ff8679b92c385df7355bbf04b4be000ee5872c04304199b81d4c7 SHA512 bfb57d95e477942cf5b615388a7534df886617b2418e8aba7c83805095752fbd67d64a8aab753219d3af5466f47b9d7b059035c422f93c0cc5d7bd17ec178ed1
diff --git a/dev-python/ruamel-std-pathlib/metadata.xml b/dev-python/ruamel-std-pathlib/metadata.xml
deleted file mode 100644
index 52060f7fe88f..000000000000
--- a/dev-python/ruamel-std-pathlib/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>andrey_utkin@gentoo.org</email>
-		<name>Andrey Utkin</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="bitbucket">ruamel/std.pathlib</remote-id>
-		<remote-id type="pypi">ruamel.std.pathlib</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r1.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r1.ebuild
deleted file mode 100644
index 1a4104bb0300..000000000000
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
-
-inherit distutils-r1 vcs-snapshot
-
-MY_PN="${PN//-/.}"
-
-DESCRIPTION="Ruamel enhancements to pathlib and pathlib2"
-HOMEPAGE="https://pypi.org/project/ruamel.std.pathlib/ https://bitbucket.org/ruamel/std.pathlib"
-SRC_URI="https://bitbucket.org/${MY_PN/.//}/get/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~x86"
-
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index f141dac48741..1aded02f15db 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.0.tar.gz 178084 BLAKE2B a4d23e5c931a0c720edb80818ca11bfcc1638f28ec910878f53720139bd8fbd034de6db73154c0e758ceb6c5233c10a2bf7d779f8e7f4a134c8b07cc33382a1b SHA512 7d716e27963b97a1735ba7ff0e581f7ecdfa62725cc42def59ad0ccdf9e23a9f7dfbc3cac298bb3e29362535036b07ba0f523452d6f73248be53c69796637e34
-EBUILD ruamel-yaml-clib-0.2.0.ebuild 707 BLAKE2B 2c52504f04ba2879545a949e14fc8757a8a4cb60e3a668aab4a0544c0d99867222504f3ff9e3f80762536e0018af5f08d7ebe6e84493e7dd3abb86495100eee4 SHA512 4c3738eb78d2a977beb0afc4ca7ceb99eecf45bb074b2dcf98ebe0c190c10b374f21d59d2a00cb3cbeffe0a15a8f61f0672232c7d51903e0ae3b946ca8934ad7
-MISC metadata.xml 925 BLAKE2B 9ed79b613e946d5f1fc006c818e1435e89b6eb74fd3f83d42fcb8cca906a52625a720616ceab67fc3a0cbed2197b52e7d3b106b2a7ee3d4f8fa8e837c856a2e8 SHA512 3ef363c45a12827551c44d4485373d50a1fabb27b20a6b97d014405ae7d5138916008bdf47af831b7ce74f58affdb5c7ff87ebff1336d2574cd897e8a3ce05a9
+EBUILD ruamel-yaml-clib-0.2.0.ebuild 714 BLAKE2B 89c14677f992995643dd5ced5a3a3a0ae6ebda01e535ea6de87aeef2ee285f1ee8a3db0ba42b5393b94c1042430ae34e79d2286777697da4e26920316f424b4d SHA512 52e3685e459f4a781b2d069dcb3d1efbf3078d2b8992ee26d3bca51342f79048374c89b075987f1a8f60aa0e5fab465c8368d0288e97f38bd6f5590522b4af8b
+MISC metadata.xml 1153 BLAKE2B 58de7fd7876683773ffee4304160d3a5207855b637b7116b83af5445d5d79636e39176c0d8c69f61ce3c728f273f16be0a6f39292464abc010b5e5c693c27c4d SHA512 eb4ff5e5bf91ede5c09114a76233e43913416781eb477032c4e04e4d1b0c0ab68969a6574319cc4a95f4db0fa426e831c4f9535393f9f7252b29189b1db5a47e
diff --git a/dev-python/ruamel-yaml-clib/metadata.xml b/dev-python/ruamel-yaml-clib/metadata.xml
index c7fd7b79be46..946ed7ddc671 100644
--- a/dev-python/ruamel-yaml-clib/metadata.xml
+++ b/dev-python/ruamel-yaml-clib/metadata.xml
@@ -9,6 +9,14 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription>
 		This package was split of from ruamel.yaml, so that ruamel.yaml can be
 		built as a universal wheel. Apart from the C code seldom changing, and
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild
index 7b010bcc2706..cad3597e4606 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~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 b608d46ab5a4..a771bcc3e531 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel.yaml-0.16.10.tar.gz 147033 BLAKE2B 35e5b0a1bd5a42ee539e66309dbca64bccd9570da427631d230c77d9cc09dc28637abb787c441b4fe8f8f17d9b6b313607887ce79eb631ce8b265cc18570e8fd SHA512 f124575a5054f993d5826d03aa7a9500a1084c5201be1517be36e587bfc60ea4d13b29dbdb3e62bfbd309fe9992590fd0a5028a43f0fd26a5a5cbc9f3dcf423b
-EBUILD ruamel-yaml-0.16.10.ebuild 757 BLAKE2B 5f9da2d74aa18c112227ed94de2906e51f907f91605c3ac67737a599717f12c5540f31c46aab27cfdb83b7fa9ef32d718aef9735793b8437a5717f80bde54dc3 SHA512 31fbb89dca722ffb3648c3a99027de52161b491fe5c68a0d661dc9c2da99ae4e421e07cc34d0a7dfc3f36dbc842f89930908b5e8e48cf14c5393584dd913f607
-MISC metadata.xml 487 BLAKE2B 3e1f4ab68d168ce3e2136df34bd8576dd18d083e84a33936cfbf542474f0c28523da626a339fb8b1ee8796537c61b4c129445b6c42df79c3214fd1c356891a07 SHA512 ce5c8374b80cdb2c5548fd3c1ce3f9a121aa99ca589bb8869a53cc4f846dcd345b13480c85225aef5cda3fce349cf995bbdd4a46d709ea461a123d0813406169
+EBUILD ruamel-yaml-0.16.10.ebuild 764 BLAKE2B c6087a1971d6a4477a0f81c42b0ec0be5da928effc63bd4285a08c8cd875cc94acf0d1d6711ea93f8b05bfaa618f77d5c50efc5e685f246b17beb0defbd874bf SHA512 8554601fffda4f88c275e8783a8a16814a8880ec2689d3dcab1a752fdbb0093e3eeddc4e3db43667d592191ec0d5df849e00d656c594b7c26ec358baa1e3e84a
+MISC metadata.xml 715 BLAKE2B 8adfe458db838b8217c79ae03ba0133fd7aabd143c99f2177debff61e8960bb9b89df4e7bab27eb392127bc95a34ec7ab2a7e2ab96ec87adc28ea7453bcce6b8 SHA512 bb76d173705214d1df3e44032301d078ea0f1abb41ddbbe743d4ae3928ade3fc3622b26bc54d8c66f47ef2e2f445180aad381bccdc18a6e5fc512c9e83826a9f
diff --git a/dev-python/ruamel-yaml/metadata.xml b/dev-python/ruamel-yaml/metadata.xml
index 5a38e316033f..d1c93d5b8e28 100644
--- a/dev-python/ruamel-yaml/metadata.xml
+++ b/dev-python/ruamel-yaml/metadata.xml
@@ -9,6 +9,14 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>zoltan@sinustrom.info</email>
+		<name>Zoltan Puskas</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="pypi">ruamel.yaml</remote-id>
 		<remote-id type="sourceforge">ruamel-yaml</remote-id>
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild
index 6db10d99034d..ccefcd8cf75b 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.10.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 944c34e58590..35489fc5a3b2 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,4 +1,4 @@
 DIST selenium-3.141.0.gh.tar.gz 155705874 BLAKE2B f75eec80e6caa86744092020abaeef56defcfac8278dd3fd605c29d6860c1c046956c7599164ba1b4682f20dfa997f5a942d83f7ad707b052ad3ca98c0800527 SHA512 add14d426c5b929901cd71104460c7ceaacf46374b46898254dc2e2602f4a9a370199da603e3f35375c0f297d6fc2fda00c9ce2ede9d5b893b072e0487883df2
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.141.0-r1.ebuild 1153 BLAKE2B 4bdd29affbec3534008cb2ce82b46939e4f1f735765e604cb6770b82192dc52df0ebe6644e8d043fb014657a614c5fd584e2b890e2c8a62ec298b476a5ea8242 SHA512 5a3dceedc738d7ab2f8a84547eb9c0ca46834d30916a52b5ccdc5dc60ba2520dfc864656b325f68b9f76ac40054569da4474041ebd8a1ae40813845882c89685
+EBUILD selenium-3.141.0-r1.ebuild 1151 BLAKE2B 58569052795dfd9e278febfd03f5f99a17ec07d6c9daa7da5425aba7d34051992c09a7dbc2c30d74663c1ccda4c30a283aac331986a476d7ac8cbed8dfa0f4cd SHA512 0163ead669fe2bd50dcc3ba39285d33945dc39943f3123ce4086a90a1dcd93349d6ddaf53a077636622b666c813754ec5e63d8fdc12c0f3839f448ea4b766800
 MISC metadata.xml 382 BLAKE2B 2069f6989e396728b0de8e072c064980714dfa75f5bc8ac56b17d7b311e553c2a821a2d58433ca43289b059ae40f7a822c788c1af1d8eb883936662d6eb17bfc SHA512 85f758426e03c1ef8b1e4e9f7098df95965547a10ee9e2168398b9a71b612a61b531860a46d75701d9c4ce0a83df9e4344354ee65ab1ee166f45738a2b1c9955
diff --git a/dev-python/selenium/selenium-3.141.0-r1.ebuild b/dev-python/selenium/selenium-3.141.0-r1.ebuild
index a65c1f33f536..8d7c91fdbe16 100644
--- a/dev-python/selenium/selenium-3.141.0-r1.ebuild
+++ b/dev-python/selenium/selenium-3.141.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 			-> ${P}.gh.tar.gz
 	)"
 
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 885a0c1bdcda..f4ff32fcf864 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,5 +1,5 @@
 DIST sentry-sdk-0.14.4.tar.gz 75420 BLAKE2B cbc5f401fae8a4a9eaa8f6fff8ca16a61cf2d339f14787610646112f67d7b0694d95a6076d2810968d28eb176d447fec6cf49af9a317bb2c30b4e6ab2d89a4f0 SHA512 66886df71a3d8f9f86f41bfc4078bf80f217bcb0a27fb9e93acee193b482d3045db44953f6f0b4d05e79daa91dadb56c2784b13d1308e7bc00fb40f485537dab
 DIST sentry-sdk-0.16.3.tar.gz 170145 BLAKE2B bf619313fb3f49800f5384f0dfec3aa34ef4bb030c5e038a485a8861a733a537ee7c834c8c200a2244335c3c61e7d564005b81d4e5c5f603d2864b2a943a5384 SHA512 e8589f7bd433d4aff068099e860c0cf012fc88dc63806873573a338bb91848d73e0a2af76dad0a5e023a1b25b0be85507346b77dec5c5a265942005219541699
 EBUILD sentry-sdk-0.14.4.ebuild 630 BLAKE2B ae27b8659b9e7777f1f125cc5ee15f2afab351e0d698ad46daf6f6c8e4d9ccfd4baeb2714be7453accf82df65b2fe2c28583b945a16332916a795333bafadce3 SHA512 fd379211a4f3de92ab9c6339d9c20aa2e51d3e737a7328aa7c97774d10d446ce0bbc20773d82b42893e30cc41ed55ef97961895b3f64427c37d632f24fdfda91
-EBUILD sentry-sdk-0.16.3.ebuild 625 BLAKE2B b3491389bfd9776238f2f7a753f415b5b72aae6d0612a3b77b1e36da6ef74936e3ae9074233902a4ec9e25b5bc6b9b133e2239af918014fd443f3de83e97f3a6 SHA512 0eab64f46ec556365cf3d4b7bafeaa733f5ac3f392380272266f263ab5c71601c219555713059b04b4e307349b6033ad781a17c29c65540bd7e62a5714bfaa56
+EBUILD sentry-sdk-0.16.3.ebuild 627 BLAKE2B f014670034b1eee91bf1382fb807a8810b68236f809628248c576490f7534e5d3e9770b1aa4174ab6ccad0d7928ca0ed7a87fbf3acdf5a0ede8a18a303f1dd0d SHA512 ac7ad13beabf70ef557883d43023d526302d54c13b5d1655584a9f2ee1956a196378a0a7c56a792314b643e7fda5bec79c8d9e24a5b2afaad950fba58f54577e
 MISC metadata.xml 422 BLAKE2B 40203c82cbd2c3bd3a7fb0efeb325573895e00d57131355f501aa0bcd8ea2fd431521f43be6f0fbc35e663b4d009ea6fe14afcac432f052570a4e4d2eb5eaf90 SHA512 5167cc4004c64227502da603869e7a92f1efd52c334807b057607dbfd77cb409fda1a54b1eb6a1e18085844f88e04b5297e7dd1d8d0730e7d80648fa5e50a91f
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
index c23ecfdbfc37..b536923dc9c9 100644
--- a/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-0.16.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index 7d00d76fa8c9..2cec95243416 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,5 +1,5 @@
 DIST simplejson-3.17.0.tar.gz 83119 BLAKE2B 979dbcb5d50aeb55fd1c16daa398ef915ee1f23ca25a84870a3132c265202d1cd253090157cdea179cecc6603618df293a28adeadc795238ec3ccfceda88ea0a SHA512 383ee4fa3b2f378cd83152ba588ffbb620aa0e7cec80d3e3097edfb406a60e96afd6c5302a5b64adb710d3a52479c609873a2db7ab5756d7ca7a51412029e4c6
 DIST simplejson-3.17.2.tar.gz 83210 BLAKE2B 1b9f97a43bfe84f1ad506713d81483ebcd4006d1174558b7a27373f99d014e23ed72a9ec2b2006e64760c61e1e500a4f1ea4547104e7f4c71ba51003df0a5052 SHA512 003b2fbcb3f8e0849bdbd958c78f8b470081d97527bef82306db77940c6734a1cbf3b5dcb0984d2f9c9d14aa525e7865a08e70a10971f8841e138f7ad6476e4a
 EBUILD simplejson-3.17.0.ebuild 774 BLAKE2B eaec307788c130d7e32ccc3760379e3712f1407b9180c1a087daab1327ac230caaeab92fe6a32df2d58219c11264b9c24317fc64b536a67e24ebf870fcb49a37 SHA512 69226587cf94ab5de79b4a1a0687ca2554b545807d9796ea23a9c82419b53d0d1ab6f36ef73a51936514a66c773f3655cc6c2b74eb690e1ac1a2763929d6eb03
-EBUILD simplejson-3.17.2.ebuild 776 BLAKE2B a938820f8aa423bc364b9ff1911c57aefdee6abf8bd2267ad54a1e09cdd83c81c77b5b3276e27bdcb2b7a21d5ef1fffdae08ae925f656ec8f3b61504196d51f2 SHA512 0a843a997904484049c71e683bf7effc17e1bc17311a48a7a99740a3aeca885bee92c45ad872fe82d9e7d4e65f63d747222c46bbcc4035ed3e27c880e6759be7
+EBUILD simplejson-3.17.2.ebuild 775 BLAKE2B 293c58cc538db9c81be5599eb02441c172b0b560a39558443d9611a2e6716ed93b0acee8d356831c1d5b0b54919d3fe355b534e4ac4b069a7fdddba1b2c82a23 SHA512 de266669a56712eff48bed22001dda7af03a465f60985294a467bf4e17491b5361f0b246c69c61d47404cc523a291a9a8432d983f0ca59edba343052645519ef
 MISC metadata.xml 323 BLAKE2B c21be649394bb8a261a6169a710fd3862f1dd539505381a15f99611f323ea1e5fe4e6e54f1ed73d28bdddc2459812f13e40658ed99c09d0ba0f93f724b4bcfc9 SHA512 7db760ee80a6281bcc370303bafc40aea566465bf3264381336222c6f6002f573bfac205f2e42cca557c7b31855f082e1ed29ec9ab3b1125e455cf84bdaf54ec
diff --git a/dev-python/simplejson/simplejson-3.17.2.ebuild b/dev-python/simplejson/simplejson-3.17.2.ebuild
index 262c80842335..fcd6b3f6d3f1 100644
--- a/dev-python/simplejson/simplejson-3.17.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT AFL-2.1 )"
 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"
 
 DOCS=( README.rst CHANGES.txt )
 
diff --git a/dev-python/slixmpp/Manifest b/dev-python/slixmpp/Manifest
index 4179ac339b18..f2800d3dd3d7 100644
--- a/dev-python/slixmpp/Manifest
+++ b/dev-python/slixmpp/Manifest
@@ -1,3 +1,5 @@
 DIST slixmpp-1.4.2.tar.gz 864608 BLAKE2B 9689b274a9c787174248c094329ea33783627a45ef39708a611013454953de4fa8799ca5a35950a3f3ed49bebf5c56f6f2bea079bcc2a3dce7d2648bfd812371 SHA512 3b3356352af8d7ec8cca15210c0524ce0bb5e313d8c5455bec13e82aec261f6d094a99df9f08642418a0e4abea4ee1ff607e42e1c166b9be1c26534b690c330b
+DIST slixmpp-1.5.2.tar.gz 886383 BLAKE2B 6b5ed074ab182f449bf7d2919c241694ea4ff24567546c50a3d228af7708826fb9bfd89b4fccf8a31ae2909399b57caa752a71c187cffbe133bab13b41da814f SHA512 4f377246526c03ae02ece370ba8c9fa7c26a89eca7a012a1a89b8186b6c226d72287c15a7668ca85bfc8f2200765406dbc0fa9cb0e358c3755f551df8eb0d59f
 EBUILD slixmpp-1.4.2.ebuild 798 BLAKE2B f0017ed0f6e8b8c88f418f3f52a94270b36aa6fce0b733b7ebb4bdfb29759637009c07fb8c0e068b8eb13ff1f5855be5a840b3737f800a0ec935e08c04975aff SHA512 2ce8bf3a9b47dc64fdffb86bf4e80ce9f74c58aba0d21414fc23dd850a018bcb4771d6abac8c59a5abb2e734c985c15d002b38a4bf0fe44537dfe7d1d1791ace
+EBUILD slixmpp-1.5.2.ebuild 706 BLAKE2B b6e6a1d61556170953d20710ed4edef3664638942e6c4adcb5e8e52e78d6fcce1bea0c8669b605e3049cee7961f5f60348101a24a55569d0a4a9560e2a085922 SHA512 1ef8a76736cfeced562f2c27ead531590520bfdf111e80f21fde1195a7a8a0696b642f78bba8e336c0f8d96d2da464a1a5d4a347e77abee3ec3547e840b178ad
 MISC metadata.xml 321 BLAKE2B 263ceaeeaf4eb1405ad1fa44a5a064ad778b1759e9b4f72dd4e110b28c4bc904897029441ea4c5b1d577472f13dc1baebd2bca0dd11ec7f624708eefed6d4db6 SHA512 1d3070cf4fbf0feaf8473e8f9e354f401c64cbd526f94bf42721528fa94852146084219beee4c344138a1d1241783b12a47e6a4fd9de95cb330dd82baaab92e5
diff --git a/dev-python/slixmpp/slixmpp-1.5.2.ebuild b/dev-python/slixmpp/slixmpp-1.5.2.ebuild
new file mode 100644
index 000000000000..eb42815f81e4
--- /dev/null
+++ b/dev-python/slixmpp/slixmpp-1.5.2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3 library for XMPP"
+HOMEPAGE="https://dev.louiz.org/projects/slixmpp"
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://lab.louiz.org/poezio/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	net-dns/libidn
+"
+RDEPEND="
+	dev-python/aiodns[${PYTHON_USEDEP}]
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/pyasn1-modules[${PYTHON_USEDEP}]
+	dev-python/pyasn1[${PYTHON_USEDEP}]
+	${DEPEND}
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 67b3141867ec..843e2b3b47f2 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 577 BLAKE2B d7a11e9af275ec134d26f8dd943f9984a4f2e36abdd9d245b604be30a026c5187a525ebf4776e839268287a198a01df66e58117865f7d385f6c1eb1c9dd30b91 SHA512 00849a488c07eec6b24c955afddca04ccb3fd4bb3086e94da3aa93e33a5eff264f20d06d391f258f7ac2896c9a1a193828d8a3d4a713c55a7868c8fab6cd3524
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 584 BLAKE2B 34d329ed6d25068bcf0725102718ee234899bf1d491b8afd8d8fc3cde6f6937a9cd05bc594f91a052c3ca931cd1268f973f2cb43837a29b7566c01b08c1b17d8 SHA512 24ccab07bc8c1c032b225ba6432d6b765d630e6ddb9ba7741e96179628f7ec49a2333c7ba0c7e9cd1f898a2b84823cdd4cb08e551ad59091ca12c9af37eeae8a
 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 5d7f1a975ba1..cdb1da129949 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="amd64 ~arm ~arm64 ~ia64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 2da9efeb0675..22be58a0a553 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 809 BLAKE2B 37a0e7c1cd5396e63fe16ab8b94e37ebd01a7a7b71716e0b3b434d080f38ef5108923a2e626716f22e548fe418ad097de8f5bc626eda6dafb43023f0a49d0259 SHA512 4663d1b199677a7f1f364939a0f563870adf5096af879fd109a72d179d44159a8b5cb19af4bd6b1be3606fdb626d30395413f9ca4f4499dd374b893d57fbbcf2
+EBUILD sphinx-testing-1.0.1-r1.ebuild 816 BLAKE2B 6570aa17afdd9e91b1392f64fb20b4ca711c9192d17316061861c5f86676ae178d3fa6ee7e1d080d8233fa77e4705e6ee140b4c3a6213c909e73ca58f37006b3 SHA512 e3ca5795c4189cf05f2c99eab0c5b9aa73835f410b5d8c5a3c106460f7f9a09287adb9c6f12cc768835b22c0f873a00b20c531ae084d8758e6174d49f1b2268b
 MISC metadata.xml 340 BLAKE2B 9a1df283aab1420d7818f4661b57f6d60cd734016c3711c633b9a6a11c401c8603503530fa5e1f50940bd28c1fed83196c1c543d16b5217b996f6afef23175a8 SHA512 f5299851dc6aa3c3ad1109123ac6c4eb5b5c7e1177fa1f068da5cef0920bbece63a8f1c424c5b95addf661e5a7d15a05a427676f6c272a54741495c77e316b78
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 2df49f6ac02c..1b302e866357 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="amd64 ~arm arm64 ~ia64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index a909cbed67aa..db3a7ae603cb 100644
--- a/dev-python/sphinxcontrib-blockdiag/Manifest
+++ b/dev-python/sphinxcontrib-blockdiag/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-blockdiag-2.0.0.tar.gz 11903 BLAKE2B 9301fe05ff936836e8e648a507b7e2e5fd8cada58252fd46b274a4bb3e6b51b00b7696ceee712d12bd590c40c5ae1235e0b532ef55ffc2e78b2986cdae64a0f2 SHA512 305ad9b27bbb44480c69139cc0ae9cd8e47c6ad95da5b14a964c703a17e62ab9b342ff567e8312e403549a794f6381fe4c4d444ccb7a8e41410d1a3754ffb3f1
-EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1181 BLAKE2B 5fc0896f03f5bbac88d023e89400ad96a0fe9b2efce0bb33358aeb00eb8ab43a02df18f6458c1061e7c69d04688661a8d9cb63f52403904eb0073754fb9a0441 SHA512 1fd706fa608424ce1401b50485d07a68404ae48f9cd578cc5c34c5680236b6967fdf9c257ea4e6e29b975732b1feebe9902d5ebeac2f14f82ddc35b03c920c5b
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1188 BLAKE2B 66ca579424331b19e9467e3f239af13b30750ab0ad88479233055f6e20fe7a5317548d217df157e731e26a065fb446144144ac01deb97dea4c564da03d290bc0 SHA512 d3ba3de5e9105aee3dc3026a56af94c22458f888079880aa8a3474a71a37efb502a8ca63989a4bd12987b9e7936eaeb1e817de107d9a94a753cd3e5ad0384b2c
 MISC metadata.xml 416 BLAKE2B 4383283e64d8db0b5576f1defc62412b5c4f4003e5ac75a2755e79d3e2a53f6d7aff82741d6225d2c96f0e2d87df650d47110a31cc91362dee641a86c54b18da SHA512 10fc4ff78fce4beadf8f8b64cfcaf4b71f84c3f74d80bd7299055ef7c2a759bf8d8eaef841e464d72d3272d999fe20ebfbcd382f2025932eef474387e92be6e0
diff --git a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
index 40e89f1c6438..29d970775e27 100644
--- a/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
+++ b/dev-python/sphinxcontrib-blockdiag/sphinxcontrib-blockdiag-2.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/blockdiag/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 51bb782c5b51..736d0c2f8faf 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 833 BLAKE2B c91040d8bea8f6ec03295ed1efaaa75384f741405eb35a370b2d04860b22826183456985df51f9cbe65cd53bad8787a88750bd4563548ac9e0641828fcd96bbb SHA512 d57668d9c558e3d67b61f415f84941f973d05cbf5fcc755224780cfdee9d8f30148c2dc84b4fad62920c01cd4d0da4efcecac2e598e2643068910ff879f9e629
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 840 BLAKE2B 861b5b2bc0ac23d354bce19c81c2a4b9d194f7289a2f86d02a4e9639b397e23331e9b7a52999a23f22df9af7b0f31d202514456bf37e72797e154ff5c363ddbe SHA512 d31a3f0c8dce55977db98a0078122f0d718592c8b8a8699a9aef00ff818d5d705bf9a1745d7fbae59f759b512d804fdad4b281a61feb620402908f928bdd633b
 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 cdf4593a1534..30caa460973e 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="amd64 ~arm ~arm64 ~ia64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index b7a81b3b35ba..34be0ebee8e0 100644
--- a/dev-python/sphinxcontrib-spelling/Manifest
+++ b/dev-python/sphinxcontrib-spelling/Manifest
@@ -1,5 +1,5 @@
 DIST sphinxcontrib-spelling-5.1.2.tar.gz 22962 BLAKE2B c7b15289b4b6dce5e6c5fb529c4be2cd7c1f41d8bfc6ac86daf1a982f711bd2c426d9b3a615471538fe221197b64ccd907efd4620ea2440f6ec07b2a078d6bee SHA512 4a0398b7c79a035e12d9ae96100fcaa4df42aeae07a01a73f7d875ba04fbbeb3d7441c9debe77491876d78b0a3753677cff4cb3a575e3490364fe5780f5a70b2
 DIST sphinxcontrib-spelling-5.3.0.tar.gz 45665 BLAKE2B c44c8c2621aecd74734c6137e1344a763e99fb61b3ce882c8ea70364df17a7e2fac49acc8878753cab1b70df2cf084de5087bed77f8b1bffe311410ecec3504d SHA512 8f3c4718877e55b0ebcd3d8c0f078a6c06c27c2cdd3cc557fd2e0e990f0c8956179fd9a8b3135b280973e45c0c8657f71372746ef4b55319078db8f16c7e00e9
 EBUILD sphinxcontrib-spelling-5.1.2.ebuild 941 BLAKE2B d7a4baf4284165354c8689e49e1f9c35d856c2e8bc2d207db2a30b358daefa72a9b70ee7f37b19f0b184646e3f9d6f505e93c55bd7045f229f3c5752f1e3e99e SHA512 70cfa8fd9fd9c229b4b1e3f48016e28e4ca1a5355a47fab5cef9163b3560b76d6483407ddb264189a03c07e72a863658b5f5031fceca6dc74d746565276b5e93
-EBUILD sphinxcontrib-spelling-5.3.0.ebuild 1084 BLAKE2B f9ecc44c2059755168211a5e92f90009ceb360f16c4d585337dd4d3abc322c41223afaa566915f606210327b1b87233eb2998914a68065cdebefe4fe915038df SHA512 60a7d40b6dc3b99372ec43f34d3881d0e4db7da32f691ca30c633fea9aef3f3279bb59e3d5600979b42a7494b131976d3b57a8fab38ec81a6ae1498d047eb6aa
+EBUILD sphinxcontrib-spelling-5.3.0.ebuild 1091 BLAKE2B 043557487ea86c052c57d05724cd989d2cbbaeb7eb9c50b8f7d95c53d336c525ec75ec245e6e668581513b2cc3a1ffeff7b5e59ef598528086c6fcb682057f28 SHA512 3e7f575cf5089e72a4655caafa57a1a0ce4dfc1944e9c80e71772d7f2725c3bdbd8b830ad38df5c157a31f9ead95e0b8582bf959ceb62f8dee62ad445d75863d
 MISC metadata.xml 390 BLAKE2B 8d41fe5d3b7602e6f29d13d8059ae1e942991659b4681c8d2a6e62fa32816690289c4183e28b2cc0abc14ea2078368f87cd1d82e71f1c4ed9fb684fb7d2e1449 SHA512 8407fc4fa34e474aa5f74fc1623004bcfa4f6ba451d56e62704366e8c21919e8617a54b5f7fec31318c4b7b34c4eb064c18c9d448c04d28430aa4e961ceb28af
diff --git a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
index f0af7ff34fe1..26fa09a591df 100644
--- a/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
+++ b/dev-python/sphinxcontrib-spelling/sphinxcontrib-spelling-5.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/statsmodels/Manifest b/dev-python/statsmodels/Manifest
index 9ce9d5b595f7..6c988a6e9da7 100644
--- a/dev-python/statsmodels/Manifest
+++ b/dev-python/statsmodels/Manifest
@@ -1,5 +1,7 @@
 AUX statsmodels-0.11.1-tests.patch 1915 BLAKE2B 90c13595a80cf1e59e81c483746f4b7e25bbb47d03211c39fda4dc9f441b03a9e793398d88e235ab53895e3d08cf97f7080d961317c4ea3fab04e011f0e5b64b SHA512 ec7f858b1af512d0bf591d35681b8663041e08e64a6e223e56cf600316a203259cd6386d2004bf884224608945b9e4938e9d39f8370d11c8914f6b773cd2773d
 DIST statsmodels-0.11.1.tar.gz 15381516 BLAKE2B a40cf9138edd8a9a6707a550d9885e0610f9bc666fcd73a60bd11ade6dcfa806ecd912a725cf2a13902e92f31af2c3e82f244280f70586bb3359dc8fc2842508 SHA512 54afe55a23b431154c159f44d284aa093f3368988f0695c0f3fbb206046cdfb171ab2ba51ce94285d567b8536141f93a1ef404b5f7222f1e61264baf0541926d
+DIST statsmodels-0.12.0.tar.gz 17502050 BLAKE2B 8621882d920db652d1244fcd4a0bc4f31310663c4dc6582421cd64a040e0b64917070aef5962515b07a8e92c0d690d43dea19d8ee9b71c7a3c2548e903e69125 SHA512 a9cbba0c8cd7e11bef4fbb303c204d5d4db4eb9f3f93f608b9be5b3c0d7feccc08dd84b4904557fbd1c12f49f3376b2aa7fabd06daf5649fd72c16b7041afac9
 EBUILD statsmodels-0.11.1.ebuild 2200 BLAKE2B 62991021e4489b3923fb03164d8f6ed8176a469543c8d6661abc282d54a4147eeac5981a12e259855d313aa4e1f5e2726498fa6dc30b9b0ef2e4e502190857cb SHA512 ab2ba2a1fa3a151150ba17993e14882f9bc87fdff26492d36cc83447edf118d4e1ef8855c48d9446834c33f3f832e6ee298190a003bc525008a3e1527cbc0da8
+EBUILD statsmodels-0.12.0.ebuild 2009 BLAKE2B a537123de26a3ed3b3857495b9688d206de2e20dcd158adc5ac0e5f682d1d369d7e5bac20dbeed2986f52c4a88a2791ac3bbd2bf51d3a1dc912a0e6440e44c6a SHA512 516108e182fd628487f07881fd4e5d78b52f1ed8b9346950d6c78622688f15db93fc82dbb15bcdc858db3634577ddd408583747871f1fe306ee9890d61eeb4ea
 EBUILD statsmodels-9999.ebuild 1984 BLAKE2B 7ee4c8dbe27a102107ac29f0438b8608492cadde4bb6740cfc7c70781885ef256164a994f592bbd6a00b75767f3c756f1297e16d8ff4fbb6e752a54f26c0e95a SHA512 8e3bcafaa6251aec5e3bfc40afefc00608a5c13eb80ebe5a9eccbcd2dfb8072f10f88679710cd757c70aaee88865d6abc830b7fd1a0faae1caa0b8b7d80748f1
 MISC metadata.xml 1310 BLAKE2B de8c73b0fb91a3bd65b2ee149b3ef01b3f93c78dfaf1642f9c81335e21c0ace42a771a0901a30dfebc7a8bbb80e9fb7057bd047a26035e103c7ece9e9dbef58a SHA512 96bfb2a3e0b677a67c0256bfcdc76b3621eac9d9242c2aaa7d22322bb53be9bb2185ed82a2fa65cb7cd16df7562c1999ac0d936471608700030ecff4de7174b6
diff --git a/dev-python/statsmodels/statsmodels-0.12.0.ebuild b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
new file mode 100644
index 000000000000..dfa23119e7a4
--- /dev/null
+++ b/dev-python/statsmodels/statsmodels-0.12.0.ebuild
@@ -0,0 +1,83 @@
+# 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 eutils
+
+DESCRIPTION="Statistical computations and models for use with SciPy"
+HOMEPAGE="https://www.statsmodels.org/stable/index.html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.23.0[${PYTHON_USEDEP}]
+	dev-python/patsy[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15[${PYTHON_USEDEP}]
+	>=sci-libs/scipy-1.1[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/statsmodels-0.11.1-tests.patch"
+)
+
+distutils_enable_sphinx docs \
+	'dev-python/ipykernel' \
+	'dev-python/jupyter_client' \
+	'dev-python/matplotlib' \
+	'dev-python/nbconvert' \
+	'dev-python/numpydoc'
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Prevent un-needed d'loading
+	export VARTEXFONTS="${T}"/fonts
+	export MPLCONFIGDIR="${T}"
+	printf -- 'backend : Agg\n' > "${MPLCONFIGDIR}"/matplotlibrc || die
+
+	# these tests require internet
+	sed -i -e 's:test_results_on_the:_&:' \
+		statsmodels/stats/tests/test_dist_dependant_measures.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x MKL_NUM_THREADS=1
+	local -x OMP_NUM_THREADS=1
+	local jobs=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")
+
+	pushd "${BUILD_DIR}" >/dev/null || die
+	"${EPYTHON}" -c "
+import statsmodels
+statsmodels.test(extra_args=['-vv', '-n', '${jobs}'], exit=True)" \
+		|| die "tests fail with ${EPYTHON}"
+	popd >/dev/null || die
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x /usr/share/doc/${PF}/examples
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "Plotting functionality" "dev-python/matplotlib"
+}
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index 77a633f09c92..24cd2fe88508 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,3 +1,3 @@
 DIST sure-1.4.11.tar.gz 45933 BLAKE2B b2146ee56237f4575cab5122279023066a1b9ba20493ced7d729b1afa456f71a38071b721c39594c3ef2fcc912ba934e85e5cb5da576c3b2d20fa7d4926b56b7 SHA512 ed067385bf9cf317a5d55f6c5fc6ee54ee3d592825be398e47c37d31fc9c010cb9316d4e2bcf1d72d53d7e53fd470792d64348aa2bfa5dc43510daaff97742da
-EBUILD sure-1.4.11.ebuild 701 BLAKE2B d0c5072f378145f357415e3b93ed220b25a6739fe0760cf9934bfdde5c0b6f79d940f9c432c2ac166e128c870ee2ea2ae26fad194ece0e1399c0de1abd4f203f SHA512 4d263dcfae644e5769a42d21afde049ed748e4873b249b9a7319d3b250fe7e12cc9a2d2592a340ba39c540a5b7ca0ef685e4a7a906cf710d1f2c2b434d91211d
+EBUILD sure-1.4.11.ebuild 699 BLAKE2B 942bb34a6a011e4808eb70c7e9f37bc4a56f3c9da72cf720b8d4d5656efa5d31a4cd5b6eca2c6a21ac62c38abd919e0286aaa9adedf88cad64058bd260d96c28 SHA512 927fa0ca2c91d19ad86f3c5687cb1d295f88fd059fc6822b81dd639b742e83b4e9ed70f6aa276f165692a51e3b7aaeaf191c1f11b80943ede320a6cede768f2c
 MISC metadata.xml 580 BLAKE2B fd57ae5f0db3af8fa1a3752dbc6c5c0d2f614b19b3a791e416fae0e4500f0a3ec8f88a45b46b37745f92d7538f54846379b8ccb8d3cf6afb0cbd613b0eb4bf40 SHA512 ac9536e4de1fd74d326af98154065afb9a42e6b29b5ea2bfb22987be15da16236aa2dda813257be53158edb426c021e4e6a0f954299c64fe55be08f5b0f3b8c4
diff --git a/dev-python/sure/sure-1.4.11.ebuild b/dev-python/sure/sure-1.4.11.ebuild
index c4e6f87b891f..9dd80a7bd131 100644
--- a/dev-python/sure/sure-1.4.11.ebuild
+++ b/dev-python/sure/sure-1.4.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-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/symengine/Manifest b/dev-python/symengine/Manifest
index aa1b1b389fec..5a92814e4083 100644
--- a/dev-python/symengine/Manifest
+++ b/dev-python/symengine/Manifest
@@ -1,5 +1,3 @@
-DIST symengine.py-0.5.1.tar.gz 110864 BLAKE2B 30309b87cc612df37fca94df5c3199401a2cff9fd782de2fa00910bf17a1bb2debfb851aefc6178a38eafe49055950b76373c6e9a81a2fe5814497c2894b5f8e SHA512 85df42245daad0387886f003a593e8d45f34e51db4ed207f6bb70f573704a33f24a1cbe30f1c67c2c1541f1e800208c90b3ce3ec35c9d4eab05bbdb5be570ef5
 DIST symengine.py-0.6.1.tar.gz 112123 BLAKE2B 3b55ddd834c7401a5a211e5e20bafbea68b172738c6388e72b1e6a6e62719e19f28356fb6156caa6cfbad59d051de45c0e103a89d675e3453136cc85e638f327 SHA512 09f452757e3c99dc9d896a322a07d58f57af6d57a9eaa615b9f4f3d834cfc91f6a79de955a36ad94bc30c962365272ef0afe401570583af49c015295ccd7c4ed
-EBUILD symengine-0.5.1-r1.ebuild 1032 BLAKE2B 0f0b252a6086209b2984348b014ea124de628280206653b9e88cceba01d8e745a778d83ade77c0fb74290e866d8ec009b0985e29d5eb5ff63c7225d044ef7e0a SHA512 11cab6c58220cd636aa2ca27b4ceae17ea1ee6ccb7fe43fdef941480ace25fc1391e38a2425781b81cfe6359a804e2ef24c82c6fa9767f79be365b97aafba7c9
-EBUILD symengine-0.6.1.ebuild 1164 BLAKE2B ba014aca708018bc54331e1f2b469136e281f96b1d2e6ea91ec825cb65b5e1dab84dc362550b8f86a35416422bdf123958e0fad90d46465a39c2a0f685b046da SHA512 7904d972ae564b1abf6182f78d539a8a58b769ae8c8a2d4c45aa6668474c0a230f59843887e1d04a905fd516d21b33024791c69f6ba9c4981659f2b4babbc59e
+EBUILD symengine-0.6.1.ebuild 1164 BLAKE2B ab5164a7025b69fc91ff6d0e1d30dcc433564703ca969aa882a92621925fff0cb3484530d645269615ac1d84c56123ac76c12c868008c272cd52bebe3b43f949 SHA512 e654e9fc772fe95d4db7ead2f98cc515e051a47e49190b8bb673b1806f679d891750e8a641e5ffc2eabbd01498a59f8bae7d1d48afba75fcb4071213549daf73
 MISC metadata.xml 366 BLAKE2B bbf2f9c38d569a0575af808f60add4a61f2065fbc28d9bdd44fbc85a7e24fe63a4cd3d7f3abbc4b68cca8007d9cb742cce1249a6d0f8c9eef8f9446f29dd2121 SHA512 a7ee1b2afe1c934cd83e57e0a1b09d53e73b5a060f342f020ae4785c08808da9762a58f08c04020bb4c61f9d5d925dc7f212afc16d7412ee52a0188b3adfeafd
diff --git a/dev-python/symengine/symengine-0.5.1-r1.ebuild b/dev-python/symengine/symengine-0.5.1-r1.ebuild
deleted file mode 100644
index 9f1b6b83333d..000000000000
--- a/dev-python/symengine/symengine-0.5.1-r1.ebuild
+++ /dev/null
@@ -1,46 +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} )
-
-inherit distutils-r1
-
-MYP=${PN}.py-${PV}
-
-DESCRIPTION="Python wrappers to the symengine C++ library"
-HOMEPAGE="https://github.com/symengine/symengine.py"
-SRC_URI="https://github.com/symengine/symengine.py/archive/v${PV}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=sci-libs/symengine-0.5"
-DEPEND="${RDEPEND}
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/sympy[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${MYP}"
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	nosetests -v || die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_prepare_all
-	python_optimize
-	rm "${ED}"/usr/share/doc/${PF}/README.md || die
-	newdoc README.md ${PN}.py.md
-}
diff --git a/dev-python/symengine/symengine-0.6.1.ebuild b/dev-python/symengine/symengine-0.6.1.ebuild
index f75bf9e3ef38..6d69f4350e0f 100644
--- a/dev-python/symengine/symengine-0.6.1.ebuild
+++ b/dev-python/symengine/symengine-0.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MYP}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index f95783c72669..2a95c1472ee1 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,7 +1,5 @@
-DIST sympy-1.5.1.tar.gz 6815997 BLAKE2B bc74d01fdf2ccea6b83a06c11f810e3d105e9d35b397c8b87a1bcc4e316d00c456f576baf57d1b4a6175e056dec58f05fbb05893519775ffa252ac018452d2ff SHA512 3c4220243d2cbcff9eedb2a7986431b5b4d7d0007c78208a60b21830c9a3528d2171086874c42205c1227f779e44c19b9562943e2935d329bc352e7ea85396c7
 DIST sympy-1.6.1.tar.gz 6811393 BLAKE2B cd19946fc726b5a74f9ff0af07f07f8f76ea28b20818653d785848e331c126d634d8167e3506d8b87c12ed057df4a59551f0a0214b7d1292e199c6a3353f70be SHA512 95630b6fad1e41f2d58d1f4f4433ef76d4553f3e119bfdd36048c5880ac7f07d572e901eaae0b5c6208f598989a86ab5e03932a851f8048c584154973be6982c
 DIST sympy-1.6.2.tar.gz 6811705 BLAKE2B 4cd894d28bedc986acc8ef67aa60f82e0899c2ed028658a8f340d7538b890e0ed380b3614a464eb58d71873b29b0795508b4556bb8115bf0c108336ef1e4cca3 SHA512 e16a1d85aba438e4248bac48a163ea1827e2cee57c28f7670ed19cc69d4c08d6796d62f79d245e269d75765b8f7ff4f4ca2841f98534e136ceeb5d3f7a5d252a
-EBUILD sympy-1.5.1-r1.ebuild 1850 BLAKE2B e2f08e54dca354747252fbe8746a163b93731a54c3bd2da1b8bced7ed8a3a94185eef5d3c5d7c71a7cf00dc8eed8b041253a451acb682eb3ace923a20df442b7 SHA512 fdc6a748fe63dac5f904b36ea51beaddecbd074ff1ae9497e0cf30481d505d0d48eea9732342f9033aed6d24a740aaf3f9f53586514f4fc2c3e89db111813a98
-EBUILD sympy-1.6.1.ebuild 1770 BLAKE2B d6099d50f37f0bbf766b3f4f5ccacb1f98ec13bd28cbb2034df2a676a9ccb3c36b56199afd4d4b2242ac1386c93b73db5bbb9569eeeac62ba176d214f86acf89 SHA512 9fa463c7de1d7e7622e9cb2d97750d9a9da55ab187a4a5bc3adb92dc40da90c518d495f2d743c10a759e146e1adf93a8389aa33e05971812d57879503ccc6444
+EBUILD sympy-1.6.1.ebuild 1770 BLAKE2B edfc897a7913daeff431f284d0dd8df1a4d87ab3e8546d0412dcc6edad3076e15434dc34452987d32aa03d22b26321055d9be9b9760856cc2b9eb988adcdd7ce SHA512 18f8ce9e78502c0ab59f22d3f9f48ec48fae41b997aeda44068e89f563b19a1e846c7e605d1c80e40bd03b9c8fe9d224a440bbe86b66add4a8f1c8057718bd60
 EBUILD sympy-1.6.2.ebuild 1770 BLAKE2B d6099d50f37f0bbf766b3f4f5ccacb1f98ec13bd28cbb2034df2a676a9ccb3c36b56199afd4d4b2242ac1386c93b73db5bbb9569eeeac62ba176d214f86acf89 SHA512 9fa463c7de1d7e7622e9cb2d97750d9a9da55ab187a4a5bc3adb92dc40da90c518d495f2d743c10a759e146e1adf93a8389aa33e05971812d57879503ccc6444
 MISC metadata.xml 1476 BLAKE2B d6a0d7816ae7c0c2d61d6f584b9c872d0169053d43bb604f66ff242721df6f74788ade3de06b23db53239dc0da1182beda16c86eb7e7b383fb0964b13eca1883 SHA512 99d6eb86839fd09abd4db55783e028c6f97c9d0dfa8d68ceda881e6ca981f86877e55a0a83d34b432833f0824a896eea8af35eb9ea499bffe0c62e1e0a27c3c2
diff --git a/dev-python/sympy/sympy-1.5.1-r1.ebuild b/dev-python/sympy/sympy-1.5.1-r1.ebuild
deleted file mode 100644
index f5455d9408f1..000000000000
--- a/dev-python/sympy/sympy-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit distutils-r1 eutils virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://sympy.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-# All tests actually pass, except a bunch of tests related to the deprecated pygletplot
-# It is a non-trivial work to wipe out all such tests :-(
-
-RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-	theano? ( dev-python/theano[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${RDEPEND}
-	test? ( ${RDEPEND} dev-python/pytest[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${PN}-${P}"
-
-python_test() {
-	virtx "${PYTHON}" setup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.rst )
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/sympy/sympy-1.6.1.ebuild b/dev-python/sympy/sympy-1.6.1.ebuild
index adb5f1ab365b..cf99ff7b3c6e 100644
--- a/dev-python/sympy/sympy-1.6.1.ebuild
+++ b/dev-python/sympy/sympy-1.6.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 eutils virtualx
 
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index 491622612f83..f525a2569bb2 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,5 +1,5 @@
 DIST tempora-3.0.0.tar.gz 21500 BLAKE2B 7bf241d5ab60c78c0ea56df6b28e33504200eb5427cdffaf9d5f34da202c3ba4550fa4dcc48874ee870345fa5a10f2b874687fe7de2bbe049b1c14d05161b0e0 SHA512 2d397c1d17bb4c502817ad0278090137fb8ca00273c63a7336200ed7e621a99cd5c954cdc2da00d06eba34ed4f079429f5ddc68b928cc83feacb2335f995e1b7
 DIST tempora-4.0.0.tar.gz 47217 BLAKE2B 3f8489c584768c074874fd299d11ca71b51c646f07792ac910dbd3fa76c309a866e599204364bbc06e6589a6fa046d3150bff05c9d3beb9b427ff409e2c27fe6 SHA512 59792bf03b4ccbdd5b849f0f6b9a0b5f2672e1cc3076b85449b8f183524d23de05588c3a8185550cdb9e52cc610e29db18ed151b8c5f5f25438de41015cc595e
 EBUILD tempora-3.0.0.ebuild 1512 BLAKE2B bd20ee242a1fa86de4b266670289110e6fe0d11aa7e274fc0650fdc0d323376ccb362fbd070aa972aaf959dd257d3704547874a75be991415045cda19d51a87c SHA512 b36730adbf19e408d2a834f0ae5004850e4422f7a8a2f19aa8db493401d9b664d1e039cbb25273ed14916070f84937ebc673521e54c5c8b4cc0961460c610475
-EBUILD tempora-4.0.0.ebuild 1054 BLAKE2B 0635ce1e265914b6c76d8aaafc8e785a1ce0f3863f37c669f4af10797080507990e3704ad6d3fe4185ca91a260045eb526d619711960b0656675fe717b5e9b9f SHA512 3ed905b4dc5b5698949f9ad0e42f1bb1839806ae4e66468f135351beeb8c7985abbb9cdf3aca453470f3fa9d3c1a4f2ca33ed600d3ae9c988e680b16fbb215fe
+EBUILD tempora-4.0.0.ebuild 1052 BLAKE2B 27ee5e889a1701173f255982a0c106e7cce3b4ea708783fb4ea8d2cb71fe309004730c5a2ba56540082e14e34ad51ae56fd815c61071f8769cdb366487ef55b8 SHA512 f52cca94743848f46e8a35b616c12c1baf2842f934d7c8e6f0da8161380d87a78aaf33b465e9c0ad2016c9c47b8b69ca79708ae6142119d4eafff53d2f6dcc6d
 MISC metadata.xml 615 BLAKE2B d393b579842c51e2dea6da1afde0a5571d5034905a9a4d5f4cbfa70cd80e918157ffbb1f98fbcefed28ee6c1ba20dc64e7583ea7ebd82fc1b8f9d3e57dc796da SHA512 7346fb2daa80f58a819462fe96220fa85d242795e24cc2fce5be013f4f0a678e1201b2b56bdcdd2881d95f0fd93386f47e900492862ed8b54e90ced91dd27f33
diff --git a/dev-python/tempora/tempora-4.0.0.ebuild b/dev-python/tempora/tempora-4.0.0.ebuild
index a45fe1f5b5dc..110486f366c1 100644
--- a/dev-python/tempora/tempora-4.0.0.ebuild
+++ b/dev-python/tempora/tempora-4.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 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/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/theano/Manifest b/dev-python/theano/Manifest
index 7fe67bdeddc6..b01646a380cd 100644
--- a/dev-python/theano/Manifest
+++ b/dev-python/theano/Manifest
@@ -1,5 +1,3 @@
-DIST Theano-1.0.4.tar.gz 2840691 BLAKE2B 7f89caee3dd50d75ff09693fde7926f2b7da0f94758ef932f207feea29d74d38ed56591e6ebe0b46cfa043d5fb46d5b97028171acdfd324a01eb7b904169b4ac SHA512 3cc7f9dbb606c3c997c8651c34dd861721d5a8b99d06ed0887306d5a5ad0d7e402fbe29dcb5ad2f513b3bf75966e41a2854ebdf9a4fb212607345f84f367de8c
 DIST Theano-1.0.5.tar.gz 2842778 BLAKE2B ee82e9487a5265a1040750ace70465c450134e70eba4e58752cbaa7d487be5fb3cce31b838429cb52f7bc31d32a20379e158ee289dd5732dd8b86a9ee36b6d89 SHA512 6bb27753957d32392ea793e39ea56eff94baafbb55e27488f9c0bbdb387172a6829e64f461f83dae192486d9764b72d815e3b8dc059b2af116b024fc7228a118
-EBUILD theano-1.0.4.ebuild 1257 BLAKE2B c7fef716786c92810df145f74debd9cfef52b81028a532f4b111e4ec5317e3d57c4e5d1ab885d6dec8ecd323e43fd6227c6399bdec46345e098a656961a83a44 SHA512 fab62809f565ca9ee4781b9d605e5f176962b76c02ae07c5fdc299fd7cddfbff26bde88fb8c4afc00f26cfd6c4eaa930becd12c8483b8e69421c08f4af1d0b7f
-EBUILD theano-1.0.5.ebuild 1070 BLAKE2B dd446d06b3db9a27950063c572da4eb4f1e8d9ddd85d7396bfda5d7f26446e9d34ec6eaf14c4b33e867cce6ce4a0190ac3c4f8d3c3102ff57a9923d97e103a65 SHA512 38a07dcfe32b33ec801f7302c325982d438d2a07a4067160aafb9913f2c834ff21bfdca6b4c20c22726c1fb8c599c22610872b53e3f71159a11c811c86e74377
+EBUILD theano-1.0.5.ebuild 1068 BLAKE2B 8a9a875661e7d0e1f250e78d9851343a4e1ea8ae03fbc050c31afe975c69c8dd617b917539da0788b2723952039375b3f760036e952c11de17996e743a703e5b SHA512 3607caaa7b0d4c3a8501da5f0ecf19051b1de8887ff9a08b5f076f58043360e8ac906e2f723564de3503955f1ffbb5a2e29a681a2161915bc00886f60fe6f113
 MISC metadata.xml 632 BLAKE2B 2bee1d4912596b45d3f5cc0528a927078a072091148dfce38892319b91a0635859fa91dea32565b4a7f5ed02726364a50870bab22197c57ff33c88a48ad9d223 SHA512 653fc6d180455ee24967e70f78682ed2a7e61022d6867390b4c4eb994699b3f293bafe45b4fcf1c4ace3f102acba41c5491e8fb39b9f6102f1022a2c51955ef7
diff --git a/dev-python/theano/theano-1.0.4.ebuild b/dev-python/theano/theano-1.0.4.ebuild
deleted file mode 100644
index 5652fc9d1c4c..000000000000
--- a/dev-python/theano/theano-1.0.4.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} )
-
-inherit distutils-r1 eutils
-
-DESCRIPTION="Define and optimize multi-dimensional arrays mathematical expressions"
-HOMEPAGE="https://github.com/Theano/Theano"
-SRC_URI="mirror://pypi/T/${PN^}/${PN^}-${PV}.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/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flake8[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/parameterized[${PYTHON_USEDEP}]
-		dev-python/pyflakes[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}/${PN^}-${PV}"
-
-python_prepare_all() {
-	# remove bundled six
-	find -type f -name "*.py" -exec \
-		sed -e 's:theano.compat.six:six:g' -i '{}' + || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	distutils_install_for_testing
-	nosetests --verbosity=3 || die
-}
-
-pkg_postinst() {
-	optfeature "Make picture of Theano computation graph" dev-python/pydot-ng
-	optfeature "Required for GPU/CPU code generation" dev-python/pygpu
-}
diff --git a/dev-python/theano/theano-1.0.5.ebuild b/dev-python/theano/theano-1.0.5.ebuild
index 6bee991692fd..f96083149264 100644
--- a/dev-python/theano/theano-1.0.5.ebuild
+++ b/dev-python/theano/theano-1.0.5.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="test? ( dev-python/parameterized[${PYTHON_USEDEP}] )"
 RDEPEND="
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index a43d1917700d..5fbc94203804 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,6 +1,8 @@
 AUX tox-3.9.0-strip-setuptools_scm.patch 699 BLAKE2B 15c001c0523420c2ae22013cc6729b34b97f1a25f7cddcde53f752dc11e1329d66522eeebbbda00bce58781c96b622ce4cd22127902b5ddf34b43e5197577792 SHA512 6c23dfa907303a826595cc7ff897212272841b151b574596d401b87bd441d26599c12b36bc08a5659af3e6639c20773c866df7b53c4230bb3eea86986253eb07
 DIST tox-3.17.1.tar.gz 294492 BLAKE2B 1a2ed9a26ad366a1ae7343289b45a338a8d2a58c1b6df2aaf716a2e8bbcc1cbc797c70fb51665411cf1bb69243aa8415f7fb7c82d78afb2ffb7117e4ae75edad SHA512 b084d4552609c90d006573dc95d46d0b27cf53c40a54465040e3c625b5d33eb19f95f3fa488439f11029e30ca414ce4e9ed6793a44072023826bc1f4398aaeeb
 DIST tox-3.19.0.tar.gz 296499 BLAKE2B cad41c7791108ecdf6efc7bca99623c66d1d8ffbb2b06688eb84e575f14958ba2b497e0035ccc331fc8e0ce667824cba2c8dd37488ac48b3c16902c7b546074b SHA512 7a542282dc2fdef7ab8aff04372aeeeaad54b83bd7f1022c1c60465604d67a5984abcea7d409b8593b646192407c78cb88422aa4dfd11fb2a2d9da520aeafb39
+DIST tox-3.20.0.tar.gz 297432 BLAKE2B 279a6d407c4a490309843ba30e62fe2f0c6ace63af2dfd5b5c2fc8ee6ab784b99da56e9d7d76cd0170f85432bef500c31b824fee32558f7f21d4491385d13b4a SHA512 eb8e55eb3c232356cdb3e1477399ef055df497f1276f0b5c5423f30c780e2619067d1e44c2d6702016e63f96a76d04d0c5e7b6c6f1faa1a98f1dcc5b1cbeae39
 EBUILD tox-3.17.1.ebuild 2229 BLAKE2B 40d7b8dc05367102a5c9442187bd4ef3b1f8a2a0708cd751a9b009723896b67b41bf9705870457d5afc93e05397ff6c944e0b72601b33162377e3ea480bfe5e7 SHA512 f5488902e1a68cabfde1eef47b6180d8ab215ddee2d3788b9f803933b7f4372d9424eaeaaf1bebc653c68bd1dc4722e8e787aa70cdf221ae70c55a11abb2c20a
 EBUILD tox-3.19.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
+EBUILD tox-3.20.0.ebuild 2236 BLAKE2B a23faaf319dc2589304ceb01f48e5a9220d017e7962ad7feb06d2e2c438d3a627e41d84cb8248fbae064073f5eec9a7f021698f567a4de6151382a8f057f04f1 SHA512 0af72e70c86c1844ef67c9a0594e0b2ef5fd79519eb35c01b019de1ce4fcc3c7db575623e1f8dc6f3f70abc8fb679d0eff046bf17f70e73703327312a7b3cbd6
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.20.0.ebuild b/dev-python/tox/tox-3.20.0.ebuild
new file mode 100644
index 000000000000..499658c518d4
--- /dev/null
+++ b/dev-python/tox/tox-3.20.0.ebuild
@@ -0,0 +1,70 @@
+# 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/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index a61cd80f4fda..94abdb5d52b5 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,7 @@
 DIST typing_extensions-3.7.4.1.tar.gz 36357 BLAKE2B 69a1dc0d86c73beb54c5b727ae0fa71a8891e729895a928be48bad49d71858d2e1fd52e029fc7f129a6990e52587eddccff985ea902cfb392534f3a299e52d84 SHA512 ef66388d035bf69f2f3f0ce5708bfb8c2284392cc9ce1804f8ad47dc1adf021637e779325d2cbb30ee76b4408defb1aa51fd2ea8cab88de2d515ab4f543c9a6f
 DIST typing_extensions-3.7.4.2.tar.gz 38427 BLAKE2B 9d7514cb27b5a8dbf246b15c8643a0e6e80d74004a39dc5585c1cb662cd77b9d8bacc25a03f9da7cde51aba4bd932ee8ffbde75d95ef29ae03c9f7e25897c816 SHA512 7a74c4a97d8cda3e56830c92b409235ffbe7cf0c1685b7fefa7a275a0abf21937622d12c25b4163b4927f6269ed689cbd30f95990ad0b7d2d4341ed648516819
+DIST typing_extensions-3.7.4.3.tar.gz 38979 BLAKE2B c1b0cc4d5d66f43628f6b488aefdcdd9878aa75cd426fce68aea6039006c1f0126f1a492a817e5a18d2c611aa399c5415d8b5e047b58868ee7b8b2cccfe13825 SHA512 fa1f96b73b13308ddb2676684862916aac8741be4523387c6a0f682a52d307190aac3e4149317842e686d14483d8a37a9e1de2514a2d1ca86f9ae9c8b0e18eb1
 EBUILD typing-extensions-3.7.4.1.ebuild 798 BLAKE2B c4ce0d6c159da89ad63a4cb8f858d44e1aa25180f1536b96258e3a860b175bcf1bf1a1e8a6ce9737f735b10767314dc0664ea094bef847e7470627b3bcdebfa0 SHA512 c97bf9daefe20b239adf5979868c550e8ef1ed2cf662764f62fe176b51396d8a8dae3c066214ae52529dcb7b8b789945dc3d9ed7f9d78f5e0c14f2f6478a4fa3
 EBUILD typing-extensions-3.7.4.2.ebuild 719 BLAKE2B db1f7b94debbfa2b792869a3ee51b2ee3a6f71b3e0de815780c4835bf70b606b7652b65a6fd457f1a4c3efd6656ce1f8ef04c441e9d9178d0877278925b5bbc2 SHA512 5a0d4f63549b8ae636092d76e46afaea51be4b016f4697a597f82f74bfbb90141d92f7d6f91547cb4a9d7757a842a1dedb4c32b6863f3dae98392f05c2409328
+EBUILD typing-extensions-3.7.4.3.ebuild 719 BLAKE2B a860bdff5b23485ee60f91a2c254fdec495786c016ded26fb6f1a5d80341b2732a886ad249a7505a6d109792d02f170b89b91747a36e5b02f9d57403d5da7fec SHA512 ccaf8a6f9705439f96dcc19f55005c45d1e4814fb975b695ed0c0913d156ca7865c33a0496c464762a1f4592437af923003a89a42a76ff70990971aace150ef7
 MISC metadata.xml 309 BLAKE2B 22c8c811a8b91dfcc0b4b8e2b6081e10cefda4e3a37733ac985c7412b71bd995dbf21b43ef6766a80e6decf3a5d9c6878623785eed9fcb817b63a7ca853502f7 SHA512 c483306bdc995969591e21452fd1cb20310e5e9e496b2b4a0ace1c1533023b6225dad6ea156ee12f0045e9bfb6a5426d9a16f05131395b960e529b3194b4331b
diff --git a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
new file mode 100644
index 000000000000..d2e532c3e11e
--- /dev/null
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/_}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Type Hint extensions from Python 3.8 backported"
+HOMEPAGE="https://pypi.org/project/typing_extensions/ https://github.com/python/typing"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+python_test() {
+	cd "${S}"/src_py3 || die
+	"${EPYTHON}" test_typing_extensions.py -v || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index ccd4c3c230c0..e0bcf5b09d69 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -2,6 +2,6 @@ DIST urllib3-1.24.2.tar.gz 230699 BLAKE2B 9c2f2be8fa743f542493d75072c02423d1bd40
 DIST urllib3-1.25.10.tar.gz 256875 BLAKE2B 3f2ad2cb3ac9a09f73c1ec03e89aa7313055afa443c53ec82fd9227348859566e20ca33b803972134be24eeed070c63b98e6ae75efde4006e2a4bb7b4cf3f054 SHA512 5718dab472a476bfd555753758ceef46c81dc358131205b6db05d186a66f397dc07252eda1622d12586390ccf14e8e17acdb9486c17cb7d34e323287a67373af
 DIST urllib3-1.25.9.tar.gz 254921 BLAKE2B bd78d7a1de71ffe3b1f62352bb49f94fd402870f57e86ae07ea5462706c19b0ae1f8e23a7e8a4a83482b57e007cb95f5ae242d179cec7e9568fcb440b9d95b82 SHA512 505f1d9137e469a48ee0de417f2be36946cf1d9bbcf1233280be399a6c6d8650b5b3c6cfcf884b04e0156974da703f48843381b9aab377738a2e60f7d2d3799b
 EBUILD urllib3-1.24.2.ebuild 1786 BLAKE2B 3c413607941e08872efa7f4f598e69d6a858adea7505b183ae2efeb7bf418edf8b06fbd04d0f3aa640a50f9ee18616f8b5186f382fb8fc6f250a667348c7d088 SHA512 4f217cb09fc22adb26371a336d42c274be4ca2aa1e8ea5404b8ac97f573b7d7f6c577b8e12a5f9281e1df39e4967614c8f9d9aa626c3544bef20c86053f1a95e
-EBUILD urllib3-1.25.10.ebuild 2114 BLAKE2B 94beae886893b2e331b28b0cbe14b98dc1346a0a60aaa2e845252438599b1c39f4cc70f965531bc2b8a49ebeb397390226dda0eff10af1a88f664d287da96940 SHA512 a16b329a40683179c291f13f9c97b5be28dd10767a04f927cbb10a2f93f624bc7720fd4e784826ed68db1021a20de70451833d23f5d0ed6c1afb47c542866841
+EBUILD urllib3-1.25.10.ebuild 2105 BLAKE2B 7fcb111436dfa4cffea70d3c23e7b8291261ca6ab629e876df66b9e42db3a78337482532660c70defecc52ab9eb43feeef467b00d9b09ab2888b6640c1a14404 SHA512 193b25c1ff69cff201123b0dbfd72e628fed83790a087705b737531d7cbb6784f6e565fb094ddc525dd0494c08dc4989ea61e3a757c4416abb15df6bd531d65e
 EBUILD urllib3-1.25.9.ebuild 2106 BLAKE2B 365be3ed3d45043b7f2bb1f8c414570d412273c879984c1d9ab41f486f0e8a39867414f0d11afb0758f7620086da92ff134739852de82cd3bc5af2b7e094e164 SHA512 3c9b415e8aaf9ea37d7ba4643ce5efef645d4e00b4c687295eb3057acb9e95e4dd23043107a269bb64b21e78dfe991e55129bf7f707a5d0684793fa441868a79
 MISC metadata.xml 548 BLAKE2B 47edce866bd0c727c4b945630c97f2944c34f8e81c43bdbe57e28c4859dd3e681c64eb2d3b75101ad41c85587890ddbc819a2fd04188331dd5fad23a1d9d0ba9 SHA512 014f625e8de5ea3f00628fe360db47dde9dc82efd0b11218b4118a20b7638bd4e6ac14253888073740c0dca4a19a196567cc2af1864d52f3e1c959389c77c9d2
diff --git a/dev-python/urllib3/urllib3-1.25.10.ebuild b/dev-python/urllib3/urllib3-1.25.10.ebuild
index e724f3938f78..fa5b173c516e 100644
--- a/dev-python/urllib3/urllib3-1.25.10.ebuild
+++ b/dev-python/urllib3/urllib3-1.25.10.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"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index 4e8b8e26502f..e5b796a4a289 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,3 +1,4 @@
 DIST vobject-0.9.6.1.tar.gz 58556 BLAKE2B 74f9a7dc8058bb792492b1ac44a0310f58c603e677aedda35be0d8e94743e6e1e001a4ae888625f314f706891b7a31db77efa4c268482bbaf44ca37fff236cd6 SHA512 0b299fd4ca105a063f4ac7b03b157c54a3867d6fb798f9072897939b0ba275ba0887bb001c5ed38002a8eb1c10aee710af880413c072140b855af4b62d5aff72
 EBUILD vobject-0.9.6.1-r1.ebuild 753 BLAKE2B 5e93a983ffa494a90c4312796e508c38e988ccbf0713b756f772795f30bbc9a7991f3a11c371effa3a6b605099bf855f5e2bbed5a84f8bbf630487961528fade SHA512 92bbd48ae92e7032264dda17ab7a9d2148dac409251302d2ed3a90f559d2cc29cdbb6ddd28c6683dc813073cef0a5c997e0575921f42f68857aaeedc7ed27e2c
+EBUILD vobject-0.9.6.1-r2.ebuild 791 BLAKE2B 741daaae7d6cb2583d308b59917b90be29904247731a44feca84dc1e29d8e38aefba1fffc4c281703fbaf9738b6dd8b7c247f1a5ed5616943e58267cb4194c3b SHA512 2904ab0d3f98f03213fb843ab630181c054549069e32817ecb839565ced3d36472752a1caad6fce22f5d0cbd19d1bc68435e397e5448501aa6da7082a2fd2d01
 MISC metadata.xml 322 BLAKE2B e0e386d11610176cc9b83ec3e1c6cf3d53306b01dbe272be61538592057e125ae6eb196e60e8c6588d80a3f8413f9f5bbe9e373f7e6670f1bb53bd043cd9be39 SHA512 d50380968c2886e5fb7971f90ee38189b9f325513eb0e0e039638ec0b466b3c54c20be5ac056a49fd28923e061d658200898f26850dcbe2c0d58114c0b732a02
diff --git a/dev-python/vobject/vobject-0.9.6.1-r2.ebuild b/dev-python/vobject/vobject-0.9.6.1-r2.ebuild
new file mode 100644
index 000000000000..ce291e2f41a7
--- /dev/null
+++ b/dev-python/vobject/vobject-0.9.6.1-r2.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} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Python package for parsing and generating vCard and vCalendar files"
+HOMEPAGE="https://eventable.github.io/vobject/
+	https://pypi.org/project/vobject/
+	https://github.com/eventable/vobject"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/python-dateutil-2.4.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+DOCS=( ACKNOWLEDGEMENTS.txt README.md )
+
+python_test() {
+	"${EPYTHON}" tests.py || die "Testing failed under ${EPYTHON}"
+}
diff --git a/dev-python/vpython/Manifest b/dev-python/vpython/Manifest
index 5e5ad62a80af..a5cff500f582 100644
--- a/dev-python/vpython/Manifest
+++ b/dev-python/vpython/Manifest
@@ -1,3 +1,3 @@
 DIST vpython-7.6.1.tar.gz 3552831 BLAKE2B 78281ebbdae2bf09d139569cd344f32aa77aad59ce988a72c57b9984774bc376348c6e69c9119822fe1fbd5dbe6cecf81f17da3977b257c64321e4d4f2deb755 SHA512 8a06bf41865a6bb61c6616c853889b24128f32a9ce1eb8cd9ff861e4995f700ea24e7ffc04fd1edf9cd823a1a592083202abecb1373d5f544facc8646f0cf30b
-EBUILD vpython-7.6.1-r1.ebuild 667 BLAKE2B 019540e4cd1c93d58306322199a7a53d7b3af7e9e90ed1b9ca38225782d77e23471b959a8aeaad9485149980a2d99eaf2800714ae0c19228999b14f54b051b33 SHA512 eed3058ba86df4370958b0952d2fff396b392b190ecbecdb759a97aa42dcdc5e6fc6978c30040cc2c790e73b6a0d4d6b346e3544bae2a524bf7ddcfddb29c9ba
+EBUILD vpython-7.6.1-r1.ebuild 668 BLAKE2B 2a40d6c4d434a0c097e2acf2718e5f48bbb99e2a14d1d56d50360bdfcdcc37bea55d9b103da9edbd08fdf3a2da4fed9ed10489b004394a5091343b9f2f643b60 SHA512 e38bae96de59cd5af18d181fa158f9c36d57429629c0f0aaa6aaba93339084cff9542d10e4cb309a05b1bf31af46fc709816aaa3cd64608e9ac7adc13bc01b24
 MISC metadata.xml 621 BLAKE2B 9b76c9b14bafc55ba1e99bf584a43ebc4414183230809eae1994db3cf10b35e8d7591db002828c9a18e25c73c55183a0a27812d4b6491d282c2229bf17761733 SHA512 fa384102ed51e900a7b27be256688c2fe94cb9e08f5240f116ad3ee4b2581e47b2956efb6446de448554718311e212dde2eecedb5c9ecd01a59dff7e2f14eacc
diff --git a/dev-python/vpython/vpython-7.6.1-r1.ebuild b/dev-python/vpython/vpython-7.6.1-r1.ebuild
index 1d0df6203ec8..0b80bad621f1 100644
--- a/dev-python/vpython/vpython-7.6.1-r1.ebuild
+++ b/dev-python/vpython/vpython-7.6.1-r1.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_COMPAT=( python3_{7..8} )
 
 inherit distutils-r1
 
 DESCRIPTION="VPython for Jupyter notebook"
-HOMEPAGE="http://www.vpython.org/ https://pypi.org/project/vpython/"
+HOMEPAGE="https://www.vpython.org/ https://pypi.org/project/vpython/"
 SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 RDEPEND="
diff --git a/dev-python/widgetsnbextension/Manifest b/dev-python/widgetsnbextension/Manifest
index 5c1f5eea6dce..b6e432b479e6 100644
--- a/dev-python/widgetsnbextension/Manifest
+++ b/dev-python/widgetsnbextension/Manifest
@@ -1,3 +1,4 @@
 DIST widgetsnbextension-3.5.1.tar.gz 1112877 BLAKE2B 9608a4bb385e697685383e52ee3a17127b87dded4e8edd22233ed03ec837818798a8c08709a83ef7c13995797ebc1b43961e2bc8592e542c5b4fe7c2f5f08f7b SHA512 484f6d91e36ab734c02675973e9007b1f379f1a1cb762c863ad0d80c8c6eb8c9c49a138b3280894ed17ed86775f517a13790cb4537e1cf8bcbdc57e72d13cc2b
+EBUILD widgetsnbextension-3.5.1-r1.ebuild 482 BLAKE2B b6a9c8cf3b7a2dd8b044b3734cbefad035445fcc2b4488321fc463dc94482ab76a3d737124dfb01d75818b9373b86ee0ebd606f1dba83f160f394a38edb28aec SHA512 c96566b4d15c612d1161e6c51a87316d664eb32db497bfd617d988fe9c2c8a27b40d1b01ccd93b0b0e544c88b49a55935013fb2eb91af4ac6e15a70fcf81b240
 EBUILD widgetsnbextension-3.5.1.ebuild 480 BLAKE2B bb4e624240b86ed5b0d988eef02e04095feb06b43e40bb9a6666322774f561b95bbaf1a8c7248aeb1ee1b1c528212af252c9f0989b2d4e4700d2dec2cf59dc5a SHA512 4a40d26e24f80ec5ef3e5eadaf2307d8bc91f8f44619f4ce3ffc2d09a420e8b690a92af565f60ba52b6ac5fb6e64d1b389a3b5838b44ab1a32dca5a293cf9f89
 MISC metadata.xml 519 BLAKE2B 592ea12fcf1d68154b5e993b0aaf5370e3675c6fb0151800b777e36d35e93f59d4126167b6a00c7ea0c4fd08469d0a5d14c9fc9c5ab7759ea839057d021e9824 SHA512 abe9fb9ee0902e30755d996d2886ce34419bc6291feb9c51a91d374675279fc7e03850c0a6f319a034c5fa5288797747a67a5b248855622e15ae9444264fac76
diff --git a/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.ebuild
new file mode 100644
index 000000000000..28147f8a5302
--- /dev/null
+++ b/dev-python/widgetsnbextension/widgetsnbextension-3.5.1-r1.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..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython HTML widgets for Jupyter"
+HOMEPAGE="https://ipython.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="dev-python/notebook[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 654ce41f6b90..482d0706c7b7 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -9,5 +9,5 @@ DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e0
 DIST wxPython-demo-3.0.2.0.tar.bz2 3992212 BLAKE2B 9defe133e3863be5ae07b7adb4bcb94688487e9dd9f5ab1f768d2f5942f30d05ff678f1ba74241d9bafde3584e3c68ffeae4978117aaa300e23165140e6a6d44 SHA512 361ecaa7dfe5bae0757e04215c564370eaf8e5260ead45007f9d70439c15701725c3cbcd76691a5191258bef24fd200ebd61347a3fd920d888137bfc98a16702
 DIST wxPython-src-3.0.2.0.tar.bz2 58304944 BLAKE2B 1144acf2cfa0a18aa2f90aabe81aaeca54d3fe6139818267dbc031accbae38035478a64ec084fe8bb8b89126fb70ff96e68981026df8ad3fc82e81c6d0e22d1a SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4
 EBUILD wxpython-3.0.2.0.ebuild 4581 BLAKE2B 02226950f5f18aad9261b59c0310c88427cd91362d97c30e8226551ce038a42ce054092418a26a64f878cc3317a524d8ecf67135597fb0db1ca4ae00f6251aaa SHA512 c1edff5306233fd830b847a3c7475c5e7822b501ff117022ec572a02d1cbfcfc003e717705d3d5fd0cbdcea783e2471d47e98296b9d83a52eb9c83dd9b94231a
-EBUILD wxpython-4.0.7.ebuild 2266 BLAKE2B 9f4492107d916e72b360a8408c703f12a8ae3e9e11041a9fe8541acc0f6a179be6cc4053452861cce50b71f710960c5c801e38968802750da369be3048a03251 SHA512 e354675d9312c41279bcb710f892eefaa120cfbb3f1c87a6f484e9b202658fcce8e9e8be3e75c0f7a2a31d7c1605b43107104117929815b45502357b0716b306
+EBUILD wxpython-4.0.7.ebuild 2265 BLAKE2B 8bd7dc2b02bec8ea1398a93019321348508694924166c52999948575ef907d0951f90693e881546c59c143e104e495a8230850f6cfbbcaab9caee7898a32b66c SHA512 e31e5fd18944a54f830d55a69802ab53636d3e1ada75e47da56a4c687c543c995810e0e5420555d54017568d5b3891861f5a4605d229f521ff464c6300121559
 MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
index 32ae9484d2bb..be31363646c4 100644
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test webkit"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index c2b72fc0bcca..6f3e22c0ad2b 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -2,6 +2,6 @@ AUX xcffib-0.10.0-testing.patch 712 BLAKE2B 755afd987d0a6240f4d140717c62c62bf0ee
 AUX xcffib-0.4.2-test-imports.patch 902 BLAKE2B 386d1a45dff2454925655b09f8dabf8159ab3be6dd0750723d0f70f85b15f75b48d7989d37ab808a090bb4723ae7cbbfcc271eca390b1653a10dc2244ce0564e SHA512 f08590fb2d5979f464d56f9c7e45b83f20954005980f98d2ee3d2c6ce5c44554431059fc911040943ecdcd4ca786c345bab6bae733a46379ad58fa487d516697
 DIST xcffib-0.10.1.tar.gz 84689 BLAKE2B e36ad4f9c6bf5bc63400ae35d0d58ea1def00f299c0f811807cde430e6a6850132e77584359f77fb2f4ce5fdf5f22ec91ed22e1b7ce5d6d318b7a8dc5f3e0939 SHA512 98412fe36962108902dc0599f05ac9be5d7412d7f12fc6566e020c2ce84ae4a536a20ae2dfddd2dc9a536f37cd82539bf19e1993ee65f0b09c44372008cd7edf
 DIST xcffib-0.9.0.tar.gz 83063 BLAKE2B 898fbce1ff503a9ad64a4c34778e0b5ffef531cf2ad04327f1890c87adb5f91287465e39a981a3c5a628c048b8acbb38bac3b0b76a58c3bbe45ab34c9a5eacf5 SHA512 e5891f080fcf1df596c37bb64a70e0de4a41d83b4675dac3b1c128656ab1b09d865e3ab0bfe0e5cc523e89a75dc6127dfc455ab66ca543ba6eeae9ee5bdae168
-EBUILD xcffib-0.10.1.ebuild 673 BLAKE2B eafbe77a9b6d9cadabfd393ea2789e18799593bbf7efd665113700639be1b6df89374b6c4d978cad4a9dd487676f2e9ee314034aa38dc7f6c094dc175450e556 SHA512 d0f3a1c49ec07ed74a4bb6f98a914fa94e400a6642e384c0c9a06a556239d0c1b509beeb7d1700eac0e48737b9a4b99b19a9f65f616561570f3a7cec0df39cb7
+EBUILD xcffib-0.10.1.ebuild 670 BLAKE2B 0e16be14e328d6556037a3b2feeee0d3aefa09ac7e2f82576a0927ca43f4f4bce825c1bbb32f16cc96e61ed45e3de0441453b06c16974de9c953e5b39ee9d2f1 SHA512 916b3936253ae434a7af483748ff8f9393db36b762b8e529e545009fb4fa99e3c4c25d1c9b976417f54234f723cfbe5bde4b52d22d63e2dfecffa6a7bccadc0c
 EBUILD xcffib-0.9.0.ebuild 762 BLAKE2B 0292d0cd3101a0b6d7fa2b7b7dbdea76f99500a0b31c451babe58a4a9df2f62abd7623c0934e337f9887d53b3b310f07d24de7a9c301d4f2545fc4d2afa97eda SHA512 3b9f580fc0a743166b9a6bb84d6c53530a930c7707f2d73e61589a4990136b04dd1efd997f6d7d42d61e559a13d55aaa561c7cca4a84b7c660bca7c21b777c67
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.10.1.ebuild b/dev-python/xcffib/xcffib-0.10.1.ebuild
index 790a52834b15..d04a31e501a4 100644
--- a/dev-python/xcffib/xcffib-0.10.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.10.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/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 51f976b38ed9..aa1c05776792 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,5 +1,5 @@
 DIST xmlschema-1.2.2.tar.gz 318829 BLAKE2B 5ebb8749d56491e65a2c09b56e965ea6b3e9be3d453a01671fa0da065389ca4bf44993693517bed4ef9df22cb94b9398660a7a838405c1757ee1c6f40aedacd3 SHA512 51be4317530cd1055438a4bf8e484b70d8a9414da5507fd30ed506271317859e5255fc729ed9fa5df2230e2af049ff40e693c67a5062e61fda43a1329ef2138d
 DIST xmlschema-1.2.3.tar.gz 322076 BLAKE2B 2b6c587772a14b4b804a35614a2e1e77ade9be0ef25cabfc331efc3a443058fd51c178339f1d6df2cbda77d2a8d1c2ac2c33155406e7e7f36c10225ecb70a3e7 SHA512 15c47c7e93cb0bf14534dfc298848ba4ac332677583ee14eca0c5908fd935e1a3dc01b96f92e7df6eb45b215eae2b67d74ee2d4d227fb3e3360be944815532b7
 EBUILD xmlschema-1.2.2.ebuild 936 BLAKE2B de45d9ef22dffbfa20fc2b8808cc9d0c540c6e7dfda939dc70c8f207775960ae703ec395d54013df5b87f97d327c9a993f42c259623432e260ed2a652657d088 SHA512 e5cd335f21f8fa0139dc6195c285ac6c3ab7488a0903dd9d030d0627b620c82be8b98e22ce8a15569aec0600f0728da1736032e69eb6041ee76d6a710929ed60
-EBUILD xmlschema-1.2.3.ebuild 764 BLAKE2B 031faa73dd3be8e463192a489dadd1ae0de416453dad607139286ab9f6dcd9309f6aafc59e42359730769ea9ddbac3c12b6af37d80c8104a013ea108921aa519 SHA512 27395cc3c7e8911b55a1eb6ee69029a0654562f0a73b079257aba8527be3859cb3440b875f3f587f3fa92e4ba753aca99e29845dd5ef58f77c357ca9689a48a3
+EBUILD xmlschema-1.2.3-r1.ebuild 764 BLAKE2B 492d235417e5ae1bb14b241bc6368ae851f95e3d594824fa6a161a05bdd868f33c8e9b457eb1e1fc4c38c7bdf771589fd7554c400aec9a89b3c21fae620559b4 SHA512 082ee380c94521786c6be10e61114e74722aa375c1f76dc9f4ea17dcf29893f0ff6e22a9461a40489b09050e4048e0452b6675c61415dfa2e575b7341e88bdf1
 MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/xmlschema/xmlschema-1.2.3.ebuild b/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild
index 411381185a2f..12fb0529cc95 100644
--- a/dev-python/xmlschema/xmlschema-1.2.3.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.2.3-r1.ebuild
@@ -18,7 +18,7 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	=dev-python/elementpath-2.0.0*[${PYTHON_USEDEP}]"
+	>=dev-python/elementpath-2.0.0[${PYTHON_USEDEP}]"
 BDEPEND="${RDEPEND}
 	test? (
 		dev-python/lxml[${PYTHON_USEDEP}]
diff --git a/dev-python/zxcvbn/Manifest b/dev-python/zxcvbn/Manifest
index f2c28cf95120..76a4a81047cf 100644
--- a/dev-python/zxcvbn/Manifest
+++ b/dev-python/zxcvbn/Manifest
@@ -1,3 +1,3 @@
 DIST zxcvbn-4.4.28.gh.tar.gz 9392042 BLAKE2B e3baf57df00819243f9588c8203598b14b9f03e0a232d53152584b3b74872baef7050fdf8f11f25e8a8776e2e4a7a0af15c9045f07700fe686c6cb021f794f2b SHA512 be85f976dcf685e2885edff116147cc4549f9c86dee4317b61b84dc4f36ab2c8c2f3468d5d1a55e8890693c852a09104b14360f9ce43feb3727f8fc164eb78f1
-EBUILD zxcvbn-4.4.28.ebuild 510 BLAKE2B ea067681b051906ee9d22ac180f5c333944cd4bc7aa6f8cd208831de6f980004aee92864fcfb15d327bc17d8809064ce8b738eb36d05b1b54f8bd13a19931440 SHA512 17274989db3263ca1ae0e974f5756ecc09c3a676b7f631ab936e2eb483fc2b84ddcbf832b6a8dd66ac868d0d1df253fed7aad0f5e28773748a27c5653e273fe9
+EBUILD zxcvbn-4.4.28.ebuild 509 BLAKE2B bb3601deb04e9dbe60d03296285afd745dadfe9ce0f98aa90e5ee7d2fa088a7ee6781e5c5dc973d80c799efce5e21018845ff5d75279757f2b6940f768854998 SHA512 7037ec2d52446fba35dede62776382e5e7027a7856f3a84f4702ff487d0d0e02bcbb9cfa04f768d73523ef5241479e6494c00742dfd157d41b9cffa5268faef4
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
index 632384ec4461..b5bbfd07f856 100644
--- a/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
+++ b/dev-python/zxcvbn/zxcvbn-4.4.28.ebuild
@@ -16,6 +16,6 @@ S=${WORKDIR}/zxcvbn-python-${PV}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 distutils_enable_tests pytest
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-02 14:09:07 +0100
commit	b17a3ef12038de50228bade1f05502c74e135321 (patch)
tree	9026dffec53f92cba48ca9a500a4f778e6304380 /dev-python
parent	3cf7c3ef441822c889356fd1812ebf2944a59851 (diff)