gentoo resync : 30.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-30 17:27:54 +0100
commit: f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree: e907cb121b30e3c1df1710719c0ddf4029597a47 /dev-python
parent: db063b515939ab15261136b24e4bc44386335c0c (diff)
342 files changed, 3905 insertions, 1199 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0e212658f472..d58c6a5c3540 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyGithub/Manifest b/dev-python/PyGithub/Manifest
index 7d6dd75b7794..8fba06ed9a60 100644
--- a/dev-python/PyGithub/Manifest
+++ b/dev-python/PyGithub/Manifest
@@ -1,5 +1,3 @@
-DIST PyGithub-1.51.gh.tar.gz 2950990 BLAKE2B 214014b8205d954c559f2d19a38c7bc93800f40500c294397f16d55a4a027b7827910c93d98b6f5dd867bb0049ad1c9618c08ff72996f3717480ad17ce0ec64d SHA512 617b7bbc1fbd680735d5a57910ac1863cf67d9b2afc037d20fbd140a32aaa146164a76f73d76f2395aff1eee1fb13eac7a146c9cd05791b27db9a06a28d520e0
 DIST PyGithub-1.53.gh.tar.gz 3026570 BLAKE2B 7204c5934b94d5629b38e841a9c9011ea561ca8aa8d3d169915975fb02fe8db059fcb521d11bbb2350a806457d98abbfe36a19c4e5f633c82cdf06b8b7203c6d SHA512 f98d013d5fdf31ee59405c52edb35942ca5a3d2c1ff9653c71f03871bb28d0c247412bfc2593991026ddb989e1a33dfe91d19b4ebb1e89386b54493d51071768
-EBUILD PyGithub-1.51.ebuild 765 BLAKE2B 00f5df1c6be8b6f146d7c5f27eec89cd001c2c2cdf14ff1abd4aa84c089b76e42dd35e478b1aab3583b4ed6524a21cc68d391b598bee60c791df044fc3431094 SHA512 1ba906569f5ec5c07d5c7c387024cb0b6285a7f535ca04e3396d373815a2ea342e7e6be33355cb8e6f50e5aad8f4dbc556a1d6ce6a9476da79ed7a3249f0aec6
-EBUILD PyGithub-1.53.ebuild 767 BLAKE2B e06845d6d84823f891fcb5cfc2278193b625d536ba95e063bb0fe5fe99617155a2a38eca2d7e057f1d25e12752906e52096435d9de44d919d99a9a7c5bdab6a5 SHA512 a67b987c5663a5fe7b9f883e387523ccb04513ac176c2754ceae509998f1bf978b0892d87889e60baacb88033112cd1d5ba5a74e3c58cbc4f65249db6e27e6fa
+EBUILD PyGithub-1.53.ebuild 765 BLAKE2B 00f5df1c6be8b6f146d7c5f27eec89cd001c2c2cdf14ff1abd4aa84c089b76e42dd35e478b1aab3583b4ed6524a21cc68d391b598bee60c791df044fc3431094 SHA512 1ba906569f5ec5c07d5c7c387024cb0b6285a7f535ca04e3396d373815a2ea342e7e6be33355cb8e6f50e5aad8f4dbc556a1d6ce6a9476da79ed7a3249f0aec6
 MISC metadata.xml 471 BLAKE2B 1d1b80ed6b439d4e66af20c29e7ff4a2c229e29bcd9c3b8c4735c7e15f8176c0fcecd88d2cc26745edc52f99c75e9e70ffb70df1a1acc2b46c29d8801973effc SHA512 a6c6fb332c408fd4219ec277d30233693397b9badf6a8bf438ff65ae3cbb9431caaf4124c2291cf9cc9b1dc671f162bb6018de7ec6495f6a9740daf9a25bffb1
diff --git a/dev-python/PyGithub/PyGithub-1.51.ebuild b/dev-python/PyGithub/PyGithub-1.51.ebuild
deleted file mode 100644
index ae1dba794d4a..000000000000
--- a/dev-python/PyGithub/PyGithub-1.51.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python library to access the Github API v3"
-HOMEPAGE="https://github.com/PyGithub/PyGithub/"
-# Use github since pypi is missing test data
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.0[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/httpretty-0.9.6[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/PyGithub/PyGithub-1.53.ebuild b/dev-python/PyGithub/PyGithub-1.53.ebuild
index 0a466756e898..ae1dba794d4a 100644
--- a/dev-python/PyGithub/PyGithub-1.53.ebuild
+++ b/dev-python/PyGithub/PyGithub-1.53.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/deprecated[${PYTHON_USEDEP}]
 	dev-python/pyjwt[${PYTHON_USEDEP}]
diff --git a/dev-python/aiohttp-cors/Manifest b/dev-python/aiohttp-cors/Manifest
index 80b02831bb36..84e1fd023857 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 957 BLAKE2B e607bc8cb189c8dfd8c731918ed2bb81c1c8df568b3478d67edaf26893d0fc47f6cd0e260ccdb8da459f704800dcd96fd550270e8701f880be8cbf361d138e38 SHA512 e78f462237ac84f2423f100fd172a1339a8d11890b64c55fb0f23f8649c4b12274775bfb6ffad1e4ec998a1cbef4facf2646e9d94e30c64d582185f9aab9fbbd
+EBUILD aiohttp-cors-0.7.0-r1.ebuild 964 BLAKE2B fe0fda2af78a6440fe20ae250c877af143ca72f630d969f980c7af4469a603ccb20c1e416c146467835dbc85e6380f374e5dcca52b68b36dd2c8e8dccab66379 SHA512 2bcc8d751b266a133ac4002b25ae250000ab5c57abaf22a14af3a17c90d66e07043d7a8370cccf0899258a4e3abc651559905b183897747ba545502997c07806
 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 355a196ad404..7b154442adf0 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 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND=">=dev-python/aiohttp-1.1.1[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 0e19f986f816..ebf40d1be47b 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 6761 BLAKE2B 3ecfc4251403d3f5df85a4752c1aa19d31b585f342940f39fc292f47d46b87631cafbd93bd86342559df614e63bf190c3cccd1fb3060a9fb4d09edf7f74278be SHA512 0d4825b013f7205c34e92fd0064b45824c4e5be30c159d768491335000d8a58ed015c5b5890c7e1c7f53f842682a2e7e86eab8f01b26a69138acbdb8461d9abc
+EBUILD aiohttp-3.6.2.ebuild 6768 BLAKE2B 6f4d67ce941d1c548272fe49ed8e2adeea5d080a658f15841c108692b2264cd18eaaa8c54bb52bb0de62e96ccc9450f6e6419d222022d2d7f8f365405069f19e SHA512 00fb1fa28f9e1cc71d4cad57bccceff967a055a2df264a09688bc4ac4fb68810295929c8103ab4a2c47971ca6c911693d21eb9818ecfd9fc135fa82628112746
 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 b2089b92c174..8576aff21c99 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 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/aiorpcX/Manifest b/dev-python/aiorpcX/Manifest
index 127d820e2d7f..162cbce7f549 100644
--- a/dev-python/aiorpcX/Manifest
+++ b/dev-python/aiorpcX/Manifest
@@ -1,3 +1,4 @@
+AUX aiorpcX-0.18.4-py38.patch 1913 BLAKE2B f15e8cf86a2447944cca64e5a6e99239918e9e2971faea70bffa13a38c89ae6007bb5504fba13830a4c7dff36fda8e55953907b49421e19204c732e323cf7b34 SHA512 ff7af0ae3f9a538e36d225fef827cb4684d6fa5eccd7f24276888a538dd72f9972d643110fcba87a2f5fcf3c1d54124d85364a51ebb1a1807e608564ed72cbd1
 DIST aiorpcX-0.18.4.gh.tar.gz 65500 BLAKE2B 8c84ace1e2bc974e68702e25efe126f7f69dd7451f438ccd924ee8be3c0cccc5c9b3d116bf2d0a755b013bdfe61a398d856031970e5ae82b571af09551231bed SHA512 d4df1343f575af72dff31f1794485c0cbb5b6c31d6d933b07cc8375a1418ad4fb81b2649b3c60adaaeab75b7a5d959838accc38269373310eb07895acf4c9496
-EBUILD aiorpcX-0.18.4.ebuild 734 BLAKE2B 7936a4a32656d5caf34502fbd20c6ceeb912e5a2ca2fca72689bef58dbbfc87a996fa62a822acd4ec9205d4b55143a39d6116c7747cee11f5892d4e4924cf399 SHA512 b7dfe1260f9884187c37706a03b697426a8d1e5e11cb3a9fe0b9ba8ce592bae78674bb75acf2b9551214738899181f07c3b2b81beb30e836d3649ea44e52aca3
+EBUILD aiorpcX-0.18.4-r1.ebuild 779 BLAKE2B 27da6ffd9e4a54d0a4fbc52e3a43b9b56a33d870bdf844f2641bbb2d89df39c515eb6cadf02048bbd27423591eed4dc1911ec94de05d2ce1ed03d66b4236c202 SHA512 ad38457b6891d2fcb24adc377ea8e6fa2a0431cd061b924ded6685dca46c3b514e6e1e293d8f19dc8132e88acc8ed793877059cc01c996f32ff8350750447e55
 MISC metadata.xml 380 BLAKE2B c1355cf2d901123fa14fadb4f4bf084d385dfd870baa0a2189c68d05cd3bed57ae4f1caaa668211b74b6e2491e3263b99ba8b99446c0e4f5336ea06577dc540f SHA512 b025f50be4d5ba7e95f7ae7b91099498b76b75c7faa28df52f0bb64dbe55b494107f011d42bc4cd6f5c9e5786b2dc1eb8ffc8561334326dff9c99f7877576364
diff --git a/dev-python/aiorpcX/aiorpcX-0.18.4.ebuild b/dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild
index 8aa08960194e..304db91bcbf8 100644
--- a/dev-python/aiorpcX/aiorpcX-0.18.4.ebuild
+++ b/dev-python/aiorpcX/aiorpcX-0.18.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit distutils-r1
 
@@ -25,6 +25,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-py38.patch
+)
+
 src_prepare() {
 	# websockets are optional and not packaged in Gentoo
 	rm tests/test_websocket.py || die
diff --git a/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch b/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch
new file mode 100644
index 000000000000..bc189277c4c6
--- /dev/null
+++ b/dev-python/aiorpcX/files/aiorpcX-0.18.4-py38.patch
@@ -0,0 +1,53 @@
+diff --git a/aiorpcx/socks.py b/aiorpcx/socks.py
+index 92ad396..4a6cefa 100644
+--- a/aiorpcx/socks.py
++++ b/aiorpcx/socks.py
+@@ -45,7 +45,7 @@ SOCKSUserAuth = collections.namedtuple("SOCKSUserAuth", "username password")
+ 
+ # Random authentication is useful when used with Tor for stream isolation.
+ class SOCKSRandomAuth(SOCKSUserAuth):
+-    def __getitem__(self, key):
++    def __getattribute__(self, key):
+         return secrets.token_hex(32)
+ 
+ 
+diff --git a/tests/test_curio.py b/tests/test_curio.py
+index 9292f52..97b479b 100644
+--- a/tests/test_curio.py
++++ b/tests/test_curio.py
+@@ -1,4 +1,5 @@
+ from asyncio import get_event_loop, InvalidStateError
++import sys
+ import time
+ 
+ import pytest
+@@ -525,6 +526,8 @@ async def test_nested_context_timeout():
+     ]
+ 
+ 
++@pytest.mark.xfail(sys.hexversion > 0x03080000,
++                   reason='broken on py3.8, upstream ignores the problem')
+ @pytest.mark.asyncio
+ async def test_nested_context_timeout2():
+     async def coro1():
+@@ -562,6 +565,8 @@ async def test_nested_context_timeout2():
+     await parent()
+ 
+ 
++@pytest.mark.xfail(sys.hexversion > 0x03080000,
++                   reason='broken on py3.8, upstream ignores the problem')
+ @pytest.mark.asyncio
+ async def test_nested_context_timeout3():
+     async def coro1():
+diff --git a/tests/test_jsonrpc.py b/tests/test_jsonrpc.py
+index 315f639..b0cdd60 100644
+--- a/tests/test_jsonrpc.py
++++ b/tests/test_jsonrpc.py
+@@ -1126,7 +1126,6 @@ def test_handler_invocation():
+         (Request('missing_method', []), 'unknown method'),
+         (Request('add_many', []), 'requires 1'),
+         (Request('add_many', {'first': 1, 'values': []}), 'values'),
+-        (Request('powb', {"x": 2, "y": 3}), 'cannot be called'),
+         (Request('echo_2', ['ping', 'pong']), 'at most 1'),
+         (Request('echo_2', {'first': 1, 'second': 8, '3rd': 1}), '3rd'),
+         (Request('kwargs', []), 'requires 1'),
diff --git a/dev-python/argcomplete/Manifest b/dev-python/argcomplete/Manifest
index 6eac13af4341..c93213d14904 100644
--- a/dev-python/argcomplete/Manifest
+++ b/dev-python/argcomplete/Manifest
@@ -1,3 +1,5 @@
 DIST argcomplete-1.12.0.tar.gz 53625 BLAKE2B 29b4f620537a087629c63dc71c6a0101d40967145680518b566b9c81e3e744c5d73e1ed016795f0ea4338be4e8f20b7df1968e388e1ff09308e012ed1ba6d0c0 SHA512 5e21e3caf1dcee661c0dadf28d7b127147325475fe3ae569fae8797a762c34b55125df9f52de8d76f0aa6dd4efdac260a358b325a7659beae02b1dedab501c18
+DIST argcomplete-1.12.1.tar.gz 53677 BLAKE2B 85c5d75b59875b6fe5bb932ed05916f3af23ef64b993544c69ae431d9e6b5d8c23a9bd35d76b570538ce8e722a6ffc8cbcbfbc9209fbf29ddb000c60a809c03c SHA512 236871966361ac781c04f52c02d90c20badabad12d34bd7c5cb1cf1a74d442f9147e04b320530b55abc0490f7bcd11494cdc13ed5c339c91737f1c979010d096
 EBUILD argcomplete-1.12.0-r1.ebuild 837 BLAKE2B 854f8cdceb843ad602bbf6990f87f65af2014c0db0bf22b7efd50a000e983e6da5453a5823e007d84cd1e3debf3ed4228a32969277a49f5514dddc8612bf33b6 SHA512 7a487867cc788f382f2a33fd3e870d8ebdfc1abf75cdf78da270978defa07c7b1387589c3abec343d060dba5c41fb40671f7999ea49808a4a1e16272ab4b557b
+EBUILD argcomplete-1.12.1-r1.ebuild 845 BLAKE2B e4b5274d0ddef1cd9fc44ce31a5fe3b45efe058f6bd4afe8073a8d89a54e6242254f4ed9350609b3828f9d482efb402b94cdfd28eacd238aff7e945900166aea SHA512 9064048d5c985a95d09802ceb031a2417efa3e755e5fc4a33496fc4aabc38068d3596da2c071667ded79b5cfd662d276e31b74550f80d068d9cbe6fec41dff1b
 MISC metadata.xml 410 BLAKE2B 5cc57d8d5fce195e6c050674f8626a6b2a884a956306c668a40fb81c3bed51d9dd8a23c4b69cca5ece9facdd6d459341abc2e5fd4454b1f3614b5866b3501682 SHA512 9a04c26c63f40f33ed3f5d004e5a0478dcaa5f90c363f1364ee14f309433d65e3db5809b3fa8b504c4d4f961b79a8ae39efbd6b3af1fe1cf681ad1f4f9a89fc3
diff --git a/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild b/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild
new file mode 100644
index 000000000000..9756cbf400bc
--- /dev/null
+++ b/dev-python/argcomplete/argcomplete-1.12.1-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Bash tab completion for argparse"
+HOMEPAGE="https://pypi.org/project/argcomplete/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		<dev-python/importlib_metadata-3[${PYTHON_USEDEP}]
+	' -2 python3_{5,6,7} pypy3)"
+# pip is called as an external tool
+BDEPEND="
+	test? (
+		app-shells/fish
+		app-shells/tcsh
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		>=dev-python/pip-19
+	)"
+
+python_test() {
+	"${EPYTHON}" test/test.py -v || die
+}
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 7cd3639f0da3..229082962b2e 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,5 +1,5 @@
 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.8.ebuild 693 BLAKE2B 1a17920f4be6b1636a112c4836fd5df0d70752cf731cc5dd6336cacce74a0b7582b74464b153c4665651c9ac9c0c7edb486bcaa8a107e168052a065c54c00bb3 SHA512 737b3519042b7f72f6fb36a03f3cb1ca99940ed6bdc1daeb7b3b0823ad97a4fcc6cc0d5fd2851f9e4f26ff52b40d42b7a857ca8fdfdc47de87ee2005bfd5b0fa
-EBUILD arrow-0.16.0.ebuild 703 BLAKE2B 5974df6331c78efa84ef7dbe22555d20bc963a327446445688199003bd5c539e8e012839eaf24d0358d59ae8494012d46927231bd8ce4a29f9081c403242eb88 SHA512 52894163dbc1fbf14d6f489d1c5300154a57a8d7b243a6b79b4d5c0aa3622e051bc7081e8090e849fece78a9efe0cb7004ab0b4156d415ca116a12e0ed643573
+EBUILD arrow-0.16.0.ebuild 701 BLAKE2B 5fd0b11f5bb287d47d1cf02ebc7ebf07eb0cc9fc5f624f967b2b2ad2908e1b65cb8f6f26ce67758addec83c2dbb98f4a07ad76f64a1f47aecc9e7f283ec4abb9 SHA512 f84b16734673d75c7ec2311ec165d31b5e3f3144479e3d453a5ba9f2120cc328ca9140d10484e1fd4b00c5d1673a2a40a8e768a9fe764488f8393e5571d95dec
 MISC metadata.xml 388 BLAKE2B 68ef136715f60b69973bcfa1957f23ddf81a8d1cb99d2edaf955562b78f6d92a6187b97f208366b320c0bf140d2ce0d9b62aa9a8d6631b9277f58dd60cfdf5bf SHA512 66f3d1a07042e4e935dcac1e5417893b9fd7b9e97b9f7e3670c85960dc2344e101715cfc11fd2776aeddad8b622c4e8fbe509ee5d93c5250183486a7dd53e16b
diff --git a/dev-python/arrow/arrow-0.16.0.ebuild b/dev-python/arrow/arrow-0.16.0.ebuild
index 1056296f2129..1cc6a3c1c47a 100644
--- a/dev-python/arrow/arrow-0.16.0.ebuild
+++ b/dev-python/arrow/arrow-0.16.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"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/async_generator/Manifest b/dev-python/async_generator/Manifest
index 653c15280074..5f39e0601d1f 100644
--- a/dev-python/async_generator/Manifest
+++ b/dev-python/async_generator/Manifest
@@ -1,3 +1,3 @@
 DIST async_generator-1.10.tar.gz 29870 BLAKE2B 7f1bea82b1ed9ed87774f1fb42af2c58d8f9e34a02f067fad018680d46c94b811075107396b29e948fa5f72131c79f3b45544fae5aeca9f990e809db85bb28dd SHA512 3874b4e474cc7febec981f704672e233512a999e00e1672e46fe3a18e45168373fabc83142926763b7c6fcaf16948e031702d5854694aab4b5cae96b9b1ef819
-EBUILD async_generator-1.10.ebuild 685 BLAKE2B 49f5cd601fc27bfb8f4fd912e6d6279df0a8942a655815ac065e8fcf4ae7847861c8c914ce8e8280b81471d2cca8e92b49e35b58018df73e8a4a34bd3c37cb0f SHA512 166c43f389694520d622e0c416f616b415e1c4ce157f1f379df77f863e05d3072f4ab49145bb66150d2b01707a3036ae610ba1bab5b13fc91f0ee19720b9d275
+EBUILD async_generator-1.10.ebuild 692 BLAKE2B 6b41e4e7b7dde7bd455a5903923a625df428a8e85268682594f662e3f8401c880911033581ac8f50fb52c78f79e70500a2e3789b0648f6d899700e651a6cd9d8 SHA512 4f63a79843a4d43522dead01420c4e0d6e9ea6d20d9815b95cf01073496f2bebeaca0054340fd66ecdb6a09314a6bb9833ee3d00c297b4346e3b0506f7405490
 MISC metadata.xml 442 BLAKE2B 93ff73ecbd80ae38cb18b2ffe11bb60c411b7f3ce36b196566e230fecda350a13d19892e672a65fd278038feb53273b39ed7eb42809bd397bb71b8eeb4baf5ca SHA512 fdd4036bac7d48e387e8ad059be940d3eb3cebcf1d6a6079cf4effe25265c3a52d360269fccd8e45f67374d2ce4c2b67245e75fd59656df92a36744265494f07
diff --git a/dev-python/async_generator/async_generator-1.10.ebuild b/dev-python/async_generator/async_generator-1.10.ebuild
index 6fc53dac5a04..328f79e69dc0 100644
--- a/dev-python/async_generator/async_generator-1.10.ebuild
+++ b/dev-python/async_generator/async_generator-1.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 3db4f1d9e8c6..4a3c777cf635 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 1004 BLAKE2B 8e274597cbf11e7aa53a71360afebd093dcd083c67c88f0e5f1973d910688af4dad04b77be07408efcbc90b06cc5a5e525c017eeeac71bbba5e5abb89e3fd8a1 SHA512 5be4beed84c46256495ebb8da04911b6de7b405f5fd43e9cbb1a2b717f83df94f537fcae6184ff4baf554352cf8d217204ffb3f9ba2b7924e1bceb06fa9b1f0a
+EBUILD async_timeout-3.0.1.ebuild 1011 BLAKE2B 96762976a1ed2b2a794bb3fd80092756af5ced437fb5671804ba03d7b5a23f280781f84448c81109b0b16c062ca0fd697af6a66e97f28e8603465b0524667a58 SHA512 e1761c9a050f9e05a8dd8d5619333607f233c1299f0f86f777a24755ad4ecba2a19543583698d00ce4a45de18621b761a7acf67945f29637402487209622b3bf
 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 a9291b7803c5..618cfd9b570f 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 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 S=${WORKDIR}/${MY_P}
diff --git a/dev-python/atpublic/Manifest b/dev-python/atpublic/Manifest
index 8ded0967493c..3fa1d66cd3a8 100644
--- a/dev-python/atpublic/Manifest
+++ b/dev-python/atpublic/Manifest
@@ -1,3 +1,3 @@
 DIST atpublic-1.0.tar.gz 13611 BLAKE2B b5ce4cbbe950943c001e25c3f0c1fe6c25a99a96e4c630844a409cb0ae9a2e7d8fae8d010864364bb2bc948ce78ed17bef5c1f1ca1435faca439f62521bcc719 SHA512 f9e6f7bbbe12d86df5bc849c432e789fb55c6d19b9d6b3fb2462ea38aa8ad6602504a30a95ec14e001f62709ae5e11ae29258b9cb7a71eaa48879f9cb0cb19d8
-EBUILD atpublic-1.0.ebuild 495 BLAKE2B 1d71d3b681a9e7b5bb443f1772ed23849de2e6ef97e2f4f66a0d6db15f7c77abad32dc4848aefdf0e6f3eae01e3945619254d199e9414c841cb71e7f9691d2d5 SHA512 0212885e9bdf42d832a534bb6ebff24f31bb4d88708bfc8b1c19784d191afcdfc1610b21b69f5b9928dd4579b095f66a13bcc9fe5d80201bc7ae98d3086e7558
+EBUILD atpublic-1.0.ebuild 491 BLAKE2B f5631f8eef7ab14c94994484f0759a18007a0c882982e9b523fc40d83f2d840a8940987d6e5fe6cf817a98692bf7dc2288aa1fbafba8dcbe31ed447b30e39e6e SHA512 64db34c22bf2cc034170cb774c961314dd7e58a4bab9e375e680adcf5574e481184944e796ab536e72f3acfb6ff6983cc461112d1eb65ba54481ba1eee936135
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/atpublic/atpublic-1.0.ebuild b/dev-python/atpublic/atpublic-1.0.ebuild
index 6cdb26be63ac..0b3d317de132 100644
--- a/dev-python/atpublic/atpublic-1.0.ebuild
+++ b/dev-python/atpublic/atpublic-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_6 python3_7 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="A decorator and function to polulate a module's __all__ and the module globals."
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index ce53e6d16685..0299fed4cda4 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,3 +1,5 @@
 DIST beautifulsoup4-4.9.1.tar.gz 374759 BLAKE2B 43f5dc296bd0c4967036fcb70889f988c0dfc9d8713f8bbab423c9089e87960323392458b3abb9b2332acff286efbbb308a5c77058462c15f8dfe9056f0304c3 SHA512 a1fe9cbfe8616d2ff25cc836769ff02d51ed86b06ca9a37366867b145440b7f64b866346600ed74820f0407c8e70eaac3d58700766a99b5ff7433cb736a57b3c
+DIST beautifulsoup4-4.9.2.tar.gz 375880 BLAKE2B 99137530e3b95aa4dde80b64dd42f0614c6429aca421208eab98764f7929c30a725e9df3625afa4a2c2e8bd4be56144cb9077e8e260741b6b306cfa696e6a076 SHA512 3bac5d57404e0be1e77a1bd560750e831c8636fc5f9b3c05b375c0cf44d6846ed73127a2a7d1d8ca657c21ec33854b8194f76b62820fb627d80a5906229a7454
 EBUILD beautifulsoup-4.9.1.ebuild 865 BLAKE2B 56ad3bad060f06f8c8c5a423756737103788c45f0989e8ec3b6b73d3a5e3d2f9cdc8d45e488a518ea018fa24b04cff0ac670a1c25cd81a8cfed7845b6cbfea5e SHA512 4d7262aefafc557a8f5a82312043aa2128cff129032fba20a17b25363e2047cebd6c73423c16375a0690ad829aaa60fee13a0fba83022e00f2244e469e850028
+EBUILD beautifulsoup-4.9.2.ebuild 849 BLAKE2B 6d2b22bff7e16eac5f5e4fbabbd280d42d10fa671ea3f4b85384c9689bfcd8e0d4a46d6bd84644ac0023cd06cd9af2a79e12c24c764b248f01b7edf8fc5d61dc SHA512 3e8c20c173aba4009c59be54b2cd62ea748e6a8ed325e042bf951e5b6bcb3c4d06c45e877e5ebbda5226d42a57372b32b9f1bc20a68555369c87ac8afc916703
 MISC metadata.xml 744 BLAKE2B 93987e4adb8dc5dea9b897940cae80d431b29d693bd1fea9d242de75174b1fd86afaecc6a5fb5e4ad06576caa559a918d09da28d253147f2683703d911435f76 SHA512 f56ab7ff03d21187e38f292b24396eccfd53622c84f5f489bd1e515393dbf85b75bbdfe26a6875352b16dcbf16f89cd9a051dfe44dbca8786efecd7db914f789
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.2.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.9.2.ebuild
new file mode 100644
index 000000000000..8c2e9be5885e
--- /dev/null
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="${PN}4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
+HOMEPAGE="https://www.crummy.com/software/BeautifulSoup/bs4/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/soupsieve[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests nose
+distutils_enable_sphinx doc/source
+
+python_test() {
+	nosetests --verbose -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 474246cbe479..cd8b776a05ee 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,4 +1,4 @@
 AUX black-20.8_beta1-setuptools_scm.patch 467 BLAKE2B 4dd16dde09bdb9c9b8480eff2542f11cbe712919dec6678193fae1dd2d58c646c76ecc4831a6bcbb54ed5a7f3692f61953bbb8856e8dcf6b64918ccbf32fe69c SHA512 47df09f60aae9ebbddfdf513d9b6caa30aaf60d65cd21027e965b0544085d63312dcbdc54906a0d1ef0edfaaf00f3cc753a7af3c113f4001ef4b48ca53e04c6d
 DIST black-20.8b1.tar.gz 1092546 BLAKE2B 5a0a755222617d8d551b627c91670ecc32a9330cc1197900a9d21b071d0d99ddd32e09786becfc577407ab402f6da3d8683a59a9deaea1f6b4f07b9e1e4ecbed SHA512 53d6f6a6f47027e5bdfd3909471c993480034c8aa8ae395792565b8d79fb4e3a44299ea529652c0ccabf4309d645db9179bf54efc06fee20517f479e91cec838
-EBUILD black-20.8_beta1.ebuild 2196 BLAKE2B a25330d815527c3bb5df0bcbebe481618c2028099253998067a5359624279c0bc2d799bbc0eadba5c6e5bc90c8bb3660eb0942ee59228cca36d026aeb7182d6e SHA512 7db27cefdb3f98c801955ea3d680ab4c0b7cea237f4564b3369ef002faadb4b8e5c67a6fd3ca3e589d0296486b5a11633fd1ae1f9a66051074b3ba1b1277713c
+EBUILD black-20.8_beta1.ebuild 2203 BLAKE2B db78e9b9cbf8f289ad0284155e20f766bc2952958834eac0dfa61568e8865e0d2fcf9e208c9574e1aeabb580283239955a937858849235c3fe034450532ab915 SHA512 2e683fbc67c51e18dea4424cd6f794796fd07ba84091c105ab5a025b83e93d1d51ff9de8258c7b9f01c364118b7dc2ec84a56a512300c9f428e887a2f257b37b
 MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/dev-python/black/black-20.8_beta1.ebuild b/dev-python/black/black-20.8_beta1.ebuild
index 229cdc66ac76..68248b52a45f 100644
--- a/dev-python/black/black-20.8_beta1.ebuild
+++ b/dev-python/black/black-20.8_beta1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/blockdiag/Manifest b/dev-python/blockdiag/Manifest
index e747f0d7dd4b..f3dcefc2e52b 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 1698 BLAKE2B ebf09c851a0ecd89c2b595bb38f9ce4c85c215aa6f2ab4cfc10919bde2bb0d6498332df82f21c14cfe87d9b3e0eae87e1f7d92a604957fc9a3721f78dae4f9d6 SHA512 a67c58b4372f2fe0b0c87586952dd9bf2a99a3831204faaba1b59f4f7c9a8d595c01721d0098e7794633fbeb4dc3bfb40e3a3c40633a7248c0e83b6ef3331fba
+EBUILD blockdiag-2.0.1.ebuild 1704 BLAKE2B f0400d6b774b1b439f8de14a7633caf04847b3e99937f6926fe408ee724c9a739bc91836eebaaeb0162a4c3686e801eff95dab354bd915ffa53635d45d9ce4c4 SHA512 4dc538e420e1fa2e5089755da3fd323d183b4f66e4b5736e6877e67c654cb409cfb91caca519a10fdc4744d45771cfb939e918d97deae6df3459c547b652a37e
 MISC metadata.xml 773 BLAKE2B 898f9291909c30bee45f6b25bfd9c2746d536eb9a238535cd7b7770565f64a6a91590fcf51f52fbc6a77cd4604014c3c9a8c66667b04359f7a686a284b8aaf41 SHA512 2d7ca8b92d199ed60f2035868175afb50a01e634da31cdbf0b6d583ca75c8362d186a613edcad83f42172c5abbf42063316116b62a4e6a7513493a734f51309d
diff --git a/dev-python/blockdiag/blockdiag-2.0.1.ebuild b/dev-python/blockdiag/blockdiag-2.0.1.ebuild
index e01eb61ac595..2a481caaf805 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 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 3348327c73f1..0376e42ff109 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,6 +5,11 @@ DIST boto3-1.15.0.tar.gz 335099 BLAKE2B 0cdf8cc0007a90671d4d3c66482d834e24860990
 DIST boto3-1.15.1.tar.gz 335146 BLAKE2B d2d008dcb2059b120f142aaf588264122d1e84b450ab1fbc938627d1c8cc9bb60d1b80e68bc5e538376b56866156ca901abde747a8f973588b64b962284229c4 SHA512 46e1aabaa975b0215c2ece160b5e584468ba19699f87686c2787404d0a13274f763272cec577f830c6c71cb7f9e10b1c317a1348770f49283257d8cba65c5e3a
 DIST boto3-1.15.2.tar.gz 335231 BLAKE2B f1eb144da7afc1cf630cdc1f61880d094186a37d46556ae361da278fd3045a119dcb09c3d08387a019ca88d6502fa8710a5e5733cd9dc9056676ef17853d76e2 SHA512 6866e0d6a50d11495e5f2a33a392b0edbe1ff6625235b26b5d6028f7c2c7089d78febe17b982f65dc2564254800a23409247ac09716b099f09f3751c5b7f47b5
 DIST boto3-1.15.3.tar.gz 335286 BLAKE2B 05c9ef757b8d227ae06a22e78d978821ff50da719f122ac025940b2e1ac5728d6bac044d4bfab95c56ac8c363efd7abfe3de2b3fd65d423ab53dbdfc60b910da SHA512 dfecfc075896ce84fd58d0437b84a6a794af69ff3e598b35b43f83b2b5ef57b88f96ef62a0d6505d5fe7fef0401513c8ecf0dfcaa22e4575510acd3ece191901
+DIST boto3-1.15.4.tar.gz 335401 BLAKE2B 42ee1f2cf1e82338ea59a40b95aa5c76abae51aacf325ae845f407ccbc3caf1b3901bca48036889ad6307f96c257259cce39784a3f52ec6ff03c0c6c5633c654 SHA512 14626faa3943b65a215b8f1bce24f217e69421cdfd40caaf7de0fec13ca9b5b25c5e290c27672b2a6bc41316917224209110e2efd5be817de7273f93ae5764ce
+DIST boto3-1.15.5.tar.gz 335536 BLAKE2B e4476272346dce929be52be220ac7da2e258bc20f5586eec8adb18bfedf1be63c6318a4ac9890d1380b625a67aa4ca5068fbccd6c36972a9ec8baf4473d1f2f1 SHA512 d9d49176b800f2fdf70ae3da657201571a26112f23b12337b133459c6e03d4f56970f6a7be3da6570439f32c41fc917adcc8c3b1d9cd74196728ac55ca0bb933
+DIST boto3-1.15.6.tar.gz 335618 BLAKE2B 6f3816b6363757ea1dbdef4bd710a68f07b513d2f4b6a7ad05769e2417e8b0a6752dcff8f3600f8bb419f074a24b32c9386c9f11dc549097bd963c32d20a0d23 SHA512 7357f8ac98ca1bb1983af22537d1ed939b1e51371966a7c312ec748f6acf9fbbb102335965a79cf44ebbb2b0b4db9ce859c4470f542d19ceea4513d90eaba274
+DIST boto3-1.15.7.tar.gz 335640 BLAKE2B 01becc9a36fc03937153fc7d4a37b5630bb1c1d6f72ff9420de73a05f4ef7e5e39561e4175b6f652241d15efae708123b41673d9d69453b9b902c0f1568282b1 SHA512 4b612fc51e453af77e84ddbe5d3ee8e03e25be37a2b8fe65a960c22b8ee3423b1ddf0a482a189378e470500b3fe78af615571f15f9fb8fa86147a4334ef22ffa
+DIST boto3-1.15.8.tar.gz 335724 BLAKE2B 4b034d21108bcf7fc100f71e534e348dfd72cf1ffea7e4ae53fa420e05c1e854216095e3179c4ce16c893a5bd32665830fc5ef3c3a4f0a011797b227ac53501d SHA512 dc6b9816fe58401a391aee2843698d8245141cb9735cc8b3c27181388ce8df070649e15d437ad96bbe3948061c97b0285e323c48e298c57271cd83d11180c768
 EBUILD boto3-1.14.46.ebuild 1353 BLAKE2B acf7d5909ffe2c1b58d3c2438b8ce995f98e092b2a76977674ad1c0491b4e2093ea53d8a1cd45b225e3577ed28847b60319a1a682d1af74c71acde7a822c4da2 SHA512 fc2ac14ce0c1ce9e7ccac46bdc9fde2e84687a7c634a784cc0ac7e99556b84f4ef3d2d27e546c445b687b93dcc293b63a5e3716ae645b01a60d8550fda591c4c
 EBUILD boto3-1.14.59.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.14.63.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
@@ -12,5 +17,10 @@ EBUILD boto3-1.15.0.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a
 EBUILD boto3-1.15.1.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.15.2.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
 EBUILD boto3-1.15.3.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.4.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.5.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.6.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.7.ebuild 1355 BLAKE2B b77544d9428e4a8306032b23d79f453bfd59e44a61fcc664506d8e3b8977478bebda0d6b7df403c5e2b00473f0b14bb8eff7ef2bd454597c7d5550a6c37e972e SHA512 e863b24a58b8a33b678c3bd7b9f26ae9fa924f9f9cbd6ae7e923f1f764c4c83852c6e15084e0614f6141ad4ba00596208c41e543b40cffa1eec9029b7ae09ed2
+EBUILD boto3-1.15.8.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.15.4.ebuild b/dev-python/boto3/boto3-1.15.4.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.4.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.15.5.ebuild b/dev-python/boto3/boto3-1.15.5.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.5.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..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.15.6.ebuild b/dev-python/boto3/boto3-1.15.6.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.6.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.15.7.ebuild b/dev-python/boto3/boto3-1.15.7.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.7.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.15.8.ebuild b/dev-python/boto3/boto3-1.15.8.ebuild
new file mode 100644
index 000000000000..ccc99e1c2415
--- /dev/null
+++ b/dev-python/boto3/boto3-1.15.8.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 71c7453b0d71..84255414be87 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -7,6 +7,11 @@ DIST botocore-1.18.0.tar.gz 6838497 BLAKE2B efc0930b8ffafdf8d7f24d4f30cbf12e0dd8
 DIST botocore-1.18.1.tar.gz 6839699 BLAKE2B 188c5a05345fc7c4d4c05b3a8d9b675b5c2141326caa62f9ae8a5a996f6c7ff4e56c581fd010afbc4c57073d7b6efd22debad3e03456f6ad0453c7f823d6409e SHA512 63a9a7ac93a8774d7a1a511da0464d7b5d0841598c7358e97343406b4d76842ca56a0187ff173e0a29d9da9ee22f94fde66f4b8c3e9c8a3fbcabdaddbe95b752
 DIST botocore-1.18.2.tar.gz 6843154 BLAKE2B 77f4cbccd6a686cfbdb2f25fafb9f2210c0e23de72fb40403f905711ec5d073b92cfd003d39406d273feb0bfb90e2ab594f2bb9c1564b5b0879efdf3bcfa47e3 SHA512 f4fec4caf3b4ebca8a593d58827fb4377c2458b7ebccb53ccd830df5423a2021ecebd534d2fe276662f8d8e91078bb5adbf611a52baa29c8ab3526d9c7b975ac
 DIST botocore-1.18.3.tar.gz 6846755 BLAKE2B 3f6709cac832dff1ba07c2e8b4c235b5bcdf305c9851eedea2ce5f7847d0be93d7e9cbcb1765add47aaec1d0c1c31cdd2c88542a984af570140ffb7fe30d8388 SHA512 a8831b1549a768cea9d550dc2dc3c1c8afc03e018d2ce246569bed35cb9ce25bcb18689d066dc5b6e6dcc69db93e0b0957b32cb68c101127e01cfe3fbfa9fe08
+DIST botocore-1.18.4.tar.gz 6850892 BLAKE2B 013319b1055db5a65f25b4d11c0ae97e6eb58a8976eafea98c80a33c756b8715d69fddb86c900e9c3c1a6447d05a7afd2f11a155db5f6cbcefc5f80fccbf680c SHA512 c84b7c5dcb78101d6d04bea2a4453e2c47711133bf4ee1e96c6bea18a0b3de7c41021bfe5ac501eeb2b35d50bfe8782ee29d931adf79ae77a45a2f3b117716df
+DIST botocore-1.18.5.tar.gz 6852318 BLAKE2B 3aeca749a143cba59ce637935a711df14351444bdbc3c2c6133431700a9d0ca1d8fb878ee3561e34c223df4c91f3e7054abfd82b09469369610ad0f35de2ff22 SHA512 3ba448a45460ce746a01372ab8e37b2faed7529bdd1e17d9ce9d79545a3700231e36f9b00ba448dcd33f60734dedd5dc9851def843eff55a0c9ccf711ee06b35
+DIST botocore-1.18.6.tar.gz 6854270 BLAKE2B d5d8a321adde9c16706768633a8ed32d4db086ec2634dae8e2057c2217b2e729bfd02e2968a9749d660ded41c883ac153a80083256a27496b4b59013b57520e5 SHA512 d4c3f79f1531f85f2ab793bcdeb13f8f51c333e704f404415e49f50d310a715f752f19bc4bc7ce07c5b20f19c5924008f47146f737c318b9204d8a4af4f6fe8d
+DIST botocore-1.18.7.tar.gz 6854828 BLAKE2B d4b3095d29fea7157ca8b5499726886527941e04e0c2f274eba3573acc8a8c6ff26fd734f144335e03b9bb25c9fba128bb817a68178c284406a232c1d8881050 SHA512 c94ef62d4cc89317cb13fd96f5661de8ea3b1478c4dbce039d6e3b6af6ac4e58e3e5cf2d7d62c90e5b6b046303fc1e9273041640ae4907086591213ba3f79877
+DIST botocore-1.18.8.tar.gz 6865779 BLAKE2B 5b67b67deba73a0a69d4b413bfb105b3eeae5d62a38b0f109d172652270e490eed55b42c8a67c14039aec3f8f0b8b1d1dd9d6945bf9c86d1466bf69d4dc4237f SHA512 467b8ac3c3860777efbf37868add24fc56eecf65003c03692f45669e4ece965c129e18fe3ee0e1ed75b02c886f5762186572927c5e99b3eae85724d7443072d4
 EBUILD botocore-1.17.46.ebuild 1609 BLAKE2B fce27c888fa414b4121f897eb9745f7747f70ce1968a3552c2721baec6e8a11169ce366acda929565eb71192fb2698b4e2e48a7898e1daaaf60e69574b4dda1d SHA512 dab881e9279a7125f3c478608664b198d57bba5ddfc7f8710fd84f5b965a5414fbf931dd8e931a452f1a31f0d08bc9b8ac6915e561e9062e4df0eff19239f1b8
 EBUILD botocore-1.17.59.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
 EBUILD botocore-1.17.63.ebuild 1611 BLAKE2B 3b63a581ad997b3d17ec4c2124b391537420fd0ef91f18f0071be34cfe13d70241006384d64fa577b1088d8e5664a8260c008959a6ba102bd13c68117618d010 SHA512 8c7cacf4ed5b422db3a065281bc26b7e582c852807df75949e8324127c93a230106a71c3dd96f09de00ee4d30f31ee8a77a97513bf7b76c1c39bc4d891748303
@@ -14,5 +19,10 @@ EBUILD botocore-1.18.0.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7b
 EBUILD botocore-1.18.1.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
 EBUILD botocore-1.18.2.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
 EBUILD botocore-1.18.3.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.4.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.5.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.6.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.7.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
+EBUILD botocore-1.18.8.ebuild 1487 BLAKE2B 7950b667f687c23796dbaa4da135ee890ad7bfc97b0b4f71c393531095850d40d69137153e0e3abb2db2f017db1b7277228b2a341edcb5a164eeb7da6cdd91f1 SHA512 808a83af211652d25c6b4978f51548efe5074e1fc2b03c7193072d93371c58bc52b232db4d0c2bc3ab73313c50bf2d2412f52a6153a52d9674ef322079243f9c
 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.18.4.ebuild b/dev-python/botocore/botocore-1.18.4.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.18.5.ebuild b/dev-python/botocore/botocore-1.18.5.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.18.6.ebuild b/dev-python/botocore/botocore-1.18.6.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.6.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.18.7.ebuild b/dev-python/botocore/botocore-1.18.7.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.7.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.18.8.ebuild b/dev-python/botocore/botocore-1.18.8.ebuild
new file mode 100644
index 000000000000..ba67bf7ac94b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.18.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 84871d6f7e29..ee5458995bb3 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,3 +1,3 @@
 DIST breathe-4.14.1.tar.gz 69369 BLAKE2B 93c394d7174aff8e8e8b1c95435d88c5f344ea1a26f46e9ef6ea8e7457bb9650d0cce96d03bc5c23e58704e3dcda3228ef1a61b16cd9ab45b07c2f1989eea88f SHA512 7247aae71c8e3e2491b76e6a5889fd9b97100e921e8c724c26e6c75b904c4e5dca825ae824b015f156960d5afbbf622b29535a46261c7fa0c24dd52deb46d096
-EBUILD breathe-4.14.1.ebuild 758 BLAKE2B fced61c688f9496422adb3267165824904c93b4959107d87a84d7368168e8ac124c4c927a6df2590cc059368c16fd9db2b6b6dcd862c859a3cd00d0c3c5dce2b SHA512 b693afa217365628e5606be195d1e96a44ed6522e9aeacc06674df15034524bb8f62a3164efeff9550b24ab2c21dad83c5d9be7cf4a638416f476665703fbf33
+EBUILD breathe-4.14.1.ebuild 764 BLAKE2B 7c4fe46495538c0a713d5dafb3a8cd71a9f1d8b5f84fdc54e6e76bb14de2b6cb6ff54b66403e8b4a971698990b2aa866041f7ce90582e90c54e729c6800ee5e8 SHA512 1235f63ff79f275a403478bdcad3ee8723d4ebbd274bcf1545b489fbfc4174ef4f7b2cc76020038933397a0a53d9e65f3d82350b4a5b6cba0ba29d49747b3ba3
 MISC metadata.xml 796 BLAKE2B 5f7541beb0113e83fb387eadfbbefea4bfe9d6a172c61fd60a2de473ec9e61f1a941d768350526de1464ff0ebbc58dabf13e7be3e38cac1d3a3cbcd791260d40 SHA512 734fa318039a2831c3cd35fa9f710739406b627f1e0f1d34c772d1d9dae53ea6921c21a236cabf00e3a1d3d2e95f053ea39436b1f539d9fa0c2bf1abbaf9018f
diff --git a/dev-python/breathe/breathe-4.14.1.ebuild b/dev-python/breathe/breathe-4.14.1.ebuild
index a9bf669f7e1b..9f9c21dc8aa4 100644
--- a/dev-python/breathe/breathe-4.14.1.ebuild
+++ b/dev-python/breathe/breathe-4.14.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-doc/doxygen
diff --git a/dev-python/capturer/Manifest b/dev-python/capturer/Manifest
index f5ccecb52013..051580dd2b98 100644
--- a/dev-python/capturer/Manifest
+++ b/dev-python/capturer/Manifest
@@ -1,3 +1,5 @@
 DIST capturer-2.4.tar.gz 16963 BLAKE2B 329e388059a033993cf2ac3744a8df273beea0239f3696d19aece57767b0b5cd3397fa095f860c4f00ef24e8cd6bf2e58aab4158a86cf8c0c09c89d2065de0da SHA512 d85614b0424ab8817df9475ac0d230d7151289a3353a3c043a7fa89dac0528265a4dee535cac9ad0a3c2fbb0cac18afa69cd0a405b1becab55f9a6be13df0c46
+DIST capturer-3.0.tar.gz 18146 BLAKE2B 345313fa9e58c4e0121c795bd99606f99e46459215ed239da56586da8f8ffab35d97f0bf655258abe9cc45d4abaf7cb0ad2e76054d8c1781be2531ca01b04381 SHA512 3c83c0eade27380304347bdc93df392b2cb84c084e50693993dcca5fd572b8f92d31de43b4a2ddd0a0e8c7eb097629127e86a4860918c507d13b0e2979a04098
 EBUILD capturer-2.4.ebuild 738 BLAKE2B 2755052a169fe6c3f5c2741198c5f44f538bdbdadb2f6ee9ebc8cfb92813afe684ddaf12d7b2c61f4eb677b52a655c4df65cb687ede328b8cf3e3a3a53ff450e SHA512 14fbd0716ae21a0685c38fc7d520cf1c1bd90698f81c59cee7e53b4b9f65beb0c76a60a131c7bd9a0063ff50525519abc6172c9d100ce46a36242342d2fc074b
+EBUILD capturer-3.0.ebuild 717 BLAKE2B d5ba8786a9d0cfb7fc5c0d4407a283ee550ff252844338865aa34ffa266875e84940cde3f26a65eee836a77e485ae6100e779488f49bfc11de12d1275259c356 SHA512 1fe27fbc52b7513c1c384f1de4114feb9517cbd028de0e77ee0a1e1d54434ef68de9071ff728c34633255dcd4044fbe59494772b6028b261e962d707df63c8b4
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/capturer/capturer-3.0.ebuild b/dev-python/capturer/capturer-3.0.ebuild
new file mode 100644
index 000000000000..871d5abc7b60
--- /dev/null
+++ b/dev-python/capturer/capturer-3.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=( pypy3 python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Easily capture stdout/stderr of the current process and subprocesses"
+HOMEPAGE="https://capturer.readthedocs.io/en/latest/
+	https://pypi.org/project/capturer/
+	https://github.com/xolox/python-capturer"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv ${PN}/tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 86c735effeee..41baf4e178b6 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -1,7 +1,7 @@
 AUX catkin_prefix2.patch 1741 BLAKE2B 31884cff0d6150e458fd76fadff86e16f0d76d73c2422c2a5c02ae45a8494de939e141a1eca5caf0e3de37b12e1456ff7a83eb2fc550f2b5f5b25a204db6d51c SHA512 e6a04b6d53676acb3f9f20ce76040a4b2ed9da72bd32fd7d27419d0602ce9c05826128af055f1f498e1e3299525e665a4af1987ba9eec6889f6d7ed493dd813b
 AUX infinite_loop4.patch 1327 BLAKE2B 609c67413dcd65db3961d0c96066d6921cc909ca1aab4c253c83045ae6792dc5420c516c53f354d64aa45389f99c50e7ba34db6ccc7d00845444e409804f3dfa SHA512 7ef9d36aaa9fe88fc8f3ce60c233e4ad92facd04dfe9bfbfd496d96659f2e977702e6cb0ce5ec1654cfc8773b91b5e5ee83ac6634599c30b015c1c40c6564e9e
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
-DIST catkin_pkg-0.4.22-gh.tar.gz 64407 BLAKE2B cbcc9b766b8fcde05a89b41d6797c02e12b65ee4518b37e31d120aa2cc43d5b7d588ca668ae0bbe2a2b10ae2883aaf8e3414449292af7ea8ba01d05e649e402e SHA512 e7119dde7fc70503d8b8cedf505d93aef719039a836186738d017500f8d53cbd73ae4f017cb8d86cc007978066e6471b971039387a07e2eb3c6894569a30946b
-EBUILD catkin_pkg-0.4.22-r1.ebuild 1259 BLAKE2B 95e5898ddec6dd48da319da21d715187fc81218a010d607a94e964964ed70722c428f96d93a9c85f972968977a3977dc956204841e07b996e06ad94e28c91431 SHA512 d8e4d1d73121396e56056e4baacb70e2dc87f6a51a2bc9d2d749e916c07a8223dad2682a9d743b859e96d1c61ccca4657c2b4d5ea381c9b1381a0ceaa6a61fca
-EBUILD catkin_pkg-9999.ebuild 1259 BLAKE2B 95e5898ddec6dd48da319da21d715187fc81218a010d607a94e964964ed70722c428f96d93a9c85f972968977a3977dc956204841e07b996e06ad94e28c91431 SHA512 d8e4d1d73121396e56056e4baacb70e2dc87f6a51a2bc9d2d749e916c07a8223dad2682a9d743b859e96d1c61ccca4657c2b4d5ea381c9b1381a0ceaa6a61fca
+DIST catkin_pkg-0.4.23-gh.tar.gz 64677 BLAKE2B 7bdd6e748561fd7e1193bdc85373e621bba0f1f80452c85c9d90d3b7cf758a83596376dae841b0ccac56a4ba7732111d464a47bc50cf4d9f29fb607f00ec66d7 SHA512 f388eb9ae588dc3a7b69d20fdba127081c9bfa24f7d5d01fee4cac7b57cfb05beb342a23e96052d4952dcb16be87495a9514edae57ea9d7c9742dce9a8a99dee
+EBUILD catkin_pkg-0.4.23.ebuild 1292 BLAKE2B 0b65dd1e6f75c604f31b1099add252b2e305de1288ea9f6e2ab9f51a6c277a33b0b617a86754a0ef914d8437520f7138dd0fd30030c17fbeb4370d4ffc2dda34 SHA512 d9c1075d1440404b96002130033f72d5b7b07b812182da8b0249582eaa04f560401bbdc9a3290bc9b9c41f14c47f3db1d655054ac42871efc4e7dec443d3f560
+EBUILD catkin_pkg-9999.ebuild 1292 BLAKE2B 0b65dd1e6f75c604f31b1099add252b2e305de1288ea9f6e2ab9f51a6c277a33b0b617a86754a0ef914d8437520f7138dd0fd30030c17fbeb4370d4ffc2dda34 SHA512 d9c1075d1440404b96002130033f72d5b7b07b812182da8b0249582eaa04f560401bbdc9a3290bc9b9c41f14c47f3db1d655054ac42871efc4e7dec443d3f560
 MISC metadata.xml 343 BLAKE2B 54c183cdd942eaeec77723ae80d09a3cdd6e40270a3974e80a811fb050289e6f86b8d722fcefb1f37f7c2b8ad1ead3e00f04d49c2a029884daa7c2c33869ef87 SHA512 3ca5d78edb7c7dd2283944af93b7a8b6b3bb176ffa9e0df31881c8b5d66a4abc7e080e11f25f285e0b8735b16ed1598cf032a37d62b7fbb0b5adb3296e9b5862
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
index 53b5bb90f674..db0d224232a4 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.22-r1.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.23.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 53b5bb90f674..db0d224232a4 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7,3_8} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-python/certifi/Manifest b/dev-python/certifi/Manifest
index 28ecbb506b29..5502a35252ec 100644
--- a/dev-python/certifi/Manifest
+++ b/dev-python/certifi/Manifest
@@ -1,3 +1,4 @@
 DIST certifi-shim-10001.tar.gz 4061 BLAKE2B 183c573b958921877b14e38e9e26842e8a4f1c1617979a30b65ef1e2bbf001e5ff0aab830e4399906a7d21fb3c71ac12b1e757e4d283aae16cced8e7de7c2a1d SHA512 93beea61e579b2b414bd37c63eba49365e0a1a62304e0c7ac920bedaf5d72cb095a4a46b2240b3c2e6ee31e5b91cd520ae8348b6a8033212d11bbca31db6750c
+EBUILD certifi-10001-r1.ebuild 938 BLAKE2B 9eaabb0e1d9286b69fa318a8bfd051f146e1bdb585dd4de9f1c5ba5a6b4bcbc73cbc22bf37d4f8b0b75aeae69d5ad6e1ef18986880a14150ecbbb8a2e30f1aac SHA512 802ef5073c00a7edfccf882d3d7046ede2772a4521046c51ab8597ae99449a21cffc9bd1780923df9b88f528687413468a039d7264ea4819925f0ebc904a81fa
 EBUILD certifi-10001.ebuild 948 BLAKE2B 96903071c2d78f4fa556b36c8f2e367adc1e24face20abe6e4e872dfd94f17ebce210bb30defd61aab1b3f9937bf350c06a1f83214e83a4b6c989a436c9c9801 SHA512 84892fb0678dd12aecde7aef383d23996bea4aac62aca46bb71a4c10597e1f81391a3fce66ecbde94ce5706b549eba4b3c4e96929f521519b9dc5fdc211ddb20
 MISC metadata.xml 345 BLAKE2B 5cf437570a10505d4c41abd959ebea978c42c94d48bc28c83f6d8d707e71941ac74d6a9c11d95ff498eb0b1f6299ddc2d458da4cd1bb260c9854ed8e13d53e3e SHA512 27e9fe335402d355adbdad8adc1267903e8eed49a535cf00858b01f8ed05a07511038cdeb6841641d934b0fc5c8649d344dec7e2a5fade97d0b7fa38858cbae9
diff --git a/dev-python/certifi/certifi-10001-r1.ebuild b/dev-python/certifi/certifi-10001-r1.ebuild
new file mode 100644
index 000000000000..9a81b8332522
--- /dev/null
+++ b/dev-python/certifi/certifi-10001-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_P=certifi-shim-${PV}
+DESCRIPTION="Thin replacement for certifi using system certificate store"
+HOMEPAGE="
+	https://github.com/mgorny/certifi-shim
+	https://pypi.org/project/certifi"
+SRC_URI="
+	https://github.com/mgorny/certifi-shim/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="CC0-1.0"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND="app-misc/ca-certificates"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	sed -i -e "s^/etc^${EPREFIX}/etc^" certifi/core.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 947eedbfe831..0c2ea3fd22f2 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -3,8 +3,10 @@ DIST cfn-python-lint-0.30.1.tar.gz 4137425 BLAKE2B dd4f7d449236e567e7ea0fa662cbe
 DIST cfn-python-lint-0.35.1.tar.gz 4501826 BLAKE2B 84da0965fc198ce7b8f955a7d43f9a1c87c9688c301594abe6843509a832b4c9c5fadad1f75ac1c5b20ce2179244fd2b9681f5a92a1dbe38738a61c94f95982a SHA512 6d277048bbd7d8950ef7681c4a31cb82ccc231fb29f5083169caef69bfa4464cd87e473f40c775d798ff511a5db1dff9a17b0c08dcc800db0188e1e84990c9e4
 DIST cfn-python-lint-0.36.0.tar.gz 4879599 BLAKE2B a79a12290e20f4db1e45b29df0486d3b69f3c028f35cae8e8ba9ab5da191c1a5f7fed6bc339d24e3212faab7a05a82e859a79135847eb90b0161fe0aa7b8c995 SHA512 286c8e614ee083981105a74f09b4c75454ae6eef48812ac59852374bea5dfc0d111b006bb67c50e42fa2a1eeb54ce6f25b8bf0f06624da236344e9bbadf4ce1c
 DIST cfn-python-lint-0.36.1.tar.gz 4963743 BLAKE2B 31efc227bf2b5aafff0365d0ca949e4007684dd896e6e8a75afb692a260e05f6b134b9cc822855c99edec7398a1cdd767a71557ef7178ff9054c4e737a5a5ec5 SHA512 4682b7a010875df2322856e9a01aa547fcce171c5bb7531ee35d92bcf0cfc523f78b4180fcc6a6c4a1460d5b517e834ce0e0026fa6c2f6afb9ebf3b3c46434bd
+DIST cfn-python-lint-0.37.0.tar.gz 4990073 BLAKE2B 447e7685f5ae7d4a610512729d2ecda48f4838f2b2f22ae80cdfef53d52cd929953014f2f2779ca7d340ed88287bf6b4f221e3be3b69b10335fb6716104f44ca SHA512 4ef0763c0995baf196098aa1499b22400cf5fd44f1f519d391314c6e199091a22b2179d1b1cabae6cddc27a85673c294fc65c02b92d864a9546ceb5c42264590
 EBUILD cfn-python-lint-0.30.1.ebuild 1147 BLAKE2B 2f23485ac84f0911d2e403928924f0a96198aa863c712103c68295aa02f662d51e5c59d51883f9753159177f5b05dd47966489ce537e9cc8aca9de0cd5a75f56 SHA512 ae3c1238893d5d4d7ba86a6fb749aa407f0597f8ec2a59c8b455392105b45de8400ae133df8025d5b04a8b3a1b8edfa3ee30e2999c718107555a185e1e595077
 EBUILD cfn-python-lint-0.35.1.ebuild 1234 BLAKE2B 1a88241ea6c30d155790ebe1a599c184b8746b55c70021885549c8d10228f77052b564d2a8f0768746326db784c163bcffe52b108a5db442d4ddac366cbfb40e SHA512 8759e70f66de52b3ca3890e585ee8ffae47e966e5b28a72f078317edd8b87f0559ae862b3f10ef75950a1932907946ec14aaad0765df7d41e423e3a26fee7341
 EBUILD cfn-python-lint-0.36.0.ebuild 1234 BLAKE2B 1a88241ea6c30d155790ebe1a599c184b8746b55c70021885549c8d10228f77052b564d2a8f0768746326db784c163bcffe52b108a5db442d4ddac366cbfb40e SHA512 8759e70f66de52b3ca3890e585ee8ffae47e966e5b28a72f078317edd8b87f0559ae862b3f10ef75950a1932907946ec14aaad0765df7d41e423e3a26fee7341
 EBUILD cfn-python-lint-0.36.1.ebuild 1234 BLAKE2B 1a88241ea6c30d155790ebe1a599c184b8746b55c70021885549c8d10228f77052b564d2a8f0768746326db784c163bcffe52b108a5db442d4ddac366cbfb40e SHA512 8759e70f66de52b3ca3890e585ee8ffae47e966e5b28a72f078317edd8b87f0559ae862b3f10ef75950a1932907946ec14aaad0765df7d41e423e3a26fee7341
+EBUILD cfn-python-lint-0.37.0.ebuild 1234 BLAKE2B 1a88241ea6c30d155790ebe1a599c184b8746b55c70021885549c8d10228f77052b564d2a8f0768746326db784c163bcffe52b108a5db442d4ddac366cbfb40e SHA512 8759e70f66de52b3ca3890e585ee8ffae47e966e5b28a72f078317edd8b87f0559ae862b3f10ef75950a1932907946ec14aaad0765df7d41e423e3a26fee7341
 MISC metadata.xml 572 BLAKE2B e7e0e4631f4ec0e9b668f664607b89790edcaeea43c2da8b9cde1e9671eb5c18221d61d8981b1f23773b6d0582883d879b70d1850bfb4ab8a7bbfad60456b286 SHA512 6677b1994867314be92d0a95e2115102d8ef87f4137ac26d488957ca7d34e77cc618a308c8fb648405f28eecd872c8965dda5f042d410d5084c3dc38d54994ac
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.37.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.37.0.ebuild
new file mode 100644
index 000000000000..09f91de4ad66
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.37.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	distutils_install_for_testing
+	"${EPYTHON}" -m unittest discover -v ||
+		die "tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 9c4e02ded827..a32eee48c417 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD clang-python-10.0.0.ebuild 924 BLAKE2B d160ab3d5b4b57df192aebc214061fcadd11233a7fd97480124797bc52da0f3026be74021c127b68eba8e5e3db0e9d523e20e36537fbee3fc19ae606b48a5858 SHA512 862f0822b486311c4ffec46db51030d707c43a21d69ea22b5eafbedf004679805371b2d453d0bfe9939818d2f7d9658170bb7799e601f6974f3621df03b5bc12
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B b96dbdf62c22c703a871c8d00971976f1f856dd81bcaf34859bbb0f4de72f74a459331d732fcd6cf9afe0913815573459a1db933e10091f5c99cb8b8d23be1a1 SHA512 f033ff3e59044f45926ce86a594226eaee03b76ad5ea7b9ca390cafb619d01416370005fc947f2b643072b2fd6d6d700f5ba0cd686fa10fadb6816fe56c6dffd
 EBUILD clang-python-11.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-11.0.0_rc3.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
+EBUILD clang-python-11.0.0_rc4.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-12.0.0.9999.ebuild 902 BLAKE2B 7b7d93c597e0aedb92928c2a549f7a0ab6d9745db42e60f7d7b0dd904aecc70f4a3e752ac105250a6348502a570109eab099942100cbb2f1376a477e59394c20 SHA512 6c6fbee3cfcb1d32e6a9ee4ed72e66a5aa7e88c4333b719d504a24da5bb8ebead00d39ab071691a49d0954a3b3e35755b8fbe04b8591ad995d7a811c74201a77
 EBUILD clang-python-9.0.1.ebuild 924 BLAKE2B 8a666866e1c2fa2806c29ae6c6787cee7dd7bbb33ac8d2d99e9072d13f8fd0b1a98388de9f655b9f26bc43085269af402592d62c29dd1ff3f2e1564c2e8a4c39 SHA512 c0c164894497d871a3016ec8dc19e09142f5f77d194dfe27d9ad12043daf22df7abaacefaa2294e7355aab2d45fe7f578e80ff7df87af6dcc0c75e8128f885ca
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-11.0.0_rc4.ebuild b/dev-python/clang-python/clang-python-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..6d7cb294e651
--- /dev/null
+++ b/dev-python/clang-python/clang-python-11.0.0_rc4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+# The module is opening libclang.so directly, and doing some blasphemy
+# on top of it.
+RDEPEND="
+	>=sys-devel/clang-${PV}:*
+	!sys-devel/llvm:0[clang(-),python(-)]
+	!sys-devel/clang:0[python(-)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
+}
+
+src_test() {
+	python_foreach_impl python_test
+}
+
+src_install() {
+	python_foreach_impl python_domodule clang
+}
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 14e0b3154cc3..93e301190fc1 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,3 +1,3 @@
 DIST cliff-3.4.0.tar.gz 78990 BLAKE2B d7d8209e2fe24614cde6d3e113eb0dbbba981addef045fe318143e71f9a240188c0fb74e831d868b31b6dafb4289f7beabfbb5fe1dade1df196f670c53a55549 SHA512 d625588f4eed0aeee549b4a21e604f1cb886b8c10a12df7c546a5292223ec5bf9067352b4d326d5710673dab56eec47e2fb46c9c5d5df6e9fbf026d030bcde1c
-EBUILD cliff-3.4.0.ebuild 1030 BLAKE2B a3d63fa28dd726341baf4548e86833fc8e76c47cb0505216b0cdde38c1a67832269baede6b7f011e60bc1bd5277e35686361658f3b06c4bd317ced86031c86f1 SHA512 6f216271a4840acc7806adeb9bfbba75a9663712c88f1f9d888ca86918432b05d7826009eaa47417e281abe2a1551005615504ed4773006f89b4203ac5e94673
+EBUILD cliff-3.4.0.ebuild 1180 BLAKE2B f93fbf092f3a261d13b66c6b63b6df4cc695d755027c8d3e4b0414834a4223a71176d4f086aa79d97765932de78809e53adcca2025a943e7f54bc69f571cccdd SHA512 1665f0121a8ac9b984088682182402ab40fdc6a134c8509763ea19c97fab03910857713c74a250d977bfc0931c74d673abea40fd5d6e0e6ae700d8f7b7e95bb7
 MISC metadata.xml 734 BLAKE2B cdfc9f839d8dd599e27c78314ca5688d94dc52b3128d0aca7c6ff11d8b7f5f9de9d2d43f6690543d8e44b8483899d0cc21ef7273dbbdbeca0b498b2a593279a9 SHA512 6103b640d65a93bbd2cd9cf6ca6ae42a12a0fbfcdc26dd164494b777bc976d14d7e0bd94372b84ed30f7eab3e1acb54787671d90f165cbf6b0b160770cdbcfff
diff --git a/dev-python/cliff/cliff-3.4.0.ebuild b/dev-python/cliff/cliff-3.4.0.ebuild
index 97560bbb48ee..2cb3eca1cbe9 100644
--- a/dev-python/cliff/cliff-3.4.0.ebuild
+++ b/dev-python/cliff/cliff-3.4.0.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+# pkg_resources is used even though the QA check doesn't detect it
+DISTUTILS_USE_SETUPTOOLS=manual
 
 inherit distutils-r1
 
@@ -20,12 +21,15 @@ RDEPEND="
 	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
 	<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
 	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
 "
-BDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0
+	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
 		dev-python/sphinx[${PYTHON_USEDEP}]
 		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/coloredlogs/Manifest b/dev-python/coloredlogs/Manifest
index d8c17974828f..33ca905a534f 100644
--- a/dev-python/coloredlogs/Manifest
+++ b/dev-python/coloredlogs/Manifest
@@ -1,4 +1,7 @@
 AUX coloredlogs-10.0-skip-sandbox-violation-tests.patch 5312 BLAKE2B bb7ac55706ca89a16d7727d796e586a665730d25f1cb69aa833b24082e42f0f5aed3a5d4f627e2015bb189ea3422ab1bcc2982933a7a123990adf821a7a2fdc2 SHA512 071ac2255ce9e6e4e379065ce377e86c3ebc9e910951d647cd19e15431983cb966eba7e1bb2a2431ecb91aa09f3802a5e365683a2e545e0e5fb2d58432748bfc
+AUX coloredlogs-14.0-fix-install-prefix.patch 1474 BLAKE2B fbd2751c0a4f0f7a412428839b5bd8891b863f609d0c890887b85737d7cce9480ccbd2c4c6bb4e6e600b5ef850c065862ce7867b352f41e262022e21841cf1a1 SHA512 50063a6c14d1d4baf76d6409fc9776ec366500f7fa9b1b9e1270dac456b174b015b907f067c5641d4e74b75abc62ca4cdc641e55af88216101ddc4916198f1c5
 DIST coloredlogs-10.0.tar.gz 273273 BLAKE2B 775b12718d780da396d74c7f960cdbbd4858c793bf3eefb53d29e9f6b415f682110ae2c7ac631be230578946a2fab8d75e0c3aa487ccd952bb05443f0a85700c SHA512 f4a51fd8fa92ea4e2ef0b58305dcc4bbe12851e722fc85cfd4f48a9388002efced52bcf027f6dc4c525b095f3f953970e73928fdce3245ab4f9d13ae36b9d498
+DIST coloredlogs-14.0.tar.gz 275863 BLAKE2B 0a8c026220955397378ad2b43a69c89c5710a09e2d9ed81a3f25408c60e171f4b8f78239696a0bc1b51fc3dd9bfca80df63e1f1d7afb6bee0046209a089e0d6d SHA512 3434a95f3216d19af5d7a48324e5afd5e975f92d9f6b99f40df2c0a635f1738e0bc6d7277a549a42a0fec5a8601f82908c4b0205ceeb3666f49210f66fe58671
 EBUILD coloredlogs-10.0.ebuild 973 BLAKE2B 4b4a9a736ee0a943b153b62e5b83c380f16c251bdb00be5bcb546a044c22f4d0c2978bda0b7835095daadcb389f189da0ebe074fe787e99bca319082690d67a2 SHA512 781543a8f486c50554f1270d18ff5c393396dcbd94608c17a75ee8d2ba0aafc95b539df42ffcd1bbe018030996699495e5820da8dc48b41afb3009d5fa7f04c8
+EBUILD coloredlogs-14.0.ebuild 1209 BLAKE2B c320068753a8d5e7f7a1541f990a83ffde29a0469788f18fc10326f444a198595dadd34a11cff68408718071d82df2bcce2bfeaa4d1921105117f85cd61e2c22 SHA512 f77a452c0fcf8437721c4abd4279e329450ddeec312beff16fe0503d7ec405446e45114bec79eb5aff109670015cc8a00ec82f8aebf500b18d73bc9e0b3f8ab3
 MISC metadata.xml 390 BLAKE2B 6f1ce9de711c22d533fd07fb56b62c6f30c78aea141f78b4946fd9400b6daaff70eec5334aad41b92ffc28829d9edb3f6ef1e2515ab5a18c7e139265043f8a98 SHA512 4df2d5312905b2be06239d81f2274ae4e6517f48d62ec54d5d755bb08cccaaece3531b391f45097590f039db10b8bcf6ff265a28506a0f8096f121fda85e498c
diff --git a/dev-python/coloredlogs/coloredlogs-14.0.ebuild b/dev-python/coloredlogs/coloredlogs-14.0.ebuild
new file mode 100644
index 000000000000..89c3d911e9f4
--- /dev/null
+++ b/dev-python/coloredlogs/coloredlogs-14.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Colored stream handler for the logging module"
+HOMEPAGE="
+	https://pypi.org/project/coloredlogs/
+	https://github.com/xolox/python-coloredlogs
+	https://coloredlogs.readthedocs.io/en/latest/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/humanfriendly[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/verboselogs[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=( "${FILESDIR}/${P}-fix-install-prefix.patch" )
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	# test_cli_conversion requires the package to be installed
+	distutils_install_for_testing
+	# test_auto_install fails because the pth file isn't being loaded
+	pytest -vv ${PN}/tests.py \
+		--deselect ${PN}/tests.py::ColoredLogsTestCase::test_auto_install \
+		|| die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch b/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch
new file mode 100644
index 000000000000..d6b60c3bdf57
--- /dev/null
+++ b/dev-python/coloredlogs/files/coloredlogs-14.0-fix-install-prefix.patch
@@ -0,0 +1,35 @@
+commit 6f566c799323feb3b8dc2b82e62953040a6a5129
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Sat Sep 26 10:30:37 2020 +0200
+
+    setup.py: use absolute paths for pth files
+    
+    On some systems (such as PyPy3 on Gentoo), distutils' `data` path is not
+    `sys.prefix`, which means that we cannot rely on relative paths.
+
+diff --git a/setup.py b/setup.py
+index 057dd80..7674adc 100755
+--- a/setup.py
++++ b/setup.py
+@@ -66,9 +66,9 @@ def find_pth_directory():
+     Determine the correct directory pathname for installing ``*.pth`` files.
+ 
+     To install a ``*.pth`` file using a source distribution archive (created
+-    when ``python setup.py sdist`` is called) the relative directory pathname
+-    ``lib/pythonX.Y/site-packages`` needs to be passed to the ``data_files``
+-    option to ``setup()``.
++    when ``python setup.py sdist`` is called) the directory pathname
++    ``/usr/lib/pythonX.Y/site-packages`` needs to be passed to the ``data_files``
++    option of ``setup()``.
+ 
+     Unfortunately this breaks universal wheel archives (created when ``python
+     setup.py bdist_wheel --universal`` is called) because a specific Python
+@@ -81,7 +81,7 @@ def find_pth_directory():
+     directory without hard coding its location.
+     """
+     return ('/' if 'bdist_wheel' in sys.argv
+-            else os.path.relpath(distutils.sysconfig.get_python_lib(), sys.prefix))
++            else distutils.sysconfig.get_python_lib())
+ 
+ 
+ setup(name='coloredlogs',
diff --git a/dev-python/construct/Manifest b/dev-python/construct/Manifest
index 3ed734be4beb..cb074ea8e41a 100644
--- a/dev-python/construct/Manifest
+++ b/dev-python/construct/Manifest
@@ -1,3 +1,3 @@
 DIST construct-2.10.56.tar.gz 1184110 BLAKE2B 01ce1800970826ae3584a9733de171e04dd926e7d19d8b48b4364406b4aa0f4d878ec52f9a7f755bb249aeeaca75ae6221d6bdf302d4342d4974d268b1782175 SHA512 cc9aa126c26a017a3fb7b78a6b8f2056194028a44c8ed615a6dc4a445d50f0463e2de0b80810ab5a252070925a56b5a61dbb601a3de9e445d861356231a146d5
-EBUILD construct-2.10.56.ebuild 954 BLAKE2B b40292d9336f1d2f47f253c09fe05952b4f5465fc8d7e5a6dad03488394ab4af172f44687030bc78d4ba591f49d14de2cad8bad3c3411f880588686d698fad7d SHA512 59ea367dc6a210f74ea84d918c33e873450f3d5d6869f91eca0472fc5aef0f5c448c1848319079fab9c19ac50b4248440bce528b376c2b5a9af40f4f6d5942d3
+EBUILD construct-2.10.56.ebuild 958 BLAKE2B e37950c42f3d91be6888f25f5ad22513aaf9c509536c022c1343f9278b004d08b66c3b2a1af71f10555787809e60e40bba191c35d44ff67e285c8e553f0ca3f0 SHA512 cdd17099299c635799ef650e7c96b146363576ce4b6cfc9c009c156ffb1c628a17ba19c1e77ec84a39d89d2ad51c7792dafba29afe377f353f5d5aafd72e2571
 MISC metadata.xml 491 BLAKE2B bf8f7729988a0a4c39c9f8081a4b05560d1596a69c8670e378ea1f1f81b8dd5a2c366e8211c36e07f809378c6ae769b01181a4ceaf3f82ec8eb2b1879d874a87 SHA512 a8a85937bda8fb36a51bd6e0c0bcb1ce721073ee07a8e198c88b64ee484e8fd1c813e937443885e5ea2e532cda3971e8eb59385797a7a8f44ec9524a57acbbf9
diff --git a/dev-python/construct/construct-2.10.56.ebuild b/dev-python/construct/construct-2.10.56.ebuild
index 3a485cc76365..b7ceabb00f5c 100644
--- a/dev-python/construct/construct-2.10.56.ebuild
+++ b/dev-python/construct/construct-2.10.56.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
 
diff --git a/dev-python/cookies/Manifest b/dev-python/cookies/Manifest
index 8d2950cdc2e8..e9b75f2a5beb 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 637 BLAKE2B c7967bf95252babc407f9bfa2aa42ec82c0d3cfc99080a3e0958875f0e481e78b8831421a9f9ebae24356f41a9f22d221d2878332e2f0ce3195845d97b9c6c3b SHA512 a65c3099511e792ab40ffd90f09fcf890a0103de4be48868f24894ac6a3239b18a76866962e297ea474258078e58a75f152dd814dc81d60a7b39fc4c4d510812
+EBUILD cookies-2.2.1-r1.ebuild 651 BLAKE2B 1762d12bbd783e9c382774286866ede3a5a363637a7c14b8e18d6b8a71ec84babed9f21f459db5d4118093bdaf04ccc920cc2c423f7009458eb211418300f6ac SHA512 5eeb2c07ef9acad56945b40abe8510103882a6a26b6ee3cf6a0f2ead122415507834c5d3183c63c393ab8432dc127d4b24dc908fbf84986f2fa8a39fb98ba9d4
 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 29ba466fc16c..0f5a2fce13ed 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 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	# https://gitlab.com/sashahart/cookies/merge_requests/2
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index 7dbc9523f5bc..50732e8c975b 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect-1.1.0.tar.gz 35516 BLAKE2B b4480ad4335ba15ae8a2ae758ff942865a5b61de68b3b00fb59d517b1dacfce1cd817280e4aac562dbf829f90601a56220f01d99aecbc502420b9102e50c46ca SHA512 b33bca6a026f4de37b75606fd238dbd170b57d06288fbff3ea97ce79685a99af275fb8522b04ea9d6693aba5a18541d70b657191fdad881be79718bcf2e7655c
-EBUILD cssselect-1.1.0.ebuild 763 BLAKE2B 4215a4a6e6d2d1d20a3ac55393b79991d70481cdbd888ed05c4da507e08a8471ed6c4dd0d676734c15a89c2597e032a714bbece63ea3410667434ae2dd2a4b1b SHA512 3e1980db8c2e76f9baef63626699a8bd0cc5fd06128b703e6d2b5ba4f3a848ba8a9eca9013bb29baa896b7f00cb875ab73ccfac0f7961ad81f8ab2a3172a84be
+EBUILD cssselect-1.1.0-r1.ebuild 757 BLAKE2B ca2a2d3733533ba23a30124ac7620a7bcb0996b911b192dd7c0de92ae970c464519cbda678c4c725ce6a95cbc1585408971cd84cfcddccb526bce1d9700d5a21 SHA512 43b53ec5e489547272fe4842618edb184987d083c8e82ef64df1459d304a320bcf0a674fe4b3ca71f6a7ef9a16d03c51c950f497ff54c29d2d6f5a1affde1ab0
 MISC metadata.xml 322 BLAKE2B 2ec56f6e5522f780aef1a27df29af54f7169cedf727e4698c0c3764002501a06e52db5a94901d795d75f792ae2e8eb7d82625f88e2069453c2ff4190352aa7c9 SHA512 9933f17432e27a6a708ad4c9ec1e5f65197c4c0048fe2deadf3ba66d878f98510e150dfdb83cf935294a529e505b261808b33503f5d6acb622ae1821e065d798
diff --git a/dev-python/cssselect/cssselect-1.1.0.ebuild b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
index f456cadc5c7a..9888e40d1b39 100644
--- a/dev-python/cssselect/cssselect-1.1.0.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7,8,9}} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/cssselect2/Manifest b/dev-python/cssselect2/Manifest
index 24acfa798877..8b00631f4d94 100644
--- a/dev-python/cssselect2/Manifest
+++ b/dev-python/cssselect2/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect2-0.3.0.tar.gz 29534 BLAKE2B d7426d72c52ab2cbdbadfb935b3d4f1f23cbc960c94d6691a8f97c9935e0c8d6212e9e2c1c5b00df6fd450216a3deb2c7308c032821f9ef7fbb4d488a7728c8f SHA512 ae59314654d1c1ddf982b77521de7743d1496145a1367f51e02b6067d6757940e7ccb50b67959630f472972473a1e87cec8dfbc8eeb68ad5f16465a36b1447be
-EBUILD cssselect2-0.3.0.ebuild 712 BLAKE2B b9780a9fe36d9634c6e098a2a11ab4d3cea3c83178eae584883418d157bfbef302eeaee3546b52b7bb8884315c9642aca219b612cc4cdb81e863d01e8eec2c34 SHA512 23b388b635acdafe7f0e1f6749f64ac8a28b6e00ca2b52d844a4fe2a06afdf0d390faf428e31719a6a81f2a1182f58ea4110a1453205118fb4f0ec335a568901
+EBUILD cssselect2-0.3.0.ebuild 714 BLAKE2B 982bb2d99d8627720ebd8436f332e92265298eb8ea9ad99b63e0eb7c53e27d9a62a21e2a3a7aa14b64f97a96a993bcccc6c7c2cc5e9eacf9aa73be5adc791bff SHA512 0540e406fc5e79a16eb8b84823d86ebfbe62c3c8e2c3a4ae16198ba33cdf0f59b830d490a16f9895e7564d25c2caa620f3e604ae1a35e7de45621b12c28c7911
 MISC metadata.xml 323 BLAKE2B d7d2c7c44a6d77f88dbdcd8a0543282203a71e28f2b64f637d92d37cad737fa6e27d339d6d2c66fb96f83aead59794ef4da5fcabcfc51f1945c781b6c4295a89 SHA512 977631018db4c06abc89d7eeb92640e7a045c64fdc96ef9d69a4191a6e3e07f6ecea37c779b9fef2e01a433dfcb311e991b31fe4656119fd445154628789c005
diff --git a/dev-python/cssselect2/cssselect2-0.3.0.ebuild b/dev-python/cssselect2/cssselect2-0.3.0.ebuild
index addaa3168ba8..81ef567bdaf1 100644
--- a/dev-python/cssselect2/cssselect2-0.3.0.ebuild
+++ b/dev-python/cssselect2/cssselect2-0.3.0.ebuild
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1
 
 DESCRIPTION="Parses CSS3 Selectors and translates them to XPath 1.0"
-HOMEPAGE="https://cssselect.readthedocs.io/en/latest/
-	https://pypi.org/project/cssselect/
+HOMEPAGE="https://cssselect2.readthedocs.io/en/latest/
+	https://pypi.org/project/cssselect2/
 	https://github.com/Kozea/cssselect2"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 351b8bb2acd0..8e88b0cb4340 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -6,5 +6,6 @@ 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-r1.ebuild 1812 BLAKE2B 24bc7484f50b8774fa9738f97afb777c21e7bdc83e20e34f4812e6279fd72ea4f12a805c98a28233dcdfd22a8f66ee8c266230524d7098fcf031fdf6bdaa81fa SHA512 3432f5e5ab4f7539184f98658163ad4adb6b5eec198c34762fb5e432c84b786c62b42568e3151937b9236f2bdffada419ac8c7355d1801fad2bc7f502805e908
 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-r1.ebuild b/dev-python/cython/cython-0.29.21-r1.ebuild
new file mode 100644
index 000000000000..0d37c4e33e83
--- /dev/null
+++ b/dev-python/cython/cython-0.29.21-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 toolchain-funcs elisp-common
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="https://cython.org https://pypi.org/project/Cython/
+	https://github.com/cython/cython"
+SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="emacs test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	emacs? ( >=app-editors/emacs-23.1:* )
+"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		$(python_gen_cond_dep 'dev-python/numpy[${PYTHON_USEDEP}]' \
+			'python3*')
+	)"
+
+PATCHES=(
+	"${FILESDIR}/cython-0.29.14-sphinx-update.patch"
+)
+
+SITEFILE=50cython-gentoo.el
+
+distutils_enable_sphinx docs
+
+python_compile() {
+	# Python gets confused when it is in sys.path before build.
+	local -x PYTHONPATH=
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use emacs && elisp-compile Tools/cython-mode.el
+}
+
+python_test() {
+	tc-export CC
+	# https://github.com/cython/cython/issues/1911
+	local -x CFLAGS="${CFLAGS} -fno-strict-overflow"
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.rst ToDo.txt USAGE.txt )
+	distutils-r1_python_install_all
+
+	if use emacs; then
+		elisp-install ${PN} Tools/cython-mode.*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index e0ab0f825a92..cce8cb1c9df5 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -2,8 +2,10 @@ DIST dask-2.23.0.tar.gz 2840133 BLAKE2B 2fe8e4007acf2bbd8bfab889e4d912a15518318d
 DIST dask-2.25.0.tar.gz 2842089 BLAKE2B 048a116a60dd98c7c1f3800426af13c2d8d116772a6b3133823b9a78ae6fcd34ab32dbfb9ae8db9eb6c948bce381e5d6e91caaab78203ae56159493ed7689038 SHA512 0d6e8e8c1efbaa4dc77e1a505e5c2df45eefc43868ce923ec674c5f768f12beb30e06c8712f621e44a826fc11f86fd50e60f0f6a78e261d74273f73b49503301
 DIST dask-2.26.0.tar.gz 2852574 BLAKE2B 66abba9ef32bee11249557e38eee7e60d2988f098904bd867e5e9ad110d735c1a3b3f10829c58fdca5400f078fc569822e7e73f0e9c6894dbbfa41b46d521f61 SHA512 07daf541570e9e30fcb97f607b9629761d14de58fcb4b89fd01f9688690af1b55b80e3e62eefc54942d47da5fcb9d3c4aa6bca0b76f4bf60e664054515e18fcb
 DIST dask-2.27.0.tar.gz 2852785 BLAKE2B 7be6704269f21891ed6a3289ee16827a1494591f7024d158e88001d4e10f263409e33f9c0e14e21ec8fed3d6798a6b011e8cfffec4659d6b07d2c4b31355c6a6 SHA512 afa7454e208cdfd482ff971aeda8db6364408661c1230c7e33fc05e63dfbe3e26e899415af0e4625a642dab15a29fce9c432d24d21e8a3bf7760f6ae304fc371
+DIST dask-2.28.0.tar.gz 2858331 BLAKE2B 9adbae83559a1a5a218aacb575ec6e4007cc0bcebf4f2ddac4a2bc23de2be74887ee41ff341c05e0e1612a42d4b3bd5d7ca072b58f7cbc9fa516d8c45f7f0ae2 SHA512 f36b1cc843b0ef7efdae0af1ffdc91ac251cfcbd63160379f479f55005b93e111818f782db2a7ecf8e6bbd63ea48661a178d1c2ca74473a4d477025bb955cbcd
 EBUILD dask-2.23.0.ebuild 1417 BLAKE2B 5d0c82471b9df5978841a9afd48a7a54b53e8f0c5c75a8f40f51c2c77f782b4fb9ce731a1bcb0e1dfeb0760638e57af355edfef1d961d2688a42dd5279ad6319 SHA512 13bd5850229a97bc512fcb4513ade5847ae0e7d93ad22d866cf941818861694596e04659fb32bc843ae417f31672ce2a319f96c82c304b05d75249aa8f2eab81
 EBUILD dask-2.25.0.ebuild 1185 BLAKE2B 8fa443f53041d790d94210aae2b3b8b87c5fcb9f59d68e0a8628485f24186e58d75cb60d4fc8143d90318fca1259f3367e787d48e05f4c731a32815526da0be5 SHA512 fe07f83b17e73d49a4d08b61d0b2e3eb238432556e97ddfcb8a6870d8c586e96ab4c72312bb68e550ef25f87aff2d234067e35f67ebf23b3de5282a3a30a99de
 EBUILD dask-2.26.0.ebuild 1221 BLAKE2B c180151bc29d71b4cce2cf55b32165d4fabeb4f64bb5d3836e1aced61d1999b8e48c9d49e5ca42e13e69f28293a31b9c8dc4b8d12d6c4bdf8ff33293004d17db SHA512 f22766a34191481f05542cd627f98a197a7b37f9ea669b2c08e75f17fbbd3181c22539347f66bac514bc41678e133d722e4051374794fac308aeb4894292be79
 EBUILD dask-2.27.0.ebuild 1221 BLAKE2B c180151bc29d71b4cce2cf55b32165d4fabeb4f64bb5d3836e1aced61d1999b8e48c9d49e5ca42e13e69f28293a31b9c8dc4b8d12d6c4bdf8ff33293004d17db SHA512 f22766a34191481f05542cd627f98a197a7b37f9ea669b2c08e75f17fbbd3181c22539347f66bac514bc41678e133d722e4051374794fac308aeb4894292be79
+EBUILD dask-2.28.0.ebuild 1166 BLAKE2B 198408df328fb2d8b8934e9582ad830921af9471ad1760ec33ef754c8d3fc52a859fb60e66fa9669fba5ed649b5cc6ef56ccc9df2360cc7848d8bd30f26b33ec SHA512 6c228d4357255315f06c80c3f1894d976d72c7d3a6c8758036c917ce6e19fffb6979e419ac442fb2d1bcf861597d0ccd1441edf4b4f75a88241bee321d3e084f
 MISC metadata.xml 763 BLAKE2B 110683c8d0066c5d55ae709f5025ad9bdd81d3e8e3f7bc39111eb55280a476b6f66fb274f3bb9676903423a6f7f604bb554db8929d7e12544b1882b36aec9d74 SHA512 7fc3a106e1cd073051be6ea7e48a39bff903c5fb43162ed24df4056c3b1ae481d59d16bd75cd441473ef75581d697ad1b8f9755c1282a8ad733a8fd72bb522eb
diff --git a/dev-python/dask/dask-2.28.0.ebuild b/dev-python/dask/dask-2.28.0.ebuild
new file mode 100644
index 000000000000..f0f21e67dc47
--- /dev/null
+++ b/dev-python/dask/dask-2.28.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/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv -m "not network" ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/dataclasses/Manifest b/dev-python/dataclasses/Manifest
index 27a33ebc2246..c761d80daba6 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 550 BLAKE2B 547bd291e9a0c39783cb005caab2cc9ae7470a059b61092d740ad937c53925b50f34d208b0a9b0c8d1645439f70c1ed4f9cb673a2fcd946ce8c613b726d0331f SHA512 22bc8eaab14eb62e397554010eb668f350b0dd3e21673abe7545610623e4d677f943734b417e8dac29cd555642034e7144343fb7533f2acddc7bff62144865e3
+EBUILD dataclasses-0.7.ebuild 557 BLAKE2B c7659b1f18e0c2af9026ddcce77e9f0f385a368f61266e1176a55ed839582e02a04a615f183f82bbfcc23f981b80e3e2d0968ce957171e11466283742fdbed25 SHA512 f68b196fa786dda9a6e100f80d218ca6042f29d427e474b4faf8481436c73fd15559546f79f6e559415eca9d0ee30a4421b942878229156d0c192591b39c5825
 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 3abafb733cdc..e76e64feb12d 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 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 src_test() {
 	cd test || die
diff --git a/dev-python/deprecation/Manifest b/dev-python/deprecation/Manifest
index 36895e7db6a1..3671c3f9ae99 100644
--- a/dev-python/deprecation/Manifest
+++ b/dev-python/deprecation/Manifest
@@ -1,3 +1,3 @@
 DIST deprecation-2.1.0.tar.gz 173788 BLAKE2B 444c7ff688d6eab7dfcf58ad24580b5a6df39a5749341b28d6d5b9b516fd6aa7a462d7f644e6cba596bbf289be0224968f579837c6c71dbe7b36b65588da6eea SHA512 c184665d210c6eeb3f055b23e75c3714f3b18050e03bfe1384baf6c2504f1370116ae0e8c53ff818ccc54c0d633bbb3ba5791fe20b8029f3be0207b019a00275
-EBUILD deprecation-2.1.0.ebuild 597 BLAKE2B b46bb4afaf5550c7e8b6b67caba124b20e274d6f453d94ad8141abf8659180051f9c55d710e940aaab44bf296be8b0d3bfc5b450f3ec7d1a3e700256ec3ac688 SHA512 1b281307d41b75920ae0ce08a02da960a893bde443772ff3db83408ad762922d595caf571adee9c807304035a528913f0f379631d8b016ac81cadb9d25f5e3f4
+EBUILD deprecation-2.1.0.ebuild 603 BLAKE2B 48af348b1473137dbbafffa146d8c1e4f2c61fb46eb7dd7fa7818d6e846d6b72df6f47973536eec8a4c30de3130908b796f834b90e317fc249360e8b8320bd53 SHA512 022baaf19a098ef222f6699f5ae4a1f26aef31270ef0afe5c5f9d5341ea84faf3da5440e47a3b896d488aba0d0cd81e9263f3139d787e1431b1c63e415b0eb04
 MISC metadata.xml 565 BLAKE2B 007c1977dff6e93c49877fbd0a41e12f7b59e73b12dd8cbd0ee309860195ab560b9bbb3f52b861be6742d5e8f1b78564eb69f74cf53e121e7c9df2a2e58f0f8d SHA512 89374b3c32bbf7f35e585295cfd13c50019304f2620a4b8745b20f0e37b87abc04c7fa464b9277630a723a1a0d4a6a9460f85b87c902285ad4033519e6ad5120
diff --git a/dev-python/deprecation/deprecation-2.1.0.ebuild b/dev-python/deprecation/deprecation-2.1.0.ebuild
index 3e560278b432..7b44faa014cc 100644
--- a/dev-python/deprecation/deprecation-2.1.0.ebuild
+++ b/dev-python/deprecation/deprecation-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/packaging[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/django-debug-toolbar/Manifest b/dev-python/django-debug-toolbar/Manifest
index 6e03e351d25c..9d8fe821902e 100644
--- a/dev-python/django-debug-toolbar/Manifest
+++ b/dev-python/django-debug-toolbar/Manifest
@@ -1,3 +1,5 @@
 DIST django-debug-toolbar-2.2.tar.gz 322475 BLAKE2B cff55a26f4d95353edff3d7f678a052c262636afc94307e22e4d9dc1b6bbe3c0bc1a4997c4904a397de97218b462d52e67ac0f80bb05de7736cb278c7dca58ee SHA512 5cd9e50852bd7efeb83879c5e9fe10fe6df5087b746e9cb2a0e13e66b3fe0a815a6eaea4b273258e7e682149bc29ad8979268d2be263539c522624e3f16aa5f5
+DIST django-debug-toolbar-3.1.tar.gz 228867 BLAKE2B af3d8011136ba30e690e03548d757405e9cd89fb5473b277720a3151149e92be212e50a6ec3d95903382716c9594405a1e93a7a1bf231f220f4b5c8ae1e38480 SHA512 c4cfa3cd98adfba7362e259e18a0240b886f294ba10f5c64e12887b00d4dc952e9b80cac0f78e7193a15566585f43d988f6d287e4d0dcc84c4f8395c7006e2b0
 EBUILD django-debug-toolbar-2.2.ebuild 1172 BLAKE2B c681f25cfd6881ec951ed1706e8901e666e76bcdfdaf9f791f32e87e81efa57464b5874503f33bf768628613896a667947872c7f75cc0da33fce7cf72e87b074 SHA512 19e61bd2944a8ec95a829d9f2b46c87e29f589a88a3c6efe1ddd12b9ea6098d540c1dafd6bb22e4653362a6f9879ea91375e73718f8dc40c21352211ae94badb
+EBUILD django-debug-toolbar-3.1.ebuild 1170 BLAKE2B 458a46ad50bca484063b13d883373c1d49c960538124329622435ba3803672578962d55252b1fce00c1dd449f8380d256dff06cd4a43ee646f3ec524d9b5db73 SHA512 9ad2f9b2ad80dfea4653783234d13fff87774c7913a8c06e3e930f652ca1c393e304a28bbfbe7452702c139b1d5dd8717009e9f23ebc8a308f78f9bcea887db5
 MISC metadata.xml 356 BLAKE2B c0d02bcf9ab38d7939a3edaf8eca080283ccee6f95f1e04ac96ce5870845e6a84d6672d6ac923c74d18c340326bca379691946aac7a51bdee8d6f4adcb45a50e SHA512 12686662e852b0283d2212f0db83c832c1248723a7cd751990e43b1641ddbad2cc2c71c17ac4704c01beec9a9366fc726504c10e9a9e56456b544a800cfa7847
diff --git a/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild b/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild
new file mode 100644
index 000000000000..5f9abc451510
--- /dev/null
+++ b/dev-python/django-debug-toolbar/django-debug-toolbar-3.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configurable set of panels that display debug information"
+HOMEPAGE="
+	https://pypi.org/project/django-debug-toolbar/
+	https://github.com/django-debug-toolbar/django-debug-toolbar/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/django-1.11[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.0[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+	)
+"
+
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# This prevents distutils from installing 'tests' package, rm magic no more needed
+	sed -e "/find_packages/s:'tests':'tests.\*', 'tests':" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	emake test
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 607611082ef6..8c117a7a6105 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,5 +1,5 @@
 DIST docker-py-4.3.0.tar.gz 236399 BLAKE2B fd9cb6426697a105f58c1199809adb009943761fc17a9b1c0a0c091d0950faf15d6e097aeddc7012b4d39770a66fcdcde73de6874a081e2a2172acd6b5c6e816 SHA512 c790563c6a3a5042f5a0d602c22b2b2838ad6f54df3bc1691e32da06336d6b651d7560ca77677ae1cb3f4d4aab721f98984e0479f7fed25deafceb1dc1c24a7c
 DIST docker-py-4.3.1.tar.gz 236548 BLAKE2B 2934410e9360ac0a0ea4a038fe75728252804c3ffc2dfb614d217a1771d6c61b50c93b1848df5c34f3bf6b6ad2fb98fc5295165c6a482895b6e7c8ef29bc658a SHA512 f82d8681edc866e73dcc0557a2be7ccfcb68e6add3cfd034d62f9639646c5d396e8e2b29df2b42006ee92adc8b432ca6a80bf2a10b54af42f33fe5ea8ed4a912
 EBUILD docker-py-4.3.0.ebuild 1114 BLAKE2B a353dc3c2f8897ac47d6de6c6ffc9c2a2ac5adc49265525a19ce6126bff90877ad353b7cad39ffccceb9b6645e7bdf8a30a3895ba29c5c0fc5babc02f42d99a4 SHA512 f966f70ff1c43b07541cb23c76c092648b1da53e0f605428d065596b1f321afda2f2ee381df0ef5559f4d7b8b2fbd6f199338a63b4fb3dde0f3262c2b65d31be
-EBUILD docker-py-4.3.1.ebuild 1116 BLAKE2B 1c4acd03d9f127b01a144f99c98f3b309308ecc582543556a7c9273a072a9053cad2477a07265cdcecfebec43f86c511ff4c5557b48e4f73ad3d36bb5a20bbea SHA512 267f8cad01e4bcea796f2c0d2ef9d2aac4180f2a2a78025662946f8da706c0a37f1a03893a58744b346abfb510fd5c72b4e7ed4f617dd79c4d57ff160687496c
+EBUILD docker-py-4.3.1.ebuild 1114 BLAKE2B a353dc3c2f8897ac47d6de6c6ffc9c2a2ac5adc49265525a19ce6126bff90877ad353b7cad39ffccceb9b6645e7bdf8a30a3895ba29c5c0fc5babc02f42d99a4 SHA512 f966f70ff1c43b07541cb23c76c092648b1da53e0f605428d065596b1f321afda2f2ee381df0ef5559f4d7b8b2fbd6f199338a63b4fb3dde0f3262c2b65d31be
 MISC metadata.xml 398 BLAKE2B 40d5a5305a062cdb348ca447eb5f50ae9a0ca7a80c9460ac33af87bd78dcc552ba089f465294214cb4c0d9fcabed0f696875d47ba67e19ee14d3dbbc7c2e7dc5 SHA512 f991f94b167947549e0a2a152cd52e3fba6a95d54297559602b01a90e39ab6f675bba5d002994bd824cb6b284506aa3dad655461ef5f130f225ca13143e3eaa0
diff --git a/dev-python/docker-py/docker-py-4.3.1.ebuild b/dev-python/docker-py/docker-py-4.3.1.ebuild
index 530692235251..5eba6c4519e1 100644
--- a/dev-python/docker-py/docker-py-4.3.1.ebuild
+++ b/dev-python/docker-py/docker-py-4.3.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 
 RDEPEND="
 	!~dev-python/requests-2.18.0[${PYTHON_USEDEP}]
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index dea70888d411..fd84c0ac7a13 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 1227 BLAKE2B 5ad5634f00c9e883afae0fe6e86ff4ae60fdf6685ef4d4af7badedb7c39b7b1b8fa4306a9bedf2fa9815becd851ece353767cdc0c40d0e647712f6e9a092eb63 SHA512 eb084bbeff60fd65a916530022f98a9fc164924bdb4b82dfd11649f9da742ff6dfc20ba0c264bdf5077dde36d90f17c10a7cf42c409f7b713bca8e16ef79552a
+EBUILD eyeD3-0.9.5.ebuild 1233 BLAKE2B 66ccbf6da0dd91cbb9e9450a409693359805dd9fef64231839fb025d05f3791be748e5c5bdf69b725d5d918cd3e0df233bb2ca51cd15532ba0d6a365ffd87427 SHA512 390a3cc2fdd1335b6a3c5ebbb327a25ed3a0559d665fb8488e1073da8e5db03c57783533ba761f24f927888174c24988ba79fbedc8cd3f7d7192c1115a036fea
 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 87155128a941..79cdf41bddba 100644
--- a/dev-python/eyeD3/eyeD3-0.9.5.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.9.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nicfit/eyeD3/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0.7"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/deprecation[${PYTHON_USEDEP}]
diff --git a/dev-python/feedgenerator/Manifest b/dev-python/feedgenerator/Manifest
index 0b8d2fa21572..d58988fcadb1 100644
--- a/dev-python/feedgenerator/Manifest
+++ b/dev-python/feedgenerator/Manifest
@@ -1,3 +1,4 @@
 DIST feedgenerator-1.9.1.tar.gz 25677 BLAKE2B 0293b3b41f83ab2d0e289cc5ea4b6088217dfa64caedf2da888d99a9d6860c45169852f9249049b2ee0983c9cebcf289b9b107ae63f5f5f5e057d93bf71d8a78 SHA512 db3642acb8f0c9fd692f37a79cf5862e60687a1745afbc6593d37a0372adb994de603238a17a8eae95ffcc993195f63037f16122a3cf8771e6922dea492fb5d5
+EBUILD feedgenerator-1.9.1-r1.ebuild 503 BLAKE2B 4c84f717f2267b8c8b7aecc74a5eae7f66a3b5163c621797268970707772b4a9c34eefce029661a92e89888ff579dca28a62ef8cc5498378f8433cefff6999ea SHA512 c8aadd8fc7b0e841c539ad3f216a07e08c7e41b454336aa9f5cd04385431986850927d10982235cca11743fcde66ea5ae6645c52a39021ae8ecfad1e90c6e4e1
 EBUILD feedgenerator-1.9.1.ebuild 671 BLAKE2B a07377c29c11a6da21ed114e591e1d67f2afe085f6c1acd1be75b8a3de88df76ed8eba66928f19b221cb27bbb6e111f732fb49e5c209db328843a3af53bf1bff SHA512 d4f93a59a5aaff4eae420d3002553f3273c3c04a3ae9217fc983796fbf5dd260f01aaffac922cc08f6c201802cc4df51f74afd19495d4bf23030aa255f975679
 MISC metadata.xml 452 BLAKE2B 418a1e8ead7966378946aa28e1978cd64b2a85890e3b380b808d064d37597d60205a6457d626968e1831256ef48a82325fec6b38ee5710a2e3841cf6b5f49437 SHA512 d37223c168450987a8f3d09a34636cbf08b6e95622ba23aad3a0d240ce179fde3f20d0645631cea16b147215b91c8132940d6376cbd3e6a435dd4ee00524b585
diff --git a/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild b/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..a0b696084642
--- /dev/null
+++ b/dev-python/feedgenerator/feedgenerator-1.9.1-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Standalone version of django.utils.feedgenerator"
+HOMEPAGE="https://pypi.org/project/feedgenerator/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/filetype/Manifest b/dev-python/filetype/Manifest
index fa0dc2127e05..81bcb9311b9b 100644
--- a/dev-python/filetype/Manifest
+++ b/dev-python/filetype/Manifest
@@ -1,4 +1,4 @@
 AUX filetype-1.0.7-examples.patch 824 BLAKE2B 1e3fe9e72a422eafa45f35b43d04bb0cb1d4ccc379b7a318b6de33924b3e4139ca3e6c6efe529da5d99e4cc4038b818f4edae38778c9b9f7e0e0fca740b5ffec SHA512 9d5171016461f65330d4f1e6c985d1764f1ee8a173529e35d4abebbe98a7a3ccf920752f4baab8b3c6fcca484b59043f0338cc7c0b3c319948399781eae31e7c
 DIST filetype-1.0.7.tar.gz 666636 BLAKE2B 3abc1cc3a94b3ca8c91b9b43909522efa18736c826f8f45990b3d7dab18047476f05b259108290bf7383e4df82a63def4249c0d52ae313b0dc23d377bb5369d8 SHA512 8d81261082a5765c2f96b587cc8372ec2e7347536f3e76c1f4c17f10011fd1808309ceaf55923f0e063f379cdd253020ce651a263b9535a9d16375f07dc8ec92
-EBUILD filetype-1.0.7.ebuild 527 BLAKE2B eb206f02c64f5f67191c6c7e39a6886084a47a72ee189c692ad0b712a056f05ad1fb82115905462833619d7e81ff97f455b93cec6738df9a9c86720cd5cbf1b1 SHA512 6603070cd275f2bb5d6412b9625380c0ce17fe28695d31263cd36412dce7857e66393d796eddf15c83a08188da569d36379af942ddb995c7064bdf05d64cce4e
+EBUILD filetype-1.0.7.ebuild 533 BLAKE2B 40b2a54f9e0d8a1ad2be49e76325b332bc129b408f308fc1bb1d700aba252cc8026ffac160c6e808165f9c063376723e852d40f904eaa321a789377a51ceb749 SHA512 68b61376667b96e11f203623b3865a2cdbf595fcf1101e60110dc15adf332415b8e591e4397e888f65eecf0a7df72f7a5304a7e0629515684f06664e58694a29
 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 5fe6826b3bb2..70a0352bf347 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 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 PATCHES=( "${FILESDIR}/${P}-examples.patch" )
 
diff --git a/dev-python/flask-paginate/Manifest b/dev-python/flask-paginate/Manifest
index cf3c832f7398..61be89b07590 100644
--- a/dev-python/flask-paginate/Manifest
+++ b/dev-python/flask-paginate/Manifest
@@ -1,3 +1,3 @@
-DIST flask-paginate-0.5.3.tar.gz 118570 BLAKE2B 0c6d1163dcd8144afa80b217ab3a714a39f4015aa732b4c32cf0feee0d7ee06968bd8549651f2941be9c60d3fd36a18e132dd4c174eb4148e63f83e461cbf519 SHA512 fe3cdc808459528c449611b2411c377d46bdef4995cd2851730e90dc0091da15479022f401e31113c4d39f766841d9701f285c81e0ec6293eddd4c8f0821567e
-EBUILD flask-paginate-0.5.3-r1.ebuild 816 BLAKE2B 33c9a4ebd5f8cf7068236c541ef996453859a9bc2586eca36f57d8c8634b938ed951e516a11c3016f6109adff71646d8386d125fc54e546309822afc106275c3 SHA512 218bddaca192b67436a698c9dc7898d45c79b688623c39f1efbc5b9bcdebed101a8e801d087a196e435f9d45d36bf698fbea224f1984a72ea9d8f09f7e824c45
+DIST flask-paginate-0.7.0.tar.gz 119358 BLAKE2B 24c1f3bc77853c9c96bb72d3364e73845f8fd0870606dd96b4261861430bef864a6830dd793f4f6e8a9371c89342dda88c5f976d79ff4a1bec7d687614b2014a SHA512 11c335c08c6a9c32999e5b8ba7a76c1fb04769e5ab679b550efc87497446edbaa1e3ccb62a4c238a0b5585f7ba4067e43f158ae123c3b118db84b90cb5d4f219
+EBUILD flask-paginate-0.7.0.ebuild 593 BLAKE2B 7e551a8ff2f03e99fbbff323cbca30bdce156bd6d666830c4bf38f409764509247669c57a288f983c3bf99e6dcf52a8dc76c88539711601590ea1cd1d126aa9f SHA512 609ecb95be51e187515d3a0122c0f3c37a120b5e83b2bd70f215d12e9c3c3e7c16a88bccab02d1f1cac546e2df883da6b05dc669b2502a651b6e052afd903e0e
 MISC metadata.xml 618 BLAKE2B f9feebe27aa247c8458d416154475e0c0234e2ab391d6b9dcf06016c01cebd3d7078efde6079646ff3a8b718911cec1d0699bb5cb4eb2a319b14752718f8fdb5 SHA512 9f6ff105f8b01580628888ecba7a9175e42618ef17e96a90dce15f08335b5dbc76a6b09cbabfd9a7fb659557e04531e4fb46ec3856418d96e18cff5da7a61cba
diff --git a/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild b/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild
deleted file mode 100644
index 22d2f703dbb6..000000000000
--- a/dev-python/flask-paginate/flask-paginate-0.5.3-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{6,7} )
-
-inherit distutils-r1
-
-MY_COMMIT="510ad833106134711868653fb597bf75ea8ac34f"
-
-DESCRIPTION="Pagination support for flask"
-HOMEPAGE="https://flask-paginate.readthedocs.io"
-# https://github.com/lixxu/flask-paginate/issues/68
-SRC_URI="https://github.com/lixxu/flask-paginate/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-S="${WORKDIR}/${PN}-${MY_COMMIT}"
-
-python_test() {
-	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild b/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild
new file mode 100644
index 000000000000..8435e67f09fc
--- /dev/null
+++ b/dev-python/flask-paginate/flask-paginate-0.7.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Pagination support for flask"
+HOMEPAGE="https://flask-paginate.readthedocs.io"
+SRC_URI="https://github.com/lixxu/flask-paginate/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/flask[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	pytest -vv tests/tests.py || die "tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index e800088eac0c..b9964c38c6dd 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,3 +1,6 @@
+AUX flufl-lock-dontinstalltests.diff 554 BLAKE2B 4440739b038f1a73e035555028152c14ceca39ad42ddbd5457c839c154d12160fbd6d3da1c4f0e24977b9f2d0f117fd031e2f65599198172a61ea0f19a39b84e SHA512 e0a918f69563e5573fb245736ebf7557ad98e917cf9cac51d331fa7265a6a46f3b9b1fee0f14f66d0d8ffb8d4e5b57cbc4271f3b95362ce0029e36046138b578
 DIST flufl-lock-3.2.tar.gz 19250 BLAKE2B 230d7122fb6db1b4002e5732a878d597837f1c8cb10b85f4c131f793f820dc0b76a494504aef89845be4f7bdfab94b17573f83002712c245206c9ce25fac893a SHA512 496195e1c52f628bc6c0e8fc3dcd5373ed01cfee35b6165cae37ab4b90d70265c6a0aea565f1e0663277c2b9e9bafde8af1420133a15e6254275fad2f28a56d0
+DIST flufl-lock-5.0.1.tar.gz 27788 BLAKE2B 2651898e881719f24bc61e14f697877ca39f2747fadf52de1a5fc917b26e23001df5f0a4ea2e48271da69198e1a1336e69cc0167a4f46fddd21f464b355fa4ca SHA512 f937fb6c7f7bef2b85674225f83f3162f34db3fe2df3d9a896f772c4489c3e0611361e3d1d9efda7727112d780f31022d3045d3a3b8e78e9412aca2f2418ca24
 EBUILD flufl-lock-3.2.ebuild 574 BLAKE2B 2ff8d9470afef5e042e561a721c6e77c3750fc25aa7f918e88e3c0917b773aab69de40c422d4c8fce37f8b121d976ebb1fbebdd6522b6fc98a8b487a445d732f SHA512 087e144a6c232a0467c50f0bd848ca6632c955abf9741c51e59f88004d8b2066d3a8edf76346d87ff320ea8918ba1c88deaaea95fcd4acb429183070c42d5bcd
+EBUILD flufl-lock-5.0.1.ebuild 820 BLAKE2B c8e28bcccbb13b75000f16c00ddb0b4c77da2c2c75fdc731bbbc5bb3562d7fe1dfdd38d539b03fa6bee3139ed91c597827b183b7ed1a2482d7d42aaa89b293c4 SHA512 bdd9e3c75e563e67063692d629cdc9d0c05eec760ca9e74f51f20a96df5b14bedacedead8fa4f4a0534d90f09feca1a8367ec15ad46e9db45a079dac9de5bf6a
 MISC metadata.xml 333 BLAKE2B 1a681ac99aee289a919b530bb87037df6fe53b044ce14ce3a9da3cec54a73d7fde58cf01f12678f18397d16b56c9e5bf88d289ddec4469e343d7193502124124 SHA512 a73512d246562e6591eb9c8d13759352cede7f0ae978d02c87bd72b1fe2c9b155cc3908e8489b136387bada61f1257d8e0771e01e26d998b51f9ce13c087ec41
diff --git a/dev-python/flufl-lock/files/flufl-lock-dontinstalltests.diff b/dev-python/flufl-lock/files/flufl-lock-dontinstalltests.diff
new file mode 100644
index 000000000000..3cd5bfba99ed
--- /dev/null
+++ b/dev-python/flufl-lock/files/flufl-lock-dontinstalltests.diff
@@ -0,0 +1,12 @@
+diff -Naurp a/setup.py b/setup.py
+--- a/setup.py	2020-08-20 06:35:06.000000000 +0200
++++ b/setup.py	2020-09-27 17:50:43.776476265 +0200
+@@ -24,7 +24,7 @@ setup(
+     keywords='locking locks lock',
+     url='https://flufllock.readthedocs.io',
+     download_url='https://pypi.python.org/pypi/flufl.lock',
+-    packages=find_namespace_packages(where='.'),
++    packages=find_namespace_packages(where='.', exclude=['tests', 'docs']),
+     namespace_packages=['flufl'],
+     include_package_data=True,
+     # readthedocs builds fail unless zip_safe is False.
diff --git a/dev-python/flufl-lock/flufl-lock-5.0.1.ebuild b/dev-python/flufl-lock/flufl-lock-5.0.1.ebuild
new file mode 100644
index 000000000000..29e78cd92cc3
--- /dev/null
+++ b/dev-python/flufl-lock/flufl-lock-5.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+
+DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems."
+HOMEPAGE="https://gitlab.com/warsaw/flufl.lock"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_{6,7})"
+
+# See https://gitlab.com/warsaw/flufl.lock/-/issues/22
+PATCHES=( "${FILESDIR}/flufl-lock-dontinstalltests.diff" )
diff --git a/dev-python/fqdn/Manifest b/dev-python/fqdn/Manifest
index ff92b50d8b63..573f7330dc82 100644
--- a/dev-python/fqdn/Manifest
+++ b/dev-python/fqdn/Manifest
@@ -1,3 +1,6 @@
+AUX 1.4.0-tests.patch 782 BLAKE2B 255832295218f4119fa152246606f67a24bcb7e71fa31ec54e164d1d5b154c98559fe7081cda4d2a6eb85599e4ff73294d6bcf8f0fbda79bb58ad8e70927e43b SHA512 09c3fee689dde053f0fe10e7f97919b6a5990744bd50960434460f5266968c5ff6ef47f5a198ddef681755394a054d4a5d4cdc7c78eff9c8ffd1d07b516c5b61
 DIST fqdn-1.2.0.tar.gz 12275 BLAKE2B 0bc862863ee3b196ea08a1f4f50f98dca88e8b81f37d2cb97bd3fd74ef9844157ea7a9f38707047fad17b95fb95c2f0e7ace8ad2c2310171cba6ff43471ae63d SHA512 ddfcfd82860d597075fd2d989d4bb1cd8c1dc79b711da432732bf786032e78b9356e04851a491c5299b336dcde173a66ddae0e23aea59b67c758d997554b494e
+DIST fqdn-1.4.0.tar.gz 12962 BLAKE2B 76b7bd7f2ebfd77b2bba04f7e07cdab42f0ff6c7ad5967f52e4c108fc3c3345c88a220b9f0330d998dc5abc53909d5768b1b52e08e48bc1e16009fa39f3afa16 SHA512 e2a67e97bc832526e234bbf19600af2e7eda8f7ede13ba33ec8c736888d19693727eded4b895efd4c88ab2e232db768d42761f44a479e615e13da8ddbf6d03a3
 EBUILD fqdn-1.2.0.ebuild 625 BLAKE2B 3f3ff8c5a36dd5fdb0ed8cceb030432d2da6215fb132c4a887d84b9bd89175bdca6ccb68e06ee42408757d1730ddf78d29198e6d59087ba38a7dcbf6032b3334 SHA512 fa46d2d375ef21a13f25f6c66d25676f2ee2b689710e1d5270c966e1d853336dd9c7ebbcf1ff27f876697cf1aedf49e8b9731c60a3d645d5b209316e7ef98e69
-MISC metadata.xml 526 BLAKE2B 1fb86ccea80fe5eadf839fb67a10f428907b402f8559935ba97ea054012497253b3b139818d7cab92f3375fae374772b8e90d470be10773998ec554b3407c401 SHA512 d9107d31f2e828667938b86209ecfe70f0eabd8c10517e3dfdaceb63ac860c314e4889a1b06ef680b2a9acd84212aa0f703147c6180a9b7e031bc4579e93e6a7
+EBUILD fqdn-1.4.0.ebuild 590 BLAKE2B 3b03928434d87df6d037a249f3bb70fa6c76138645f9ee451f7e615901fcd0dc73a9d2fc25ba8379af0f64bb885b501c83ebaedb718aca9a3b16490ca3ab4da2 SHA512 ca0efe80191eb429379302eea156a6b1fda6407fbf4027b57873513e84b37e93f365ce97ae559f3e2c618238ee8747d1fa2abf7829216f86b0872e97e2a5bf02
+MISC metadata.xml 651 BLAKE2B 52e04a7e3de79067b3ef936ecc8bd0a2ad9db6157901992e45b4c96fd84cffe68a836fdfabd3e6b8350e53fbc88af9fc5534d0754ecaaa7f2df8e4c7af146951 SHA512 1f938747b18ee81777209bc80b6ffd66fb680f980feba5e7fd2fa13c2e96727be27be004a4e69b244629e00da851b2ad384691816ebf49cc81e73e9ca000f1bc
diff --git a/dev-python/fqdn/files/1.4.0-tests.patch b/dev-python/fqdn/files/1.4.0-tests.patch
new file mode 100644
index 000000000000..0804be7d175b
--- /dev/null
+++ b/dev-python/fqdn/files/1.4.0-tests.patch
@@ -0,0 +1,24 @@
+From 0d6a6191a49fac252a96f72bd3193f21ae56424f Mon Sep 17 00:00:00 2001
+From: ypcrts <32625281+ypcrts@users.noreply.github.com>
+Date: Sun, 26 Apr 2020 01:51:43 -0400
+Subject: [PATCH] test __str__ to be congruent with absolute
+
+---
+ tests/test_fqdn.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_fqdn.py b/tests/test_fqdn.py
+index 37fcf52..60c8607 100644
+--- a/tests/test_fqdn.py
++++ b/tests/test_fqdn.py
+@@ -21,8 +21,8 @@ def test_constructor_raises_on_bytes(self):
+ 
+     def test_str(self):
+         d = "greatdomain.com"
+-        assert d == str(FQDN(d))
+-        assert d == str(FQDN(d + "."))
++        f = FQDN(d)
++        assert f.absolute == str(f)
+ 
+     def test_rfc_1035_s_2_3_4__label_max_length(self):
+         self.__assert_valid(
diff --git a/dev-python/fqdn/fqdn-1.4.0.ebuild b/dev-python/fqdn/fqdn-1.4.0.ebuild
new file mode 100644
index 000000000000..bec42af9f411
--- /dev/null
+++ b/dev-python/fqdn/fqdn-1.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 2018-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="RFC-compliant FQDN validation and manipulation for Python"
+HOMEPAGE="https://github.com/guyhughes/fqdn"
+SRC_URI="https://github.com/guyhughes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="dev-python/cached-property[${PYTHON_USEDEP}]"
+
+PATCHES=( "${FILESDIR}/1.4.0-tests.patch" )
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs
diff --git a/dev-python/fqdn/metadata.xml b/dev-python/fqdn/metadata.xml
index 8a3fbf73a49a..38e8c03d3dc6 100644
--- a/dev-python/fqdn/metadata.xml
+++ b/dev-python/fqdn/metadata.xml
@@ -5,10 +5,15 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Validate fully-qualified domain names compliant
 		to RFC 1035 and the preferred form in RFC 3686 s. 2.
 	</longdescription>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">guyhughes/fqdn</remote-id>
 		<remote-id type="pypi">fqdn</remote-id>
diff --git a/dev-python/funcparserlib/Manifest b/dev-python/funcparserlib/Manifest
index 72dc7b6b1ba8..b815b1ebff45 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 714 BLAKE2B 7251b48b35b1993d36a2018d758ca9b79b2ac89b819f006b72b8e3d35308dca2e67321a5d2318c4895b20259f5f9085697ca13dda7a5d66320c9e5332787a228 SHA512 4feb41de697c9bffb6739d6ac0dd6724e46ab4d6e0e421c08db8f28ae27ada3eb7d7c7f8701922e93fbabe74200cd95eaf727d841e6b947e6dc8a4beede6d18c
+EBUILD funcparserlib-0.3.6-r1.ebuild 727 BLAKE2B f181e6cbef4b017cf5525aa405d737a622d63b08eaeb1f7616b622541a77445d54a8a942afb2ddb7bdd127375851f9489412f191b717fa8ffc439a7f4826ae05 SHA512 4fb9cfb3995fb1e18a472c755799e4dc04e570c337e88683a81c1240d2b60c8e022b75bda7bbd3f3cbfa36e98c1c9c82e4e943834dbd2b74babf8d66a8c6a7f3
 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 83574dcad3f6..6ea59ec4dca6 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 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index 8716463ea3ea..c50423ec12c4 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,5 +1,6 @@
 DIST gast-0.2.2.tar.gz 10294 BLAKE2B ad81309b1dd938a07f0cd39c21d4f89af6d902c136b8fe12afc5b26827c778f12561e06c66648a5b672b1c9d9eb79b3dfde7cad0acf8c7099451841b67c0daf4 SHA512 0be9b2b66b7815153e6f294b4db6b028c321d8a94d97c89d89b026df73e0c95dc2ee8af5c10f2eee51cbfb94af4b5a0da8a682896861870b98dec4c6c59a5dd3
 DIST gast-0.3.3.tar.gz 13760 BLAKE2B 0298ea81d3d133f8305fc6a7cf020213a75c2dbcb09c9648e533b8c2c58cf3e3f363448f905c8295bd34db0023be6dea00de0d901bffb1d55650773f7acc0135 SHA512 36869a5e0976223a5a82be8bf25a01654896f4de70affe0fec5252104ea6d1fea3eb8c5153530fcac8addc47b51535b02e3920a0e82aad11ba1ca8350cd11341
 EBUILD gast-0.2.2.ebuild 457 BLAKE2B f3bbda9a508e4807d87edcb71cb4b69ffa29ebceb6ddfe20e7302b3daffd4c64e3bb3f7d0d6aab72d0dad774eddbbda3703985295a5c59036b5c85ac3961902f SHA512 cfe70fee53cc47118c63e3436789d37144ad954ddeba13141996373b47df254ecadd531ed6e125f793f7b80b6f2efc6fddaaccb95dca6e1641b313089400622d
+EBUILD gast-0.3.3-r1.ebuild 459 BLAKE2B d7b7a5e46c65631bcb48dc61f3b1c1282afed3cefefb247d7185a6fdcbdea4402a4754893f5a51576159ed55d0e17e801dfc5f778067cddb2479a0292b9ee01d SHA512 7cac1089a9e5af3c30d471b240fbf44e79574978f48784f6ac22e1b500e4d0017a1c9e340bf6bce8d16ea974982d6b8232bf24bb513040027b41360fbfb13b91
 EBUILD gast-0.3.3.ebuild 458 BLAKE2B a2523227e20e5c3964df1f21107b3019034f41bea585ec67a3a1cbbb2e41c6610401f1647555b446abe5b18bea1e47d7b57105d1b3d8926a3bffddf9e6e8c1ff SHA512 4c4033f429bfb159b621c290c34eef7b667e163716805ea2bc928b879154dd8ad9281642ac15792f15b4f50a7efb1d267b35667aede0f68f72418f6e5b3e5507
 MISC metadata.xml 484 BLAKE2B d3b8be13b37bd1a2ef98b2f164c901cf21c8b73ef9b13914200c85ea26eb07dedaaca66b008dccde88dfa1bfcb733e25aac9920704625b87ce0a11a04e02b489 SHA512 5a3d09427a29d39047f396c91ad544a6cb5568f2af06216fcabc1aa12d9e4d34a71cda272d38667d8fb0114d54971626ad3de0c9d71a708cccd825ea1d7e2504
diff --git a/dev-python/gast/gast-0.3.3-r1.ebuild b/dev-python/gast/gast-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..a2d5b861bc85
--- /dev/null
+++ b/dev-python/gast/gast-0.3.3-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
+HOMEPAGE="https://pypi.org/project/gast/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index fd09751666ee..a346bd4d189a 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,3 +1,4 @@
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
+EBUILD google-auth-oauthlib-0.4.1-r1.ebuild 631 BLAKE2B 9a87391320fae8ad83b4896f8c8ff40cee0c5823e2cc9832870064dc9aea58b1b52219d7c65482e68dd95bdee6422da2aefce734729c7a574cf7490349121036 SHA512 2552e0378adf25366af9a71e81325ac1e9910a1c7edc18b45618fa0294e6c707717dd908d3f23109f092cc0737ce00075d9aa844bc693953f44f27a74ac4d51a
 EBUILD google-auth-oauthlib-0.4.1.ebuild 629 BLAKE2B 0cb2298c2fecf924e22458c8652d9f9d461f183444c234e4f5817954cb95e498630ebbfa4b75a2d38995cbd74b946518729bd47f6a45ed0ecd48b8fd6555e95b SHA512 41d56a3d6105833824b666862769d6a2c4ffc8e60abbb4f10f98cb598915d07f66cc34067a6537726ef6a299e32d35313d3f097f2087ce25659df9d0778784ea
 MISC metadata.xml 255 BLAKE2B c4c803a94d6885a8abc62874a17e76c1a13cc6a00ec4584d189c44c3e37fc87ef14b803739705e4e0051f57fcd1e475f4374ba28eb4520590b990ca53b16b272 SHA512 aca82b710a2d8d4338aead6d3e0443bd3d2175cc7bb4e2e72fee0535d0f0305bc55b87bbd9c87cc2385d7a7d4cfe81a4f123f9ba9010f667fcdc892a9883a362
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..ba3dc19e098d
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.1-r1.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="Google Authentication Library"
+HOMEPAGE="https://pypi.org/project/google-auth-oauthlib/ https://github.com/googleapis/google-auth-library-python-oauthlib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/click[${PYTHON_USEDEP}]
+	dev-python/google-auth[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index eb1a8184f9a9..f21d9a340fbd 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,4 +1,4 @@
 DIST graph-tool-2.35.tar.bz2 15153787 BLAKE2B 31f815f564510bb9628f43e8afab1a561222d23aabc3417ce474f0db69625954fc46119f61e8d7764d49a291e16e3b32f2e4249304f934c08d17af3e47a39ce8 SHA512 eadb122b75ff95fde165bfe1be8387deb08b48d041236aff11a0b8414d1a5027931a5e4b3216348edb61c53187b191a5e78af4eabb1ce679dd8736651f142bec
-EBUILD graph-tool-2.35.ebuild 1815 BLAKE2B 2c16de329fa4832c3d5145bbbc4fb95ebc2ec84578d58f96c1c8db24a4fb1ccac9664414a7e0a4f950c17234888ca9078773a43b037223f5933c013649d33272 SHA512 fd4d95f3a1c1537733cbd3abe8f3ef832f3d3b25ef865821d1b20ed5be7f5e0e5b0209eb65dcaee012b6e9c8d3b9f7c6ef6996204d6d169d0a84838fb2112bf8
-EBUILD graph-tool-9999.ebuild 1815 BLAKE2B 2c16de329fa4832c3d5145bbbc4fb95ebc2ec84578d58f96c1c8db24a4fb1ccac9664414a7e0a4f950c17234888ca9078773a43b037223f5933c013649d33272 SHA512 fd4d95f3a1c1537733cbd3abe8f3ef832f3d3b25ef865821d1b20ed5be7f5e0e5b0209eb65dcaee012b6e9c8d3b9f7c6ef6996204d6d169d0a84838fb2112bf8
+EBUILD graph-tool-2.35.ebuild 1813 BLAKE2B 9d5e874f2cabdad5acf309aecc6255aee0b828a86283d6bbe81d6b4ddd9802cddce88df3991446c3ac2ce6fcb54b02f4f166a4d89374c579f1834080cfd866ab SHA512 e97f000c5b861cb73ebc01d4b9b3459a981ca7de53a6f5d673db6e67a599150beab91ad1dfc02f39efe75c58041c13cb03d7419960ce281767d8dda4778f0136
+EBUILD graph-tool-9999.ebuild 1813 BLAKE2B 9d5e874f2cabdad5acf309aecc6255aee0b828a86283d6bbe81d6b4ddd9802cddce88df3991446c3ac2ce6fcb54b02f4f166a4d89374c579f1834080cfd866ab SHA512 e97f000c5b861cb73ebc01d4b9b3459a981ca7de53a6f5d673db6e67a599150beab91ad1dfc02f39efe75c58041c13cb03d7419960ce281767d8dda4778f0136
 MISC metadata.xml 346 BLAKE2B 69ef980447280fb170c6fc3d23bd775afb2cbc451054214ab0d1628ac5ac4be136a796c1f367d9e5ed2b914627cfe246372fba4f59e810469439b5e160d8aefa SHA512 1f8d51beb2a99ff4ac06f8e13529f09f4ed7322ed05ca281fc2e79d8cf309e3ef38695c57d27f80f25a490edb98ae4660b16fd3f671f232a3e1be2daf253ac7a
diff --git a/dev-python/graph-tool/graph-tool-2.35.ebuild b/dev-python/graph-tool/graph-tool-2.35.ebuild
index 20fbfe4e5570..bec6af3f123b 100644
--- a/dev-python/graph-tool/graph-tool-2.35.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.35.ebuild
@@ -70,7 +70,7 @@ src_configure() {
 
 src_compile() {
 	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir emake -j1
+	python_foreach_impl run_in_build_dir default
 }
 
 src_install() {
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 20fbfe4e5570..bec6af3f123b 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.ebuild
@@ -70,7 +70,7 @@ src_configure() {
 
 src_compile() {
 	# most machines don't have enough ram for parallel builds
-	python_foreach_impl run_in_build_dir emake -j1
+	python_foreach_impl run_in_build_dir default
 }
 
 src_install() {
diff --git a/dev-python/grpcio-testing/Manifest b/dev-python/grpcio-testing/Manifest
index a60090adb050..2989b7d1bf10 100644
--- a/dev-python/grpcio-testing/Manifest
+++ b/dev-python/grpcio-testing/Manifest
@@ -1,3 +1,5 @@
 DIST grpcio-testing-1.28.1.tar.gz 17127 BLAKE2B 494e232d4a4cf098cefa0948868f0610732d1aeb7c788d1481ad2693394767d73a74bfda49cb8c892f6f246f47b18c016318b5eefe3509fdc87be5649c253a17 SHA512 89c3aa5528e1f243a435997266a210ba6e287bca1401931689eb51f258a51768eb25a34c095d383dfcac7d446865535c48aefa0e37b4844bbb92214c7f431068
+DIST grpcio-testing-1.32.0.tar.gz 16814 BLAKE2B 70205dd8857256c9c4de8c7a5d115620b908deb4da35fc3cb77d9a93bd42ece34d6fcd2d32d587f8c3ede9bf49e61b9d37aac36ebc1fddbbd6e3ff2ce83809f1 SHA512 3ee10912a090287d3f039f350b11b8fc2ed656939e02a3e616911fd1af838e3f3570a7b3444c0ef54a25797a61edde87d545a9b9cabaf251a862b94100a45473
 EBUILD grpcio-testing-1.28.1.ebuild 526 BLAKE2B 48a7270fa3f6e8fcf6498bb5f059da45d9bd1a413fef8c9ade410127464951c2d05e231c770117ef00fd3cf37a9c95da1bb4a867edee36bbe787194f6264ed1b SHA512 b7cd30215fa0d7cb66ddfc7cdb3b32f0dd5d2f0752c23d8d65108fd539da6c57d375f4c6d51be9aa5cee68d379d100ec41d24ecc0ef10bb6f0c6d5f2a620f905
+EBUILD grpcio-testing-1.32.0.ebuild 488 BLAKE2B c1413d8cd6dc8836c27bb866fb06f9041799d4661e0e8a5b33de9ce42888833f2b83c86bf351eb43423f3562cebc03c4b45eb0acc29f6e08333dc0414670d335 SHA512 7cebbd04efb1d61cf8e7cb1984061060f4a01f68cc66e2bf72a13c297d99dcb169ea34a7dd6c0409d9a14c6f40547d97e8bd0e21a6ed75eb3049377a32969553
 MISC metadata.xml 377 BLAKE2B bd545cc0c7eca567c067fe1a6a77ab15026216bd2ac23a489b681d580395e1dd9669de6c0bc189a55e3e17da6fd3fbef4bcaa51e872e637a6135ea93e8b8eaad SHA512 bd18706bf10487e2771b213d706fda017282cc3b63ab60501b28b65012c77de4aae6e4199524aa97bbd7d34bd60211d974e1606b773de747497b3f4c0d52f50c
diff --git a/dev-python/grpcio-testing/grpcio-testing-1.32.0.ebuild b/dev-python/grpcio-testing/grpcio-testing-1.32.0.ebuild
new file mode 100644
index 000000000000..b27dfa6488ae
--- /dev/null
+++ b/dev-python/grpcio-testing/grpcio-testing-1.32.0.ebuild
@@ -0,0 +1,23 @@
+# 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="Testing utilities for gRPC Python"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
diff --git a/dev-python/grpcio-tools/Manifest b/dev-python/grpcio-tools/Manifest
index 27eec011d39b..5c4a1bb8f40e 100644
--- a/dev-python/grpcio-tools/Manifest
+++ b/dev-python/grpcio-tools/Manifest
@@ -1,4 +1,7 @@
+AUX 1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch 975 BLAKE2B 66dd2468bbed40d844d001b455bb03bfdffc349be39b848b0a6a6bab160887e91ee95c16d922b7c2f61f4988998fa9bcbd19fd727f75cb49d369b7386b712948 SHA512 f69edd7c7b65c5c4a0d827fb582767baae1a9b474d4019a6b40ccf8743e129b3b65bc01d0bda319d1af064e626abfff9d18c6d21a2696f2d2b0905685ee07186
 AUX setup.py-respect-cc.patch 636 BLAKE2B 8bbba520f02c83be4322e6ad2e65f95f23dc475f55b8acea15be341b131f9262c6595d7cc79dcfd0ede7ee3be61139a4c0d74586ffa845ce21dc253fc8e88bff SHA512 22aff2ae63dfeff93dd1bcb23d3f95f0e54908819b6fb7b54fad54b38cd86e62c2f4af8f1248c81516700377971c0da9dea027df99df9fa7d168f720dbac4d23
 DIST grpcio-tools-1.28.1.tar.gz 1986547 BLAKE2B 9f6eeb1e12dbf088a38bbff4daec95327cf86d6b9ac72dfdd826507d6b19d635bb263ccb4aca7577df7f585acaf02a45feebcfe0879c32a1190cac179d8cafba SHA512 b385fc567e8bb5965082164f87c1fafca5f0ec236feef343df92f82862b12ca33ddf9c94a366cd56437dc691ec5a37b82fd0f4fd547e389c6e9bcc7fe912d12e
+DIST grpcio-tools-1.32.0.tar.gz 2103777 BLAKE2B f33a54140a5356afb3930dd1ed7d48852744093621d7b252ba74ab9b615c90de36c637d1004689bd2dc3fc86757c9084795586f334a54c3ed45475f2565edf98 SHA512 aad072eb6de60d162d4ed6e353ced9d1b7d72e4ffd012237294fc5839c7d411dc640ea235746057007d289ee37235aa93c8ac23108299ab150c24f99cf050a4a
 EBUILD grpcio-tools-1.28.1.ebuild 762 BLAKE2B 8448040333dc9089d864949fb1abb1675688c43fce7b06f974261dd02405d5274388456b322b70d82893d935cc8802154566714a2a3aaed4e9b00dfe8e430a55 SHA512 a2f33ff11d7a524707471282d5b2757949d3888eb3755084ad2e5e1e18656021a65f34ebc86b2555fe4843852d018eb576e4346c9fe5b09c358383429f2e6d74
+EBUILD grpcio-tools-1.32.0.ebuild 843 BLAKE2B 5e92410d107f907057e196a12e8029ef123ebc431e3d13b79bd77ee2b8e906da8b2da8e34ac3acba08f1cb99f3d86082096eef60791eff49278b8bae8d739aba SHA512 637ffe1eadd2b771b64929c5b9abd96e658e3756d1317d91e1fc75833d7ae035b8f5770d3446296af71753a2f815dc3b2bb0456d8921308d004de31c70f8b2b2
 MISC metadata.xml 375 BLAKE2B 5bc161c29339492932031484663b5af94d2cdc7ab17fd7125e1f06988b8870c6c513549341348d531b5858e32757e0edd7bc0e364abcbefc58658d7153b85f71 SHA512 42bcc2c018fc04fe3166ad61cc7e4392d95edfdcc802d88423a903033ea6bbd781dd0a6df2251c6aca41b38db1fc57554149b390ed34d1e70527ac467007961c
diff --git a/dev-python/grpcio-tools/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch b/dev-python/grpcio-tools/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
new file mode 100644
index 000000000000..c6729e9808b4
--- /dev/null
+++ b/dev-python/grpcio-tools/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
@@ -0,0 +1,28 @@
+From c8e7e1c3cd55bf44b6fad6afa716dec9de3bf14f Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 25 Sep 2020 15:34:19 -0700
+Subject: [PATCH] setup.py: respect CC variable in latomic test
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 20a6d76..d1cd707 100644
+--- a/setup.py
++++ b/setup.py
+@@ -164,9 +164,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
+ 
+ def check_linker_need_libatomic():
+     """Test if linker on system needs libatomic."""
++    cc = os.environ.get('CC', 'cc')
+     code_test = (b'#include <atomic>\n' +
+                  b'int main() { return std::atomic<int64_t>{}; }')
+-    cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
++    cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'],
+                                stdin=PIPE,
+                                stdout=PIPE,
+                                stderr=PIPE)
+-- 
+2.28.0
+
diff --git a/dev-python/grpcio-tools/grpcio-tools-1.32.0.ebuild b/dev-python/grpcio-tools/grpcio-tools-1.32.0.ebuild
new file mode 100644
index 000000000000..1cd0831159e4
--- /dev/null
+++ b/dev-python/grpcio-tools/grpcio-tools-1.32.0.ebuild
@@ -0,0 +1,36 @@
+# 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 multiprocessing prefix
+
+DESCRIPTION="Protobuf code generator for gRPC"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	~dev-python/grpcio-${PV}[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch" )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 232db8510d7a..daf7697bbec3 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -1,4 +1,7 @@
+AUX 1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch 975 BLAKE2B 66dd2468bbed40d844d001b455bb03bfdffc349be39b848b0a6a6bab160887e91ee95c16d922b7c2f61f4988998fa9bcbd19fd727f75cb49d369b7386b712948 SHA512 f69edd7c7b65c5c4a0d827fb582767baae1a9b474d4019a6b40ccf8743e129b3b65bc01d0bda319d1af064e626abfff9d18c6d21a2696f2d2b0905685ee07186
 AUX setup.py-respect-cc.patch 1152 BLAKE2B bc939dd5f28039c8d2a7c5ac40eaff2437c0cff1ed7859b150cc5865fa59be3410338d4507f1f0cc4ed1e36f8ba338840aeac3de847b43dba1e4a3fd91b345dc SHA512 93ebcffb27c0c30e282d45094cf21f9852a46055122aac37d8f6bdab8ff42410ed234a0c9bb661c05057d41a7c3291bf868275ef57a5e7c8ef3ad1de4ea074e2
 DIST grpcio-1.28.1.tar.gz 19511346 BLAKE2B 01ebdeddcba5efbb67880693ede04ccd828771fe73def24a91d882c28f5cf6f14215daca212df1d8bb9372f385aff1e31418870437c87343f218e7b78a06b04c SHA512 12feaee3816a5e7b20b648a144d37f7e550a057112f5460bc4ec016885461951148cd4d2900fbfc905f76059ef29ae4c4d1d5a3216e5e3a2d17048c8b45f394f
+DIST grpcio-1.32.0.tar.gz 20809917 BLAKE2B e28cb44d09fd775b9b6dc87dcd52bf7f144643b09912ff8b76bf39cb250743f90bc7e3769252d47f205f9532157ae68b6ac0a9202158cb14e7b9ad448d951656 SHA512 f802a7b83bd166502fdcbfaf162652adcda36da1b2e91b5073e3b3d97d38191fe989a6dcbec6c1bf27fff162633e54bdbdb20a92e74e14280fac4576baa92157
 EBUILD grpcio-1.28.1.ebuild 1027 BLAKE2B 283b657f796910b58c9e307007884fea2fe8ca296771b19063392ca52ebd66e1728b6be2c7bde859153f353c3b264aa751b8f3cd3787e036f4ee92f92d474179 SHA512 027a951f9367400c15f6ec99ea8dab3d67c4fb49749004559a68ea8156158a5f7084cae37be0ae34846f6d485b44c83e3bc00e744ea5977c9a1353a783147756
+EBUILD grpcio-1.32.0.ebuild 1110 BLAKE2B 32350c9c7d442810971507afd0d3edbcfa75e1ea032a1d94bf49d9c0a2fb1192644c7df63255c06073a0ed68a2738f9f4a4dc05399a98299568be98c65f0c54f SHA512 ea35539e4cc7249859dfe04ae1644f4cd3f51414790d8cfd31a2229ec6d777abcb44e77c0f381e601ca72346aab3c057b1e86cdb79f58f01c72a376846ad8f44
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch b/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
new file mode 100644
index 000000000000..c6729e9808b4
--- /dev/null
+++ b/dev-python/grpcio/files/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch
@@ -0,0 +1,28 @@
+From c8e7e1c3cd55bf44b6fad6afa716dec9de3bf14f Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Fri, 25 Sep 2020 15:34:19 -0700
+Subject: [PATCH] setup.py: respect CC variable in latomic test
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index 20a6d76..d1cd707 100644
+--- a/setup.py
++++ b/setup.py
+@@ -164,9 +164,10 @@ ENABLE_DOCUMENTATION_BUILD = os.environ.get(
+ 
+ def check_linker_need_libatomic():
+     """Test if linker on system needs libatomic."""
++    cc = os.environ.get('CC', 'cc')
+     code_test = (b'#include <atomic>\n' +
+                  b'int main() { return std::atomic<int64_t>{}; }')
+-    cc_test = subprocess.Popen(['cc', '-x', 'c++', '-std=c++11', '-'],
++    cc_test = subprocess.Popen([cc, '-x', 'c++', '-std=c++11', '-'],
+                                stdin=PIPE,
+                                stdout=PIPE,
+                                stderr=PIPE)
+-- 
+2.28.0
+
diff --git a/dev-python/grpcio/grpcio-1.32.0.ebuild b/dev-python/grpcio/grpcio-1.32.0.ebuild
new file mode 100644
index 000000000000..d5fdc2f0f42b
--- /dev/null
+++ b/dev-python/grpcio/grpcio-1.32.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 prefix
+
+DESCRIPTION="High-performance RPC framework (python libraries)"
+HOMEPAGE="https://grpc.io"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
+	>=dev-python/cython-0.28.3[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	net-dns/c-ares:=
+	sys-libs/zlib:=
+"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/1.32.0-setup.py-respect-CC-variable-in-latomic-test.patch" )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	hprefixify setup.py
+}
+
+python_configure_all() {
+	export GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=1
+	export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+	export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+	export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+	export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+	export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(makeopts_jobs)"
+}
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index 8f02d58c7c5b..aa0dff988889 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -2,5 +2,5 @@ AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65
 DIST hpack-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 1141 BLAKE2B fa5b217246a531245d1b1c93176eed6918058252cb1d0bbf0aaed7e4575d53b87803d372c9865dfd6aae0874923d243506b2f1173c43d94a34e99b7696ee20bb SHA512 c6628c614799fda7f861d72ddb0d9768c0f877f392b8652ded30d354506711472076aa12af116de4076eb10682c29df2e5d361571ab6bf26ccf5a52b108bddd2
-EBUILD hpack-4.0.0.ebuild 704 BLAKE2B 7058a9975122825eff85502616b66f5c8c60880a90ad6c5ecf5b9c669ef89c3d4b6a3ba57882e19f3fe1bf091b407e03b9a13972fbe3a1b79903df052bfe22a9 SHA512 80ec08712faabf91b23f606e348ea4b2f9c35f22f29ab97f50d7d82445409254403d26cf1b57ae2cfe8b8387ecc06a775ef8c9c36e87ad35bc1f377bd0deab4a
-MISC metadata.xml 677 BLAKE2B 1440fcf100740188ffc8ae85da9bc014004feb2aa04d5f5db73546e62a01ffbe0975b9b588e6d579c45a2b1c803958999dbdd1cad8c1cbee597a3202556b7d4b SHA512 b7d64d3fa13e9e2f7a794aab733b511ec37809294b0c353d9cff55950dca47e57da8b5b5b80ffb0763f509a498816f94586c11dfdb569ecc6fa604f75c7a6132
+EBUILD hpack-4.0.0.ebuild 711 BLAKE2B be6c7d6abc49435921f4c74101e2984c278d96e46928aa71a17e0a87e3628e6cf1eb596dee134b0589fe09cad01fa94e7c2b8ba892554826131ba18a8e046732 SHA512 f1a90de9e64afad82cc782293f7d6bec90bbb548990ad0f5ebce91d680a41dc5fd6f3b26bb44cd21e3399fe0ca59ce290631d471feaf652950c72c64fd94dcb8
+MISC metadata.xml 701 BLAKE2B ddbb1fb2ed0eff9436e212933ba3a6d91a3b439c3457bc613d00c0f8ec06468df44d4476f19a3bef9daa163938804ab2ef9ced38b51ef29a81f208a704599c4c SHA512 f464fca486d271112fe08d65f800858427269292720804ff620127bb5ff3aa920e334bb1155f1788feeeb98d02d0e60114d2801d97febd77031bd524758c4184
diff --git a/dev-python/hpack/hpack-4.0.0.ebuild b/dev-python/hpack/hpack-4.0.0.ebuild
index 3d2885a39310..b0734a0afcfa 100644
--- a/dev-python/hpack/hpack-4.0.0.ebuild
+++ b/dev-python/hpack/hpack-4.0.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 # dev-python/pytest-relaxed causes tests to fail
 BDEPEND="
diff --git a/dev-python/hpack/metadata.xml b/dev-python/hpack/metadata.xml
index 83d597b0e26f..a4853f53cb10 100644
--- a/dev-python/hpack/metadata.xml
+++ b/dev-python/hpack/metadata.xml
@@ -17,4 +17,5 @@
 		also contains a compatibility layer that automatically enables the use
 		of nghttp2 if it’s available.
 	</longdescription>
+	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/humanfriendly/Manifest b/dev-python/humanfriendly/Manifest
index 6af4892a41e8..db0d17b1435e 100644
--- a/dev-python/humanfriendly/Manifest
+++ b/dev-python/humanfriendly/Manifest
@@ -1,3 +1,5 @@
 DIST humanfriendly-4.18.tar.gz 345853 BLAKE2B 9b03ea0679f787e216ee78efe8feb77f83562998813718845f4d21b7ce3f42cadff0e80b96f02da3cf6dc7f35cb0714f746940cf2ac0ec8e8981377989650c8a SHA512 01c7ee50d35154fe0b7ad39662ca6ff2dcd3e0f2a2eacc62f0184102c9db1c0fd99257273982aff56710b4e59024e8c20ee77ddd10c68e427c077ed4ca7e0022
+DIST humanfriendly-8.2.tar.gz 358747 BLAKE2B bc5824e94ea94df6ee93ea44d273ccb856f50b69e52ae6293afaedf06c9f00c67e064f0c85edd88be9954bb258334b1b9af4ab88efc5b352f3efe8d322fc55c1 SHA512 123d8592e6613a70421740648bb8998733b118927a0bd6182af848612e46eec8e35cae95168219c9b7672bed8e18e1c4a493a80248eabe47f8a4cb1813c8b591
 EBUILD humanfriendly-4.18.ebuild 807 BLAKE2B 0c03c4fc21aa1909fdd84cb53b82ff0ab27d020d38a40ffdfd5d559ae79284dbaec8c09b18106f25bbc79ea9f4024a1af181363edb2e58f3c346412899ba49ca SHA512 7f33d3e52c193d09ff1d58ece09f428d9ae75619ed0aeb9b17b902b0181adda126259fd0e51b444c5186a9d1012ed445db5700aec97ec015ead7327f86259dfd
+EBUILD humanfriendly-8.2.ebuild 896 BLAKE2B 5b351de246dce297e9aee2ba5149f893c3884446758b618570f8c053b46fa0f0dcf5b0f15082f5b1e52d93aa6ea9786281a566fc365bf865decda7e9a5ac3a5c SHA512 fc28d50dacacd1a48584e33434daed2c781ddb17db6b33b7a14b167468cd482355777f045f264386d3be191b8bb431a9c3fd30f3424710ad424f33c21bf371ab
 MISC metadata.xml 326 BLAKE2B 5db2fb344393d914a42d1b9b256782d2e8286daa33ff4b8687d23e613ae8d168052dc310cab48ef0c49c524d3b5115d2a17cbede518fe93e944c0067c94f9c7b SHA512 1338df242248b37b4d016d8f9a31ffa004eed60a9122ed9ec8f94103271b3136b698a613c0f7c91411f43d96b136777e0ffe808c250f9ece3d29922312457f47
diff --git a/dev-python/humanfriendly/humanfriendly-8.2.ebuild b/dev-python/humanfriendly/humanfriendly-8.2.ebuild
new file mode 100644
index 000000000000..a918f9d2b315
--- /dev/null
+++ b/dev-python/humanfriendly/humanfriendly-8.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=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE="threads(+)"
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Human friendly output for text interfaces using Python"
+HOMEPAGE="https://pypi.org/project/humanfriendly
+	https://github.com/xolox/python-humanfriendly
+	https://humanfriendly.readthedocs.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/capturer[${PYTHON_USEDEP}]
+		dev-python/coloredlogs[${PYTHON_USEDEP}]
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_test() {
+	pytest -vv ${PN}/tests.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 2f2a07f8c8d5..83177ae4c93a 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,5 +1,5 @@
 DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
 DIST hyper-h2-4.0.0.tar.gz 2142185 BLAKE2B e5ae692c1f21b6e3ea8695ec269a4d02f72b8d385b6f9c523775f3db2200379f9af5accb70fa06a357575728a6a5b2644dd1225cfdf458fffa80e84c7b1c7b2f SHA512 84578174a13782897f9286c62d450eaf11aa71c01c96b8660179cd2df77618dc1a6c4b354b2bc5731cd21c4709c8c0a8282a859a98c4a62a7295b6dfd1b5cfb2
 EBUILD hyper-h2-3.2.0.ebuild 958 BLAKE2B 9cc6c4a52f3ec041d9e6072f42e5ca7d17fb51533461a184d94aa74acc30647a10c74a7fcf4c31edb652091e96d35ce04a424c1d08f75013d8482a7041d77917 SHA512 7a54002d65b303d0d359123143184c9698153d6d6e3c5dfb6cd277353065898d8ed5adc22fb2351362923e844fc3e2d7c54282a03f1f972cb945dad2404f5651
-EBUILD hyper-h2-4.0.0.ebuild 791 BLAKE2B 0b2d449058720a8ca480a29d80255e8792fa0be8ddd6c1026059e82a78352d92e97cb74561d3dc1a7f4c6853ec95de0445041c3ef16e3617f0a817c281e6c37f SHA512 400c511d1b792b7a7f441e7f87442e92ab7be16ac8a8c1bba35070f7a4e9186c8816c11f2ee6783136999e21bd66e6ae0fc29f81e9cdfc6c35ddce9ec7bcb993
+EBUILD hyper-h2-4.0.0.ebuild 798 BLAKE2B 13239213aee8005cdcf5143b42ee56072927b901fd7c5bdd417217ddc51bab1372652faba5501bfa4b3276112faab181f26dd8d44d00f0483115e070ead04add SHA512 779435005ec6b5a203d6782e59e307b4e8483624d49b631753b28ad2f5b42b81a71f515f574fa35846bb97d8b57817a60d3bcea9713637e80663d26eb6ee91e6
 MISC metadata.xml 693 BLAKE2B 40bdc58c6b6541754e1fb5d2b3a6fa4ffd234f84768061f7ac1c1183f2f944a72948ca54824488ed2f177d96f9a0a74dc990ff6e97e6b9dabc4602522c0d27a0 SHA512 3f083b3de6499dfc1dbe59c4aa201f7b159847cf72076e0a7a9f80b029f668dd668395c2219e01dc5035677b21e6cd60f3ccf646fbef6bf458e208a0d79cb94d
diff --git a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
index 284161100632..5937d1f73bda 100644
--- a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/hyperframe-6.0[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 74d15afd9f8e..06d0a4121457 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,12 @@ DIST hypothesis-python-5.24.4.tar.gz 9054743 BLAKE2B 5c64c86ed58d8f0e4a07390b1b1
 DIST hypothesis-python-5.29.4.tar.gz 9071060 BLAKE2B 0668f3c7859fae7024c15f693b1f56ce8d02d6f3b8187d24b2d84e38e7bdb73c0824d2b02cfecc6b40bdfbbb1c91c0aa83d40848c499a97ab7e9223aaa6c78d4 SHA512 9da4b487fd3c56540a20e2fbff635704f0720f422d8a398d0accd24a1fb9517476b0d29135b9113a96e8dc98fcfc31cc53215ad82cb727be54e4e77b44d4c8e4
 DIST hypothesis-python-5.35.3.tar.gz 9084707 BLAKE2B ff0638194067a1c52a0297254be572ba66d67afa49c1f2fbcc42bff694ab4fe545d408d9144118314a6decfdffdbe950e2b72e89b689ae99b82ad3d3321e72fd SHA512 d862cba17444b36fa05877419495b5e49e8686980e0203da388e2dc4e528ace928f0bcb244afc8512f97bf466f2e5a2a421a2c873053849af61de71421d5c61a
 DIST hypothesis-python-5.35.4.tar.gz 9084892 BLAKE2B 5545f2b1f3e97eafb4c83d7918f1558124102b1b58854bf0ca3a75fa3f6f08c0cc862c0ec32f5fdcbbf12e6cfc849e7081fe82ab0bb24e6de8fe41108525816b SHA512 db26d0b8d23b753c4880e0ee54ef89957c68c75496847aaefd538196188e7734513d737e2073bdced5eb7a8677b096b2cf9d6d48e572922d8a3e5a5c930bc795
+DIST hypothesis-python-5.36.0.tar.gz 9086288 BLAKE2B 9deba5f50168185d5e9ef35a47bcb0dc6dfdf38b7da7a2aedee0a6fe18740fa9a353b0985e25a40da1a30d26900c6294161a1dfe03e5c7c9c31f74aa1b2cec9f SHA512 e7324f98ac8609c1ce7ed957d0ee0280d177e9a6d369cc3bdb2cc8bde7f5e79d8f19b53c6b19fdfc732c9f84e4cd7dffa9c2af3cc004b3b5dbe703d73ce64009
+DIST hypothesis-python-5.36.1.tar.gz 9086877 BLAKE2B 4b71daa1e9417d8249364292ca1dcbdbb31d041e2f5627776bb2d2d4493be82c85201d000e187e5cc445c79612f5918a5ac71a2787bbc0c21eff83d4c27b0dc3 SHA512 97d0446ba5660c189e60b47b8f782818525fcc1c5c1d64eec997b85d5ae47fc7d52771439b5c249002380ffe7d95696728f81efe513993ff90c8e192e2ceca8d
 EBUILD hypothesis-5.24.4.ebuild 1608 BLAKE2B c52cd842682347491245d4560fba737a85f8dd46e93416047c2bff5ff4dcde85bd337d7e7c65556e61d97bb1c2a1270652bf3dec8126049daa01215ed1424b3f SHA512 7d3450fa374c88dd6206663341a1437d177a7cfe5b0eb99161a85f4e62b97020843e052d28ae0975628d8c299655a35b86ba51cf67bacd296e839d949c06f785
-EBUILD hypothesis-5.29.4.ebuild 1782 BLAKE2B 7088d5f99f70a5195711fe19904daeb3286292e85f2c4b00b3c8f0b87ecea5f17e595f1204fad1f326847688da324d0a747d0b99c0fe0313c0c1330fe1569b2d SHA512 9bec8bf52fff95e4e4c5244c41f8987cc41f6a90d0a5ffaf4af1ce929601536752cf7a03180a626d343bea25c7016e3f40e4dae651b7e5ffb4c5aac60f6c4b15
+EBUILD hypothesis-5.29.4.ebuild 1789 BLAKE2B 675098e49370053498baf2a181d31e1beee829d19e94d0f95ec2bef24dd62cb9fadac2a8f7bee68bd12f5aee489857a4365c794d5791a5be46a91596b485e552 SHA512 36484ec011a777aac0aa8c14e06365f18ce2261cd7d49124e69fc04e634dc2054949ddd626eab4c95acf40190eadf1fe9dbe2b4da54bd79ee472cd6b708e0c37
 EBUILD hypothesis-5.35.3.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
 EBUILD hypothesis-5.35.4.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
+EBUILD hypothesis-5.36.0.ebuild 1796 BLAKE2B 3962807fed780a205f7ad0aa29d18c19cfe3b15ee2a96a6581e420cd67deb9b81984cec05d3445d27e689a613161a7bc03526c801ef6888a086b882ade089e54 SHA512 5555a953cdae1e0c70b5231c9ea9d14385b083135c585a2cd9cdf6dcd68d8ab051c541ef7c5d3c91bc5186e31c45abf485783ab00a7e3ee17338e8554ea57e33
+EBUILD hypothesis-5.36.1.ebuild 1803 BLAKE2B 04eac62c585b02bf721763309619d61eec9d526f332323daabe73e8a9829bbf6c2939baf751a196cae120134dfe68bde39e1567795ad5668cc718489e2a3e3f4 SHA512 0ff2d839e09d54bf1ec046f1de9cd29a13ba75d57ea6334a4aa812fba61b15e805596e92ca9a825ae482cd6528e94115bb4cc92e1a5439e691f4e23ff961f7ff
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-5.29.4.ebuild b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
index 5065388770fa..1b73cd15acf4 100644
--- a/dev-python/hypothesis/hypothesis-5.29.4.ebuild
+++ b/dev-python/hypothesis/hypothesis-5.29.4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="cli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/hypothesis/hypothesis-5.36.0.ebuild b/dev-python/hypothesis/hypothesis-5.36.0.ebuild
new file mode 100644
index 000000000000..c8d53477c0bc
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.36.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 optfeature
+
+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 ~ppc ~ppc64 ~riscv ~sparc ~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.36.1.ebuild b/dev-python/hypothesis/hypothesis-5.36.1.ebuild
new file mode 100644
index 000000000000..b817839fd0ac
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-5.36.1.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 optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~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/idna-ssl/Manifest b/dev-python/idna-ssl/Manifest
index 84966b9f08d8..301fd24741c1 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 857 BLAKE2B e43687a4cf70d0759f56bcfe5f01997dd8e45a6e06ae7b8161736cc15fff28b34603de2aa93addaae55c4d5e4316607636ccad7f10741e4e422e6cf32411d14e SHA512 fbf482d78ff4a208add93753b03a694f49d9370e46d6c1f79b64adb4234bb6396711fec7903513b4b992ef27ee6be0c0f1fd104be293d4ff1746673703f5fd2c
+EBUILD idna-ssl-1.1.0.ebuild 864 BLAKE2B 86dab263deabac9d1b6b9702655a9a62ea7187006e30153762cf3d7ff637d6248f83507a452ad6e67431b486b3da46972739420f277a2252cac8d463b93816be SHA512 4a30545c29d38c21b1156769db5d21f903454ffefadd32173d98ee83b72fac4e3c51c24411654fb854f4467248f21331394d5b03a1367c258b0454287b67a1ed
 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 802b3e0ff9ac..bfa486ba3f29 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 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/iniconfig/Manifest b/dev-python/iniconfig/Manifest
index 2e09ce4d60e0..05af6bf8d6dc 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 564 BLAKE2B 1bc1935fdb3333abb4b9f2ce6b01467d732708eea1c7ffca71fd16f53d4d0aebdd6ed760aa769932e81376609a88f7f0f369e900b51e4a1d47fd466ec014f25d SHA512 c54f6dde5a7028b1e5b5cad60824ddae6055998f368336fac47cf10fe258a82f7b5fc75a07aa704340bbf0ad97780d6fd55fca123e3a81278bfd80dca27e324a
+EBUILD iniconfig-1.0.0.ebuild 568 BLAKE2B 93c0d6d18ed5a34f0ecb4dbaa093ed2f783b42a6ffa1283113b49f4ae1f7c4cf410736d044d13038e52cd12126f5a830fff4621ca2a451187e5c33b5d2456e93 SHA512 101d1330194335b67f222c839b26ea037edfbe66599e2130ae91e4999919dd28bd182cadbacd9d49221b58285e1ddc7ec809de2933913ae2cc5bb90eff9778e1
 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 635312b96011..810b8151db13 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 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 BDEPEND="dev-python/setuptools_scm[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/ipaddr/Manifest b/dev-python/ipaddr/Manifest
index eccf08b8992a..59e02e6b77ad 100644
--- a/dev-python/ipaddr/Manifest
+++ b/dev-python/ipaddr/Manifest
@@ -1,3 +1,3 @@
 DIST ipaddr-2.2.0.tar.gz 26266 BLAKE2B f12807beb52c5cb3c7da2afa4b61b264fb58f0100900e5ca062127ce218f9f5710f38ac7c7183a7aa08b77757c39866d169e6e39c3bc5c6c55df003a9b414ec0 SHA512 5adb117c44e6e5dbdb9e96543aa7a34f35b4a4ec9baa163a25448058c34091bf4019d24f0250928291e4d4bc97dcdf75865daef739e2d94f98cc584e6e6c50dd
-EBUILD ipaddr-2.2.0.ebuild 663 BLAKE2B 81d87d3ed102a165bf5ca25e5311bc2f882851c9b6c77cf4b2c8c75ea80619c6f0f5102471e6d8d4d5c02e6d27f9a74d58b9e0be1672611c15b99136c023ec67 SHA512 3e80c351d310bbbb4f52f548fde2ea57c553e6db99957c5d2206c18236e3cc2937e18e4dbd3e0e7059970c63afb3401ecaf0ed78e9dcca867a7a52492c81c466
+EBUILD ipaddr-2.2.0-r1.ebuild 657 BLAKE2B fe1db11eebdb11aa8f38488e646b790585a0f52aa0dc77fd422e84f9d5be110f5ba91b2997537ccc843cc4ffe7da4c7bbe90d59499acc1537a66d09845b95e7a SHA512 c3dc4a63e20f3b8ea8c796288c51d766344c23217eaaa2c933fa8946eed37a60f9c48d4f91e9ee7a86e5c982fc5cc380b4f5ddc7bc5e7ef141e7be0657ce8e2a
 MISC metadata.xml 493 BLAKE2B aebbbdad8a285f35bb8635efe1ebb3740108597d7c5842c64ce56aeea95e918445493fa2dd1acaa9db641c73b1fe36c48e6203dcde42dd8af9f52be7cafec9ab SHA512 23d6c158e1e33c5731eebede2743c612b0220e7f7d769470115a4143a6f69c46d8652c535837632f32494f852c1074112f808b67ca43488a49f09accff840779
diff --git a/dev-python/ipaddr/ipaddr-2.2.0.ebuild b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
index 84ed45148909..4bc2aa1929eb 100644
--- a/dev-python/ipaddr/ipaddr-2.2.0.ebuild
+++ b/dev-python/ipaddr/ipaddr-2.2.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/jupyterlab_pygments/Manifest b/dev-python/jupyterlab_pygments/Manifest
index 729a75335548..6b828b3e083a 100644
--- a/dev-python/jupyterlab_pygments/Manifest
+++ b/dev-python/jupyterlab_pygments/Manifest
@@ -1,3 +1,5 @@
 DIST jupyterlab_pygments-0.1.1.tar.gz 561976 BLAKE2B ca317ed6709fd2c9a8afd137051140396bccdc3140c8c1ca97f64f8d4f74d2272c687661e1e28822a5008b2285306024408b18ba6ac92cb9d73acc29b8741fe4 SHA512 743e380f253f817ec9c9aedbe5d3c1cb5bc2c3de2136deba40b0fd3880bb04a4774099eb90437519638811ea9bea0324db3c3d8b1a9ab63857e7513deeaba669
+DIST jupyterlab_pygments-0.1.2.tar.gz 561989 BLAKE2B 85d6b59b2c959f838746c7c6fed99ad5adda89a514a77327cc8e9ba7d6a91b1c0206d999c09149e6c5b9c67911ca16914f0b17a67b3505db73c23a7194fe4566 SHA512 0b4f4c13017f8afbd83e9fb575b3c4ee44272bc01421761ae7b140ecab743d825aa195432caa5f6153bda0ef84fe3ab92dad61ffd9b048927736a916dd267b5a
 EBUILD jupyterlab_pygments-0.1.1.ebuild 492 BLAKE2B 664ce34a11198df300839ae4bce40c1e49314feba622ab1c62e4e621025f0987317d0360a2edafdd48d243468a4af39320d6a7e174b1829254baca037f2ab008 SHA512 7d2e3072ea8b388bf4d8b1fa0627976541357360613acfd20c58505bd618edc2fb88b4431d41b4726867913450cf8ed3d4728bc824ec955ea2d9ead80df457d8
+EBUILD jupyterlab_pygments-0.1.2.ebuild 492 BLAKE2B 664ce34a11198df300839ae4bce40c1e49314feba622ab1c62e4e621025f0987317d0360a2edafdd48d243468a4af39320d6a7e174b1829254baca037f2ab008 SHA512 7d2e3072ea8b388bf4d8b1fa0627976541357360613acfd20c58505bd618edc2fb88b4431d41b4726867913450cf8ed3d4728bc824ec955ea2d9ead80df457d8
 MISC metadata.xml 384 BLAKE2B c047f8bd2673bf34d6a1f17af9d3e6ca58fb54a8b237e433cf55f6c6bdda863cd8c39b41d44b7119d2b8c2ff0b3c3ac67a5e0a0cc606a545a46ada4e64704345 SHA512 fe21650260f3a89af0dbaaa7d4953e7e5396b94cd1ff630601e8c8bd82d0c91870380bc3da3a7d03aaa212ac278c834a19c2c83ca23b7a2a86d09460878e2813
diff --git a/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
new file mode 100644
index 000000000000..49809d701f83
--- /dev/null
+++ b/dev-python/jupyterlab_pygments/jupyterlab_pygments-0.1.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pygments theme making use of JupyterLab CSS variables"
+HOMEPAGE="https://github.com/jupyterlab/jupyterlab_pygments"
+SRC_URI="https://github.com/jupyterlab/jupyterlab_pygments/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/pygments[${PYTHON_USEDEP}]"
diff --git a/dev-python/jwcrypto/Manifest b/dev-python/jwcrypto/Manifest
index ea910ef2b4cd..c54feba9a50a 100644
--- a/dev-python/jwcrypto/Manifest
+++ b/dev-python/jwcrypto/Manifest
@@ -1,3 +1,5 @@
 DIST jwcrypto-0.7.0.tar.gz 80869 BLAKE2B 7b8a6928dff40d4d3e0bd61cfc81362ed5d0abd1001e1273aa12111166ed13e510d9cff935724578c2b7392bc74ffc94b0a733ea23f4a982e6bd8d35b1155ef4 SHA512 1d2b6268a54f3a3d466f7a7f7f0776164f0f35420b026c8ebfba099df530d965697eea85a49a73c44713e38fdb9ec4018cd4813b8e154a18117fc4006aa5578e
+DIST jwcrypto-0.8.0.tar.gz 81782 BLAKE2B a3cfb04f099a747c365f870c53d75574cdfaf8b98373f37cc107ebca956b414b7d7cb78f8fcd6d3964528d3bc8a217e5c645bf6e82531e951dfdd9ca03472111 SHA512 784134d27ff7abd31e1069763969513ed45f81fd2c242b7ff7036413c35ef374d535eae0123f5561a8e4eb2630cee40056d1c66454288e1310c4cbedecaac210
 EBUILD jwcrypto-0.7.0.ebuild 712 BLAKE2B 1f2d773a6e127377a7d0e5dea1d91c42d554145bb1496b3a0a1ce717a550c8e9e1d22ef874ae5521b7897b53f2fccd33f23dfc3abbb866e5031b66028251a30b SHA512 763e7b8394fffeb7330861aa76b4e63f81b726560944e6a7fe34b3a953b2a047a4bd5e88fb475ce001e79cf5b44e4f625c2dc13956d553a1f96e8f9375f03145
+EBUILD jwcrypto-0.8.0.ebuild 739 BLAKE2B 5c1c2da78f7f680559e303a8f30b9dedd94c4708c05800181b03382d5ea3689ad52c51192e5c2e6f711669d1b47cdd57a54e239b39746463b0e949b76706ccc0 SHA512 def1db76c2686cbfd5f7ef324cf358d403bc671e840e1a5f2ce4f71b6f109f0bb7b161b38210361dbf728318fcd7c08824adbddf6a8b71ef3924928b64a48111
 MISC metadata.xml 368 BLAKE2B d5656c56c5a851d766c1e6588409d4864688de0c3acd4f28fb00ce22a106e5cf7f3ca8d54a4e448250cfafd04f4a0acced22db2a99879da67eb80c03f141ca74 SHA512 fe3492bfd6ba81846e7ba185468617d19f06eb813d55e87ac8ac9d5c7997d069e2b0f90dbd11ec5508b1da1ddd1d6a291fbd524f0c9dcdbdc8447ca639b78735
diff --git a/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild b/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild
new file mode 100644
index 000000000000..babe4d90871f
--- /dev/null
+++ b/dev-python/jwcrypto/jwcrypto-0.8.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Implements JWK,JWS,JWE specifications using python-cryptography"
+
+HOMEPAGE="https://github.com/latchset/jwcrypto"
+SRC_URI="https://github.com/latchset/jwcrypto/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND=">=dev-python/cryptography-2.3[${PYTHON_USEDEP}]"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# Do not install doc in non-standard paths
+	sed -i "\|data_files = \[('share/doc/jwcrypto|d" setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/lark-parser/Manifest b/dev-python/lark-parser/Manifest
index 0a282a69ccd2..43b57b1fdf11 100644
--- a/dev-python/lark-parser/Manifest
+++ b/dev-python/lark-parser/Manifest
@@ -1,3 +1,3 @@
 DIST lark-parser-0.7.8.tar.gz 276204 BLAKE2B c2d103f41b7b6ccb988c5935c53e422d495980c1d64cba125e9d27b9b7bf03c0864904e6c2c6b40ec56e8975a8051f1a18c9da126d02fe149dc3684ea7d41c30 SHA512 52eed1a5f26fa7ba79820298a8f6f7594b2351797abdaf8fd96f76e15a11711805955e055164ce287f7204edf3d19116562795cf56db464b4f2f15e40e1da561
-EBUILD lark-parser-0.7.8.ebuild 405 BLAKE2B 435ad90823354a3f90a1462832e1ab2da73f6c04babc2b2181de7fcf7b3b721640c986cf897cacb4874ab12d9a0049839bcace046baa64c6d1ed556dc558308e SHA512 8cc8853b17474539c52ac81626fc6c8bfe0cf1d3fa4f5f1ff365faabd4347539218faad57a8ef4b7fcfe1e13511136f37198a4ef94229c3ec7228ab79940b81a
+EBUILD lark-parser-0.7.8.ebuild 407 BLAKE2B 8e3e44b477b24891c3f58422211e3c3218517d70f563876a934e5e3e8069b35b9b67d1a311cb89a2f180061d2f65dbd519ad4872f10e61cc59d2d81079a9f215 SHA512 cf4245c3f1d339082598a942190e7add05b04e461c8849305212490cb1a90cb374458f746cf95587cb3163d3bab42bebd7c2176e1e190b2062c44918aa59d347
 MISC metadata.xml 503 BLAKE2B 99d3c5991b02f4c0b0daf656b1e6f38e38f04622715b0ceab73b40951f4bf1e97b52e6ebe06767948660370c93382a294efaa7d768937659e66b3916a44b3a31 SHA512 11eb50053b35b3dd0a92f0923d3e7c00abeeee046cc3a1113c5ae33993627e778fa58699b90bf0d4915b00ab8635f2200c4a4637754d9752a60874c419c6d4b0
diff --git a/dev-python/lark-parser/lark-parser-0.7.8.ebuild b/dev-python/lark-parser/lark-parser-0.7.8.ebuild
index d85e3e03e315..683bfc8846af 100644
--- a/dev-python/lark-parser/lark-parser-0.7.8.ebuild
+++ b/dev-python/lark-parser/lark-parser-0.7.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit distutils-r1
 
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index 36990d76a241..6782ed4378cc 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,4 +1,4 @@
 AUX libsass-0.20.0_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d
 DIST libsass-0.20.0.tar.gz 321750 BLAKE2B 215bbe8d4a60d3f6851bfe92a7fb79e58bdf86fa5334a39c7ed051ad2ffc598e59afcb381f6526d25d6e3d021fd5eda51371a6628c01111f8bed42bda9581cb7 SHA512 ad6054f3e02b39730c4680b64d3ed20ba05443c7019c8a7a47ae557a6f52c60be1326a2cf2421f13de0a57a5f37347dffff1146190d1fa0eb8fd985f27ebf7d7
-EBUILD libsass-0.20.0.ebuild 882 BLAKE2B eae8e6d58a3b7f4813354049235ffa5e4a7ea62eedbd0573e7afe77e55d17337ba35455f2a7aa622769fda45e3e618c90582e03ba57160c52c7541a8c6cf60da SHA512 ffdfcad24892c7369dad358128676c22d8faa6b242e67d8656b78a39e33100b3634d3dfb7a6d4659990fa39a450c1b1f42c631e08a30adc63381b281bffcd836
+EBUILD libsass-0.20.0.ebuild 880 BLAKE2B 2efb02d977f7a5882ac76b4e5303fce24090b4cbe2ed8376770e5f4c27016c56b004d5fed0209b74df1c4efa0ec237c07cef40b8fff0f459098ad033cb818e96 SHA512 c97b6c5f00487efbc32b0a72decac4bbc5e5e3964cee52328cd5577ed3971edbbc87ec38e01eca4f05da402a57617f7a11b846656713a1e602d814d522e1ea12
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/libsass/libsass-0.20.0.ebuild b/dev-python/libsass/libsass-0.20.0.ebuild
index b745260bad65..4db2ec619f46 100644
--- a/dev-python/libsass/libsass-0.20.0.ebuild
+++ b/dev-python/libsass/libsass-0.20.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-libs/libsass
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 7723efb7a724..c238fa81b72f 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,11 +1,13 @@
 DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff219888706d2b79d5296590934714e42ac79f6a6547941ac2b1d2c4e6313dd18b6c7068e748aa6ac033e49fccbf5d355aa8191 SHA512 baa182d62fef1851836013ae8a1a00861ea89769778d67fb97b407a9de664e6c85da2af9c5b3f75d2bf34ff6b00004e531ca7e4b3115a26c0e61c575cf2303a0
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
 DIST llvmorg-11.0.0-rc3.tar.gz 122766783 BLAKE2B 052fdc864fed52692141284ebdc41d52d21fbeaf24ac5ed3e67701537baa683bae61b1c06de68322e0578a27a1f5a8856088cdc001d2b8d34d2ec88ae65ff739 SHA512 a28ce74775373c63fe23b3116cd25db0efb95c6fdb60e56f2522659a404a59576f3d9429a109cb0f90534927259289aa1c712673f36f92272d642bf8dce5699f
+DIST llvmorg-11.0.0-rc4.tar.gz 122768150 BLAKE2B e92417b6e1775a10c196534518036de6393e3cb9e0e656d4f864e7870be8fb0dad3f4cf170345e653ba60f36172df117977d5dfebe3d9ee7ec2c160d3dc9c5cd SHA512 ed2aee9f6d0bb887f27840158e9f95d94c9ad3981a0388a33fcd3e405f5072134a02999075238b6a2b8803149aa08ac790214605b186c2cc2d4827ba53c00de1
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lit-10.0.0.ebuild 863 BLAKE2B efe99feb8f7c0b6b4121591f240120a47f3f2c673d5b5d3908184a6a395b206a84abcf0f524f3106357a35b7217122875b6b4d5365af26676a48d3e1194a0158 SHA512 a3cdcf3d5af68f02e0ced1427c0babc7470b1268f7400d6c4db7d9961d5f944191777a03e3ef2c30a55ce75f003c1cdea382f2a0218e5c32c1d0c4a0b2cbf523
 EBUILD lit-10.0.1.ebuild 895 BLAKE2B 868dc79efafa28332067b6070b2e8a632400888bd6ef80a380c35359acaa781d2d31f58a216318249e5b7317b888fd10e64b90c47d3bce8dd5094cc216fbd1ed SHA512 4b5e708921eabad1d1001fd332153e3af26068d97342ad908189125adc0038a2d5af5859a2ee0b1816f0e6eb467ef253adbe53e9eee17433f19c03b21851008b
 EBUILD lit-11.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
 EBUILD lit-11.0.0_rc3.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
+EBUILD lit-11.0.0_rc4.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
 EBUILD lit-12.0.0.9999.ebuild 868 BLAKE2B 2ee1ed99d09450178ee1d188a464b80681534c04a4c96df18213b884804bce1f4182fdf578f5aac54489aa370f2b6ff39d72af7f96113d4ab4f110658e12b5c2 SHA512 44b3c4890bd0885b035d8eb9fbe1fac5b5285bc47080f2ff2b47eb3171af4c9144b20cc033cf2b907c62a30e945ddd809729429b4385ef8bb8f5e52ed5f198dc
 EBUILD lit-9.0.1.ebuild 861 BLAKE2B c4d1a504e922e182102538cc19ea99683500c533af440179bbc99f22aa21558585a7d4f6bdc8ca4159c2300150ffedba1cc980c448fbf5f146d4168e65a3c9e7 SHA512 7916fc0e882021c5b3bf21b4b565e73e83380d9c221b61b31af0acb5939ee3413a1a6638f7328b0815081316300b78836273ba20448b4d8c9d5baf73278184d9
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/lit/lit-11.0.0_rc4.ebuild b/dev-python/lit/lit-11.0.0_rc4.ebuild
new file mode 100644
index 000000000000..eafbdc683987
--- /dev/null
+++ b/dev-python/lit/lit-11.0.0_rc4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
+SLOT="0"
+KEYWORDS=""
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Tests require 'FileCheck' and 'not' utilities (from llvm)
+BDEPEND="
+	test? (
+		dev-python/psutil[${PYTHON_USEDEP}]
+		sys-devel/llvm )"
+
+# TODO: move the manpage generation here (from sys-devel/llvm)
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x LIT_PRESERVES_TMP=1
+	local litflags=$(get_lit_flags)
+	./lit.py ${litflags//;/ } tests || die
+}
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 65214384d7b2..c9ed8a98b9c8 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,4 +1,4 @@
 AUX lxml-4.5.0-tests-pypy.patch 17429 BLAKE2B d27a093c8419e0a9a8a192c91f0f764868aa0164851d3f8650eacda14ecca836b306321de81768b64788ebd013d1916ce2e608d9f000c0699b969cb13fc67ffb SHA512 dfe9bcfd035edbb7e931f9827405f6df449aa9b572970fe4c11e666977df874584bfba12145f79b3d59723da004815f9ec2f708398ef4d8205ad7c3954884361
 DIST lxml-4.5.2.tar.gz 943480 BLAKE2B 11130d2507ff0d61637d7fef2f4b28c5fbbbfe8864504c8f3a231899be4db14e6be65edc6e780719686605663b0c5f76f161beb509dc58d16ee3a9158a7db59c SHA512 146dcb4414b7f0815c5930048d9dc89711bf0a3ee091c89f4475265cdd6f1690a20f82ec24a282a43cff8854f9b960f0cd4430cff79a7506d39ac1baf7770695
-EBUILD lxml-4.5.2.ebuild 2247 BLAKE2B 98bcd13a52412ffae6f8be77266db161a37ca23c27ec8092f47c853567afaa35faf30700105e3c74f0ec22162e73502b3a0c8956d65d86c0d2dd366f20025341 SHA512 4656c26d3541440c6f5cbbdbe2ffbeb52ea0d4e2c637f399c73bc13947a377bc09bcf60df99509f4ae3ffe7013b3a644131a1eeba42e615b96d08e18580a92f4
+EBUILD lxml-4.5.2-r1.ebuild 2237 BLAKE2B 3a14828b9740d490d9f6df146e69692aefc20ca3610585305c468f63528281f8fc09cb992210d46440b5effebbca3f8c78f902f1621cb777dfcfb94cd5b07e55 SHA512 ef536b193167c0e594bad724c5c7b48283dde809c8457d2f21adafcce238bd37e0e99f06762957fd1df921abdbc733347d448cdea72c3b1d0016fd9312c8ce92
 MISC metadata.xml 317 BLAKE2B ba93bbba5105423b6640b86b29f2a54ff50c9daf42424915cfe25049e983ca03c6f2fc066d4e27fe42292e8290b7091bc00d5a40f49d368a3dd6acce42c4504e SHA512 900609bfd7cd032821afb5d1f6e5c25287178f06a49e59431a710d4e76187a2b41a4a0da383d257777a2120b60f15620da37c70d145eca4a84aa30a08b824fae
diff --git a/dev-python/lxml/lxml-4.5.2.ebuild b/dev-python/lxml/lxml-4.5.2-r1.ebuild
index 5fda592375ee..91bdb6ed77b4 100644
--- a/dev-python/lxml/lxml-4.5.2.ebuild
+++ b/dev-python/lxml/lxml-4.5.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1 optfeature toolchain-funcs
 
diff --git a/dev-python/matterhook/Manifest b/dev-python/matterhook/Manifest
index 3ea76bf57399..5ef23f3f4e26 100644
--- a/dev-python/matterhook/Manifest
+++ b/dev-python/matterhook/Manifest
@@ -2,4 +2,4 @@ DIST matterhook-0.1.tar.gz 3150 BLAKE2B 841b64875d3ecc55c5056a15e07e8c46ac13ec48
 DIST matterhook-0.2.tar.gz 4458 BLAKE2B 83dae9d38eaa9de3abdca4925378475660ab6f9571565f9275425cb9579397c2f3d106735d4268b7045d6af2572bdb8e1f60aa89030b1fa44c4c5c1b19fcd106 SHA512 aa476a00a5b571c5c8bb21eccc5b1c325e0932da7e4f8095e3ad29356afd4716384abfa9e4927a820e6d1fcf8e62a516943f6372d90cd7a9e76d0292c352c483
 EBUILD matterhook-0.1-r1.ebuild 494 BLAKE2B 14f5af598f16368c6d26fc2ed631f32b8d84e58ee5a8d10d0df2dac84279396b0c909d5aa57fb0f3f29cfd381a2665a5c035e81058d5c7937d10e79d182c3c06 SHA512 454d714e7618be61c5da34208d7c5d703875ca70754ef0594d238e78aaf93f1e5203032abfa1970c1ddcf09aed385a53578f70faddf3778e6e1af86343e7f0e7
 EBUILD matterhook-0.2.ebuild 496 BLAKE2B 7fa2d6857b8430c50773e6ae17c6a79b6b1e114c6bf4b7246468e2d07e4c15b475b9735e8feaebe4102014ccd683a462959cae6df0b7d0da15503a30a4e70bb8 SHA512 2c3b9b70a7bde1eb2945e027ba31fe7858c2df5188270992d6bdcf5708e70e8721906621aa5093c65539f1d253ee362301f17584880728195366af6a8d53d379
-MISC metadata.xml 311 BLAKE2B 53b986a49d3c6615c99e1a79572bf81af5cd3f094d95abb417148c0bbe29bbd4d6f412a18b16d366cf0c9fd487acafebd6d0f192b48b855e8f7db3fe08add8b0 SHA512 0702ce6e8985e0c20f35455802d955e1cc69769de6e92cba5aa5de0edbbb5ed9104c6ebe82cc689d144226d64414001b8ee41a575786f6377f863d6bc0bab1fd
+MISC metadata.xml 336 BLAKE2B 1e7290ae691ca7a715f9dc60546340501b3ee5854f6d3960557c76039f90b8b96479d3a603b9d8e60d4fdc6a6551eaac3269946c0784d3c308e9d874f008473a SHA512 85d15317337059f72b1b2451d00eb95a6c196a9b09d180d0583ef8675a269615a8dfe91b726c6ffaa9b9a5eb4fe5da2357a5973fe85a6e77106daa8232406bdf
diff --git a/dev-python/matterhook/metadata.xml b/dev-python/matterhook/metadata.xml
index 334baca2874e..4c76899f3eeb 100644
--- a/dev-python/matterhook/metadata.xml
+++ b/dev-python/matterhook/metadata.xml
@@ -4,6 +4,7 @@
   <maintainer type="person">
     <email>ultrabug@gentoo.org</email>
   </maintainer>
+  <stabilize-allarches/>
   <upstream>
     <remote-id type="github">numberly/matterhook</remote-id>
   </upstream>
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index 020bbb0815b1..33efde3715c8 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,4 +1,4 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3-r1.ebuild 811 BLAKE2B 46af92ddbe58766cab9a8bbbc9fb16a7f6ddd3104be6171093892d670506e9ccb7ebb51c3a58b62842e152754961ecf00c6f5a46488597b618eb72ab69899897 SHA512 47b2b1175204931b3c9549c8c3d3eb08bffbba6662e8e7a746400a5825758ab1744c2d697b9b8005159fbcb8fab5b4257bfedf258c5f0abf3a7516bacc23c8b4
+EBUILD mypy_extensions-0.4.3-r1.ebuild 818 BLAKE2B bac262f89661459cead7dc27743d369a940d6e8102b13256ff0b09e96a9b38a36db9336d9cd6d588c8b461fe79ab108241c9c7f631be856302ac38f32bdc3aa1 SHA512 9189edce03ced6534d1097d1a4ac797e7c7d5511e48ea78de66666790af60e6c235920894df0ac2adf5dbec152fec65f8080ced53f085eac88e1cc3dea15dd49
 EBUILD mypy_extensions-0.4.3.ebuild 1025 BLAKE2B 6e531146c9e8c331c64453e6701842bac7d4fb80330a103bdd897d11a10618202cf291a4ab5691b5e7f6ed7dd3c9986f66f9b216f9185b95e284e7784e6a419f SHA512 770e6c1ed105f69d7f8bbb33b6e16b9b5a906962ff81c65efbed6f5a2639cf469a49f09bb284aa1f078da36d7b7cc752e2410cae91d8c18fd979c40ee460c2c4
-MISC metadata.xml 328 BLAKE2B c8305ff15b161dc506756c3a5e9d06fd2d22de1789676d02b610377520d593a594aebe733dfe88d0c88bf235e7c0dbfc16309d57f729365660c9fe9284fa9830 SHA512 6fa42508eacd37f3cdb2b47371baa13f67d985bb4f47237a0f9be5fa27b2ce86670de842abb75ca6c21f8d4255e56be552f5415c66244fe0c5dc99865e61b252
+MISC metadata.xml 352 BLAKE2B 932d22dee01e3a1e586176e5e32423d36100c8d3116cf6b8eb1268665ac7a5456535fbb6b855a4e6849767d31dd6c2066eae3d08868662c211596d7c02f39ec7 SHA512 2eccb85a7150b8592717ee60ecba338f59563fbdc12c172924f8d7743d33c1a32cb9a0bfb41f150e86bfee3748488f32ae9d57bbb240cb7fae4b9f3a00621e4a
diff --git a/dev-python/mypy_extensions/metadata.xml b/dev-python/mypy_extensions/metadata.xml
index e0bf53421120..ddbd57b96d8e 100644
--- a/dev-python/mypy_extensions/metadata.xml
+++ b/dev-python/mypy_extensions/metadata.xml
@@ -5,6 +5,7 @@
 		<email>ikelos@gentoo.org</email>
 		<name>Mike Auty</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">python/mypy_extesions</remote-id>
 	</upstream>
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
index 5451fe4f4b28..f8af82c56a72 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" =~ [9]{4,} ]]; then
 	EGIT_REPO_URI="https://github.com/python/${PN}"
 	EGIT_COMMIT="master"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 0a682c5fbddb..3ab0a0ddf307 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,3 +1,3 @@
 DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
-EBUILD mysqlclient-1.4.6-r1.ebuild 876 BLAKE2B f86bed107710e37c01deec254d2750225ebf94a98556990aade9aa5f1bac1252a193ca556cc92058579cc5c9c52f08d16ccaaf550e2e685eedc393870bdbfce4 SHA512 a324faf541847499a19ef31219345e6c879c86304936f6b5eb928c00bdc7e9e39681f743cf1a26a53fa99b7db9c0bd8aa774532ccd37626c02940687f313af93
+EBUILD mysqlclient-1.4.6-r1.ebuild 875 BLAKE2B a4009a0d402ca70243aa460671f7472a7fced8b2ee075dc32f0249c4da89f3b4c196215d48b988edf4292fa64000f6f636cbc354984a76bb24e170e2f2df5bb2 SHA512 30a1a45ab4cad9de5e1b948c367c533c41831aa4980d849beb4633649ddf858ca70c55db120b48f063187b516ef7ba4f3825c7857ea9b3c4dfa71d113674c83d
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
index f90942112b29..9dd4e5a530d6 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 hppa ~ia64 ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index 9a8428445847..f4a056526805 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1.ebuild 836 BLAKE2B 3bd6d4b42336e1c9b57e101c8a3b156b53af3e2d69533c3b979101d9bca8b3e42927d051d52384ee58679f086283b94fdcee6800df5b1230eb8e4c62babd8b2f SHA512 dcc8bdf7b2058c2e6e54dad6b953eb7a5c59371a90376ecec6c41c321735eda1f5ccaafd603569823869257ce179bac41652225a0b152ece331e6b657ab7e1f1
+EBUILD namespace-google-1-r1.ebuild 830 BLAKE2B 4d1f8cacb0974bdbdd85e5629b416dad3f06498e9f4584c4d1c6aff3be11d3bab5843f7968e7770cf996fe120f4a4a2e104879d5d0b30fe0ff8700016468cc4b SHA512 bda66556d8ddd1c408f1d5a5166ccc091938ce67f4d5e4c6ac01726a48ce57dca9b8cb21172970552b69d52f1d949b4e386cb093aa9b1192bcb001f8cecb569c
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-google/namespace-google-1.ebuild b/dev-python/namespace-google/namespace-google-1-r1.ebuild
index a54997c42810..fbf1dac945c4 100644
--- a/dev-python/namespace-google/namespace-google-1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{6..9}} )
+PYTHON_COMPAT=( python3_{6..9} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for google"
diff --git a/dev-python/namespace-jaraco/Manifest b/dev-python/namespace-jaraco/Manifest
index fce97cc791fd..3691d3d0c9bb 100644
--- a/dev-python/namespace-jaraco/Manifest
+++ b/dev-python/namespace-jaraco/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-jaraco-2-r1.ebuild 809 BLAKE2B 66dae9c6eef9dca286d8cf4e79b0bdac3e8f8894d802e83ed27dfa70589e8d55553a3a548669a75b117176785a288c83421b6bbbf85722737010595d8e731cf1 SHA512 5b8ed87ec1837f66ee08b8ec96c07153498715727ed624455433636aa72861ba280dde9d469335e432f57ed92288a218436ffb60142c8979c2f4ac7154430fcf
+EBUILD namespace-jaraco-2-r2.ebuild 803 BLAKE2B 87641a3fd780de40865c663eb7cf15f3bff20dc3b2f0b71401c087069d3f6a650a993ded1da8103603f10229b64d978a990df961078812ab3a78dc447ae67f99 SHA512 48b4dc0730e7148318b27f41cab6e22c03694fe5fa26cde85fdece5af5caf531448db8105227fede88a5ad41b519e80a35dc24b18990dbefa8848767a52dfa3e
 MISC metadata.xml 346 BLAKE2B bf549c97be0470c6694566c73fb27eda911bd1c7e38641ccfc90e0cbf33717499177dcd4d6b6ce475d430a04ba395500d41aa5cf7d7938ae8bdd1c0840e0a6e0 SHA512 747d2fe0daa0213a7f9d737cc8c5037438ef9262ba049a7a687e944cb1251b9b3dc39ea03a810b5ca61c7b95c7f1360bc397c4d75fc26746cab5029f7736efdf
diff --git a/dev-python/namespace-jaraco/namespace-jaraco-2-r1.ebuild b/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
index 7cfab7705f6d..5c395f853ebd 100644
--- a/dev-python/namespace-jaraco/namespace-jaraco-2-r1.ebuild
+++ b/dev-python/namespace-jaraco/namespace-jaraco-2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python{2_7,3_{6,7,8,9}} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for jaraco"
diff --git a/dev-python/neovim-remote/Manifest b/dev-python/neovim-remote/Manifest
index 023676294b61..a007e59a4c18 100644
--- a/dev-python/neovim-remote/Manifest
+++ b/dev-python/neovim-remote/Manifest
@@ -1,4 +1,6 @@
 DIST neovim-remote-2.2.1.tar.gz 438078 BLAKE2B abbb056a10acb1c4e21c0c418ee2d6003869340eb34df0c0374b947fbbfa2d2e0f64f61ad571a6cad7ffad7374f1df17a519795e61b37b8d6741d566760759e9 SHA512 04a16a1ed5f4947b4fd763432a14fc565300abe9b480037a462f0c4700535d4854012ff08ac64234dbb1fccc1d3f5ba2174f94effc5564879fbcd1c83fee26ae
+DIST neovim-remote-2.4.0.tar.gz 438687 BLAKE2B 0dfbe3d660d9b2f6b7a4f1016d4d230d63612306ea99079364ed5c6dbae51df7a19c4d1bca51a7bfad142ffe5811e286b843edf6b0715c7aac921c584701030e SHA512 073bf95a0238c76c19258d886fe71e23ec85f9cba200b8a490014a2842d1a84b3c95092afcfdcc8ca80122639b9e07652594faa24ed6a6aff537192ec3a3d14c
 EBUILD neovim-remote-2.2.1.ebuild 782 BLAKE2B 7d7b8b8fd6168b69f5551f2c0a7f9e129bafa1391f3085afb5756bebd622cb021fef4a451023ad9c8def96830222e2c83c3511686b36308b8f18ca831c87e380 SHA512 0fef8c1a73da9bfc3540df682e6f5ea17f42a73429a55897e8edc3dc6490ceb02a73a6f54f72d1ffb750f146c7235b3dc9c548d44ef958c384d43dc83e45b424
+EBUILD neovim-remote-2.4.0.ebuild 703 BLAKE2B 133f32a1f6e90a206c87b7e2e8dec5bfbd85d559203ef5500f882c9103d2e88f2379e924e8cf00c0902cb1f843bcdfb27050113089a74bfe3771a3ec6d97247b SHA512 f890bfcd8698a49718942f8c3ce23a0adf5cd4173063bd4f875648241b91ccc7e5b715779c19cb172e54e2f6de77d9377ce9e701874b95fb43d3956646550a38
 EBUILD neovim-remote-9999.ebuild 650 BLAKE2B 1a539de9625bb01d8ae01757f59fb373e4664e2e2cbab51720a7d571214047d882074845a61ade063e00c83f72a786692fba0d3eadead8d93c4ec4c326a40ddf SHA512 1c4f39e444c14ae4d6a27ec80968c91377c6d97b1aa9fa6216ac1175ea2755011fe2cdd50d91441e5f4414559627d7b2986392dbf87984bc66b64dec6b1a32e9
 MISC metadata.xml 361 BLAKE2B 8cbaa82fad1a726eb2e09bc74bf9f6b18579fa767d56ee20d14c39d8bd7726d8ac044e5072e4cc00686f9acc41e0c9a2d4578705c79a3e84af5318c136c910e0 SHA512 b7a6d140b5642f8326e0d69752c0479319ef0746eaa440fce0a4bb2d36d4428f5bbe42364430906a1baf2dc953283130c5fb3eb7b9f9d45add2a398a1e9f5b64
diff --git a/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild b/dev-python/neovim-remote/neovim-remote-2.4.0.ebuild
new file mode 100644
index 000000000000..e8e8df1ecd2e
--- /dev/null
+++ b/dev-python/neovim-remote/neovim-remote-2.4.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,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/mhinz/${PN}.git"
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/mhinz/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="A tool that helps control neovim processes"
+HOMEPAGE="https://github.com/mhinz/neovim-remote"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/pynvim[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+BDEPEND+="
+	test? ( app-editors/neovim )
+"
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index fe39bb9d8bb0..85d738983ca9 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -3,5 +3,5 @@ AUX networkx-2.4-py39.patch 2188 BLAKE2B e94c8ee731642a596d0812d82dbf85379249a64
 DIST networkx-2.4.tar.gz 1462338 BLAKE2B 90fd7d249f3b022dd9c861dd023881fd241cba0515e2e9991516c278a40b92ee03663eb2b15bd584f179c066529df0587293f9c9a211e7c526addf77fdaf5cd6 SHA512 38eabef56e3667b7fa85206ae01a0a8f5c71bfa2f324bc2490c433cb973508a03955183a0c58ae40390f86d6a4741135cdb426c4c15e53e2f123072f0cac1b89
 DIST networkx-2.5.tar.gz 1542085 BLAKE2B a4d1d1f65a09f8e7cd830a9e670cf540c19b800dffb90aa1cc6ebda8b6116b6181969382f90339254746a3f277d786020506a3c8f10c90ff48999d3b2c3c433e SHA512 ab51198072d20bdba7c9ceb6856631a20a7e9527a7cadb41271a999f57bf60da5488269c6e4e1f3f4f33420ec6493af665386842c216ea1cfadd1792ccb6444e
 EBUILD networkx-2.4-r1.ebuild 1580 BLAKE2B fd4ee5c316255f11d6d90828851ebab513eeafbef8ec6fd9499a7dc88718d750ac2143862ffcdbe8e24910be575dc6e35658845f7159fccdef2020522c58c6e9 SHA512 96aeafb16cad3f2c089daa07121662f5adbecfdae5fa68270f0464130e95c39655849eeb8f9162bd8cd804842a493b25819cb4e29f23a12b4704d6b259f6e258
-EBUILD networkx-2.5.ebuild 1343 BLAKE2B 9d7ded05640aa495e6ed48bee95d8580e93b2dd6beef87c093bac941029b48e19e974bf7a523fe958b37ed3d1322a78d5d96491835de55f0b3f781d39451f9bb SHA512 e647180a28730670d3ee9659c985776aed39a45e36cbcb8ab14ec7a0bbbef8e6281d939c8c144669d260bf9a9ca66efe36716b77f30ec4f725b2ef8e32b469a1
+EBUILD networkx-2.5.ebuild 1341 BLAKE2B c11626738b1d236a56b931ecfd28a5a367738befa28f7e5e9b382d03c5b0b6081260615adb8fd29a57afcdbf5c9f074d585a045b7760dc953ae9b09ba32e8b0e SHA512 e1948968b8d43e0f6ca2929095f6f6516b090f8a5767813b88ebd6889189e2e2605b55d10ffaf77b774fd6b0383bdb6c01f9e7ea9aa69c5a2ecbf5ea6a44d560
 MISC metadata.xml 1460 BLAKE2B 2b3d94eb6c3b4827ff154dc73ecb99a46e8e194150cb508928b88366cfb6842f8b535c738fafb33fe0c4de70829b9a211cc64108621213fefd2305a725d8945f SHA512 3beefd0d791e9799438f097cc78e38aadec92100e013d5a477851f6a8db7a9fde606c3f1d5c2c0f4e75f4c8b3190b5daecf3b7c03b5f06a6f7866d46eecb1095
diff --git a/dev-python/networkx/networkx-2.5.ebuild b/dev-python/networkx/networkx-2.5.ebuild
index e3df9c8c3bcf..452500338b0e 100644
--- a/dev-python/networkx/networkx-2.5.ebuild
+++ b/dev-python/networkx/networkx-2.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="examples extras pandas scipy test xml yaml"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/nose/Manifest b/dev-python/nose/Manifest
index 04e40a5ba14c..f27fa25f6987 100644
--- a/dev-python/nose/Manifest
+++ b/dev-python/nose/Manifest
@@ -3,4 +3,5 @@ AUX nose-1.3.7-python-3.5-backport.patch 1802 BLAKE2B 8513cd506f7031ec4af1a4acd6
 AUX nose-1.3.7-python-3.6-test.patch 3289 BLAKE2B 4f19c4f6e4f376cb09896f9e7b054753c339ad371e151f01cc8c54e83ecffee72e4959d827a88d03b4944192b43085b50017ef8b8785222125ce32fac5831717 SHA512 0be6e49f08a4098b4c5dd1d9678e757c8f1f317fb13bd355a035c44bcdd9cd043be1755bb97c4ca78397985f07f6fc486ddd10cb56dd8d8774d631eebcc81127
 DIST nose-1.3.7.tar.gz 280488 BLAKE2B 4bb479b2786f813f9e9a5fd401e30023a473a053ae013d7887be15af415422c09fb399af6058ae99ed65c5fa4da84eb274eb805e895ca74db159d952905f5be4 SHA512 e65c914f621f8da06b9ab11a0ff2763d6e29b82ce2aaed56da0e3773dc899d9deb1f20015789d44c65a5dad7214520f5b659b3f8d7695fb207ad3f78e5cf1b62
 EBUILD nose-1.3.7-r6.ebuild 2376 BLAKE2B 805a479082b87865e782f5de72ad024ddca3bde297cfa7d667a98ca36d395b343c0161defad74f35630b0c94a55f7594ab2df89f045919fb487ab16c1ddef672 SHA512 b930ea4730f8c6095ffe018810a42f9aaf316af9c9b93f61765dcf2a193bd595b17698ddb4d87c00ab0335d49817a8df8ad15f66c870085e046d9418f0d36869
+EBUILD nose-1.3.7-r7.ebuild 2303 BLAKE2B d5903baa2d1e645152220149d6fb06c5b765a426c1b679162bc38c4187fd3a42a8cf9b35196db734644271dda438c523e46f5c737ce79f0a0fb189dfa1b9e323 SHA512 4b1c0a40cd9cbe7bfa4c0fe1416fff644388d9460c6a5ce4df96ea74977cf90ea16140aada6b6c498268eb93ba2c39cdc9964c45bcb011ac7b2a9039a0329c17
 MISC metadata.xml 524 BLAKE2B 90a98bae0d27a49c51aee677f8bdebcbee461d74fad0f349f73458229098ba3038705d63a88c59f90ef8621931e5d3902c0209bd627c28d2b0296deaff4af75d SHA512 4dc9346469b9b3a0b87fffe49db530107a019bd798fba0620b671d71a43805537face8451c24d6ad40bf11ed3498d8970ddc1ce3109398534c9f3c8ed72743e0
diff --git a/dev-python/nose/nose-1.3.7-r7.ebuild b/dev-python/nose/nose-1.3.7-r7.ebuild
new file mode 100644
index 000000000000..f72c21ba2527
--- /dev/null
+++ b/dev-python/nose/nose-1.3.7-r7.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Unittest extension with automatic test suite discovery and easy test authoring"
+HOMEPAGE="
+	https://pypi.org/project/nose/
+	https://nose.readthedocs.io/en/latest/
+	https://github.com/nose-devs/nose"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="coverage examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	coverage? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/twisted[${PYTHON_USEDEP}]
+		' 'python3*')
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python-3.5-backport.patch
+
+	# Patch against master found in an upstream PR, backported:
+	# https://github.com/nose-devs/nose/pull/1004
+	"${FILESDIR}"/${P}-coverage-4.1-support.patch
+
+	"${FILESDIR}"/${P}-python-3.6-test.patch
+)
+
+python_prepare_all() {
+	# Tests need to be converted, and they don't respect BUILD_DIR.
+	use test && DISTUTILS_IN_SOURCE_BUILD=1
+
+	# Disable tests requiring network connection.
+	sed \
+		-e "s/test_resolve/_&/g" \
+		-e "s/test_raises_bad_return/_&/g" \
+		-e "s/test_raises_twisted_error/_&/g" \
+		-i unit_tests/test_twisted.py || die "sed failed"
+	# Disable versioning of nosetests script to avoid collision with
+	# versioning performed by the eclass.
+	sed -e "/'nosetests%s = nose:run_exit' % py_vers_tag,/d" \
+		-i setup.py || die "sed2 failed"
+
+	# fix manpage install path
+	sed -i -e 's:man/:share/&:' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	local add_targets=()
+
+	if use test; then
+		add_targets+=( egg_info )
+		python_is_python3 && add_targets+=( build_tests )
+	fi
+
+	distutils-r1_python_compile "${add_targets[@]}"
+}
+
+python_test() {
+	"${EPYTHON}" selftest.py -v || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/notify2/Manifest b/dev-python/notify2/Manifest
index 2f570119fbfd..dbc6ace57a4b 100644
--- a/dev-python/notify2/Manifest
+++ b/dev-python/notify2/Manifest
@@ -1,3 +1,4 @@
 DIST notify2-0.3.1.tar.gz 17792 BLAKE2B 649df1934d1fffb97dabbf2f483204c55427fbede851840d642da2e4e62a9bda9d49670e60f5b2cda36b62ee47b7d0cd861d757d338867547dce3c7d61ddf7b4 SHA512 0b69a64e0a7e4955ee767c975db92c5c60d28c0e54f77498cfb98390771a8f536631fc34e42b5c46c138dfa1054b5516a0809b8e3b0cb9237a39825ddb827109
 EBUILD notify2-0.3.1-r1.ebuild 738 BLAKE2B 1050c727ef34716a21e4dfeb36a9834de07e110e15c9b68c7b91a14616646a6dc604265f574c9363ad4c7f2e4bbe299a3f81fd2ec9d8f0863a188d70055bc7cf SHA512 a794212cf4033def159205a3b8d4d7b8bde31ee375eb14bb5ede368005f93415cb94a2fe3fc512b902e3338613007b44b674b5f0b89f129f01522084850530d3
+EBUILD notify2-0.3.1-r2.ebuild 735 BLAKE2B 16ec1d30655285131c94d550148fddc3ab004fd052ec6e28deed0509157b5cbfd34ddda4ee26e97b9a82511bf05b8747eb59b20a04a4a3067558ef19a2cf0f65 SHA512 b4a3839a0d37abdc67fa8c3942449a6ca750bd4251a83eb3d3f5f7ea7ff0823a2e924972c83a7a714277fb3a25aaff94d433120d0e7b856affcfd2e9169414f3
 MISC metadata.xml 465 BLAKE2B 477ef3b148c7916372b0c12fc450dc9bacb59c609a3e3e005be6f8d5a268661405744c16180b336e34f4782f7e3a38ba17e63747d46199d0eb161e23d8415eaa SHA512 8024b5c580d09b74bf6a258dad507bec09d0c7bbbd10861bc2f866dd71acd7a858e7175dcb1d670cfdbade64da3f607667434a8587de6ceaeee7da028ce332ba
diff --git a/dev-python/notify2/notify2-0.3.1-r2.ebuild b/dev-python/notify2/notify2-0.3.1-r2.ebuild
new file mode 100644
index 000000000000..1a165cade8b1
--- /dev/null
+++ b/dev-python/notify2/notify2-0.3.1-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python interface to DBus notifications."
+HOMEPAGE="https://bitbucket.org/takluyver/pynotify2"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="examples"
+
+RDEPEND="dev-python/dbus-python[${PYTHON_USEDEP}]"
+BDEPEND="test? ( sys-apps/dbus[X] )"
+
+python_test() {
+	virtx ${EPYTHON} test_notify2.py
+}
+
+python_install_all() {
+	if use examples; then
+		rm examples/notify2.py || die
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 694200995b87..b6c1f2ed2aa5 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -6,6 +6,6 @@ DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761db
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 EBUILD numpy-1.19.0.ebuild 3726 BLAKE2B b7ff98d3782d037656a810490a46f8d6a1f9ffa407577b910fcc7a06ce900390d341a06213c5f8d3b6073c7b20053f151f65636beccb07cb055e4dd5a965cc9c SHA512 36ef418f6e17a0cb364bb0f5cef4890fdb84d3a2b748733e35f576574a84cdebfb1e086b8764aa6a14ab887d1730f12cd7f6550a70a792d942622b7ed8602407
-EBUILD numpy-1.19.1.ebuild 3741 BLAKE2B 3d16e9b26a02dc4c6a5a0d34bb5734aa73e161e198cc7e4311de287676c9b4cfd1d4fd982fe6572c71553d284be16978c06f5b170a9674dc747c3c99eb3728b0 SHA512 984cf6adc67ae4dd627ce0209522080f84a12cabac4c809fa17589e5acf1cc59060753d3a5f11cf3e5139904e3b8eeff2aba3f3490ff4551da23d0551756c235
+EBUILD numpy-1.19.1.ebuild 3740 BLAKE2B 7bc7ee8ad4958aa64a38cd89093cc2d866f37e297174eec66d2a131b70cd532c2eedfeb50656055ffa75756c1d701a59aeac99a9e57d107affed5e4854ab940f SHA512 8fb7b254c41c38059532a7ab897198844aab6da031de67c7166c87074bad21c426751f8d0b35d274d76d83eefd8825dccba05de69eb6f46ce0f5cacbeccb9006
 EBUILD numpy-1.19.2.ebuild 3741 BLAKE2B 3d16e9b26a02dc4c6a5a0d34bb5734aa73e161e198cc7e4311de287676c9b4cfd1d4fd982fe6572c71553d284be16978c06f5b170a9674dc747c3c99eb3728b0 SHA512 984cf6adc67ae4dd627ce0209522080f84a12cabac4c809fa17589e5acf1cc59060753d3a5f11cf3e5139904e3b8eeff2aba3f3490ff4551da23d0551756c235
 MISC metadata.xml 876 BLAKE2B 5e257d6ea3c59c5819d854db7b7db3ebff53b5c87b5ce9348786085f09db12aa6fc8fa86393b9e6c06760ac0d9f36a52fdfb1865c9d1d9ad5526d74d3d53e8b1 SHA512 d35d0954ff8f21e370edeab3ce3e5ab501bf216c93399e807ede6f1910ba0ea41359425bf894d813a39442fb92a724fe83ec8a5c64e6bd97de9422f67700d549
diff --git a/dev-python/numpy/numpy-1.19.1.ebuild b/dev-python/numpy/numpy-1.19.1.ebuild
index 48984ec1246c..d550852de8d8 100644
--- a/dev-python/numpy/numpy-1.19.1.ebuild
+++ b/dev-python/numpy/numpy-1.19.1.ebuild
@@ -24,7 +24,7 @@ SRC_URI="
 	)"
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 0a8528555693..7828846a6e18 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,4 @@
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
+EBUILD olefile-0.46-r1.ebuild 553 BLAKE2B fa7a66540df05545ab8991a400d905b305c436d24c06e8a14017f49a8e1837e28256b50a17d3d5593f0424b587a845bd07efe32edde98ca8ee260d350def387e SHA512 051bb35b7299ab790d46cfcbfe54c8f44d0e81aa8fa0ec08301710a41ff1af6bd309d81a835e6ef69eabe5466154f60d7c7718f2012b497e20263fc8ad4e461b
 EBUILD olefile-0.46.ebuild 559 BLAKE2B ff2e3bd1e0737050f3d1cd9bf847ebc5e5f89e17dd5ea174b99dc1beb2e36d4021d48e0f9358abc349bef1373f9e6da2f63d59e4e0f50b48fa6ebb81e90078c2 SHA512 86e9252a0ea67104ed6c9537ffbbe51e3a95928db902002dd65e1fa4852d908b333bc010031076b915472a8269687ec168c17011fa4d2db8b28d25aaab74bd58
 MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
diff --git a/dev-python/olefile/olefile-0.46-r1.ebuild b/dev-python/olefile/olefile-0.46-r1.ebuild
new file mode 100644
index 000000000000..cf09eeb237d8
--- /dev/null
+++ b/dev-python/olefile/olefile-0.46-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python package to parse, read and write Microsoft OLE2 files"
+HOMEPAGE="https://www.decalage.info/olefile"
+SRC_URI="https://github.com/decalage2/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_sphinx doc
+distutils_enable_tests unittest
diff --git a/dev-python/openpyxl/Manifest b/dev-python/openpyxl/Manifest
index 14367429fb13..3b114cba7316 100644
--- a/dev-python/openpyxl/Manifest
+++ b/dev-python/openpyxl/Manifest
@@ -1,4 +1,5 @@
 DIST openpyxl-3.0.3.tar.bz2 2407120 BLAKE2B 8a746409d3424014150bad797923f076ac8ba0ab24ffe0ee75c1d65f02accbeecfdc0ae5d2c6025d0fa937cf0f1c75c8837a84ba0f9d63b3778c14c2899df4ba SHA512 7a17a21a4f3be391e7ab72ef6c5f6342094404f68a9e9ca69f874f1ac2441d81699b91224cd1ccd4fe3e7e5c99ca59088ee532bbd2e6edcab40c27a8f1898095
+DIST openpyxl-3.0.5.tar.bz2 2421647 BLAKE2B 60fc12188a608891a63513177e8e3399b3905ee9b4c4ff1631901ce0d99c3e05bc9413813d3c4f7bb9034e1d839f91e9dea5e610795c701a40d99f1011b08c45 SHA512 5f60f746b7b4bd32a018972f7c18adc0552a6d6904fcf1258db3fab28f21aa7b17e386b355ede41365889146e9aaa09911748a26343788477fd72ad5d1264974
 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
+EBUILD openpyxl-3.0.5.ebuild 746 BLAKE2B 2a49898be40ef0f6cd2bb09baf99c74b6d8077cb0c6784123caf135d0a6db232e3db5eefc21c025d0e631178d6ee968cd1d5ca6af28a881f62298b022686e808 SHA512 640cc23cce5fe8de78912baf8d6be2223f19060b6285c72d128642455971ad2e523c4127916b688304ac7a74aeb907b04f88a8f434a7968438e0e206fd80890b
+MISC metadata.xml 508 BLAKE2B 929353e837b5a3add8ba96cd39bae1072953891d0e20ce6223a817ba6ea014deacb8493c9a361445559086d9befad3e936484644d0551e4122a87b00bb06a065 SHA512 77e9c91e35ff72c60ec08596db72c0307126a13f017fc5c772091a427a324a3fa92172e3ed91ceba744e151d6b20a5a10855b4315969704e4aeb08609e0b21ec
diff --git a/dev-python/openpyxl/metadata.xml b/dev-python/openpyxl/metadata.xml
index ee52e74e72de..93dffff67799 100644
--- a/dev-python/openpyxl/metadata.xml
+++ b/dev-python/openpyxl/metadata.xml
@@ -7,8 +7,8 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">openpyxl</remote-id>
-		<remote-id type="bitbucket">openpyxl/openpyxl</remote-id>
-		<bugs-to>https://bitbucket.org/openpyxl/openpyxl/issues</bugs-to>
+		<bugs-to>https://foss.heptapod.net/openpyxl/openpyxl/issues</bugs-to>
 		<changelog>https://openpyxl.readthedocs.io/en/stable/changes.html</changelog>
+		<doc>https://openpyxl.readthedocs.io</doc>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/openpyxl/openpyxl-9999.ebuild b/dev-python/openpyxl/openpyxl-3.0.5.ebuild
index 957f018d2820..76ad7c8bc494 100644
--- a/dev-python/openpyxl/openpyxl-9999.ebuild
+++ b/dev-python/openpyxl/openpyxl-3.0.5.ebuild
@@ -3,33 +3,28 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
-inherit distutils-r1 mercurial
+inherit distutils-r1
 
 DESCRIPTION="Pure python reader and writer of Excel OpenXML files"
 HOMEPAGE="https://openpyxl.readthedocs.io/en/stable/"
-SRC_URI=""
-EHG_REPO_URI="https://bitbucket.org/openpyxl/openpyxl"
+# Upstream doesn't want to include tests in PyPI tarballs
+SRC_URI="https://foss.heptapod.net/openpyxl/openpyxl/-/archive/${PV}/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/jdcal[${PYTHON_USEDEP}]
 	dev-python/et_xmlfile[${PYTHON_USEDEP}]
 "
-DEPEND="
+BDEPEND="
 	test? (
-		${RDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP},tiff,jpeg]
 	)"
 
-python_test() {
-	pytest || die "Testing failed with ${EPYTHON}"
-}
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index da47bdd1f72f..d53fe5afc3dc 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,3 +1,4 @@
 DIST opt_einsum-3.0.1.tar.gz 66204 BLAKE2B a8d2d1246e890d24ea73d129ed1ee99e8fbbca30771c96a48858acb5af5eac93bc73b9e8f1c5f1ece6e0872277de1f01fd1d0f7d27e044fa5f9de09060792565 SHA512 d6c2b95d17f523680e3f849ad2b0a4c36e7102e0540fddee365446bfddad4a26be2aed19060570ac0d1db42ccde8e15f0e7e4c066b9117024a58f8cc8978508a
+EBUILD opt-einsum-3.0.1-r1.ebuild 467 BLAKE2B a66a47c4c1c0dca4fb5ba352a272b3914362e667a5b4e844ef2dee5d4f346dc6f9e26e044ad83ef762840ce7167a05e7e4696b90696de680601765d566256129 SHA512 9a22177c4fc787d795d9590c3fc95f28f6997c1aa0dfe95a3be51318af8d1c807e6d2bba8b3647b4accbc2bd4cfca5a985cf3973a222823f9a44ccada61d20d0
 EBUILD opt-einsum-3.0.1.ebuild 465 BLAKE2B bb2aa8539690d7911c526b49a164900d6ee2145142aa94a734420f6380ef12ae7153cf908c4c2bbb09e1eb285b274d992ecf1dc9ef88f5e037cbcfbdb1d2f274 SHA512 b7816352355a75137195ce4ac6b405d99abd89afdda028ddb27fb16fff1b7eadd99c28a8d612b77afe704da87a56c533440a60955c5e6b52c5129336c2cafbdc
 MISC metadata.xml 373 BLAKE2B e60b5def188efafe8cbea965732384164a8dd735c37d065cfb9b8c3edc652dcd5b23641e11655fe535206823317e8aa9c0c2f2a624e654d511595e36ef8fc5af SHA512 5471c7592bfb2e9ab1f3c47fdb1ab2211debda6e928f2491f17a171d14c95d5faacf03eb105c94d35ab6f5e889f24cc327f5111e8ac8c11527dcca1e04d61290
diff --git a/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild b/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild
new file mode 100644
index 000000000000..cbcf6d756d09
--- /dev/null
+++ b/dev-python/opt-einsum/opt-einsum-3.0.1-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+inherit distutils-r1
+
+DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
+HOMEPAGE="https://pypi.org/project/opt-einsum/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/-/_}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+S="${WORKDIR}/${P/-/_}"
+
+BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 035beeb0f361..91ef0301a5bb 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -2,6 +2,6 @@ DIST pandas-1.0.5.tar.gz 5007108 BLAKE2B 6aff9602f8b1642af1dca70c7c596f2978bfef8
 DIST pandas-1.1.1.tar.gz 5213685 BLAKE2B 6604c7def761f8eef4596a9ad6c1afe1f59fdd6181f9cdc9edfa97939a9e668e745ebc0abd8664eda4f864be54740d46e4aa10f32728306b897e397bd6e1f682 SHA512 db93e66956d832da594f04aaa5cb895ea22f66acd0e97ad76f22153f9e872e46845dad5b952b54463ec8ef3e2a73a766eea8d53e980a5508e3a3346429a07999
 DIST pandas-1.1.2.tar.gz 5220166 BLAKE2B 3351bf0e539335b7f13dd6e6590309989c3bd5d36c0fd188808be14a147b828f1a3a14007fc499e2b5f580072b02de8587885629a8ffb1fc70b2577fbd034001 SHA512 a81e9f82b866cc48eaf55c288610b150fe3fa6ba6100c0b13516eb0ce4b569397127b85161e53454d0b2b24f276aa9806baa007a521623aad2345e7b7168cbb5
 EBUILD pandas-1.0.5.ebuild 5713 BLAKE2B b3f9cd16526e1a3e76f5bc574db1e9f39a5f6981ae42309544ba1a2b3902c27238864225630ae1c13d83a2896b082cde2a47f8dd01fc5efd03e2c7fa61a95bcf SHA512 7c364d109a4cfc9be212bd9c819008f142c253d92a30d8f6f7ef546ede9f98f01809009f90f0cc02c011afd9efa3841d24d46fc6a87368ae8a940e32df086cba
-EBUILD pandas-1.1.1.ebuild 5953 BLAKE2B 9f0b4d1cd98ca2a9ed992fb90e35d8d0c47366a7b31f4d2e63028eb0ca5626cf1296c24306551c66ee31380959fa42132635ebf7df1f0365d30926d8b23579f3 SHA512 8aa324990366dbd38efa9eb30f366ea834fef65c1ec72246493e21c7b9bf704cb4cc7bd78e6aa0b253535587ae7d11abe53959d1165c5b373543caf2861938d7
+EBUILD pandas-1.1.1.ebuild 5952 BLAKE2B 25e4f9c8097bb7fddaeffd36468c5e71cac68477280e0c7f22649853982a5ec6715c9656d9e68033f674c5513e0f09a45634feca1a8652d23a19ed897f368357 SHA512 3285f52c91b4395bd966e316793456de6b5db438baf99ca757bc0ba73a475391b3b75cb7085b23a4ba16c7f2215ca5d0fde8d06a38b207ab16fca0c66b7263ce
 EBUILD pandas-1.1.2.ebuild 5953 BLAKE2B 9f0b4d1cd98ca2a9ed992fb90e35d8d0c47366a7b31f4d2e63028eb0ca5626cf1296c24306551c66ee31380959fa42132635ebf7df1f0365d30926d8b23579f3 SHA512 8aa324990366dbd38efa9eb30f366ea834fef65c1ec72246493e21c7b9bf704cb4cc7bd78e6aa0b253535587ae7d11abe53959d1165c5b373543caf2861938d7
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.1.1.ebuild b/dev-python/pandas/pandas-1.1.1.ebuild
index fac714b52820..347189e62999 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 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parver/Manifest b/dev-python/parver/Manifest
index 5b9a76edbe2c..d66323cce5c1 100644
--- a/dev-python/parver/Manifest
+++ b/dev-python/parver/Manifest
@@ -1,4 +1,6 @@
 AUX parver-0.3-test.patch 1078 BLAKE2B d81c48c59ec2f744c70c8dfea7ff6133c652105e933f2de77e6c50c097da5038f3d753e809d2237cb840fe927986ce1cbfd2620c629346ed8f232d7d1770ebe6 SHA512 2d4a8eec787eee57be68d57f6b041e4ae4fb437767b02568b3aa258c8853461922dd7a963fde0be134dd8cbcd4578cf93ad8eba37ec55b26733cc3671984de69
+DIST parver-0.3.1.tar.gz 29110 BLAKE2B da444a77907beac0bebd2dba812c8843052e27de1b8b802b5bdd37feb4ffe1cfdcabb84a91b6e6fe21275bce22e3b43736617df756570c6438af7ffd81a1ba87 SHA512 2ea7eb7be0c58657f5261d7b4729da6caaf2fac67db3fc3f36d29627bdbeba45f6ecb0e4bb251575b621908eb1ff5fa5ede5fc2ef0e041156dcc00548fd34360
 DIST parver-0.3.tar.gz 28324 BLAKE2B b7ffed6f6e03d9409ba512fb43336fa81ce4152fa066703c1de122f709410c946a1ce6fcedf8ddbdb0c9af66d8651c597f2abf3867115d89280381c6fb1f24e8 SHA512 0b31ee3c3fc24b056a97ccb9df10dec69ca66f4690b7f01ae84fbe583b77cf713b98d207eaf7a34c2192eecdf4077121154fe9b59aa83fe4836080cae729a90d
+EBUILD parver-0.3.1.ebuild 813 BLAKE2B 720422f4cf91f64622db19f5e87a5d1d1edad857738e3a5b3eb7e57e7562fbc7ee2c988cb752f10466a9c516b406a2d59137982457c309117615a0f8237594ec SHA512 691f586330a9c0a193bc652190c74d4d4364a38c20218b54021acaddd93db3207cff4165f32e94317b8b24db9f662967d6521476a27be58fcec714b6622c5461
 EBUILD parver-0.3.ebuild 894 BLAKE2B c9e4a89ae9badb85b3ae97db8f92a2e71208b11b56bcdc67f733d4d8dcb7afd0eb31021e4c455b0ccb676020fc40bb01ce6f79c21b2cbdcb6e3584c42ef9aca4 SHA512 5447934cc17277e5354b3fa8b491d852163f72050b0d2a97abcc53c69ea4ddaf5360cd59bc16f0a59777d56bffa5828f77392471c6b88bea450e1366d7481952
 MISC metadata.xml 433 BLAKE2B 816ccc76bf4592a65bb9577c64a81ad4dd6643b8db012506a931ed8420d68d18426085f9c6f13f3bf82679ecdeda9967f612571d54c6c09c0ad795246e41cb04 SHA512 9f271e8d1fdeee78d5a3c8fefbd1f9e1dfb999fcead3ae86453f63d4d9d44d36951fd7342e1512483eabea11515c729beea1041c28cac6b7255ad33522bbe569
diff --git a/dev-python/parver/parver-0.3.1.ebuild b/dev-python/parver/parver-0.3.1.ebuild
new file mode 100644
index 000000000000..3cf5e0976c79
--- /dev/null
+++ b/dev-python/parver/parver-0.3.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Parse and manipulate version numbers"
+HOMEPAGE="https://github.com/RazerM/parver https://pypi.org/project/parver/"
+SRC_URI="https://github.com/RazerM/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/arpeggio-1.7[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	"
+
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unlock dependencies
+	sed -i -e 's:~=:>=:g' setup.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 8b5535e9ad60..0da6e1aefe6c 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,5 +1,9 @@
 DIST Paste-3.4.3.tar.gz 630569 BLAKE2B fa81b60ad048a2c999d4e57992f5a5603680bf7505f13a8618a55425b388ef906ceb2e118821d689905a20e7ec2b31d27a6aecd704f529540db6c4436f30268c SHA512 0869a3330a74cc14f88fb5ce24183328ec38fed1fc5cd669b428f09ee2fcafc770e95c2f4dc8de86dfce4d66861bad26c9502cccb81966c519ca4593ada094b1
 DIST Paste-3.4.4.tar.gz 630575 BLAKE2B 1d81efae1e1a783daf2d3fa86eb2e80cb95173a4bb182326c27471e2612b7de047bb3d98c0943aba9600f9888d760f39edd7c93ff4c16fbd4c90f68ebaa0caf6 SHA512 f977fa02b6800be27f703115b87987dcf8a1e4edd681f253b20fb363bfe625109b424ec6a0faba066e1d074f55a2ba336e17654f899b3100c9e3c3252d38b5a6
+DIST Paste-3.4.5.tar.gz 630575 BLAKE2B 2b6f08ed330fe4657bf12b4dfcc0cab95f73ec2647decaa5cb81635f7f2813814170615d1af945640f5bb2fc605f678fc20713b3016f55ad69e9e9b658938408 SHA512 cffc7a36ea880acfed6878a8865161c35263a3a056e853cf0d7c5e4dd2101d9462a4bf71a36e9f4c707c8fc11ae23ad2d0ae31080adf8614680462e489f47d3a
+DIST Paste-3.4.6.tar.gz 630593 BLAKE2B c1bfa58be8bc182878f0e67c89b09896152e1be993f301bc3ff1fd2673439146f3e95b0e2247d6c3cf43c346f67c7fdaf8a7721dfd0967f71d6346fbf62bab4a SHA512 64cf2abdd40850704060b3a07d1999dcfd05e19bf27270f7918c5c8683a4b1638d04da13d09f9f671b8acf069e26872d5932d5f0ed7022fd5cdc6bbda7602433
 EBUILD paste-3.4.3.ebuild 1094 BLAKE2B 42c35e023b4d38e2645cf89004712660142cd5860f2f65d3ee37745662dc7d4d991525a7e15c6d1068b934ad4de5cc73f3e9d1a60bc9e99e5fce64598135540a SHA512 0621ce3e077a240b7fe1f3d16e49c5ffad728502a8c3279fcea1cb53ceaa7a1575034ae41ac65a0a44145714fe9a95396f2c7539151fb9ac13243829724bab78
 EBUILD paste-3.4.4.ebuild 1103 BLAKE2B c5ad50193533d210fac4623a9de9cc8b558116e355feab4a6a495b09e7a757c09d2dce160f3079a1fba8843b1866443692ac5fd1dbcfbc058528b7e3133a79f4 SHA512 8ecf848ad049463f59557961afd799f6094b7a9f00ad765432ed89566af3739a977043ad1cf6f06bb447631ed904f3b08772154b05cf14d392ce930784240aac
+EBUILD paste-3.4.5.ebuild 1100 BLAKE2B afd13d9c10accf4aa274a5da8ae9e91717efd228ba79ebee0a03c4502d27eaefa6ff313de258b80b056c5fb1620a60788fee9713afa095aa3d058c6c71ffab51 SHA512 e9098c0514c335acd7d3ffede9e74271ea0406555526f8baf545ded1d1471cef97fa2fe99fd3d48a70a0b7c5e3675a9a4fe8352d7304633ca9c7f3dd5fff768a
+EBUILD paste-3.4.6.ebuild 1100 BLAKE2B afd13d9c10accf4aa274a5da8ae9e91717efd228ba79ebee0a03c4502d27eaefa6ff313de258b80b056c5fb1620a60788fee9713afa095aa3d058c6c71ffab51 SHA512 e9098c0514c335acd7d3ffede9e74271ea0406555526f8baf545ded1d1471cef97fa2fe99fd3d48a70a0b7c5e3675a9a4fe8352d7304633ca9c7f3dd5fff768a
 MISC metadata.xml 627 BLAKE2B 544d8a892fba33e583c08d31ff232d71c71397981b5d51f721545e9d1dae4342b68741d656d8eba8988f57eb9a6990adc2827c4f2f4a7b9262fa2be9bd9740be SHA512 a49e8e5ce28d107c97b02b00e7c0b3c260c780fc4ac7d80ea3e8163cd5a8fb44756470ad2603b0d9db312e5cd36b0039eae61dddc0339618ef0c6ee675f1ef58
diff --git a/dev-python/paste/paste-3.4.5.ebuild b/dev-python/paste/paste-3.4.5.ebuild
new file mode 100644
index 000000000000..87576606a344
--- /dev/null
+++ b/dev-python/paste/paste-3.4.5.ebuild
@@ -0,0 +1,42 @@
+# 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
+
+MY_P="Paste-${PV}"
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="https://pypi.org/project/Paste/"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# TODO: 'Address already in use'
+	sed -e 's:test_address_family_v4:_&:' \
+		-i tests/test_httpserver.py || die
+
+	# Remove a test that runs against the paste website.
+	rm -f tests/test_proxy.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/paste/paste-3.4.6.ebuild b/dev-python/paste/paste-3.4.6.ebuild
new file mode 100644
index 000000000000..87576606a344
--- /dev/null
+++ b/dev-python/paste/paste-3.4.6.ebuild
@@ -0,0 +1,42 @@
+# 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
+
+MY_P="Paste-${PV}"
+DESCRIPTION="Tools for using a Web Server Gateway Interface stack"
+HOMEPAGE="https://pypi.org/project/Paste/"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris"
+
+RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
+	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# TODO: 'Address already in use'
+	sed -e 's:test_address_family_v4:_&:' \
+		-i tests/test_httpserver.py || die
+
+	# Remove a test that runs against the paste website.
+	rm -f tests/test_proxy.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/path-py/Manifest b/dev-python/path-py/Manifest
index e82572a71ae5..9f924ef9f449 100644
--- a/dev-python/path-py/Manifest
+++ b/dev-python/path-py/Manifest
@@ -2,5 +2,5 @@ AUX path-py-12.0.2-py38.patch 602 BLAKE2B 5a836612a8fb6e85595973eedcc39720cf59b5
 DIST path-14.0.1.tar.gz 73830 BLAKE2B 7528f90708423802dbb177309b1a608bf8dd6b8b1563fcf3904a805830b1c53b76866ec8055bb8d4afda4adb88209b789aed90a33916e450748866479cad1889 SHA512 195abf3e70f3e82566653c8a1154047a8ab82b98eda09a2ae38ba8989e382fd3225fb5c772b827be54a3eafa696829afda2a0198d1bef7ee369e6dc40b0bf11c
 DIST path-15.0.0.tar.gz 73642 BLAKE2B 186b77b6571dd878a5b64b575289bb5ee549145ccd0c7b858f99c9e3772cf98f2cc7ff5da759e7fa660296abc49c053a388ad95466c51adccce2162c682c6566 SHA512 e41684c576b959e27258f60c0d8b69719c38a5a7a04d9646089aea91227781573368a08f01230dca831732ae687741d22caf52efd9a481378b8d4e77627fe3a5
 EBUILD path-py-14.0.1.ebuild 1416 BLAKE2B 855c9725a45b11734fd99bd03f5b2ecb20ca3a4aaac623380eb6121dd5302f5715b2c4e33d4136780d5b70a0d798597fb2a42d4320f7f39562ebb4eb508af5f9 SHA512 8395bb60da8df801e43581bdcd9a5b247f166e141032ee26e29714079becf7977f8f3ae713a6ff7092ec9d6980d521a6133c9c337f779e87a8313f93530ee037
-EBUILD path-py-15.0.0.ebuild 1253 BLAKE2B e67759daea90401a8b89abdfdf0434f1a140bc43d6e7b9c448c43c390237c01be3fc097cf5285eb6ba35076b2f1542180c0ff280e44c5becf8f088c91c1575a3 SHA512 dca9e206803c8e3b34d38e05d2fe35b7ec647b0a3ec771adb4fdea67164660f317c949e3f53876a8e66f02c22fff008a69d584e7adfb2de7076eb5a0c9f9ebf8
+EBUILD path-py-15.0.0.ebuild 1220 BLAKE2B 853fdab38de7c0b846b7ce1ac61b3f2dc04683e95db199b0b7c9268a5b870049e0e5f93db8c6683f657e1b69a0040f256105caf8329ef168e34f8a62a2372532 SHA512 d720de9a1124c4cfa3f2303826c260af674b88330c4b6ac11a14e46a680c724defed4592468608cc209f093ad1a5218bc771c7e2343feb3f5b5ea477eabed8f4
 MISC metadata.xml 401 BLAKE2B 5a8d84aaf65dc91b75cd7222e333e75f9bd6654ce4f9d55c91a8d28b141c5fc982b8c8a6a0b3b4f1c04fcf05fa56b13725062233961f323383110ace44089da6 SHA512 415b7917fd35598bd39c03ec7ede5e0e13266927b73647a995abb62d56004039aacebaeade95be39a265ef3944c35f3c61145cdb2100e563d8125753547bb729
diff --git a/dev-python/path-py/path-py-15.0.0.ebuild b/dev-python/path-py/path-py-15.0.0.ebuild
index 13c63b0ca9e1..1389d65eb266 100644
--- a/dev-python/path-py/path-py-15.0.0.ebuild
+++ b/dev-python/path-py/path-py-15.0.0.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-python/pbr/Manifest b/dev-python/pbr/Manifest
index 62d2eb02c8e0..5c1b1b9f1829 100644
--- a/dev-python/pbr/Manifest
+++ b/dev-python/pbr/Manifest
@@ -1,5 +1,5 @@
 DIST pbr-5.4.5.tar.gz 120510 BLAKE2B f0f22a25e41820a0848aface6c241e38d8c4500d14ac3c8abf3d3b5f3f2d88680505d43f045589d700e9c07ade1643712274b156832246ca3f2050f44e4cda26 SHA512 b53ca10b7af7e365ff99ecf11942d3f047112d69f7e963716d07bc156077b08d79bb708bb93aae342e5e03c83278507b6990137dc34d0ebc11de53bd57ab3654
 DIST pbr-5.5.0.tar.gz 117967 BLAKE2B cc3f023493150f0687ede07ccadc3abfb4a8dc5e0cdc0f9fd946d3a28fe2cf496683f37f934a5555875b5ac0546a0c0ed99e1bc2f7be53b47ec68d64d27cb78a SHA512 ce187787d5a51700d854790b329274aafd7d4f9e724b1b69b5ea8684cdc58c738274d30fd85bb890671bb77f2c7c88ccb488ea11df7ae9fd0505b4dc29292889
 EBUILD pbr-5.4.5-r1.ebuild 2296 BLAKE2B 0b406a9dc60649b7506a02b34854927529d6815d0e9ecbd06668a25af601bfce81b451407f7403102fd9f001aeb17dd4083d22585f3dbe7ff59417a22c0c088b SHA512 07fb007759938be0866bb33a75c346a889f6df35651210e5ab5785efb53d5627d2f4544de57d81ef075b99593901b6b9c377dd93f7ad11d9b860ccdbc22fbb28
-EBUILD pbr-5.5.0-r1.ebuild 2120 BLAKE2B 13de15d7a4fc9779ab19418c4fb7cbfe316c5e92ec856a5dae2e0e618276b4c0717cb040940ad09895c60de482920e98f9173ea4a2438956de08ce50fc09b0f2 SHA512 f14317f1668fecca804999b43825d41eeff01d4d78747b0d5829937b51d171f1df5ae125ec5585fdcb6533011e33329f311d240d7608c426c36b2a57adaf44c9
+EBUILD pbr-5.5.0-r1.ebuild 2127 BLAKE2B 066c4f0655f574a9301f682be45a782e53530d1ddf23c44871729284d4a2ab90c5ddb63847e486b1b4f2b3aaed99d5a51c4abe367782cb47f5710a47f561f0b1 SHA512 391bcae51e982bfd629580989e544a21707894e305c8d686bf8fc30af590211a042ee945e5f0c2b663ffb31959cbea35bf1afab7181ff514a8f388e84feda31e
 MISC metadata.xml 818 BLAKE2B b3ed054273dccfd8cd24f2e86e1505be70445aa45d193d37c30e6f5abcfcab489d59cb6a1e11d54cea70bbbcd152d9a208dc32237058537b99061172f573b868 SHA512 3d21678a6769bea88b901391d5df75882798e49ab5266ab7d5a73282c30793e479ebbe24cbb5b7d35ad19b517996e52243d238632a390f136ff30f77f54436fe
diff --git a/dev-python/pbr/pbr-5.5.0-r1.ebuild b/dev-python/pbr/pbr-5.5.0-r1.ebuild
index 7e7e611dcad7..09ae1032c9e7 100644
--- a/dev-python/pbr/pbr-5.5.0-r1.ebuild
+++ b/dev-python/pbr/pbr-5.5.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pexpect/Manifest b/dev-python/pexpect/Manifest
index 4d657ae7dd62..93089b548da8 100644
--- a/dev-python/pexpect/Manifest
+++ b/dev-python/pexpect/Manifest
@@ -1,4 +1,4 @@
 AUX pexpect-4.8.0-sphinx-3.patch 761 BLAKE2B 609849b3587cd5eeada58ba5065111f3d5d38514d525c49682a9554fe5b21c4b5994ad3cc70725c1a73e19daf03c66644a7fa0ac880d87e912620263396df3d9 SHA512 d6cd0c3554c83c0092f46a2254dbe1752773abd76c220e0eeecd4a416f01ec57ecd51f26011e17d03537746d24f913472467d9ac8b569bdc168b6975292b4cab
 DIST pexpect-4.8.0.tar.gz 157037 BLAKE2B 742642bd6b9ec3f6cdfad054d4fd22db56b4a55b746d675c27a8cdf824ea749ec4589e296dffa08778195f3ccd20feb56bc0fd5212984396ea5aa0555c41ca96 SHA512 7447ae2d1e13be422c894a8fd51c5aaa788e37ea7f0c798c88b77afd401fb3631400a637077ccbb83c2e3876b0d0c5e1dbd5fdc9d3739d785b4d5ad7c0192580
-EBUILD pexpect-4.8.0-r1.ebuild 1260 BLAKE2B 55a81c13d04a7a308f04c7c621cd97d87bf8ff98b848634797304a8b78c147df049c5bf405bb65c4f3cd05460c306ccfeafda66de241945c1a99618641744c6d SHA512 4a8c32048b25f0a4edbfe94e746f49d20316aafc48799dff9690743b840c422eb9bd3cd3e10025e4a708acfc1bede2f86f084b1abe845e73a78dc3391a67d7a2
+EBUILD pexpect-4.8.0-r1.ebuild 1288 BLAKE2B 6987dcbfe95d60957b3a08d9ed4202d80dcae53ceed33f01d8ab91a002215a8438aa98db3f2bf338b6da6eb9b56ffa8b798c2f17118999f8adffc9b177278dc0 SHA512 d4c92b79623257e1e92a519e41526a0910f8f345fe50a630ac517a5086993248aade656811318bbf8f4c507206901ff5068e91cd81d17978b441633064921a16
 MISC metadata.xml 402 BLAKE2B e6c1f9d8cc5397177b54d7bda059a281267e005b9391e6d18e3b70ec3e6fd09bbdf1d214a105e608e3a43f34f0f6e5d7e924366e33647fdfc7d68283c8749d06 SHA512 bd48e666243651d02523b111ee7d8073ed10b8813765f19c7d17e12b7b84bf58be03a157486fcaa65f34866a983d46885723d944348a0cc16b9bb05cc474ffaa
diff --git a/dev-python/pexpect/pexpect-4.8.0-r1.ebuild b/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
index 8a77f172f4c2..9421d5c0fbc0 100644
--- a/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
+++ b/dev-python/pexpect/pexpect-4.8.0-r1.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
diff --git a/dev-python/pgspecial/Manifest b/dev-python/pgspecial/Manifest
index 52ca9bd1c215..141c23f2e5e0 100644
--- a/dev-python/pgspecial/Manifest
+++ b/dev-python/pgspecial/Manifest
@@ -1,3 +1,5 @@
+DIST pgspecial-1.11.10.tar.gz 45560 BLAKE2B f4554eb812fadad984f746e8035a7a91f22480321df920bd15b96239c571c13cdf397ea38ea122f0a73167924a902955a1eb50dc865ba1e4445324358c3e3cef SHA512 452f217055873d3d1acff6b9b5016a3e721bffd4349aaa975aefe3ae1e25ca576f90eab13e7f913ebbfb796ac7b81dd8ed63c8e6d055c2ad7f8fd9d72ca8c21a
 DIST pgspecial-1.11.9.tar.gz 45009 BLAKE2B 3ae53d4225d448c3291d6701caf7388023d140678461a5811673c7cc7ed242fb0c18ea38427210366f58f1886894def348051469c23aff20be7abc5e5c96622f SHA512 b07083ed715a6ac3d1b32ac954b83852fcb154f4b2757fae91ce7c35524576fa8caef5cb7201d313eac783bc956ea89c9d68f099a11c332486d677dfb185caca
+EBUILD pgspecial-1.11.10.ebuild 638 BLAKE2B 907634b51799a7e46a08149ab962d6965cb9624e792fe722bf70a965122b2758d6d646762f3070b0d534e0544531a1c563e1190247ced3f05a232159ff7dc553 SHA512 26229aa2328883bd4ad613eaf9c4e4a3180c6478506623411429057406cd3c0f3e2b8fa0f047ecf412b4d4c71f98a8c6205faa98bc06edb64262544bc43dc936
 EBUILD pgspecial-1.11.9.ebuild 592 BLAKE2B c548518a8ea514a966c18745685cd35ab84ca681b83f1a3b32eac83dcf665fad182a8b2f745784bd3ac864da9a3422f8db291004becc8ee95a148ce08882cb61 SHA512 d95232a3a5c7773045a725b5b06af4c3370ff8a669a0a725bd6b2a0743cec4239669d41569f8b223487bed6447fda907ee74a1d676a2305acb2c24f0b1de1596
-MISC metadata.xml 252 BLAKE2B 3ef06410049f2fb424b0c05625f4713d633f0f56755817017edbb6dd335b73ea5f7d74c9d5dd4264ee1afbc4b44e425d062d026a12da84ccc1ee764e08de2036 SHA512 c4cc955c7e074d7173b983b935f1c1628d5d90c7eb640a7663b87509c8b68668cdbea2cae7b48add16ebaacb00dd178281b5793c181dd719537cf8b7b1412062
+MISC metadata.xml 634 BLAKE2B ea219e5ff71cf035dce0ac8a9159e8efa396b940ff0c1daf9e29cf820685107a3ffd074dbe5af26c8f690a0d42364ebedc68095ca04ca8622250e67089b7c714 SHA512 d2df8be3ddcc1fa7c21ece2d708efb3fd23af587a5766b922398f6e4bb1c2b37137e0613168fb2629e2979623bac7ac6201bf10cf00ccb66da5c3881d5b3f69f
diff --git a/dev-python/pgspecial/metadata.xml b/dev-python/pgspecial/metadata.xml
index 7afccfdce85b..aa7641b8040d 100644
--- a/dev-python/pgspecial/metadata.xml
+++ b/dev-python/pgspecial/metadata.xml
@@ -1,7 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>andreacerisara@gmail.com</email>
+      <name>Andrea Cerisara</name>
+    </maintainer>
+    <maintainer type="project">
+      <email>proxy-maint@gentoo.org</email>
+      <name>Proxy Maintainers</name>
+  </maintainer>
+  <longdescription>
+    PGSpecial provides an API to execute meta-commands
+    (AKA "special", or "backslash commands") on PostgreSQL.
+  </longdescription>
   <upstream>
     <remote-id type="github">dbcli/pgspecial</remote-id>
   </upstream>
diff --git a/dev-python/pgspecial/pgspecial-1.11.10.ebuild b/dev-python/pgspecial/pgspecial-1.11.10.ebuild
new file mode 100644
index 000000000000..1f8952ae4e42
--- /dev/null
+++ b/dev-python/pgspecial/pgspecial-1.11.10.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..9} )
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of PostgreSQL meta commands"
+HOMEPAGE="https://github.com/dbcli/pgspecial"
+SRC_URI="https://github.com/dbcli/pgspecial/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-4.1[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.7.4[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.1.19[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+DOCS=( License.txt README.rst changelog.rst  )
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 4966cd3f9b2f..d4e666fc4cb7 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
+DIST phonenumbers-8.12.10.tar.gz 2254112 BLAKE2B 1fa0faf7347371a548b5e890e3cf8ba9daa32275670f40f7efe507ecfa817a3c372d5b47f2b91a1366bb519657447a614d3579bf69ba3249255c579e37ae883b SHA512 14fcdaa76a61624db2c4d4290a3df27252d985f889b8fb29c80971b88b502a5fe74efa0a110ee3ec92459b8d6a1ccc03dd5eb211b6addad741c9bb7527d5e600
 DIST phonenumbers-8.12.8.tar.gz 2249617 BLAKE2B e02f851774bee9806f01b0359ea4e159c8c890a815edf45f19162dc35972aaa3c84f9e2e19a51ef3efb053d4e307a4d3a31b664a7fffc7c4ffe9a7c6c281ae86 SHA512 0897a5298b5aaee7c0775e12cbe35a6e25b85a1836d8302abc5eee7e327fc559bc06f3130c63ac5aa14207900d1615f3a7cd4137d6561855e4ad38b6e4af220f
 DIST phonenumbers-8.12.9.tar.gz 2250397 BLAKE2B 06b3f8beefe3c1e5cfa4d0f9bb550f40e568692f711513784001e9bad9d3805adc42ba0bdacfa292935239c6bcb47e4723a72da160efde21269308329299fce0 SHA512 0f1de43bd56ca05920721cc9639249bffaa6516f4713fc54b53491e4ffecceb357a26cd9d6126ea9e91eec1bb1fb4bf2003f95f1d62f61ae2f1275e0dca58e29
+EBUILD phonenumbers-8.12.10.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
 EBUILD phonenumbers-8.12.8.ebuild 433 BLAKE2B 05a63352cb4e9522f74d8bedc829b3f01ca7396c2cafd311ccec56a4079539d9c6784abea36076454ddc5fc27911323130cda292240e3f18b5510f085e0c8cfc SHA512 58baa6deb1d024174a2d019e63420ed0a33817234b643530ed9006e62644873540fe8f8dc4e0fec7152fe153e0709db6d8e66b91c216980dacea323f6dcd6f5a
 EBUILD phonenumbers-8.12.9.ebuild 435 BLAKE2B 79b981b633b68fa232f0c431dbf4a180c9d4596931386e69046e2850e6f7aafc05600776af068613cbfd54484ecb2c5a3ee0653afd0338f12a18b43aeb9d6653 SHA512 e3f59e06254641b3ce2d4433ec1b1a74f786d0ae4ffcc1a407e30c8f4ec57f539925fdbaedbdaaf71ff4cecc9bcd95651f3b876affbf9e86c5b99546a122c17a
 MISC metadata.xml 517 BLAKE2B fbbefd64340f179046eff07f02cfc01416d9c99817d8bd4061aa908eaabf59560e704e40876b5d514389766b26697ee811a1a4ef9ee5a306790156892f45e8d1 SHA512 5246cff049767fba3892ae49499127453cc26806d3eca35de98012c71df29cca4192d104810ea21921a1160e736a2225e3538e829016d9712a0b489be0e5a17b
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.10.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.10.ebuild
new file mode 100644
index 000000000000..4d3183b1591b
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.10.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index dcf29b6e4a9d..55febb000aff 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,13 +1,10 @@
 AUX pip-19.3-disable-version-check.patch 872 BLAKE2B b0398674f56b78a066c4308f0a8ee0272c5c4c3cb569e6c300ac62fc9fbe8ec2a1bfe257047c15ddcf9cc44c47b7f8b9ab99e17b722bd6ae4cf9dc2a168e01d6 SHA512 1ece773f66556e4380eabf76490430e8fbec23f7cfad27dac02c7e49f7136b632515ef04843e89dfae42c095dbf5280d64e61da1544801c998f802aa59be8e22
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
-AUX pip-20.1.1-test-endian.patch 2779 BLAKE2B 63fd87aed4edb8c9cf5c64b3055c345234602a9dafd0b58b501bd30f5026ebd683720a9ad2931bbb9db2c35841fe6cac19a88a5181b195c9f0a4e4e590b18094 SHA512 21f52dc64746e5d8e5c0d92c3f9b6a75da0316eeafad49fccdbd92c8b560e083d4ffedf148590c6f4265cc367a67b8e70890c14d0f718934f4ca4ddea82bdf50
 AUX pip-20.2-no-coverage.patch 6154 BLAKE2B 743dcacd3107d9c6447197dd01bc85b1b16db5b1da3bf5f84e73801e645848a98854f350d958056eb17aa6b87f8bb2557a27e3bd78582958c3b37cb6ce61d7ce SHA512 67ea11c56b6a7b02faae28c9d941015ca2ba9c125dfcaf01eeaba7717cfb22f23fb84c28f993202f7b648ee64741baaf7545e9951be840d378e39d3af0a60fd0
-DIST pip-20.1.1.tar.gz 6503229 BLAKE2B 5b0409042c970ec47fa6f947b21a53aca43563a6bb442fd5f91788fa97caf7167a84b4f581de87453eb0e55657d2ccd11dca2d1815c3bfe9ef5923994306a6db SHA512 ee7b0345c08fbe0215811d07b4c57c1ceece826871842f6d1c174d82e8eee0ad810aa5413d6763ecd5a513e151792a53c36623ab99d2049555ef2542d32d1658
 DIST pip-20.2.2.tar.gz 8719081 BLAKE2B 642a8e9b2f7c3dc08b7e8f7874b7d1d988622f50b9430939060c3b9c086ae7bdaf4a58e9709376e0d36411fb2b492d4e44ddb6282f1fe12d7c8b9ecfdb1c0482 SHA512 0b000977f169900eebd4afeabfc7bd59b104246bbb048ce5b4db7f701e20ef1caef22c7ca2311843eafc4a37abbb81a74beddddf655eeaf2e33e3949d5a811e6
 DIST pip-20.2.3.tar.gz 8719284 BLAKE2B 280637627750302b11828f066b949df7a8d38c6fbdb7532a41eed0d4bd5b83a24ec717e9f57ebcf9d246a0c5aeb272bdaefc9299926dfe308ce20b84e82d81c2 SHA512 b2f7c6b2d5b0c3d743fa8b1061196f8cedf7f106e0cb87507070f1d930d1f1c8a875c800b2d1f7be5b9cada1ba6d3e5b2d7e2f3bdd42e43fd5147536ec1bdf48
 DIST setuptools-44.0.0-py2.py3-none-any.whl 583230 BLAKE2B 823e6792471660f247e30a938aa869d345a63db7294e5f9b4bd88f15a7694779011d29740fe317149620985f705fc6e18cbb07a18e5680cc11d7c229ffbc74f6 SHA512 7006fd303181afbeeec0e30cafb9fd1e4d3c6f55cfdd6343fedbc32b17dbb96b3d96ae37f4db27bfb168738727474cf425904ec280ff1d2b789fc48077a8fa84
 DIST wheel-0.34.2-py2.py3-none-any.whl 26502 BLAKE2B 3a1bd4571c582245b60ff33c9bf74ff8a2ebafb26e56fc7b9bd215058d059b6bd13bbe21ce46002af257813a54126f27e19253f211e21c4548c7cf84cd15caf7 SHA512 4f1a44f4691ed8baad777d7874f7f4da96a5019eb485fd3a9eed9259aa2a9d5acccc6dc63a72128664347c64ee039a6076c6ca9c3b75a1f94457967864e522ed
-EBUILD pip-20.1.1-r1.ebuild 4075 BLAKE2B d91549b341b0b348162612e3d06022c441225b38dd8d0b8383150aa55b3077928bf1a670299fdbff06f240511c0b26a5f9f9f51702053bf04867fe69268b636d SHA512 f61c586e14567dbce823340cceccd75d8d8adde3f7df8a9ab10a0754e7c071047b3b2b64c3b6dc10dc3d8f012f0ca6e2dfc0ad93f370fe0300422af3bd1aadac
-EBUILD pip-20.2.2-r1.ebuild 4154 BLAKE2B be5d200d5d4e52020152f4fbdd3f43e2b4b3841a02a8fde9396c10c340ab1d612192ca549c847094f63b7fbd12d7b58b2c50228cefd23c069c0648337ae33fed SHA512 d393a995f3c554f96d0f7a95bb97bde714bb173bfab67cd19312ff47ebcc134f91fdaa1a60c174aa0c0149ebf6d71904b38f96ae1c66d7a02b12fdf9bab2af83
+EBUILD pip-20.2.2-r1.ebuild 4152 BLAKE2B e91199206e94eb1b3a83a9aecb20d53660fbf118963ca7f07cea0093a1176ea9aab450fdcff1f2984a77743847ca0fc08aa67bceb43eb75608ab0cc1217c7ef2 SHA512 8f9e73d690d8e318038891ee42d0b1550eeac5e66cc7d0a09ddd4b46b3c27c5d2eaa6ac6d0e509ee29f9a3f4f6d90f7b0319eed87a1e45e0bb44fb547b63db02
 EBUILD pip-20.2.3-r1.ebuild 4160 BLAKE2B f47df62e17beb0f818f07f6cd3387c3a716a8f99962eac5c13744d730e2990468c6871d69ca3aa971efc69ae0abbaed6ef7f00cbce1f9774f0a3a31bae7b4c10 SHA512 f11ea8026b81fad0895cc8b0a2e85c9a5e4a4ecf2f3662b192f46167da35ff78ab054238392acab18572a35e1850e75e0886752e64afc7d7aa34955ee946b0fa
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/files/pip-20.1.1-test-endian.patch b/dev-python/pip/files/pip-20.1.1-test-endian.patch
deleted file mode 100644
index b6aea145656f..000000000000
--- a/dev-python/pip/files/pip-20.1.1-test-endian.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From b30dd1e04e1f37901733f1be0a5a1e02c466ad0c Mon Sep 17 00:00:00 2001
-From: gutsytechster <prashantsharma161198@gmail.com>
-Date: Wed, 15 Apr 2020 19:54:48 +0530
-Subject: [PATCH] fix(tests/unit): Update tests to be endian safe
-
-This updates `test_path_to_display` and `test_str_to_display__encoding`
-to use the endian safe expected result instead of the hardcoded one.
-
-This fixes https://github.com/pypa/pip/issues/7921
----
- tests/unit/test_compat.py |  8 +++++++-
- tests/unit/test_utils.py  | 16 +++++++++++++---
- 2 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/tests/unit/test_compat.py b/tests/unit/test_compat.py
-index 1f31bc5c..b13087a1 100644
---- a/tests/unit/test_compat.py
-+++ b/tests/unit/test_compat.py
-@@ -2,6 +2,7 @@
- 
- import locale
- import os
-+import sys
- 
- import pytest
- 
-@@ -91,8 +92,13 @@ def test_str_to_display__decode_error(monkeypatch, caplog):
-     # Encode with an incompatible encoding.
-     data = u'ab'.encode('utf-16')
-     actual = str_to_display(data)
-+    # Keep the expected value endian safe
-+    if sys.byteorder == "little":
-+        expected = "\\xff\\xfea\x00b\x00"
-+    elif sys.byteorder == "big":
-+        expected = "\\xfe\\xff\x00a\x00b"
- 
--    assert actual == u'\\xff\\xfea\x00b\x00', (
-+    assert actual == expected, (
-         # Show the encoding for easier troubleshooting.
-         'encoding: {!r}'.format(locale.getpreferredencoding())
-     )
-diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
-index 7d74a664..ebabd29e 100644
---- a/tests/unit/test_utils.py
-+++ b/tests/unit/test_utils.py
-@@ -375,6 +375,18 @@ def test_rmtree_retries_for_3sec(tmpdir, monkeypatch):
-         rmtree('foo')
- 
- 
-+if sys.byteorder == "little":
-+    expected_byte_string = (
-+        u"b'\\xff\\xfe/\\x00p\\x00a\\x00t\\x00h\\x00/"
-+        "\\x00d\\x00\\xe9\\x00f\\x00'"
-+    )
-+elif sys.byteorder == "big":
-+    expected_byte_string = (
-+        u"b'\\xfe\\xff\\x00/\\x00p\\x00a\\x00t\\x00h\\"
-+        "x00/\\x00d\\x00\\xe9\\x00f'"
-+    )
-+
-+
- @pytest.mark.parametrize('path, fs_encoding, expected', [
-     (None, None, None),
-     # Test passing a text (unicode) string.
-@@ -383,9 +395,7 @@ def test_rmtree_retries_for_3sec(tmpdir, monkeypatch):
-     (u'/path/déf'.encode('utf-8'), 'utf-8', u'/path/déf'),
-     # Test a bytes object with a character that can't be decoded.
-     (u'/path/déf'.encode('utf-8'), 'ascii', u"b'/path/d\\xc3\\xa9f'"),
--    (u'/path/déf'.encode('utf-16'), 'utf-8',
--     u"b'\\xff\\xfe/\\x00p\\x00a\\x00t\\x00h\\x00/"
--     "\\x00d\\x00\\xe9\\x00f\\x00'"),
-+    (u'/path/déf'.encode('utf-16'), 'utf-8', expected_byte_string),
- ])
- def test_path_to_display(monkeypatch, path, fs_encoding, expected):
-     monkeypatch.setattr(sys, 'getfilesystemencoding', lambda: fs_encoding)
--- 
-2.26.2
-
diff --git a/dev-python/pip/pip-20.1.1-r1.ebuild b/dev-python/pip/pip-20.1.1-r1.ebuild
deleted file mode 100644
index 1d87f8aac745..000000000000
--- a/dev-python/pip/pip-20.1.1-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
-PYTHON_REQ_USE="ssl(+),threads(+)"
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-SETUPTOOLS_PV="44.0.0"
-WHEEL_PV="0.34.2"
-
-DESCRIPTION="Installs python packages -- replacement for easy_install"
-HOMEPAGE="https://pip.pypa.io/ https://pypi.org/project/pip/ https://github.com/pypa/pip/"
-SRC_URI="
-	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	test? (
-		https://files.pythonhosted.org/packages/py2.py3/s/setuptools/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl
-		https://files.pythonhosted.org/packages/py2.py3/w/wheel/wheel-${WHEEL_PV}-py2.py3-none-any.whl
-	)
-"
-# PyPI archive does not have tests, so we need to download from GitHub.
-# setuptools & wheel .whl files are required for testing, exact version is not very important.
-
-LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
-SLOT="0"
-IUSE="test -vanilla"
-
-# disable-system-install patch breaks tests
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		dev-python/csv23[${PYTHON_USEDEP}]
-		dev-python/freezegun[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/scripttest[${PYTHON_USEDEP}]
-		<dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}/${PN}-19.3-disable-version-check.patch"
-		"${FILESDIR}/${P}-test-endian.patch"
-	)
-	if ! use vanilla; then
-		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
-	fi
-	distutils-r1_python_prepare_all
-
-	if use test; then
-		mkdir tests/data/common_wheels/ || die
-		cp "${DISTDIR}"/setuptools-${SETUPTOOLS_PV}-py2.py3-none-any.whl \
-			tests/data/common_wheels/ || die
-
-		cp "${DISTDIR}"/wheel-${WHEEL_PV}-py2.py3-none-any.whl \
-			tests/data/common_wheels/ || die
-	fi
-}
-
-python_test() {
-	if [[ ${EPYTHON} == pypy* ]]; then
-		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
-		return 0
-	fi
-
-	local -a exclude_tests
-
-	# these will be built in to an expression passed to pytest to exclude
-	exclude_tests=(
-		git
-		svn
-		bazaar
-		mercurial
-		version_check
-		uninstall_non_local_distutils
-		pep518_uses_build_env
-		install_package_with_root
-		install_editable_with_prefix
-		install_user_wheel
-		install_from_current_directory_into_usersite
-		uninstall_editable_from_usersite
-		uninstall_from_usersite_with_dist_in_global_site
-		build_env_isolation
-		user_config_accepted
-	)
-
-	distutils_install_for_testing
-
-	# generate the expression to exclude failing tests
-	local exclude_expr
-	printf -v exclude_expr "or %s " "${exclude_tests[@]}" || die
-	exclude_expr="not (${exclude_expr#or })" || die
-
-	local -x GENTOO_PIP_TESTING=1 \
-		PATH="${TEST_DIR}/scripts:${PATH}" \
-		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
-
-	pytest -vv \
-		-k "${exclude_expr}" \
-		-m "not network" \
-		|| die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	# Prevent dbus auto-launch
-	# https://bugs.gentoo.org/692178
-	export DBUS_SESSION_BUS_ADDRESS="disabled:"
-
-	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
-	distutils-r1_python_install_all
-
-	COMPLETION="${T}"/completion.tmp
-
-	# 'pip completion' command embeds full $0 into completion script, which confuses
-	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
-	# This trick sets correct $0 while still calling just installed pip.
-	local pipcmd='import sys; sys.argv[0] = "pip"; import pip.__main__; sys.exit(pip.__main__._main())'
-
-	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
-	newbashcomp "${COMPLETION}" ${PN}
-
-	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
-	insinto /usr/share/zsh/site-functions
-	newins "${COMPLETION}" _pip
-}
diff --git a/dev-python/pip/pip-20.2.2-r1.ebuild b/dev-python/pip/pip-20.2.2-r1.ebuild
index f171089bb627..9288626db89d 100644
--- a/dev-python/pip/pip-20.2.2-r1.ebuild
+++ b/dev-python/pip/pip-20.2.2-r1.ebuild
@@ -25,7 +25,7 @@ SRC_URI="
 # setuptools & wheel .whl files are required for testing, exact version is not very important.
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 SLOT="0"
 IUSE="test -vanilla"
 
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index 520f68142bb2..43e9e817a5c2 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1,4 +1,4 @@
 AUX 3.6-picklefile-IOError.patch 681 BLAKE2B 2aacef3639c9ec920d6cfc5e56ead129234d54019757a4c816c48c563789e119e6148ed409e5432ccdd763b62ad83c1359b63faf8432326ef8ebf4c93fa564c3 SHA512 6dce69df1cc538ff9787cb70617437ac36972b68a998922123bd4f0529dd6f155befe4104741e704e7e8a1ed8822f2e99580867bbc894fc57896aad4130c317b
 DIST ply-3.11.tar.gz 159130 BLAKE2B 58c50b9dad445ad83a64aaa8174ed4602b36f5c8df33a7d62590a92388c4a21c9800599c1d4e4db6f02630e8dee4c8482611e26498e4aa8ccdb2cf3453ae1db4 SHA512 37e39a4f930874933223be58a3da7f259e155b75135f1edd47069b3b40e5e96af883ebf1c8a1bbd32f914a9e92cfc12e29fec05cf61b518f46c1d37421b20008
-EBUILD ply-3.11.ebuild 1082 BLAKE2B 8c1b0b4c1fe710e8d12748d4313483020f6e6a647162e9885b596d66d18e02f1d457ba54be9db6588e0764e283ecfa70164cb8aa6c91f5f65f00ae362fa94907 SHA512 757e9e7e47151af5d44fdad9d4775fcfed34950b75dd4016f4a162b7198b182ca79904b96f059fcf2c13e24a7eb359096962f961a02bfdef9018e0ada5dbaf63
+EBUILD ply-3.11-r1.ebuild 1072 BLAKE2B f23a0cb121ae5cdfca3556526a100fb870e3b33ecf0ba5924320d138ad2ef0b629fdd6351fbc1dcc3337ae908ef7dbadb8ba124a152f576c321114328de0ba27 SHA512 37a0d0a7e2cdeb52542b763407a967a69f91c17b9d7c76ba24ae40a7f7551a49a449fda2e92f15e08a2e6a95707a8bd881e372071326a8cba271c3c1c8abf17f
 MISC metadata.xml 1418 BLAKE2B df2c9fa5b1d9a0b7779fd72b390d4509f83e1ca4c49f3d64dd2c0b440d2f583c0b936535eb2c15bf323e649cacb4f1bd72bea797bd51afaf611fd8fa6490ae78 SHA512 92a5a470227858726239f537b3d8559e29d589a8aca0f1d43b8a1ee3ec00470117efb45275b5bfc0ab6d0678863db50aadd36aec326978e7a3e858c0b0be41dc
diff --git a/dev-python/ply/ply-3.11.ebuild b/dev-python/ply/ply-3.11-r1.ebuild
index 464e6b1233c2..f96ca8e95cf5 100644
--- a/dev-python/ply/ply-3.11.ebuild
+++ b/dev-python/ply/ply-3.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/process-tests/Manifest b/dev-python/process-tests/Manifest
index 8f64e7c5c5ef..8b3be8b03486 100644
--- a/dev-python/process-tests/Manifest
+++ b/dev-python/process-tests/Manifest
@@ -1,5 +1,5 @@
 DIST process-tests-2.0.2.tar.gz 4815 BLAKE2B 14f2b2e266fd7365c4c1382a608ce641734c34c5215131b45b895a6d1d72591c2396332d1483f006ea7333a30993fae98d25e1a95cd58b38995d949c395da035 SHA512 6cf64d14587ab577a0680760ab6be146a60590091a0bbd6fb35d5c06ddf5289fa4d873c5658f882313837291b70adb37a3e41c13f1fe541777e05f5e9dac1750
 DIST process-tests-2.1.1.tar.gz 11522 BLAKE2B 6f6b97da73f1e4f449c3c7f85a6d860611de57e78cb57c352ea4563be07d7866a5c44107fae0ecfaad24b262c933806b59c2c9218be959b2576fc0d8250da4b9 SHA512 4bb520074a9964d3eed4aca7a1952bf1a0d99b475f3f61b5c51137d8f2e804352639187da5b5ff30ea8739466200eb9361e77dc3c43a20d5ea418f63a2765a1c
 EBUILD process-tests-2.0.2.ebuild 628 BLAKE2B 7c365f149c1bc8ca2df6440a9651fd7df2764962289f40a3f7459b2b8774be5398b94cea0a5df633528d3995d7a0f7823c44eb4b9a917a9a0589a34c05c4647f SHA512 5a106c5d5295afe8b283dce39c44222351100cbff55f4696b1e7af3db802170ba84800577360f5bdff262dc11527d4bde545ddd33055c0b14847c34cf755efe9
-EBUILD process-tests-2.1.1.ebuild 644 BLAKE2B c7044748399003ed13be8e779d4b65ae37043503ae2febb8634f381e9d37c0a916c145784200f4990d7a52ed7c9152cbac6dbb2bf19ebe67ab0558cea2b5b064 SHA512 012fef9e44178df7c40a4145ca79ecd5c04ef3f4c1140c7a2ec89f66eca10a9018f006a11c235163905d40aafb48c1f56ce9338be9035e6fe6e970bdc68538b7
+EBUILD process-tests-2.1.1.ebuild 636 BLAKE2B 0b0ed718a847ddab81450d142a7a46cb119c729597b078d8b4f4aa5a7d12e207030d2a627303452c841be3f506b1674d1171b71ce9aa397440c64de187a93472 SHA512 cf3d02f0a3761b79b68e57f9dda299469849ccb71b415976066e2bf03a082acf1032a800131d6c01bf3319e37b69c5a9742f0bfa621a3c54ca752823e3d4a6c6
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/process-tests/process-tests-2.1.1.ebuild b/dev-python/process-tests/process-tests-2.1.1.ebuild
index bd0aebc70432..583ac5f99d58 100644
--- a/dev-python/process-tests/process-tests-2.1.1.ebuild
+++ b/dev-python/process-tests/process-tests-2.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 # There are no tests at all, under TODO
 # see https://pypi.org/project/process-tests/2.0.2/
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index 8a57c5623080..45820afdc7ce 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -1,10 +1,11 @@
+AUX protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch 888 BLAKE2B 25d486e8ccd60753f372fb708bb66ef2dd6358cf088f84ea58d4fe6889bc31276930bb5d8fb5538b5a25d621959cf197ce9cd9d27299df05109432197c32c2ff SHA512 4ed96d0608146e268d717709d7d00272b306ce78dc91d715d35d0901a545dd58873ff40f903b42d46362deeef6bdeb0c2a34225f7c3fb4798d352e54fdf8c344
 DIST protobuf-3.11.4.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST protobuf-3.12.2.tar.gz 5309688 BLAKE2B 6f04ab75a165d8135b4c1de210f8698f56f309f73d664192209de10580e0ef850bf56f6f394b860f21912e341141f7bbb1f63198eaee55fd7ad74d86b00c3b1f SHA512 84a349a1dcb5bce6a6a892cf11264390b557ed1e7b05883b71fa9cfb7460d9f73119da1f2861066869e33c752246ea438d5ce2c2b3ff7a4b07696d9450b7916b
 DIST protobuf-3.12.4.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
 DIST protobuf-3.13.0.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
-EBUILD protobuf-python-3.11.4.ebuild 1557 BLAKE2B 4a81edccba9763452cec9166535bda9bfdef9b65d044d4151eb8f48bda036cbeef61a81cf7ae8dcb35a7df5bc031c5bc169fbf972098aec7f792c8db8e1964a9 SHA512 c3581654a93005e894d071a30a197358fe0643ff0a462a8fe2b21ceb6b27b208099251a3ff61af617c5ff443d0d090c9f2e8744c4eae6d9c8b542465ab4850c6
-EBUILD protobuf-python-3.12.2.ebuild 1558 BLAKE2B e752981210ab066a3f8a45f7db34174796b12c8c70371f2065818abf1ed0077c2973b0af7baa49363986d9c552a0994adad3f2c03faf0572ceea28d18f889703 SHA512 608783436fad1e86117c985ca8e1065f4212a3a20ae7df333e560db93fdd33a04e17fb7667a413daa2064b62830542dfdcd34c28357d51b62a70acdd94c0cef9
-EBUILD protobuf-python-3.12.4.ebuild 1566 BLAKE2B cc05b4213196c3b14186cfa0f5b0c879ff8245793e4853837b098cf7793edd60b5443d58e4562bafd9e451cade4b4920353ec988b15fe9c346eeb8156945dbc7 SHA512 a08d31ad529c83aec7809ae2f3dbf2d1f12a0c7308037a6864b9d8cca246c9685f7f6a3bd9993aee7bc80a59779bbf1a84ed512c896cfe65283e17f0761c71fe
-EBUILD protobuf-python-3.13.0.ebuild 1661 BLAKE2B 2263ced6fd5256904f674deffe3ee55e8dc062b87725122f1fc88bb0038f69d448c0c86e5c23dc5f0d15b5ade904bdf6e3af83428502bf02eaf437ec899087b8 SHA512 ab427ce891c3505aeef22e43ed68110ee42c55d6821d8b9c8de518385eea7b38bfe6fc6c343f934b3abcb16e40fdc555d14c0f1aaf077357e3f1b50901f74c6c
-EBUILD protobuf-python-9999.ebuild 1548 BLAKE2B 9c70147a9c667dfa8f5f71a92fa5a98deb56399006c7cb8d720afd437c2b07274ffcb78bbd245958c1ee3f2a709451fccba3d474aae530e3aa20b0ebcdecafce SHA512 6143050af118f1747ea0b0b720142ac46adcaaa0fbd13a1a635dbe5f2aa0c83c1b249ad8ee92180d5a9355c5537336a2a9fa56a8533e41e88106ae0baa2d27a2
+EBUILD protobuf-python-3.11.4-r1.ebuild 1755 BLAKE2B 3f799ed3eb955c14afc27c8874f1181039ebf689a128e3a4091ad4ad380ebdd705924998ad45c52bd829fa8399e961277733f24d5103e3e0d14291491dd7105a SHA512 e5768c3301f38aa0171052fed9d771b23965270f9c8d9866d06e7bb8a80cdf99ea9a30adae8687c6fda8468001eaebccd7ceaf6cca27165f2e2049b1327f67a6
+EBUILD protobuf-python-3.12.2-r1.ebuild 1753 BLAKE2B 1a53d4c3c6045b738eeee3b05fa588cf891158b7a48c4fc6ea1ca52676775a3e4514ce6fe095b52cfae2ad1d69ff5c4a7a8a5fcf9cbc3b440eab9dc2bec7c590 SHA512 cebc21b3ef6830bc771168fa5dd1d59adece556d43162702e534ba0b98a3125af3ee153c339effd9b038b716606a61347f20e5871300e33c0ba10d9e3f3c11ab
+EBUILD protobuf-python-3.12.4-r1.ebuild 1762 BLAKE2B 6f8960631feb4c1929461d23670ee6f06ed2cf7775cffe4ba57c346e53064b384b3b4cbe25453c0c0dedd07b3c0ffd321aec87f3e2f6cb61172d008de164ec97 SHA512 1279cb70cf1c121f14b9135e89ef033919c5a87e4e2b56b455a60d8b112a81432490abf921dd5843c04c3d8a41b55b68e78b101755d940e6a1fef94a7ef72bb9
+EBUILD protobuf-python-3.13.0-r1.ebuild 1841 BLAKE2B ce91807d58420bc3d7a6880d3b42311faf750c5fa5a2fb43e70614232ddbd7f830fc68c5572aefa0d924242dc832d79531fe286b4093e3090f0024b06d75f356 SHA512 8da8ba39e2399c6e66b1fe9e4fffef839021f98f2de25d99f90119f3bf51347e0bc96220f2699a002ba5b5562b28b7b9e315049de56a2737984135b7b613f46b
+EBUILD protobuf-python-9999.ebuild 1728 BLAKE2B db3e66b56226f42c1c3aeb26f7afcb92dc017ba7c65ad0a66cfb1d8993ae6f0167af6758c20537dfcd9f5b55d8f0a2fa90aefc177e32ce3770a7b8cdcab1f920 SHA512 640e1fd6576f92f1a644181ba071aa2c2ec9fb17322c1bbfdb63aa95e323516c869c337216fd035c4cb8d46449a4436355ceafdf7dd51d7f4ced9f8b78e07ae8
 MISC metadata.xml 539 BLAKE2B 32831dd18b1c8c19a3e5339788b48bcbc6719654148fab93412bb91aa53ccad7b39529bbc2ea78b33b157eeb024e77cfa981088375466273e58b9d043ebdd70b SHA512 c6f28c8549dc8d3552836e81322db479ed4ac7ab5a12232f64d55cd909d8e4face39eed67b3f2c79f01023cfe3d00cf0540493acdb0aac419e6b58abcd430890
diff --git a/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch b/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch
new file mode 100644
index 000000000000..68318320b909
--- /dev/null
+++ b/dev-python/protobuf-python/files/protobuf-python-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch
@@ -0,0 +1,22 @@
+https://github.com/protocolbuffers/protobuf/issues/6205
+https://github.com/protocolbuffers/protobuf/pull/7016
+
+--- /python/google/protobuf/pyext/unknown_fields.cc
++++ /python/google/protobuf/pyext/unknown_fields.cc
+@@ -277,13 +277,13 @@
+   PyObject* data = NULL;
+   switch (field->type()) {
+     case UnknownField::TYPE_VARINT:
+-      data = PyInt_FromLong(field->varint());
++      data = PyLong_FromUnsignedLongLong(field->varint());
+       break;
+     case UnknownField::TYPE_FIXED32:
+-      data = PyInt_FromLong(field->fixed32());
++      data = PyLong_FromUnsignedLong(field->fixed32());
+       break;
+     case UnknownField::TYPE_FIXED64:
+-      data = PyInt_FromLong(field->fixed64());
++      data = PyLong_FromUnsignedLongLong(field->fixed64());
+       break;
+     case UnknownField::TYPE_LENGTH_DELIMITED:
+       data = PyBytes_FromStringAndSize(field->length_delimited().data(),
diff --git a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.11.4-r1.ebuild
index d95a668e36a0..d9ae6a9e74dd 100644
--- a/dev-python/protobuf-python/protobuf-python-3.11.4.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.11.4-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8})
-DISTUTILS_USE_SETUPTOOLS="manual"
+PYTHON_COMPAT=(python{3_6,3_7,3_8})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -30,7 +30,6 @@ IUSE=""
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
 	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
@@ -43,6 +42,15 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
 fi
 
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_configure_all() {
 	mydistutilsargs=(--cpp_implementation)
 }
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
index a6ada7b300a8..5c10c9876757 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.2.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.2-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_{6..9}})
-DISTUTILS_USE_SETUPTOOLS="manual"
+PYTHON_COMPAT=(python3_{6..9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -24,13 +24,12 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
 	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
@@ -43,6 +42,15 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
 fi
 
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_configure_all() {
 	mydistutilsargs=(--cpp_implementation)
 }
diff --git a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild b/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild
index 45575c8ab012..754ffae59d5e 100644
--- a/dev-python/protobuf-python/protobuf-python-3.12.4.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.12.4-r1.ebuild
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
-DISTUTILS_USE_SETUPTOOLS="manual"
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -24,13 +24,12 @@ fi
 
 LICENSE="BSD"
 SLOT="0/23"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}
 	dev-python/namespace-google[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 DEPEND="${PYTHON_DEPS}
 	~dev-libs/protobuf-${PV}"
@@ -43,6 +42,15 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_CHECKOUT_DIR="${WORKDIR}/protobuf-${PV}"
 fi
 
+python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
+	distutils-r1_python_prepare_all
+}
+
 python_configure_all() {
 	mydistutilsargs=(--cpp_implementation)
 }
diff --git a/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
index 51f7d5f7b7f2..ecca6acde4bd 100644
--- a/dev-python/protobuf-python/protobuf-python-3.13.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.13.0-r1.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -44,6 +43,11 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
 	distutils-r1_python_prepare_all
 
 	sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
diff --git a/dev-python/protobuf-python/protobuf-python-9999.ebuild b/dev-python/protobuf-python/protobuf-python-9999.ebuild
index fc808ec3a2a3..faaae29a1aa5 100644
--- a/dev-python/protobuf-python/protobuf-python-9999.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-9999.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=(python{2_7,3_6,3_7,3_8,3_9})
+PYTHON_COMPAT=(python{3_6,3_7,3_8,3_9})
+DISTUTILS_USE_SETUPTOOLS="rdepend"
 
 inherit distutils-r1
 
@@ -44,6 +43,11 @@ if [[ "${PV}" == "9999" ]]; then
 fi
 
 python_prepare_all() {
+	pushd "${WORKDIR}/protobuf-${PV}" > /dev/null || die
+	eapply "${FILESDIR}/${PN}-3.13.0-google.protobuf.pyext._message.PyUnknownFieldRef.patch"
+	eapply_user
+	popd > /dev/null || die
+
 	distutils-r1_python_prepare_all
 
 	sed -e "/^[[:space:]]*setup_requires = \['wheel'\],$/d" -i setup.py || die
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index bd0c28b356f6..131076c90fbe 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,6 +1,4 @@
 AUX pycairo-1.19.1-py39.patch 890 BLAKE2B 8ee84005e17fd485f568213e751dd30bcb904806d4016088d0c6882958ce7edeba2517f3ab4b8139a8f923e3baec435bc9a21cf3546b60f4459c5cc9ad7a54d6 SHA512 607d6f2cf6bcaec394b755f452d3c4bc0f6edb39bea185a18258c1ee0db11a99d84c7605dbe9db83906518d41baf065b2b8d9261db3736f8a737a2a8f7dff266
-DIST pycairo-1.18.2.tar.gz 200462 BLAKE2B 1f755dc90fe3ee50aa68273a0816752312f144831ff857709e1a4695a58646ffe6be518733480ed37231c213a11d4e5aaf8dfd1cfa68104873bc7d4192435b89 SHA512 279ea80413ba55d493d51455685da09afa1f5c45e2930c3fca3e417a8afe6645a0d8131201f79482de59e5ec56cfef62eac65ed88fe88866bfcc06503dcc59e0
 DIST pycairo-1.19.1.tar.gz 205196 BLAKE2B 504334628daf75dd9145c97fbd86ea133b4be225ce7fa911b48231ebd5434678ffa7b1f185e0527f96b4b36955e788d0bb4fa4d308843e5ae9b20a41d2126301 SHA512 a7955a2566d5e5586154b62f3aeef824e1e6076cbd3eb86af8288fedcc7d61c4e36a53691298cf9df2e2df7fc96292f96dec92c5d4343e6c1b4c971e97d0650f
-EBUILD pycairo-1.18.2.ebuild 1338 BLAKE2B 11805aacbe6c9779dcb6617ea7395e8a6fef2ed86a2fc4085fc5c73f94659405152754fde9aaf94bc2802615a1e1349e8170dbb50f604265bd68b4b1f818599c SHA512 ae1b95e7e12be835fdbed2ecf94a507cfd3df1181b12af3bed72f0644c61bfe465b43aee4ce0820046ef7bf691188eb217eb4933fa9acaa1842fca9603239171
 EBUILD pycairo-1.19.1.ebuild 1159 BLAKE2B 54c569d55ff94e0af8d810e1eb23acb9b1618efeb9a67bace79688920ebdc98d6ae01ff7170e67327f9e44f1d8bdd6a37bb009c72954475d627bb25e371a27ea SHA512 8612efb9fbb3e0b37a467748ba6063ec502e493d3a3b93bedf96c3f8ddb175180a09615fe53c90d48bf6130eba9dd1077144e849645232453148b754450103dc
 MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/pycairo/pycairo-1.18.2.ebuild b/dev-python/pycairo/pycairo-1.18.2.ebuild
deleted file mode 100644
index 253c565d333d..000000000000
--- a/dev-python/pycairo/pycairo-1.18.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the cairo library"
-HOMEPAGE="https://www.cairographics.org/pycairo/ https://github.com/pygobject/pycairo"
-SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.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"
-IUSE="examples"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/hypothesis[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-		' -3)
-	)
-"
-RDEPEND="
-	>=x11-libs/cairo-1.13.1[svg]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${PN}-1.19.1-py39.patch" )
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx_rtd_theme
-distutils_enable_tests setup.py
-
-python_test() {
-	if ! python_is_python3; then
-		einfo "Skipping tests on Python 2 to unblock deps"
-		return
-	fi
-
-	esetup.py test
-}
-
-python_install() {
-	distutils-r1_python_install \
-		install_pkgconfig --pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-}
-
-python_install_all() {
-	if use examples; then
-		dodoc -r examples
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycparser/Manifest b/dev-python/pycparser/Manifest
index 95ca50842b38..1c506f7fc458 100644
--- a/dev-python/pycparser/Manifest
+++ b/dev-python/pycparser/Manifest
@@ -1,3 +1,3 @@
 DIST pycparser-2.20.tar.gz 161330 BLAKE2B 9a114e4b73e6c3c495bd78c393957146ec425eb5b15d72266cbf424f15e8d2e2e6402ef36d60a9dff41b393aab80fe1356befd25549517f398e129836a76b037 SHA512 ff0853c9f981b43b4f2e879350715c07b02cf9dab223d4980d8fe0a3138c98041b5f848a9355ae4f1cb45e7f137c03a88843008e18d77af9250e0d9c55f5ca1b
-EBUILD pycparser-2.20.ebuild 1683 BLAKE2B ad7cab4e547bcea5362f5de8d0207fef55b919b677d7297c37ad934980b2ac40bb7ea7d84f6909fdf4b73ecc7226534d73564a15ca642ce01a94dcefbfbff02a SHA512 5c92fbd01060822351c8b93026096499b587da471b2687c97213840e2285f6957de58114d4cc29b907a27339cf4b87715ca7b1b494b50f8ee2ebfdb7a4b02ae3
+EBUILD pycparser-2.20-r1.ebuild 1673 BLAKE2B f0424d312555273e3c2bdc98e22468eaebdec431d59aea646ecf0af11e489909aba2af4078351d2415828d11e0dad58f95296019903f3c4b6717b4a727734280 SHA512 a220f31f4dbaf1fa1151f05b37f715b034f09ad570c7fe5c313c9bc3753c0fbd99276c6fdbdb85b7eb75148a07e1eb1a301364bee5132ddd95e46a6db2ebe47e
 MISC metadata.xml 380 BLAKE2B b013fa2cb5c61b39b122c1c051ce40a8c002d4d4c6995ab78e0f3a35cec07d2f81cb5b05326ddac9c2526eb3ebcf90bc2660f588c4ebe5bacbd1a861fcf91985 SHA512 98ca8c63733123ae6a1d1c8b338d5f98a679b8f84b1e0abed8dc7fefa5549735a7f4de9a5851a26507a6169336fa46689616e46a49df0e9a52f6efb669eac865
diff --git a/dev-python/pycparser/pycparser-2.20.ebuild b/dev-python/pycparser/pycparser-2.20-r1.ebuild
index 86f47ce182ea..75845e89e7a3 100644
--- a/dev-python/pycparser/pycparser-2.20.ebuild
+++ b/dev-python/pycparser/pycparser-2.20-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index c197764bb5ec..d36e23f52a10 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,3 +1,3 @@
 DIST pyenchant-3.1.0.gh.tar.gz 75012 BLAKE2B dde78c4f8e986be7e7b4f82979bc446d68a88c3289d472948bb704120fb0dfc3064b8fd46b1883724b0084eefb9e52dfd522bcda290ed5e7a99ae62c948f828c SHA512 d2bf872c15fca1e2c1aa8de06a9ee2c0e6128a69f728383ae9b91fb0ead2d66f804388671cc8156716e240548c29da41eb6c0678dd889012009c690bd078a7de
-EBUILD pyenchant-3.1.0.ebuild 705 BLAKE2B 8fe00b1225cbe5ed97590fd4f5fbdef7a03f53ba81bac5d879ba05079852cc69e827375c4f17f55970726c8fc95fd1789faa789117a84913b5445e807301af9f SHA512 b5f7281dc69893bc56eeda19d907175b045ecee92e4248c776c220cc576641adca4c158370a886cfa664a45c5c986eab7ddf4167fbd4eaf9a150db2c8ed65d5c
+EBUILD pyenchant-3.1.0.ebuild 712 BLAKE2B 171748cbd5f65d678c0288c48848cc04995edd6c1ea3aa597935f70db52c50095bfdffb08b8965c8adf1145f9c9063d8750cf526d0c0e512c31e671c1c909bf0 SHA512 bf7420e73287ae8d13e6f58bcff45ebb578b8059dcecccb494021c712dda291050970f4f9066479c9bbdb262053ee9084623409e96ba02bbea5f3332c72850f1
 MISC metadata.xml 870 BLAKE2B 991969a849f8342f8fcde0b547b58163214703c68ee65864522f6a64d74d8f8a5058619bb9cf00f61533e4cc218da2e3cc217049072b1cd2396cc7fa3ef298e9 SHA512 bf35258041e5664b6cea0a0c697edd684ee32c5a72f3dba7ef4bd87d060f58790d60a120c80dfbe4376cebd8edd9d45b5c2cb6b0fc5562334d8345b398cb565b
diff --git a/dev-python/pyenchant/pyenchant-3.1.0.ebuild b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
index efc28ba48790..b128cfe80b26 100644
--- a/dev-python/pyenchant/pyenchant-3.1.0.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.1.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="app-text/enchant:*"
 BDEPEND="
diff --git a/dev-python/pygame_sdl2/Manifest b/dev-python/pygame_sdl2/Manifest
index 82ad66d4fbed..a9313ddaf5e5 100644
--- a/dev-python/pygame_sdl2/Manifest
+++ b/dev-python/pygame_sdl2/Manifest
@@ -4,4 +4,5 @@ DIST pygame_sdl2-2.1.0-for-renpy-7.3.5.tar.gz 2678274 BLAKE2B 537e63a7e4755f6fea
 EBUILD pygame_sdl2-6.99.12.4-r4.ebuild 1103 BLAKE2B 01f497b66ea90decb55533520ac36ee9ec17a28ebe9ee353fb0c0d75426942c68d52a47975129832f34536ab0d2e3d8146ad615da4c0088912447ec655a39c2a SHA512 c12cf0a700f05f7f93f5bdccef6386e2ce23a46325f6e10babe63a7e6a396c5f5ee240d392d02008fb601b7a9d0ec9f9fe75809f7fed0ece400fe78ef68b845d
 EBUILD pygame_sdl2-6.99.12.4-r5.ebuild 1113 BLAKE2B 83f99eaa4354ddbb00d7de872ff8d5a72cff5c3d174d0e3f8d11ba1fe88461e59142ab7c3fe575ba7d2ed778fded85b1f4d534b0ca9aee2fb4bacc867e50e52b SHA512 e3a2dd3e3d38859b1bf8e6fc4788dad33bb2f6118ef79db1f07251b2650aaba195027993f2134b2fb401fef7a5195654cf239d8f69635e1808052f0eae3e21a8
 EBUILD pygame_sdl2-7.3.5-r1.ebuild 1050 BLAKE2B 3acc4a3442b315bba46ee780d283f4ca2aab973eafcf4476e194590b434cde5f813fd0835373dec2e9de6b81c730369d850ed287692e04a95fed2d915687fb63 SHA512 530ed75bdcdc03ac211f4a5d2822be1842a92321c22370033ba83fb999035db6eda89ef7a82822cbd66752a3c7ec8a484b567b985af5383d909afa48ea22ee0a
+EBUILD pygame_sdl2-7.3.5-r2.ebuild 936 BLAKE2B f56e68e2a4cb47d8e9761b7d15fbde445c4111810efa2256b4c01114ceacbb86912b4f5f9cfa44b7d8fab073380cbe8b28cdc637122400762d1b6b400a9457d8 SHA512 8210375dae6c47460ec1d021681e21695840180b11e30e636437244edfdbc4ca1e469884814122ac084a21408911ed4d0c1a223efc8dc12a389f5cedc0a7c183
 MISC metadata.xml 332 BLAKE2B 3af5bfcb689c906453097e4bcc7a7b87ccec6bb1f1f8c43766d4ae5c473f9e220314b8591c63ab9b4ddd67eb411a27400a431a043ca5f696069fc4bf31291ffb SHA512 ae1f94e0d1f533a9f2db740f0a1c534456cf5a919262aebfcb501269ca3b508e697750c4bbc6eb60db8dda2182ecb712a10dad5d91efce20f24c5a736d9b3521
diff --git a/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild
new file mode 100644
index 000000000000..0790013708f6
--- /dev/null
+++ b/dev-python/pygame_sdl2/pygame_sdl2-7.3.5-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+inherit distutils-r1
+
+PYSDL="${PN}-2.1.0"
+
+DESCRIPTION="Reimplementation of portions of the pygame API using SDL2"
+HOMEPAGE="https://github.com/renpy/pygame_sdl2"
+SRC_URI="https://www.renpy.org/dl/${PV}/${PYSDL}-for-renpy-${PV}.tar.gz"
+
+LICENSE="LGPL-2.1 ZLIB"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+	media-libs/libpng:0=
+	media-libs/libsdl2:=[video]
+	media-libs/sdl2-image:=[png,jpeg]
+	>=media-libs/sdl2-mixer-2.0.2:=
+	media-libs/sdl2-ttf:=
+	virtual/jpeg:0"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${PYSDL}-for-renpy-${PV}
+
+# PyGame distribution for this version has some pregenerated files;
+# we need to remove them
+python_prepare_all()
+{
+	rm -r gen{,3} || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index 7a5f26a76e26..0ad3640e5931 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,5 +1,5 @@
 DIST pygobject-3.34.0.tar.xz 552268 BLAKE2B a9cbeb644e0aa1b23067b591fe5c6299741395656631d39782a8c183a5d3a8e5e7f1a81acdefee186b7cc2bc34dda9271468b1828d5b9613ddc1256e24f1ecb8 SHA512 782195d22e564b88dea8d43469f0111f398b44b51a63df2fe7d07650af94d5cd037f322a5d7e405338823be3419fcdbf0113fe50b220ab1cfd07d4d01dbc4766
 DIST pygobject-3.36.1.tar.xz 556568 BLAKE2B cd38aec8e71ff230926327e77867d07ae0fd5549b71619301bb3be01821ea93e557ecf335ea238292176981a864b269eaa2a86da47e8fb320f187f54caf24dc4 SHA512 5e00dcd03dfe4f92acbf827c13c164b6b9740b2a8cef3b2dce70f96a2156fee2411c84dc669f12b910f4a93daa03ba845282832e2b09d8c887102d43764a345f
-EBUILD pygobject-3.34.0.ebuild 1906 BLAKE2B ba5de36b9f7f82dbf9bd11dc1f56dd5bce13dc3147935a60096d7943c779b8e96bc58cf9e7b711a3a993f1240e56f125d6ebc9c435dc8e765a1125dc3c467368 SHA512 096bc7dae1783d60d86cb69fa2b32612c5bbd8ce1ab2565b5806becd66e3e4ca85c47cd8a325167704a422d40c0e9f0baa6ca67da2541fa59ede6e42373f1243
-EBUILD pygobject-3.36.1.ebuild 1908 BLAKE2B d6d92dc86f635c73d7678a5c5e1285bb92fb3e54df1d9811b823ecfc5dc02c3fc72b483de7b83579a9e36709be5390297883e9ef65ba0c68204912f6597cbff7 SHA512 e0367979a1f076e3667dbe31955ff31171f89a03720214988ce7b6f8d895af7ef2a6a2dfb0fb3aad78841c48d6576b435ded87a0b7ccdd334e8f40229169feee
+EBUILD pygobject-3.34.0-r1.ebuild 1896 BLAKE2B 2e53e017e9a4d12394fa45b88700a5af9cfb725edad3925c9f6074cbaa446dc7ed159e8a2249d914be697d37f99900a1f379bee6b4efdbd9ac2477eccd96ad98 SHA512 08eaf6f24dc0a71d394a0ac9c2a823f906d25ebdbe8bec4947863226805a7c6f05366dc2754399ef23640ddb2f46011eb8e6596ab0233c6eb8264fe8c88451cf
+EBUILD pygobject-3.36.1-r1.ebuild 1898 BLAKE2B 890b7f739e38735d9e2ae796e75578bc42f4a63b5a4ab5f546a1301606c9be4f19511d8c489b2b8722b44133302d8db9f1358fbb267e8931cb3eeadc314e47d0 SHA512 77204741bd734b3c16c7b9b8a4729803d1c3c533f788517be46a3b657fd42b935aa707d1a97dc0044be8a3a9036135a7d0caa7b06971103ffdab805012b611d0
 MISC metadata.xml 1220 BLAKE2B 4f2d4f1091eef503e2ca7457418888071d70509e346ded7c5e77839c8e5e6dd1c27957e6645a7f32bc7ba0810aff8a55874e7225f7a9e7674e4c1bfccee2ce1d SHA512 991d11e7aba9fc7d6ccd6971a150d50ebcd397968a9a2c2c901093f598acfa70eb8719a3a590c10433147fde97603012862fe1fc613f766ccaa2a159705a6ae6
diff --git a/dev-python/pygobject/pygobject-3.34.0.ebuild b/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
index daaf30dc04df..5a3bf5df09bf 100644
--- a/dev-python/pygobject/pygobject-3.34.0.ebuild
+++ b/dev-python/pygobject/pygobject-3.34.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit gnome.org meson python-r1 virtualx xdg
 
diff --git a/dev-python/pygobject/pygobject-3.36.1.ebuild b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
index 16c018529420..e07d82e9ea83 100644
--- a/dev-python/pygobject/pygobject-3.36.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.36.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit gnome.org meson python-r1 virtualx xdg
 
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 877fffc6ddfe..038ce4266a3b 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -2,5 +2,5 @@ AUX pygraphviz-1.5-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a
 DIST pygraphviz-1.5.zip 117810 BLAKE2B e9139d6b8e01cacb3135b1ccd2fa8624c041b7a04848f66c7668c5acf55cf66380ab9f05193b1bb240133f0c01a21915e2314807fcde23246c287d22efb9450a SHA512 6d3df6642a7e23ecb6b687761480b80a3ee5886508ef50b81697041425be7d09d623bf46990c5cea3ef36817a28d9e5c2905eb32267296f55524fdedb2199ea2
 DIST pygraphviz-1.6.zip 117043 BLAKE2B a6c4f28d67ff67bf3fb69869adaad23855c6d702663cfea648b2072b8a5095caaa3d9cfcc864354a362cc6c4c2c6e4a15d5977c58c6af5e22b02f8cea8f7e877 SHA512 6dd389b3fd8c46fd5c8a5a450623f2fe080f720bcf0812618549d092cf917b56ef515f4235fdb89123ece422c6e295705bb08076a3d3e9b193955fcda624acb3
 EBUILD pygraphviz-1.5.ebuild 1137 BLAKE2B 14afc237c4da126b7ac30e6176892fad3c46d0716e167c3d7c6f0a431d70f25b730194688db0e0c25948a4a6eef478260863c9a78a7f30fd1c15851e9108254d SHA512 1143108fdef556d65d181214ab4fa188dc1a6e656a39d79ff07dbda07ef2b5467e7a0edab56670ae884ebfa539ce1da9e4e8ceab7ba41be645c399e52c4fea63
-EBUILD pygraphviz-1.6.ebuild 1055 BLAKE2B 7be6e7da4dc808a7dbb249bb98471f0c52841ffebb555b8b36361b60856054895fd1d7efdf3c036b22e284b2a52453fdf68fe550db9549f15d73e4de3fcfba88 SHA512 a75cc3044e1715e7b102e2a791dba007931602608edfb7e7c231751869310e04f5654e55a52d7c702dcb13646aa7a5e7d6b9ab1f5fc7f1da056c7e95ddd0043d
+EBUILD pygraphviz-1.6.ebuild 1053 BLAKE2B 10730b633dd90422c3d8f276149f34a25c9bfdf594027511c78938a3afef7f7be11c6ab6fa723bd58ddd15cc9b9f673475385f0840ceb8f08cd48f25e01294e5 SHA512 9a91ea51abed4e9ee18e41d58d38e81b144c20013137ea4093d6c1864039005541142c01f9ba8a977ace64c00959097357b256fba04efbd83ca37ce2e506e50e
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/pygraphviz-1.6.ebuild b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
index e53d8c412382..3caab34f5442 100644
--- a/dev-python/pygraphviz/pygraphviz-1.6.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 x86 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/pykerberos/Manifest b/dev-python/pykerberos/Manifest
index 504e2e4a3063..55e303219c68 100644
--- a/dev-python/pykerberos/Manifest
+++ b/dev-python/pykerberos/Manifest
@@ -1,3 +1,4 @@
 DIST PyKerberos-1.3.0.tar.gz 41033 BLAKE2B 5805df2c258a75321dab5fe84fcbf1de706cb7c14a710c914ae4918dd39f79036a4f4033a068982778f73d9f00a4ca45b80e9cfc59c6a246a236f3c6931bacc5 SHA512 ed2644a236993d9737af43be951d57207fc787a74e82f343b265461b456923763610f1ce1b46d7d56f22d6452be1418b98707b8529b22fd8abf299143e52cf69
+EBUILD pykerberos-1.3.0-r1.ebuild 1309 BLAKE2B a495155c23e6d965de0daf8bdb95a7002b6cde0ed3828df2717091067c3520490ca66441a370970c3bbc92cc0f360c2fc8f2bb28651f900a80b1fe1664ddfd59 SHA512 baaf93252fc62684b180ff6eadf6ed205a2a5d76481acd1721bbf031ce14c3fcc9fd6d527abf1442a03949fa12b76e63e4382734c533b7d29abd0203196065a0
 EBUILD pykerberos-1.3.0.ebuild 1319 BLAKE2B 04348fe54a9b06dadf14693e784d1b652317124a81b111b5239cab4420c888fc72aac1323b1da1f9d5f14433a9fdccb7c0e4e45e88492452ad6caa27ecb1ec09 SHA512 46b623a0288cec6f1acec781f62e1bf2ddf3998605999db9c0ce5cd1510f07bdb8b388f04f9efd9f72f7a58a618365f66371aac1d4013dca984ca1f92f326d66
 MISC metadata.xml 423 BLAKE2B bc74606c5e0d18c76749904da2d388a2be603d2aad92538dbc0ab92974903a24a78788094eb6da7775028b8cd178334b243246fb0f4ba85f90f74fa31bd74f35 SHA512 c84e39a4e84b841aed995cd47aa349df5c4d3ec32757e826a7194c7f629e5f109e30c841f4f4bdf949e966937cde58ee555d6dbe02496baecc25937f06244950
diff --git a/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild b/dev-python/pykerberos/pykerberos-1.3.0-r1.ebuild
new file mode 100644
index 000000000000..0d5435a1f31d
--- /dev/null
+++ b/dev-python/pykerberos/pykerberos-1.3.0-r1.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=( python3_{6..9} )
+inherit distutils-r1
+
+MY_P=PyKerberos-${PV}
+DESCRIPTION="A high-level Python wrapper for Kerberos/GSSAPI operations"
+HOMEPAGE="
+	https://trac.calendarserver.org/wiki/PyKerberos
+	https://github.com/apple/ccs-pykerberos/
+	https://pypi.org/project/kerberos/"
+SRC_URI="
+	https://github.com/apple/ccs-pykerberos/archive/${MY_P}.tar.gz"
+S=${WORKDIR}/ccs-pykerberos-${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 x86"
+# test environment is non-trivial to set up, so just use docker
+# (see python_test below)
+# also for alpha/beta Python releases support:
+# https://github.com/apple/ccs-pykerberos/pull/83/commits/5f1130a1305b5f6e7d7d8b41067c4713f0c8950f
+RESTRICT="test"
+
+RDEPEND="app-crypt/mit-krb5"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	set -- docker run \
+		-v "${PWD}:/app" \
+		-w /app \
+		-e PYENV=$("${EPYTHON}" -c 'import sys; print(sys.version.split()[0])') \
+		-e KERBEROS_USERNAME=administrator \
+		-e KERBEROS_PASSWORD=Password01 \
+		-e KERBEROS_REALM=example.com \
+		-e KERBEROS_PORT=80 \
+		ubuntu:16.04 \
+		/bin/bash .travis.sh
+	echo "${@}" >&2
+	"${@}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/pylast/Manifest b/dev-python/pylast/Manifest
index ec7ec0dcfd61..b3a813432ce1 100644
--- a/dev-python/pylast/Manifest
+++ b/dev-python/pylast/Manifest
@@ -1,3 +1,3 @@
 DIST pylast-3.3.0.tar.gz 40209 BLAKE2B 45725d8424a54ac03b53a6c7fe79febb0038c07ee6c2685d7b66f29933f91fb4ea55818be1d02f8fb1126758acd1d9ce3366e8a7d84fe3082b9b3003a9b948b3 SHA512 8b0c089896d7efb37bdf3a701d150b0f94f386715eb73122a4a7618f5b1a514f9f7577e8c7c84eacb36b18e69aa064220403a578d0544344ab11e87e1b46695a
-EBUILD pylast-3.3.0.ebuild 798 BLAKE2B 9639c2d9d8acbc5e689ee107e17e05f8efcc00f335cba679c5b9e0197ecb8c891ffc52948c463d3e65f72b79491b4d6c91eb50c69a000f2cbb6b7a71e6fa4d31 SHA512 a22404d6431d63a8e8cfe2e8e34f22314e76dec17c38bb3b8bb7ecf064d7dce20dc393f46cd5532e2f2e07c72434a9770b73009ef167d2ff9de01e3524ac3735
+EBUILD pylast-3.3.0.ebuild 804 BLAKE2B 66a361aea761026d88dbca8d669775ff4fe6758ef52a0374996fd6e26559c83e131de9b4bbb1dbbe4024a72e0555ebc49d92c135b00ea55ef4f7c2325c876249 SHA512 701be387c5f2b4ab8e8d3bdf79e024af1e393eae18c6147977591db82c04cb95dc2e102aa3521a00f8b6dd4bce8a3e591514ed40d46b026487a96cfa570933f4
 MISC metadata.xml 863 BLAKE2B baa94af51c12d8ef4cbc482d99afdf0f41851837a560b48d190410b690878fe01add338503f4264f2f031c83615f6d53231be56f8efd20833b7df93263394530 SHA512 2363edae5cf8ca68874aa0891ece420b69855fb2d4c6da7dd2147d149504800a72bbf725ef34d25c104de4dbb2200d045097644b0b85e264dc9bbb083f6278d2
diff --git a/dev-python/pylast/pylast-3.3.0.ebuild b/dev-python/pylast/pylast-3.3.0.ebuild
index 1e952dd430f1..18789b6de119 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 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/pymongo/Manifest b/dev-python/pymongo/Manifest
index e93c12eb0726..cb49ec20acaa 100644
--- a/dev-python/pymongo/Manifest
+++ b/dev-python/pymongo/Manifest
@@ -1,5 +1,6 @@
 DIST pymongo-3.10.1.tar.gz 715892 BLAKE2B df1f8ae34366ea9de633be7e1ca103a2bc704a18a9b23cb1fbdbc8d116e939d4d5462e18a076149d93dcb8ada9f4737ed2d61b08803b546dce89dca4b2416689 SHA512 5a73ac17ef6f6783a573facd90879dbefa0c95d69123bc67c1a6af0987cb5786f637b8fa81a6810387acc34829a4cde33b848ac0f7b08f7d07faa90a8e13b595
 DIST pymongo-3.11.0.tar.gz 771691 BLAKE2B 5ae5b78caac335656c1005666c5633882da517c512bbfdb0df2c4569ec5060fa9623a23f48ffcf0c6ab2cdc69f6534f36ef18c929047bbb22cfbe9055a0881b7 SHA512 4f8a185013cbb3c07774d3c6aecc9e97dabb4ba55176fa8a51e17bcdb7cbbebaacd16304e580b4c6aeb26aad964401249313b59dde3c5c248c4496d64d18b22c
 EBUILD pymongo-3.10.1.ebuild 2854 BLAKE2B 70c1f06d278465491dab6c124629c0ab7a2310e5521b8357a57e4db6bfe3c4347c55744f7c205256088b04b3f65402482b50292ac73d4ea7335bfff80e91fc65 SHA512 0b4185f73dbd81b07ae04e54cdcccba08dfeac591c3780e8a1572de7d0fe2971dd482492372525ee6d324fa38804847cead63c9ef2748251084163b71d900b41
+EBUILD pymongo-3.11.0-r1.ebuild 2643 BLAKE2B eed1b61398ff854625f750c21dcbfd36746f3ef2f1b65f2c65327f58c1b555aed7f35076a26fc182309a7c73e8a80e88bfa129ff192972a1e130fe7ebe07bdc2 SHA512 b3d258c891d05a95d6db6e705c5cf8b6fc5dfdb360f8451d6a36d45e66dc2730c021ba310f703c8a17906c9b5ebf528ee9bbd997f3702105f1bf6a559498cd50
 EBUILD pymongo-3.11.0.ebuild 2653 BLAKE2B e82d2c09a9a72658c3287ff602fdb8917c5b250a3006da8e69901147e6812f1ed77f2f55a687876bbcd1fe1ea19d8a2a24ccf97dd4c55019271f8f948f1d16aa SHA512 f6ce32ec473397efb2d46622c4f837da6dd2de0b7b5b10bdf1a4c0e75f256340dd9c6bea10dfcbc69fc4bb2dc7bc54a29832a53929d82d92db249c6f8d2e6ac9
 MISC metadata.xml 672 BLAKE2B 48cf6ce2f03ec2865a99fd033455a1b0a53cf9e55240ab6e993483929a6dd93661afcea7fa255095b66536f0a8cc05b5c4e6a12bd044547a5cf190559a9e480f SHA512 89b8a3551a5b0bd495bc98ac2f9324daeb3f3d81d0f6b991e5537e02c7b369201f9692be5acbe228ddcd3581002a39ac777ea5fc136957e9ccb9683f205e38ea
diff --git a/dev-python/pymongo/pymongo-3.11.0-r1.ebuild b/dev-python/pymongo/pymongo-3.11.0-r1.ebuild
new file mode 100644
index 000000000000..985536ffbabb
--- /dev/null
+++ b/dev-python/pymongo/pymongo-3.11.0-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+inherit check-reqs distutils-r1
+
+DESCRIPTION="Python driver for MongoDB"
+HOMEPAGE="https://github.com/mongodb/mongo-python-driver https://pypi.org/project/pymongo/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~hppa x86"
+IUSE="doc kerberos test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	kerberos? ( dev-python/pykerberos[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		>=dev-db/mongodb-2.6.0
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+"
+DISTUTILS_IN_SOURCE_BUILD=1
+
+distutils_enable_sphinx doc
+
+reqcheck() {
+	if use test; then
+		# During the tests, database size reaches 1.5G.
+		local CHECKREQS_DISK_BUILD=1536M
+
+		check-reqs_${1}
+	fi
+}
+
+pkg_pretend() {
+	reqcheck pkg_pretend
+}
+
+pkg_setup() {
+	reqcheck pkg_setup
+}
+
+src_prepare() {
+	# network-sandbox probably
+	rm test/test_srv_polling.py || die
+	sed -e 's:test_connection_timeout_ms_propagates_to_DNS_resolver:_&:' \
+		-i test/test_client.py || die
+	# relies on exact exception message
+	sed -e 's:abstract methods:abstract:' \
+		-i test/test_custom_types.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Yes, we need TCP/IP for that...
+	local DB_IP=127.0.0.1
+	local DB_PORT=27000
+
+	export DB_IP DB_PORT
+
+	local dbpath=${TMPDIR}/mongo.db
+	local logpath=${TMPDIR}/mongod.log
+
+	# Now, the hard part: we need to find a free port for mongod.
+	# We're just trying to run it random port numbers and check the log
+	# for bind errors. It shall be noted that 'mongod --fork' does not
+	# return failure when it fails to bind.
+
+	mkdir -p "${dbpath}" || die
+	while true; do
+		ebegin "Trying to start mongod on port ${DB_PORT}"
+
+		LC_ALL=C \
+		mongod --dbpath "${dbpath}" --nojournal \
+			--bind_ip ${DB_IP} --port ${DB_PORT} \
+			--unixSocketPrefix "${TMPDIR}" \
+			--logpath "${logpath}" --fork \
+		&& sleep 2
+
+		# Now we need to check if the server actually started...
+		if [[ ${?} -eq 0 && -S "${TMPDIR}"/mongodb-${DB_PORT}.sock ]]; then
+			# yay!
+			eend 0
+			break
+		elif grep -q 'Address already in use' "${logpath}"; then
+			# ay, someone took our port!
+			eend 1
+			: $(( DB_PORT += 1 ))
+			continue
+		else
+			eend 1
+			eerror "Unable to start mongod for tests. See the server log:"
+			eerror "	${logpath}"
+			die "Unable to start mongod for tests."
+		fi
+	done
+
+	local failed
+	DB_PORT2=$(( DB_PORT + 1 )) DB_PORT3=$(( DB_PORT + 2 )) esetup.py test || failed=1
+
+	mongod --dbpath "${dbpath}" --shutdown || die
+
+	[[ ${failed} ]] && die "Tests fail with ${EPYTHON}"
+
+	rm -rf "${dbpath}" || die
+}
diff --git a/dev-python/pyopengl/Manifest b/dev-python/pyopengl/Manifest
index ca188b2c4e43..0a5163e184e8 100644
--- a/dev-python/pyopengl/Manifest
+++ b/dev-python/pyopengl/Manifest
@@ -1,5 +1,5 @@
 DIST PyOpenGL-3.1.0.tar.gz 1172688 BLAKE2B 9865a10e8b5d2756192077b4b079658c680b9f47bdaccb33285fb1942bc678b29f6a69359a1486ec023b1a73d714a7e0209b2f57776fe8b5e4a5e2d0803dba4f SHA512 f748017ab3734c7672c3fdbedcea80df297a91a78b111533e260feb0868ebb02935666c041f77db03841ee8f90057d9c53c53b00b097aae4cf67a52c7fc9c2eb
 DIST PyOpenGL-3.1.5.tar.gz 1835295 BLAKE2B fd3b3e9970b3e704b09128402b401e23c584ba20de23082d019f5ab9e1e222efdfbd2e11ecff6ee748f41bad3a5ff089c57a5c354092e2f717b13e18108de2af SHA512 5d90fc68040b4886e46ff69a59be9e3a8e31e3e1295283756db86d50a1efe681986928e18eb55d20fd2660f863653301ea483425bbe24046f55085b44f4906eb
-EBUILD pyopengl-3.1.0.ebuild 810 BLAKE2B a47e25fd766eb0c4bd2bdb8dbbec4eaae34936d02cd0e268679beb48448f33f90e4ded506356d8abf41e99e2cec8184b687f5516238d7e19ef2eb145be144811 SHA512 d2bd32acd53c2eba0503aee69b37297d6828e83d45532b9d206c63d350f2a1d61667a142a3f7a5b4a44f9031bf0b9a821c076f1b89f75c89975e182944095af8
+EBUILD pyopengl-3.1.0-r1.ebuild 806 BLAKE2B eee91be873326814463cae23fa97158188fc033b051701ed7b07d8c51d817297d1551262bcb7c773bfa850949072fa3bf7389840c1ecfd312557115bc223b909 SHA512 919b0c46d864f8b7008161a75c673889b2c7683a0de5c2c9096ac104354e91c419526c6d82b451744f2b26827d6cb3e66c1a37a56280e5f484b9c8375d79258e
 EBUILD pyopengl-3.1.5.ebuild 1224 BLAKE2B 6f5c4df5e4316651712d5263f434dc61a1e2b79dc901a2b8d2b003862c055cb27bc49801e3f258e6b54500a0a19f9a9b7076e77e255b65a16b5078f3112c51cf SHA512 a564f63316f4bdc3af64b7eb939afdb7f0f50be2be1f9a2cdb14502e86a67d917cd4bb60cbbb44f855bfe4ccd9b3ecc285120e990591147a8bb388132ff882a5
 MISC metadata.xml 364 BLAKE2B a831069125da49ab322af6f4d615d3091865919e26a1cd66da5a760a855ca81eb38450f8707c9346174871cb3055fb5085944a46c1fe22135a8f4b81c7ac2117 SHA512 7f81e0f6a601ff3ddd04a391380882edfa45f801bb4afb6fa04673395cee74968745016e9a285908aab6cd701f62b70164b9885493cdfe553d52f30d49509546
diff --git a/dev-python/pyopengl/pyopengl-3.1.0.ebuild b/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild
index 0c37f864817c..c66c6084afc2 100644
--- a/dev-python/pyopengl/pyopengl-3.1.0.ebuild
+++ b/dev-python/pyopengl/pyopengl-3.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 PYTHON_REQ_USE="tk?"
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyparsing/Manifest b/dev-python/pyparsing/Manifest
index bcd4b1791863..129e83d5ebcf 100644
--- a/dev-python/pyparsing/Manifest
+++ b/dev-python/pyparsing/Manifest
@@ -1,3 +1,3 @@
 DIST pyparsing_2.4.7.tar.gz 648158 BLAKE2B 24525b4ee7876e245b9eb270f0e3e22fe2d8b398f9777ad3b3657b8a1227dcbd25983aa64a3f3018debdbffc1a042c732e6b3a09800e081c7acac7b97da15317 SHA512 c7a546729f86a2b5176e2482b566b9fd715b03e495aaef4d720b21307bb03f385dbc849247f8d266cb3d92be0a83c34ce4995b655ce85318355d5a0d42d6991e
-EBUILD pyparsing-2.4.7.ebuild 1014 BLAKE2B 0b8579e667c69497bddd9c33c326c997c47fc9d9c519d69a05f7b929c1968036c764796932b9b588c5f855d223eb05e48dad9685ba5740872c50d90c1e1b5754 SHA512 c33e9adc63ab6580fbbfde14f35307c7c2be38b1166d44ab131ea96a220faedce4e764e1adee4c6227ecbf038021c77e19c5b80dbc19bbcea0c4bfcfacd2c1bd
+EBUILD pyparsing-2.4.7-r1.ebuild 1004 BLAKE2B f82c4df2d33ca243b5dfb480dc69fc5a9d10a40bac27bebb95dfba1c82bc57fc90c4901ccb04341d7c1b422d0dc0bcc3750d52faaf42d21654a7f97d21d0cd3b SHA512 c3fac5cef28796e188e8c5b3d2726892488a5b0290ecb2ad5e9408847081c7878ccb414528381e9401afc9a8f580e6945ac5cf9ffd08b8bb3c808a860f6f62fb
 MISC metadata.xml 762 BLAKE2B adad994029179676a767488775141e8d79d51803f1fa9546d85c33dfbaa2a656e82bbd1c684c401bdccad5f2be763878296f149c9032097f1db87c60865dbc7a SHA512 7afb6c24b323080e02f552a35c89e7b0117482ed9edf5ad28e845553d98db9ba0d02919419ec8029bfc431ed39c5b60bc270360e6c5567d34e883c819b2ca9c1
diff --git a/dev-python/pyparsing/pyparsing-2.4.7.ebuild b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
index b412b387bec6..7007a149ec66 100644
--- a/dev-python/pyparsing/pyparsing-2.4.7.ebuild
+++ b/dev-python/pyparsing/pyparsing-2.4.7-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 0c3da9b6cffd..534a1c95e658 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,4 +1,7 @@
 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
+DIST pypy-exe-7.3.2-1.amd64.xpak 13541084 BLAKE2B 8af5c35d99275a2131d4b6c51f505a9bf3015a144387030c78a490c331f1fb34b69106ad6ed961247b4de6a39d2fde47a1ebad204e3a3569f269ed7ee32559de SHA512 82d99e896954aec8749154e19d42636608403e4c4bece34e72b5804208cb42ed26bfdf4506ab2579a3b74d7cede97ef66b313ae9feeddabbfd79045090dc3035
+DIST pypy-exe-7.3.2-1.x86.xpak 10216001 BLAKE2B 934be623ce1afa9d0bfb1b3725e89d994352c9d57b9807c6fa135a0aabe3c50633566425b25ebf98f1cec8160eadf5305033ac3f3ba4cfff5fb7b39e5d19f9c6 SHA512 9d25f1d82af3ed1c4d046e5f3434d12ed4c02eee4cc8adb64a03159bb48cf114f393bd60c67223447796726f59b622f8462ac439446eb14dcf2e76983da635e8
 EBUILD pypy-exe-bin-7.3.1_p1.ebuild 1086 BLAKE2B a331d825f7906c1685f4b387d4e6c50b9d82296d4d3c7d1d24f5de50d7ee65f02bfcd2b14f0b57cd2a73a714253a18e5a7f09fc122a5ba033965381a71a57144 SHA512 fe49f4895b502a6d0a2050bd0aa4e6eab616026a875905b46443fbbc4ef378329e3a56ff641541210fd613f9a8bc07317e9a639f1ba187cb2b4041fce321b687
+EBUILD pypy-exe-bin-7.3.2.ebuild 1081 BLAKE2B ebd50d6abfd93b8e1a3abb52e45eb2685778a05687efe0a43f363cd9f57f18f1517d40bbed0b5b0a5352ff5b0dee90a3d9a8a015b34a8bfdbd1ad847068792dc SHA512 bce00630db8b75dfa6874fb903ebbd0c92a8d7370a0bc0231fa83f3d5110fe5a7bbf2ed464a40d86a01f7e7721a0bdbfd4f651ed9f0f0cf91d4354aaade01019
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.2.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.2.ebuild
new file mode 100644
index 000000000000..cbfcb9fce7dd
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy-exe-${PV}-1
+DESCRIPTION="PyPy executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+QA_PREBUILT="
+	usr/lib/pypy2.7/pypy-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy2.7/pypy-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy2.7/pypy-c-${SLOT}"
+}
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 93a7ea6346a0..069b899afc43 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,5 +1,5 @@
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
-DIST pypy2.7-v7.3.2rc2-src.tar.bz2 21145693 BLAKE2B e722111435f81d00ecb5cec83e78e17676a042703fe83c049456fa6e5debdb1c09cc3f1fd71bcd8a8469da373a7c8131c252b3f139959a442f4cfa2b7f202c6f SHA512 ba7cccdaff1616ad0090cb0942ad35eda025a758be4d6b4e978bce19fb8cb8840136297fb924127a7e99f02c09665bde7eaf714e1744b9b32612973355459ad4
+DIST pypy2.7-v7.3.2-src.tar.bz2 21142873 BLAKE2B e6bcd2dc28ef740962d053753ccd172e3895fc83fe23a319c003248e0986f9805839daddd13a0f480f1e9ee813979742699cb0bc8c42b6b05c193fedf67aea4f SHA512 b40d93d615a27e3a035007307a8ab2b49ff90f3047af914b268a80feb8219d372eca14c04a8b0dea91efb992653457b7c6d088c784de32c414cc48879f2d15fc
 EBUILD pypy-exe-7.3.1.ebuild 3891 BLAKE2B 1121625d5422a1d52114e58fd7f1632f175fc1623b2b931c3fb528acb1f18fdfc1a0859218330fe3e7c20bc539ff2819ea21cac2cb41328a4d295e7f5e9f684a SHA512 6bff225e427ae47b014a20ae7ab3893e55a893d5ce0670dc0474b4e6626113f5cbeef893e8585d42c8be78a64a051addbbbff1eb90b2266284d6064e73feeb2f
-EBUILD pypy-exe-7.3.2_rc2.ebuild 3893 BLAKE2B 68647b133594b77ad1c361f587edaaf29a0f6f4d4dfacbe647e0b60c01e91e30b27f5c3b70ac0d74d71d3a40804a69d903782a577bd10d501a958418e1a329d7 SHA512 447c447548223d0dc3711b3d856d3abda964cce8b7b3f691917b47481e6ee4306744ebdc547d861a1f13f0c513d7891410eac8f7d030570c583ddd08ccc88cb5
+EBUILD pypy-exe-7.3.2.ebuild 4074 BLAKE2B 2e5f26deca32905d708882f50edca4ec1af675c61a4284f6a6cd174ca7d7dd09b9b2693b67afedaf30fca54db7640c083d88a69ae6f1e75b30f5d4ed0f575a4f SHA512 bb74c3250fc5d9d9d393923925a317b2c155c209f54c97f7f353a5860c778e3a0b999f4f58cbb89cd94204440c91f4cc70ffa96f99fc61e986cbe9e49898d994
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.2_rc2.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.2.ebuild
index 07e3be2ee5c4..c0dee5cf1c60 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.2_rc2.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.2.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://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
+SRC_URI="https://buildbot.pypy.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 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
@@ -31,10 +31,7 @@ BDEPEND="
 	!low-memory? (
 		|| (
 			dev-python/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
+			dev-lang/python:2.7
 		)
 	)"
 
@@ -140,8 +137,16 @@ src_configure() {
 			"${EPYTHON}" --jit loop_longevity=300 )
 	fi
 
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
 	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
+	# we're going to build them ourselves since otherwise pypy does not
 	# free up the unneeded memory before spawning the compiler
 	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
 	echo -e "\033[1m${@}\033[0m"
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 261d6ba92381..6fadbbd94936 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -2,9 +2,9 @@ AUX 1.9-distutils.unixccompiler.UnixCCompiler.runtime_library_dir_option.patch 5
 AUX 5.8.0_all_distutils_cxx.patch 18248 BLAKE2B c48346df7bab8a38552eb7439e37f2c57c00ec534cb5e20a54d0c2a7d5f975b65746e556dc0a5876665498f165945adf9e8af5a053980b317dfe4c75c2338f62 SHA512 a1bfe2ac4380c87094d4b934603956260eafa5ad6059160603e636690d99ae65181e5752fba38f145ccfb263340a1aa03a46e31f7ceccb5643df14b0190e1d8a
 AUX 7.3.1-gentoo-path.patch 1575 BLAKE2B e374b879aabdb1a9b4d3bb07ba03510e9df7c00e6fba13e117dd718268118ade06fa76f7468855463fa50112fb780fddb9687198f4a24bb0a6cc69b5b79e70d4 SHA512 14e14e4c000166bfe3f1cd10377baecc721b43c2df43c0d5d85e8dc6f220e1a453d7fe30cfbaab547e5483f8f493ddd840620b8de4de6d55abe8f9cddcca2464
 DIST pypy2.7-v7.3.1-src.tar.bz2 21053306 BLAKE2B 071d59b7978c98e9ed9243d9a64d93d21b524351cb9a45e0f7d48828f919c84585a1164e7c38739fdd8828ab4b1eedade96dff7d64d0d9cbfe00c74d88d532bb SHA512 1bec44fa0fc4b1186e25f69303f9e332df32184be990d86fba41c40152664a93bd65eabf4dded133371271402cea9b150b60c13bce89d1004b276f0908c0b8f1
-DIST pypy2.7-v7.3.2rc2-src.tar.bz2 21145693 BLAKE2B e722111435f81d00ecb5cec83e78e17676a042703fe83c049456fa6e5debdb1c09cc3f1fd71bcd8a8469da373a7c8131c252b3f139959a442f4cfa2b7f202c6f SHA512 ba7cccdaff1616ad0090cb0942ad35eda025a758be4d6b4e978bce19fb8cb8840136297fb924127a7e99f02c09665bde7eaf714e1744b9b32612973355459ad4
+DIST pypy2.7-v7.3.2-src.tar.bz2 21142873 BLAKE2B e6bcd2dc28ef740962d053753ccd172e3895fc83fe23a319c003248e0986f9805839daddd13a0f480f1e9ee813979742699cb0bc8c42b6b05c193fedf67aea4f SHA512 b40d93d615a27e3a035007307a8ab2b49ff90f3047af914b268a80feb8219d372eca14c04a8b0dea91efb992653457b7c6d088c784de32c414cc48879f2d15fc
 DIST python-gentoo-patches-2.7.17-r1.tar.xz 14708 BLAKE2B f6e25236a471649de122d0f29506f7a4f34044a568ead47a68980411d9722b761fe1f9d653d5edccb6978b65c8c1eecbef55f403b94f32b37c0ad68e061505a8 SHA512 ecdde5e38c6fe5e69691fb3a68c8f4f43da7857d4abaff763d3cf6ad864ba43c769c03b186b60f2736a1ffb1e3e4c9982715d1b8a99ff3f5740096153bb8a90f
 DIST python-gentoo-patches-2.7.18-r1.tar.xz 15500 BLAKE2B 7008b29827dbbd80d4ab8f010ccf9efced99c6b4b9109e4430c0ba269ce53529cb6fedd832502c8d2d3aa21938749cc3591c2545b21c0a59a6e60f8598e84ccc SHA512 e656ab07281fd932b92165674619bbf55ecf410d2937ae4ae771d490b4532540498cc731d30d19c1e8aafd1f64df8a406bbfbb46ea985b3dcd8edb89a0b7f20f
 EBUILD pypy-7.3.1-r3.ebuild 5851 BLAKE2B ebc9ea70cced86be882e8b58bf810b417b36463c9559b7a7816b4560fa0a03ca79489c9c9ddc0f5b7b9d3d5bddf36f7afeded2f8bfa2eb71e52738a2e03a8948 SHA512 71a7a5cf51767c1913a96af6afb03a91f7002c5d0c98aef66445e27d1e9cc6eda6af9c9c3267db2702f6b288ecb65906fa60df69b5d2f2287a838d4ff7c91576
-EBUILD pypy-7.3.2_rc2-r1.ebuild 5569 BLAKE2B d58e4e0bd77af60e7346702cd917fc303a3f112679e2f7836a42319a48166779553b8d9d3226d12fbca9ce78dacf71851bfde8bb53392ff55263359fa74175c7 SHA512 c51b11d163a0261e670455f7c93306d8eab658dcfa9020ed367891b5470cb528aac5c8165c68cd0f917f2ba2c333c3fde04c94c9f3a76fa3820bf993200fd128
+EBUILD pypy-7.3.2.ebuild 5573 BLAKE2B 8003673bb846858ea9718eeab505d4eb333c4aeb433f2c9f901f0fea2eb66b8e5d1a213598d4381903536a6d217d1e64bd01071b2ceaa37280d90908958ed156 SHA512 53664dd522887de6b54a4746f54a96c4f7bbe3c39dc935d285acefa989c651d1eefdc22a3a7be88dff15d7536db390c7cf25e1041ba4c2d63a5ba02cfc058092
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild b/dev-python/pypy/pypy-7.3.2.ebuild
index a5a678ffa9d0..90e8d764f97e 100644
--- a/dev-python/pypy/pypy-7.3.2_rc2-r1.ebuild
+++ b/dev-python/pypy/pypy-7.3.2.ebuild
@@ -11,14 +11,14 @@ PATCHSET="python-gentoo-patches-2.7.18-r1"
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python language"
 HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2
+SRC_URI="https://buildbot.pypy.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 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 1bdba79ddb92..e2a53b593be5 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,4 +1,10 @@
 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
+DIST pypy3-exe-7.3.2-1.amd64.xpak 11747236 BLAKE2B 5421ad051d2af6f88875591c99e801eab3991aa4a6936c0661f7fe131b13ec5cf9a261774f4ce6cae6202a9b0087265a457e2bdefe50110ce12c71e56885992a SHA512 6cdf308a12d2dffc44335b06e8e6212e559f329f0045fdfb8e3b5fe127d62b8881eaf8231a3b7f9ad7f628ac059a1e68a9bb2b43d677e59cfc81ea202ebf0898
+DIST pypy3-exe-7.3.2-1.x86.xpak 9043236 BLAKE2B 0c07e5bba6d44444c227e63dea02c390254b809a2c14a4b9faefa080e32a86849c354971eb4f1d13331e00e2af7e79d108a6f69fed1cdec0faf70ed8320b6c64 SHA512 8040abb95b2bd4144a456f429fad39492672b6f225951f93d138609a7265bdadff9d2ea0b4cf7b481cd9a16fa1017bdcce0f7a3afda27ab60c094cc2a0ba2a92
+DIST pypy3-exe-7.3.2_p37-1.amd64.xpak 11873959 BLAKE2B e9fcb007b18d5880955bca5828285d8eb6b258f41ade7f53c2aa77c0bd65bb4884501dd093a6d19e694315cc20423ad05eaffcf78f62815b783a311220989805 SHA512 59fea7fe0670fed68c1748c9a763c754261b05f25f0ce251088908f79b73b9d468aa2777b0c5cda394474db04e0e754999b49677051ba00a94f4dfe6fca7e4a5
+DIST pypy3-exe-7.3.2_p37-1.x86.xpak 9127420 BLAKE2B 23c7382980339ec4bb476acf99e587e7ff6128cc421bdd1758c6b922ec0cc1fb98c4895d28788d1184f3b6fb00e1954e517f58d33c3c10470c8d8c236fd43024 SHA512 f6680fca7a39b27117ea6aa680fc0fe78cec836413777860ff1adda21934ca6d0330364c7e3d97e9ab9f92fb3160e021cbfd016de89af6009526865164433f0e
 EBUILD pypy3-exe-bin-7.3.1_p1.ebuild 1093 BLAKE2B 7f26dae3be0bd6aa84dbf76aa8f6bbefffbbaf71701dc5f032ae62d36022214fcfcf977512aeef1e5de96f174922fc1ef94f416eebeb42aedc379eda371f0f3b SHA512 fad45a0aaa788da299e62bb367391795a9300a1acec31b202c90edc35d4223cfa4ebe734f58615d1741f221f798da3b977ddc2e248b3a139852cb4caa2ba235c
+EBUILD pypy3-exe-bin-7.3.2.ebuild 1088 BLAKE2B fa81b28f520227698b80f0219a9e4a02134d151ebfeffa940661f7c8f25cb76d18c89a303919673f7f46631f96e62d9314d03611535143f963fdd4304c21b678 SHA512 176008be08c86b6c5dc7412409e9e16b4702af20b95d80c8149272f54ba4b63a4301a2c75ef74045aebc67d0200b518f551a5d7478051c4a0c40ceaa43e41f15
+EBUILD pypy3-exe-bin-7.3.2_p37.ebuild 1117 BLAKE2B bf745cabe2c1ed81a366fd5095c9a273877fa1e58f2978dc52d1ab2323d96345ead7ddf35acd3e6d86a3dc0eb6a7f81f468f9b19f3cc264120a9d75ceabf2ddd SHA512 ec5f2c73118651b2f7465a05c0fb59ad4459199a864830622ec08fb83487ea965ba7ed9215e146bf7f93c3f74a45d8b9986a2885059dfbee52113d0d66d43a4d
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2.ebuild
new file mode 100644
index 000000000000..345dafd4e829
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+QA_PREBUILT="
+	usr/lib/pypy3.6/pypy3-c-${SLOT}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy3.6/pypy3-c-${SLOT}"
+	pax-mark m "${ED}/usr/lib/pypy3.6/pypy3-c-${SLOT}"
+}
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37.ebuild
new file mode 100644
index 000000000000..e8930a159077
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.2_p37.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils
+
+MY_P=pypy3-exe-${PV}-1
+DESCRIPTION="PyPy3 executable (pre-built version)"
+HOMEPAGE="https://pypy.org/"
+SRC_URI="
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.amd64.xpak
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/pypy/dev-python/pypy3-exe/${MY_P}.xpak
+			-> ${MY_P}.x86.xpak
+	)"
+S="${WORKDIR}"
+
+LICENSE="MIT"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	dev-libs/libffi:0/7
+	virtual/libintl:0/0
+	dev-libs/expat:0/0
+	app-arch/bzip2:0/1
+	sys-libs/ncurses:0/6
+	!dev-python/pypy-exe:${PV}"
+
+PYPY_PV=${SLOT%_p*}
+QA_PREBUILT="
+	usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+
+src_unpack() {
+	ebegin "Unpacking ${MY_P}.${ARCH}.xpak"
+	tar -x < <(xz -c -d --single-stream "${DISTDIR}/${MY_P}.${ARCH}.xpak")
+	eend ${?} || die "Unpacking ${MY_P} failed"
+}
+
+src_install() {
+	insinto /
+	doins -r usr
+	fperms +x "/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+	pax-mark m "${ED}/usr/lib/pypy3.7/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index 6457e619dd37..f3d6122e34ed 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,7 +1,7 @@
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
-DIST pypy3.6-v7.3.2rc2-src.tar.bz2 22750248 BLAKE2B 6a8a3c4306cb5c796ee89f3d9ece61f5d669515ae9edf4961f43c7779123554cda0f3b433f8264d3d08e531ef5fe660b494135321a11f441ae1de97ce0abb332 SHA512 a89184314d04bad646cf2e2151e2d5f27ca23a68f25e22b5c2e4f07745671e70c71d869be1c61248ee839632f7151b597fe79eb5af814967a1ae97f2c2cdb8ee
-DIST pypy3.7-v7.3.2rc2-src.tar.bz2 25066853 BLAKE2B 286ec0909d4b9ba9039cd9ca234a90832e99369f5e7e36a486d219661631efac186e02146dd5bc5a51521fcfdd0047c3fa5a6dbffd20cebe8ff7c209d02fec53 SHA512 c8e5dc5ded2989aa3a6b635e040c23bb8e2812101ce22a104f251e0abaa3320b61f2f611ece58d6b8a8ae9f1cbc8ca22c920f3491dd5653bcb0e05264fd54a4f
+DIST pypy3.6-v7.3.2-src.tar.bz2 22736022 BLAKE2B e2338ac3f7af06b987c43e93eab9ff14d46262143472b0393b30b011fff67d33add45d8198cee7109354e09c52a2540938abeef364b0cf12f2891ca9c7aac2a4 SHA512 ed861a57d6edf1548c061d10295313a05d0ac54fe68a8755211ff76fa2dc78d7b1479c6152dc5d0d1cdce4e247c240c1a2edf59ec8a53d0004ec7713514c9c35
+DIST pypy3.7-v7.3.2-src.tar.bz2 25060911 BLAKE2B 35ecfee4c64e13539827c65a61e0cd359de4046f77553629cdf63479327c6ad86afd1443caa7a911a6271f496f0f3caf1b919ce91de717d0a71d008927b7f77b SHA512 563a9cf63e818b95aeb14c25b55bb5fb0bf8283f0b9f2bdd9a8833989beb651681f53f52368fb9db2c75fb60be0456eec87d48b557740b57847c4104003cb288
 EBUILD pypy3-exe-7.3.1.ebuild 3458 BLAKE2B 70d5be9e72cdd482d6f2107143cd79ddc024d50ef242b7fdf467d91c9a2d3c1130510750c54bfa869220fb248aba7fb46c9ce7b50dd0cbc69d55c23c98a3b60a SHA512 2b986efb595c46e284e96cfba530fdb7f16a6d931f015b98ab1254ecb142064ca562e9cfa797d6b28dd942b74640ba5d7436afbc360c42582f45d1e105a2c7e3
-EBUILD pypy3-exe-7.3.2_rc2.ebuild 3460 BLAKE2B ee6b32591968dd52639dc1b629b40d2501c892a9f96dea1982d1096bae4ea01ac90ee676bb7ca3f36617da677ce8de7692f83ed192b9f0ece463a76dacfe8d37 SHA512 e04629e3d99ff807e09a1d1dda16f1eee722a6a7bcc85c238b026b39df3319bc5f988258a029d52ff57e4e1c67218daca3580c90dc40152079c67012b4917436
-EBUILD pypy3-exe-7.3.2_rc2_p37.ebuild 3499 BLAKE2B 35b65f641337763788ad9c8a58ce41b36533a9d6b6eedcdf7e58e6806114de1a3454423968372629a2370b6054177b4292ad639f3358554659115f30a04898ee SHA512 112e0e868cb4e627365b21a399b237e8d46635feb807a900fe49440f6935a5c5126622a2628a40c660882ec33d045ad8232f32353a377b31f55e0faf36daf8a1
+EBUILD pypy3-exe-7.3.2.ebuild 3641 BLAKE2B 745f107bc0f5efe5e3a4ce67de747d3230111262787aca7e893edd181a1416f2a3c2ce9885d4e08e0d81d6606b74b41c919cc10d6a8cb7407fbf78f793554270 SHA512 9674383075e1861344854147e405fb9d31de7abda958095118be14af725f9ecb846881f49080e8fbbf2ae3ce4ca05ba7512c351ddf8338f0d9b2fbef93d5b234
+EBUILD pypy3-exe-7.3.2_p37.ebuild 3680 BLAKE2B 37640296820c961bfb69fd153faafaa03693758be90ec58c5b5bcb586fd12d4af9033e5a39a3bcb671c24f1e51781b793a97769494fdf482c2fb17dd8883513f SHA512 bdb87e56c6577494a6044157b8f065676cd331be132117155a9d2f1838719afb0af84b5f0344e84b16ed7f1e27326de78550da8af642e0de66be150b484fd8fc
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2.ebuild
index 24b904343e13..a8648c1e6ea9 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2.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://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
+SRC_URI="https://buildbot.pypy.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 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
@@ -31,10 +31,7 @@ BDEPEND="
 	!low-memory? (
 		|| (
 			dev-python/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
+			dev-lang/python:2.7
 		)
 	)"
 
@@ -129,8 +126,16 @@ src_configure() {
 			"${EPYTHON}" --jit loop_longevity=300 )
 	fi
 
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
 	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
+	# we're going to build them ourselves since otherwise pypy does not
 	# free up the unneeded memory before spawning the compiler
 	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
 	echo -e "\033[1m${@}\033[0m"
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2_p37.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild
index 8c73602fa5f8..5992fb3e87ef 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.2_rc2_p37.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.2_p37.ebuild
@@ -11,12 +11,12 @@ PYPY_PV=${PV%_p37}
 MY_P=pypy3.7-v${PYPY_PV/_/}
 DESCRIPTION="PyPy3 executable (build from source)"
 HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
+SRC_URI="https://buildbot.pypy.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 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
@@ -32,10 +32,7 @@ BDEPEND="
 	!low-memory? (
 		|| (
 			dev-python/pypy
-			(
-				dev-lang/python:2.7
-				dev-python/pycparser[python_targets_python2_7(-),python_single_target_python2_7(+)]
-			)
+			dev-lang/python:2.7
 		)
 	)"
 
@@ -130,8 +127,16 @@ src_configure() {
 			"${EPYTHON}" --jit loop_longevity=300 )
 	fi
 
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
 	# translate into the C sources
-	# we're going to make them ourselves since otherwise pypy does not
+	# we're going to build them ourselves since otherwise pypy does not
 	# free up the unneeded memory before spawning the compiler
 	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
 	echo -e "\033[1m${@}\033[0m"
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 8789ca89d8d6..9834f5023f01 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -4,9 +4,9 @@ AUX 7.3.1-gentoo-path.patch 1565 BLAKE2B 3c444b8112fd40de747fae75cc6d6f5ff8d2ecd
 AUX 7.3.2-py37-distutils-cxx.patch 14756 BLAKE2B 3524f2fbeef2b23a17c2248fbe07e0b194f2d6cc8be9c4ffec9c7a745421577d0c246a82c61afbd4af116f6ec756ce11988093e3e0a74337868530382206dd7d SHA512 e590266f1f6f5571b0056fbbf38c54bd7f07bebcdc009dbfaa3203aaeb3f70eac0f9b281df3ec04771960dea930b30ae861bb1dbc886fa28dfb8c58e484f6a8d
 AUX python-3.5-distutils-OO-build.patch 3627 BLAKE2B fe4fd23515f0d1cfc236ac3e773b6a70a9b0fbbaff4719c1f1621e21433cfdb1f53b6bf5f348069d7bf03d26bd039f793e4ef2ac4f6271062d83c088ccbab56d SHA512 5e8e4ab7d326386a244df9d0fca5b54e16b5943e35d12ecaf9ea986e79d2d8d8e85585f6286e0fc440dbb7a8c17e2bcf7a11498ff9cc5f523e97d8b353d9a511
 DIST pypy3.6-v7.3.1-src.tar.bz2 22712809 BLAKE2B 4250b3fe98c611b9635319c106b80e88ab469eab5f883babb738e175e7b7adc22c85f8ef3fdce1cdc127b521beef8d6c7862e188d8c8889c39f90136d6bbe374 SHA512 f8e32aae7f01225e0e4d6763eaac40fc02dffc3d0b6a30f22d422147f9be4f3290ea78160a912ffae311dea3d503eb31a7a4f3999d3b541fbccd93d1cef4ca56
-DIST pypy3.6-v7.3.2rc2-src.tar.bz2 22750248 BLAKE2B 6a8a3c4306cb5c796ee89f3d9ece61f5d669515ae9edf4961f43c7779123554cda0f3b433f8264d3d08e531ef5fe660b494135321a11f441ae1de97ce0abb332 SHA512 a89184314d04bad646cf2e2151e2d5f27ca23a68f25e22b5c2e4f07745671e70c71d869be1c61248ee839632f7151b597fe79eb5af814967a1ae97f2c2cdb8ee
-DIST pypy3.7-v7.3.2rc2-src.tar.bz2 25066853 BLAKE2B 286ec0909d4b9ba9039cd9ca234a90832e99369f5e7e36a486d219661631efac186e02146dd5bc5a51521fcfdd0047c3fa5a6dbffd20cebe8ff7c209d02fec53 SHA512 c8e5dc5ded2989aa3a6b635e040c23bb8e2812101ce22a104f251e0abaa3320b61f2f611ece58d6b8a8ae9f1cbc8ca22c920f3491dd5653bcb0e05264fd54a4f
+DIST pypy3.6-v7.3.2-src.tar.bz2 22736022 BLAKE2B e2338ac3f7af06b987c43e93eab9ff14d46262143472b0393b30b011fff67d33add45d8198cee7109354e09c52a2540938abeef364b0cf12f2891ca9c7aac2a4 SHA512 ed861a57d6edf1548c061d10295313a05d0ac54fe68a8755211ff76fa2dc78d7b1479c6152dc5d0d1cdce4e247c240c1a2edf59ec8a53d0004ec7713514c9c35
+DIST pypy3.7-v7.3.2-src.tar.bz2 25060911 BLAKE2B 35ecfee4c64e13539827c65a61e0cd359de4046f77553629cdf63479327c6ad86afd1443caa7a911a6271f496f0f3caf1b919ce91de717d0a71d008927b7f77b SHA512 563a9cf63e818b95aeb14c25b55bb5fb0bf8283f0b9f2bdd9a8833989beb651681f53f52368fb9db2c75fb60be0456eec87d48b557740b57847c4104003cb288
 EBUILD pypy3-7.3.1-r3.ebuild 7051 BLAKE2B 06171de220f62a018089cde90e190412f3e8db71163368eb0af7e8c6b6cec4c7f7d90f448683063f15e38323ae98ce5bef24e9917dfcf7ccf30baeebcbd9b708 SHA512 f82b2cb6e45768a58757070550c11056b010a4bc627195319ecca16ed7d1d1c225b08ee7eb7121c0bd9169e15403d6c8ecd5a38d5c2e7db705ae92039f367353
-EBUILD pypy3-7.3.2_rc2-r1.ebuild 6590 BLAKE2B 98d08f0608eef083f950e32baec3108488222bf4db581a64d1cd3231eaeb8daa9edaee4791eb66f26287f66b2c6d815079f63d67ee287de25bd93b69cbc384bd SHA512 6f28d8ad0772327112eceb8ccd1ad93d13b22420acf263fb980cd734694a0679f4ca86fc8e11d9db14644981cbbac6a502d6ea3b9e13f30bce31b1a5cb1d33fd
-EBUILD pypy3-7.3.2_rc2_p37-r1.ebuild 5419 BLAKE2B d0fc27f83246f05edf8b66462762252d2e040c2c6c0f57c43ed59da5bbf0c8bf57a5eeb496d8021114364f12d5ae5713f873002a4dbdc9b508208fbbb5f2cc78 SHA512 113c42cbc9f63ce45d9039c0f864792a6d3d6340dd1e06c11eed93208d2ac4804334802fce7709e98e6f4b36c468a49dc24943a35bfb5c8b11c1015132c44d34
+EBUILD pypy3-7.3.2.ebuild 6594 BLAKE2B f49b8c3f494bae513df46e3b13109550858382e46a0575ca2da01c2de8550e30f2bdf4627e12f4391e94fa5c05a1afbb6eed5a7f8cd58e63b27dda877e6fc28e SHA512 c48cebb3c91c0f9612299265b513734c27629ec509275e2c7ac3862036cd648f516ab2ef38dfaff3c3b23603709f445ecd158bb2c652c0ce0d9834f4a3ed528b
+EBUILD pypy3-7.3.2_p37.ebuild 5423 BLAKE2B 1c0a61ad14c9f76d069aebf3c7d2f55d4278936f3a591eedcf10d58070d3508504122e5e32775e1f262ad7eccdb7c26795518b1edfb8e162aee3fc6324d3533a SHA512 840e0fc134f7523e0dc6780c7ff38b81c1033468570f3b48326de5f0ea5c64ca9c34e7cb8603ba85084a412c84f44043f966ff411b632388752692c8feb30896
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild b/dev-python/pypy3/pypy3-7.3.2.ebuild
index acb328c4e725..c0706600dea4 100644
--- a/dev-python/pypy3/pypy3-7.3.2_rc2-r1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.2.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://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
+SRC_URI="https://buildbot.pypy.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 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild b/dev-python/pypy3/pypy3-7.3.2_p37.ebuild
index d750cf9c4b2b..9c1fc7d860ba 100644
--- a/dev-python/pypy3/pypy3-7.3.2_rc2_p37-r1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.2_p37.ebuild
@@ -11,13 +11,13 @@ MY_P=pypy3.7-v${PYPY_PV/_/}
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
 HOMEPAGE="https://pypy.org/"
-SRC_URI="https://downloads.python.org/pypy/${MY_P}-src.tar.bz2"
+SRC_URI="https://buildbot.pypy.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/pypy37-pp73"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit libressl ncurses sqlite test tk"
 # pypy3.7 is in alpha state and a lot of tests are failing
 RESTRICT="test"
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index 3b5d3d587baf..e9d72c58460a 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 530 BLAKE2B fa0c29d6cfb5ec5164141587d35242fcc93cdd9064b3a4145f9629e0b87f50632436f3fb81539fab2fb167277c5e443b3fd9881dd171540e034aede332c03a3c SHA512 d18b985d1ffad0cec8120cb4dfbbda2b96a7bc2d496c75c4ea456c9222e78443aaed378aa185bd7cdea74650bde7d80460b105c254927416f42f35ed447379bd
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 537 BLAKE2B 6b95e1fe3ce5eb0ef521eac7fcd3535d5d69683ae30cfd4bd9b0914fbf3dc4068d45a86731ecfcbe5f37c7769a9c3385d42d8a26bac43935abf588e94fb2023c SHA512 5a54903ed2e0a08a72260e2d3b9d0b30be8d88a34f735be73b999a55bf4022ebc19c6e131a235f2857bd5b39c51be905852556a16f468289b14f4025543c1641
 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 558fcf85a76d..f3e488461a08 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
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/pytest-freezegun/Manifest b/dev-python/pytest-freezegun/Manifest
index cd6cc8175c86..fd61bb37d1ad 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 690 BLAKE2B 3b710af5f97dd33b3c29c221ff999a30ccc15843bda26be386771f3317855d1c9f44616ac024c45966a98a4dddda8f85c8e521fc30e7e9190faeb845aaff02dc SHA512 58262f594385b6ac21a1162fe50e76ba6be56100985e196533f940fc98915357cb006ba7fd4c5e448fefea14dd48e5296393b325bda334710d5d11c9395e5bdf
+EBUILD pytest-freezegun-0.4.2.ebuild 697 BLAKE2B 1955b8341acc362650257dea0ba2cb4fa610e74e06a10029bc1a65c9db741e7d28b782d687b82a1af4237c4268d556402ea1d4a46081d0b1131b7d6914710e77 SHA512 5d28b41a39fc0bb3c23fd3ea4ae47fc105dbf5971ab0f593191bd03af1409e785b4b9522c81c40d8cc25cf96720bdaaa6e952252b1914898ad6cb9afef011c2a
 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 0bf347a70eeb..6b6213042264 100644
--- a/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
+++ b/dev-python/pytest-freezegun/pytest-freezegun-0.4.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/freezegun[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-services/Manifest b/dev-python/pytest-services/Manifest
index 75179458a2b7..5c97c0581f97 100644
--- a/dev-python/pytest-services/Manifest
+++ b/dev-python/pytest-services/Manifest
@@ -1,5 +1,7 @@
 AUX pytest-services-2.0.1-lockdir.patch 1085 BLAKE2B 09982cf4874d82a332b441e4538d1fb177735af3acb2ba2d7fed9c0a2ef006841ca0c4221fc51c0472a0a94c49bbcb72877c67b5c7630333f550e3fda1b5aa91 SHA512 7b5d4d5adb722936bd3593ed4e12fa2ca9bc3aa764565d9cbbea2d70424d9811d5838e97bbbe8fafa2f73acb8bdfa6c705e8c4aec12b5b6556b1e4c8db629ea9
 AUX pytest-services-2.0.1-no-mysql.patch 821 BLAKE2B 3a041e51c0e2c08ce8727eccdbfac36eacec2542d8d8cc7ab7544f46916b47a62e960437821f8fa85fe968b9e68808b94d9ac51fe06daf487008bfaf305ba81e SHA512 68788f6b6700793df2de4fbae85a41fad095f09ac9af717c786305fc1ca6b29438a65d096076b9469dc543a54ce8f72a40dc0f211eb9d517e658ce068e60ee23
 DIST pytest-services-2.1.0.tar.gz 20552 BLAKE2B 6359c419591efed553e095e267c24f78f36b152f0eefe21d46742f7c15f05e92a9e86891f99762a3716fef5284b00d07d8d6eb825008dbbbf07e36dc62a7a6b4 SHA512 54a487546a2af7996acdbcd63bfc01626832aa41683617cdd345453cf6518afdf03cb8c2465e1f5d28c88b2cc801ffb0d9d4440582865f899e21fe42ab431ebc
+DIST pytest-services-2.2.0.tar.gz 20995 BLAKE2B a65455d89190d6b63854df7509124c8056c962640972f67210e3b3dbf2d669708e4edb124077cd32e7fe429e884372f4248396377b5d4879d9f7313c3ef7df46 SHA512 48430d6c107626a4e13a8eb16cf5cc3b2068e34869b8a4e3e615fd7a20f3644a028c911211f3de885ffd942cafd3946c313e76ddcf6199bedc9731f7b88c843a
 EBUILD pytest-services-2.1.0.ebuild 1192 BLAKE2B 0b01249eaa29b1ed37b363052bce603ee5b5236c872de1e7c90fcf896037ec57d633888445fef215f8767d286f67afb8926980cb37bcdbbf49bbf6ef9fdcb628 SHA512 1d58a79178d31dc5b3846038b5e0dad068aa4b366717c4ea2c9a55bbdae85f18bbbdd435b850ab162c25c5248d370a632bc556bf9a51e653f2b613b2c461dfdb
+EBUILD pytest-services-2.2.0.ebuild 1230 BLAKE2B aa1641741f2dd98046110b8ebcd792a18fa543fed04416ad8022797a7b769dae44d31c8305a830c7c0cd39e850271e7881e4f57782b4d4594a5e98231c86cc02 SHA512 663661875a7a86caf50faae5e4cc518d78d8f62a62ef98bef46882c1185e6e3d95e996f039df17c0fbc6674fd876086949781de4afaa0639edc9aa653c6ca20e
 MISC metadata.xml 408 BLAKE2B 84e0589c8c4d813b4542e5d3080ad855611c320c9d5950a08c232c9fa344bca969fa4b23cf6d2b427731d2d30c2f678d33605207042779ea40123c6b249017ed SHA512 de1340d8f01941355ec01b2f92b4e89ad798dd9438e858050861dfb8c139994b5e8fe620b00fcc8133204ba8d265eac36f60ba3bca3a4e0da49332da13b75a9f
diff --git a/dev-python/pytest-services/pytest-services-2.2.0.ebuild b/dev-python/pytest-services/pytest-services-2.2.0.ebuild
new file mode 100644
index 000000000000..4d08d2390cf1
--- /dev/null
+++ b/dev-python/pytest-services/pytest-services-2.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6..9} )
+inherit distutils-r1
+
+DESCRIPTION="Collection of fixtures and utility functions to run service processes for pytest"
+HOMEPAGE="https://github.com/pytest-dev/pytest-services"
+SRC_URI="https://github.com/pytest-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/zc-lockfile[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( ${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		x11-base/xorg-server[xvfb]
+		net-misc/memcached
+		!dev-python/pytest-salt
+	)
+"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/pytest-services-2.0.1-no-mysql.patch"
+	"${FILESDIR}/pytest-services-2.0.1-lockdir.patch"
+)
+
+python_test() {
+	distutils_install_for_testing
+	pytest -vv tests || die "Tests failed under ${EPYTHON}"
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/pytest-xdist/Manifest b/dev-python/pytest-xdist/Manifest
index 8112d7c3154c..42b4f3d033e8 100644
--- a/dev-python/pytest-xdist/Manifest
+++ b/dev-python/pytest-xdist/Manifest
@@ -2,5 +2,5 @@ AUX pytest-xdist-1.34.0-pytest4.patch 1839 BLAKE2B 6f16b51b8b8415390d66b5763afe0
 DIST pytest-xdist-1.34.0.tar.gz 66151 BLAKE2B ac5274e32b3ef6b72113efd4300eb6946a977e0e202d3383abcdbc022126b7806edb326ddc16abb1219e22eb091e06a9c39fce3031aaf5943d4ad653a47af142 SHA512 69e9877ee0268d71d7c0ca202ccc46b3ba1a9271f0e6e4ac4b76602833f9b7012364eb6924ae994e76c1d48d63adf1702d4c5e6ed5b75c52ac7ebae958210e24
 DIST pytest-xdist-2.1.0.tar.gz 66332 BLAKE2B ac3c19a32bb9153537edfcf55bc656011661cf0d166da1aba969055a398616bb5782534a12ba354175be722c070fcfb2013d58405048814a3d11434a314e38b8 SHA512 85c69d8e649a19de5639738eae4cb213dc7323d96883ec82f39ab51a196346edd9fadbaf97f9763ac0dea104bc123d521264a39d2701878edfa76ce7e5bb347b
 EBUILD pytest-xdist-1.34.0-r1.ebuild 1036 BLAKE2B f576f44fdb55876e9cf7ccaec9ce5ffeede2095111a48f2455da590cc4c053ffac094b21baad142dc9ed54c654af423b29c4f7719dd32ff49da2d2f149e666d3 SHA512 3dc96e04f982a62f24f9ab9b2748dbd1a97c486ae3feee09b2e6fbd1ae4af6910455c456537453fa48d3cb85e03ac09acd7d26512a054e3aff83b5dc28591f62
-EBUILD pytest-xdist-2.1.0.ebuild 948 BLAKE2B 929903847fc4f7364e877526a1b0cc86f67914c1a2d398ca56b925cfa34054f73291fa24081880517b652ccf8b1340dfff980ef607f3a04e66abcc59e5946d93 SHA512 ce13c2b58cc23a5ce988d09fc1d8e91913446969030e28db095ff9e6dfc9838cac666df59bc976326679f75ae2331db09e37a6b3a2f7b68f1e02343041093dd3
+EBUILD pytest-xdist-2.1.0.ebuild 940 BLAKE2B 99971cbc66925d5852dfba23c3495281f1221372f0e9e48332908297707ffc4214153ac422965d2be7c4ace98e747d0ff3e531031f1d0d7f05f71d625a73850b SHA512 4def0ad0cfe6f8f3d9dc38db668e502fee9f9e2cf9a14578279cc5b21bb8e0dd35c446a838543b4fafc357f39659e98d2aca5e749c3f782dd5c398523b30ecc6
 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
index 75f1a49f1a2f..ef6d90f384cc 100644
--- a/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
+++ b/dev-python/pytest-xdist/pytest-xdist-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 # please do not depend on pytest to avoid unnecessary USEDEP enforcement
 RDEPEND="
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index 87cfa89ca7ad..931f179545ef 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-xprocess-0.13.1.tar.gz 10273 BLAKE2B 0c2a8bdf5e31543b32ada50f2bb5e1a09b45de820064807bf41321638d11d6b6fea28fd2a8c795e7bc6f7ac7370a3e78988e8aee318fad9df194fd3b06cce7cd SHA512 e0ab9e13d7f90ffca1bb3646e5789582806519ff5e665e13ed0db00896d799a7828b39e7657e947783d15ec1a961b33c1c981e39069dd298bf352826dbdc496f
+DIST pytest-xprocess-0.14.0.tar.gz 13272 BLAKE2B 54a308b2d2783875c51b747c6c54fc7d8bf3542ea80590bdd51de0ee4ffeea73463793cfcfa8b8b75b45345b88ca4caebf3f5e45bc1de3fdc1649e0bdeebd72d SHA512 fc808d10f4adea1fba501178e30f82af575fa64fab9e3f44a73f1f1e809a09530be465d20be91ca0abb1fd270e9ebc397d64bccabfb3dc497b7b8f1123ef1fad
 EBUILD pytest-xprocess-0.13.1-r1.ebuild 630 BLAKE2B 43440cb9b303a3c2abdc4f29eea0f8a37a05dda6030d72a9632fdc4a6b3acbb7327be5121cfa051143a104edb9c141e991c3418162e6ae811e07c639c83a6466 SHA512 0694a9b4e2f5dc1863d9b826eb043bc27b5e9b5ca3bbbbe15f5f90640e66f16ba781b12778ee7d6501e9c5d53eb7cd07358ba987a753d1df5eaee183570f3e8b
-MISC metadata.xml 424 BLAKE2B c4e4e4a90fc6e7dd7e474686b1a0215a380925523d3d41cba07cd5f59f0ce322a2e8fd10cd834ac263bcdef2d0f62bfcb48bf85373036bd8869f764ea06ef788 SHA512 822c6bb63a93d2ec81c4d7c00faa75ba7e97813f510d570385f075a1a0b641408d6323c9718ddd899fdf25b2d198204c5bba38604a593841a7cf89c44410134b
+EBUILD pytest-xprocess-0.14.0.ebuild 638 BLAKE2B 57a2292c5fc28288bfbee85a36e17c803b2b5ad0923c559cbc64d7546d2855b9f1041fffbb80870682ce8c7ab40e86e7915a9e4a3bf834fa43ad8fedae30d6e8 SHA512 15a917078d76247016db8108becdc434c944965b9e63e6939eefe976fb5942793010933a7534a507eaf6340aff99b42c25c2beb289edf851719afa0d525a01b9
+MISC metadata.xml 421 BLAKE2B 616045f871631311e9310ebda14f2bcd936b7a721196f9312b6270bbf8713789329b56ba058cb412d31e68e91957666ce9f44043527efbd0842dece87ebb5f5b SHA512 4d5b9f41b7aaebcb87c8718a98b1dbb3df0f199a5f6940bd12e3504ff5080a0ed112b315c89e2af1a5a3220829879afa0cdf931828359ff98732311200b76b9d
diff --git a/dev-python/pytest-xprocess/metadata.xml b/dev-python/pytest-xprocess/metadata.xml
index 0052c5ad8164..e123380870c0 100644
--- a/dev-python/pytest-xprocess/metadata.xml
+++ b/dev-python/pytest-xprocess/metadata.xml
@@ -7,7 +7,7 @@
   </maintainer>
   <stabilize-allarches/>
   <upstream>
-    <remote-id type="bitbucket">pytest-dev/pytest-xprocess</remote-id>
+    <remote-id type="github">pytest-dev/pytest-xprocess</remote-id>
     <remote-id type="pypi">pytest-xprocess</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.14.0.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.14.0.ebuild
new file mode 100644
index 000000000000..d9f406cc465b
--- /dev/null
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.14.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Manage external processes across test runs"
+HOMEPAGE="https://pypi.org/project/pytest-xprocess/ https://github.com/pytest-dev/pytest-xprocess"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 65e94d3f0f05..838d0089dce8 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -4,8 +4,10 @@ DIST pytest-4.6.11.tar.gz 952305 BLAKE2B af07adf5e8fc614b1fdb7b5673fb9c557ff0dd3
 DIST pytest-5.4.3.tar.gz 1022353 BLAKE2B 70d4f23cbbfc4c4ce63c512ee0a01556973761a6d3ebb71a6d9ed4fb4a4a21531e1b151ed0e4c5e56e5dd3243a1a272441f17c4c2c4e3b0b19c24654b74e8e52 SHA512 0a07d4f4f791969c6f21961a0ba0f8c6670e5870c6cc1cebf93766587bb9cb3e10db8e57f0bd33dd22b275f3aad7aa674949f124ac80e0ccca64e35be4beee4e
 DIST pytest-6.0.1.tar.gz 1069631 BLAKE2B 89a78ebf8e8cf968ea767fe7244408ca79d247c1ca459815ac299ce773b44c375429935c8a25b4de26349969113c60e4b6812d5aa2d805691664af74796ea85b SHA512 bdd790c3860da2ed3a3ff47f04512c3bfae4fa1e31fc6b96fc19bd57d1804a6fec968ecf17a11c5b20d30dcf82d6391ef0d893ae57a3da9ad777a15c078c129f
 DIST pytest-6.0.2.tar.gz 1070533 BLAKE2B 54397bdf8255641e1cb0555a78b3687a49376d9cc603a98b6df3415159aef0331cbaa7d0883bafbceea1b2273fc0ba5c867f7b66eef5b2b4c24f3e5196786877 SHA512 478d28c30f4f990dcdd98edcd074051e32d9ab25941c21bdc9c4cc47b726da79b5b3a01572ff97f608598ef6bb9df075ebba49abb2f1420947e0c6d4fe0be9c8
+DIST pytest-6.1.0.tar.gz 1083563 BLAKE2B 79da2026ba6915b406a1b6a2c8d79e5f45695f32e8f9369ef3c27ebf9b3f80ced23b4832c75c47db552a084f03a68da04279fdc8c8ef526a41e42deed0a52b5e SHA512 a67571468315eea7ed5b56285f18b239b47992bfc7d4d891587f1c540f240159219be15a9a34852529ded7743bea82eb9cde4bcdd053f448a61a6c835b5405de
 EBUILD pytest-4.6.11-r1.ebuild 2473 BLAKE2B 4a5edd72d94553b553730a5caa2c17c25826a5be58bce6273d39d2a010a70c1fa1f8acb0751c3fe5185883a94da31ecd7e772f606c82d8d99b639804bd49d5d4 SHA512 da60063475df3b7e9e531b234e486bcafe7c1e926f58f7ebaa8e38cb02233629160aa20a9b665fddb83e50f52b0b46702b8a80e65195af4ff7b3e939927db9cb
 EBUILD pytest-5.4.3.ebuild 1940 BLAKE2B b17bc0f3efe70c149ee494d2528f8e16a839c4cb2965378ab6c8b37e3c1b295bab253edd8410f6f2a69cbeb288d6299898320d387330e2d7b5b31418e985a0d8 SHA512 d99fa3064053e3ac99fadce4b23749e16dc2d9e6658f3ab07b1e68c1885d9fd243f4ab4f5462e127b9afdbb957bb498c41126ce79164a31cb2accbbaa1f4b7e9
-EBUILD pytest-6.0.1.ebuild 1640 BLAKE2B 299366a4eef7f503de1ca25c551235e508df299827c365d9b3c45a5b6244b425ede0fc2509847b1db542a034141c89e145febd752b232c650a5ff28d3ccf3ac3 SHA512 c8e65d1e3c4f8224ec53630be82f19d57ea90ae8073330cf4f5b1de6a1a057aac885e234211110639e117dc717ad6b162a963947d88c72305af957d23fceb80d
-EBUILD pytest-6.0.2.ebuild 1639 BLAKE2B 2717ed1f35c783793700e904c29e5a94372787cc7d6b7d0200aa0c90dd8aa56818db06bf3328f449727f3a58c7441171f0df5fd49ce132c798778f65bef59995 SHA512 632c7acc6f09cce77307310a71e55f872c73528388da3113582c6cded7b9cddf77ce8c6942fa45cd35ee3f2c40f82bc05f5c004ac8f653ade0dcb673329463f1
+EBUILD pytest-6.0.1.ebuild 1637 BLAKE2B 760ee5651a0f09ce50a8a955d740cf5d64063cd174abe19780152f895115a3ba7a5b9e1dea444086d67f701d0622f153e72bec014fb1e03caf8669cb5d893499 SHA512 0c37af8239aa9a74f793a551c451027b180d1d216c6b8ca6b5089a38389f5ce5b220d8ad65a0f360028068fd6b38ab52a2fe6022fc306bc5358e618942bfdfcd
+EBUILD pytest-6.0.2.ebuild 1646 BLAKE2B 48fab75ea46eb167d9b608e1d61c6387bafc8776b1d29221390060ac14a5c90e7f8f79dc839b78ec46e9d1a604b444dcbc0324a7dadae892e4fb4e683e31b1d6 SHA512 cd9c7e5cd34d952188a6d0f6e07545c42fd31674eca3fac26b1ea3323734804abda3468f100f297d37c332260e2e9c5616bc5879f1ac52c1cc18f19b1860916f
+EBUILD pytest-6.1.0.ebuild 1639 BLAKE2B 2717ed1f35c783793700e904c29e5a94372787cc7d6b7d0200aa0c90dd8aa56818db06bf3328f449727f3a58c7441171f0df5fd49ce132c798778f65bef59995 SHA512 632c7acc6f09cce77307310a71e55f872c73528388da3113582c6cded7b9cddf77ce8c6942fa45cd35ee3f2c40f82bc05f5c004ac8f653ade0dcb673329463f1
 MISC metadata.xml 333 BLAKE2B 2155c30735de72aace8fe3e88a16c011f3961b4b644d761be31c45094f243f1eeeac1803f5a74219198039dcf1f7474531b2ec814a3ed591c59fd6d9ad5a914a SHA512 c59e04710dd640b2e7bb0214e52b05ec50367d895d057886ae9bf9342312006e7b21f5625e1c4f5d7a9e12a7f7b64a968e5371f8c2c45a8ac8b1c8ca6d39b10b
diff --git a/dev-python/pytest/pytest-6.0.1.ebuild b/dev-python/pytest/pytest-6.0.1.ebuild
index ef8c99c827b4..3720e6e0ee6b 100644
--- a/dev-python/pytest/pytest-6.0.1.ebuild
+++ b/dev-python/pytest/pytest-6.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-6.0.2.ebuild b/dev-python/pytest/pytest-6.0.2.ebuild
index 79c06ee7d705..6f3c17ec4430 100644
--- a/dev-python/pytest/pytest-6.0.2.ebuild
+++ b/dev-python/pytest/pytest-6.0.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pytest/pytest-6.1.0.ebuild b/dev-python/pytest/pytest-6.1.0.ebuild
new file mode 100644
index 000000000000..79c06ee7d705
--- /dev/null
+++ b/dev-python/pytest/pytest-6.1.0.ebuild
@@ -0,0 +1,62 @@
+# 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="Simple powerful testing with Python"
+HOMEPAGE="https://pytest.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_{6,7} pypy3)
+	dev-python/iniconfig[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	<dev-python/pluggy-1
+	>=dev-python/py-1.8.2[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+# flake cause a number of tests to fail
+DEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/argcomplete[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/xmlschema[${PYTHON_USEDEP}]
+		!!dev-python/flaky
+	)"
+
+python_prepare_all() {
+	# fragile to warnings from other packages (setuptools)
+	# little value for us to run it
+	sed -i -e 's:test_no_warnings:_&:' \
+		testing/test_meta.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	"${EPYTHON}" -m pytest -vv --lsof -rfsxX ||
+		die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 6f89c201b125..c4e2929ba68e 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,3 +1,4 @@
 DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
 EBUILD python-caja-1.24.0-r1.ebuild 1238 BLAKE2B c6246ec404142eae09fbd15ef22a9a58611b1f843542cb40b0a9ac2c6b6828a3c741751cc88c5a06d1cf9718252d0ac83447d390c2db3671c020e65b15a9eb38 SHA512 0c95e497ab243747de397a450634409cdc293fba2143fbc1f48dac7be77eb8a769a0e5488786978e9c82109bfa1117db5d6e82a40da347ab945a59a5516c5720
+EBUILD python-caja-1.24.0-r2.ebuild 1236 BLAKE2B bf8ddc677f7bdaa33c3fbcc466a1a3e398727f5d13e1554bcccf35e3fddf72343504881d9cd07ab465a379445af4c1b804c59ee950469735418f7bd701d8e953 SHA512 39f4f9909268860e40c5083a66fdb11435a857e61a0c55979648975ed0c6f7789a99f243e1f0646130bd3a4f9756e8e818be2bced872c6d1063e3b0677b36887
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
new file mode 100644
index 000000000000..622b4373e83a
--- /dev/null
+++ b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+PYTHON_COMPAT=( python{3_6,3_7,3_8} )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Python bindings for the Caja file manager"
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="doc"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2
+	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
+	>=mate-base/caja-1.17.1[introspection]
+	>=x11-libs/gtk+-3.22:3
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+	doc? ( app-text/docbook-xml-dtd:4.1.2 )
+"
+
+src_prepare() {
+	MATE_FORCE_AUTORECONF="true"
+
+	sed -i "s/\$(PACKAGE)/${PF}/g" examples/Makefile.am || die
+	mate_src_prepare
+}
+
+src_install() {
+	mate_src_install
+
+	# Keep the directory for systemwide extensions.
+	keepdir /usr/share/caja-python/extensions/
+
+	# The HTML documentation generation is broken and commented out by upstream.
+	#
+	#if use doc ; then
+	#	insinto /usr/share/gtk-doc/html/nautilus-python # for dev-util/devhelp
+	#	doins -r docs/html/*
+	#fi
+}
diff --git a/dev-python/python-efl/Manifest b/dev-python/python-efl/Manifest
index c9d778961012..90590cf3290b 100644
--- a/dev-python/python-efl/Manifest
+++ b/dev-python/python-efl/Manifest
@@ -1,4 +1,7 @@
 AUX python-efl-1.24-clang.patch 1611 BLAKE2B 132c1f64c2bbf8a0a30fb154c6fab367141c0e65f363c17f4881dc3efac66792ac1c9be652a896c11296a25d77a4a138b6452749f02502075d95828eb42816ea SHA512 11d7ca99d06642f7bdfc3bc72e86dee56f9c47a09a17e5533296fef296bcbcf7d75c23f5ba5f8088f6daeb2ff5982840abb6cd2e9ae82345bdfb1ca5325237db
+AUX python-efl-1.25-clang-crosscompile.patch 579 BLAKE2B d308bf06950094a00fbbad24f4813b6dd511122071328f01ab2bd774ba1cd79cca7cddffc8dad4d65c8cc83430f99d59a55dfc2a5d4805a54f62ae0ece880a3f SHA512 3da1b63c7d40dc8027db5bcd6ab165789790e4db8c3ad876d55eda9363557cff8a46858a2ca8c23d1bb8e1e43bb7b057ff596aebe7adb2c40f3bb18b37e71225
 DIST python-efl-1.24.0.tar.xz 9535212 BLAKE2B ab9535d60af75422f3c055e56f3c6297f595afbf682970afcb21f597486b307504fa83ab894c2029fb681dda8d886d1fc837726d1c4ae62df7185fbc0073724a SHA512 5b57de58b2351f00f744454e6aaa16f7bf9cf72b7f73d07a2d98cda4d152eb65810513b5c04b1eda127b6f5caf56e4b9bc9a7c1ef98593edde26a9ed3be953c9
+DIST python-efl-1.25.0.tar.xz 9543920 BLAKE2B fc2b951ade2fc2b7c32dd78a84800bc9f225499ee9d8431034b378c86e423181d918aba2c4d056974f3aa2df9cfb9c7b3dcf1c366362387048cde182c0b3128a SHA512 23ed29add25cd2639e9eb144f22c5e2809b8634389f7ab5c4b7ebc19302fde4ebb0fe8c41d7b10923e658676c4dfbb8670fda16675682fd376258beecbc3d9c3
 EBUILD python-efl-1.24.0.ebuild 1778 BLAKE2B a49a7a27e5dcd5da3f9dcf7f22b04a32e1f11cd3f7e1a611a1677b47325afee28f412be14630c438c4b07e6bcea74960f7689d524f8c0cb97efd4629c826c4df SHA512 24bab6cc4907e942e270d937567d6f90eda2a77ffa41d653ffe86594e464226bfab4daf4b368ef20f47c54895a516181450f76a938c37ad70e9b56331e2e4bb8
+EBUILD python-efl-1.25.0.ebuild 1803 BLAKE2B c980a4ba307b02b6a1325b61f79357b49900d9045fafb74e9e3faa41b30576e054dbcbc36be46d586df77d9b82e9794ca654f276be552ebb0f11ef7f6b805cf6 SHA512 fd0db0d5afa8f3b99976fee25a08a9956abee52e0cd2304b3e4ef3ff8be289a5dfc16579a29fc68e4d4176afb50a94b7d8828ba4cdfdaa34f5755a2cd19d80f0
 MISC metadata.xml 588 BLAKE2B 0d810c31fac4488f392b8d3b57eb830af3b5ce3c970a9087939e35bc33c58d652ad3a6dd1c42c6b2604334b5c098b81465a1dc92e051e9f5b8cf5a047a190ee8 SHA512 9390fbbc9345bd5e580a8a1208d8f2e727dd0d1d562679b5e7b7c3f7a4010ed6154e1c2f9d93502dee73d96cbe28ed771b921f67e4a4921c635ada8056449de6
diff --git a/dev-python/python-efl/files/python-efl-1.25-clang-crosscompile.patch b/dev-python/python-efl/files/python-efl-1.25-clang-crosscompile.patch
new file mode 100644
index 000000000000..856aed8474ec
--- /dev/null
+++ b/dev-python/python-efl/files/python-efl-1.25-clang-crosscompile.patch
@@ -0,0 +1,14 @@
+diff -Naur a/setup.py b/setup.py
+--- a/setup.py	2020-06-25 19:46:38.312786000 +0300
++++ b/setup.py	2020-09-25 09:52:34.830587205 +0300
+@@ -221,6 +221,10 @@
+ # remove clang unknown flags
+ if os.getenv("CC") == "clang":
+     common_cflags.remove('-fno-var-tracking-assignments')
++if os.getenv("CC") == "x86_64-pc-linux-gnu-clang":
++    common_cflags.remove('-fno-var-tracking-assignments')
++if os.getenv("CC") == "i686-pc-linux-gnu-clang":
++    common_cflags.remove('-fno-var-tracking-assignments')
+ 
+ 
+ if set(("build", "build_ext", "install", "bdist", "sdist")) & set(sys.argv):
diff --git a/dev-python/python-efl/python-efl-1.25.0.ebuild b/dev-python/python-efl/python-efl-1.25.0.ebuild
new file mode 100644
index 000000000000..097475df6fab
--- /dev/null
+++ b/dev-python/python-efl/python-efl-1.25.0.ebuild
@@ -0,0 +1,75 @@
+# 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=no
+
+inherit distutils-r1 flag-o-matic
+
+DESCRIPTION="Python bindings for Enlightenment Foundation Libraries"
+HOMEPAGE="https://phab.enlightenment.org/w/projects/python_bindings_for_efl/"
+SRC_URI="https://download.enlightenment.org/rel/bindings/python/${P}.tar.xz"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="=dev-libs/efl-$(ver_cut 1-2)*
+	dev-python/dbus-python[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]"
+BDEPEND="virtual/pkgconfig
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)"
+
+PATCHES=( "${FILESDIR}/python-efl-1.25-clang-crosscompile.patch" )
+
+src_prepare() {
+	default
+
+	# Tries to download a file under /tmp
+	rm tests/ecore/test_09_file_download.py || die
+
+	# Tries to use that file which failed to download
+	rm tests/ecore/test_10_file_monitor.py || die
+
+	# Needs an active internet connection
+	rm tests/ecore/test_11_con.py || die
+
+	# Test fails because of deleted files above
+	sed -i 's/>= 13/>= 10/g' tests/ecore/test_08_exe.py || die
+
+	# Make tests verbose
+	sed -i 's:verbosity=1:verbosity=3:' tests/00_run_all_tests.py || die
+
+	# Disable any optimization on x86, #704260
+	if use x86; then
+		filter-flags -O?
+		append-cflags -O0
+	fi
+}
+
+python_compile_all() {
+	if use doc ; then
+		esetup.py build_doc --build-dir "${S}"/build/doc/
+	fi
+
+	distutils-r1_python_compile
+}
+
+python_test() {
+	cd tests/ || die
+	${EPYTHON} 00_run_all_tests.py --verbose || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ./build/doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index d4992ee5137f..fc932c8949a4 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -1,5 +1,5 @@
 DIST python-language-server-0.34.1.tar.gz 70238 BLAKE2B 55ec41875907bb6c09f682c8ce6165e7e2fab5d03c3d4758bcbe658968aeeee7f0316a472efe68ddd87872b0e2d34908c8a7e9528aa5eec6d3359b2565a2cbbc SHA512 12404753f4271ec3606cee535ba8e886037bf0c61cc5c4415358066be837e2248f6393124340551387cba7351dee924b4f5ebc9c4e35b1ab0943067968967a90
 DIST python-language-server-0.35.1.tar.gz 72944 BLAKE2B fe469e5365dec4a2192a2ca2f75fc9f05476434c0f6db26d851521149053455b256678ed98c5f1209d30b262808b615a3f7ac77fb604adf1455203e40f93c96f SHA512 278f281c8c82729ad60db2785b3f4b64568de529edb7a6f1b5683d09838ea43ed79182c50e42210e766b9a3f3c10b0c0256121b9925803c45f9e948f144ca994
-EBUILD python-language-server-0.34.1.ebuild 2333 BLAKE2B 769f38ef10b364ffa0f780a61879a558b7c29e79b7e8036d6965804c891b908240cdb7f976e358588c3f1739f81e5928d518a89a3de2b95ee0ee3f9ae6fe953c SHA512 ee9b21699c16bd8ad745139d99f27ef38a61183a86dfe5d431d8b708734da7917fff0ce6e19bf3ce4feb90656ee758c5214fa0d07e4dc4dd6e9e59efd1d11338
+EBUILD python-language-server-0.34.1.ebuild 2332 BLAKE2B f2c1f1b6c7c5142287f80e167e4dd2efa2395416585915b79118635f6b24078a73cc52c29236131086777a6036335b2de6c9859fc7a293aac35ed20cf89df36a SHA512 789b65a8cee9bea8a2e3709967fa3078d77b64989905820d542f4945e66c0cdcb9f384e39a4ba5d82b8597235654c87d14af32c6243989dad15c32dde6c3a0ff
 EBUILD python-language-server-0.35.1.ebuild 2662 BLAKE2B dd6c20e8f34b4c97e21aa0919569a5ae93a0d235d8dc2177dc603df7abf0b387b5d3555f75031f4ad8516d7d1eb9a0ae46e795f992b07066062a138b5f481537 SHA512 c613f523794bf1c44ec4211c65273fad32ca8c2084ef532ff1c31d6098462736bdb8708a8604168ba1a005725a409f9a6915b7d7301aa8dc239e7755636c12cb
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/python-language-server/python-language-server-0.34.1.ebuild b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
index 03dbc1d1dd8d..362f4d094a9e 100644
--- a/dev-python/python-language-server/python-language-server-0.34.1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.34.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index 30bfbe50c045..9cdc3fa7b723 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,3 +1,5 @@
+DIST python-memcached-1.59-gh.tar.gz 32334 BLAKE2B de8d18ba887b03e4737b554cc4b0074a4f16745e26a8b3631a747c45019e1da83612677dc3e98f97d76e851320c61baafbd0a29231a826c14b7d3bf3e477f29e SHA512 d7ff45a329f2a9bf97fdc7c0268c2c67046c3501270fcf03578b955c2da35904d7bdecd4239924d390797ddff8f4cc69fc5743f4d4f663cdb9f2f8c7e8159512
 DIST python-memcached-1.59.tar.gz 22210 BLAKE2B 50387821d50cf974ada738346e016eb736043078721bf905782f41df1f27574244d03b6b94ac9e5ccab7aeecfa8ca4c5a78cec2c41d15fda8756c7cb3bce9aa1 SHA512 a25cbb9efb3babe85e1523bdabfe4644b93b3a6a7268787a3928f724f833ce0eea7d2ef676d1b7f894cdfe293129975b35cb46ec553c92810dbc18013bfabece
+EBUILD python-memcached-1.59-r1.ebuild 1192 BLAKE2B f8139adc31ebb7c85299cdc98bf3a4c9b56e762522b732e7aa71d496cd2750985039c4e6598b88aabb0e20b2c4c3e595b6b22638a8999adfddfdf454ce481f76 SHA512 42374eaf1dbeb21ed49793105a55e95f7821b5e1dfcff3874a3c34d57c12f565b7307972dc0b98f855c4f2d4a5ef1067a6bc508e4898d7d40f92fe148043f93a
 EBUILD python-memcached-1.59.ebuild 1255 BLAKE2B bb04c0eeaaa34086942176c298e3c01cbe71c014dae7c2abd85e57e01e2de401b6b6a88654215ac48ec6f6802eb695cfab53752b4f52412afdbc4261834fddc9 SHA512 708ea202402b8fb3af376b76c4cf39c32af13cc9c0c23aac102a574b0cbe579abb3bd7da942955c7512acf334e4031d278944fdf18eae141eeea6fcc73f3d067
-MISC metadata.xml 611 BLAKE2B fa7a75bea6b08f6ab65ff4b5d4d8e3022912ba8cb86c6dd3fd2d8f5bb224f89ae9db977c2197a39e6541193ed41366c4bdaa404138a18b2d31afc412b967cacc SHA512 9070f42bf5f3fb721f41309c7a24f29168f1179f9327f1334dcd5bd7b38ae98bbc682c2f0cfb7874c8e20e92ce25bffdc5d3f21870316c6d35cd57e1049f8d90
+MISC metadata.xml 758 BLAKE2B fafd3d180cab6721b98fb30317f4e614b3300aa2b5a0b525057bd11e6628d959a17c2520dbc3bb941382d454095a1a25d1be47e0105d036aed3b6639ef8355ad SHA512 ea503ead23c8bf720372aff57740c744ce4c97b2d9016d503d3e3c3d3ece462c36ef417c535877dab1a42571c105ba3f3d13daeb2b6f883d20efe38c0df1ceec
diff --git a/dev-python/python-memcached/metadata.xml b/dev-python/python-memcached/metadata.xml
index 5a0000d36d7e..2f8d37bd82d5 100644
--- a/dev-python/python-memcached/metadata.xml
+++ b/dev-python/python-memcached/metadata.xml
@@ -10,10 +10,12 @@
 		<name>Python</name>
 	</maintainer>
 	<longdescription lang="en">
-This is a Python based API (implemented in 100% python) for communicating with
-the memcached distributed memory object cache daemon.
-</longdescription>
+		This is a Python based API (implemented in 100% python) for communicating with
+		the memcached distributed memory object cache daemon.
+	</longdescription>
 	<upstream>
 		<remote-id type="pypi">python-memcached</remote-id>
+		<remote-id type="github">linsomniac/python-memcached</remote-id>
+		<bugs-to>https://github.com/linsomniac/python-memcached/issues</bugs-to>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/python-memcached/python-memcached-1.59-r1.ebuild b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
new file mode 100644
index 000000000000..a8c482faaf46
--- /dev/null
+++ b/dev-python/python-memcached/python-memcached-1.59-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python memcached client"
+HOMEPAGE="
+	https://www.tummy.com/Community/software/python-memcached/
+	https://pypi.org/project/python-memcached/
+"
+# PyPI tarballs don't contain tests
+SRC_URI="https://github.com/linsomniac/python-memcached/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="OSL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		net-misc/memcached
+	)
+"
+
+distutils_enable_tests nose
+
+python_test() {
+	local pidfile="${TMPDIR}/memcached.pid"
+
+	memcached -d -P "$pidfile" || die "failed to start memcached"
+
+	nosetests -v || die "Tests fail with ${EPYTHON}"
+
+	kill "$(<"$pidfile")" || die "failed to kill memcached"
+	local elapsed=0
+	while [[ -f "$pidfile" ]]; do
+		if [[ $elapsed -ge 30 ]]; then
+			kill -KILL "$(<"$pidfile")" || die "failed to kill -KILL memcached"
+			die "memcached failed to stop after 30 seconds"
+		fi
+		sleep 1
+		let elapsed++
+	done
+}
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index 026306518e12..8486d440cfdd 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -2,4 +2,4 @@ DIST python-mpd-1.0.0.tar.gz 60032 BLAKE2B 9293dfc85363f83041b1d73046dabe6a3243a
 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
+MISC metadata.xml 462 BLAKE2B 7ab5f8dbe5062af562e466d8c9452e29072c1d91ac10eb7adf05f81f9c7ab7cb28a2a81f6a80791c782aeac33a863ab26a17e88c0bde408db084b29fb8fdc592 SHA512 2c3220c6a6efe353ff1d667b8689f673c66ee58176a140437237cd74fe02c794bcdc219dd658f8e77d5f338a6c877890d09d28d87580cef36946011aaffa4cac
diff --git a/dev-python/python-mpd/metadata.xml b/dev-python/python-mpd/metadata.xml
index ff857238fdf2..5f48b4f8480e 100644
--- a/dev-python/python-mpd/metadata.xml
+++ b/dev-python/python-mpd/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-mpd</remote-id>
 		<remote-id type="github">Mic92/python-mpd2</remote-id>
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 93c04a3468ae..2de1c8d61e4c 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,6 +1,6 @@
 DIST pytools-2020.3.1.tar.gz 67635 BLAKE2B e10f80ee743165b0c1f9ee7a171a313ef70644ce4a7bd10a04764bd0e1244b9c98077d659b119b34f0976bfae6ac3caa172f5b24ea967da487536b59aab4a9cd SHA512 819e4d10efffac95f75e07838cd05052136f5a62183680119763dde4952013530493a2292bcb73541b6d329823feca32befa89fcf2dfe5cbe5cd1b00240b40e8
 DIST pytools-2020.4.tar.gz 67157 BLAKE2B 57fd583a7d5cc1337e20fedb5bc1c53c4025a01e7d4e3a5b05a0770a86e2bcabdde31dd535321215cf1bf2c7f3ed0b54e2407583bea63b63ca5b829f590a00be SHA512 66dea0d67c99c152edd7cd44e1262b6d163f065f5a4b697a5997f7453145af8fb0539d8eafa606fa18128908ce933c724b51bd1a76a6f7ab02e27db24496dc4c
 EBUILD pytools-2020.3.1.ebuild 670 BLAKE2B a4dea2ba67077ed0c59807debe1b73c59f7526c0201784813853b818a5a280be90526110dde5f4102aa080995e0214416f09f6bcc3c3641e218147bb6ded0e1a SHA512 9da434ab7b2fa6cc73c246a920e62d8a0af1769f3b988eaa74cdcdee3846f4110a4c54327dc38c86d3f42cd6712147b0c04f09427d5af0e10868038eb18834ed
-EBUILD pytools-2020.4.ebuild 671 BLAKE2B 839e1f378bb8802c37a1b831dc6dfc58fa72837a9d9a2f00814163c5d02c4eeeb11c3c2a0a534b405998084e46f528d98c45319840c66dd870b385f58af4d213 SHA512 d340adf02e9ee7e6cd033d668cc9bb48a8786de6d1e63f4d6715fefe8e3c79431f7b15d52b0df9f9719cf7057542611b5c100ea6722c88bd51640e9659321999
+EBUILD pytools-2020.4.ebuild 670 BLAKE2B a4dea2ba67077ed0c59807debe1b73c59f7526c0201784813853b818a5a280be90526110dde5f4102aa080995e0214416f09f6bcc3c3641e218147bb6ded0e1a SHA512 9da434ab7b2fa6cc73c246a920e62d8a0af1769f3b988eaa74cdcdee3846f4110a4c54327dc38c86d3f42cd6712147b0c04f09427d5af0e10868038eb18834ed
 EBUILD pytools-9999.ebuild 659 BLAKE2B e95a3d9d028e49f5f6123a98342ac999ec1d6a3487ab7acfb2b09b4814d6b4a3af9d609ff17b9451bf93509926cb665c4568ccdf4a2dbeb93dab80ad82f976d1 SHA512 07ef3afa1568beae15a9210426a0d5b4687becf12249443e7f2d5e867b6a8632c17b01eca5dbb69ce1055eaecdda62256129783106b0bc45a88ec48e9670ed38
 MISC metadata.xml 370 BLAKE2B c7fc7fd9d90ddabb9b07a5a15677f36892a428e3d0394eaeba76b4828560d7ba0212cdebb6fc4a61e5768cbd8458dc069038e8e84c99fd7d92d1e014eeed04cc SHA512 8287dc77596e94cd8d3d34dcd6fbe979064efadda19124992b97d90cb14b561ed311e701769f29a1bfc9f3b0e612e3356b95bfa05106dc29dfaaca722cb79292
diff --git a/dev-python/pytools/pytools-2020.4.ebuild b/dev-python/pytools/pytools-2020.4.ebuild
index 7c6b5339389b..452aa2e327c0 100644
--- a/dev-python/pytools/pytools-2020.4.ebuild
+++ b/dev-python/pytools/pytools-2020.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND=">=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pywavelets/Manifest b/dev-python/pywavelets/Manifest
index d23fb625afd4..f41ec3a4b55c 100644
--- a/dev-python/pywavelets/Manifest
+++ b/dev-python/pywavelets/Manifest
@@ -1,3 +1,5 @@
 DIST PyWavelets-0.5.2.tar.gz 4430706 BLAKE2B 0a96dde04c0d6b58304b2a6a1331036c33bf89be717127df97ea178d638d193b9ce8994d90e34b969a4a6228e7985c943529fb386a3bc938ce61a78925549bf2 SHA512 6685b348009076b39a46e5a480189c34e5bc791ac110f47a52a8dbe0cbed1f3dcb64402174480d525bcf3776d12185ac89fe36c839727a14ffbad1ed835824ad
+DIST PyWavelets-1.1.1.tar.gz 4578294 BLAKE2B 1d3c9118739f831a3a198ab4461daa337b7952e16693d8ab15498ac26897a813d0adc02ae339a6a3ebfd3810db13ed297714c36ba67af559835af58c2ab243e1 SHA512 3e70625dad27822165e79b7d240c34072684ba340e8d314a026d2e47e81b04945d9ed9c6a5f0730eab285d3d5ebb1b311aaec5d6d06bced1eea80000bef5e787
 EBUILD pywavelets-0.5.2-r1.ebuild 1130 BLAKE2B 49aea3fd048f82deccbdcbe47e9174b0850d60f89fb9ca0cf2097a1272df78caf4fa97a0b41f40a48dea7585758401fef009e2c216c57aae04fc6f7112622033 SHA512 fdc45941068f9428cedaa479acc186c069eb2696ccd64f22748e1821e679f60a2d9f6db0525c9eb7cf64340dd0daae271432898d5197590bbc11d3db3253572d
-MISC metadata.xml 814 BLAKE2B bf95f588fd50238b95cebc807140d2fd7b346e474375617b4cdff4f763f896754a106cf2ee29854ed98a8a5caf5a93b8007718580db5addfe6d3a23e392d45c6 SHA512 02937ffa5a37a9ca5e9f3b8bcee990bbb84bf4b41f770f3f02cb0a447429d127f2d1337cfd26c936469858ee01c850db33a65798144fa65102940414df5f24e1
+EBUILD pywavelets-1.1.1.ebuild 1167 BLAKE2B 700bbfca01608bb571aad6d137191becb6af5daed7724b61ec665120bcce1196e060c893dce9f99c61ea5a7e59bf275bf18ee6d740da9082981d7a1e635536e5 SHA512 5beba4c947774029288ce6a350d908fdcc00bd6ce56520ae51032c809a5f4a52761b7cb39889d200ee86f4f96827fc123cc0e0151ccf75057ef25884cb1118a8
+MISC metadata.xml 804 BLAKE2B d0711a98d04ff34942a59867869fbe84b75e43f6e5bd97c5c4ad7ce033f6746f353c271704354f87ac4ddc4f908b56786aa58fa1ef605b1a2b41a63810d2a421 SHA512 b724a93b3400ea7d4a935479d69474d4f66de2836c86b61c559b1dc260a92c5924cb613134b52954bf8c00df08d3d22ca31b5d5e5b15cdb167401afa2abf31f0
diff --git a/dev-python/pywavelets/metadata.xml b/dev-python/pywavelets/metadata.xml
index 8a4e71211553..1b93fee9c995 100644
--- a/dev-python/pywavelets/metadata.xml
+++ b/dev-python/pywavelets/metadata.xml
@@ -9,7 +9,7 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <longdescription lang="en">
+  <longdescription>
   PyWavelets is a Python wavelet transforms module that can perform:
   * Discrete Wavelet Transform (1D and 2D)
   * Inverse Discrete Wavelet Transform (1D and 2D)
diff --git a/dev-python/pywavelets/pywavelets-1.1.1.ebuild b/dev-python/pywavelets/pywavelets-1.1.1.ebuild
new file mode 100644
index 000000000000..de07fe47ec1b
--- /dev/null
+++ b/dev-python/pywavelets/pywavelets-1.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..8} )
+
+inherit distutils-r1
+
+MY_PN="${PN/pyw/PyW}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Discrete Wavelet Transforms in Python"
+HOMEPAGE="https://pywavelets.readthedocs.io/en/latest/
+	https://github.com/PyWavelets/pywt"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
+
+RDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/numpydoc[${PYTHON_USEDEP}] )
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	dev-python/cython[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	pytest -vv --pyargs ${BUILD_DIR}"/lib" || die "Tests fail with ${EPYTHON}"
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+	if use examples; then
+		docinto examples
+		dodoc -r demo
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 01e86fa86107..27877d629ce6 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,4 +1,5 @@
 AUX pyyaml-5.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5
 DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556
+EBUILD pyyaml-5.3.1-r1.ebuild 1151 BLAKE2B 77d987ec45ff5eae54d9db792b1e9bcf6efe596e9412c62c0c98d12d13430b0ae1760fc222324f34fa52511dc79c0c4533b0c86428779ff85cd90e11c0939940 SHA512 6e561ccba83422190bb4f0479af9bf71fa3644bd71bf1e62cbd6bbe0e3265c23c4df99a1561e38cf9ac0a735f179a4787dfe5ae0a24eb635789c9813e27d48ea
 EBUILD pyyaml-5.3.1.ebuild 1164 BLAKE2B 04287dde778f61fa86141215661f71b3f82b238c3d27d7e8615a90e68c9682d7699adad1071327b6c1ac022f4d2390f89cb160c3f9db05c076ca354007f8f82d SHA512 75c605d42b9dabd3c1af1ed1ac79fdb9cc220e390febaa7eb1f0267de8d40e957fc51251399d099a77e4691c67c7f544bd71f0806d3884ea1d43fc75edca2b36
 MISC metadata.xml 439 BLAKE2B 2be21fbc47c75ba527e1b7969a9b472234a0cf38d39b6574eebf7c388b119c6951b7517d4a34c251b0d2a2bfd9ed73cd0157759a17c026da1806439e457aade4 SHA512 fe4be818db191edf5e1bc8abc09012e1065c46a940beb507c8fb48d996113e3601b2d1ce1cfcb70ed85c7d192ed0ba0416f7143f87fcdaa7912fd85e2e80af53
diff --git a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
new file mode 100644
index 000000000000..5cef66731ae0
--- /dev/null
+++ b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="YAML parser and emitter for Python"
+HOMEPAGE="https://pyyaml.org/wiki/PyYAML
+	https://pypi.org/project/PyYAML/
+	https://github.com/yaml/pyyaml"
+SRC_URI="https://github.com/yaml/pyyaml/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="examples +libyaml"
+
+RDEPEND="libyaml? ( dev-libs/libyaml:= )"
+DEPEND="${RDEPEND}
+	libyaml? (
+		$(python_gen_cond_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		' 'python*')
+	)"
+
+PATCHES=(
+	# bug #659348
+	"${FILESDIR}/pyyaml-5.1-cve-2017-18342.patch"
+)
+
+distutils_enable_tests setup.py
+
+python_configure_all() {
+	mydistutilsargs=( $(use_with libyaml) )
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}
+	fi
+}
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index fb9739357bdc..577b6c8aa3c5 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,3 +1,3 @@
 DIST qtsass-0.3.0.tar.gz 27880 BLAKE2B 07f71e794392ee23db901b1ae74e4c8a8888040b3e5b0681e05e2aa22ec2bdc958e588e2ee9ca9e5fdb4d341827b7c39a4ceb589ed4c669454cae78ee9747883 SHA512 fc3e082a01b35d1e7cada22cd5bea2aed37d4d3dd5a036d3d6d7621fb64ac61fdb3f2358f377f69e2cc5678798069af1d7cce04c4bcb9edf390d5162d308389c
-EBUILD qtsass-0.3.0.ebuild 653 BLAKE2B 9251a12d9eb0bbcaf6ea4f22b5548944348847c077a52902833081e179b0bba6357ed8e272d7307d19f56df544415985b46711529bbac28015d68d855c708c78 SHA512 30b3a1815bf45f684690d0eb0128d3bdee90c48ee506048ec8da46ac308e4295ac72624697003269fcb88190f2e0f1af788b8e609a7a8437d106b50dc17f2981
+EBUILD qtsass-0.3.0.ebuild 651 BLAKE2B 2fb9991d6ac24aa9a9c11eb212b87473c72c7790ac24a8f62f008ea54453b1fe12fd81f3c07d7b1137c93ee0f1c3ee1c615f34cb2e180897dc55324f5a60539d SHA512 511d8a4c35755d2b109939e6b57ac8a8b04f6a239f9e80919a0b4e6068c3ec8c978a8b5e2ff2108429057cbc4efa696bb3bd5e4905e38c43371358814b30fe7d
 MISC metadata.xml 412 BLAKE2B 1c1563b175b955ba98fa211a2277e49347a6e3bdf4aa4fc585a2eeab65b080e2b63ddaaac5958521f9e421ac3c0a8bb5872416e0186490b0185eea76d527dbab SHA512 d5cfa13aa12b5612ac426563ec40fe585231a3a599b91490d81745c5b77c9ea603335fedfac9d62e810694e25f2fa5ed71e47e13c85cb75db57c116db3164225
diff --git a/dev-python/qtsass/qtsass-0.3.0.ebuild b/dev-python/qtsass/qtsass-0.3.0.ebuild
index 55b1d70e7d73..47eeabc1bdd5 100644
--- a/dev-python/qtsass/qtsass-0.3.0.ebuild
+++ b/dev-python/qtsass/qtsass-0.3.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="dev-python/libsass[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index e83a07f7964d..439868c085d7 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -3,5 +3,5 @@ DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f
 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 1346 BLAKE2B 3ae7be7013162aed337129dded6b65fe4b393ae0a90ec389d4cd3e8ad5db6b9c93ccd4191d91846e97397976a18c0832b0b5ff60c5cea8efc7c6acac195b486c SHA512 08bd12dd05d8ffebef0b43987620ede57e4da21de8326f428ae18980c9698b43c20309d1756a59a01df13932eb2629f73e29f6bc1342d0c2e471dc1a3ba6371f
-EBUILD reportlab-3.5.48.ebuild 1437 BLAKE2B 4dda551899e2d199aa8d6e444e237d305d1bddfb52bbc3deed7ff6a6cd43d2973770f9886023cb1fc2203f6348a621bf0acbaacde882dd350592e397528df41e SHA512 1b3637077286cfc8635ca4bd0c7da8ea9b1acba63c80b2dd40343085d1f985135cb0e1ebc97c75ab0363e74b71a082fb0be69c25423e70910edbc2e11e2513c5
+EBUILD reportlab-3.5.48.ebuild 1432 BLAKE2B 64efd690d0e84e5124b9927fe69ad24cbd1cbeec9eb5d13a7bc83c908f5819d2b1ca6e867f9dd9cea322088baa2ea73ed6be801fdfc89be202755645aef34a4c SHA512 c2521bbe253470321c41409bdb8911e6acd372eb6fe0bd7404d37e9ec60570336dc74d28e59f3901b1a10b8d1e44b4c9323f8cf3628b0d99aa7b1088b432020c
 MISC metadata.xml 322 BLAKE2B 64b99a95cfa082f2ae8e3a778cf44d3598f4d3f43f03d58eae011aa4b361af042e1b650eba9eb17421c8c154e654a8340d4a85d60891aa89666861a973a49d15 SHA512 cea3f16d94fb50eb3e505756952d9ee14e170e5354e5a3a186c24dc3a253ce96d6d275505e71586ef360c71e080a9eaf5fb461d8aff4fc18ac6122912bbe1976
diff --git a/dev-python/reportlab/reportlab-3.5.48.ebuild b/dev-python/reportlab/reportlab-3.5.48.ebuild
index 292bdd0ebb40..02ea3ac4b79b 100644
--- a/dev-python/reportlab/reportlab-3.5.48.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.48.ebuild
@@ -17,7 +17,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 57823938d11e..d4fb90c7717d 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,5 +1,5 @@
 DIST responses-0.10.16.tar.gz 25420 BLAKE2B a71402d30a30be18a445f2377498760fb00c5ed1fe0f61503675b4d0730bfd305711a0d56dd972a7c1cb439c3202819570eee81b6214fa723725d584f96905db SHA512 ec6738d3f7a33f7e3fbc95b1aaa5a10aa038dcbd8c9fdc4dc0ffc263e0cd613e6f2ce8e2fc2b59c91a30dec9677219fbb2630ec4d5d8d4340526fe72e24bd89f
 DIST responses-0.12.0.tar.gz 26527 BLAKE2B 71769b683f9c672d52844803e76ff66def61a2a56f788d93cfbad5a7e0f967b003244ee32f83430a97f7726c732b4e8b25baf65ec35535da1a6d609e4cfefe7c SHA512 484076f7942ff12977f06bcc850f1afcc9ae70ca2b7986a647c972893562d28cf3cd7226c87d8f5588fa4500be34dd5be0c7d1df6b8ddcd134455540d3dbe6d9
 EBUILD responses-0.10.16.ebuild 739 BLAKE2B f6942c1865cb0979872a167123f8463f3c2940108a103ae6ac39cb88d74f7261e127dd6f2a30f1f261796ff22da512ad32d7fffe353c9103b012318298baf303 SHA512 340ef34c2b8dcaec28e69ff9f8d72d6864af4836f2ccbac1d34edf09a17aa5780e12c87339f63aa6592bdce2028e061a38e916104ab952dc8511e53a9df68f33
-EBUILD responses-0.12.0.ebuild 765 BLAKE2B 38428c172fa575a6626843f3033ba9b00127d2ffe355c2173163255725c98eec6c0023a380d54ad1a3a942623a70f30404c193d07eac5f232c25ce715af70cf8 SHA512 cad177c160b0e228b09a2a71dd010e5b16abfe3012c0fedc60c58c47416b8ee720a129b75d11f6fa66447c43fa2963a7667785fc61d39b85be482caec981cc2b
+EBUILD responses-0.12.0.ebuild 778 BLAKE2B 33a602f5f10fac28fae259f14227a43ae1c1dac7be28463ad276fe8e1bac782d3c3fd38e31ca2763a46c637b53cd6d2107bb8af1f68ff39f374bfab96f755a50 SHA512 8221824a89c9a4e1155707bd12f40d65e8f15324d40e53017e69c2591c556c5f92d219b9f826c9c35cc7b95b2025228ef1a0bcf8a5bd8216d0fd3d51b0615e96
 MISC metadata.xml 462 BLAKE2B c0afeab502da79631572ffa360f5b5cb19d41be177e9dc028041642cc756e08df0df9685c49825a40f3f343a29defe87f1f1e4805568d1037eab73895606221e SHA512 1b33da0d6d1ea49e0f108362c903f3521704ce8eaf1f328441eeb6950c19900eae5abf08204a0402cf7387077f32da97e5a84b2b6bb7c347a39a38e18032de33
diff --git a/dev-python/responses/responses-0.12.0.ebuild b/dev-python/responses/responses-0.12.0.ebuild
index d950831eb075..883183f2e7b9 100644
--- a/dev-python/responses/responses-0.12.0.ebuild
+++ b/dev-python/responses/responses-0.12.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 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-python/retrying/Manifest b/dev-python/retrying/Manifest
index e95eb0e53946..b75c03a88438 100644
--- a/dev-python/retrying/Manifest
+++ b/dev-python/retrying/Manifest
@@ -1,3 +1,3 @@
-DIST retrying-1.3.3.tar.gz 10890 BLAKE2B b7f2dd9488e99089e842f832666c6b71f94cb7fa9394bd504c27b5bb83fac2eb3dd1b7ed59cabe0c74a17c17483520502b65027d36887580744621d1776a2342 SHA512 99b81560caf63416f0301721ed9b9f9e3527a2fee4c53aeb0630b6e860ed81baf4b12b9819ca5b81346d45c4f40dfcb479a0b25305da1f560657fd3fdf2ffa75
-EBUILD retrying-1.3.3.ebuild 549 BLAKE2B 56ccfeacd415ffc5ab3d15575404dce16d4055bbcf6262b4819992ff14273b6a22821a4c00db0a9c38069366d1498ec7c29bd824066f1b40c10a0315607c5190 SHA512 88b244c5b5babef230fc1bf0059ee59d9d01c2d58e635f12565583dbc4a171139c33fd4965b3161de9b9e9f263a7ea31050f8b4cb5c035540b534b24bc6db6c2
+DIST retrying-1.3.3.tar.gz 11648 BLAKE2B 2c518ca887dddc35bad421ad75c76cb88f08a0965272816af8667b1b151eca2dda1b0b198607f26dcda2df547ba2cb317ac927ebfc5891cd8c6203ded619f1e1 SHA512 e053e62cb71b31573b89b8fffa706c3410794b5cced829582c373a09af78158f7a16948e6ce52078589cf7d8f5bba726c889180588a2628be343f242bc40c035
+EBUILD retrying-1.3.3.ebuild 552 BLAKE2B a52a7fce05520eddd153d83bed0dc7c5ad08cfb10168f63f3b4da9b5750895b0e015893915b68e32e4ad75318729ff80dcfd52651c3257f6340e2db3cbecd673 SHA512 949ed46222f22aa341e6c065b246a03a1ca4f0f3588d2e4b6383a47021493a2ae75e1efe4316802970099dab305c685ed2ef42059b7e945af1a920a3162811dd
 MISC metadata.xml 696 BLAKE2B 66dd73d35f5f4fff4249e00dd76c8811177cd017b2714663aab2fa418e00c83bc596f8062a5e55b48a901b5b04b5debf947f366da9fec8809cbfc23316bb241a SHA512 e397e072f8f140fa55db71a21156adec37d615f41cd07dd07d86c4d77c7413b675e6a3032f63b5dab11f1f64a4f1ac547c2b8df685500304e9db48c3c5516289
diff --git a/dev-python/retrying/retrying-1.3.3.ebuild b/dev-python/retrying/retrying-1.3.3.ebuild
index a51261d188fa..6af95ca658e4 100644
--- a/dev-python/retrying/retrying-1.3.3.ebuild
+++ b/dev-python/retrying/retrying-1.3.3.ebuild
@@ -2,22 +2,19 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} pypy3 )
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
 
 inherit distutils-r1
 
 DESCRIPTION="General-purpose retrying library"
 HOMEPAGE="https://github.com/rholder/retrying"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/rholder/retrying/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-"
+RDEPEND=">=dev-python/six-1.7.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
diff --git a/dev-python/rply/Manifest b/dev-python/rply/Manifest
index 1d56cc25476c..c0e1bb41be3f 100644
--- a/dev-python/rply/Manifest
+++ b/dev-python/rply/Manifest
@@ -1,3 +1,3 @@
 DIST rply-0.7.7.tar.gz 26366 BLAKE2B 09e6b93e9581745209b2d1fede6e0e4f08c2a34cc2495ea73aebb27b012353bbdb749ef127128cd5d9df201607f73625e248945038a927d788e324fb632341b4 SHA512 c01166b7df067a6a55d1b43caa7b5a349045e838899daf82e2ba70a2c2525fd68e95f11e5319a1fe36936e696352a37bdc13f132f739cd52759a9a9c91e317ba
-EBUILD rply-0.7.7.ebuild 683 BLAKE2B fb4215390776a9ea2ff22374a484e96e9d3ed165709eaea8cd4460de2221a06ac5a3faa3ecfc5574ee588c5b4ca12e5075f1ebd948de7e2ce9950c6206a22712 SHA512 a4fac60a26e9c41e0d5384e76f5c7839ce53e758190b0142fd38c018ae25d123ea9bcc5bcdb1db48fc94597fdfb7d0fe617448920bd5512d9fb328a41de21fec
+EBUILD rply-0.7.7-r1.ebuild 569 BLAKE2B 502be8cf23ea2474a75ccdb3ad86fc9226b26417813ecedbab46bbd5ac9e3f666eed956a2d1636e3a4abba9772e33a916b94a2c1e057204a3a240c2d56c0c341 SHA512 2afc224db6282b58586a68a68b9fa1b34c62bc92dae9266173da5c0603b948b692a717efb6f1dcf856ffdfebf796de0659affc97fcb3d7d5e79bd13b147539e3
 MISC metadata.xml 324 BLAKE2B d6027998ac0d5aee72ca31a60c53bdf7bbc628b16eacb329041fadb5ac5c9015f152e3e9f59495505eb73a2f8fe76ccff182026b6d5c80999274268056e63e14 SHA512 9378b0e52729cd011ed824e800aa1af7ed6b9f799de0802950dbf02eeb8dd27e356ea067a46aaa91b05d96f7ec5fc17a43c0d980b7b585fecb8220b0ddc20ba8
diff --git a/dev-python/rply/rply-0.7.7.ebuild b/dev-python/rply/rply-0.7.7-r1.ebuild
index 7517d698f0a8..cbe95f22ad3c 100644
--- a/dev-python/rply/rply-0.7.7.ebuild
+++ b/dev-python/rply/rply-0.7.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit distutils-r1
 
@@ -14,16 +14,11 @@ SRC_URI="https://github.com/alex/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 DEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	test? (
-		dev-python/py[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}] )"
+		dev-python/py[${PYTHON_USEDEP}] )"
 
-python_test() {
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 8a4d7f98037b..dc56bdb6efa7 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,5 +1,5 @@
 DIST ruamel.yaml.clib-0.2.0.tar.gz 178084 BLAKE2B a4d23e5c931a0c720edb80818ca11bfcc1638f28ec910878f53720139bd8fbd034de6db73154c0e758ceb6c5233c10a2bf7d779f8e7f4a134c8b07cc33382a1b SHA512 7d716e27963b97a1735ba7ff0e581f7ecdfa62725cc42def59ad0ccdf9e23a9f7dfbc3cac298bb3e29362535036b07ba0f523452d6f73248be53c69796637e34
 DIST ruamel.yaml.clib-0.2.2.tar.gz 179914 BLAKE2B 90fe272c3c4f8943e944d43dcf1f61367600bd3b1fb296d7434b27183433267a510b6e41cfd50fac8e17bebcfaa51d7d1ca89d4d23da0b1107c468cafa65ac3f SHA512 5bbab2a23c65b1416480758cf0d0a75dcf8ddece0f8df603ce90f2b1c54356bb6876ac113d53e01c4869e3c9fb22b13ea29e66dc31a09144d4426c3e0f3b9399
 EBUILD ruamel-yaml-clib-0.2.0.ebuild 714 BLAKE2B 89c14677f992995643dd5ced5a3a3a0ae6ebda01e535ea6de87aeef2ee285f1ee8a3db0ba42b5393b94c1042430ae34e79d2286777697da4e26920316f424b4d SHA512 52e3685e459f4a781b2d069dcb3d1efbf3078d2b8992ee26d3bca51342f79048374c89b075987f1a8f60aa0e5fab465c8368d0288e97f38bd6f5590522b4af8b
-EBUILD ruamel-yaml-clib-0.2.2.ebuild 722 BLAKE2B 8fa764b104dc4416451bc96b3f4c6213b1a86b18c405509e4d5e888d17c27f3f74e1ab399b70f6d1fef2332a086927889be8c73dc5076321657e2db6785ae076 SHA512 4ede4e04074e3c75e481e1bccf3a710ac491aeaa73e7f2554fe5901ffa4a6fdd66b71ea1124bf7383fe3c4d00d4831e7e94de9318bab37ce27ad23bb2700fea9
+EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 695 BLAKE2B 80e52b96be163854f5e37153062b4d8c8ffe82409d16c2cdf5690f7407b318e4099bffb3372fefa14919770f4bd1d440465f695de479b74951c60d734be243d7 SHA512 434ae13ecdd8ef13faeac4c8f1b71f035fb3e37afab4c221c906b708d4e7fe935eb427b91c8653b8438ad1ddac68755201d1b0d8b4cba093351e78c6183887cb
 MISC metadata.xml 1153 BLAKE2B 58de7fd7876683773ffee4304160d3a5207855b637b7116b83af5445d5d79636e39176c0d8c69f61ce3c728f273f16be0a6f39292464abc010b5e5c693c27c4d SHA512 eb4ff5e5bf91ede5c09114a76233e43913416781eb477032c4e04e4d1b0c0ab68969a6574319cc4a95f4db0fa426e831c4f9535393f9f7252b29189b1db5a47e
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
index 71a96cc35b0e..44f65b049199 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -17,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
 
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 197dab18ed21..127ffdc92540 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,5 +1,5 @@
 DIST ruamel.yaml-0.16.10.tar.gz 147033 BLAKE2B 35e5b0a1bd5a42ee539e66309dbca64bccd9570da427631d230c77d9cc09dc28637abb787c441b4fe8f8f17d9b6b313607887ce79eb631ce8b265cc18570e8fd SHA512 f124575a5054f993d5826d03aa7a9500a1084c5201be1517be36e587bfc60ea4d13b29dbdb3e62bfbd309fe9992590fd0a5028a43f0fd26a5a5cbc9f3dcf423b
 DIST ruamel.yaml-0.16.12.tar.gz 147355 BLAKE2B 6e91116029dba57b81580f4ce34a066fc49ec2c6167c2bd6ec2ae940b16bc12ba53cbd4c62f9ae3975664917ce990b050e9f15b434f5ff66f9dece5426049c9d SHA512 21be4d956d01164b84233c3d3945a4e56351a8fc59c35a8e71b1276da84aa43b125e3860f9884e95a1f895bc53e0b85b6d3f0f4b03512d629a892d8664e3ecd6
 EBUILD ruamel-yaml-0.16.10.ebuild 764 BLAKE2B c6087a1971d6a4477a0f81c42b0ec0be5da928effc63bd4285a08c8cd875cc94acf0d1d6711ea93f8b05bfaa618f77d5c50efc5e685f246b17beb0defbd874bf SHA512 8554601fffda4f88c275e8783a8a16814a8880ec2689d3dcab1a752fdbb0093e3eeddc4e3db43667d592191ec0d5df849e00d656c594b7c26ec358baa1e3e84a
-EBUILD ruamel-yaml-0.16.12.ebuild 772 BLAKE2B 2c54b980c7e2969ea080648dc6fbe12f0d40c1314ee714f82b579873dc8c2b6a374e66e418fdd5f3c7cb45205531422b9ce0dfbc775ce6da72709ba8aba6dfdf SHA512 306b2b051022f2c623a5d046bb5a5923b73939c3d4094106d7da3428d4f4903fca855278c5fc77349fd23702698fda76023bc48ca3979139cb3698af0bc07f2b
+EBUILD ruamel-yaml-0.16.12-r1.ebuild 745 BLAKE2B bf60575866973e679883bca9144467ddaefec117ef38bd67455add3fac7dd2f512e42dbf1754ffb19b6c6d188ea7ec15793663d9eeacb644916f8ad09c85fe1e SHA512 1eda26e2d6e2c7ca6847061e00ce4cac6f78a8e07f2ced5ae778b027e3cf6400d857bbd8ed9281567615d46ea314fb11fddac235aca900272c1076debc1fc55f
 MISC metadata.xml 715 BLAKE2B 8adfe458db838b8217c79ae03ba0133fd7aabd143c99f2177debff61e8960bb9b89df4e7bab27eb392127bc95a34ec7ab2a7e2ab96ec87adc28ea7453bcce6b8 SHA512 bb76d173705214d1df3e44032301d078ea0f1abb41ddbbe743d4ae3928ade3fc3622b26bc54d8c66f47ef2e2f445180aad381bccdc18a6e5fc512c9e83826a9f
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
index 4c7c61d9affa..6bd16e617756 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.16.12.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.16.12-r1.ebuild
@@ -4,7 +4,6 @@
 EAPI=7
 
 PYTHON_COMPAT=( pypy3 python3_{6..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -17,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 34d3997c1d03..84b1fb8f4c90 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 1158 BLAKE2B 115af3a9ebb4b719b25820dd0d5f201bad1e2e6474c9da9429161c7c42b813d7599d06256c98e91ae3d7e5375b0b0d89cee9b6c69fa64b38a7bd77620a27e0a0 SHA512 bb73665ba0b9c7c38a5e09e2e8b2cbb346ca8f66ee5fe409e009b0a2ede84dc24fd78d7df21e874b5f2996489ba2d3bb3bc060b471d26f209b9fe84cfdc48b4d
+EBUILD selenium-3.141.0-r1.ebuild 1171 BLAKE2B 0b6d740a7c4b81618368badc408fc0e235bcd862ae7fd3a075078fc320e025e14b86f888824f9e9be9cdb3a37d07e3e2661855b7c679544dea199f574e780c60 SHA512 34f11ac791743d8b192c7820ca36cbf90c2c1c4e6a5dd17e0b9df5dbe409a3817d869032ec84ae84f7e22035feb445cb5a146606998f623648754738df78f3fd
 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 a5962b98373e..0878736c2a51 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 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index f51590adec89..9a1e885cf572 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -2,8 +2,10 @@ DIST sentry-sdk-0.16.3.tar.gz 170145 BLAKE2B bf619313fb3f49800f5384f0dfec3aa34ef
 DIST sentry-sdk-0.17.6.tar.gz 183157 BLAKE2B ea0f6af54c31abc785274fc75238a02b8c9f7a978881a01203e0928e100c18df2257ec4a3cef608141b6846c616566388134a4ec31364f26d0bc2b0fadbb0dac SHA512 1af433b5c2311612ad650ea196ddfedb444e9ccb424df72422759f8647fe6cc22bb81a15933f2716cf40313ce3b2e262c077168aa831758d057a1f2e5e1499ff
 DIST sentry-sdk-0.17.7.tar.gz 184034 BLAKE2B de71b2e270594abe2e16d7e2fb9db3028e3c2abd4539269562e8786e6d937352153da21d6366d5e0384e3de1dbd6fbabe3d5060a6f0f9953bd260fbd865c893d SHA512 2360321ec0231ba76c968ff4e6dc78d42a48106aa6aade73a1c1194f9406fbafea3b533994da42027b3479302756ed3ec6e44ce551cb01ce60397939beaeb6d4
 DIST sentry-sdk-0.17.8.tar.gz 184271 BLAKE2B d34f881632e66d5db5cad0c6979de6c3c6205119af30b34996122ff7aff1ed7c3dd0c1603e57163f5d72c8525921f9af7c3e1c729adb14b43dbcee0aa4bd9fc5 SHA512 84ae0ca888457ed833b416320c45040e522a656d7c3ca0d64639f179e7be3237f53cfe4827e986a50d37bd7b61da765ed8c00ea663d478874cc47623ccf47a51
+DIST sentry-sdk-0.18.0.tar.gz 186389 BLAKE2B f531d68a1244c34d267cb332263c996afad31f7f72710b868e14850f06de6225a11fc37dca9ff820fc14d2f1b29919cfb10f59b7dc4449c0734458c6bd1b9816 SHA512 4c78418392668b1e061f0d6b88d3cc3511db138a99b08df50d2e610a7d8a5528ad83943ef1cfda8d508cb3b52f511f872ac87439460254a6b28348c9bb92406c
 EBUILD sentry-sdk-0.16.3.ebuild 621 BLAKE2B d2ffc79e8d2ec8daad9d01f0120760c3d1225bfebf1162cd5246bb1b7ddc5f176e6ba1b272701cb5b3a99aefe171f660cafa6be0e8594a65c0e7d2d803fb199f SHA512 32df9a79cf7988ae3687264f2ab7eca66af45447886e5e7cd33de8218373b49eb3222bb5cd30fa64648c46dbc6453176e555a27a94e1388d3d6295fe3c8060b8
 EBUILD sentry-sdk-0.17.6.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 EBUILD sentry-sdk-0.17.7.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 EBUILD sentry-sdk-0.17.8.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
+EBUILD sentry-sdk-0.18.0.ebuild 2705 BLAKE2B a5750df9d8da0160089bffc496d716dd427d772dc998fe00916c424fb8f21697557247cb5751404747277ff96a00a45b6708aadfef7777784d5c2f0628eb8160 SHA512 077901b2c5c659bffb6c0191dd779c6744df98b7bfc2e5204bfdb05c43fbd98129f5b5e71cebdcaa3a7cb01034416c4071e2bf06fbcc72a0573530f35be89616
 MISC metadata.xml 446 BLAKE2B d115ce1b9a1d92cfeb93cd220c96247f1d6ae9514b0d598a0abc9fc6b17e45851a33e6f61b364f682f6530e4ac2611fd0a65b2fb5b21d394e78030f6ef34d1fa SHA512 f7167d56812496468a0766bf6e7d29b99e5efcef8cd61723ed7b09188b515b50fa13275d665f7ff8400b5b451e05ddcec403cc4c75e55509b21b849cafde0a3e
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.18.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.18.0.ebuild
new file mode 100644
index 000000000000..1e52e8d55106
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-0.18.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://getsentry.com https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		<dev-python/dnspython-2[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/aiocontextvars[${PYTHON_USEDEP}]
+			dev-python/contextvars[${PYTHON_USEDEP}]
+		' python3_6)
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		--deselect tests/integrations/stdlib/test_httplib.py
+		--deselect tests/integrations/requests/test_requests.py
+		# wtf is it supposed to do?!
+		--deselect tests/integrations/gcp/test_gcp.py
+		# fails on py3.6, hangs on py3.7+
+		--deselect
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		--deselect
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		--deselect
+		tests/test_client.py::test_databag_depth_stripping
+		--deselect
+		tests/test_client.py::test_databag_string_stripping
+		--deselect
+		tests/test_client.py::test_databag_breadth_stripping
+		# test_filename: apparently unhappy about pytest being called pytest
+		--deselect 'tests/utils/test_general.py::test_filename'
+		# test_circular_references: apparently fragile
+		--deselect
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+	)
+	[[ ${EPYTHON} == python3.6 ]] && deselect+=(
+		# broken with contextvars on py3.6
+		--deselect
+		'tests/utils/test_contextvars.py::test_leaks[greenlet]'
+		--deselect
+		'tests/test_transport.py::test_transport_works[greenlet'
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/setproctitle/Manifest b/dev-python/setproctitle/Manifest
index fe3669684c7b..ff021c646440 100644
--- a/dev-python/setproctitle/Manifest
+++ b/dev-python/setproctitle/Manifest
@@ -1,3 +1,3 @@
 DIST setproctitle-1.1.10.tar.gz 24042 BLAKE2B acd4ef33ab2a200b5d102fe5ceb78df03deeee47eb5a3c7b50f0a44e095953e5a4e2230278b6b4a5010472e4a5a18b81accbff0461e3a642be478b880d98114e SHA512 c976c5b86f59bc6d0f840f495b8256813169d3d7b9edae70207a24d62e1240bfec954fdc4f67b429ae124e3dc74efd7193404785643a52b2d57b55028bb3c533
-EBUILD setproctitle-1.1.10-r1.ebuild 974 BLAKE2B 97d9a2b2637937fc95ff54956f96ef01e327de016777ce5142a8db96e1e7c1dc1bb2bb53fca70599d8522bffb8b1a8a8cec467950c98f4b5e2ef3e567d0c0bf8 SHA512 efb2af33c6f222bf3e62db97d2e2bf3b4108a83529ea07f3fa2de0a2ac739bcba46be0f7a1176fee5ec6cc0c71426528a4e162a3aa2f2017ccf01d8f07a4b6a0
+EBUILD setproctitle-1.1.10-r1.ebuild 980 BLAKE2B d6300fb90ba30c03d37afca61ccbc6fc04238ed1f279ebaffa8bdf9b3859fb7c469b1274dee5940261ee5db7bbc7ed772e103fa8b2ebf895617b568663e5b0e0 SHA512 af60bb769003e352e01b8c94bd8417f7c8c745059e24a322bdf5f32b8e3644f6f2d8246120cb60812f6a5588561b44c4753e15d4dd77ade2ecc781251a9a0aab
 MISC metadata.xml 380 BLAKE2B 136b22ffc942b2b6a6bcbd45ed3cebb105bf91a16014fa1fbc181a3a9055d132e03df3ffa63df79682f1e7369ee264f87ff32e8602a6478d170f4b20a230e9fe SHA512 eaca32091baa4a9fcd8ffbac6d250c135c0237552a7229aafc3cbb8bdf43450c114f26676964f80f73c2146b0b47934d77bdfdaf8411c069958bd898f69e8004
diff --git a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
index b6cec2019595..8d60577c7cb8 100644
--- a/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
+++ b/dev-python/setproctitle/setproctitle-1.1.10-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_configure_all() {
 	2to3 -w --no-diffs tests || die
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index fde6f5dc5bc9..0bbcdfdd75eb 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,5 +1,5 @@
 DIST setuptools-46.4.0.zip 865912 BLAKE2B 452d36132f5648c79c7e1616a93ff6a39ab2f64b2864ee397b4f57e7f72c47d418ff274f5decd35b0591b09800ad2a7cbd71c283550bd0e60a4d85744a57d4ec SHA512 31e58fd1d682089a45d23aa07c3c2c4c952ca016fa4c3416b2cba979d8b57369f80baef98ce857912e506e87d6cb456497a1ce1c75a0cdf1ee25d4e753b58726
 DIST setuptools-50.3.0.zip 2169216 BLAKE2B 029ea0159de270af0078a4661c696b93681b33dcc475640c7626f5a40bf1bb4759e5915948696c03b76dca10bdc4e790e2e9ef9628f41abca9a6aa48adcb72f6 SHA512 f67a2b7d639e03bf8b3815133e128902a559baf689afdd5893844ddc7c83505d727a6bb30ced1f78c4d2719dd405d2f4c527576bfa14dd9cb50c8ec4a479683e
-EBUILD setuptools-46.4.0-r3.ebuild 2509 BLAKE2B 98d7955fb5c7049ee1c468bcdb4549c790358fd5071082ff735c1a2364b6a0c513653bf8d870ddfca8201fff299d1f53867c8c7d0a9745c248a1d0e72d61f356 SHA512 f2636c0fa7828f3a43d82a25d4a5e19c4bfe97d15b2d98b2d6206c37d3440dd1b0ffb661ba66f346a1681887190def7fe1499ac5fc2a5c70b31e79e53c13f782
-EBUILD setuptools-50.3.0.ebuild 2242 BLAKE2B 55cbd8c45e536ca370d6f28bd5a4378ea04cb91ede8b5842615ed5ccbbdbf2814c0fbd4e62a089c8c16cf431d1f293fa5e5fb7cdb9502396acc51cd3ad6e1a85 SHA512 300664b69a018daf86725ffa2a7c1e293136cc864482b522b7e97e520e4d38b74fad48c2f695846a5525461f39eecc09e924789c31215b16d6e6994471b10d11
+EBUILD setuptools-46.4.0-r3.ebuild 2568 BLAKE2B 177c7c477880b56f4129ad7688448faf9344ec6e03fee0258bd256662f7861a82347089cf58cef8c08b9f4e513284d2ac42927456bc780d877ed5cfe61380bc4 SHA512 6f7cf119b89d73d1aff16a386f6d17b1af293fe2c079c4a8d57a42541e3b5b7cd0c11b5f1af1cdbeaa011ce8c249b1cde20632410de0b25bf86913d730b8e305
+EBUILD setuptools-50.3.0.ebuild 2301 BLAKE2B 342658b02fa1a098c2e449e9ea8734e4454292a993c2da14678688892f16fc6daa535406d08865387c3ce3ef626ee1b5eb885ca4ffc5108030e3fa4b80381d50 SHA512 aa3e3abaa78914b9baefc739047a5ec21d9ceb80c9673218d538fb909a5c51a60c8090208d691653a7969a56c133142bf414e4fcb29f3a96e073c252b779dfbe
 MISC metadata.xml 468 BLAKE2B 5f9a9240795261f894d54130ba489bb18fd24f8f95f993b55d23136fb2b518f47b64494d71ab0f697ca64f4eacc8cb58487e8889a8de22e8e3448caba5498065 SHA512 e284933f2a5d11cf7bb483776b8de2afe96ccad15a0e0bf7c9feab05c65f4247c9b19bb60c04d699ba917a637ca470e6ba41a38795899e54179602b587efe300
diff --git a/dev-python/setuptools/setuptools-46.4.0-r3.ebuild b/dev-python/setuptools/setuptools-46.4.0-r3.ebuild
index f42864c53f39..9819bcdb50ec 100644
--- a/dev-python/setuptools/setuptools-46.4.0-r3.ebuild
+++ b/dev-python/setuptools/setuptools-46.4.0-r3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
diff --git a/dev-python/setuptools/setuptools-50.3.0.ebuild b/dev-python/setuptools/setuptools-50.3.0.ebuild
index 0d8d2e8bfb98..ccd3f2338abb 100644
--- a/dev-python/setuptools/setuptools-50.3.0.ebuild
+++ b/dev-python/setuptools/setuptools-50.3.0.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-DISTUTILS_USE_SETUPTOOLS=no
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
 PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 PYTHON_REQ_USE="xml(+)"
 
diff --git a/dev-python/simplejson/Manifest b/dev-python/simplejson/Manifest
index abe327adb7a5..ab33c1a12d15 100644
--- a/dev-python/simplejson/Manifest
+++ b/dev-python/simplejson/Manifest
@@ -1,3 +1,3 @@
 DIST simplejson-3.17.2.tar.gz 83210 BLAKE2B 1b9f97a43bfe84f1ad506713d81483ebcd4006d1174558b7a27373f99d014e23ed72a9ec2b2006e64760c61e1e500a4f1ea4547104e7f4c71ba51003df0a5052 SHA512 003b2fbcb3f8e0849bdbd958c78f8b470081d97527bef82306db77940c6734a1cbf3b5dcb0984d2f9c9d14aa525e7865a08e70a10971f8841e138f7ad6476e4a
-EBUILD simplejson-3.17.2.ebuild 781 BLAKE2B 2a330a8acb09e31a8987ccff86a79d8256079ea18f8e37c978785c9c3f71391ab97da2ff83b7039ab07d839b71fb6a9fc9538079002ad225d46da3dd66c58759 SHA512 1a1632bc4742529653249e449859399586b1126588db3863aa67086d2da7c7f9aa9fd6669efb71910a39de36d51077459b3853bb34e4d80ca66861f4aeb9c144
+EBUILD simplejson-3.17.2-r1.ebuild 771 BLAKE2B af18fa2acd655a6884887d9d5b8d1c5775f82d64f524271ef0e9110d7cd7a071bd82761e003e4271e35e7a8fcf18869a767bad29606a9efed191eb5c8e9b2d81 SHA512 7da64c4664959c59c4e908b20ff44978ad49e31f6b99a3c2c387ad4b955db9c9017eefb26879fcb64cc7a8bf92c9feceb5363fe1f3dc451f5e8df9ba35af63f6
 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-r1.ebuild
index c583dc0725e0..c5be00caf282 100644
--- a/dev-python/simplejson/simplejson-3.17.2.ebuild
+++ b/dev-python/simplejson/simplejson-3.17.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/six/Manifest b/dev-python/six/Manifest
index 0a9e58e4957e..7fc7c8d5edab 100644
--- a/dev-python/six/Manifest
+++ b/dev-python/six/Manifest
@@ -1,3 +1,3 @@
 DIST six-1.15.0.tar.gz 33917 BLAKE2B 57e852b6c35dd19e256814c0371cfbc26141b0f25a31f79a1cbd1b0cdd7d3cacf1236b96f5452f968cc426e6dff4d1ad70a9f2432bc361ba3c8c17fd40fe7582 SHA512 eb840ac17f433f1fc4af56de75cfbfe0b54e6a737bb23c453bf09a4a13d768d153e46064880dc763f4c5cc2785b78ea6d3d3b4a41fed181cb9064837e3f699a9
-EBUILD six-1.15.0.ebuild 958 BLAKE2B e3d15c5805d938af552b1da3f5bdf5ff2d1b31fba3aee7523e8230183d1d85766bd7520c3288b926f00795b0bec8faedd6b567bb80600654a765c8c2f24906bc SHA512 8aeefa7cd592b50d11267c3b8c5aba5b805d599adb02cb116950624f14f265b296a5553939edca44792b6f2b292eadfec8885f4adb0c8a48454497b8dff43125
+EBUILD six-1.15.0-r1.ebuild 677 BLAKE2B 3b30f1b55efed78b9390c14e5243a7c7c969b012c36238cb3c469925008c64aff214e042cd204500b66ebe7430a59443438d1215d16f8124c94d7d388d557e8a SHA512 0795825dd331137a0016332b6da550eafdae383a790ce9d38b0a1defb1a5461315dd8ca755108a938b49262e7d7863e95b4696e8adc4c29785b55429d68ffcf1
 MISC metadata.xml 396 BLAKE2B 4b08f7faa6e73dee9d4f39caebc0eef9901f408c1cdfe5d883b350af406de2731e654c2a1c266daf07299451f57b8a717214ca1716463f7f43b376a51b4f6c2c SHA512 03881122a5eae7539c27d078eaf69f34e121f3a8a43c7e0ca9470c0ec6863ea268b5facc64e0ab100cc6b8c00473f784042047f077ceaa7f13d70d71dce03391
diff --git a/dev-python/six/six-1.15.0.ebuild b/dev-python/six/six-1.15.0-r1.ebuild
index 2ad1ac731cac..2206dac04197 100644
--- a/dev-python/six/six-1.15.0.ebuild
+++ b/dev-python/six/six-1.15.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1
 
@@ -14,20 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]' -3)
-	)"
 
 distutils_enable_sphinx documentation --no-autodoc
-
-python_test() {
-	if ! python_is_python3; then
-		einfo "Tests are skipped on Python 2 to unblock deps"
-		return
-	fi
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-aiohttp-theme/Manifest b/dev-python/sphinx-aiohttp-theme/Manifest
index 606691123db7..0fbb1cf08c62 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 596 BLAKE2B e29f865f47781f3a232d8d265cd56820a6342602c75aea96b4b70bfaea08d804d7e1dd508f6675a4751b07fbd9ef1c97860a8f568014955440d5b5e6bf7964fa SHA512 ac562a2ad33553ee8a5b7eac635a0f5a33e9b88f8a1b53b7afdf75d0303c11dc8657e91dc0a8b1c4307bd8c233db21f756f1c542c8213f463e909ab48b69c23a
+EBUILD sphinx-aiohttp-theme-0.1.6.ebuild 609 BLAKE2B 9a08b5dd30b2d6231694099b5be5a27996a2c259956e008fdd4563aea4a0f3edb37e9f00e81831ece8b0096839c62e53974054f62a6429eae7ab0375d10d3473 SHA512 d14c8e274acb7b3fd3e587e35a912e07083a9993a5141795db572c1caacede7e7b7efed2873a6423fa1131c4e6a30c0e1733112b084377aaa9365cf3cfcdb5ab
 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 9901d7169e98..862fa7ba2013 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 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinx-testing/Manifest b/dev-python/sphinx-testing/Manifest
index 6d0aa9a4d737..f3ee884a1360 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 821 BLAKE2B 4a0b3349cbe1c81e9683c9e67f753364d0f5b8689e08d6315ebe8dc2429408492086e8083cfd84972bd8476f6990498b18be1b59ba29d472574a5d15f640e147 SHA512 2f99fb21da6e31da7fb887d864a4a165c49dcbf36396479208d9867b2c7bd9caa8217435b25749511eb1145eb84c798ceec442b61b5956a7eadba11cbb287701
+EBUILD sphinx-testing-1.0.1-r1.ebuild 834 BLAKE2B 6f12db632391972d66d41384d82b3280ca6cc329bf6efbfe2cca2c8ba048a69f375e211e2917efc81117f40c052cd94eea282787f9b376f21d05a63cb14c6893 SHA512 04fc97103581a7f7ca9b56013f2104df4c045bf89700fa6424470bea83e3f433773dae32d00d099473945079b9701d4f18e6d169421ad17d117cc03ed1ce8a45
 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 c9e677f2f19b..966d9b666d56 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 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinxcontrib-blockdiag/Manifest b/dev-python/sphinxcontrib-blockdiag/Manifest
index 31690eb39404..40fbe9baf735 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 1200 BLAKE2B b6adac68aa51ab9c8920b7d7bf245a4e6ca6eeb8e92bac927eb1f360cd5e45f277a86b798b46c3b54c66cfbf5555f3e4630a26df2d5147bff0fed7e682ca4f8f SHA512 7150a6d6f630540f01df334665fcbb4690b61844ccc9ce1d911cfc6ce37421664f8d0d131fb840af1e63acd68e9bec4e771587beed9bb2f621e481ea6106ae4d
+EBUILD sphinxcontrib-blockdiag-2.0.0.ebuild 1207 BLAKE2B cdac468c9fd90646ab05ea5bd181888a7f54d34232860516eced6bc830900bd3c0ca82355fd614bcc301ce820d41572ebdf28e45a36006fd0be767523d1eedf8 SHA512 9d5c6f8a3bbf9e45824bae49ebe5fe7de54603ff7c2877a5017531de9a18779a9399ad41788e4697f6f29884edf5354e2e1dfc93336fc4e459177f148fa4f3b8
 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 11b7e45bee75..8225357c130e 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 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/sphinx-2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-newsfeed/Manifest b/dev-python/sphinxcontrib-newsfeed/Manifest
index 36f4fe0a9ef6..bc9b094fe66e 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 852 BLAKE2B e3e1aaaefc9b409f1e1c35296aebbb975f3232be707ffd52501584709899c5397cbe90965691151358aa1a6a8b8c68c210794c0d62150e4906cd70290e47cfc9 SHA512 1d3a62e62ea17f6a6c49402bff7b905fb6bf418d4386cf10d793a146ba673ec390c360eb8bd82810596dc4a1a5a263b664ae5e612230f4c2ef95e8d5f79c4d70
+EBUILD sphinxcontrib-newsfeed-0.1.4.ebuild 865 BLAKE2B 2859c9b548cb6b7bdbbf39707ed8aec5149670d11165a10d7a22f6460f2b606aed93b59b2673b44bace4ca771a3920b6887caf835e060b2326179608373908d3 SHA512 5b5ffde0e9e969fc94e257abf5a05cdba97c23b1bf1b3dbd86b6a307e47e532f293d13e6383ece54be6dd81eae3ecd55db0d0d6e38ac44ab21325ec38d3d96ea
 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 1f7123b6c317..5ea09f7f8a3e 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 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sphinxcontrib-spelling/Manifest b/dev-python/sphinxcontrib-spelling/Manifest
index dfeb43ae40c0..972b1797010d 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 1110 BLAKE2B 1f6f62ced5b2e82c55cb7327f22b6727c1e194a1429456f5622f430fea4b296bbb20937ec051b59e2c6a40dd7bd4214707bb6bd31a027c9200585326d0d0bf16 SHA512 d4e522d4ea079245648948d35c2f2a198ac0fc57ad04d06f58dfc1701e7e4deadff77c1174dc08da019aa0b56c771cb8195f00b7b34066c6c7e09020dec1e4ad
+EBUILD sphinxcontrib-spelling-5.3.0.ebuild 1113 BLAKE2B 498f0d8948635500859c57e440540b69b58a2cc67d882391d64216a79c75632e924614d06bd4b61f4a13615f875d545004cf171111e633dde931c37f67d9dc92 SHA512 41a625b9d77ea8028431816d64b86a98f86a064b29ee46ecd1df44fdb2c3b78c4726eebcd7b71585014fbb4ad3498e70478fb7de35d477a2dfc0f0372aa25ca6
 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 b8e4d54551d5..9202602394bb 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 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index 6f9ba473630d..eed4e8998aed 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,3 +1,5 @@
 DIST svg.path-3.0.tar.gz 17077 BLAKE2B 6fdb51c982575639337d74a6f02f0bb3cc44dac56bd6982dec6493bed52d9caab5ed725ac59bf754f309cc62ef6f77faec462afacc8f93ce9a20b886ef2b5c8e SHA512 73d23f1386bbd4d1c1d805766f7e6fe6f8b7ac731e104020e7d853d7f1b46bc2681f44ef20d9c5343197d9d16b2af49f2c4ef4ba5945f4d25fa0493502203e13
+DIST svg.path-4.0.2.tar.gz 18161 BLAKE2B bd5adbf059808b8197fbff0f12e274d98cc72ef840cd29e504bab1dd5fbcb5240aa3d6beb2cc3f6b91bcbdd9251fa29285de0ecd163c22d6cb8454102b911597 SHA512 0659c3d012b81cca83306c2895480bcc770cf23f4fc98dc4f167b6799a9c5618a90aabd81e2c91e6b7c57998d42f04a47d8f0fa966546111cd165127df239510
 EBUILD svg-path-3.0.ebuild 620 BLAKE2B 5783d88dd07f851a5a5bb7eca50483de7806a4f9012ff94d1d4658d6f36185c67709b89c41504a6509817f023ec6003fc0d99daa1be5ec813c31a128dee34a6d SHA512 fb6dbfc3362126fc6585fcac984cf86cc5ab6f15405c707f9aafa3a8b566158c32f7fb50b38e4fc72655408c192946c51db255269a81bd94ff0a4f0a6fa578a0
+EBUILD svg-path-4.0.2.ebuild 542 BLAKE2B 9be70cbb54fe66cddd0ca4c6e5d58e13f39d596a6ed6858b53d7563968e556ba5372bdfc4d5637a9628c14c906238aa22b5e58039f39c2ae92e1b1946114a3ca SHA512 853291d8d6d747c834a7161eaa5b15b05b697d511626f2fa7ffcbe3a648f555e1cb990a1253eb03c62e4dbd488e3df36998aeab062a90400f6b0cb693f092a73
 MISC metadata.xml 702 BLAKE2B 3a8759e763ce21b4f2a5f20161ee2d346f6c48f457f404ebb19605703ca78ccc6c48613efec43a8591bf0808c6eab1e838797265cd185e0df2dc8f66b620dbec SHA512 b4720805371d8d2044ef0cc9272a6d28d45f215a42bf99f991f861d60c57c6435d26d8c165b38d643911cca47fede95bffa362146d2b4a717f2c8e74cce55859
diff --git a/dev-python/svg-path/svg-path-4.0.2.ebuild b/dev-python/svg-path/svg-path-4.0.2.ebuild
new file mode 100644
index 000000000000..e9e4587533bb
--- /dev/null
+++ b/dev-python/svg-path/svg-path-4.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+MY_PN="svg.path"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SVG path objects and parser"
+HOMEPAGE="https://github.com/regebro/svg.path"
+SRC_URI="https://github.com/regebro/svg.path/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+distutils_enable_tests setup.py
+
+python_install() {
+	python_domodule src/svg
+}
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index f26f0dac00b8..eb14cd912a5d 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 1511 BLAKE2B 5076914b2292fad9eb845421042f05c19a8ccef702834ed5419c64051f7d3fc3bc740aaba6185d7b3d16319b705bb71f2feb3e9f39a6f4ab1fa929368f3530ab SHA512 c3fe5e474d92c3aa5ba417a1573648166b4d08906294494e4b726a0e2ddd6af726de1d5935619093ce9acaffd34586c30f36e121b56b9625b809f08ce12b3052
-EBUILD tempora-4.0.0.ebuild 1052 BLAKE2B 27ee5e889a1701173f255982a0c106e7cce3b4ea708783fb4ea8d2cb71fe309004730c5a2ba56540082e14e34ad51ae56fd815c61071f8769cdb366487ef55b8 SHA512 f52cca94743848f46e8a35b616c12c1baf2842f934d7c8e6f0da8161380d87a78aaf33b465e9c0ad2016c9c47b8b69ca79708ae6142119d4eafff53d2f6dcc6d
+EBUILD tempora-4.0.0.ebuild 1059 BLAKE2B ac937540f3f2e926a93c39b96770094a4484d351f2e76fe17decc6083c462de1f83d337c56111fac9b081259114dac4c415d0e357cb8884ce5ff580f25d25237 SHA512 6843bae826d91a924eab1eab61b4931df0ea7d96ade5bfce349adf65a6cfd6f352c0b81e5274ddc14cd4ff3836a5eadbf3dbbf37ee0afe2a6d96f1e255bcdcc4
 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 110486f366c1..e15f8e99b97e 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="~alpha amd64 arm arm64 hppa ~ia64 ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 17027400abfa..9f876436358f 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,3 +1,7 @@
 DIST toolz-0.10.0.tar.gz 49579 BLAKE2B c323bf1ba1da5c01a1a1d879ef545767b8253c906baba63a0f600d2879c5b7120c4978574447954648c23c22221ba05de2a2c7437eed1eeff31dface1c823f6e SHA512 4ed40c165462440c6004974d2515067f211c625bebcb69ea854fd8837e1fe05febc546215355a6bb9de5916c8ba98a4d297f8aa20e40ffbc8a730b2bb3831a71
+DIST toolz-0.11.0.tar.gz 64412 BLAKE2B 5b4a1fb4503767b91262ada31026c8ce26b98bb98967043dbbd2ecfa0011e200accc65d3a3923cbb69670aa305845d6825b3f0ed08f9e5a2c4e3a3854df1c62d SHA512 6c546561848d5156ae90fc7f11b219c4aa489c96d3d0c6e703b636dc7f0096fe95b986e7e1f33a0914b324bf807f6d66bec4c8ce2031c3aae3a3086bb1cb0596
+DIST toolz-0.11.1.tar.gz 64428 BLAKE2B 934f122bbf9e762e72f502f8b9ba8b5aa946b6e2b758e9501c2bc58fefa3443cda4b3e2c423be221643f51b2a12de0961be835ae3a23e97525fa203c969edff4 SHA512 8bea2b75b74d9da988c777577f3ad574192659dcc4bea54ac6d1400a81bef07818c49c8da40028a8c42905f9ab5b5111c50c239fb56f34c315865f90413af68b
 EBUILD toolz-0.10.0.ebuild 436 BLAKE2B aa344df77d7e820dcc80e13b084ba150c6ff3c274a681af59e83404db8527846a8801f507442ef40046ba2e3f97f80f5b6d06ff155e388532a860c93a6d5dab0 SHA512 d53cd5b4c4d2ebb70c48f5f03a51173ed65c8b66ca58128a3bf495c1247bb369fbecd695b552e7b4799b779ddc3a1c77711411dc724fb43cdcdd7b6e0af3dc5a
+EBUILD toolz-0.11.0.ebuild 491 BLAKE2B 3a26b0eb5c62eeb0bd1d4d20f0f118a1dc3e878b5d913c74a49691a44d859ab6337b425e1d295cade00f9f871f5d451400b85781ae8b934a7ed7e9b53e8260bd SHA512 e2389c2038534d421215a023e569d845c6db72d866dfb5c4819b20a32aad93a3c5492a2065c532934af7d26d19a549b18936ab85876ca72256011ddb7cffe1e1
+EBUILD toolz-0.11.1.ebuild 491 BLAKE2B 3a26b0eb5c62eeb0bd1d4d20f0f118a1dc3e878b5d913c74a49691a44d859ab6337b425e1d295cade00f9f871f5d451400b85781ae8b934a7ed7e9b53e8260bd SHA512 e2389c2038534d421215a023e569d845c6db72d866dfb5c4819b20a32aad93a3c5492a2065c532934af7d26d19a549b18936ab85876ca72256011ddb7cffe1e1
 MISC metadata.xml 332 BLAKE2B 36407eae22ccceadca8dd6127b7b6e1d04d65722e2ac88fd8f875807ec6f08f5a62d3570970c7cc85f6fd9bd6998c38b06100712569baa086dffcee98ef0aae2 SHA512 f32abff7501f0aec08df19ecc6f3b3aece597c396d73c7c025cb6e6f6127c9aa498719f02f55c51bfaf6e0d0dd51a150dab04baecdd9586245a2f8a0fbcb19b9
diff --git a/dev-python/toolz/toolz-0.11.0.ebuild b/dev-python/toolz/toolz-0.11.0.ebuild
new file mode 100644
index 000000000000..217a48444976
--- /dev/null
+++ b/dev-python/toolz/toolz-0.11.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="List processing tools and functional utilities"
+HOMEPAGE="https://pypi.org/project/toolz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/toolz/toolz-0.11.1.ebuild b/dev-python/toolz/toolz-0.11.1.ebuild
new file mode 100644
index 000000000000..217a48444976
--- /dev/null
+++ b/dev-python/toolz/toolz-0.11.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="List processing tools and functional utilities"
+HOMEPAGE="https://pypi.org/project/toolz/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/typing-extensions/Manifest b/dev-python/typing-extensions/Manifest
index ff96fa696c2b..986fd647839a 100644
--- a/dev-python/typing-extensions/Manifest
+++ b/dev-python/typing-extensions/Manifest
@@ -1,5 +1,5 @@
 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.2.ebuild 717 BLAKE2B 21b84d24ea58e4226b93258697978ee9012d2ff3a7f1897796ee9df0b3fa342e715c987f4d7dc8d21440e0e7fa40880342374a938429c8277edb48dd87b007a3 SHA512 46ecfdfa91ad227fa1311b93a91dcd71a29aaf0cbe85caf860e0fbabad65b6411031c67a9c40826d3fd51abd02d076c4ade0535b72e0ad3c484dcdd8acad6ef0
-EBUILD typing-extensions-3.7.4.3.ebuild 720 BLAKE2B 31d49c410e3595ca2ddc11ae202dbc26f1473e87e488ebdb9a2e9e32ce22edab9fbf500a5f6a8a6d63ca64ce5e87f76edd45dfabab25f831973f41c1aa43e224 SHA512 87bfe64c32a82ab739243a775dfb04f2bcab714475b6e4a6bc6a4849e7ef165275ba55d87becb6272af5e8fe2fee2172b891dfa7346a31d003910f5cd299ab58
+EBUILD typing-extensions-3.7.4.3.ebuild 718 BLAKE2B 27bf6ca202290439d5f6361604f4038b793c40d4fe0ff9c54d1b010a90d069ddba5e228e1437e51e15adecdb8b4ee88b1360f0295054c60d44475d55d9f47cd0 SHA512 8dd6eab93b943054014de9a5bc8942b1152931c8ca4f79326b79c03193fd556ae6e81e8a7cc496bb6501968c4bd8cde55aa7ea70eed98f4850a10f4452b8782c
 MISC metadata.xml 333 BLAKE2B 7c8ba2188c6cbc930151cad7d365c6b26677aa23348454bf307f4549f296857681c2d871af330b7c889f38524dd63e3abf782ef5bbd7f5f606adcb60741c3461 SHA512 b411ac2336820d0fc123dd6f1575d92d001f6c472537fb1a4899b489bb2f223955e86c5a5a89f98490374ffac231cfc678472c14faeff56c33705850f3d23e0f
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
index 4cf3c3b8746c..0ad35ce658c3 100644
--- a/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
+++ b/dev-python/typing-extensions/typing-extensions-3.7.4.3.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 python_test() {
 	cd "${S}"/src_py3 || die
diff --git a/dev-python/verboselogs/Manifest b/dev-python/verboselogs/Manifest
index 1bb7caede51e..1d22f388cf57 100644
--- a/dev-python/verboselogs/Manifest
+++ b/dev-python/verboselogs/Manifest
@@ -1,4 +1,4 @@
 AUX verboselogs-1.7-skip-sandbox-violation-test.patch 756 BLAKE2B 3766d28085f4eeb9167fe37f1f1b78dc9c2d1b5e8c401a402b7231bc33e9eaa31dd1a6ae8b0e4052712a173cbb8339361c18b5c4b0d794fcc902650ce6fa19ca SHA512 19f4bd82b49f2b97c7d99154b80e0d63c70211040d73e6cf7ad5d4523f3b15c6cd3df865a8584fd0ee0a255c2463b0057da15ea66f1b28682eeb568120e5d172
 DIST verboselogs-1.7.tar.gz 10338 BLAKE2B a0058a4697d642cc984e68983d499745b644380fd82a45d2aa424cb92b053da2ba5ae225f960427663c49ab78c47ed65c755b43d61c9c978dd881b52ce371ff3 SHA512 13e96ac21e1cb5c68428b348bab63fc4d4ad34eaffe8e1554c05380f9115d2a3ccc6fa2e0a5ca8941e73bfb06537a3e46f29880e7ba3f47da0284279a9740211
-EBUILD verboselogs-1.7.ebuild 707 BLAKE2B 2f68569dceaac5925615fe09f142805c13cf6010828c74af1f7ceaefc3e428dc2506086a92967615d0d6a01cbd7cfbbf7524e2224a739f9dbd83f6c6abffd714 SHA512 3a6243b2d30da741e321e62334fb39c2a752c6a7ea0a41ad966b1255dc6373170ef7f9da31ff37c7930bab35baaf5913112d18e5d3f922dc259ec075b5e60ec8
+EBUILD verboselogs-1.7.ebuild 715 BLAKE2B e6f51dc5b7339f721bec56e615520c0d635ae661db4db1c2ad7af65731148ea87bfba1d78f7bd1377017244ee6a4a3bf53bf4b6bc3cdcfdfbf324f1afb3b0744 SHA512 dc96e68718878401f17897ed24871726654b6426e29371320bf6d07944978780c404d1ac9fa6214b067058b6bd42c879614ecca561ff393cf521e6ee5a073e50
 MISC metadata.xml 324 BLAKE2B 6c8d909bd018e46f81fef3a30b87b7dcec5d48a31e919c6c60b000982d31486cb6fd8639afe42351579099454757922d7b05be5e196a3902b6ee199ff5817955 SHA512 4e0057695d4ab3557dc29f6ae0031d780cceabbcf6c0b07cdf80f11052e64cd90994c93a4d09213f875d54a1bce1cee88287ab223bc4d7c0cf4a70095614c039
diff --git a/dev-python/verboselogs/verboselogs-1.7.ebuild b/dev-python/verboselogs/verboselogs-1.7.ebuild
index 15d0cfd921bd..b4e84ccc0639 100644
--- a/dev-python/verboselogs/verboselogs-1.7.ebuild
+++ b/dev-python/verboselogs/verboselogs-1.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( pypy3 python3_{6,7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index 52e4c61665c6..c343e34b4c07 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -4,5 +4,5 @@ AUX virtualenv-16.7.8-tests-pypy.patch 3133 BLAKE2B 37d544c96a1546aa0df4e820014e
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-20.0.31.tar.gz 8300305 BLAKE2B 1574b553b2bc8e05bf00584379f80c1e5c0ee9798595255830059eedea62f02f02d216c421aa2cb312bc9e60694f6a409d0c2495858a89fc1ad7aaddea7965ff SHA512 46220bda37b3b860e44c4d0775a89c22a7ba775287f05438d1d3698201cc213a05b2718ef40be302627005ae349dc59a3141c7a30cc1dab6dc81f7692c7f16a5
 EBUILD virtualenv-16.7.10-r1.ebuild 1959 BLAKE2B 90c31ff96e46d24169602a0f034bf02f0d5fcc4132b1ef12a06226580ed2737398c889a0f752cd14c99f310a72642664aacc27024a65840a8541e580ef601deb SHA512 ab7f3e64008dc6320e2d0a280087b7ae26f934eaa7d571e2f8e01c4e21db7356476fd002918b6217bb52827f22bcd6f8e527e53c1011824d8d32be99c452bec8
-EBUILD virtualenv-20.0.31-r1.ebuild 2562 BLAKE2B 35176197536991d7e46aa5cba9f655875617663bae8d2287858af479f61927dc20e28d203f0e94c708b5a37b288c2bc693d4e49596965376d758f6e2c0cd7799 SHA512 11920e53a2253b3d62700256626ef44d1b361783ca121770608eabdb74dfe47071435442fe815a3bfa5a6555756d231f5d000c2f748c80b017c5d02aaa0f5fc4
+EBUILD virtualenv-20.0.31-r1.ebuild 2569 BLAKE2B d876b5b027a29b0fc2abab36752347ff274f69e3264785520147d179c789ecef30c127db670d9bbd64e698c74b2d3a2bbe66417995757961b05e3c555c95d7f1 SHA512 3891ca5da5bcb47deea8d670d163ca93873ceedb07cc8434c63b152c94c64dda2959b0d4116bdf8bfd08e7bfa0d798874ee15329ac00a19108bc5264538d5d01
 MISC metadata.xml 380 BLAKE2B 9a15805179f82d4e5c60aeb56191e690f9fe9260e34d9b4e0b893a51522fdc61246f02b20c1b55084709e06d6ce53b2e6436947aa178e2d413a923102d7ee125 SHA512 b6385fef70c6988548a00e6987bf5004979d139ad6c501d3f7b739bacef06eafa39a40bee8cc2d1164e01bb425f131aeea13f4b58ed6e75d66773a4f1c1df824
diff --git a/dev-python/virtualenv/virtualenv-20.0.31-r1.ebuild b/dev-python/virtualenv/virtualenv-20.0.31-r1.ebuild
index 4e1a69e4749a..a734981f18b9 100644
--- a/dev-python/virtualenv/virtualenv-20.0.31-r1.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.0.31-r1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 SLOT="0"
 IUSE="test"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/vobject/Manifest b/dev-python/vobject/Manifest
index e5b796a4a289..abd9cd72623c 100644
--- a/dev-python/vobject/Manifest
+++ b/dev-python/vobject/Manifest
@@ -1,4 +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
+MISC metadata.xml 346 BLAKE2B 3d1f3f0efd8481b912aba7675d50f338b831d06108734b4622bf2aab5e0df5feff99856544ad12b5d2ac80393d16dc687a06359392c96e4c652ae062469a5095 SHA512 51588af560593c3553f3fa1fd97c1a058d71e819df55261ff7dd24e07a23f5f0290902debd56d509af4b8696d92fd4853f2deafb11b4d9a357fae754e7b62d8b
diff --git a/dev-python/vobject/metadata.xml b/dev-python/vobject/metadata.xml
index b83ddeac473e..fd720400b6b7 100644
--- a/dev-python/vobject/metadata.xml
+++ b/dev-python/vobject/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">eventable/vobject</remote-id>
 	</upstream>
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index bb936b1da35c..610c1a49316a 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,3 +1,5 @@
+AUX websockify-0.9.0-mock-tests.patch 18675 BLAKE2B e7dbb0d77bf264bdeef98a3aadc071c3612bd7cad5f6f72c2a748d75e7197ca59a328e7476e19970fa89a17fa9cdc869493dea7505b708cec4e3a020e1a8c545 SHA512 e14011a7b1aa4992f21e5f4293e04424faab2a740ed362bfd1c65daa16cc2cf0d7329df0511239b104a6a4618fbeadf39344227cc7cdc5f48a6b3cfeebf7e748
 DIST websockify-0.9.0.tar.gz 58493 BLAKE2B 622a36979ec083dd3ea747b43cd8fec0916f9eb6f1a2b8f9b7acabd38f41aec839b2101c5261fdf2474bc40ebbbef61c9ba51d2e57f749f1e1a1c46879fb5d65 SHA512 d2251f653a40dc6dca0e5541845565d968c60be96a20a9b70b0305c4b7578f7fe205d4b98a94bb77d7c9383a396833af90fe92a6ade7e1a6f2d9bf8513d372c8
+EBUILD websockify-0.9.0-r1.ebuild 776 BLAKE2B 15444b1c977b88a9d66300f2d7b2b9e2d3d6a1a36a3a428eff34a3634e63a3720883e969fd0b1dae00ec9f6e4258d4bee0cd038ee83cef506d5d963880bf6771 SHA512 d1df61cc79dcca0342e71c08ccdf8a6c937df9856b2900c0d5182bbc3b3ea4f8965691f25fef20f7a1bd45534b1874b71e6a7ca4c862f8a277ee3d79c6e4df31
 EBUILD websockify-0.9.0.ebuild 504 BLAKE2B 16075323e3432b978f691b98731974415cc7894fce65e434b2e88e625123dd40e1b7174e36b6237ec35cf20f1e11bba0c040ca5bbd85ace9323a242c62ad8e9f SHA512 9b07948208ac459fb78eb28b6d30b54e6e8b0ec493672e7b70ea4a11294597843491c8ace13332297f051629bbf4c06240688306375126a7dff23eefd613bbba
 MISC metadata.xml 453 BLAKE2B 3952e4a784c0495f9d3f4b754efb1f76d49573615737f0c17f2fe9b00a51518c78dfa6de9777567fcac7d654473c0f253a87f8aec32be22f18f8c9121912a6cf SHA512 264bf203b6a60818054f8003f131daff7188adc824584dfb12cf8622e65ebdcf181b95a5bac045f08ea618e6944259a13b422c6893a64581656d15561160274b
diff --git a/dev-python/websockify/files/websockify-0.9.0-mock-tests.patch b/dev-python/websockify/files/websockify-0.9.0-mock-tests.patch
new file mode 100644
index 000000000000..a6af9508e07d
--- /dev/null
+++ b/dev-python/websockify/files/websockify-0.9.0-mock-tests.patch
@@ -0,0 +1,392 @@
+From 992e09eac484f25871b7fcfc6d11b8e5beac9edb Mon Sep 17 00:00:00 2001
+From: Pierre Ossman <ossman@cendio.se>
+Date: Fri, 21 Aug 2020 10:50:11 +0200
+Subject: [PATCH] Convert tests from mox to mock
+
+mox is deprecated upstream in favour of mock
+---
+ test-requirements.txt          |   2 +-
+ tests/test_websocketproxy.py   |  34 ++++------
+ tests/test_websockifyserver.py | 111 +++++++++++++--------------------
+ 3 files changed, 58 insertions(+), 89 deletions(-)
+
+diff --git a/test-requirements.txt b/test-requirements.txt
+index a63a15e..8e01437 100644
+--- a/test-requirements.txt
++++ b/test-requirements.txt
+@@ -1,4 +1,4 @@
+-mox3
++mock
+ nose
+ jwcrypto;python_version>="2.7"
+ redis;python_version>="2.7"
+diff --git a/tests/test_websocketproxy.py b/tests/test_websocketproxy.py
+index c0a8d93..d8a4916 100644
+--- a/tests/test_websocketproxy.py
++++ b/tests/test_websocketproxy.py
+@@ -20,10 +20,11 @@
+ import unittest
+ import unittest
+ import socket
++try:
++    from mock import patch
++except ImportError:
++    from unittest.mock import patch
+ 
+-from mox3 import stubout
+-
+-from websockify import websockifyserver
+ from websockify import websocketproxy
+ from websockify import token_plugins
+ from websockify import auth_plugins
+@@ -74,16 +75,14 @@ def __init__(self):
+ class ProxyRequestHandlerTestCase(unittest.TestCase):
+     def setUp(self):
+         super(ProxyRequestHandlerTestCase, self).setUp()
+-        self.stubs = stubout.StubOutForTesting()
+         self.handler = websocketproxy.ProxyRequestHandler(
+             FakeSocket(''), "127.0.0.1", FakeServer())
+         self.handler.path = "https://localhost:6080/websockify?token=blah"
+         self.handler.headers = None
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'socket',
+-                       staticmethod(lambda *args, **kwargs: None))
++        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
+ 
+     def tearDown(self):
+-        self.stubs.UnsetAll()
++        patch.stopall()
+         super(ProxyRequestHandlerTestCase, self).tearDown()
+ 
+     def test_get_target(self):
+@@ -120,8 +119,7 @@ class TestPlugin(token_plugins.BasePlugin):
+             def lookup(self, token):
+                 return (self.source + token).split(',')
+ 
+-        self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                       staticmethod(lambda *args, **kwargs: None))
++        patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+         self.handler.server.token_plugin = TestPlugin("somehost,")
+         self.handler.validate_connection()
+@@ -138,8 +136,7 @@ def test_asymmetric_jws_token_plugin(self):
+             jwt_token.make_signed_token(key)
+             self.handler.path = "https://localhost:6080/websockify?token={jwt_token}".format(jwt_token=jwt_token.serialize())
+ 
+-            self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                        staticmethod(lambda *args, **kwargs: None))
++            patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+             self.handler.server.token_plugin = token_plugins.JWTTokenApi("./tests/fixtures/public.pem")
+             self.handler.validate_connection()
+@@ -155,8 +152,7 @@ def test_asymmetric_jws_token_plugin_with_illigal_key_exception(self):
+             jwt_token.make_signed_token(key)
+             self.handler.path = "https://localhost:6080/websockify?token={jwt_token}".format(jwt_token=jwt_token.serialize())
+ 
+-            self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                        staticmethod(lambda *args, **kwargs: None))
++            patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+             self.handler.server.token_plugin = token_plugins.JWTTokenApi("wrong.pub")
+             self.assertRaises(self.handler.server.EClose, 
+@@ -171,8 +167,7 @@ def test_symmetric_jws_token_plugin(self):
+             jwt_token.make_signed_token(key)
+             self.handler.path = "https://localhost:6080/websockify?token={jwt_token}".format(jwt_token=jwt_token.serialize())
+ 
+-            self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                        staticmethod(lambda *args, **kwargs: None))
++            patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+             self.handler.server.token_plugin = token_plugins.JWTTokenApi("./tests/fixtures/symmetric.key")
+             self.handler.validate_connection()
+@@ -188,8 +183,7 @@ def test_symmetric_jws_token_plugin_with_illigal_key_exception(self):
+             jwt_token.make_signed_token(key)
+             self.handler.path = "https://localhost:6080/websockify?token={jwt_token}".format(jwt_token=jwt_token.serialize())
+ 
+-            self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                        staticmethod(lambda *args, **kwargs: None))
++            patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+             self.handler.server.token_plugin = token_plugins.JWTTokenApi("wrong_sauce")
+             self.assertRaises(self.handler.server.EClose, 
+@@ -210,8 +204,7 @@ def test_asymmetric_jwe_token_plugin(self):
+ 
+             self.handler.path = "https://localhost:6080/websockify?token={jwt_token}".format(jwt_token=jwe_token.serialize())
+ 
+-            self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                        staticmethod(lambda *args, **kwargs: None))
++            patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+             self.handler.server.token_plugin = token_plugins.JWTTokenApi("./tests/fixtures/private.pem")
+             self.handler.validate_connection()
+@@ -225,8 +218,7 @@ def authenticate(self, headers, target_host, target_port):
+                 if target_host == self.source:
+                     raise auth_plugins.AuthenticationError(response_msg="some_error")
+ 
+-        self.stubs.Set(websocketproxy.ProxyRequestHandler, 'send_auth_error',
+-                       staticmethod(lambda *args, **kwargs: None))
++        patcher = patch('websockify.websocketproxy.ProxyRequestHandler.send_auth_error').start()
+ 
+         self.handler.server.auth_plugin = TestPlugin("somehost")
+         self.handler.server.target_host = "somehost"
+diff --git a/tests/test_websockifyserver.py b/tests/test_websockifyserver.py
+index b9312dc..a089f55 100644
+--- a/tests/test_websockifyserver.py
++++ b/tests/test_websockifyserver.py
+@@ -22,7 +22,10 @@
+ import shutil
+ import socket
+ import ssl
+-from mox3 import stubout
++try:
++    from mock import patch, MagicMock, ANY
++except ImportError:
++    from unittest.mock import patch, MagicMock, ANY
+ import sys
+ import tempfile
+ import unittest
+@@ -73,22 +76,13 @@ def makefile(self, mode='r', buffsize=None):
+ class WebSockifyRequestHandlerTestCase(unittest.TestCase):
+     def setUp(self):
+         super(WebSockifyRequestHandlerTestCase, self).setUp()
+-        self.stubs = stubout.StubOutForTesting()
+         self.tmpdir = tempfile.mkdtemp('-websockify-tests')
+         # Mock this out cause it screws tests up
+-        self.stubs.Set(os, 'chdir', lambda *args, **kwargs: None)
+-        self.stubs.Set(BaseHTTPRequestHandler, 'send_response',
+-                       lambda *args, **kwargs: None)
+-
+-        def fake_send_error(self, code, message=None, explain=None):
+-            self.last_code = code
+-
+-        self.stubs.Set(BaseHTTPRequestHandler, 'send_error',
+-                       fake_send_error)
++        patch('os.chdir').start()
+ 
+     def tearDown(self):
+         """Called automatically after each test."""
+-        self.stubs.UnsetAll()
++        patch.stopall()
+         os.rmdir(self.tmpdir)
+         super(WebSockifyRequestHandlerTestCase, self).tearDown()
+ 
+@@ -101,47 +95,36 @@ def _get_server(self, handler_class=websockifyserver.WebSockifyRequestHandler,
+             record=self.tmpdir, daemon=False, ssl_only=0, idle_timeout=1,
+             **kwargs)
+ 
+-    def test_normal_get_with_only_upgrade_returns_error(self):
++    @patch('websockify.websockifyserver.WebSockifyRequestHandler.send_error')
++    def test_normal_get_with_only_upgrade_returns_error(self, send_error):
+         server = self._get_server(web=None)
+         handler = websockifyserver.WebSockifyRequestHandler(
+             FakeSocket('GET /tmp.txt HTTP/1.1'), '127.0.0.1', server)
+ 
+-        def fake_send_response(self, code, message=None):
+-            self.last_code = code
+-
+-        self.stubs.Set(BaseHTTPRequestHandler, 'send_response',
+-                       fake_send_response)
+-
+         handler.do_GET()
+-        self.assertEqual(handler.last_code, 405)
++        send_error.assert_called_with(405, ANY)
+ 
+-    def test_list_dir_with_file_only_returns_error(self):
++    @patch('websockify.websockifyserver.WebSockifyRequestHandler.send_error')
++    def test_list_dir_with_file_only_returns_error(self, send_error):
+         server = self._get_server(file_only=True)
+         handler = websockifyserver.WebSockifyRequestHandler(
+             FakeSocket('GET / HTTP/1.1'), '127.0.0.1', server)
+ 
+-        def fake_send_response(self, code, message=None):
+-            self.last_code = code
+-
+-        self.stubs.Set(BaseHTTPRequestHandler, 'send_response',
+-                       fake_send_response)
+-
+         handler.path = '/'
+         handler.do_GET()
+-        self.assertEqual(handler.last_code, 404)
++        send_error.assert_called_with(404, ANY)
+ 
+ 
+ class WebSockifyServerTestCase(unittest.TestCase):
+     def setUp(self):
+         super(WebSockifyServerTestCase, self).setUp()
+-        self.stubs = stubout.StubOutForTesting()
+         self.tmpdir = tempfile.mkdtemp('-websockify-tests')
+         # Mock this out cause it screws tests up
+-        self.stubs.Set(os, 'chdir', lambda *args, **kwargs: None)
++        patch('os.chdir').start()
+ 
+     def tearDown(self):
+         """Called automatically after each test."""
+-        self.stubs.UnsetAll()
++        patch.stopall()
+         os.rmdir(self.tmpdir)
+         super(WebSockifyServerTestCase, self).tearDown()
+ 
+@@ -154,10 +137,10 @@ def _get_server(self, handler_class=websockifyserver.WebSockifyRequestHandler,
+ 
+     def test_daemonize_raises_error_while_closing_fds(self):
+         server = self._get_server(daemon=True, ssl_only=1, idle_timeout=1)
+-        self.stubs.Set(os, 'fork', lambda *args: 0)
+-        self.stubs.Set(signal, 'signal', lambda *args: None)
+-        self.stubs.Set(os, 'setsid', lambda *args: None)
+-        self.stubs.Set(os, 'close', raise_oserror)
++        patch('os.fork').start().return_value = 0
++        patch('signal.signal').start()
++        patch('os.setsid').start()
++        patch('os.close').start().side_effect = raise_oserror
+         self.assertRaises(OSError, server.daemonize, keepfd=None, chdir='./')
+ 
+     def test_daemonize_ignores_ebadf_error_while_closing_fds(self):
+@@ -165,11 +148,11 @@ def raise_oserror_ebadf(fd):
+             raise OSError(errno.EBADF, 'fake error')
+ 
+         server = self._get_server(daemon=True, ssl_only=1, idle_timeout=1)
+-        self.stubs.Set(os, 'fork', lambda *args: 0)
+-        self.stubs.Set(os, 'setsid', lambda *args: None)
+-        self.stubs.Set(signal, 'signal', lambda *args: None)
+-        self.stubs.Set(os, 'close', raise_oserror_ebadf)
+-        self.stubs.Set(os, 'open', raise_oserror)
++        patch('os.fork').start().return_value = 0
++        patch('signal.signal').start()
++        patch('os.setsid').start()
++        patch('os.close').start().side_effect = raise_oserror_ebadf
++        patch('os.open').start().side_effect = raise_oserror
+         self.assertRaises(OSError, server.daemonize, keepfd=None, chdir='./')
+ 
+     def test_handshake_fails_on_not_ready(self):
+@@ -178,7 +161,7 @@ def test_handshake_fails_on_not_ready(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             return ([], [], [])
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         self.assertRaises(
+             websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+             FakeSocket(), '127.0.0.1')
+@@ -191,7 +174,7 @@ def test_empty_handshake_fails(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             return ([sock], [], [])
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         self.assertRaises(
+             websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+             sock, '127.0.0.1')
+@@ -208,7 +191,7 @@ def test_handshake_ssl_only_without_ssl_raises_error(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             return ([sock], [], [])
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         self.assertRaises(
+             websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+             sock, '127.0.0.1')
+@@ -230,7 +213,7 @@ def __init__(self, *args, **kwargs):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             return ([sock], [], [])
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         self.assertEqual(server.do_handshake(sock, '127.0.0.1'), sock)
+         self.assertTrue(FakeHandler.CALLED, True)
+ 
+@@ -251,7 +234,7 @@ def test_do_handshake_ssl_without_cert_raises_error(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             return ([sock], [], [])
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         self.assertRaises(
+             websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+             sock, '127.0.0.1')
+@@ -280,13 +263,13 @@ def load_verify_locations(self, cafile):
+             def wrap_socket(self, *args, **kwargs):
+                 raise ssl.SSLError(ssl.SSL_ERROR_EOF)
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         if (hasattr(ssl, 'create_default_context')):
+             # for recent versions of python
+-            self.stubs.Set(ssl, 'create_default_context', fake_create_default_context)
++            patch('ssl.create_default_context').start().side_effect = fake_create_default_context
+         else:
+             # for fallback for old versions of python
+-            self.stubs.Set(ssl, 'wrap_socket', fake_wrap_socket)
++            patch('ssl.warp_socket').start().side_effect = fake_wrap_socket
+         self.assertRaises(
+             websockifyserver.WebSockifyServer.EClose, server.do_handshake,
+             sock, '127.0.0.1')
+@@ -321,10 +304,10 @@ def wrap_socket(self, *args, **kwargs):
+             def set_ciphers(self, ciphers_to_set):
+                 fake_create_default_context.CIPHERS = ciphers_to_set
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         if (hasattr(ssl, 'create_default_context')):
+             # for recent versions of python
+-            self.stubs.Set(ssl, 'create_default_context', fake_create_default_context)
++            patch('ssl.create_default_context').start().side_effect = fake_create_default_context
+             server.do_handshake(sock, '127.0.0.1')
+             self.assertEqual(fake_create_default_context.CIPHERS, test_ciphers)
+         else:
+@@ -365,10 +348,10 @@ def set_options(self, val):
+                 fake_create_default_context.OPTIONS = val
+             options = property(get_options, set_options)
+ 
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('select.select').start().side_effect = fake_select
+         if (hasattr(ssl, 'create_default_context')):
+             # for recent versions of python
+-            self.stubs.Set(ssl, 'create_default_context', fake_create_default_context)
++            patch('ssl.create_default_context').start().side_effect = fake_create_default_context
+             server.do_handshake(sock, '127.0.0.1')
+             self.assertEqual(fake_create_default_context.OPTIONS, test_options)
+         else:
+@@ -387,11 +370,9 @@ def test_start_server_error(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             raise Exception("fake error")
+ 
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'socket',
+-                       lambda *args, **kwargs: sock)
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'daemonize',
+-                       lambda *args, **kwargs: None)
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
++        patch('websockify.websockifyserver.WebSockifyServer.daemonize').start()
++        patch('select.select').start().side_effect = fake_select
+         server.start_server()
+ 
+     def test_start_server_keyboardinterrupt(self):
+@@ -401,11 +382,9 @@ def test_start_server_keyboardinterrupt(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             raise KeyboardInterrupt
+ 
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'socket',
+-                       lambda *args, **kwargs: sock)
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'daemonize',
+-                       lambda *args, **kwargs: None)
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
++        patch('websockify.websockifyserver.WebSockifyServer.daemonize').start()
++        patch('select.select').start().side_effect = fake_select
+         server.start_server()
+ 
+     def test_start_server_systemexit(self):
+@@ -415,11 +394,9 @@ def test_start_server_systemexit(self):
+         def fake_select(rlist, wlist, xlist, timeout=None):
+             sys.exit()
+ 
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'socket',
+-                       lambda *args, **kwargs: sock)
+-        self.stubs.Set(websockifyserver.WebSockifyServer, 'daemonize',
+-                       lambda *args, **kwargs: None)
+-        self.stubs.Set(select, 'select', fake_select)
++        patch('websockify.websockifyserver.WebSockifyServer.socket').start()
++        patch('websockify.websockifyserver.WebSockifyServer.daemonize').start()
++        patch('select.select').start().side_effect = fake_select
+         server.start_server()
+ 
+     def test_socket_set_keepalive_options(self):
diff --git a/dev-python/websockify/websockify-0.9.0-r1.ebuild b/dev-python/websockify/websockify-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..3e94e67a53ce
--- /dev/null
+++ b/dev-python/websockify/websockify-0.9.0-r1.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} )
+# entry_points is used
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+SRC_URI="https://github.com/kanaka/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="WebSockets support for any application/server"
+HOMEPAGE="https://github.com/kanaka/websockify"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/jwcrypto[${PYTHON_USEDEP}] )"
+
+# Backport a patch removing the need for mox3
+PATCHES=( "${FILESDIR}/${P}-mock-tests.patch" )
+
+distutils_enable_tests nose
+
+python_install_all() {
+	doman docs/${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 482d0706c7b7..708e735cbd34 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,13 +1,5 @@
-AUX wxpython-2.8-no-preservatives-added.patch 525 BLAKE2B 7303124d355849fbe7b74488aa28399d675be2330c1af59c09c84465290ea2a06a69aacc8b3cc6ff5cc91a77ed392c0d8298ff0510d3c2081bdcea37c9604c71 SHA512 83e066d6798aea833304004d7270e3b7698e51581e9ac9c934b96fb438bbafb16cea15cc73297961893fd73fd18f95cade22c134aea6556962025fc3c12bdedd
-AUX wxpython-2.8.11-drop-editra.patch 2197 BLAKE2B 055cec606028e20e613109f3edf455b12964725349a92323cee5212540b56fadc2f7e4319e473045cae69ef2a01a8c2c3c4f4533895d7231e0690f8b1d32cb5c SHA512 3800b68ba13c52e81a4411940e297f83f9e98c76b4d8d9d3e53ac55564a38b1376b57df337e4f009b1cbbd44199293554058341aa2122ec329c3a42dd38593a6
-AUX wxpython-2.8.12.1-disable-egging-mode.patch 1146 BLAKE2B dff061c8680a3c1a9c9731c8d80acc93f8562ed70e8bb98527b78f0f3813372f6179d8f5e348870cec25c24c961213f7e5db4755b8b79648aa251199b275226d SHA512 a834a2c3f009f6855755bd07b54683b8f3d9dc58ee9d0631e51c0450e3bac98245e4dab0e40820ba1727b6a0d8528675443c986d7fa4f7c58d606d60975e4190
-AUX wxpython-3.0-wxversion-demo.patch 147 BLAKE2B a02fcf87c8b153b3a3fd7abfda117f988fbdafddbeefe47e77adeef6201b0c037c51ee7f4b7fa3d57a92e70b7518ce6fd7148f11d2b53d96fe085d8d366021df SHA512 99682f18a520b68b313301784adaf71c1ab9181022b743de82c9cc6acfaa1fc77867ef43c00926f6d7bdde8ed29fac24b5eb72761209a2e2a1d498feee85a0a1
-AUX wxpython-3.0.0.0-wxversion-scripts.patch 4187 BLAKE2B 07601322f2e71fb6af40172ed64efe5e0b0d32d30556ce821b0a835ae545c016df5974c5aadf6e8810ffc651b5ca8bda47729b1f7589947d5dfc0ad0dfd21771 SHA512 74fe603daafdbc5a50daaa3411ea40243d1fdee2cb3bbd0e6e99bd73bd124137161cd682673f2c727faf92214bfa4d27c059021f19c92c581485bb1d6a5b49a6
 AUX wxpython-4.0.6-no-webkit.patch 1411 BLAKE2B 222f85e79f55420ca2b04b3ba6a30293646f84894a45ac2b72852e3f72f187e333b2efd6d76cc02c5996ae75725ef40e882d45012c492b7f3a478666a01d0189 SHA512 82539d4ec63a8b21576de38b17fe2fdf095443b4cfeabf369c443d818ce402e62dcf257ccba022c3b0d671f914f5ef88e4ff40b9fc7d6276493c9a8caf2b76fa
 AUX wxpython-4.0.6-skip-broken-tests.patch 4113 BLAKE2B 920f1c0c6e1154de83c412ffdfa4b3276d01a5e9be8998be42634368f34217bd5b6505abced2ec3479b9ab4f40a5697405983740e599b76be1725bb963e3311e SHA512 04201012f1cc16913ff53a9d4868dbdaa6915b1a3a33f0342572aa56741207b6de6e274b91cd26a06511ae8d79d7fef247c2cababafd57130417caa4463a409a
 DIST wxPython-4.0.7.post2.tar.gz 68891167 BLAKE2B 77eb69f7a59e5be81c3d17b64c76e09a43efc9226bd87fd058483185871a95ce05dbb65614ec8b003edf52cbe1cb1a115856c0d622170c51ecacbb952106fe22 SHA512 7af89db90a0f7e6b644d61c1ede01ec36a2c295e46d44692ae9dbc4af923310c1b498a52f45b02a89e8917d844c6abe67e5f3fdd9c1d51da3312899319a349e4
-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 2265 BLAKE2B 8bd7dc2b02bec8ea1398a93019321348508694924166c52999948575ef907d0951f90693e881546c59c143e104e495a8230850f6cfbbcaab9caee7898a32b66c SHA512 e31e5fd18944a54f830d55a69802ab53636d3e1ada75e47da56a4c687c543c995810e0e5420555d54017568d5b3891861f5a4605d229f521ff464c6300121559
-MISC metadata.xml 550 BLAKE2B eb8b5a9f5b6c0bc12d5eb1848888549a8d18fc086cde9d4a819dd2765b654470a18ff627578929ba901f09486b96b34644269c09102861bc09482b107d018332 SHA512 ad9e10ffc69cc3a103a30166448a09b84013b3dd3eb9a62583a0c562933b5cc056a62f148e34aa2fdd5bcbffeb81596b2cbd3c4eee485cbce15b649083e59d43
+EBUILD wxpython-4.0.7.ebuild 2266 BLAKE2B 08048af96d552bce639d41850c999995b0cf0d85b90dfa765507d21eaf186d45787b6f8914bb02713ad3ee3fcfa414aa89bd82df12318c3475362b8e41bcfe4d SHA512 42883fc1a6b476a8fc8e9a599af4fe1aaccade3cef1b09b4a60d521de687e7b1b2fe362a589b017a1bf022c409237173ddf5bdc8c5f00994104b8b5cbd6d1097
+MISC metadata.xml 444 BLAKE2B ede5bde5d439eb6df2a438a3004367a8ed3e867837e259f86ba0fd2889345d7eaa7ba22ae683f56fb85d269a239bd31b7181205d4c1b311d2abd40d64e8ad11a SHA512 402f8994132035a8f7e1fee67f446ec3cd529f6ce0836422df5945e24995ac19d714c2729bd3acbb897c2d1581f7d99dd8ff8603211e28ed2d768a8868afa62e
diff --git a/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch b/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch
deleted file mode 100644
index 5e4221d51506..000000000000
--- a/dev-python/wxpython/files/wxpython-2.8-no-preservatives-added.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Portage preserve-libs removes the linker name (.so) of a library but leaves
-the soname (.so.4) and realname (.so.4.0) installed.  findLib searches for 
-mywxlibname.* and returns true if anything is found.  Disaster ensues.
-
-
---- a/wxPython/config.py
-+++ b/wxPython/config.py
-@@ -612,7 +612,7 @@ def findLib(name, libdirs):
-         dirs = libdirs[:]
-     for d in dirs:
-         p = os.path.join(d, name)
--        if glob.glob(p+'*') != []:
-+        if glob.glob(p+'*.so') != []:
-             return True
-     return False
- 
diff --git a/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch b/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch
deleted file mode 100644
index 9555bb57ef44..000000000000
--- a/dev-python/wxpython/files/wxpython-2.8.11-drop-editra.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/wxPython/setup.py
-+++ b/wxPython/setup.py
-@@ -887,13 +887,6 @@ WX_PKGLIST =      [ 'wx',
-                     'wx.tools',
-                     'wx.tools.XRCed',
-                     'wx.tools.XRCed.plugins',
--                    'wx.tools.Editra',
--                    'wx.tools.Editra.src',
--                    'wx.tools.Editra.src.autocomp',
--                    'wx.tools.Editra.src.eclib',
--                    'wx.tools.Editra.src.ebmlib',
--                    'wx.tools.Editra.src.extern',
--                    'wx.tools.Editra.src.syntax',
-                     ]
- 
- if not EGGing:
-@@ -920,7 +913,6 @@ else:
-                opj('scripts/pywrap'),
-                opj('scripts/pywxrc'),
-                opj('scripts/xrced'),
--               opj('scripts/editra'),
-                ]
-     if os.name == 'nt':
-         SCRIPTS.append( opj('scripts/genaxmodule') ) 
-@@ -934,15 +926,6 @@ DATA_FILES += find_data_files('wx/tools/XRCed', '*.txt', '*.xrc', '*.htb')
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins', '*.crx')
- DATA_FILES += find_data_files('wx/tools/XRCed/plugins/bitmaps', '*.png')
- 
--DATA_FILES += find_data_files('wx/tools/Editra/docs', '*.txt')
--DATA_FILES += find_data_files('wx/tools/Editra/locale', '*.mo')
--DATA_FILES += find_data_files('wx/tools/Editra/pixmaps',
--                              '*.png', '*.icns', '*.ico', 'README', 'AUTHORS', 'COPYING')
--DATA_FILES += find_data_files('wx/tools/Editra/plugins', '*.egg')
--DATA_FILES += find_data_files('wx/tools/Editra/src', 'README')
--DATA_FILES += find_data_files('wx/tools/Editra/styles', '*.ess')
--DATA_FILES += find_data_files('wx/tools/Editra/tests/syntax', '*')
--DATA_FILES += find_data_files('wx/tools/Editra', '[A-Z]*', recursive=False)
- 
- 
- ## import pprint
-@@ -993,7 +976,6 @@ if EGGing:
-                                   'pyshell = wx.py.PyShell:main',
-                                   'pywrap = wx.py.PyWrap:main',
-                                   'helpviewer = wx.tools.helpviewer:main',
--                                  'editra = wx.tools.Editra.launcher:main',
-                                   'xrced = wx.tools.XRCed.xrced:main',
-                                   ], 
-             },
diff --git a/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch b/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch
deleted file mode 100644
index 1497a2c70761..000000000000
--- a/dev-python/wxpython/files/wxpython-2.8.12.1-disable-egging-mode.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c4072ed7bc923039e544319f52d0761b7a4600a4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Mon, 22 Apr 2013 18:02:37 +0200
-Subject: [PATCH] Trigger 'EGGing' mode only by 'bdist_egg' and not 'egg_info'.
-
-We use the 'egg_info' command to explicitly enforce temporary EGG file
-location outside the source tree on Gentoo. As a result, our build
-command activates the 'EGGing' mode and wxPython is not installed
-properly.
-
-I believe that the 'EGGing' mode should be activated only by an explicit
-call to 'bdist_egg' command where the expected files are actually
-created.  The 'egg_info' command is a more broad one and is often used
-implicitly, e.g. by the 'install' command.
----
- config.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config.py b/config.py
-index 4fbd83f..b45707d 100644
---- a/config.py
-+++ b/config.py
-@@ -23,7 +23,7 @@
- import sys, os, glob, fnmatch, tempfile
- import subprocess
- 
--EGGing = 'bdist_egg' in sys.argv or 'egg_info' in sys.argv
-+EGGing = 'bdist_egg' in sys.argv
- if not EGGing:
-     from distutils.core import setup, Extension
- else:
--- 
-1.8.1.5
-
diff --git a/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch b/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch
deleted file mode 100644
index a4f6b0b07a3c..000000000000
--- a/dev-python/wxpython/files/wxpython-3.0-wxversion-demo.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- demo/demo.org
-+++ demo/demo.py
-@@ -1,4 +1,7 @@
- #!/usr/bin/env python
- 
-+import wxversion
-+wxversion.select("3.0")
-+
- import Main
- Main.main()
diff --git a/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch b/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch
deleted file mode 100644
index 9f0cb8922267..000000000000
--- a/dev-python/wxpython/files/wxpython-3.0.0.0-wxversion-scripts.patch
+++ /dev/null
@@ -1,211 +0,0 @@
---- a/distrib/PyAlaMode.desktop
-+++ b/distrib/PyAlaMode.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyAlaMode
-+Name=PyAlaMode (3.0)
- Comment=GUI Python Shell with Filling and editor windows
--Exec=pyalamode
--Icon=PyCrust
-+Exec=pyalamode-3.0
-+Icon=PyCrust-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PyCrust.desktop
-+++ b/distrib/PyCrust.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyCrust
-+Name=PyCrust (3.0)
- Comment=GUI Python Shell with Filling
--Exec=pycrust
--Icon=PyCrust
-+Exec=pycrust-3.0
-+Icon=PyCrust-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PyShell.desktop
-+++ b/distrib/PyShell.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PyShell
-+Name=PyShell (3.0)
- Comment=GUI Python Shell
--Exec=pyshell
--Icon=PyCrust
-+Exec=pyshell-3.0
-+Icon=PyCrust-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PySlices.desktop
-+++ b/distrib/PySlices.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=PySlices
-+Name=PySlices (3.0)
- Comment=GUI Python Shell with Filling
--Exec=pyslices
--Icon=PySlices
-+Exec=pyslices-3.0
-+Icon=PySlices-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/PySlicesShell.desktop
-+++ b/distrib/PySlicesShell.desktop
-@@ -1,9 +1,8 @@
--
- [Desktop Entry]
--Name=PySlicesShell
-+Name=PySlicesShell (3.0)
- Comment=GUI Python Shell
--Exec=pysliceshell
--Icon=PySlices
-+Exec=pysliceshell-3.0
-+Icon=PySlices-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/distrib/XRCed.desktop
-+++ b/distrib/XRCed.desktop
-@@ -1,8 +1,8 @@
- [Desktop Entry]
--Name=XRCed
-+Name=XRCed (3.0)
- Comment=wxPython XRC resource editor
--Exec=xrced
--Icon=XRCed
-+Exec=xrced-3.0
-+Icon=XRCed-3.0
- Terminal=false
- Type=Application
- Categories=Development;
---- a/scripts/genaxmodule
-+++ b/scripts/genaxmodule
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.genaxmodule import main
- main()
---- a/scripts/helpviewer
-+++ b/scripts/helpviewer
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.helpviewer import main
- main()
---- a/scripts/img2png
-+++ b/scripts/img2png
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.img2png import main
- main()
---- a/scripts/img2py
-+++ b/scripts/img2py
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.img2py import main
- main()
---- a/scripts/img2xpm
-+++ b/scripts/img2xpm
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.img2xpm import main
- main()
---- a/scripts/pyalacarte
-+++ b/scripts/pyalacarte
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PyAlaCarte import main
- main()
---- a/scripts/pyalamode
-+++ b/scripts/pyalamode
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PyAlaMode import main
- main()
---- a/scripts/pycrust
-+++ b/scripts/pycrust
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PyCrust import main
- main()
---- a/scripts/pyshell
-+++ b/scripts/pyshell
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PyShell import main
- main()
---- a/scripts/pyslices
-+++ b/scripts/pyslices
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PySlices import main
- main()
---- a/scripts/pysliceshell
-+++ b/scripts/pysliceshell
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PySlicesShell import main
- main()
---- a/scripts/pywrap
-+++ b/scripts/pywrap
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.py.PyWrap import main
- main()
---- a/scripts/pywxrc
-+++ b/scripts/pywxrc
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.pywxrc import main
- main()
---- a/scripts/xrced
-+++ b/scripts/xrced
-@@ -1,4 +1,6 @@
- #!/usr/bin/env python
-+import wxversion
-+wxversion.select("3.0")
- 
- from wx.tools.XRCed.xrced import main
- main()
diff --git a/dev-python/wxpython/metadata.xml b/dev-python/wxpython/metadata.xml
index f0783659f226..0796b4162e00 100644
--- a/dev-python/wxpython/metadata.xml
+++ b/dev-python/wxpython/metadata.xml
@@ -9,9 +9,6 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
-	<use>
-		<flag name="examples">Install interactive demo module browser and sample applets.</flag>
-	</use>
 	<upstream>
 		<remote-id type="github">wxWidgets/Phoenix</remote-id>
 	</upstream>
diff --git a/dev-python/wxpython/wxpython-3.0.2.0.ebuild b/dev-python/wxpython/wxpython-3.0.2.0.ebuild
deleted file mode 100644
index afaf8aa1491c..000000000000
--- a/dev-python/wxpython/wxpython-3.0.2.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-WX_GTK_VER="3.0"
-
-inherit alternatives distutils-r1 eutils fdo-mime flag-o-matic wxwidgets
-
-MY_PN="wxPython-src"
-
-DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
-SRC_URI="
-	mirror://sourceforge/wxpython/${MY_PN}-${PV}.tar.bz2
-	examples? ( mirror://sourceforge/wxpython/wxPython-demo-${PV}.tar.bz2 )"
-
-LICENSE="wxWinLL-3"
-SLOT="3.0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 ~sparc x86"
-IUSE="cairo examples libnotify opengl"
-
-RDEPEND="
-	dev-lang/python-exec:2[${PYTHON_USEDEP}]
-	>=x11-libs/wxGTK-${PV}:${WX_GTK_VER}=[libnotify=,opengl?,tiff,X]
-	dev-libs/glib:2
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-libs/libpng:0=
-	media-libs/tiff:0
-	virtual/jpeg
-	x11-libs/gtk+:2
-	x11-libs/pango[X]
-	cairo?	( >=dev-python/pycairo-1.8.4[${PYTHON_USEDEP}] )
-	opengl?	( dev-python/pyopengl[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_PN}-${PV}/wxPython"
-DOC_S="${WORKDIR}/wxPython-${PV}"
-
-# The hacky build system seems to be broken with out-of-source builds,
-# and installs 'wx' package globally.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	sed -i "s:cflags.append('-O3'):pass:" config.py || die "sed failed"
-
-	if use examples; then
-		cd "${DOC_S}"
-		epatch "${FILESDIR}"/${PN}-${SLOT}-wxversion-demo.patch
-	fi
-
-	cd "${S}"
-	local PATCHES=(
-		"${FILESDIR}"/${PN}-3.0.0.0-wxversion-scripts.patch
-		# drop editra - we have it as a separate package now
-		"${FILESDIR}"/${PN}-2.8.11-drop-editra.patch
-		"${FILESDIR}"/${PN}-2.8-no-preservatives-added.patch
-		# fix handling egg_info command
-		"${FILESDIR}"/${PN}-2.8.12.1-disable-egging-mode.patch
-	)
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	need-wxwidgets unicode
-
-	mydistutilsargs=(
-		WX_CONFIG="${WX_CONFIG}"
-		WXPORT=gtk2
-		UNICODE=1
-		BUILD_GLCANVAS=$(usex opengl 1 0)
-	)
-}
-
-python_compile() {
-	# We need to have separate libdirs due to hackery, bug #455332.
-	distutils-r1_python_compile \
-		build --build-purelib "${BUILD_DIR}"/lib.common
-}
-
-python_install() {
-	distutils-r1_python_install \
-		build --build-purelib "${BUILD_DIR}"/lib.common
-
-	# adjust the filenames for wxPython slots.
-	local file
-	for file in "${D}$(python_get_sitedir)"/wx{version.*,.pth}; do
-		mv "${file}" "${file}-${SLOT}" || die
-	done
-	cd "${ED}"usr/lib/python-exec/"${EPYTHON}" || die
-	for file in *; do
-		mv "${file}" "${file}-${SLOT}" || die
-
-		# wrappers are common to all impls, so a parallel run may
-		# move it for us. ln+rm is more failure-proof.
-		ln -fs ../lib/python-exec/python-exec2 "${ED}usr/bin/${file}-${SLOT}" || die
-		rm -f "${ED}usr/bin/${file}"
-	done
-}
-
-python_install_all() {
-	dodoc docs/{CHANGES,PyManual,README,wxPackage,wxPythonManual}.txt
-
-	for x in {Py{AlaMode,Crust,Shell},XRCed}; do
-		newmenu distrib/${x}.desktop ${x}-${SLOT}.desktop
-	done
-	newicon wx/py/PyCrust_32.png PyCrust-${SLOT}.png
-	newicon wx/py/PySlices_32.png PySlices-${SLOT}.png
-	newicon wx/tools/XRCed/XRCed_32.png XRCed-${SLOT}.png
-
-	if use examples; then
-		docinto demo
-		dodoc -r "${DOC_S}"/demo/.
-		docinto samples
-		dodoc -r "${DOC_S}"/samples/.
-
-		[[ -e ${docdir}/samples/embedded/embedded ]] \
-			&& rm -f "${docdir}"/samples/embedded/embedded
-
-		docompress -x /usr/share/doc/${PF}/{demo,samples}
-	fi
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-
-	create_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
-		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
-	}
-	python_foreach_impl create_symlinks
-
-	echo
-	elog "Gentoo uses the Multi-version method for SLOT'ing."
-	elog "Developers, see this site for instructions on using"
-	elog "it with your apps:"
-	elog "http://wiki.wxpython.org/MultiVersionInstalls"
-	if use examples; then
-		echo
-		elog "The demo.py app which contains demo modules with"
-		elog "documentation and source code has been installed at"
-		elog "/usr/share/doc/${PF}/demo/demo.py"
-		echo
-		elog "More example apps and modules can be found in"
-		elog "/usr/share/doc/${PF}/samples/"
-	fi
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-
-	update_symlinks() {
-		alternatives_auto_makesym "$(python_get_sitedir)/wx.pth" "$(python_get_sitedir)/wx.pth-[0-9].[0-9]"
-		alternatives_auto_makesym "$(python_get_sitedir)/wxversion.py" "$(python_get_sitedir)/wxversion.py-[0-9].[0-9]"
-	}
-	python_foreach_impl update_symlinks
-}
diff --git a/dev-python/wxpython/wxpython-4.0.7.ebuild b/dev-python/wxpython/wxpython-4.0.7.ebuild
index be31363646c4..7f34fdbdb84f 100644
--- a/dev-python/wxpython/wxpython-4.0.7.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7.ebuild
@@ -11,7 +11,7 @@ MY_PN="wxPython"
 MY_PV="${PV}.post2"
 
 DESCRIPTION="A blending of the wxWindows C++ class library with Python"
-HOMEPAGE="http://www.wxpython.org/"
+HOMEPAGE="https://www.wxpython.org/"
 SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 6f1f12e284dd..c45bd2cda656 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,7 +1,9 @@
 DIST xlsxwriter-1.3.3-tests.tar.gz 32108929 BLAKE2B faabdf2d2662c61217925679b1b22b294db5279da11b959b12d181711a4c9033e34a52d4888e3dfe1d804889eaa2ee8ff03cf1f298b4930268594e2856ddfb85 SHA512 d5bfcb624b66bb2098fcab1623f8e221c1254fd7b094bb71622969618061b434d9a17d9199e32110ef56336e2a96a93c94f1ed1ceca5877ef41fb52c3b2a37b6
 DIST xlsxwriter-1.3.4-tests.tar.gz 32300247 BLAKE2B ef388172c09f258f0c70a45545fae068359ed182693cf5bf04f2d4f6b528a08e5f963766a5b553c70c94b6e7f7e7a45b3d0dd6e6754dec320bf4748a309c2402 SHA512 12bacc4e604f02f2045e1e5e5f402dcb96a04e1fbd8d934d19eefc01d011832586a517e235c99793a4114d64940785ab02586d40b3bf089b455b681268ee4ef6
 DIST xlsxwriter-1.3.5-tests.tar.gz 32306484 BLAKE2B 161eed08d54ffb1728dfef394abd7614d2ec9e275b93079434bd3bd125e5707b15a6ca164a835ddec31894caa83d68dbd8d3cc5f38d24e4e30b2d86bd7f3e240 SHA512 349c7635f6d770ecd3429012c3e3a91f78381427fa166ef29da7cd7fd86e89da82dd51ddd69dca7b9ae4fb4f05ea4213c47c161755ed9a55a83b6b971edf8202
+DIST xlsxwriter-1.3.6-tests.tar.gz 32500145 BLAKE2B 796cc49f26ffbb6f980488b2fb184da95a4d95049544e30d6754823cdac9f98cc829cd665c293220033b9e654ce95816b668ad364796b4b19a47e0fb6ac03fb9 SHA512 5a8031a92e467f1afef4a2bdcde199f35bf3a013cfe01b28cf182c9c6f51f46f51547c73165e05094f0bfbdab6b2e8f96ff75e531fe63681ce72cf93325c098d
 EBUILD xlsxwriter-1.3.3.ebuild 576 BLAKE2B 9b081264509bc153831fe787c76a58826a4ebb1ee6e949d9ebc3997b20da12d28478d675c911a75871eaa39122e3b0ea4b825159d25332031dc737c5997f8f7e SHA512 dbc2b3a6b2ec1a81798ffc085a92df5ad16c8eb9b3b4930d7b0c49302b80c9f47d69e652c9954e258baedd21eb30b96f5114b59d5a7374326b67835aa68e06f3
 EBUILD xlsxwriter-1.3.4.ebuild 578 BLAKE2B 2125806083b97e9465c6f266b7510885a2a16cbb1a2a9cc29fd7b99170b3ea6cbf72a82097288d107c585e18def43ec525d065c9bc60644db7481788a9b55f70 SHA512 2f521452e38d3cdbe39480fe481e09322e810403481ed8f8d8529f2a5df336a41a4ecb1a6171cd61f18b941011ed087645101df92f47251ddf34f17a81779364
 EBUILD xlsxwriter-1.3.5.ebuild 578 BLAKE2B 2125806083b97e9465c6f266b7510885a2a16cbb1a2a9cc29fd7b99170b3ea6cbf72a82097288d107c585e18def43ec525d065c9bc60644db7481788a9b55f70 SHA512 2f521452e38d3cdbe39480fe481e09322e810403481ed8f8d8529f2a5df336a41a4ecb1a6171cd61f18b941011ed087645101df92f47251ddf34f17a81779364
+EBUILD xlsxwriter-1.3.6.ebuild 578 BLAKE2B 2125806083b97e9465c6f266b7510885a2a16cbb1a2a9cc29fd7b99170b3ea6cbf72a82097288d107c585e18def43ec525d065c9bc60644db7481788a9b55f70 SHA512 2f521452e38d3cdbe39480fe481e09322e810403481ed8f8d8529f2a5df336a41a4ecb1a6171cd61f18b941011ed087645101df92f47251ddf34f17a81779364
 MISC metadata.xml 410 BLAKE2B d1fab95b5fac3e69c5303298385f65062b28934f22fe8db02db02753b5cae36137a3e02e1d38e3762933dc9297045e1efaee8d17c714ca7b22459f342f23f928 SHA512 4f3d74f5afdec59b8575446b444f1af36f71137c980f7790e952860afa98b2d128ddf8477b135715de2852b940926108dafbff3cb60f2f1a8825a02c415810e9
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.3.6.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.3.6.ebuild
new file mode 100644
index 000000000000..0976f9f9d2f1
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.3.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="XlsxWriter"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_${PV}.tar.gz -> ${P}-tests.tar.gz"
+S="${WORKDIR}/${MY_PN}-RELEASE_${PV}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/yarl/Manifest b/dev-python/yarl/Manifest
index 4a5bd6e4f9b4..372510dbf1b3 100644
--- a/dev-python/yarl/Manifest
+++ b/dev-python/yarl/Manifest
@@ -1,9 +1,6 @@
-AUX yarl-1.4.2-disable-broken-tests.patch 750 BLAKE2B a4d0346c790f68e49c4c1baf5ac0f713a619cd9bae6514bfd22157c8edad08f950b1e207f78b2c9e06e0a0bf281a4406a639200e7b3559a727ff048cf4c51105 SHA512 a0ac3983aa6d88a30b1b31872f24b1ecd7c1055d5f8354ecb14da6aaab029ffe9e5f818d75e5ff3f44f6f70c624ec20bd9f5ae1831e3297cdaf423af7e2ce3d5
 AUX yarl-1.4.2-test-without-coverage.patch 585 BLAKE2B 2a49dbc7f8c0465b51f0d3405e897b61ce16355c64a7b19cb805d1d546b26a8088e1aca834b215b3337ed6062d068d646e635d85fdbfa9ae98744fa0a5956cf7 SHA512 f7775c6a01fac42c9c4a544d9326692d97cdf4a4a2e8c7d69a53dc6d0847eaef9660d193531c9bf50964b0e01d764fe85761c3ba1dae8c70669795723da7154d
-DIST yarl-1.4.2.tar.gz 163521 BLAKE2B ababd1d35bca51a84c8d189266ef5d35f7a4dc65c84c4097a260e86fb838b1a35d2a639c1cf2a407aac8e68c5f67222aae6fa1f6cbfa5cb71dd851b385bae45a SHA512 036562b645d7b9b3ed4a749decb189587b41ab13b5dda5ff461b00eebadf1ecdbd8d5ae06932cc7d8b7ff551cd630f8671eb0f6c854b20996cda4a6897994fa0
 DIST yarl-1.5.1.tar.gz 173005 BLAKE2B 08bfbe914a2f9a148e558d6db955b61c0d95d3f19d6da6290cf6bcd82f3b46ca58836aebd57e148d6f0fd2dfc4b1244f633e7f472b759c3a4fe0d620f80e3f3d SHA512 c82b0722f347279a03d3f6e82b7c0c357678e850b80ed87befab570846a71c55897cfa25d36757a93ac42c023334ecdf890beaeca7fde4536f68b6f70fdf2127
 DIST yarl-1.6.0.tar.gz 175492 BLAKE2B e6e3ebb30a591fa1e94d07c353700b1ebf7c21a729d8c9a4cd582f591235d54dee40a109e28fb806893e281b9ab36ca2b1ca1cdf7f093587bde8a5a9c4e7bf89 SHA512 d08d2c4a906706bba3c1fad2b02e01299d076d9f6c1a1eb172d116d0ccbb1e6143b7dd959d242f2a1b5d450416bb15ab6e53ee9e05876b161d61ec23e054f29b
-EBUILD yarl-1.4.2.ebuild 719 BLAKE2B 3354c40f113ed2db98e8680ab88f3cce22b87b3bd2eb3ad5c24ccdd08d3088bc75b7cedb63908df10043f98ed10ff5811698243c754fb32e12b38d452ad5063b SHA512 dfe79f360e1162543b5bd2870a3ad6d0421cc3941202702a8a72ba1c85c17722fd05230874461e6a1409a2fab55a932fe79f0d21cc818f0722dca00dd18d2af6
-EBUILD yarl-1.5.1.ebuild 725 BLAKE2B 4c163efccb4020f09267ad54f5d297ca4dadeb3bbf44607ce03c6139ba96e460be4e6968d156c58b3562574bfbaa9849faaf37f0c72f337eb351b446eb9f6817 SHA512 5113e5aee9d7a3e955551b99b869357ce52886b81cc5cb68fc45035c1ba324114857cda538571665d8ec7c87682b0027df5f495cd13fecf14df35d00df029fe5
+EBUILD yarl-1.5.1.ebuild 723 BLAKE2B 8897a20fab2df6b0adf8be24cad4981e54584aa95a376d0cbd41df756b825a03800520a3d21c25e5c349b622610766625c87a93b9346e5cee1578d3284abbe04 SHA512 61108f5fb825d7ef083e78f95ace2ce6941ccf0fae2986b5793a75346f233ec7b98df5dd3d5eeda6dee269c7736367371f9152800f14aa9059b9818122e72490
 EBUILD yarl-1.6.0.ebuild 731 BLAKE2B dc50c14dd0e15502daaf748c91b429b58bf284881c591301dbee301fc1ccd63c690ba6c70e7e9bb7f487c09b5bdf754303ebe1a9a2a52a4b59fa6d4c9a1f3981 SHA512 1c6818c83ec259d88bd9f2706c6170abdad72846e261de4f9d72edd502d243bf735965bd21c6aaddea9c5a3704ae7daa011e716774e2f10d80981b637dfc1dde
 MISC metadata.xml 439 BLAKE2B 8d9b97af296f25f501da90aa57deffca21625c8dda04f04e458879977865609e2fece4231deea45f297e3dc74740cea6a2d3a1e0be9b8c37eb5b08379361fef6 SHA512 f554403c332e415434d21a63d65f755dfd80dcdd813f3832b8e09ece9e26a2d28d274de9afcff7dbf2cf64122e4f4b50e546d7a2f67cc6f2090a4da8205cba8c
diff --git a/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch b/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch
deleted file mode 100644
index b6f774a77eaa..000000000000
--- a/dev-python/yarl/files/yarl-1.4.2-disable-broken-tests.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ca06b26582c08c6e75fa5588f712c4c2f7247223 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Wed, 4 Mar 2020 22:36:58 +0100
-Subject: [PATCH] Disable failing test TestScheme.test_no_scheme1
-
----
- tests/test_url_parsing.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/test_url_parsing.py b/tests/test_url_parsing.py
-index beea365..58fa198 100644
---- a/tests/test_url_parsing.py
-+++ b/tests/test_url_parsing.py
-@@ -38,7 +38,7 @@ class TestScheme:
-         assert u.query_string == ""
-         assert u.fragment == ""
- 
--    def test_no_scheme1(self):
-+    def _test_no_scheme1(self):
-         u = URL("google.com:80")
-         assert u.scheme == ""
-         assert u.host is None
--- 
-2.24.1
-
diff --git a/dev-python/yarl/yarl-1.4.2.ebuild b/dev-python/yarl/yarl-1.4.2.ebuild
deleted file mode 100644
index 8b0deec64b05..000000000000
--- a/dev-python/yarl/yarl-1.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Yet another URL library"
-HOMEPAGE="https://github.com/aio-libs/yarl/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-
-RDEPEND="
-	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
-	>=dev-python/idna-2.0[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.2-test-without-coverage.patch
-
-	# Upstream: https://github.com/aio-libs/yarl/issues/410
-	"${FILESDIR}"/${PN}-1.4.2-disable-broken-tests.patch
-)
diff --git a/dev-python/yarl/yarl-1.5.1.ebuild b/dev-python/yarl/yarl-1.5.1.ebuild
index 4eb9a41647b8..335b8d485e09 100644
--- a/dev-python/yarl/yarl-1.5.1.ebuild
+++ b/dev-python/yarl/yarl-1.5.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/multidict-4.0[${PYTHON_USEDEP}]
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-30 17:27:54 +0100
commit	f70a1bfc721336d4fc7dfb711c2f518a6b18cf16 (patch)
tree	e907cb121b30e3c1df1710719c0ddf4029597a47 /dev-python
parent	db063b515939ab15261136b24e4bc44386335c0c (diff)