gentoo resync : 01.08.2021

269 files changed, 3477 insertions, 2368 deletions

diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 89ad1334f75c..edca4b98f48d 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 9484e44f2abb..812230a01eac 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,5 +1,7 @@
 DIST aesara-rel-2.0.12.tar.gz 8154749 BLAKE2B 0e39102e985e9f9ed49f65c76389d76702b5d8fbe8c3e1130c61dce7c43eb70f5c73fd3557ff9aeaa1d186b33bb5803a04a4a5b0ce41076af7e923d05ce3353d SHA512 e68f5ce0c64a678219421a0bfc957d1594dc34c887af6f6373c00888387e5da83dec44b68b9309146ae2fd60c0677039980a87ee87ecc0ad3db2fbc80213cc34
 DIST aesara-rel-2.1.2.tar.gz 8167162 BLAKE2B 727bdf6fb9765c8b60da585595ed7203071490c1dfc0895428ae3efe4a1e74a14bbdf2a76128a6840dedeabdfc997fd297dec23ff517247452433cbdc9449b9a SHA512 22ebd1290a0727f2cf1e106770c872d5f1d785c6946b8e4debcc29a34fddceccb11f0ec81850fd93dbff556aa300bf2ec1bd6eef1297d93e194ff832b442c453
+DIST aesara-rel-2.1.3.tar.gz 8170822 BLAKE2B dbbc4a453c5d7f9cd4ab2c925dd9293e835db23100686a8d7ab2c47182b1bc05f883eeb60d6f47f8f34e4187f3ac07b632cde43fe82a99e2145a2f699a2b3582 SHA512 52d1724eb7b3c9bae4bdbf1735db9ef96cdfa94f3e2281b255201d0baba260fe31f78c00719a53ce3c59ea9c66ff218d8acd7bc012b386942f29806c07ffc466
 EBUILD aesara-2.0.12.ebuild 2101 BLAKE2B 7915fe29cb13d9c8dcaa0706ecd3ebc4dee7f8935d42af424cc33e1beee829de6fe05a92f0f700859d8923c6d76560b57299fff452ad177337e484819a7f16e6 SHA512 3916aba60e456a40dadad9afe223e125c6ef945d966d4c270627144603a74e2596819acb3e38086c7a38bc1c30232b5d0e45431d87b032064eae1f7b6b2e2715
 EBUILD aesara-2.1.2.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
+EBUILD aesara-2.1.3.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
 MISC metadata.xml 404 BLAKE2B 5f15a3e7f8771f0d8b95097374c87fb6793089f1a0e000c433a8f644be3cb7d945128d0b164b608405070b976c932c77738ed930bf4734129ba37f4feda667b3 SHA512 f7afb5e2c8053cbf8ace61197d234869ed86a06bf066652eac3ad800c7251d18113dfd2e3115281c10f016c56e845d9d34915e2eddbeac4e3a2f414a8e858148
diff --git a/dev-python/aesara/aesara-2.1.3.ebuild b/dev-python/aesara/aesara-2.1.3.ebuild
new file mode 100644
index 000000000000..efa88e842a94
--- /dev/null
+++ b/dev-python/aesara/aesara-2.1.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/aiohttp-jinja2/Manifest b/dev-python/aiohttp-jinja2/Manifest
index dbc6e8b0546b..effb57668575 100644
--- a/dev-python/aiohttp-jinja2/Manifest
+++ b/dev-python/aiohttp-jinja2/Manifest
@@ -1,5 +1,5 @@
 DIST aiohttp-jinja2-0.15.0.tar.gz 51183 BLAKE2B e19ca813f36ac746a84812ec278a3de43e6e24eaafcf949fd18a32c99f460ded03f4dc97171fe1493174a8e2c51543b8c1afcdec51c4688f4fb0b7781287cc03 SHA512 084714cd2376b93f32cdcebc1971d4aaa704a177524b00f322e0347c15ab8085960a68a3760be056e391410f01b6b637eb59db54fccf54d09ba53a9ea03a01db
 DIST aiohttp-jinja2-1.4.2.tar.gz 54328 BLAKE2B 3d6aaeb03bbb89516a92fa877ee95a2fd27ab83666a03ca12e78f1744b82797faf2547bf55118618cbd979d80779a9571dfcfe9036bc84142563ede55cfbc1a1 SHA512 7bdaee97efe90a0009cd78a4e46dc80cfeb661c2d5561fdb1b1a1ff098abba8667260bb908e3227edd6601c2412812d0311461942568a8aabf07a164ea2f290e
 EBUILD aiohttp-jinja2-0.15.0.ebuild 1080 BLAKE2B 79c5f9ac7a6d1b25fc494a3574c9127f42de3046433c5a3c07bfb1ebbd0b5764d73e30eb87dae1486be98a8cde8e299ba2e28913d832f980fe7327520055e4bf SHA512 dadd8b7326252f151b00440d2bcde8eed37493c9c44283bfaa860a8dd308d9581f8e66a14d181916826ebcdbad1ab87fed70d5fe14b0765ceb99966183ead5a8
-EBUILD aiohttp-jinja2-1.4.2.ebuild 1105 BLAKE2B bfbd47bcfc80dc082c0be7fb5f3bf2f18c16b462f36665ba769a7198f5bb7a7b916cc748fdc3f498537c2d413752201a932ae4940f5b32ca1b5b777c9215d8cb SHA512 dbd0621b0fd5da4baf69d67d5d764174ec99f9c88331557dcbe0a592a26a6ee0ac33f50f2f7810e2e23c7d4ee020fe6bcf2156034e8265f4bf9062de81902d6b
+EBUILD aiohttp-jinja2-1.4.2.ebuild 835 BLAKE2B 94a5a9a23474bf9d8b170df4295f7c9529b6ed93b6365c91621616af028f814b402d166bcca0512eec21f165432c20a0bd773300efecffc0d3df39a89be5911e SHA512 ec7546c1cea7828a28369cdffea06d1084c59eb34fd962508aa1cba73b2f56db9283f2090ac826e9af944cf8958ce1e29a4d109467062b57bc345dba8ede3fe0
 MISC metadata.xml 408 BLAKE2B df678e57a82a1c6a818983506af4a0397469497ec15da8a70aa021b77b60b4b4d14f8c37d821c655fb1c92dc75da69bd37ac487d9937d87c14d6338de8bad803 SHA512 bd5b6da5b67af78a148ec4a95378caa391dee95591b6888028d5427000d38411931559332bf0508c201691e04b8b417acbc5dc026858c546e6843d6779607e22
diff --git a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
index 47be01d04239..6afda9ed0652 100644
--- a/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
+++ b/dev-python/aiohttp-jinja2/aiohttp-jinja2-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -14,25 +14,19 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/aiohttp-2.3.9[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
+BDEPEND="
 	test? ( >=dev-python/pytest-aiohttp-0.3.0[${PYTHON_USEDEP}] )
 "
 
 DOCS=( README.rst )
 
 distutils_enable_tests pytest
+distutils_enable_sphinx docs dev-python/alabaster
 
 src_prepare() {
 	default
@@ -43,13 +37,3 @@ src_prepare() {
 
 	distutils-r1_src_prepare
 }
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 2dd0ca3e7a7e..44dc0bf4edbc 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,4 +1,5 @@
 AUX aiohttp-3.7.4-brotli.patch 3537 BLAKE2B dfb410aabbd24f16bb1cf5fe999e9730417ccaf7ea59cb48d0445abcfe757e0b9d165ea723152df8f54ff039ac092a0a6cc6d6bddfebcad44d8d63f4eb5c3c79 SHA512 6bf8969c57fc649f84dae9eacd79d5f13558bc970e8755dbf22dcc08789d2377d1f04a745becd3c533f3a6ceb459ddb6bab5eb39e1098468650b312c2ecd51c3
+AUX aiohttp-3.7.4-fix-py3.10.patch 2285 BLAKE2B 4d0841adb3e0038b1b361449812975e4f908e0813576dd3adf1f6d841e93adb514803629bb186304d44c92680d0b1529e3a2ca5a861766f856d32cc69edb18d4 SHA512 3cb863431c8175da625d429a6e275a6a3f932f162f9dc9c477f7038af302486698ee0665c3ab69111d277b9bd080d90e7b3e4f7a2c0a797e554c0cdac3f5cef2
 DIST aiohttp-3.7.4.tar.gz 1114533 BLAKE2B dcae3e66e13df8264d731a3ca65b4718feca8d0e6e1baeb6608dcb9bfb4bd4baaed6bd34297ed5ece78d01189bf9a0b9860845cae4e2b93cc2ba463cc35cfb77 SHA512 66fcc837b388020dc998cbaa2db31e48ecec75bcfaa8af9108e2ea265588dafa5684ca96a8fe3ad6759b22e09a4ae6d4efd8653fb76126eccdc826c15cbbe2e6
-EBUILD aiohttp-3.7.4-r1.ebuild 3165 BLAKE2B 251953a98d2342392985e53c878a59177b75b032b9e443757c0c1195688b6a5bb2dd19fa0c66d4aaf2b583a8a460419eb6699f2dd2232f9d7e6f4de039b3c31d SHA512 c20675a6e456b7fb1ea0125e2c51fe7399ac466759c9f1b91e10364a667784605a8ae6e50a61c42f541030f6162c7397468513acdf163ac8d5ddf26ca284f946
+EBUILD aiohttp-3.7.4-r1.ebuild 3212 BLAKE2B 662c712aa1811f1d7e603e175ad958d2d87a8075e0fabcf0d157c1efaff634e8a3b7b6f56b2990447072127d2d843af82e44cba711b1fe00160c8ae5849baa1e SHA512 76fdadad383bdd3cb061da3314eda61c9ab325e157990f4469808526a350ee9ac319326237b26f635f565ab6a3ad0c44eba2108ccbdeeee4282a537dde0a750c
 MISC metadata.xml 489 BLAKE2B beb80da34848dfe7b81ed65d75923480644ecf42e2c5ce04a7f66f3e729651fdc6035054482aff966ec9f03cfbb812d3be0afd783af69e37f1002182e4885473 SHA512 d8c9e2edb8a57a3b6b02bb5314aef77dc266af6e80fd0300eb0652c59790232017d0062f5b7361b059c382d1c904f0f46cd0e672d1963e9595f3d4dc7514f182
diff --git a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild b/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
index 3871075876e4..4c0cea0a0d1e 100644
--- a/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
+++ b/dev-python/aiohttp/aiohttp-3.7.4-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1 multiprocessing
 
@@ -42,6 +42,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/aiohttp-3.7.4-brotli.patch
+	"${FILESDIR}"/aiohttp-3.7.4-fix-py3.10.patch
 )
 
 DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
diff --git a/dev-python/aiohttp/files/aiohttp-3.7.4-fix-py3.10.patch b/dev-python/aiohttp/files/aiohttp-3.7.4-fix-py3.10.patch
new file mode 100644
index 000000000000..3c7593584b76
--- /dev/null
+++ b/dev-python/aiohttp/files/aiohttp-3.7.4-fix-py3.10.patch
@@ -0,0 +1,73 @@
+commit ec87d9f2b6541599dd7fc8aaebf0fdfbb812ade7
+Author: Louis Sautier <sautier.louis@gmail.com>
+Date:   Tue Jul 20 23:37:27 2021 +0200
+
+    Remove deprecated loop argument from asyncio.sleep/gather calls
+
+diff --git a/aiohttp/web.py b/aiohttp/web.py
+index 557e3c3b..52dfdf93 100644
+--- a/aiohttp/web.py
++++ b/aiohttp/web.py
+@@ -441,7 +441,7 @@ def _cancel_tasks(
+         task.cancel()
+ 
+     loop.run_until_complete(
+-        asyncio.gather(*to_cancel, loop=loop, return_exceptions=True)
++        asyncio.gather(*to_cancel, return_exceptions=True)
+     )
+ 
+     for task in to_cancel:
+diff --git a/tests/test_locks.py b/tests/test_locks.py
+index 55fd2330..5f434eac 100644
+--- a/tests/test_locks.py
++++ b/tests/test_locks.py
+@@ -18,7 +18,7 @@ class TestEventResultOrError:
+             return 1
+ 
+         t = loop.create_task(c())
+-        await asyncio.sleep(0, loop=loop)
++        await asyncio.sleep(0)
+         e = Exception()
+         ev.set(exc=e)
+         assert (await t) == e
+@@ -31,7 +31,7 @@ class TestEventResultOrError:
+             return 1
+ 
+         t = loop.create_task(c())
+-        await asyncio.sleep(0, loop=loop)
++        await asyncio.sleep(0)
+         ev.set()
+         assert (await t) == 1
+ 
+@@ -43,7 +43,7 @@ class TestEventResultOrError:
+ 
+         t1 = loop.create_task(c())
+         t2 = loop.create_task(c())
+-        await asyncio.sleep(0, loop=loop)
++        await asyncio.sleep(0)
+         ev.cancel()
+         ev.set()
+ 
+diff --git a/tests/test_proxy_functional.py b/tests/test_proxy_functional.py
+index 68763cd4..65c773a1 100644
+--- a/tests/test_proxy_functional.py
++++ b/tests/test_proxy_functional.py
+@@ -238,7 +238,7 @@ async def test_proxy_http_multi_conn_limit(proxy_test_server, loop) -> None:
+         resp = await sess.get(url, proxy=proxy.url)
+ 
+         current_pid = pid
+-        await asyncio.sleep(0.2, loop=loop)
++        await asyncio.sleep(0.2)
+         assert current_pid == pid
+ 
+         await resp.release()
+@@ -443,7 +443,7 @@ async def xtest_proxy_https_multi_conn_limit(proxy_test_server, loop):
+         resp = await sess.get(url, proxy=proxy.url)
+ 
+         current_pid = pid
+-        await asyncio.sleep(0.2, loop=loop)
++        await asyncio.sleep(0.2)
+         assert current_pid == pid
+ 
+         await resp.release()
+
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index da3216f39a84..6898e34bf9f8 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -4,10 +4,12 @@ DIST apispec-4.5.0.tar.gz 65423 BLAKE2B ce6cc6f466d274db6aa5f8b27c3a9340daff7934
 DIST apispec-4.6.0.tar.gz 66147 BLAKE2B 98127cb2bf938cc1928e13e1169804eea174351a0f4eeaabc801da711d0861bc35a9761e9f1bc478a44d6a85989a1aba1840b3e472599064240a880fda8e45b4 SHA512 b030e5400a9abce06576406f83befb298814617e06729f29c2ee70517cf456901b67e60880b3b4baec096717a91341e8268bcd8e01fd566b7c6e03709afd7c3b
 DIST apispec-4.7.0.tar.gz 66274 BLAKE2B dbb14dd831eddeb9f086643b6182ccc3e529e22ad7e31d1d4dd2dce54edf76c6cf01a74438383df5ccec18cf863334d5cdbd45214791c01632d7f7efa63f7aa3 SHA512 53c0a1e6db81439a7c3f8e933cac28003dd84444e65986a29aef8a6ec761999c84417902448288d69c5873d12dded2156e79bedc5bd4bd0fd472ea014e65a6c7
 DIST apispec-4.7.1.tar.gz 66356 BLAKE2B f78ab7f10c7a10f3d62b4d02e5a33cc1972aea0b33af1c485a11c2c415b2913a4d8151a9aa44de9876fa1ec6ebe02d448fb50dcc573e6a4779265ee07bda0329 SHA512 e5ead9a867d9dd18f2fb7509b6ef4afd9ec04cc102f55684a66e8f5ebe1b8e3e4129c62b7fd50f0a337547336375cee612e1bec620fa957f8f90d11968538c8e
+DIST apispec-5.0.0.gh.tar.gz 68795 BLAKE2B 42b4ea7d825fc94c6ca904df56a900b52ecd3fda78b3079103370c6cb362cea6338251d344c970c0ad0380d8b39931f6fc38f3e71dc4c31ace0763c6e9721f73 SHA512 1e3d4c06713081d90d5d8650e7aeedd12248ef9a43ced6681be4e9dbf4563b7390cabf3423ea2c1bfda6900cd193efa4e2cacdac77350fcf2e83cfc30580c98e
 EBUILD apispec-4.4.1.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
 EBUILD apispec-4.4.2.ebuild 996 BLAKE2B 010b68129d1ecf076356a1f6c7b7c27d3bb14ad634a88d7f77667be5819f787cb66ad06f808ebbefcd0702ecb5c023efbb52db6e87714129e6b42de1f56fc5a4 SHA512 7dee2b1f9a4efa951b1e84a378fa7538f9543d0e4ad84c931e6b458c793df606f554b83e71a014058c2992774f15cb5dd63402a4ee07bb02ce0b5176a7912a55
 EBUILD apispec-4.5.0.ebuild 996 BLAKE2B ffada6a65aa0e45e63d4314e366e3c90f213da21f8768f44eb6c133568b0e672b68f9ce0c6c8bf62b1b033666c5d61d5ea1d67b7f292643ec054ebcbf3bc65e5 SHA512 70f06d77e4cff13e20988a70a31d2b5c3dba7bde83988388ca7b81e68e1177b12a99b803fa9392354e4c5949286a7bd6b3c46a0ba8411d6c74a93696d714b26d
 EBUILD apispec-4.6.0.ebuild 996 BLAKE2B ffada6a65aa0e45e63d4314e366e3c90f213da21f8768f44eb6c133568b0e672b68f9ce0c6c8bf62b1b033666c5d61d5ea1d67b7f292643ec054ebcbf3bc65e5 SHA512 70f06d77e4cff13e20988a70a31d2b5c3dba7bde83988388ca7b81e68e1177b12a99b803fa9392354e4c5949286a7bd6b3c46a0ba8411d6c74a93696d714b26d
 EBUILD apispec-4.7.0.ebuild 996 BLAKE2B f35028913e1ba896a4cd0047275b1c2a639f1c6339b6d44c3ef1584e20b653da5a63de8e8a3b3da7f2d0698f7588cc5092febe49f0273ef4a84a90fca0ca8d25 SHA512 b74e4a525fb9ea2ef1cf55cb180593e837833e8de81e480ba0bd4dddac08798b77d01befdc3abd1d6e8b4471c79c0bc97ff1fb1d1527681b16d72db9d94ec04e
 EBUILD apispec-4.7.1.ebuild 995 BLAKE2B d4317c8d7e04455f0755d2dbc1ec18f92eb708d072b13c34b956102fad5f4c212c29520d9af88503fdbbe344d7ab9529d470f0538b7bd5acc0956815d8ee132f SHA512 28f4b6701769f20a43eab803af1481d06108d3cc25c9e03cbcdef254168cbc39290e28a4ce92d866cc5b8ade49e286f0332db36f5e7bf82095394b7a4bf985b8
+EBUILD apispec-5.0.0.ebuild 1013 BLAKE2B 9428582a7bb9828da380e83a67fc10c16dfa96991bd9a665dc06cc753456794ee2b2d19ba7a09b2162199f430ebe3f466065839c4a4a67317c249a4f7e0cdd56 SHA512 6edc487cad0b66acb56b7eeffe6869a66de26cfb2f8b29512e4cbfc59bb4cbb6f74dec93d35ea5a3de43297faeea200cb70e4653512a849a8f2478c8a4f058bd
 MISC metadata.xml 503 BLAKE2B 2004c77c7f9cf9dc1e3cedc5f2acdfaf7df4c7b7cca45c7cf6644955a042d0a2919560acc6ef838c40568e6cb69bbf5340cbeb1211ce725b005bf652873b396e SHA512 edd05204d0174abc0737f18704d805a701dc4ccc6dd50f7b8da2a8ffb2aff2f4fc993a348e2c549c01d33ae255ec6ad089ff57ba5c3efd608aa6eb2391b2c2a8
diff --git a/dev-python/apispec/apispec-5.0.0.ebuild b/dev-python/apispec/apispec-5.0.0.ebuild
new file mode 100644
index 000000000000..9965d2dcdf04
--- /dev/null
+++ b/dev-python/apispec/apispec-5.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A pluggable API specification generator."
+HOMEPAGE="https://github.com/marshmallow-code/apispec/"
+SRC_URI="
+	https://github.com/marshmallow-code/apispec/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-3.13.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx_rtd_theme
+
+python_test() {
+	local deselect=(
+		# requires unpackaged prance
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index 034e1a92f16a..96f682b5867b 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,8 +1,3 @@
-AUX asgiref-3.3.4-py310-warnings.patch 8869 BLAKE2B 9690124277e49c87fe5d72965407f50b3826d5e26e9f81c4a5f25b88872f2d133f656d5e63dbe7b6503e9242912d7d0ed1d19d9b38640dcced8b709edadd5309 SHA512 53de4ba34d212ff4e750764a790d8e5ed9fae5fb78f4e278820680bc8fa7028e6f2658d16cf9826790b49d185ffbf360f8fe539f3ed5d03907eab114cc258174
-DIST asgiref-3.3.4.tar.gz 30780 BLAKE2B f14a5ae3cc3d0c67a827b4b8d002c9d92388285f7388b7ac439b11fbe2e72b6dee5a9c38637e6b5189e3a3625d24a806b5aeff1ffc41861fd4947d7b7c4621ba SHA512 e224ce82f9156e3efde316f3e209a9fbb9494cb9347d6652e19ed130921143de8d3e2a45f50352bf13fcdf229c291e68a0348fff31de144e58cd1a53b4eb0c31
-DIST asgiref-3.4.0.tar.gz 32396 BLAKE2B bbf80c4f5bfc7eaf2f27896913a59f522643de35a5eac45807b88f0b2deef6acef408a6d3abb939c4653554415028b5eea68e99ee45247e384848c554ab61c7c SHA512 259dd6fafcd4db73554a4bd26f6000b33c61e8e4d42294bc22826bc95e89959bcc3f9f97d8f0b5dc7e0cf8420890ea8ab368232b4046254e8c91ad010f6509c0
 DIST asgiref-3.4.1.tar.gz 32529 BLAKE2B 4b5f3b33e165468d71711cf28a5a6161866cd7495140cb67ff028aba5a2586414783d2fa7ce744e99e269714d9d64a019a67c852fd4546ba1f71625473010b9f SHA512 af266fc3eac58c21f2ab3f66e522067388f9cf232b17344fb5afbc408c034e61a1cce02362ec5dc494985beef099800f75cf7de28dc057c45e4bcb973b0a6dbe
-EBUILD asgiref-3.3.4.ebuild 813 BLAKE2B d3734b2e613038bc04c49562c75695a1affb024cb3db63a7632e615b2942bb4698f6d25616df76489c4163bc8088396731229895c37601c741ece1490a883174 SHA512 e394d35e7ca25e84395fc20c6a7b998d076e3268319991cbe9116b059d9bd969c220fbd2fa107d0846b7a4935b36082964105482912746ea4d6b0c3d118eb3bf
-EBUILD asgiref-3.4.0.ebuild 698 BLAKE2B f04dd652264530179490857aef42e3af9a8d4f14a7976602c77f8e99af47d84ceb3a57981db64aa29a519e85beae4535aea99e475a4b82124b98d35457998fbd SHA512 3d11e79046a7ea4e9ff0ff4cd4816d19634cfafb6fc4b18a7305ae9befb672fab0d996da1905e6c721d5c0bd570669d7759df36041fc77c9c50cdabedd2e00b8
-EBUILD asgiref-3.4.1.ebuild 698 BLAKE2B 1a4ef749ea4481e64d8c87eb8f5cb51fb2e875fd8f5108f02472c1bf344385011073a22bb4f5175069b48546562b5a6a19a798045d5341062a98fef08d98ebed SHA512 48a91d936af1299747d53535ba24406c9c5d42865d45fc30a71d82e1d863c5add0e5d1e21e42a3994a827351caf72d55ebaf40b6be1d896bd098b4ffdd367aff
+EBUILD asgiref-3.4.1.ebuild 691 BLAKE2B 760dfe213ac9e17eaa8878640350414e140d368007a7ca4b12ad5eb321bb21ccf92cf9d2db1e4e300d9cf9a1ef66a3bae40f95763b688a551379f7aea76b7b60 SHA512 23639dccacd3fd63e5c519e180b09ab8eb02117b5653efb5da9893eb5f40e2add7780c80bd55abbeff0f751512e12c246bf07636e75557d275c34122bc4e8212
 MISC metadata.xml 388 BLAKE2B eb8c329aa8d5220d66dd380ad7c4bb4fe539b3fb5b854e9a6b4912d2212b6ffa74d7f9331c5ec575bfd53407d016b464efb06c3f94c4088dd729f646b5d528ab SHA512 45d74c331619ea754ed36e7a2e9eee1687be49cf698ed7d9e89c8cb006b40001be93a8fc753830dbbba12a5ca61d3407aaa364aff3354708ae79cbb72cba6a20
diff --git a/dev-python/asgiref/asgiref-3.3.4.ebuild b/dev-python/asgiref/asgiref-3.3.4.ebuild
deleted file mode 100644
index 30ca06005aa0..000000000000
--- a/dev-python/asgiref/asgiref-3.3.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7 pypy3)"
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	# Provided to upstream: https://github.com/django/asgiref/pull/262
-	"${FILESDIR}/${P}-py310-warnings.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.4.0.ebuild b/dev-python/asgiref/asgiref-3.4.0.ebuild
deleted file mode 100644
index d0582cfb5185..000000000000
--- a/dev-python/asgiref/asgiref-3.4.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="ASGI utilities (successor to WSGI)"
-HOMEPAGE="
-	https://asgi.readthedocs.io/en/latest/
-	https://github.com/django/asgiref/
-	https://pypi.org/project/asgiref/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7 pypy3)"
-BDEPEND="
-	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests pytest
diff --git a/dev-python/asgiref/asgiref-3.4.1.ebuild b/dev-python/asgiref/asgiref-3.4.1.ebuild
index 29fe309588a5..7b6c812c573a 100644
--- a/dev-python/asgiref/asgiref-3.4.1.ebuild
+++ b/dev-python/asgiref/asgiref-3.4.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch b/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch
deleted file mode 100644
index 1cd017ddfbde..000000000000
--- a/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-From 0c9e989f18b99ea24a1fb3ea2c8a66fd295c2178 Mon Sep 17 00:00:00 2001
-From: Ekaterina Vaartis <vaartis@kotobank.ch>
-Date: Thu, 20 May 2021 19:44:15 +0300
-Subject: [PATCH] Fix deprecation warnings for python 3.10
-
-asyncio.get_event_loop was marked as deprecated, the documnetation
-now refers to asyncio.get_running_loop([1])
-
-asyncio.ensure_future issues a deprecation warning if there is no
-running event loop([2]), so use asyncio.run which creates and destroys the
-loop itself
-
-asyncio.gather issues a warning if run outside of event
-loop (i.e. there is no running event loop)([3]), so wrap it into an
-async def
-
-explicit passing of coroutine objects to asyncio.wait is deprecated
-since 3.8([4]), so wrap them in asyncio.create_task
-
-plus, add 3.10 to tox.ini
-
-[1]: https://docs.python.org/3.10/library/asyncio-eventloop.html#asyncio.get_event_loop
-[2]: https://docs.python.org/3.10/library/asyncio-future.html#asyncio.ensure_future
-[3]: https://docs.python.org/3.10/library/asyncio-task.html#asyncio.gather
-[4]: https://docs.python.org/3.10/library/asyncio-task.html#asyncio.wait
----
- asgiref/compatibility.py       | 14 ++++++++++++++
- asgiref/server.py              |  8 ++++----
- asgiref/sync.py                | 15 ++++++++++-----
- tests/test_sync.py             | 19 ++++++++++++++-----
- tests/test_sync_contextvars.py |  3 ++-
- tox.ini                        |  2 +-
- 6 files changed, 45 insertions(+), 16 deletions(-)
-
-diff --git a/asgiref/compatibility.py b/asgiref/compatibility.py
-index eccaee0..614b2e6 100644
---- a/asgiref/compatibility.py
-+++ b/asgiref/compatibility.py
-@@ -1,5 +1,6 @@
- import asyncio
- import inspect
-+import sys
- 
- 
- def is_double_callable(application):
-@@ -45,3 +46,16 @@ def guarantee_single_callable(application):
-     if is_double_callable(application):
-         application = double_to_single_callable(application)
-     return application
-+
-+
-+if sys.version_info >= (3, 7):
-+    # these were introduced in 3.7
-+    get_running_loop = asyncio.get_running_loop
-+    run_future = asyncio.run
-+    create_task = asyncio.create_task
-+else:
-+    # marked as deprecated in 3.10, did not exist before 3.7
-+    get_running_loop = asyncio.get_event_loop
-+    run_future = asyncio.ensure_future
-+    # does nothing, this is fine for <3.7
-+    create_task = lambda task: task
-diff --git a/asgiref/server.py b/asgiref/server.py
-index f975f78..fb1c394 100644
---- a/asgiref/server.py
-+++ b/asgiref/server.py
-@@ -3,7 +3,7 @@ import logging
- import time
- import traceback
- 
--from .compatibility import guarantee_single_callable
-+from .compatibility import get_running_loop, guarantee_single_callable, run_future
- 
- logger = logging.getLogger(__name__)
- 
-@@ -56,7 +56,7 @@ class StatelessServer:
-         """
-         Runs the asyncio event loop with our handler loop.
-         """
--        event_loop = asyncio.get_event_loop()
-+        event_loop = get_running_loop()
-         asyncio.ensure_future(self.application_checker())
-         try:
-             event_loop.run_until_complete(self.handle())
-@@ -88,12 +88,12 @@ class StatelessServer:
-         input_queue = asyncio.Queue()
-         application_instance = guarantee_single_callable(self.application)
-         # Run it, and stash the future for later checking
--        future = asyncio.ensure_future(
-+        future = run_future(
-             application_instance(
-                 scope=scope,
-                 receive=input_queue.get,
-                 send=lambda message: self.application_send(scope, message),
--            )
-+            ),
-         )
-         self.application_instances[scope_id] = {
-             "input_queue": input_queue,
-diff --git a/asgiref/sync.py b/asgiref/sync.py
-index 6b87c7e..9476e66 100644
---- a/asgiref/sync.py
-+++ b/asgiref/sync.py
-@@ -9,6 +9,7 @@ import weakref
- from concurrent.futures import Future, ThreadPoolExecutor
- from typing import Any, Callable, Dict, Optional, Union
- 
-+from .compatibility import get_running_loop
- from .current_thread_executor import CurrentThreadExecutor
- from .local import Local
- 
-@@ -132,7 +133,7 @@ class AsyncToSync:
-             self.main_event_loop = None
-         else:
-             try:
--                self.main_event_loop = asyncio.get_event_loop()
-+                self.main_event_loop = get_running_loop()
-             except RuntimeError:
-                 # There's no event loop in this thread. Look for the threadlocal if
-                 # we're inside SyncToAsync
-@@ -151,7 +152,7 @@ class AsyncToSync:
-     def __call__(self, *args, **kwargs):
-         # You can't call AsyncToSync from a thread with a running event loop
-         try:
--            event_loop = asyncio.get_event_loop()
-+            event_loop = get_running_loop()
-         except RuntimeError:
-             pass
-         else:
-@@ -238,7 +239,11 @@ class AsyncToSync:
-                     tasks = asyncio.Task.all_tasks(loop)
-                 for task in tasks:
-                     task.cancel()
--                loop.run_until_complete(asyncio.gather(*tasks, return_exceptions=True))
-+
-+                async def gather():
-+                    await asyncio.gather(*tasks, return_exceptions=True)
-+
-+                loop.run_until_complete(gather())
-                 for task in tasks:
-                     if task.cancelled():
-                         continue
-@@ -320,7 +325,7 @@ class SyncToAsync:
- 
-     # If they've set ASGI_THREADS, update the default asyncio executor for now
-     if "ASGI_THREADS" in os.environ:
--        loop = asyncio.get_event_loop()
-+        loop = get_running_loop()
-         loop.set_default_executor(
-             ThreadPoolExecutor(max_workers=int(os.environ["ASGI_THREADS"]))
-         )
-@@ -370,7 +375,7 @@ class SyncToAsync:
-             pass
- 
-     async def __call__(self, *args, **kwargs):
--        loop = asyncio.get_event_loop()
-+        loop = get_running_loop()
- 
-         # Work out what thread to run the code in
-         if self._thread_sensitive:
-diff --git a/tests/test_sync.py b/tests/test_sync.py
-index cf0e0c5..8ed76a7 100644
---- a/tests/test_sync.py
-+++ b/tests/test_sync.py
-@@ -9,6 +9,7 @@ from unittest import TestCase
- 
- import pytest
- 
-+from asgiref.compatibility import create_task, get_running_loop
- from asgiref.sync import ThreadSensitiveContext, async_to_sync, sync_to_async
- 
- 
-@@ -33,12 +34,17 @@ async def test_sync_to_async():
-     assert result == 42
-     assert end - start >= 1
-     # Set workers to 1, call it twice and make sure that works right
--    loop = asyncio.get_event_loop()
--    old_executor = loop._default_executor
-+    loop = get_running_loop()
-+    old_executor = loop._default_executor or ThreadPoolExecutor()
-     loop.set_default_executor(ThreadPoolExecutor(max_workers=1))
-     try:
-         start = time.monotonic()
--        await asyncio.wait([async_function(), async_function()])
-+        await asyncio.wait(
-+            [
-+                create_task(async_function()),
-+                create_task(async_function()),
-+            ]
-+        )
-         end = time.monotonic()
-         # It should take at least 2 seconds as there's only one worker.
-         assert end - start >= 2
-@@ -428,7 +434,7 @@ async def test_thread_sensitive_outside_async():
-         result["thread"] = threading.current_thread()
- 
-     # Run it (in supposed parallel!)
--    await asyncio.wait([outer(result_1), inner(result_2)])
-+    await asyncio.wait([create_task(outer(result_1)), create_task(inner(result_2))])
- 
-     # They should not have run in the main thread, but in the same thread
-     assert result_1["thread"] != threading.current_thread()
-@@ -449,7 +455,10 @@ async def test_thread_sensitive_with_context_matches():
-         async with ThreadSensitiveContext():
-             # Run it (in supposed parallel!)
-             await asyncio.wait(
--                [store_thread_async(result_1), store_thread_async(result_2)]
-+                [
-+                    create_task(store_thread_async(result_1)),
-+                    create_task(store_thread_async(result_2)),
-+                ]
-             )
- 
-     await fn()
-diff --git a/tests/test_sync_contextvars.py b/tests/test_sync_contextvars.py
-index b1027aa..9665bf9 100644
---- a/tests/test_sync_contextvars.py
-+++ b/tests/test_sync_contextvars.py
-@@ -4,6 +4,7 @@ import time
- 
- import pytest
- 
-+from asgiref.compatibility import create_task
- from asgiref.sync import ThreadSensitiveContext, async_to_sync, sync_to_async
- 
- contextvars = pytest.importorskip("contextvars")
-@@ -25,7 +26,7 @@ async def test_thread_sensitive_with_context_different():
-             await store_thread(result)
- 
-     # Run it (in true parallel!)
--    await asyncio.wait([fn(result_1), fn(result_2)])
-+    await asyncio.wait([create_task(fn(result_1)), create_task(fn(result_2))])
- 
-     # They should not have run in the main thread, and on different threads
-     assert result_1["thread"] != threading.current_thread()
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 3953256e0210..89add28027ca 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,9 +1,5 @@
-DIST astroid-2.5.8.tar.gz 354281 BLAKE2B 70ee47c26b765ba9f9bd40cf120a9ce13709043738e20a08d201cdb899789c6c6bdc604aaab49c78b2888503b46321a1728cce656f39d70ce6877ac088cb9567 SHA512 ab2f413e399810e98bd61c837ac90674e7c6d8e2f4d32f3141b21bf1360c785831fc4afd347e755c97627a04cb482aa4e455897e1c02eec8c5fcd28c54c1e9fc
 DIST astroid-2.6.2.tar.gz 360787 BLAKE2B a2744b9ada601b731989f17ec75aa94d88825693a4ccf349374b8795b0db3879aa5bffe838df68759ff3296cd8af9cd45524e7d894a363f54055f3f1fa01e92e SHA512 776f8f9a12d425b7f048318b632dedb8894b6a3051a0607d1079437084aab4e9593e39cf9c7e01c2dd722364d2396cf13d7d26cc2acf33482d75584c458d4b89
-DIST astroid-2.6.4.tar.gz 364123 BLAKE2B 742d2bbe4a4056406b14a61d6aecb37d7add577b6f97b0649f22f7133a5ec0af30b0a7e195817681d014ae25fb69684d776a45948709cb6c2e349352da8960d4 SHA512 d81aee724804438565ab8d49b5df132e528989a3f746f9855ac841c98f06a85c72a7749492ed2856657895e948548f7f9293e4347f4247219065592d2eebf642
 DIST astroid-2.6.5.tar.gz 364383 BLAKE2B 22da12e30bbb27ad93516ef18ebe64839fc1f7057a46fe82444c189bada942b32e00c314fe47eaecaf7cb2e7e047206152e1df98b4f46a40010bef9392721b9c SHA512 28c6fe2953f10f99c31af611644137d566489188459c9249e5621c4dc1c5fecb59c1ba3cc0bbab95c2609203388d1df299f0cb87a1fc3b3bb8b4ad3ad6b010a4
-EBUILD astroid-2.5.8.ebuild 1189 BLAKE2B f519059d0c45508e587e62b79df37ce94385e97bd71c4e91d2e4b3845c55104b21ca3a689873782a0e1ced58d3c2d67df31cdfc9e4294d81e91023c264e0f461 SHA512 f63e523a3f82497443b1a7e72da6298ef8284d72074b7f87209497334795a47ec2a9cc09c7b960d77754f99adad94e36d80dc62fb25518d90e42f0f0e5c63424
-EBUILD astroid-2.6.2.ebuild 1203 BLAKE2B 76c0402208fe16f0efb7083e0dddbba8a45ada958eee01b9386f202e98596e14a3c85bd7d9543b54dc7fe15fcb3a4f7719145f0676e1157154b134bf32651b22 SHA512 e56dba9ea2058590585d088140ef844f65ad450fb1dedbcaf56eb82f2e4b1756bd34ed6e4c5749f1f61476ea89dc28d46b1b7e91b38e8a82406e39a5fa7d5f48
-EBUILD astroid-2.6.4.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
+EBUILD astroid-2.6.2.ebuild 1196 BLAKE2B 53bbb6e068191e80ffa6d8b71d540e7c56d2d7e9ddb5413392dd3f5a543d3c1c1516e7aac55ea83ca23d17f2a33fda8e2b2045bd598986527b8013185c93a6d1 SHA512 e6aa109be4acba3ded8e4b2096b1248498c5cd224b4da42aa7d5c019c7968c4f68c3c523a71c33a662db57f1d438856c40b6a6ebe2aafb06d2d2087602f6ab98
 EBUILD astroid-2.6.5.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.5.8.ebuild b/dev-python/astroid/astroid-2.5.8.ebuild
deleted file mode 100644
index d0ea2a31d654..000000000000
--- a/dev-python/astroid/astroid-2.5.8.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/astroid/astroid-2.6.2.ebuild b/dev-python/astroid/astroid-2.6.2.ebuild
index 3dc8174c1c62..cef4de93bb0c 100644
--- a/dev-python/astroid/astroid-2.6.2.ebuild
+++ b/dev-python/astroid/astroid-2.6.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 
 # Version specified in __pkginfo__.py.
 RDEPEND="
diff --git a/dev-python/astroid/astroid-2.6.4.ebuild b/dev-python/astroid/astroid-2.6.4.ebuild
deleted file mode 100644
index cda705df7b1d..000000000000
--- a/dev-python/astroid/astroid-2.6.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abstract Syntax Tree for logilab packages"
-HOMEPAGE="
-	https://github.com/PyCQA/astroid/
-	https://pypi.org/project/astroid/"
-SRC_URI="
-	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
-		-> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-# Version specified in __pkginfo__.py.
-RDEPEND="
-	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/python-dateutil[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local deselect=(
-		# no clue why it's broken
-		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
-	)
-
-	# Faker causes sys.path_importer_cache keys to be overwritten
-	# with PosixPaths
-	epytest -p no:faker ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/async_timeout/Manifest b/dev-python/async_timeout/Manifest
index 4d930d9dd053..99f09c149359 100644
--- a/dev-python/async_timeout/Manifest
+++ b/dev-python/async_timeout/Manifest
@@ -1,3 +1,4 @@
+AUX async_timeout-3.0.1-fix-py3.10.patch 11203 BLAKE2B dab3b3e09832ed11a9c684aaa3c21f2294f0066a740ebda047ae8b550c72caa1624b30520870989ec2cebedb72a8e556a92aeea0652411afc16ffab1ca2d825a SHA512 80249589c7f2f2f7c914bef7bf6fb3f03bc9a7d8dfd3376307baf85df28f3240381ca3a580091d1aa1aa9fa4f360ae5d92a5e1b46c308ac0c7e0d857b9d6648d
 DIST async-timeout-3.0.1.tar.gz 9724 BLAKE2B f18ae75969b7048469fe22949f25ea25da3fdbf08b98a16b5d5ffe823060a75e6de9ed764727e08d4344c79426e9c89013d49522f20ed62e6fbe912b5c7a8787 SHA512 fd30842671a79edfd52c7350e7fb2120533a6d97b44975f7b071ce2cbde43443bd5bbe1f2ad0ad3ab2156e1987b9e58e0c149b0ecfea8674eb0cb78eee79c986
-EBUILD async_timeout-3.0.1.ebuild 871 BLAKE2B bda191eddd234253a261c84e960c30ab3e46e6fb7aacf58c0999342b9689acf390241753fd62404643bdf30825baca66cdb6f9a8ec7254018d54ea8f23a807eb SHA512 f25e0b023d609c69764e0f5dff99ce709183261398eb2f4e3c067763fd5a03661de8e4fc406a920dc0b9de72bf0b2f8bbe94b402ffa2e9fdfc134ad9c85ca247
+EBUILD async_timeout-3.0.1.ebuild 968 BLAKE2B 1796e2c00b629edd090b88a3b6cff4e3a20190351d1ae105c0cb16581f0a353e388f3274d6693612cf2df95bf95ab495dd7cfb55088594827fa300cf56c778e0 SHA512 16aa8169ceb211ef74631b180083cc9d900b13016f0a90c363aec91832b00051c25712e610b2aabad7fcc443e4ed566b53a8c663e13b963b856ae6e3e5387b2f
 MISC metadata.xml 459 BLAKE2B aa3214d8a14324f68b5743f51371cf1902962a5b14bb7065a04944684d33f9639edbc9a899f5cd02ca19068506c5e403db149742d0b1cedf8e35a5927a837901 SHA512 fb0488558b0e1d7b9e0721a7d299bf2d105d66c67f51ea1bdb1b8dc529bb3a964c89d4410ee8640d0b094d1e364e5d59d8a9b7bafb0cdd9f3dde6443c0d46a15
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 f4022958304b..33755ac4a219 100644
--- a/dev-python/async_timeout/async_timeout-3.0.1.ebuild
+++ b/dev-python/async_timeout/async_timeout-3.0.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8..9} )
+
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -20,8 +21,11 @@ BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
 	test? (
 		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=( "${FILESDIR}/${P}-fix-py3.10.patch" )
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/async_timeout/files/async_timeout-3.0.1-fix-py3.10.patch b/dev-python/async_timeout/files/async_timeout-3.0.1-fix-py3.10.patch
new file mode 100644
index 000000000000..5bfdcf2e6dab
--- /dev/null
+++ b/dev-python/async_timeout/files/async_timeout-3.0.1-fix-py3.10.patch
@@ -0,0 +1,387 @@
+diff --git a/tests/test_py35.py b/tests/test_py35.py
+index 00bb7f0..7d88d99 100644
+--- a/tests/test_py35.py
++++ b/tests/test_py35.py
+@@ -4,30 +4,32 @@ import pytest
+ 
+ from async_timeout import timeout
+ 
+-pytestmark = pytest.mark.asyncio
+ 
+-
+-async def test_async_timeout(loop):
++@pytest.mark.asyncio
++async def test_async_timeout():
+     with pytest.raises(asyncio.TimeoutError):
+-        async with timeout(0.01, loop=loop) as cm:
+-            await asyncio.sleep(10, loop=loop)
++        async with timeout(0.01) as cm:
++            await asyncio.sleep(10)
+     assert cm.expired
+ 
+ 
+-async def test_async_no_timeout(loop):
+-    async with timeout(1, loop=loop) as cm:
+-        await asyncio.sleep(0, loop=loop)
++@pytest.mark.asyncio
++async def test_async_no_timeout():
++    async with timeout(1) as cm:
++        await asyncio.sleep(0)
+     assert not cm.expired
+ 
+ 
+-async def test_async_zero(loop):
++@pytest.mark.asyncio
++async def test_async_zero():
+     with pytest.raises(asyncio.TimeoutError):
+-        async with timeout(0, loop=loop) as cm:
+-            await asyncio.sleep(10, loop=loop)
++        async with timeout(0) as cm:
++            await asyncio.sleep(10)
+     assert cm.expired
+ 
+ 
+-async def test_async_zero_coro_not_started(loop):
++@pytest.mark.asyncio
++async def test_async_zero_coro_not_started():
+     coro_started = False
+ 
+     async def coro():
+@@ -35,8 +37,8 @@ async def test_async_zero_coro_not_started(loop):
+         coro_started = True
+ 
+     with pytest.raises(asyncio.TimeoutError):
+-        async with timeout(0, loop=loop) as cm:
+-            await asyncio.sleep(0, loop=loop)
++        async with timeout(0) as cm:
++            await asyncio.sleep(0)
+             await coro()
+ 
+     assert cm.expired
+diff --git a/tests/test_timeout.py b/tests/test_timeout.py
+index 8915546..b1cb3c7 100644
+--- a/tests/test_timeout.py
++++ b/tests/test_timeout.py
+@@ -6,89 +6,69 @@ import pytest
+ 
+ from async_timeout import timeout
+ 
+-from asyncio import ensure_future
+-
+-
+-def create_future(loop):
+-    """Compatibility wrapper for the loop.create_future() call introduced in
+-    3.5.2."""
+-    if hasattr(loop, 'create_future'):
+-        return loop.create_future()
+-    else:
+-        return asyncio.Future(loop=loop)
+-
+ 
+ @pytest.mark.asyncio
+-async def test_timeout(loop):
++async def test_timeout():
+     canceled_raised = False
+ 
+     async def long_running_task():
+         try:
+-            await asyncio.sleep(10, loop=loop)
++            await asyncio.sleep(10)
+         except asyncio.CancelledError:
+             nonlocal canceled_raised
+             canceled_raised = True
+             raise
+ 
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0.01, loop=loop) as t:
++        with timeout(0.01) as t:
+             await long_running_task()
+-            assert t._loop is loop
++            assert t._loop is asyncio.get_event_loop()
+     assert canceled_raised, 'CancelledError was not raised'
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_finish_in_time(loop):
++async def test_timeout_finish_in_time():
+     async def long_running_task():
+-        await asyncio.sleep(0.01, loop=loop)
++        await asyncio.sleep(0.01)
+         return 'done'
+ 
+-    with timeout(0.1, loop=loop):
++    with timeout(0.1):
+         resp = await long_running_task()
+     assert resp == 'done'
+ 
+ 
+-def test_timeout_global_loop(loop):
+-    asyncio.set_event_loop(loop)
+-
+-    async def run():
+-        with timeout(10) as t:
+-            await asyncio.sleep(0.01)
+-            assert t._loop is loop
+-
+-    loop.run_until_complete(run())
+-
+-
+ @pytest.mark.asyncio
+-async def test_timeout_disable(loop):
++async def test_timeout_disable():
+     async def long_running_task():
+-        await asyncio.sleep(0.1, loop=loop)
++        await asyncio.sleep(0.1)
+         return 'done'
+ 
++    loop = asyncio.get_event_loop()
+     t0 = loop.time()
+-    with timeout(None, loop=loop):
++    with timeout(None):
+         resp = await long_running_task()
+     assert resp == 'done'
+     dt = loop.time() - t0
+     assert 0.09 < dt < 0.13, dt
+ 
+ 
+-def test_timeout_is_none_no_task(loop):
++def test_timeout_is_none_no_task():
++    loop = asyncio.get_event_loop()
+     with timeout(None, loop=loop) as cm:
+         assert cm._task is None
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_enable_zero(loop):
++async def test_timeout_enable_zero():
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0, loop=loop) as cm:
+-            await asyncio.sleep(0.1, loop=loop)
++        with timeout(0) as cm:
++            await asyncio.sleep(0.1)
+ 
+     assert cm.expired
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_enable_zero_coro_not_started(loop):
++async def test_timeout_enable_zero_coro_not_started():
+     coro_started = False
+ 
+     async def coro():
+@@ -96,8 +76,8 @@ async def test_timeout_enable_zero_coro_not_started(loop):
+         coro_started = True
+ 
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0, loop=loop) as cm:
+-            await asyncio.sleep(0, loop=loop)
++        with timeout(0) as cm:
++            await asyncio.sleep(0)
+             await coro()
+ 
+     assert cm.expired
+@@ -105,51 +85,52 @@ async def test_timeout_enable_zero_coro_not_started(loop):
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_not_relevant_exception(loop):
+-    await asyncio.sleep(0, loop=loop)
++async def test_timeout_not_relevant_exception():
++    await asyncio.sleep(0)
+     with pytest.raises(KeyError):
+-        with timeout(0.1, loop=loop):
++        with timeout(0.1):
+             raise KeyError
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_canceled_error_is_not_converted_to_timeout(loop):
+-    await asyncio.sleep(0, loop=loop)
++async def test_timeout_canceled_error_is_not_converted_to_timeout():
++    await asyncio.sleep(0)
+     with pytest.raises(asyncio.CancelledError):
+-        with timeout(0.001, loop=loop):
++        with timeout(0.001):
+             raise asyncio.CancelledError
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_blocking_loop(loop):
++async def test_timeout_blocking_loop():
+     async def long_running_task():
+         time.sleep(0.1)
+         return 'done'
+ 
+-    with timeout(0.01, loop=loop):
++    with timeout(0.01):
+         result = await long_running_task()
+     assert result == 'done'
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_for_race_conditions(loop):
+-    fut = create_future(loop)
++async def test_for_race_conditions():
++    loop = asyncio.get_event_loop()
++    fut = loop.create_future()
+     loop.call_later(0.1, fut.set_result('done'))
+-    with timeout(0.2, loop=loop):
++    with timeout(0.2):
+         resp = await fut
+     assert resp == 'done'
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_time(loop):
++async def test_timeout_time():
+     foo_running = None
+-
++    loop = asyncio.get_event_loop()
+     start = loop.time()
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0.1, loop=loop):
++        with timeout(0.1):
+             foo_running = True
+             try:
+-                await asyncio.sleep(0.2, loop=loop)
++                await asyncio.sleep(0.2)
+             finally:
+                 foo_running = False
+ 
+@@ -160,26 +141,26 @@ async def test_timeout_time(loop):
+     assert not foo_running
+ 
+ 
+-def test_raise_runtimeerror_if_no_task(loop):
++def test_raise_runtimeerror_if_no_task():
+     with pytest.raises(RuntimeError):
+-        with timeout(0.1, loop=loop):
++        with timeout(0.1):
+             pass
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_outer_coro_is_not_cancelled(loop):
++async def test_outer_coro_is_not_cancelled():
+ 
+     has_timeout = False
+ 
+     async def outer():
+         nonlocal has_timeout
+         try:
+-            with timeout(0.001, loop=loop):
+-                await asyncio.sleep(1, loop=loop)
++            with timeout(0.001):
++                await asyncio.sleep(1)
+         except asyncio.TimeoutError:
+             has_timeout = True
+ 
+-    task = ensure_future(outer(), loop=loop)
++    task = asyncio.ensure_future(outer())
+     await task
+     assert has_timeout
+     assert not task.cancelled()
+@@ -187,14 +168,15 @@ async def test_outer_coro_is_not_cancelled(loop):
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_cancel_outer_coro(loop):
+-    fut = create_future(loop)
++async def test_cancel_outer_coro():
++    loop = asyncio.get_event_loop()
++    fut = loop.create_future()
+ 
+     async def outer():
+         fut.set_result(None)
+-        await asyncio.sleep(1, loop=loop)
++        await asyncio.sleep(1)
+ 
+-    task = ensure_future(outer(), loop=loop)
++    task = asyncio.ensure_future(outer())
+     await fut
+     task.cancel()
+     with pytest.raises(asyncio.CancelledError):
+@@ -204,57 +186,64 @@ async def test_cancel_outer_coro(loop):
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_suppress_exception_chain(loop):
++async def test_timeout_suppress_exception_chain():
+     with pytest.raises(asyncio.TimeoutError) as ctx:
+-        with timeout(0.01, loop=loop):
+-            await asyncio.sleep(10, loop=loop)
++        with timeout(0.01):
++            await asyncio.sleep(10)
+     assert not ctx.value.__suppress_context__
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_expired(loop):
++async def test_timeout_expired():
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0.01, loop=loop) as cm:
+-            await asyncio.sleep(10, loop=loop)
++        with timeout(0.01) as cm:
++            await asyncio.sleep(10)
+     assert cm.expired
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_inner_timeout_error(loop):
++async def test_timeout_inner_timeout_error():
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0.01, loop=loop) as cm:
++        with timeout(0.01) as cm:
+             raise asyncio.TimeoutError
+     assert not cm.expired
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_inner_other_error(loop):
++async def test_timeout_inner_other_error():
+     with pytest.raises(RuntimeError):
+-        with timeout(0.01, loop=loop) as cm:
++        with timeout(0.01) as cm:
+             raise RuntimeError
+     assert not cm.expired
+ 
+ 
+ @pytest.mark.asyncio
+-async def test_timeout_remaining(loop):
+-    with timeout(None, loop=loop) as cm:
++async def test_timeout_remaining():
++    with timeout(None) as cm:
+         assert cm.remaining is None
++    assert cm.remaining is None
++
++    t = timeout(None)
++    assert t.remaining is None
+ 
+-    t = timeout(1.0, loop=loop)
++    t = timeout(1.0)
+     assert t.remaining is None
+ 
+-    with timeout(1.0, loop=loop) as cm:
+-        await asyncio.sleep(0.1, loop=loop)
++    with timeout(1.0) as cm:
++        await asyncio.sleep(0.1)
+         assert cm.remaining < 1.0
++    r = cm.remaining
++    time.sleep(0.1)
++    assert abs(r - cm.remaining) < 1.0
+ 
+     with pytest.raises(asyncio.TimeoutError):
+-        with timeout(0.1, loop=loop) as cm:
+-            await asyncio.sleep(0.5, loop=loop)
++        with timeout(0.1) as cm:
++            await asyncio.sleep(0.5)
+ 
+     assert cm.remaining == 0.0
+ 
+ 
+-def test_cancel_without_starting(loop):
+-    tm = timeout(1, loop=loop)
++def test_cancel_without_starting():
++    tm = timeout(1)
+     tm._cancel_task()
+     tm._cancel_task()  # double call should success
diff --git a/dev-python/backports-entry_points_selectable/Manifest b/dev-python/backports-entry_points_selectable/Manifest
index 20e9d615d9c7..5bd10ef5d57b 100644
--- a/dev-python/backports-entry_points_selectable/Manifest
+++ b/dev-python/backports-entry_points_selectable/Manifest
@@ -1,3 +1,3 @@
 DIST backports.entry_points_selectable-1.1.0.gh.tar.gz 7689 BLAKE2B e7fb4372838b47e65e50d91acb034afaf326947bd76bbdf14b57834b94c72fb62afa6526931a96cc1e10b43eca9d95dce7fde431c24a4e15a4b2569ddf42faeb SHA512 abf8f5d228b52281160cedfd017f1a4273b8fce01ed29e9f0417f750125abacaf97a3cc6f363849702d1dc6f3c40602461f79bfcc2a36a3dfb962af1112046d2
-EBUILD backports-entry_points_selectable-1.1.0.ebuild 750 BLAKE2B e24e432dba1d3254f338d45bbce0eb6d106675b3a5e00a54965067aa4df49c1c44107b468efd2021778cce828f4e08823f503c1b10f656586638c5116c2635a7 SHA512 be61a61bc5b187118bd9aae390d67e7585335146346a7ad917b38b0ecebac2e76af27c337e9a5ba1f06b07816d61b1d57a7e19b2ca0f793dd8fbb5c0cfa6a7d7
+EBUILD backports-entry_points_selectable-1.1.0.ebuild 770 BLAKE2B 81d433d898d2a035416bfeb88da464eaccb31fdadb89e787fb0e0f989230189637ca16603b26ecc90fa8d7facb3f05a4e184d818bd80c05d91303d4935fe69dd SHA512 7cd8df37f6fca99d09f35d49a12bf5b3ac0793a8bf84265c5cc160f301d79532a47303e286018798653773aaa07577fb7bc8939d97198cce47a9c43ce0e85013
 MISC metadata.xml 394 BLAKE2B a52263e74cb9051e6c7dc696d1f39e87ded29b3894f58a455b25dc469f084dc4e71dc00fa309a5ab7b1ad7c9fd87e6fd2b95e28be17304aee03bc29a6139b4c0 SHA512 79f57eb7cb48175fb0fbe2d6269c1c7fcc7b48dffede2b77d770333b9ed37bd2957e3531d4638ce3dc83f4bdce83d06477a032a683766a664399bcf5afa68949
diff --git a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
index a2e941fbf6e6..c2e9776a97cd 100644
--- a/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
+++ b/dev-python/backports-entry_points_selectable/backports-entry_points_selectable-1.1.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
index cc87a0494cc1..def327d5886c 100644
--- a/dev-python/beautifulsoup/Manifest
+++ b/dev-python/beautifulsoup/Manifest
@@ -1,3 +1,3 @@
 DIST beautifulsoup4-4.9.3.tar.gz 376031 BLAKE2B fbe2139f288eee978c3f665c7640f66c6c51b857a186f6a8ace02b36effa1552f1cbea9e3744e0a46a65a06e6cdbd9203832e0ecd86b61406b933f9bd83d37b8 SHA512 e3cb6258bd7c51f12128fa8ee5948fb3566163ae233fac2dda21bab7772ab8dbb384d920b0ea138ef9921307b48f89cee3a9bf6111dfc8903d917ee7af365f34
-EBUILD beautifulsoup-4.9.3.ebuild 853 BLAKE2B f667ada00b70314f502e9747e499d176959ae5345ff26c26f6ce82675731cd8a821d19377e933734edf3c41b2f5b8eed618e9e498d64d68e90b5932e4999727b SHA512 f93f5f6dc35799f1690130c9ee3bb0b3f4a7256a976a82af939f534ea9dfa8cd6fa2122db55c01064fe2fb536123cc754561667bf5a1b40734d6826ca937742b
+EBUILD beautifulsoup-4.9.3.ebuild 860 BLAKE2B 3fde7fd3f82113b262225854d63561a2394f8718726beae1cd13b37375887253de93ca612326fe49fc0aafab41bea7331cd9ecc581bea758f5f26d26ed166ef0 SHA512 fae3924c39e781d390855b2deadf587898d721ffaa3642cdfc54490225cf60b450d3f96e1f4f3158fdd432281432230eb5730a1c4ba3b1750d3c252b8f384e9e
 MISC metadata.xml 744 BLAKE2B 93987e4adb8dc5dea9b897940cae80d431b29d693bd1fea9d242de75174b1fd86afaecc6a5fb5e4ad06576caa559a918d09da28d253147f2683703d911435f76 SHA512 f56ab7ff03d21187e38f292b24396eccfd53622c84f5f489bd1e515393dbf85b75bbdfe26a6875352b16dcbf16f89cd9a051dfe44dbca8786efecd7db914f789
diff --git a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
index 84b1144eddd9..bf90d32d6c56 100644
--- a/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
+++ b/dev-python/beautifulsoup/beautifulsoup-4.9.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/soupsieve[${PYTHON_USEDEP}]
diff --git a/dev-python/betamax/Manifest b/dev-python/betamax/Manifest
index 5dee06148706..1ac8c5de28d9 100644
--- a/dev-python/betamax/Manifest
+++ b/dev-python/betamax/Manifest
@@ -1,4 +1,4 @@
 AUX betamax-0.8.1-tests.patch 867 BLAKE2B d161db0b79eff7591bf87cf256a50357e1d82f7eeb0fdf39c27be287c97bf6a536a4e62defd173305ba598f388f2b49d22545443c6fcb589f66988930ae29a55 SHA512 001b26d84e4a02b242ee90b36df0a30c9c4890623191655a8eae5a87e106679197fa8090354b52a72ad07da97666190ebb3a7dcb9b4ffba7b9bea9c18bfed115
 DIST betamax-0.8.1.tar.gz 77526 BLAKE2B 2ce88326c5ef80082908912c4b14f149793c4457c47446ebcabaaffaa6b0ee64528096acc6bdd868fce0fad3d10ad66697cad5dc422c15b324e1cc9ae20eafa6 SHA512 89bfb56cf4004a70ec8c1f2342cfa0e02f850b8ed80b67f8b2b02c1a2093e8ac1cf1b9980354551e9d3a21fadde0d77d717f1559487024941973cd80bd451734
-EBUILD betamax-0.8.1.ebuild 1077 BLAKE2B 9d3700f10cb6bee2cd50007782070d502c5a5e66e6d15d1dfc667564ea5973e5950cd6e3a8958426ca893d50a47c1df62b1fcf573e733bcb1a08ee97c5e89512 SHA512 bf29128575e2fdea9ba81e253bae9c822c5d04b7ffe3ff5ebed9c2c24f3af36a0e674790a49d182f295af2b73d8c2b42b86a7dd31edf39c80c9c64fa5f3ac9f2
+EBUILD betamax-0.8.1.ebuild 1084 BLAKE2B 1ca411a6676cb84a817e6e80949e8f0cb99455bd5b397eb4781444344449c90af5a85fc00cecb4cc305b541c50c1a77242bb3415e4e97fc4181f2af7c8b5fb95 SHA512 31ef2377ebf77fb53c2d6f05589c857fa805df955b89bc2f4643b62e94d73073659053920c8ce867ca28ad789650223b45010fb921f4cfe35aa90fb1291c9e89
 MISC metadata.xml 312 BLAKE2B b6adeaea6a20f135ab0396ea0be72118164a917c935162c1904f07e9190cb0e692d604e7ca15f39504025990d1cbcd88ad088502202b82dde90a56862fd845ab SHA512 5c87d7dcbbd90c53df52d98b97cd54c5940cd6f3fd552fb692dbc856761cb125542a88e415ae01fdc1fff2643fdbcf7f521c2ea9f6c67d3fd9b14a01ef530e3c
diff --git a/dev-python/betamax/betamax-0.8.1.ebuild b/dev-python/betamax/betamax-0.8.1.ebuild
index bc633613470b..6471ec7d2232 100644
--- a/dev-python/betamax/betamax-0.8.1.ebuild
+++ b/dev-python/betamax/betamax-0.8.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="python-requests HTTP exchanges recorder"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="dev-python/requests[${PYTHON_USEDEP}]"
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 417971e3f198..eea6519ba836 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -2,8 +2,10 @@ DIST bitarray-2.1.3.tar.gz 72556 BLAKE2B 737ba1e1586269d279198bd966c84abc95b7417
 DIST bitarray-2.2.1.tar.gz 77371 BLAKE2B f6f699594a28fa680eaaa2ad260da00f9827090e770b22226e7a4bfd72c54759a80370f6842cb473dade6761b744175e4630af5e7b3fdd09768b7199e1a08e74 SHA512 7eb25359d405e0be63ca7faab50fd7ab652d8f838f09587b4faa94adc78952582e7c7c0b605820e5feafd18d35edf050f70f65bce1123b883ad47bd1e54244d3
 DIST bitarray-2.2.2.tar.gz 78273 BLAKE2B 1c9b9c4011b1b11481209aba6958aa3c58dc2c1f5188a97f8b6c15a8a77ed0338bfc64bfcf6da3667c317631e5d271408f443a33e214c8f123f2c764cc93d6b0 SHA512 98b02ecc39befa619c816117fdfc3d69efb931203bb509e92bdf800f5c64e8633a986751d1650cb33dd0c6c0df0653f70c97fe73d4334198b81f39aafec4e019
 DIST bitarray-2.2.3.tar.gz 79709 BLAKE2B 75bb085914fa5f7b926ede947d69f7a8de1dcd8e61917d1e154049102c539e78a7d0a4bab181a8bf8a19338d0d73124d9aec5f746f25d12a8f5a0c188f309009 SHA512 ed8641bd12a87e440642535baab62b132ce4499b8525a699eb82926b098d7f9ce6f66ea07846bfacabcf45cdc1d30c12c104a0b1af638efa8ad809329914a186
+DIST bitarray-2.2.4.tar.gz 82471 BLAKE2B 0b2bd1afd17df2756e3e6ecfe78f84ee4ec84121c9eb59eaaa57042c67702004c25b0286474b1abea82a10ed682b8e0e221001e770238d144452049019300ae3 SHA512 ad5d96c8232d239e51c40782e7a487fd898732774e39228c996dd32f0697898b65f2a26479a0af03e07a347a404174924c8299590433b41a6bf6189447f4194f
 EBUILD bitarray-2.1.3.ebuild 555 BLAKE2B 2b3a6ec7d61f8aab17773e44b70fa98a2ecc24384b22561fd83396bfc350ff7d9addf3228ae1580d0d9dc2dd6a2a6d094232b2e52568e06f6eb77540567bbdf6 SHA512 b7c65e4bffe459f8fef3c3af19be16f4fa1c948121ae044a8abcbf6f65ce7400d50641b3c794d698286b89b46b42479decdf8211c44aafc36c9c38acb619b2d5
 EBUILD bitarray-2.2.1.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 EBUILD bitarray-2.2.2.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 EBUILD bitarray-2.2.3.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
+EBUILD bitarray-2.2.4.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-2.2.4.ebuild b/dev-python/bitarray/bitarray-2.2.4.ebuild
new file mode 100644
index 000000000000..2db993517908
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.2.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Efficient arrays of booleans -- C extension"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
+SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/bleach/Manifest b/dev-python/bleach/Manifest
index e10b90052936..bd02d319e3f2 100644
--- a/dev-python/bleach/Manifest
+++ b/dev-python/bleach/Manifest
@@ -2,5 +2,5 @@ AUX bleach-3.2.1-py39.patch 1637 BLAKE2B eeb66b15ad738d07db70bbf4599ef393678ca73
 DIST bleach-3.3.0.tar.gz 181274 BLAKE2B 32883ef9a77bf1d0cd208217930474285e55f158dc8d7b9c4049ca896cdc5cfb873674aa5f5181c31d46345be29f954badd29969bf156b1cc10eb200214de367 SHA512 8e408289c5175234a383658552e48379da9f570866e4c248a4e5c0b7bdaa9a2e6be545943dd32968cdb425929d51de282cca0678fdc6dd06b6fc2c2f41b58097
 DIST bleach-3.3.1.tar.gz 183687 BLAKE2B 9ca70ff84919b6b893afdbf7914098efe7dc3c9f0c86a729a92754ba6dacc95752abc44cea96db282483cf53413d6a98421c95f102941d23adf89af00b2a5afd SHA512 bb68275f91a4c724c14594d008f58d31ab0a97b08fd45b6cbe8237a31a1bbfd24a19cea1a835efffb979739ce17a3c065099e677019e498e78d9a4222ff2d66c
 EBUILD bleach-3.3.0.ebuild 977 BLAKE2B e2b92647dd8040bcbda4d045e9decd1253e527c6d4850f5fc6de0608b7f21b65f063561dc59cadb4970487d9b7939c936e026a3eec3e88fbb02abd94d9b4077e SHA512 aa9378ec21b658cbb780fc69f547582d1c20cbe8018c5e13439512793164e7f98dc85d4d4e78dbc3e55ce4560260e6bc901372130d5a70b332bb798a0ea8816d
-EBUILD bleach-3.3.1.ebuild 989 BLAKE2B e8e9874d7a6147aa3bcbe782ef809f3f34d726f90ce8f812e2cca46ae6d22c93665334a001ea53406026aaaed2a12458eb2e8e6c5aa676c773ff9ef105282ed6 SHA512 beb43388c19a2fd8b9ec2200bd91b8feb3cfa591e2c40f572ff4df2c833eedf7a7ab86b9d8f6860baa7168701c065e783a816f8acce25f2e6291f72197f164dd
+EBUILD bleach-3.3.1.ebuild 996 BLAKE2B b371d730c001b943647b70bf6cf8282baacc8bd39cbba1c0b7d8221f71bc8edbcb74b396ef1f8a337c361aecffb681c560dd4616c379fd6cfc39cb10b3dcf044 SHA512 dbf86e3442d46c503571bf6169b542bda8a2cfce28b9a1745a26c9b97f6a97e32a3e21058ff4f1388dc2cfc56a94c1c96bfc932e308329e9f5c0842dd8201b46
 MISC metadata.xml 400 BLAKE2B 931735ca08509e3a1f8803181a1eca6be10b654fe37244772eb43b918dcac641c1733e535f2504bfc311644e52506712857ea24bf4784cebcb8b6063194d1388 SHA512 b73e3cd77b2378668b4086395f9a268105d94992f7b9d23ca8cfb834d015cc3ca0ed995acadba9060a5e96d29bae128b850a803a11c4b3d993f518180d9b4b5a
diff --git a/dev-python/bleach/bleach-3.3.1.ebuild b/dev-python/bleach/bleach-3.3.1.ebuild
index 0310e25c43fd..7a2b9a2de701 100644
--- a/dev-python/bleach/bleach-3.3.1.ebuild
+++ b/dev-python/bleach/bleach-3.3.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/packaging[${PYTHON_USEDEP}]
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index ada293f21a13..f293eb9b3bc6 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1,4 +1,4 @@
 AUX blosc-1.10.0-unbundle.patch 1461 BLAKE2B 05c54929638e7a9a645fdf872c26969720fabfd8a8526742def207b92ec0ddf96ad6002cf9d45d1f5b44521d44c369081b368ab98605a5789b1b949bf6a5f5d2 SHA512 b8139ae0d091be459071cab4779f4264e0bbef119e8641913167f809a4d0b3682e1918443e10f83aa9c34c76f0ddda440ac27cb9d1c10cc355e0a7f05dbc7179
 DIST blosc-1.10.4.tar.gz 858123 BLAKE2B 01c9bd9486a27944caae1bc92b591c8b6f821bb5a6a0b44bc19f6c1778f2a2573a25783631c2140daa4d701569e584c93f8d5da76a92b73fb35ae5880ad2ea34 SHA512 bb41b83ff5198603e3721150976f95ffcbfe7b91bd5b11e1aa5e440dee1af7a9a6f5033e5aa4858117432e1522052ec074e9f14b5be52545e3752bc818637703
-EBUILD blosc-1.10.4.ebuild 952 BLAKE2B d40e3a595205b109e72ab4b710e5d973f6bc4a415fe979a528d3a9c80376dcc485a5524187595281d9201536f855feafc7e0b23c4e7e94619910d5ced54484dc SHA512 8cad13fc1d0c33181b11b6281197d3e348ee6afb0280e867a622b56617318a7492217a32a39d01d496607a00f1645a351f70c150cb0eba4d7d471ba5f14bbf33
+EBUILD blosc-1.10.4.ebuild 959 BLAKE2B f4ee80d6730cdf7e33f9409ff9330b002014543af59c73d35dafb7c2f89542bf8ae02304fa544460f076b4b7a615ca8f7660a8c0d87e3144f1b102437899f901 SHA512 37001ca3f420b51138999636f70d92a5ef9513d6a1347e079e869a4c100ff39d4238286bb6f98221fb5b223e965d5afffc9e99e0170d27997a5dcce40356e1be
 MISC metadata.xml 998 BLAKE2B 3630fcaea0c8e2e9062aa9f42c60b17b407fd5febb70d5d41b0a0c46f202f06afc79fc25072c1403c917caedfd6205e7133431fcfd40e74f8480852aee7e2299 SHA512 22ffa2acb28f4f6f9af18398681db0ddb5b19c7b125386c0eb24265f11ccba24f90977710f74af57a2de6e497c668fb17398da89a2b2ecc5ef552b201960450e
diff --git a/dev-python/blosc/blosc-1.10.4.ebuild b/dev-python/blosc/blosc-1.10.4.ebuild
index d0100a8b57ba..e8e500f87412 100644
--- a/dev-python/blosc/blosc-1.10.4.ebuild
+++ b/dev-python/blosc/blosc-1.10.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 469ac4807456..40bb7af24211 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,6 +2,8 @@ DIST boto3-1.17.104.tar.gz 387800 BLAKE2B 928824ab0a0c091fec430c5d86b0c5663f2a98
 DIST boto3-1.17.112.tar.gz 391748 BLAKE2B 071eddfe134face48b86985ccd0171e0d8994fc65cd75e26945dfcab29566f42aa965c82b736cc7dd821a920e6903e4c45917af1759214606c2448b46c528cff SHA512 dcee3f4e2dfaf8feeeecc82ca938a72d654ced7a44f32e3dab43a225d8dcf0b3d20f0699770cfcd8ede840f792d37e124597d096322b88ce54c2e27e109da6e7
 DIST boto3-1.18.0.tar.gz 392345 BLAKE2B 8d464e038892cd77d7b171c27f41eee31c630ebcadce6677f76ccc270f3f8471d7a8443d174ce1b6ea5cdcfe98973faa42ddda4123ec21d225464515bdcd862d SHA512 ba5af17ae6705bfdea4a9d6bccb18d3f1593980d594be4dbb3049123089ba7d8ecaaed685d8a3181ae50e95b537e7a50fed3be694b4f61d3ba250693ae249f4d
 DIST boto3-1.18.1.tar.gz 392759 BLAKE2B bfa0bcfba9a413fbb13b2698f3ef2461cac99a9fddea0fe16d790a0ddab60fcd46b13ac4026536b9f89fb65ff703d61a4f01499423aa54289f17fc0f035ea2d6 SHA512 1aca424ff105fe2049c94aeaff306a683dd4eb9ac9b88303ff4857f53ddb4d3f267ef69119f8cbdb8463ab12331b2d89149fd0b10ccd23c4fde9485e63ba0005
+DIST boto3-1.18.10.tar.gz 398199 BLAKE2B 950b40afd867a8df9f8154e35572f3302c03c686d3299aac100ffd18a82c9e9a6657a4910f89f385dfb742c32e315110fc61bf00d2dc14892c4051eef5c642c8 SHA512 0391faf993faf8f4cc28e309f3267acc1beb38229f633f4c409820d45e968b1a93a7c74798ee84aebcd29b4547c9f301decd451e89b65a34297f796e1f839826
+DIST boto3-1.18.11.tar.gz 398542 BLAKE2B cecccf462510a6deb55308ea4156ae081d2357480e5d8c160797032c62554ac708f37b38e1cbe26a18e2087a268b392a145d0733400a86e4fca19a5416700ad8 SHA512 63cbea62fcd71fee1c53219f6016fe38bd08afdef0c27d918bd078d04803d14ddd4782c0182e304542314df4bcf081d802d1f581b25ccae3327c4df80e40dabe
 DIST boto3-1.18.2.tar.gz 393528 BLAKE2B 20424f9a8ff013d1d9724f741ad6754747de504fb961688f433eba74ce1d6df7e95d68c45be1e87df1532f99b2fa4d7e8b00671a8ae9a378a4df74764924cdaa SHA512 287a1f24f62fa83fd944632799540257b2f8d6cf3b5d6add57be60e4f49dafd685bb4fcceef37fe907edba00a7f2285d92bd8d381b03e45ac794b22fdcfe8783
 DIST boto3-1.18.3.tar.gz 393645 BLAKE2B 4967ac751e9ff5a86f6f571961df31d82f6012ade28aa19a038399077bf5a1b968dfa1172995423890b79a2ede54e2c6f6c1937e8ccf21010f17a4d96928df62 SHA512 f9c42257f0925fffaeb1a36e4731dc54fee1836c249617444292991d043dbb9b58472f73a806981c9763b569cc7402b378f6e1e0102fe0f995a7754807f19b38
 DIST boto3-1.18.4.tar.gz 394442 BLAKE2B e82726143b353b843e915ea78ea2e033077ee495b1d416866f5c231f8bd864372496736d266b2b848ed8afd3134bd865c507291fd2fbdd5cae00a92ce3c5e76d SHA512 b3ba1328476a1c642c6b813afc3879e904bc14da69e062156df0405b3da6d2a15a4a40602f24d0a067a83cc441ce5a5e353dacb84869b0fe24e9984c0dec719f
@@ -9,10 +11,13 @@ DIST boto3-1.18.5.tar.gz 394930 BLAKE2B a7f58699a4a27c85f00f47eb34d861509446d159
 DIST boto3-1.18.6.tar.gz 394941 BLAKE2B c7ef6f85fea5a12c248afd03cbe5cca2475c32de0d5b90e8390837e4e1980390e07bc99b6dd1e1831c34135503fe5859e0a837e0aff88f7af2bd8ddcad804a1d SHA512 01cdc6e71b8cd04da7e6f2bf9268625824c12b53fc7322343ae635d5fdd6ed30170fb698d7c4a788b4095fbfc186ef72a11fb6f785a1006fe7861d2db6108da9
 DIST boto3-1.18.7.tar.gz 395640 BLAKE2B 6a9fa1dd55644806fe93271805f35fbe0c4cb65d1de08dded2d2f57fcefa96e32c4ebe7b60743c52c0898222bc06d33dbd03d304bbef327b88022450a7943e2c SHA512 20e7fedab7d061ab02f391e9baf36cb554e7f194f38d24d5a75f76715b2acf1b51b6adce5d8cf5a2a0d29df73566db00b8813a219d45a194d9a8eb93d0dab570
 DIST boto3-1.18.8.tar.gz 397295 BLAKE2B 34e4e9dbaf53d7e9917b26f62385a012663147bcebe3a3989f3e306ed1bad8fc90c47ecd0901e127ad024f67d6891e3eb2b2f59e179ca45fe88b5cca6968bbef SHA512 59ea0cb50058fde12f748b394b9ba7053755c642d6124343a6fe00d8c7918f123b508441006c5a9ebc6319d4318f7f95c481cca47d692349c4591958c38d53c7
+DIST boto3-1.18.9.tar.gz 397452 BLAKE2B 1a600eb067baebb59141f1e8cb15442d7fa338430534099df84b8b71f6fd90a56aa5ead0c38ba317018897861f996ce38cf995233778ad57e3be82e82870173b SHA512 12d2b8a1baa9993be322b770a13a8895718bd25c6d4a51bdef39413368c9ba62fdc93e4f517d3556e5d6a26e860b21f1bdd1ee6b0f49c83082973ee716d3017c
 EBUILD boto3-1.17.104.ebuild 1336 BLAKE2B cd492f68d066b954200ac23e330958382b0ed6d5dd6389b24824282197579442a7ea9b70db065259f436aebabb898fe9e9556f5be525fb7bf47960fd61903782 SHA512 32ecfbc280efd39c19295d6d38f3df12ef199263e741b13c35a0a927a609d90b250ba2a5a1324f045c493db7249d5889627d772767cf5de74946a35e5d17e9bc
 EBUILD boto3-1.17.112.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
 EBUILD boto3-1.18.0.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.1.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.10.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.11.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.2.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.3.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.4.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
@@ -20,5 +25,6 @@ EBUILD boto3-1.18.5.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f0
 EBUILD boto3-1.18.6.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.7.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.8.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.9.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 605 BLAKE2B cb7041ecfae68d44cc4c533600c9527f901b3b57b4ac6b7877b489f849e1257f3ea157c901bb67dd44ef06296f02564b6b9e341bfd1d102b68512f7a40b48ede SHA512 2f9630e0d4396ae6f3a7a0aa328440fba250d330d4cb5e4a9cc68caaf0ffc133960294ca4fdd0bae150a212555ebdff07208e909c6f7207857a3b7774178dfc8
diff --git a/dev-python/boto3/boto3-1.18.10.ebuild b/dev-python/boto3/boto3-1.18.10.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.10.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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.18.11.ebuild b/dev-python/boto3/boto3-1.18.11.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.11.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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.18.9.ebuild b/dev-python/boto3/boto3-1.18.9.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.9.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~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 b4f657ef9c3d..95d181af9509 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,6 +3,8 @@ DIST botocore-1.20.104.tar.gz 7883624 BLAKE2B 4fb4c6abff5a2c3d3e19b11576e723f15a
 DIST botocore-1.20.112.tar.gz 7917776 BLAKE2B 6a5ebf3d32c505ec2c1fc4cd3d97aa94c76b6206dda6ba28a946dfdc9973073019389c05d1cf09a0eced701fe86a9b8a292835415c0b1ceea75959a3186f65c6 SHA512 4b36367ffdd011aeb7654fd5c52c38e95bae4c55e5af85e38b0764140539ad1f8b9d75b0c7fd1009fda8d005ef4b17673b06f85a76b52fcebf05925297b6bbbf
 DIST botocore-1.21.0.tar.gz 7955550 BLAKE2B 7e68375d07d858dc2071538c2382d8693df23fea5326938491c492abe55c060d0cdf98698cef9b06dac996a59c907ed780e5baadabbb7c10d5e41efa84c4750c SHA512 e56eea7f3c4f39f51ef1d53dfb42fd5d601167cca7c868b1cf2f291732a8cf90aaa874760f262085439df5726c6b610369a325e863533b593aa708fd901398a1
 DIST botocore-1.21.1.tar.gz 7954248 BLAKE2B d6e7a71d6dd90ed0fcf0dbab3182dcdfa4072e65a1f344d44ac30abc829ac6c546a0ebcdee51f61ae65008550acf65052b49530ae3b3a62d81af222e6e8a0929 SHA512 86d4b4159a96426e7ab853b06564604fd9729011199ba691f6204a7e5f52d9927b93511b73cfc03b65bce706563c6d50b577d85d0de0e50fb5d877472d8326dc
+DIST botocore-1.21.10.tar.gz 8001298 BLAKE2B bbc762302462d9eb5e223245c8dd2430e6f190b643502d3a124e3831f531f014e49bb54bde768fc2dc7313e5b6ca7c78076a74511d724396370d1f699366ab44 SHA512 8e3c90d24ce5c6ae76376649c1ec191bdca162adfa8ab1b33903cffa9ccf2d7b306efe36b9d81f53f579170516c91c7c3f47a00d3033f5b691f2495b0ac97b88
+DIST botocore-1.21.11.tar.gz 8003282 BLAKE2B a7ada604bef2d5130169b0905acfb1ed51fbbafbb9df29d2ed3e3cbf89b44ded59b0de1baffe46b27b10e854b190517d95a26022cc22145fbeb42c46cdb780ae SHA512 45f66cdbbc66dc74c5aac003eb67569533088486fbd3443077be7d6ecb4fe9b8ba9a9de04b94b44fe02167f7261fc9675b7cfb8973de95510d4401a237416713
 DIST botocore-1.21.2.tar.gz 7960118 BLAKE2B 11d2845e1846c03591625a95b21ff6fe1acb1448414a5f09de1d427614e927d974fafe5dd5d4f195aeb2f3b86d60822a8c73f1bc532bb45c85be8421f92eedc3 SHA512 501f059518026bef10fe933d20a3348b4140cff9ef1af38e17552aea8698179135f5271604e988f53c215e3a13158d7784a49a6b56c0d4db591f99dac9c57ca8
 DIST botocore-1.21.3.tar.gz 7959023 BLAKE2B aab15319b9f36c25ee88f2bf0b2efcb6bbffeac1b4e38dcbdfde3a947f702016e77b66c4b125ca2b63614223109fd793da68f9ce1b1d14476cdd6a3fcb10dfce SHA512 5a8ce8f612fd0e1c68a75223dda95673f72159b02a040d1a71920b7e75b3aa9d14589c33a52970182970a353308954e8cd6d5f97d374e0e2ee2cd40e0dce786e
 DIST botocore-1.21.4.tar.gz 7964960 BLAKE2B 71d55b47633aa658a9dc921375c77230a6ebb89460d9de5a9982d730e03247972476400dbcf292da0a885789860117c1abc9bf803c79547049b242feb8755d15 SHA512 4a36e5870d9996973e2258f2e6afeb7381ac94d14075eaa9885f6f89afb87fa5b4461b02ab234b4ecc8e24630434dbb839e8ad30f622de6ffa5402f872f84a97
@@ -10,10 +12,13 @@ DIST botocore-1.21.5.tar.gz 7968981 BLAKE2B cea2c648e5f8d6f99bd1f11f430511abdc41
 DIST botocore-1.21.6.tar.gz 7974218 BLAKE2B f3391b620a21d04712e1254c4e8ffc090956bc1e0a41278be2c0e02a659ada639af2cc4e94bf607492164a8425988c16e8b899726fe645871b1cf6d1f98ef04d SHA512 1a74f2450a1c57a61c704550c0f08fd518b8d4fc463acdd8622ca8bf7fa51293c52c54999e1a1d563815cb0fd35585072753d623739a6738367b0bae94f655b7
 DIST botocore-1.21.7.tar.gz 7977343 BLAKE2B 19c5bf5de40ab131585e30bb85486fcffc3428808811b312b33578174ce31a691f4f4d955462120f05d2aad2cd5e5772789704eee641760fb67099aa3cddc9b5 SHA512 db1bb36faa6857a1cc717e5d591954415bb948178ee2be90ab9c32c11b1fb45c5b5aff87dfacd907c2f11bc7cdd2cd4de2ee9c847fa8cda4e5f0814a828b1019
 DIST botocore-1.21.8.tar.gz 7996323 BLAKE2B a0c21ec64fd97f011d2e986806b0a47f5f5941f13b7a17fe84f4886a98e91629c641b9e39c2040105ebe4102d8a9c84ebaffbb6a0bf9ef8c48be80804863d441 SHA512 178914d04d1abfaed5fc7e5225e3da54706608d8075298e3b1d7ca4ef09fdef11ee4eb4b7e2f5eb60ab1527b2dcd0c46bbd6b987903be8959ea16e775ca9b548
+DIST botocore-1.21.9.tar.gz 7999524 BLAKE2B 23852915e20610691bc95a24023b2a06002215bfec1a74bdddaf11f0490ef58dccaad70428126c19928e437b1694a0146145257a6aa500ab690e10490a6e857e SHA512 2053d208e9b41139781fb4a8296c169ddea525998480a2dc524a615d9f7119909ad640acbd2d14ce02e2e3218d3faa954b3b92985f34a6fcb46ad6cdba787277
 EBUILD botocore-1.20.104.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
 EBUILD botocore-1.20.112.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.0.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.1.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.10.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.11.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.2.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.3.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.4.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
@@ -21,5 +26,6 @@ EBUILD botocore-1.21.5.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a8
 EBUILD botocore-1.21.6.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.7.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.8.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.9.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 MISC metadata.xml 611 BLAKE2B 03764517dd63550373d7be154fef3a5e3a7e55abebc6ad58011b707d1e331c362dc6e13f6f1a6831827f8bf68dae027870abea885d8c5b3d8a64fcca4ae61fd0 SHA512 3532135859fe085e3fec2c04e0f5ab0eacb40345730178729736553f025037ffe77033d63407b4097f65cb31d1f300dd56b777d139630abe2f2f8f9991e0bd76
diff --git a/dev-python/botocore/botocore-1.21.10.ebuild b/dev-python/botocore/botocore-1.21.10.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.10.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.11.ebuild b/dev-python/botocore/botocore-1.21.11.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.11.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.9.ebuild b/dev-python/botocore/botocore-1.21.9.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.9.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+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 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index e35390cd6ee8..6ee545a37e28 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,3 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
-EBUILD charset_normalizer-2.0.3.ebuild 634 BLAKE2B 3f6739ea98b87f7e0eee01071cfce5d3d767bd046e77e73738ac18d575b3179adc943807e413158a20b78f0671ff6b8a93be53cc6a5cefa6d0b271f0e2280124 SHA512 144d7391f6262631b6088cfeb2e04a23ab4200e6124bc7e02d45ba3379ced65ea31b113d735a27a35a566596fb62eb7031b186095b24c8c5490a1caca6e3f084
+EBUILD charset_normalizer-2.0.3.ebuild 640 BLAKE2B 3f1b34c36268cc935c4899d905d2e412a780285d39e803e6909afa9444354d5adcfc00d8b70a9aaa89fd3b15997aab16ab867de41bc4bd96e189a9d092aa754d SHA512 5025b53c31549ed1936afd7b48c0be04bcea91333156d341be769e590fb242f623632ae961e2705554de48a9fe625ac7cabd81134745b6dd92bb744743b2834a
 MISC metadata.xml 364 BLAKE2B be46c29b2fa986a53e4abf38f4f68a9882e3a01c0d3c524a0935a51a04d3e71d98548401ae96e84155c943dc2baf127f28e0f24d764d9e4cea466e2ba010f432 SHA512 bca4661b93af7b085ba8c71ba91188a984336c30467d4e38a7856c2522f83ae6dee122e3061a9b434a218bcb11e18583fc02b85c7629dca5cfbeb6aecc63bfeb
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
index e1fa87993f46..89687b00b3cd 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index e29c7feea184..451d41e69c3a 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -7,4 +7,5 @@ EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a9
 EBUILD clang-python-12.0.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-12.0.1.ebuild 927 BLAKE2B 1e0d88215cd7bd7a7968fb00e5c91e10b894750a4ec77a4413d5af19bb93e422b59204e2f62b90ceb628846fede7ed534424640974fe9a3e2d881aec0ccca02e SHA512 11d64eab9433584271e4c97f7af0a9e2762126c3eefffe0f19e74ffdfadef6852aea59337c2fb604daad3c8b3495a3ee2e1a015c20e14eef673e2dacc8304fdf
 EBUILD clang-python-13.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
+EBUILD clang-python-14.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-python/clang-python/clang-python-14.0.0.9999.ebuild b/dev-python/clang-python/clang-python-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..921f7735340a
--- /dev/null
+++ b/dev-python/clang-python/clang-python-14.0.0.9999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit llvm.org python-r1
+
+DESCRIPTION="Python bindings for sys-devel/clang"
+HOMEPAGE="https://llvm.org/"
+
+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}"
+
+LLVM_COMPONENTS=( clang/bindings/python )
+llvm.org_set_globals
+
+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/cppy/Manifest b/dev-python/cppy/Manifest
index f33162935492..14725fcc6b92 100644
--- a/dev-python/cppy/Manifest
+++ b/dev-python/cppy/Manifest
@@ -1,3 +1,3 @@
 DIST cppy-1.1.0.tar.gz 11777 BLAKE2B 3bdeba7ee9bb478b51090a52077abc44ee74f72439c3cf2bca898bfc84bd97993bf4dd20d641a1952e2738e3f6b89434f7435fe0a5a8302f91ebef9d02729686 SHA512 9ef4db580c963219a111ab10bc263cdf2c4386e27fce8ffe5c785fc7e8f6c6b60cb23ce918959c6f17194fd6977cc65fa64d167a0b62e6cff0cf662154bc734c
-EBUILD cppy-1.1.0.ebuild 464 BLAKE2B 68d3de294544293a5b388fa7a6f00965c457fd5a3835e5684abb4a344400162831eb668f976d9532722a51cdd3cdb2fd0858fc3944322092b5d9b0030fb4806c SHA512 9bf7a15fc75cf75d590fa14e30e92aa4f282810aadd02317c3176dc5993f327b037fe458b3601c39f093630158e5db6e4007ca5a39d3f7747cb08096ded3b625
+EBUILD cppy-1.1.0.ebuild 470 BLAKE2B 5390ddd7a96d65c63304da3b2d3ba9dea929bde8ab252d0320fa172dcf90232e7da3c69f850ba86d3872d5bf8a38a8db1ebf5efe405a1b4f00b3ad8fa1384176 SHA512 80d0a7c64f6af7545eadb34bbea74c6ee6f77db4b80231e408dd6b08bbe72cc64cfc61b70f8b7ca3fa506e1fb1fe213fb441973dbe4e678f840d73ad6f269979
 MISC metadata.xml 601 BLAKE2B ea350b20df37a65fb695429ebfe7a7de8fe2c2611b20aed100aee0b84693363d1c3f4d16eec0fc3df0de63dfd79a4d4b89afb175698888fe64c847962575d6f1 SHA512 a8e798ad3e49b58041127be01d4256d62400aaedbdd006a1294df67afc4624abb8c55a847c7f9e75434b1b193a882902685d53ae183b415cd3bfe54dd4b6945b
diff --git a/dev-python/cppy/cppy-1.1.0.ebuild b/dev-python/cppy/cppy-1.1.0.ebuild
index aa26f2a21d07..f3b11ee5913d 100644
--- a/dev-python/cppy/cppy-1.1.0.ebuild
+++ b/dev-python/cppy/cppy-1.1.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cycler/Manifest b/dev-python/cycler/Manifest
index 95aa36137cf1..28a1031083b8 100644
--- a/dev-python/cycler/Manifest
+++ b/dev-python/cycler/Manifest
@@ -1,3 +1,3 @@
 DIST cycler-0.10.0.gh.tar.gz 21672 BLAKE2B 68b48e8359210845e35e4fe2cd1f48b48ac2c1ce67196fd9fa1e3a83a3bf15d6889a727bf62a65097d0975e93e660550084ef66a0c3a3de98ba04d439d29965b SHA512 685231d455dfdde70eb71415dfe561e07c34579d7b31ef7197f4c1441301635b387fec903d610b35406b619264f4c0cc616562de8f02b8192414c29274b63c01
-EBUILD cycler-0.10.0-r1.ebuild 631 BLAKE2B 668c8865bc8b7340ddefc00e5f33d1770e66be0f93fa554ea90f3ec0039277f62e6c8b30ba37a3729b1b5d08e69bd0f0bf8311cc949194edcf5381e930bac46a SHA512 07998a5cb1a38bdd6dbbd6c555ebf07f4ec351d88c4fd044ee4f901963ce23910d45882c37b6d6265d81723eafdfe8c0e584f173bd6c5ba2e5557e534a3b74f8
+EBUILD cycler-0.10.0-r1.ebuild 637 BLAKE2B 64fbe0475ec182a49c0be04761b3ee0624899805df471f58e0ece86a529b3220de411112d736a319f770745a078d34729c369939b07691ab48342b52f32f9a36 SHA512 857109330cf5acaa9c1206206e528033b99d5c8ecfa36641f27760fc66c94c1829fdd92d04631db2183a63a2311a45893f9a148eb6a595de7827ee473ecae31e
 MISC metadata.xml 366 BLAKE2B 67803b534c2f9bc0266a5178178da1e400cfb9721c63d8d7103b6ee12b7b76808a570d1748d12ef55685df108d7dfdb7ff632e63152c4cc0e65ccfa442ae8efd SHA512 43c46a3af153f4b58f305632cac2a699eccc74417ea468b1f85810ea90e843979a9c360231d6762acfb1402270ff27491dd0927f762143e354925637dc24df5f
diff --git a/dev-python/cycler/cycler-0.10.0-r1.ebuild b/dev-python/cycler/cycler-0.10.0-r1.ebuild
index 1b7aa639d8b6..aa0edad5f9bb 100644
--- a/dev-python/cycler/cycler-0.10.0-r1.ebuild
+++ b/dev-python/cycler/cycler-0.10.0-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
index 0925b4effc26..d5e6ff414609 100644
--- a/dev-python/cython-test-exception-raiser/Manifest
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -1,3 +1,3 @@
 DIST cython-test-exception-raiser-1.0.0.gh.tar.gz 4273 BLAKE2B 028c3ded07b137a186055b4fa8f9d7306585942ad7ee022a37b3df065dae5d2110d6ddcd874f3dc2c687f10da1122329194b817b1a78a76ff8de557997ca2a19 SHA512 4e1c5dd65a7c493cf43213badfcaaeb0df9c4774cc6f90cfd437612126893e7831d218c707599adb97dbee7ebaaa2372c796c634d75738bd06328735eb8f1189
-EBUILD cython-test-exception-raiser-1.0.0.ebuild 628 BLAKE2B b98ab43e36fe4ba5e5859f35a30210a05659d9a00a880892c96520fd6d9027be6b139398ec7c52fca4cbf6a1265e7579c9ad100a30c8f12a91ae3ce04b3d44a3 SHA512 6eb5feda97615b134551a3191a4c31c7a2df633f93563bdf572fa3543ea6d2a7ccb34447cd95c4831c43e3e10c0367e94ef75914f889c2c5747ab564d82854b7
+EBUILD cython-test-exception-raiser-1.0.0.ebuild 627 BLAKE2B 49c9ebab82db4fa3b37addc9188b960e4bf4ac883b052e59922266d13f3c299baf7657a7893b0a0ff0f94a93b1eb2580ad6bc16877e8b3bfbf7c0fb710cbe888 SHA512 edea9eebca886422f75f7c3f2f639cf9845190f626cf6401bbbb012391601cf7172b1d337a86ceb0581fa76bfce4901ab88e61636fe37a14232ae7b1727d50a2
 MISC metadata.xml 385 BLAKE2B a99aacc4e3a21f41dd413b185fec8ac393e1c1c2f3897fd7173d717a72b056acb8362a0b5c9b6028021365678f828549fc0b711e9697620f50f9d66ff83952d9 SHA512 1b978c0d50c3b60bdcba9bf93d6da041d83cc9614d4fc6b9837ce9797b0c251d2ed08777f7bc0877d98a9c76b8f8ec744f7f171cbb663aa36e55e2e6a7429fd2
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
index 7b917c4f775f..ad11c7efe254 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
@@ -16,6 +16,6 @@ SRC_URI="
 
 LICENSE="MIT"
 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"
 
 BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 98d5e0b8d3a6..1798375125f1 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,7 +1,9 @@
 DIST dask-2021.6.2.tar.gz 3725731 BLAKE2B 957cf70c328462c87eb52bb2fe3d471705ab6bbc233badb8d5ba93ade4b7caa05e47399f26f37b69213df16e76fdf8f042a082a0d2d96797bca836311349a6b3 SHA512 2949a0a028d08794936faaeeea3b36c97ac1492288519efa0fd1e6bbb9b5b52b730657b8b342a47ca0183d98e9179836423847670fc12c14be0890daa4b773b4
 DIST dask-2021.7.0.tar.gz 3730549 BLAKE2B 8f76648614adbef8ca1feb01f5b39d4ad217eb5178c4b7ace72d3764062b172d83b74e9fad5eeff0a745025e0cb2bf47bdb14beb03b1520130332ece00c3e318 SHA512 3dbeefe08af6536f19a03ead69372dfa7a26eff66d768fa8e238341822136a2314fca0291694ad22bdfe3618a4ed6785d836ceb5cc4231f361d97f0cbba0edbf
 DIST dask-2021.7.1.tar.gz 3734645 BLAKE2B 4dfd98c72a54712dc4bee97305811bf411bceb5e5ad60d6a82e94b785be51ea8e2ea6ae853b85f45a9765f0220f4c35b526582f1587932178d53884df1d697d7 SHA512 0b5ab5e08503468ca26ee2b0e195979055c9fa439e62f1c47e73521856f7ddb2fa608457cd1e4a0edcd3162254d404ae4995319b73b142bf6bd804c6b63b3f22
+DIST dask-2021.7.2.tar.gz 3739041 BLAKE2B e32389a5d6a47a9c0f741a33d2f9aeb8887c951d4a53ad7e2bdc5d7007e2e7b8db9b639b95725bb70cfdf1f3568aa2541c7f46c5c87cbb50b5433866b7f0e870 SHA512 029832ea2db342cc63dcfc4e5a563e6e92f5d26298ca19d7815548acceb8098e94b53acb5df1a6923172e7014b6235ddb34921f2855701921556db83a9411afa
 EBUILD dask-2021.6.2.ebuild 1128 BLAKE2B 2302fd9867ee06d58d1707bcb06658a23e633041974b604563859c5a67b084514e6fba886182dd3f721991f33d9ac9010a2b114b90e7f91fa192af88507fbeed SHA512 b378c693d991fc814d31d2c93541513d18bd79fb7220acbad444e6aea44295962e33f4249d84f7db25b66bb22a6b554abc76428a20e8680fbe87ae84f3c272f6
 EBUILD dask-2021.7.0.ebuild 1199 BLAKE2B 52cfc495d9df0fb9d3c6477baac98f8e8eddda366c79d1f83cf0c3c828418e436bd10b1aacb449d9a76f329b63b8ae882840105fb65e3429e3e6f0ef41657bc7 SHA512 0e9047e376151ddf90bcc6de0d46863d703472f67889e50c6869795be40fd163e7b728d24c870ca4d466e0e7a6dcda65beb6f7cb07caca88f951683a55896594
 EBUILD dask-2021.7.1.ebuild 1246 BLAKE2B 98fdc9b9785d6fe9c0348c9cdfb1235e7981e0711c105da79e2a073cb393c8ed84847ec3ad9d0524ccdd9d841499e1f36867e3c6b08bb0c729653d1484b8f206 SHA512 c9e1b73ce128af0f63faaeb04ea8b74e9b6000713ce977aa4ae6f3eaf55342f1a986d2d01e6ba413b1dc47762b601aaf8422b318866709aed75e06f1f4820422
+EBUILD dask-2021.7.2.ebuild 1246 BLAKE2B 98fdc9b9785d6fe9c0348c9cdfb1235e7981e0711c105da79e2a073cb393c8ed84847ec3ad9d0524ccdd9d841499e1f36867e3c6b08bb0c729653d1484b8f206 SHA512 c9e1b73ce128af0f63faaeb04ea8b74e9b6000713ce977aa4ae6f3eaf55342f1a986d2d01e6ba413b1dc47762b601aaf8422b318866709aed75e06f1f4820422
 MISC metadata.xml 670 BLAKE2B 1a15001a3836bd70c8d539b34283c9e3b19e3a37031de32f82e8b44a09de2031e572104b1dcc5a690c80c55981f0c510325ba700e4e859a15dcd0a3b06a6abd1 SHA512 41e31ef86be6c90bf9846bb9a753d6f6ed3119d0bca3f0b205c9f814045fccf99702ff901b7e5fb1d785fb5cdd5230ba7520dd6e6ae604761af1442e8ec81538
diff --git a/dev-python/dask/dask-2021.7.2.ebuild b/dev-python/dask/dask-2021.7.2.ebuild
new file mode 100644
index 000000000000..a7f474643d23
--- /dev/null
+++ b/dev-python/dask/dask-2021.7.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+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.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${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-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# require old sqlalchemy
+		dask/dataframe/io/tests/test_sql.py
+	)
+
+	epytest -p no:flaky -m "not network" ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/distro/Manifest b/dev-python/distro/Manifest
index 18c87f4de46c..075f59eea52d 100644
--- a/dev-python/distro/Manifest
+++ b/dev-python/distro/Manifest
@@ -1,3 +1,5 @@
 DIST distro-1.5.0.tar.gz 54340 BLAKE2B 2a5bf45cdf41b9772a2e164aebe96a4e9952893b7462935938fa4939704c8dca67acc3e0a52e53d8722aa4405abdc7ad2c8d600dd397d1243bcceda4d5ceeb75 SHA512 14831fe1355e9ef4f58f273ce4a548a3fe438e95466b4b4f596b8110da51305d66ed77c2e40c3dbfbcbd1a66c74e23a4d4244c8bfdebc4b49b3e7ddcbff55b8f
+DIST distro-1.6.0.tar.gz 53518 BLAKE2B d60555488ed12658a3129747eed891487dfdf7f16b530b84c44cd976c6dcfadbeb9e20130e5c2eee9c71b0fd0c86c82d258a76498171f4e553c087840903e3b8 SHA512 d30334ed1137c54ddc70e041b75be905b7e13398483d0d92117eca0407d2a7b60424d96fd7af885a2e3ea3676b1aef620e91598a53309ae0da12a360d57ac013
 EBUILD distro-1.5.0-r1.ebuild 502 BLAKE2B 8e805a6733b05cca24d756491f8adc6d0304b0f33861bb98c214dd58e91834b98ab8a1a48c2ce4a6e7acb80f2e652d8eaabff882bfe5207d83ef77ba4bf75a97 SHA512 602a2387b5341f58ecd63c42b86c8b08b3ea6031b3fde5ed57e2d8204f83653c61b82ac16f94bc1ca1ef8a30894a32f5bbeacc4efe685dd9a5e29a7487f03212
+EBUILD distro-1.6.0.ebuild 508 BLAKE2B 1c85441cd2b3ae658a42caf9bdc05eb30d7a1021d40c190cd1f134d751d667a3fce7e3a91c102fbfd41640811ae347be691bb5f23b645a0f0f2cf2d4dba26695 SHA512 0d30def42cdb8c901e558260c810ee39222632c5eb3106101baebf47c4960d0aedf74bcedda0616df6b819038498433234e26b14394d3e4acbd21c28203b4e70
 MISC metadata.xml 838 BLAKE2B 899bf57efe9358f0f33df59ef8802cdb0e9d26c05ac99289b7d3765ddf2a5cb65452874aaca7db3774c76564c4761c4f71ee139bad080cc1e62472794de29b8e SHA512 55cab917a2b67bab65c1fda28693020efde74e905c09d077dd2562c2e78171ab33a2a4190b458deb5bfbeb3b9ed3fd66c61e69cbe569f1640d135c46a66477e5
diff --git a/dev-python/distro/distro-1.6.0.ebuild b/dev-python/distro/distro-1.6.0.ebuild
new file mode 100644
index 000000000000..331acc2c9903
--- /dev/null
+++ b/dev-python/distro/distro-1.6.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Reliable machine-readable Linux distribution information for Python"
+HOMEPAGE="https://distro.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/emoji/Manifest b/dev-python/emoji/Manifest
index 883a1ea9fc11..bc473dc988e7 100644
--- a/dev-python/emoji/Manifest
+++ b/dev-python/emoji/Manifest
@@ -1,5 +1,7 @@
 DIST emoji-0.5.4.tar.gz 43402 BLAKE2B a7d94af22d09159e23b160300f70372c08c095fae3be45e204e5be73a907cd4ffcbad00aeed4c85ec0048ae1a5fdedce52105bcfc1557217d3b53002e1770267 SHA512 20e592247f8bc9bc0a030181904d806b50768b444b728d074afa58896e258ca664b4983de5c51b7624b585edcd93e05a34b8df722f4d0eefb625ce11fbb63d0d
 DIST emoji-1.2.1.tar.gz 158090 BLAKE2B c16ff949611f9453c3c073d466ddde75f31029fb4ec2160ba003dc94d1857c3d6f1de060220869f76fd94ab11539e7ea4bcff81211b7354c1f0e6bedc131e178 SHA512 b654494aab90c3ca4ec17331ba6504e2f16b46226170e170971f5f86553e025027e23d2e02020c899d5251e50bd8b78d4db3ea1a017b4eb371562595e4a9a5a7
+DIST emoji-1.4.2.tar.gz 222120 BLAKE2B 8771c7289a41fc741c54b3096df4ba6099dfdc3bcdc72282c93c565376e8fdb2e5939949a206cb01bfb1f2d663f840cd958e4d762f9da45639c49e52f3410947 SHA512 abf7fcaa922963c990330ebb6fd26c1613ffbdcbd6cabdf44e977b54df4b9c80c30e70e0ed0a9d9311c2fb95423df052e4e9c22d95510eab10eb3754084622ed
 EBUILD emoji-0.5.4.ebuild 373 BLAKE2B 3e20b341efe60379e92339acdd0eabf663b4fa2fe47112a05f53819e97ee81f124f58e44edc31504514667f66b6a4c61a8179d4b9fa168a1cb9dedde22c9feed SHA512 17287f2e2a65e0967a9dbe636c7edda177b8719d462a8fb632f238e9b5e845092b491e198dbda18c11ea2d6aee09419835afc7b8ebcfc1c4ca93cee439bfb167
 EBUILD emoji-1.2.1.ebuild 454 BLAKE2B e5a63d5a5ad79aa68574560dece498bd3d2d2aab19e00d4e46d691c6550eb478d0bdad7c78d72b967aa1de96573b626a8d5bdaa94690d8f0d8323c64123b3356 SHA512 6bd279ae8a9581894a72e4781dc4d8843d5a41dd9899e21dc0fa1d7576f90395913bb026ef18387727ce0fec61a8a1b007777f774bdbe03a877f538e29497c6a
+EBUILD emoji-1.4.2.ebuild 454 BLAKE2B 8783d79b1d000539bd907857843064e1704919ae9b8bbfb3a4d0de5a0bf738170bd86a3c637def670ed22485c6e313dbf2ba0b8176859fbd07da550743198e18 SHA512 f770e6c666137c5fb52040f329d9156670e442c1760c4f49fccf454703361bf1cc9a3f98f73e0d39d0c2a67eb5d6721610d19ae756616a665b7a25e81f3d0083
 MISC metadata.xml 395 BLAKE2B 993d498b8834fcb8d9bc9532a7b4083fefece581175a026ba8a291d4aa95d540ea96fd40e069d11ea1ec35affc9cbe028892d1a2727eb25c1b201c754e6d5276 SHA512 5225011a919d564e2e9f5d3202fc67abaec62c7bc01e8367f6b1595f14eab2f39849e41d407efbf0a31ab8470df46fa71d56816c7a2fee207750fde09c89a70a
diff --git a/dev-python/emoji/emoji-1.4.2.ebuild b/dev-python/emoji/emoji-1.4.2.ebuild
new file mode 100644
index 000000000000..b814c446ac82
--- /dev/null
+++ b/dev-python/emoji/emoji-1.4.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Emoji for Python"
+HOMEPAGE="https://github.com/carpedm20/emoji/"
+SRC_URI="https://github.com/carpedm20/emoji/archive/refs/tags/v.${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-v.${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/et_xmlfile/Manifest b/dev-python/et_xmlfile/Manifest
index f75407b0b79c..6aeb2e9266e1 100644
--- a/dev-python/et_xmlfile/Manifest
+++ b/dev-python/et_xmlfile/Manifest
@@ -1,3 +1,3 @@
 DIST et_xmlfile-1.1.tar.gz 12566 BLAKE2B f8f1c95a523433698032c79442b8bdf725717b647d3f65017926be3c12b78890528d5cde99c13e219d99f20e45ee5db872a772f88e451974435d565bebb56923 SHA512 0978cfa08c56b6dd8b3bed020a9f48c286c5bbcef5ac46f0cbf37bea0c1fcc79c6688f9853da68cbd9df4c6268e780fd99a172907cf900bcb3faf2f6252157f8
-EBUILD et_xmlfile-1.1.0.ebuild 675 BLAKE2B 340454cb74a8d7b068f2133695cbdb2879766b0877d39c47413b03d2dafae7759a977aac881cb6798fe2ebf5fa8f769f520bf6774000614789de16c453f53575 SHA512 adae9647a8e4ff24259ed7689cb300c7ab0135cf9a3cc949c03e223efa2e916bc1fc069b33eec7746cb62a2e91ef3b14ea9685b13999e356a06b0a75876d19dd
+EBUILD et_xmlfile-1.1.0.ebuild 682 BLAKE2B b7ad844d7b5ae6a6732f67d5861868c78b733ead5058e681f6863a60de077961b02d3af2b9f8a090cd46e7067d1ece6a01b98686aa73ed8778c4e50a051a8174 SHA512 cf299c5fb9e644319fc95a45e275553bfba3e92b31f9ef38a45026fde501a23b1475b071b09682789cac07de130c7d4ca0b85957246af3e6d70f6b618aabf573
 MISC metadata.xml 348 BLAKE2B 888c03fe50adba6f74323c04eb0055b6399303a1d13f73f1faf432522936ab416796e94acca3ba59422bda48e277829680921875fbb663347a34aaf2ee02ff2f SHA512 59f01b675ab4d621f215e72b8e642bf4e2931f78679d9721d96851f5c0a1ea7da4ec579e61aa2757e398c7789e747324696371f1e912bac64f1b9e0cfc0aa823
diff --git a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
index 375cb36404e5..fac52c11bac9 100644
--- a/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
+++ b/dev-python/et_xmlfile/et_xmlfile-1.1.0.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/executing/Manifest b/dev-python/executing/Manifest
index 214482d24e4c..46a93816f6ca 100644
--- a/dev-python/executing/Manifest
+++ b/dev-python/executing/Manifest
@@ -1,5 +1,7 @@
 DIST executing-0.6.0.gh.tar.gz 330731 BLAKE2B f6a86072907c5140aefb45beb46bcc8c6e3e242e2e821046e59f0eafe1d5c16efe3c08dd1b19b1ce85388fd9cc4757bfe586b95fb490a594cfee4f5e69b5a0af SHA512 5d2f621ff4cbfd55ac43b555f771b129ade5d20f882f4e5d6a060a1a099abad73cc4128c9e6bd32fccc40c4c85c51c28b3be40ab16f163e1ceaaad07f1936ab7
 DIST executing-0.7.0.gh.tar.gz 452550 BLAKE2B 9b3bdb49b3b00ca17952db747d3f0f3995e8dffbc170bcb2260e7c34ce9e6b0c8e1620be2e2776445a6114add4e2437eaeae8a308391e2c121b6484b5bc6056c SHA512 08ee347f0bcaf04ca2c6010762a6d2d5b054b3590029c55d18d6efae5a5db7c6c5a0948cce9d9684e4bfbfd9ea19326e4ac2c96be40535c0500c28c28ce81e07
+DIST executing-0.8.0.gh.tar.gz 494306 BLAKE2B 37ce7c743380dcac85e6843e8ee708c8d876c5de883e49786da67d94dc9a7bf983bb36278a823ddb2bc9291e7219125cf870fac8c0c28979a4b49e951410d5e5 SHA512 6f88052f61479c5fe4aba1925e90f3daea3852f636c5c17d94a08dfa4de909fb3187650ff07c1dc66b4b3bec4a04cfdaf4cfe0c37903f67b2d716691d07a93d8
 EBUILD executing-0.6.0.ebuild 967 BLAKE2B f3d4b98de91121ccb7a3f3c0117aef17c0d78bbe398953001dc67a950b3024c9dba6598d4affaa66b75cf1579101c3ddd3c2e00ff4be40f10234d6590bf0c043 SHA512 5e3f463c6be4d518e075e60d563ff1ae13f73616e67060f47015ff156edda5235bd394d428767963f156780fab4f6d7a19370645a760ad8f7e18f79064c49f7d
 EBUILD executing-0.7.0.ebuild 930 BLAKE2B 1d103318ce536b06e88050d4af7f692809a474d6bd39fca706b822496f1de9a1a2a4bc64fc7385dca836d36851d2c9a045ce0cf48c90b14b6f62f9c2701f5699 SHA512 6b210a9c78b7b01a3fcbe34f63183de9818537575f05d19cee2560e2486d3ec948d4fd52a016fba055913992e37a767cb3ab3a74d959d0008f8141013f813e35
+EBUILD executing-0.8.0.ebuild 931 BLAKE2B 62c54b8256b1420dfce5bcec57365fc8250639bff76e69132b5a2156d5d0297809d97ce39ec9d1eef137591dd10edb04a4b051437866451298161a397c3b9503 SHA512 7d5bceced13d74a7341d3e61319687d8f25e4a65bd890fd2305fc4a00477c72e5e9e18fe7b95c056332a25130b2b0c70ba9f704133eddbbdda391fef3c72f8f4
 MISC metadata.xml 350 BLAKE2B d128d36a837974853f5e51c64b03ca8eb749eaba54e5049033153e1c3671eef5a91490855820a47ce718f28e2aa45dd9d26df75e81fd923d7f119d546b6d9b61 SHA512 ff4ae4abcc417476ba024f7e9ff8f8de8c57d70f34c36bd2a4adae498c01489c16bf315ff174616ac9d65de3431983c35da66edae60668c9e526ada2a026555a
diff --git a/dev-python/executing/executing-0.8.0.ebuild b/dev-python/executing/executing-0.8.0.ebuild
new file mode 100644
index 000000000000..e01cf6c3100d
--- /dev/null
+++ b/dev-python/executing/executing-0.8.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Get information about what a Python frame is currently doing"
+HOMEPAGE="
+	https://github.com/alexmojaki/executing/
+	https://pypi.org/project/executing/"
+SRC_URI="
+	https://github.com/alexmojaki/executing/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+# asttokens is optional runtime dep
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	# this test explodes when collected by pytest
+	"${EPYTHON}" tests/test_main.py || die "Tests failed with ${EPYTHON}"
+	epytest tests/test_pytest.py
+}
diff --git a/dev-python/flit/Manifest b/dev-python/flit/Manifest
index e949b068feb0..8665a8007893 100644
--- a/dev-python/flit/Manifest
+++ b/dev-python/flit/Manifest
@@ -2,6 +2,8 @@ AUX flit-2.1.0-tests.patch 287 BLAKE2B e2deed39a206096f1c4be29678a93fbfc7dabd7cb
 AUX flit-3.2.0-tests.patch 445 BLAKE2B 313f975352b67a1dbc5c582ac854dea1625f1819fb1ae147d3fed254dddf69e416d79fb4d787f9deb48d2992d4deea8bfaad681c8a506959a142b8e065a73adb SHA512 737d97e8d9b2c1d1c9a5ef6d6ddd719245a3550092034097899c1917f99604dcd2c5b183f51a7cce8f70c98df9c679adbf3d29068782687018cf085e3cdf931a
 DIST flit-2.1.0.tar.gz 106459 BLAKE2B db51d8cc119ae8aa5f8d0ac1655cd29390065567391cbdf06ca7dbb98a79e96a6d8f318273c2f9a58aaf549090a903360701a844ac071d15304a21ea54052a91 SHA512 0fcbfaa1e5e83216a5c98cc87b0a8f2aa17e2c184ec3f09c7dd0dd5e695311be62344ac4f101cb71f87390513496f8c1152a2cd8d7363202f7696ee002f07a55
 DIST flit-3.2.0.tar.gz 115192 BLAKE2B dda4b9f5b56b9868d737516841d7fc49c0e97ef8a71f9f0628112f68c3dadae89a87aef56cebfe8ec3762af5970d206fe462add146d52b3893fb8852fd7f9625 SHA512 1db7c4118fe1d70d1e318db3bc282747d6cc3f3b626ad68420fa056e585caad9ff0a3f230e17c919ea260ddeb6330effc4bbed8b30d11ed7b27e78d9d7af0445
+DIST flit-3.3.0.tar.gz 117809 BLAKE2B 8ad74f70406e41b35b44886b145b52d83fc30d0a1395bf711807da2ae3974ae8606113e4bcd556694854c48c8c01c3c03b4a1021c7cc3e33cce0e99a5abbb9ea SHA512 904889298aab581640e8323fd68c83d753ea97af0ed1b8f438f192d84d09ced83718440a03d23864885fcf966de9665c3046f0f3a1b1d4170b2decf8430ff006
 EBUILD flit-2.1.0.ebuild 1417 BLAKE2B 070718c185f263ebd450cee23d6ea7cb08a9c7c35638e07f2725b66f54cb201836ee2c288153baa9b0723c129fb82daa469f0035731e0cb870f897dc449d8a48 SHA512 61ca338e64c5537a25a1fd326acf55d31eb376c61d16af2403e8a77a7709951f4fb77bc63c9264a8ccaa3a68f8a6bc7be470d126994ee0da06c9c79eac6a1b0b
 EBUILD flit-3.2.0.ebuild 1209 BLAKE2B 651d171f9c9b79aaee9b42486fd4840a78a47b04a1e9059eda2523c59cbe24f3e9870438d68cfbc640f3e5d2e4db3415d4d952eb2d68780f150b4a0254028c41 SHA512 1ec0cfaf96533b12d77e76b9a8486699c7ef03e7f936fad09e1e3062a269bd57f070f9c92bc8d0abace09cdb0732bc2d7a6c2efe6d8dbc8df77ee66f747f7be3
-MISC metadata.xml 382 BLAKE2B fc966604e8ce9f4f1d09745dfcebf3f5ca4ef00471079c13aa04c52b31d2cc84512a9509151a7c96a216dd80368c5d00e2802ba0c8bcbbbf386c2bbde3ee82b0 SHA512 de756a5fab204417b2a52b90ca02e9b38cb4a261ee4133e2e986d5cab06fb82172e2f8d2bf8d177841a4dfb24af45e3ec39ebdef7075fd9c6daa436d1c481f1d
+EBUILD flit-3.3.0.ebuild 1004 BLAKE2B eae1dbaa853c8d38357fdf49c1a8ae24b07f92dc56b018af0cbf890a9c3d8b854e05938b4228b0321432d58d72db1245ccd33a45e2e9087868fb2f44e3b0ce9a SHA512 ccc12f091880645c53c0deee4f40b95a6acfe5ea3bd94d09b099fb5107077d1d4386da1a20b6e8cc6129c39b828e6e8218fa3f0bafa180d2ccbec3d34d5d020b
+MISC metadata.xml 471 BLAKE2B f1df27e29e20cea6b8a8ada63b3cd6eab978061069a6ef9aa3857ddaa77d3f0cab683cd94523f280656cd953fc2c29cbddc06117d464fca0dabf177c2bb95471 SHA512 e758a665a2252c3865ef4dda41238d47bf631568a7536a86fbaae6f65e347afa6aca1e6e638720d3ca0fad46118cd605d4e813b2ade56744952ff13d98c91fbe
diff --git a/dev-python/flit/flit-3.3.0.ebuild b/dev-python/flit/flit-3.3.0.ebuild
new file mode 100644
index 000000000000..cb64bcc56a9b
--- /dev/null
+++ b/dev-python/flit/flit-3.3.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules"
+HOMEPAGE="https://github.com/takluyver/flit https://flit.readthedocs.io/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/flit_core-3.2.0[${PYTHON_USEDEP}]
+	dev-python/intreehooks[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests_download[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}
+	sys-apps/grep
+	sys-apps/findutils
+	test? (
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/flit-3.2.0-tests.patch"
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc \
+	dev-python/sphinxcontrib-github-alt \
+	dev-python/pygments-github-lexers \
diff --git a/dev-python/flit/metadata.xml b/dev-python/flit/metadata.xml
index 277c51bf2044..6a3a26427a66 100644
--- a/dev-python/flit/metadata.xml
+++ b/dev-python/flit/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>chutzpah@gentoo.org</email>
-    <name>Patrick McLean</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">flit</remote-id>
-    <remote-id type="github">takluyver/flit</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">flit</remote-id>
+		<remote-id type="github">takluyver/flit</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/flit_core/Manifest b/dev-python/flit_core/Manifest
index 320c6ef2e362..7c548477d7ac 100644
--- a/dev-python/flit_core/Manifest
+++ b/dev-python/flit_core/Manifest
@@ -1,5 +1,7 @@
 DIST flit_core-2.1.0.tar.gz 22978 BLAKE2B 87cb5ced56666eb9ae4963628864b66c77758c823b34712770a61a52cb7916196c0d6f51e7b2ad9804b853f27a257966aabef7dd9c95155af8e76f5100b1c9fa SHA512 dfc11cdd62af367b56773e5e0b28763554cd27a272a040a5dd35c8fae4f1e6695b2e2b15b6e63f6aa52df9854874eccc31f6eaf5b349ed85aa33cc5e1d2e1acd
 DIST flit_core-3.2.0.tar.gz 27417 BLAKE2B 8fe53ee47ce9b850b9200f2c1c4c88e3f7e29257fb1c488e3eefe79121634ef4f272db7e96d9621962de2e576da5b684c64653475ebb702bee313564b7fb41cd SHA512 660b787f0a4fc85d8d893087369b378ba5583e1dad82feb8ca3737e70c8c0a5ab5d95a38b7d3e9edff481d5207e946f6e6c7e60f22f96a1de0d2daeef6f16c2b
+DIST flit_core-3.3.0.tar.gz 26424 BLAKE2B a7237b51f16ed4158d5f09cbe92ccee7cbb3b19e67937028e86f4e1c9d58c9fe9244ea6337bc7c7c5bb29e204d011ee95a6d3fbe596d728ce66f1e00a830fb0c SHA512 5d7b1a43a9d9a7c0cf30b1f73d208963ae51247aec2b9a91aad6412afe781ee927ddd82ecea6057d36ec18af917938500f518845206ec150dd6b604905a1f2f4
 EBUILD flit_core-2.1.0.ebuild 991 BLAKE2B 6802c78f7dc4442fc6ce5fcf7a063c298d45f9355ecf3b682723310535304dd45efcfa72eef7e08a790ac661281312363915ebd193ad7c4416bebc1634dc84ff SHA512 28f8a1dce1600ea80de621ba227d5f1ac434a4c96aded435ccec703537b9584465a9af6bec8ee3991c9ac74552efebd2b82f0b3ba3bf6d5b97a5fad5ba3ff3d1
 EBUILD flit_core-3.2.0.ebuild 673 BLAKE2B 3c799620fe55ed46b8b19bf00201e00eab3cba5b0397d69d046f5682a4c0981a13f2af1668c004af0eec880fda9d113762a9112eb1bc9385ce9611c4ef59d95e SHA512 648bfac710570cc6ae09156999db5ceb71dae0701ba38ec529fe62334b8e1f589a2d747c6c89d3ed6c01eee454a6bafc5b038ad63ba16421156fa8b9aedb6eab
+EBUILD flit_core-3.3.0.ebuild 663 BLAKE2B e24dd502b2f08cee31d9cdab16f94ae2036920d5f6d68dcb3d65e3e840b402ccc86b9f500f01c4142710b5e5ed8755dd93c2d2cf55039ad3869951d881b446dc SHA512 a6387142fb8af6a19ab59e24270b2b4785a4833e7d920b47ae72ee10e68766b4dc00d428ac0f734aff001629cc435dc0ded41ca85357c6ab0a4433a43f998da4
 MISC metadata.xml 494 BLAKE2B 45cafc5e7fbac4425836c2af8bf464438ee852077e82512ef8964af26957337530744a1e65d54904a6c9469c2d9f501e15309daa468bd3bc474de91bab0fe5e0 SHA512 9d48e122ac8238876796333b91c422ec0f4f35b58970ea4d0e806758ca8e47670dc03a266b0f6e6ede0961d1aa88efd7ab6ae9cb90e02004ef2f4017912dacca
diff --git a/dev-python/flit_core/flit_core-3.3.0.ebuild b/dev-python/flit_core/flit_core-3.3.0.ebuild
new file mode 100644
index 000000000000..444e5c0b4fd4
--- /dev/null
+++ b/dev-python/flit_core/flit_core-3.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Simplified packaging of Python modules (core module)"
+HOMEPAGE="https://pypi.org/project/flit-core/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/intreehooks[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pyproject2setuppy-11[${PYTHON_USEDEP}]
+	test? ( dev-python/testpath[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index e3a9f87a1243..e8dcbee9c61d 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,8 +1,6 @@
 AUX fsspec-2021.06.1-ujson.patch 1304 BLAKE2B 9a7a7580b7df2967c4d61b7334cb4561cc4a1ce056b9dab3d16bca132545edf6651291c6b69742421208c679b336017b0e92d7584ec24bf32eb26335a451b917 SHA512 5574a57ba32b678a35967c9560831feb993b5462ff986e2b4c9a3a93dfa497ceee206bed88a72cc41456dc255cf8aab4240f6c3fd624822cbe594c6839758324
-DIST filesystem_spec-2021.05.0.tar.gz 292796 BLAKE2B 5d56d860ced1a72c27d2031b7d257a4bcbd52f6b2fed5275fbcbf7088375fde26652f0a003e919ebd3948d5e9833d802304234282ca858a7a2a19bfa11f66aa8 SHA512 7c27a1ad4e21efdcc0f31f91a9929e4c09db7b9421e7bf8d2f485e961f6887a4a5c083f38f8d7b09005a4cf11f55c93cce4617e3dc6c2b241ed20f7847ad711e
 DIST filesystem_spec-2021.06.1.tar.gz 297254 BLAKE2B e360c0780df2ace31a2a7e15f7269f23140ddbc6bd6a1f657cfddbab2b1f285d79a0c88f8d63e406d4a53fd3737f77012eb9837479707a778ab043503ade9d18 SHA512 1d59c2c53b1a4a604ff3762eca8484d7ed60fba98548cc77d7ed014ddf1513cef046ceeec41911cdecd414bdbb4e3c669a3a3f65da08dabf5a70cc2985d06b73
 DIST filesystem_spec-2021.07.0.tar.gz 301517 BLAKE2B 84b189e636eaeb4d3724e1afc44795e83b3ac576ab8640b4fee916bb7cf341c5cd6b1b475616225927693d13f204a1750f913f2e6d35b541fb8ff26ee1019400 SHA512 bea483734e6c9773d93ee93b526c8074a28f0671fbee17b39858dc7a75fd71553ca6d8d5c4e2204446bca3e7c23f6d4c8e94b62ff920e546a2b71786d0dcb388
-EBUILD fsspec-2021.05.0.ebuild 1194 BLAKE2B 0fafb3ea6563b4cab99f604ebe85a5515556a1018f850f0c154feb87f7e3aa7e65a304b4c4d9c244feb36563051706280a09de761a9782f1bfb9db3f2a150b43 SHA512 8b7cfc0266f9ff8a2f60b7853b356b357d98714e43f7074940ff57d2abf7d1e2636bf6498bb33a6ca2b59b9a2d3162471033ef97b9a05f9d5f390c94cd095fef
 EBUILD fsspec-2021.06.1.ebuild 1239 BLAKE2B 10d15d90196fa59f567185337c9d7330d981caff400180c0d0b40e01efe7896b80ddd0161d4460a8cda60d58d91e7407f560a176af89d54098f7733078c73b17 SHA512 b8c7232cb4b0937344908f13b4c5033b84cfc0c72f1c946bd5a34ba31389f41da9fe42cb321b85073ed7f89a7132472e64ff969efdb9a6610242b0b40b6292e8
 EBUILD fsspec-2021.07.0.ebuild 1196 BLAKE2B 6264230bccd83e7b2c525e622fd542d327f3cb7f1592033305748635ae528ca1ea319caf4cf6f369c211bd63df7452b9168ec72d0ecedaf924eb02c7e61d1afa SHA512 7908bd8aa040f87ca4b912894ef1195fbb7c1a2a4f203101def93c762363fc021884e92594c648b1e48fcaf692829bd91bdda946e0c096426a3939fb22f257d8
 MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/fsspec-2021.05.0.ebuild b/dev-python/fsspec/fsspec-2021.05.0.ebuild
deleted file mode 100644
index 102b4d61d8dd..000000000000
--- a/dev-python/fsspec/fsspec-2021.05.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 2020-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-MY_P=filesystem_spec-${PV}
-
-DESCRIPTION="A specification that python filesystems should adhere to"
-HOMEPAGE="https://github.com/intake/filesystem_spec/
-	https://pypi.org/project/fsspec/"
-SRC_URI="
-	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
-		-> ${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-BDEPEND="
-	dev-python/versioneer[${PYTHON_USEDEP}]
-	test? (
-		dev-python/aiohttp[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-distutils_enable_tests pytest
-
-src_test() {
-	git config --global user.email "you@example.com" || die
-	git config --global user.name "Your Name" || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	# sftp and smb require server started via docker
-	epytest \
-		--deselect fsspec/tests/test_spec.py::test_find \
-		--ignore fsspec/implementations/tests/test_dbfs.py \
-		--ignore fsspec/implementations/tests/test_sftp.py \
-		--ignore fsspec/implementations/tests/test_smb.py
-}
diff --git a/dev-python/google-auth-oauthlib/Manifest b/dev-python/google-auth-oauthlib/Manifest
index 4ff00d63f9cf..16f56e0d4b73 100644
--- a/dev-python/google-auth-oauthlib/Manifest
+++ b/dev-python/google-auth-oauthlib/Manifest
@@ -1,7 +1,9 @@
 DIST google-auth-library-python-oauthlib-0.4.3.gh.tar.gz 48020 BLAKE2B bc5e575f3eb7b8b876deb13aaff0d1b900555bcbc609259dc72c9f01f595283feffea6aaaf91acf835b313629fe4c4c76dee8ea877b6ae37c3c01633c63909e4 SHA512 f6fa0e525b0aef6f4359954cb2c8020ee86544862318721d439d153cae3e75527b0e0a312572dc936fab7702da8c6af42ce9242d1e73f48c0a822973e470a4a9
 DIST google-auth-library-python-oauthlib-0.4.4.gh.tar.gz 48322 BLAKE2B f812b43e1e867090aa3ae4fbda7523324a182f6e1eae39fd865d23279b04cde08ee2263b83d1c2eb3555a8db3a9b01869d8148c0e603ba8fe9698dc8d052fc11 SHA512 5b17ceccca24216a0354513ae2a1b14f2aab9760e0ff0f87840a64de85a730a4115f5e44b359093f4ab0a9ec8fea41bfffb7b5aeca833574419ea6021a382240
+DIST google-auth-library-python-oauthlib-0.4.5.gh.tar.gz 50487 BLAKE2B 1ace58a7b3d3aa0c28606c8345ee71550ea6522a07356e6debbdf6097743425c334a1a5bfae5ff60789f8de71b46ecc9ed973737aacca2c025fb7b2d7efbc539 SHA512 0a4bfab32133c3a8ad79ab9b46d087614bf49d4db54a403792396bdc55c378c5df5d31166354925bca6948d409e8a17328c593f892b73430ea7be6bcd8ef1d4c
 DIST google-auth-oauthlib-0.4.1.tar.gz 18687 BLAKE2B 1c9028f6b4c306bbee51fba5b55950d129d56ff5154645a166998c0c720b125202731f1cfed60837b8103d56fcdeeb818e39491b243a8d761969f73d9f88f67b SHA512 123707139353db8e05c81138af834e35007d323f0e19ae79088ad5ca4be86dda6c0df91e2f7794711475227a60312fab9101c91b49817bf8b84866ea6374c943
 EBUILD google-auth-oauthlib-0.4.1-r1.ebuild 763 BLAKE2B 9831129d76dbb7e468426c9497146d13b2af4b98eb7f18775aaf355b7f478476f60aac5b8daf71003658df719d2068fbc2a2a9c29925d877e6e09b174bdbfca4 SHA512 64f0879d1219a780fdabf99cb7f862eb0466c1a4c0518885d77ad689f23b0d222140867ab41e15fd07f607c1b40a9f3665a8dc3ba043176a216b1a2d5cf6728c
 EBUILD google-auth-oauthlib-0.4.3.ebuild 897 BLAKE2B d27f90b749025c63ee0ccd2e986dc021b21ce0280a2e7779dbbd754a3b68a7d779627459e20f485cd2bb5a41970863e24a84b3e108a216d3185d1806e079e4b6 SHA512 af995c0a3cd0d1ea53895af11fff39bdfd9e10c7b3cc430007332a196b823ba092a73afb210130cfe0523e0d3e42d1bb42800f0e12ade6ccc385f8057ee97b6d
 EBUILD google-auth-oauthlib-0.4.4.ebuild 897 BLAKE2B d27f90b749025c63ee0ccd2e986dc021b21ce0280a2e7779dbbd754a3b68a7d779627459e20f485cd2bb5a41970863e24a84b3e108a216d3185d1806e079e4b6 SHA512 af995c0a3cd0d1ea53895af11fff39bdfd9e10c7b3cc430007332a196b823ba092a73afb210130cfe0523e0d3e42d1bb42800f0e12ade6ccc385f8057ee97b6d
+EBUILD google-auth-oauthlib-0.4.5.ebuild 864 BLAKE2B 10b7813d88167227979f33417164a7b1dec78cc3f239a4ed5975d5057b2d39b94204d897ccd17eed81ee25656468ba5790dce531533d4099d7337b1e02dc59c5 SHA512 96e06c8be123e55b2dd9a0e26b70ea8edc9ecfb73b8e0550b209d1f46e819b06b4df4327ddd6a4b3d3f59441547bf88ce19cb5fcf6dfeb2b455df8c2f625c902
 MISC metadata.xml 409 BLAKE2B 4b38459e52530c4fd9b3a6c3bd632a8844401d09be81207ae05a01ca1c7c8982493ea16b62a1377c0368001a5c9e08fb1ef8a34a7b29e6b4c09c9b206f7ab73d SHA512 62191a46281e5e7f0f361c9b7705b8d84b9ac215508092b3b23dc92fadb31f7cc71c0ddd76fc6ba366e86cf4a1644d14c91de32f89060beaa8a0f7988ea5d83d
diff --git a/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.5.ebuild b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.5.ebuild
new file mode 100644
index 000000000000..93b3e546254e
--- /dev/null
+++ b/dev-python/google-auth-oauthlib/google-auth-oauthlib-0.4.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+MY_P=google-auth-library-python-oauthlib-${PV}
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://pypi.org/project/google-auth-oauthlib/
+	https://github.com/googleapis/google-auth-library-python-oauthlib"
+SRC_URI="
+	https://github.com/googleapis/google-auth-library-python-oauthlib/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/click-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-oauthlib-0.7.0[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+DOCS=( LICENSE README.rst )
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index 142a593211da..62c5e9d8ecde 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,5 @@
 DIST httpx-0.18.1.tar.gz 1663996 BLAKE2B dcbfcb4a452b47b643d5114a535005f7f92170392202dedc6c152546430231d20fd8b94b7ecc1d2abacbc9d76acb14cbfdc268109b171cc40812504e696dcaab SHA512 954b020d117dd1064262f3ac2d3137d01bba344b1a061e5713c3889283334d9ca92d9ed3d23f6ce79d684e31bae2d83fca6993178ef55e5a91353b812ad489e3
 DIST httpx-0.18.2.tar.gz 1666756 BLAKE2B 3d1e25d503ae5306150c157bc83afdac9a475110d042e041b58de448a0dcfd75de3f4c15836b838dc799cd5f8b7e0d646e43bbe107ffad87d51ff016afe585cd SHA512 727974e5d5924fdd653987dd4f528d27bb2653085b01ef5efcdac39dc92ef2ed586f872c202349aa31105ad970cff914de4315c2d79338a6aa18bebb8126f392
 EBUILD httpx-0.18.1.ebuild 1355 BLAKE2B 94a851f649d0dc4f8455fd08544f1a22f3f960df4d880368d63ae0ecb59384df465930c71b7078b7493d0e7dada421230dfb4303b6bc577330076e72418520ae SHA512 903129f1d0120d980981e60a0a185ceded491d6e00cfb457b02a069ef709c513a5c764817a1450ce3406c2f3fd0ef93960eaff1b8e412bcc56f3f2e9f309d036
-EBUILD httpx-0.18.2.ebuild 1594 BLAKE2B 1e93a56d73d4c11feb0e0ea9d3c17df7796749dcac00c1880b83cd963677b3de7be2abd5cd0cfad272733c8f81508a2cf47689d630d81860c50880aace7a6393 SHA512 6fe94fd6e63d6bf2168eca01eca9aabb2fe0e7d470ceddb0440e0ed8a652f0bb2a91bfd47b4904587707a24b292ab2ba01ddfe56c7071ac3dc63a99f9398ab9e
+EBUILD httpx-0.18.2.ebuild 1593 BLAKE2B 674286b88f5d85114101b08a735a7e5a8c6a6f82b4c98c7ddf6dfa67632b6849573fcdd22e5e785b30b76d826297bbb05c0815d96937f8576eb94d2116acbaa1 SHA512 44960d18587f5444ce07650a233d388c5fe8dba07b49d941bd09f742ff18f0ee398887129efb607685dbfffe983f835f688101612808a7749ef31884fa4d6644
 MISC metadata.xml 444 BLAKE2B 62369fdf937f8caf46980620f2da0b16512ef94cbea9fecf0c336029a709e0975332d0d4e53ff4f3eeddeb9d231a5003dff9bbdf999846152bf578772b47d9a9 SHA512 bbbc7e622f0aae3b63e19765626ee13adf027d5ed98ca97fe04592b1f0a8da0cd0302b31f9cda90eaacf2bf5dad9c6472ddd795db75f0992ba4f084e4135ea3d
diff --git a/dev-python/httpx/httpx-0.18.2.ebuild b/dev-python/httpx/httpx-0.18.2.ebuild
index 32a16e124e37..dc1258768a98 100644
--- a/dev-python/httpx/httpx-0.18.2.ebuild
+++ b/dev-python/httpx/httpx-0.18.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 3bd7b74e3445..1e4f602ffe13 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,9 @@
 DIST importlib_metadata-4.5.0.tar.gz 39595 BLAKE2B 22ef03a47637f523b583cb8c442f7351e0b94633772978fea47dab9be583f35daa32691997b4110b832709658568b6eb79a006f109b969c6f25a638dcfcd4702 SHA512 62b9cefa502d751d36b5f43606ea86c46574fea159941b68319e5dd9aa53d6d990e630c36d72830c54eb2bba2f2be53201be2482974f833cc1da8869eb2a8dc2
 DIST importlib_metadata-4.6.1.tar.gz 39801 BLAKE2B 89a792eee17f31a86c27820a0b3972cd8f6a06314763930ccdf0cfce31435f8074e6f8f27050d1618713ee6d517f0cd8dfba6a86b1e8917af2769ae22ac40cf5 SHA512 2a0bcef3d49de00a1013eac48f1ce020cb89ab895f5e4a1673b46a1ad8f84515148eff33608847331de8ee05d7e10040e128b2c887065d3ca16d0bd338c761c0
+DIST importlib_metadata-4.6.2.tar.gz 39837 BLAKE2B c41ad332e7d54a8483928347c95bbae020e8fb1833667cd1864ee372d815a2b2e310ade7ff4d6df41c0e0bb9203e4714b4139e87f26ce81bc2c7810580425552 SHA512 01e0398e02bd04293c4135dac8eae9412bed119773d830895d34383afb9a7f883291a6b9943d654cfba4abe9a56f3e0d3625f1e6e83fbf85d6ee6c6613b2bd9e
+DIST importlib_metadata-4.6.3.tar.gz 39852 BLAKE2B a6ab735a8471cddbdd1cefcbbabb29664a8dc96c4163a361422066081f00ffb627612a4b7522cd636de9cb030d0add61dcbb38d085dc759f810239017bb5f681 SHA512 b34b3384bfa1043a1b366505c43fb8a8f0a3a055637cd745009095026dc8a1424c1065fbff5a9170523a3b9b0a48951b615dc64b7bf096bbc2c40261fa200e60
 EBUILD importlib_metadata-4.5.0.ebuild 1262 BLAKE2B 764a8124c532810fb8f76ea3fbc1a2ce68a94f352f4ec27595f99d42a9fdee037eebff73492f047bb68b44c5640877fccd715a19b5ec0e33d543216f144639ad SHA512 bae53e2a534148b86edcfc8feb5da606f298a4b8060a0ce26de93feedf9a9224b8c52f66421171d998504143821cc7fa6fb8e96bfc05ccc1415b50d09c03dd10
 EBUILD importlib_metadata-4.6.1.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
+EBUILD importlib_metadata-4.6.2.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
+EBUILD importlib_metadata-4.6.3.ebuild 1270 BLAKE2B 273dc528fa21051dc99668aa93696c69cb6523aeddb64ab9aec0cd3f509326d0a4cac362dc0396ad72fb761623dd155226aa6cf9f5d12550e4c2bd60f6b1680c SHA512 aadbad54c21abd11bb0c372b6f1478cf9f7e6144414e23bf9338537f07fdb3231dc1359c0ab8a2360f9c8f9d31c912ef29afadf82c893ef3d503126a699c6c58
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.6.2.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.6.2.ebuild
new file mode 100644
index 000000000000..2c120eefe434
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.6.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' pypy3 python3_8)
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.6.3.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.6.3.ebuild
new file mode 100644
index 000000000000..2c120eefe434
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.6.3.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# NB: this package extends beyond built-in importlib stuff in py3.8+
+# new entry_point API not yet included in cpython release
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Read metadata from Python packages"
+HOMEPAGE="https://github.com/python/importlib_metadata"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' pypy3)
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pyfakefs[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/importlib_resources[${PYTHON_USEDEP}]
+		' pypy3 python3_8)
+	)
+"
+
+distutils_enable_sphinx docs dev-python/jaraco-packaging dev-python/rst-linker
+distutils_enable_tests unittest
+
+python_prepare_all() {
+	# Skip a test that requires pep517 which is not in the tree
+	sed -e 's:test_find_local:_&:' -i tests/test_integration.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index 7cce1308bcc1..b752479553ed 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,5 +1,9 @@
 DIST importlib_resources-5.1.4.tar.gz 28783 BLAKE2B e88cbe34dfd9b251fc78f2aba173f3eb657462777cb66454fbc1735575c6cac6a868f5e40206fb8925aa8c7f708d72624693cd772f2335231bc5da4f417d622e SHA512 ede757b0ee4a246a3446a165f4c8e56edf326f90464f01d853b6c04042371ff1edc4e41f388c6ea6973302a183cf1c04ee21335342886747c991ba0b38c7aec3
 DIST importlib_resources-5.2.0.tar.gz 29655 BLAKE2B 570e92750351a72c95653302baee56dadc28a328a8e42af9d3346be9a256c2d43322d75622f78d87b5642ed9503c9b7f1df0b0223414847619efb2ebd5e27f5f SHA512 248de71aec8aae93f14b0c48381e7de4425f1eb0c014a4f4a49859db50e8b0a94c2e1c0a664086c74ac7fe19e526b8e3f4fc82d19d3d722df6625dc0dc708c90
+DIST importlib_resources-5.2.1.tar.gz 29622 BLAKE2B 3ac095355534c1ea35e65d685e36ea715555dbda686e1312851b0ea5ce079053429812da5ba57b00bf02981786037de2c5e91a4bc0eedf03c8463f184180c10b SHA512 e0534c6e0e1cfe8621710e58f43b0ec3e5a6fd9e1eafa58ffa09f9120e05a416b69b45639f3028f7d4d02831429bc5de3cbfa97e141474d268d6c32a5f14c1bd
+DIST importlib_resources-5.2.2.tar.gz 29651 BLAKE2B dde545a3f104c799432d7a2b6dbea6f071b82d0b6e3660384e2e0ab3c36eee8942b9f248a6139c708020c617bf0e0dce7fbbd5e06cb0bd192a0296fac6350b51 SHA512 7af9aceece4dd25ad827310fde100a4b0b5e0aee03dfeba8789db060e4decafc543784046c2e9eee95d8cab61845c50e4bb0543bb20ae7e1e480aaa80c88fa27
 EBUILD importlib_resources-5.1.4.ebuild 830 BLAKE2B 70ae32481116b16bf0abbd7d78571dd465a11f271479231e20d2e63dea8d9736a22e82874b7cb33227bb12287438816b5995528c5b79af6ce2e86db11d6a3014 SHA512 44cb6fb5648ae86d152219043c3bb595fd1410eb93662428dcbe74e4a86b52fa4018a2690bc640e9aa7898494f6c32a6811e64dfbf1a0ff54a995ff6a35833a4
 EBUILD importlib_resources-5.2.0.ebuild 834 BLAKE2B c2e04f2127b99d26a90d8eef22f6f21558f1aea0e340eb08663d17666acc73386fa8ad48af88a3b42d4a2b645342f767dbbfc7e9d1bf3db19bdd280116512e11 SHA512 e1212a34a31d74c9ae5ca56a966dda10508947147830df6dd548510e5b06d77ffb3ec1e1d5b08d355a59e636bad5f752578cb494292755697314786e2a72dc20
+EBUILD importlib_resources-5.2.1.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
+EBUILD importlib_resources-5.2.2.ebuild 823 BLAKE2B cb588b06d1ec26e6820539b5270b94908a56391b3f3a0b90ba08a2fcfc649cac67c464e2d780c41230c2ef0a883b25e064abac8f2684dc397ec36039ffaf5343 SHA512 491a6f4960b9e844bc7bed6ed14d61874f3bed3851a80be06fdd97aecf92f6c72c5c42bdcda4c30ef2f40d9b46827d60ccadd6daafd5eb3f4661a9b30b4ccf0b
 MISC metadata.xml 944 BLAKE2B 7a5aa1dfb947b0115f3e22f9550471b452204daedb386e78374c5dc19b408ec52bf5887d3e645c41be9ebd16f3bd003a2ac1bb3bac539e603d44decd86b92458 SHA512 f17b2ad2e3eedd75db96765537c30d68aa28c60137b12bac3bb47307347431a19ca064a94c8e41e4a3947ab2669605d7183b5b62e55def66631d20ab903e1ea9
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.1.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.1.ebuild
new file mode 100644
index 000000000000..e844671db232
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild
new file mode 100644
index 000000000000..e844671db232
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_8 )
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		>=dev-python/zipp-3.1.0[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 3ebc57b4be9b..7e9ac227c771 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,7 +1,9 @@
 DIST isort-5.8.0.tar.gz 167927 BLAKE2B 59b9ee4e63e231026e25833ef8bc4a782ad7b30622d1f6b61fe177fbf0f8663ca953f68cf168abb407d3cb90fe98e29540ec3a8933a5df2ca7ba3e938ba4282f SHA512 ffeee045b5328fa410673464b2ca22d9cd1ba8dd34eff9a430b93e9ce72033100e32e3373308438bcb82b8eb7deea1f2087091e111b1204e35791958ca6944c4
 DIST isort-5.9.1.gh.tar.gz 727733 BLAKE2B dc207ac24b586eb5c4c2bd546c0f2ab336c901563e3f2c92d917cf81bc94634c23a20dfe787e65c41fd3aec835d3fdc96721ed579c282b4cb0719afa7f50f9a3 SHA512 e48e08835a71271ab01e52e2c44ecef475aa270ab7242aff4f9ce82bcd5bc8354e2d8a717ccf995172102809198f6dfc9786d8c64e33afc9ae9a4e981ac51feb
 DIST isort-5.9.2.gh.tar.gz 728644 BLAKE2B 37fa16884e987569bceabf71d5d51b5dcf3c26a28df22b07eb5adb8f571901f5f2d0b258c09dfe720a0579836e90ffa46b1d087c536532841ff48848dd71f9b0 SHA512 286536ae5e7328085618ba37d8809b6cd46595b269755c20da0e8f5f866b810663909ed557f16d76c3d5e89b85393264aad7b1d7093cbdb33e808118a3fc7d96
+DIST isort-5.9.3.gh.tar.gz 729342 BLAKE2B f40f046c5706ea4fd6daf7dc8eaccaca35e7de3e77bc17fa73681d12c42f7d2a3b19a909384e6b2e2486679a9f9895c2fa944faace4bbc3d0cfd0ec7aff85edd SHA512 96aa9c8bb58c95a41f562d3f0e1cf6e9c0c4158486bca24dfe2293fc86c7c6b74e3e6a84ed755d965b692b1f06d98cdc8ed69080775f8acd9186ac3ae6401570
 EBUILD isort-5.8.0.ebuild 1609 BLAKE2B c248dd41fd9e90985afedf5ef572abfa0fa46775af0162881518aeb1f9b999334063aeab7f2364eabe10108169833e1037bb25e084c61006c3fb866f664d3d3e SHA512 3cce76276c44cf58ad9a6301618fe43f5765df0fb3961634841171ca09764fc4066a1462b2dd46dbab8d54f77ff43cbf893980755a43894ac149175c92e52a40
 EBUILD isort-5.9.1.ebuild 1357 BLAKE2B bd08b427294a1bb15ed5171345b7310ae5570605664733a31c37e8c75922885e910b43432ad254e851934d8e9bb3dc8ffc43108540736c256101d65d4af34904 SHA512 52fc6da287e78bfbc6e952b7a853f753706935b1ba9ddc9cd31724abd8d1146d94d641edafb0c45c2c250217acfb5cc2a487b7f50185f968ff67e8c2751e3e7b
 EBUILD isort-5.9.2.ebuild 1357 BLAKE2B 053b4a6ebbfb850249dc9598f47f11bcc947f61f26a14d234b9d0e3b5b22c53adc9e440ba0eef9974621ed850e1d7d48ac3cbd4b7d9bd201f52414aba26e2e4d SHA512 6bccec33f9b891a2125df3bc6144664581e20da7b5a7353a07c5347b3803d80c7b43ef700fb2608923e47fb37a40f70dbe34ba57605902500e951a42d8191d9e
+EBUILD isort-5.9.3.ebuild 1363 BLAKE2B b5c7ff70356755c517a7870c8a4b195db2d757560a1dd345c209e4b26cea9b2d662a4e7fba5fc7e1d813d90f3cb57df0595f8728697cd6193064d969b0e502e3 SHA512 e0389431685638814eb54c7366d1cd1cfac8ff6764a3e82466dc51271988fd31933c7e69dcd8bd0971021a7e5392f198851a8dc5dc33f386177383954b14f3ed
 MISC metadata.xml 573 BLAKE2B 2c70619aaf4f917f377e17b73d59656d6e0254bb0aa6c4a01159bd46b5e2e24e22b8ca04ab88ad71c9d4979ea3b484f5efec05e6ce3b40093e010108ef2a80d8 SHA512 4c06a138d3d06e1f9dbf570e6c59819de182d8453c46a5dbdabcfed424501aeba89fed659d19a6e329c33c0307790ef5c1b81d2ee5d7475c102c2bd689255259
diff --git a/dev-python/isort/isort-5.9.3.ebuild b/dev-python/isort/isort-5.9.3.ebuild
new file mode 100644
index 000000000000..d0eb4aea1628
--- /dev/null
+++ b/dev-python/isort/isort-5.9.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="A python utility/library to sort imports"
+HOMEPAGE="https://pypi.org/project/isort/"
+SRC_URI="
+	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/black[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/natsort[${PYTHON_USEDEP}]
+		dev-python/pylama[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unbundle toml
+	sed -i -e 's:from ._vendored ::' isort/settings.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Some tests run the "isort" command
+	distutils_install_for_testing
+	# Install necessary plugins
+	local p
+	for p in example*/; do
+		pushd "${p}" >/dev/null || die
+		distutils_install_for_testing
+		popd >/dev/null || die
+	done
+
+	local deselect=(
+		# Excluded from upstream's test script
+		tests/unit/test_deprecated_finders.py
+	)
+	epytest tests/unit ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/jaraco-classes/Manifest b/dev-python/jaraco-classes/Manifest
index 0079bc1d3e92..b3803d9ec39a 100644
--- a/dev-python/jaraco-classes/Manifest
+++ b/dev-python/jaraco-classes/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.classes-3.2.1.tar.gz 12286 BLAKE2B c96162ecda1ca3e546b58ab147ea5b080f03e3570d6d59fe7372aeff290c683b68abad6560d7ebf57662009e4d9d8d9a6c1d768ba86e4bd24568794fdedf0534 SHA512 4c85cfdd1da88de01596867365147be6cadd7e1d230798683236fdfde579747e3309aac95ae4f3ef86c91bb4493f3096c4ecc14e3db764ef308aab41ead88e23
-EBUILD jaraco-classes-3.2.1.ebuild 714 BLAKE2B f77cb00ec23bc2146cfb1a8deca6066017a53b37b7ae4166b2791a552bb9fc798fabca7d45e294be35d760f700c9fb064638cd57a88ebc9eac0574f5c096cb0c SHA512 4e9f0bd28f371dfef0a5304f9feb726fce5102f9c945b9d12081a8e2fd9a351fa20c88f13279f3ac8f17c1ec607c1565ffcdab68ca7b444f25910447f83fec84
+EBUILD jaraco-classes-3.2.1.ebuild 721 BLAKE2B 5021f291aecc9a3c4625ea768384d695fe1ab328d170d23b7bb4801073ca65543a949833530353e47e0cdd354a758a5afb0e9b186f872f56dd520a4c033ea68f SHA512 c6ed6d81a452657491613739f9a8413fc5c7b62842438ab0983d8e2c6c7e998fc5c766f840d8b39c8a359c6ba9bebe68d9c428a269a8350468004938c5c9cddc
 MISC metadata.xml 577 BLAKE2B 5daf4529f9a92c285bd3ae07a6e75f2ea5ebd4466721c65d529b51bf9b32b72d17181e5f89410182138b2e94f6b22eb6f1164744f5871585d38004cf6ee1ee3f SHA512 259deaabde7595f7978dfe12b2b90327263edec17aca918675f14fe87fc8ce041cc337632af1b6cfc55041338087c060d5e88b5b018bf2c1c2c21781f179c601
diff --git a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
index fa2d7774aac8..f0a801338196 100644
--- a/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
+++ b/dev-python/jaraco-classes/jaraco-classes-3.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-envs/Manifest b/dev-python/jaraco-envs/Manifest
index a03fb425550d..bd8c1b0c1963 100644
--- a/dev-python/jaraco-envs/Manifest
+++ b/dev-python/jaraco-envs/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.envs-2.1.1.tar.gz 10190 BLAKE2B 3b191549fe8a5cee1a964559f7ecba8305ac22cc1980191c7fd967a8fb5eac7c81cd8a2752566e2d0e820a9d089422d11fc5529f56d4266cae411ce13e304bb8 SHA512 c71aab9748cfa31c27bb7899117e15d2836851a47a76b638177facc89e894dfa2c4168da2d5b1873b1eeed0d785d23137e56e198f92fb83deb26aab38e342ad2
-EBUILD jaraco-envs-2.1.1.ebuild 811 BLAKE2B 396b64b9fc5059ae31d8e65065f485fbf10e10494670563faf3a650991955cc283b0261ff32db937bd732890526ddf7bfc38c8371687f37e54c09df77dd453e6 SHA512 634519f69729675f1256ef0322beabba5b7f2ce1a214265e45c6d9bba4c25595c6703f61bfa8e1b41aae05dcd6b59328474759170e4cde4a029f66ade98b2a5d
+EBUILD jaraco-envs-2.1.1.ebuild 818 BLAKE2B c36d742ece3586caa9b455ef4daabb5c449ac57063a15b90ba2420c80fc6d703149dcff1b843daf924e9387dfc99bc88e6c456816e65ba1405a72c3b3c93b0ae SHA512 3c6fd907445fd20577a2f4696ba48c3c6802145318450fbce9f250f5787dad4d058e62aaf98e535c189b050bbe1035c0adc240d5bca81a6cbd89c14803c8411f
 MISC metadata.xml 396 BLAKE2B e6dc26e54f94142429135696cc42201a0ccc3331a3e87cb3294bdae386b84a0f804bb91410294dd076badeae53d93b5da2158e8114aefdefbb91bd93ebb14ba6 SHA512 1456e135ae43a738ce79411b5040513a24acfadc4ea040cb93adcde5f61e6eed7c0798f42b32ce473d4bdc6563c755f5f4387f5e3cce350d557cc00a6efa899a
diff --git a/dev-python/jaraco-envs/jaraco-envs-2.1.1.ebuild b/dev-python/jaraco-envs/jaraco-envs-2.1.1.ebuild
index ed0113b1859e..3e93904a5a03 100644
--- a/dev-python/jaraco-envs/jaraco-envs-2.1.1.ebuild
+++ b/dev-python/jaraco-envs/jaraco-envs-2.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 MY_P=${P/-/.}
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/path-py[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-functools/Manifest b/dev-python/jaraco-functools/Manifest
index 0aceec283b5a..0e988d4f949a 100644
--- a/dev-python/jaraco-functools/Manifest
+++ b/dev-python/jaraco-functools/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.functools-3.3.0.tar.gz 17116 BLAKE2B 3e1bf63f72d67e55fdf5cfd8d2e12899b7862ebe6cf426be94154f479cf01a69f01b1af152a574c4fb93766b324b6050748464a17a26a27591396d59ed79cb38 SHA512 fc7c5a11a3411692066f4437d76ace7e8a00af2152256ea9f730254b577e74163342298d5b33d472c744cbad5dd316b56345d05aa93ef6f82bc92d6aadb2f2ec
-EBUILD jaraco-functools-3.3.0.ebuild 861 BLAKE2B c4915d6e00760bae4d4bf2ea51cef7a16aa28809eec055f49bbc8413c49e02de7885d2e09a960b3467496bbfe64ae735694c140445e4bccd2aa6c2069f52cc4e SHA512 813ce976727adbb4ee4ba4ed7739dd4eaa0383bea3dcf7da95a7f3cbf0711e610fef27132291b68d215f2e1203f03fdddc18f97b60a1645eeb0816a575e3bcdc
+EBUILD jaraco-functools-3.3.0.ebuild 868 BLAKE2B 3945c3e9047f5bd53feb5096e7af043b26fb1ba256fc94dd8a6d4866e3bc89c7cb2baeedc4808497c33a4b06084b66bd6a16ed91df84c6cbfc51f095b7362444 SHA512 88af4b971ccbf636519c6bcf6ae75908bfb0031217ff2678cc520886f421d429f50d0eaa9f6db585f001905ae4b30afd38b150ae6890502ba3c5e001bf27bcbc
 MISC metadata.xml 675 BLAKE2B 64f36f8fd58d397d3efe5f8a5026eba903a37a6db1a1b2cc33fc893b3cc5c3b9c191adbe814f508bb1798b0e7e5ea6cfba61257982495eb536aa1d244dd86ed8 SHA512 abc84c4f12b89d334309821d54b4d59b2f1b490e83656bd375ed932835aca4dd9fd3299fd496fd33a34a5ef0991af115211b28ff83179632a13963b68ef9156a
diff --git a/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild b/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild
index 7acead6b7a6d..1b260b53ea78 100644
--- a/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild
+++ b/dev-python/jaraco-functools/jaraco-functools-3.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/more-itertools[${PYTHON_USEDEP}]
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
index 4c3e74b792ab..ec47f62a34e9 100644
--- a/dev-python/jaraco-path/Manifest
+++ b/dev-python/jaraco-path/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.path-3.3.1.tar.gz 13287 BLAKE2B 8a803269fc02cc85391b4b1e1f2ee2a94c039d433b505aeb4aa0fcbb23731b802f236cd2de80dbb8b9e59297312892a085632f41234d3e1bb7d4bd04f62e00ba SHA512 00dac02fdc6df469f8661d552b16a8ee6150d86a7df9459264377a03e96fd94608f9782ad4cc2b2df67c64a10f8af26ed650b0bac0b1e59607d429abdbe64309
-EBUILD jaraco-path-3.3.1.ebuild 970 BLAKE2B 7822158fa5d58bb9bb984aafbcc7ac6c0ee6099f52897c43ba122eef126a73d284e32e155ca888884b496fb7db4ba5bd7dd7007ba63d3ab8f119a1e863bd9570 SHA512 ec48c05476d0624bae844347555607958795d240cf5349e1094f9ef3bccaa72e8a5d99211791d01166dbe457593d11fbbfc332e3141e05647947d34375904e2b
+EBUILD jaraco-path-3.3.1.ebuild 977 BLAKE2B 86601c24d4056dc189154234e91a02442987ec2c27847613619a2ae85ef41e5126285ba6af7dff6ab2d3c395472b2c005390c275423c80c06021f7efde22e42b SHA512 c153d824dd76dee1afbd1ad27102af74be51e3a2727688270dab195c4d126fc9ba9181fa3cc4dfe604f9f08534baa77229bc1c6d005b18c2dbb13d6100f2c886
 MISC metadata.xml 396 BLAKE2B 3ecf8b1f6392c3d14122458f7b5fc3c08e5693570685a6ad0f29da64e9f38e4e93c83b180fe01803471342343b0420769af6a01086cd71cc3031b2efaaf3b54c SHA512 eb3cdebd2a8d524c88b519d8e4bb6020e63da5cf69cb4f81eb7a7867bc6d880c313afcd8aa7dd6bd82b661e1aabc60c6ea0c4319ad2b2589e1825d8e3ea65de3
diff --git a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
index 7223348aa819..b24d6c4b0671 100644
--- a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 62f858fcd395..b69280ded239 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -10,11 +10,11 @@ DIST libvirt-python-7.4.0.tar.gz 217038 BLAKE2B a8cec1ab8652b2579daea23b746d01c5
 DIST libvirt-python-7.4.0.tar.gz.asc 833 BLAKE2B c092743b62ed256267c129d253332322ffd1ee46b054938eb99404db81379cb8c6422e045f1855076f6420ce08e4482ab77db71e2ef6d38bc35136e95858684c SHA512 bca8a981517782e204f51eba465cf101aa0bcbf60e0e26a655c5fa2faaf1585b17988e627bd26b98bef2b95536ae852590773806365cff94860845acf2534d54
 DIST libvirt-python-7.5.0.tar.gz 217284 BLAKE2B 65bae31bc484da061e116c5fe0da68df07ec42160db852c9fb83a5c6f91762d762638fec918ea6164400622178e4cacc416ff343fd2df1bd94a62f1b1a6b93a7 SHA512 ae111e4b7db5662af5315642232e2308ebc349bf80a3f9fd372b0fa0ebcde8e25690368187c86d425faef397550caad3366e7b6a3e6a0c4b56fa58df5e8bc276
 DIST libvirt-python-7.5.0.tar.gz.asc 833 BLAKE2B a6963fe069985a3c4f24007f45dc04b26517dff38ff5f14b00816a65651d83ca5e68cc6e168a318240152da5e20d75176ece9108e50f1e1d3d074dc5d4942f5e SHA512 029ada81b25445df8107651b11299a9ad259c6f990ad5d1aad617e65af49493fe824989fd9ade2703c927c59f1a15ea50c4af2d90ddf3da41aabeccdd399730f
-EBUILD libvirt-python-7.0.0.ebuild 1191 BLAKE2B c1030acd572cf307d85b13e1bf5ed2bfaa165da32ce231d2d74254359eae67d80733349677a63532ea2e282303cbd9e9954f13a2d401a8db04cf289acd770d61 SHA512 7a60511c786ff65894121a094e905f76d018fe8163d3ea526bf788fc8beea81adc067658d82edf469615989b52e0216a469d7826855c481efd2b4ffb60c43496
-EBUILD libvirt-python-7.1.0.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
-EBUILD libvirt-python-7.2.0.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
-EBUILD libvirt-python-7.3.0.ebuild 1193 BLAKE2B 559037c19b568e34e157606b2264b933ae7a9e454b1717aa173799904ed56150c747b085ec4bd148cfcc496bbe0ceccc68ffa1f865a719026352237b1fe35ffb SHA512 d7e6b0457402a4e831e2f4286648c4cee086f7f66925d25ad4bbd4ee050123a3d953879edd094ce429fb97b1853e783e62c0be582a2e6664d8820912b9d44d6c
-EBUILD libvirt-python-7.4.0.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
-EBUILD libvirt-python-7.5.0.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
-EBUILD libvirt-python-9999.ebuild 1195 BLAKE2B b85532af007a7d3bb7b86d14686a15545c626d717129f266ba1a0ba430e606bd3020b0637a23d9ee631a87e127db6915736b4b8caf47cecc878925c03acce67b SHA512 542154cf8a0e6a927bf78acd3c397930758a627344982aa454b7fdcfbe8e58bb4904a88b9e986d6f6e93ef2bf52f9f7e87eb1c06fb2b52434f2d4f89d4065b42
+EBUILD libvirt-python-7.0.0.ebuild 1199 BLAKE2B 90e6b26a3a82df9a254faf850171fe9a6c8d308b4e998fba2ed9b82f7c24225efed10d7384e303dfa2e0ad94840cfff66747726980f4fbb2949edfb34833a96b SHA512 40c1542f86cf96bd93d2b3942c9b120b3631abc8ffa97aad5126dfac3a8e5c36c868cae683e1a1e52b6db2d332cda5ef2ab6bbbb0b98709a25132a6288bf775a
+EBUILD libvirt-python-7.1.0.ebuild 1201 BLAKE2B 9607203cb4853e529b4c18f34e7dab261982ed563c54db8c1cd4d084cf5c8f3508580b3dce5a7e6657ae5c8ac9578204e0ce3bfa35f070c9348c4a6eb7b92ad2 SHA512 0a0d6be15d8d0b27ba4eb028c69440f25221d3f1c2572b8f7719c20be60d3eb09f5f944bc28c0accece01b31affa14d7ba102a862e043becf3ab01760da1b40c
+EBUILD libvirt-python-7.2.0.ebuild 1201 BLAKE2B 9607203cb4853e529b4c18f34e7dab261982ed563c54db8c1cd4d084cf5c8f3508580b3dce5a7e6657ae5c8ac9578204e0ce3bfa35f070c9348c4a6eb7b92ad2 SHA512 0a0d6be15d8d0b27ba4eb028c69440f25221d3f1c2572b8f7719c20be60d3eb09f5f944bc28c0accece01b31affa14d7ba102a862e043becf3ab01760da1b40c
+EBUILD libvirt-python-7.3.0.ebuild 1201 BLAKE2B fcf10a3aa000bf307cd5cab33e9e71621488bb7d543ed07a3ccc272258fcd954f860a5130ba7c90b1b0712360b9500fb40936f69294de51e8286cd7b2a685a76 SHA512 344e96d551cef54f0715d5d24edc20644a5f368a22f056790230f7308221a7f275e29be99c9ef9063a49c0ed2f8b298139214a4ec898df99232d342e6a239d8a
+EBUILD libvirt-python-7.4.0.ebuild 1203 BLAKE2B 610e72a4d79c6babd1ebc17ba78e6acb59b91373c589ac34584afb4cc4d38871f56f864f201596a875c6e763adee8696a5321ca4392c653f3a5e9619c9699883 SHA512 cfc23cc7c939d2fb8b566cbbf0d06fdeda87a1f767a501299bf93095212a3dd072186336e7509e6b7e5666c6b4a614a432b13ee251983b1a7141c10cd91031a1
+EBUILD libvirt-python-7.5.0.ebuild 1203 BLAKE2B 610e72a4d79c6babd1ebc17ba78e6acb59b91373c589ac34584afb4cc4d38871f56f864f201596a875c6e763adee8696a5321ca4392c653f3a5e9619c9699883 SHA512 cfc23cc7c939d2fb8b566cbbf0d06fdeda87a1f767a501299bf93095212a3dd072186336e7509e6b7e5666c6b4a614a432b13ee251983b1a7141c10cd91031a1
+EBUILD libvirt-python-9999.ebuild 1203 BLAKE2B 610e72a4d79c6babd1ebc17ba78e6acb59b91373c589ac34584afb4cc4d38871f56f864f201596a875c6e763adee8696a5321ca4392c653f3a5e9619c9699883 SHA512 cfc23cc7c939d2fb8b566cbbf0d06fdeda87a1f767a501299bf93095212a3dd072186336e7509e6b7e5666c6b4a614a432b13ee251983b1a7141c10cd91031a1
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
index 7111641af837..91125795db71 100644
--- a/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.0.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
index eb8b2abcbc09..eccf3f9c9cc7 100644
--- a/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.1.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
index eb8b2abcbc09..eccf3f9c9cc7 100644
--- a/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.2.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
index 6bd5a5eb5cb9..9342f7c04eed 100644
--- a/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild
index f4d733c9c871..16ff1e5b125e 100644
--- a/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.4.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
index f4d733c9c871..16ff1e5b125e 100644
--- a/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-7.5.0.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index f4d733c9c871..16ff1e5b125e 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -27,7 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 2fea0b59ad65..ddea8a0c5fa5 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -7,4 +7,5 @@ EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946
 EBUILD lit-12.0.0.ebuild 875 BLAKE2B c7eb151f6ea8accdfee67f26f9b65c41a65d61019295681572055c1771556a365f234bea7058491d2e739313b0d77063c3e9028a8f895fe5987604f0f45ab516 SHA512 772d7644cb8d84f53a5275992f2096dc3bb7ea298056da296572deb53cd3bda52c6f523d9484c48e07067dd79f6cd0ab752116b504f60ffc963431b02a4c7d98
 EBUILD lit-12.0.1.ebuild 879 BLAKE2B e1ae6897065f200b1fdbaf5534505138068fde33376ca9414b0929e4dfb0a659b2bcf32e51441dac01752f0036ed8c8276f270ae08274bed9a9e0fa477193342 SHA512 1f0e3b356004ce9b0bf151b6c01e0724e4100cf5c905aa8ba463388dbb308ccda8316190292dfd9db4d601cd144decd7b06154565716d4fba66f6f6a540e0e23
 EBUILD lit-13.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
+EBUILD lit-14.0.0.9999.ebuild 837 BLAKE2B 95d45d796f67305e0794e105fc7d8a77328c9f3c87ca8ad1724683281cae3f811536cc9df4210ec4e4287d2ff3fa707719e450fcdf9fc760e568a1f3e025048e SHA512 8ff08b3781ce341131d81131fb735030ae00d35f156fe8711da23ae98ae2b34cc8bc7af807406dcc76feec0c9cefb50a8a8b9c7eb452fd48343f74fb6d02ca34
 MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-14.0.0.9999.ebuild b/dev-python/lit/lit-14.0.0.9999.ebuild
new file mode 100644
index 000000000000..37168fbde9bd
--- /dev/null
+++ b/dev-python/lit/lit-14.0.0.9999.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 llvm.org
+
+DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
+HOMEPAGE="https://llvm.org/"
+
+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 )"
+
+LLVM_COMPONENTS=( llvm/utils/lit )
+llvm.org_set_globals
+
+# 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/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 23e4d9511b9c..5b8f1bdf6b49 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs-material-7.1.1.tar.gz 6080208 BLAKE2B a67742ce923dc7bbefbb5638156f5a2f703bd54af96e59b1c580264ae3096d0a823df6cd88151f2c446a97b578bc4a620d694323f5a81cc33836181dad203214 SHA512 ab6b9b4b08268c15b42cf9d5d26ea0bc91151efb1b478602b495f603335792fcd1f9058ecc52767cb861969ab1db7aff2681653db35cb739173b56f7f32f9c65
 DIST mkdocs-material-7.1.9.tar.gz 6492415 BLAKE2B 67a86251289126320088dde4611ea1c1e75543e7edcb2f737dfcf21844f53a3457544716cded44f0954c2658cb107e5cae589efa2c71ee07151a39ed0f28401f SHA512 1a4296ff692842e61406b24ac50b1c02550a2581040611c263aa744c98031a54c6f380e6f655aa477f98d7507d2e8649434fc981928e9d27f09df71cccd22ecd
+DIST mkdocs-material-7.2.1.tar.gz 6773988 BLAKE2B 8b57a58b11ecdf9fb9668a766d10869040c8f6e2d2045cae01e4e32243503540ef955c81bdf0b2066886a309c46e724586a912631ffb78a6383ee1736f1b13d1 SHA512 9ce1cd733205ab87e865c8b90e9b78b133b5172acc042f8ee954073885c8380d06607ead2fc80352311502638c02439798515acfe8521c06b9fee707173e7d63
 EBUILD mkdocs-material-7.1.1.ebuild 816 BLAKE2B 6e872ef6c7186551647d37f7a80142f591b393fcea6cb132040809478f92aa1abbada00f92530b12e23cd7712944ac8b0a82db414d0a39c1be1cf28f4189ae5d SHA512 871fc55ae207e78a3c9ef1f50b887ced596d2ba7cd4a4606549f9877f1d4f660857d3f62aeb23d4eabc4d75f7a79406cf78c45d80b645cd145baf45efbd8eb5a
 EBUILD mkdocs-material-7.1.9.ebuild 817 BLAKE2B 7700357d46cf7298e980eaebd60a96823a0c6e31800fd35c260cc00ac4f73757fe7f13adc1003476e4ff4076cc00f59934fd8a11bff95d10cce32d2c75beeafa SHA512 e32d3869be7418b2453432021fd67930c58c6886fff89b805438d71b4b4567a7c3091e96a0201dbad4da7522525d07634eb7f1ceb6fb66e52ca82d62b3b93184
+EBUILD mkdocs-material-7.2.1.ebuild 817 BLAKE2B 924aa54ed7c0c1ecc16497b25b07c7bccffd7dbca5369595d981ace8d2db7e2f118948af863309d69e2a4ff522be107ce7ccc1ebda5e6839c69fb27bee9c72ea SHA512 65a70738804a58fd256516ecbd22ca10f51fe6831a17234e813ebf30da8d34f2e2335f804d2b326bf458743075416e1678784ad8a5cddab8393e5fc2cf7696c0
 MISC metadata.xml 1036 BLAKE2B d9f342d8f3da5a5b1ce9ee0e68938b0c8f7235ff84e39c59d9da18cec1b4553193aaa7eff85157c92fd014e971f2ac947bd252caad791605b0867cf2d7622ce4 SHA512 31db1dbe3433dbbcb6036ece9803d22913980644f014f8e8db80bb00899e0b98602016a08e887f7fdd5d99627d411ea8cb18fbb091faae0a03f8804e3497b52f
diff --git a/dev-python/mkdocs-material/mkdocs-material-7.2.1.ebuild b/dev-python/mkdocs-material/mkdocs-material-7.2.1.ebuild
new file mode 100644
index 000000000000..2190898a4626
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-7.2.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material
+	https://pypi.org/project/mkdocs-material
+"
+SRC_URI="https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.4[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-7.0[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-material-extensions-1.0[${PYTHON_USEDEP}]
+"
diff --git a/dev-python/munch/Manifest b/dev-python/munch/Manifest
index 93949e9e075b..3cfdede1a952 100644
--- a/dev-python/munch/Manifest
+++ b/dev-python/munch/Manifest
@@ -1,4 +1,4 @@
 AUX munch-2.5.0-revert-pbr.patch 1301 BLAKE2B ab22d6d9e73444d5e5240a5bd64662acce9816363f824d1e5361bdb08a762812c0c9286b4c4210f17c67f3ae1c7cdbe56343d3206c47c31c96756d4c139dd26e SHA512 d7e896112db30357a279433b6d6a334ec0495fb1a4d40cedefd3e0e1eabdbfaff09d484472a72d88eb2bbab72142261e9e6f1ad134cede92fdb4f68feb7eb27c
 DIST munch-2.5.0.tar.gz 17015 BLAKE2B 17af271ae082a6e5f91781ba48a440f11cbe85ecb81d47ee2bc51910307080e3ba6c95e99e7475534400b2915a86d8f853bc65d419c3d3b7138bf021e66de25c SHA512 7eca31111f40782a19b49535322bc56d723022d52b0842c4beff512f32fa415a6c75851eb84950358cb6a11693095cafe56364028e48385b11135de414edca21
-EBUILD munch-2.5.0-r1.ebuild 738 BLAKE2B 6122fc202a3b1040615846093677a232127358f622e13a1bef2f52f060f3c5ad85e6b222a394519b19305e9f717a0dca452ff70c648b81712661fcc79afe8bfd SHA512 f0665681004b12f72787fd7d2e87b8e2a86a9b36ccb1d36f4b1774b332ff98223939633a8ae727ca4e8f14a9b4083bf31013eba6b711813297d69323131938a9
+EBUILD munch-2.5.0-r1.ebuild 745 BLAKE2B e60294ecd0262bae203e5af8506bed3f0a7c7d32690ebab1cddd44aeef5bc492d464cd9827d69a16d7b73d1ed111ad0364babdc743f8a847cc452364f9195d7b SHA512 c7a9052380c9afc50410f021f8bda3754ee091ed975c571a95a68c7db77d5dbaa50a0614e6a290f54cfe9422e6208e21d01fea83f83f2e6a2ecfba7016045b3d
 MISC metadata.xml 400 BLAKE2B de9c3fed4f655c60785a7552b740d801b4a435114e2c5716158280288814b241ef5e7b59ee468a7a16d9aa6bc177c958561459e8ac57fb88c566553c79e25fa9 SHA512 e5f2ae1e485e5a1cbf1b4e7ab94f0c46042345751332f0c5d714b571299621447862ad5402ec7b3b770d1f528fbc5a07fd35e7e9466e8f3a1ba7e3245d09f9d3
diff --git a/dev-python/munch/munch-2.5.0-r1.ebuild b/dev-python/munch/munch-2.5.0-r1.ebuild
index 2631cbbc637a..3d587eeae6e5 100644
--- a/dev-python/munch/munch-2.5.0-r1.ebuild
+++ b/dev-python/munch/munch-2.5.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -11,7 +11,7 @@ HOMEPAGE="https://github.com/Infinidat/munch"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/namespace-paste/Manifest b/dev-python/namespace-paste/Manifest
index d0cc54bb5b67..b0051a7b6e4b 100644
--- a/dev-python/namespace-paste/Manifest
+++ b/dev-python/namespace-paste/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-paste-1-r1.ebuild 821 BLAKE2B 1ac0bb153d9f6b63f2125d225bcbc51de498a330cbbea7cd00cd64a4725b0a3df7a74404909ae0b3fb6a65500ba0f6d9da47769d795477418e88fe4bfc73917b SHA512 69127cd0ba43221b7d12ed499a1811e2bb0fd54022fed8623393a82e1f47a1d49d57f61b72f80aef4936faf9a63b373093309bf210ea704ad73b0a1cbd190ae5
+EBUILD namespace-paste-1-r1.ebuild 828 BLAKE2B 3e8c99433ce125ef9d1dc76ba599e50a49d3edc40e2300dbfb1312c5a8f1b69fe06228673a892d2f434d6ea357f0e2c3604b74c8268e3c502f26349926f59698 SHA512 a900d06339e45767a9cebe82f152750b664b1af546688f172def152f0bdb14c9f366f6b4bf10a4c2a8f97f77a8c3034e2d4cdb77d8dbc676100e355c9d4776f5
 MISC metadata.xml 242 BLAKE2B 17fd7db1343fb7dba1842d5b62d83e56e2816962b0122ec6eee7f9e163f333d69ede2cbdf2a2ba8c77613367fca3d2cee779697fb25b5d8cf0439e1e845dbf1f SHA512 2ce768d5aae91f32da90c62900f556c647eb9806c810a817b6c45c5356e71f504b5a646bf75f553c3a9bfd3f94c4317df4948bae863ef7525b4a013b63618cd8
diff --git a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
index e149c6442c23..8cd006f2de4a 100644
--- a/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
+++ b/dev-python/namespace-paste/namespace-paste-1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for paste"
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index a684b419d5d5..8b4c2550f349 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,3 @@
 DIST numexpr-2.7.3.tar.gz 114113 BLAKE2B 95dca4fbd3148bbf198f82827a63fac3e9de29f677457f2ad45040e24a38bb05e4e09738efa0cac793970e18bdcd252e2744da96062217fd35b4054b10112989 SHA512 8234a65ce96ea0a2f20cce7dce3de652362a9edc86af2e7a333cdd8ecd87866f75970859ff39b04d529acc062b806cc8c64f262c318edd2897200d7e54b429e7
-EBUILD numexpr-2.7.3.ebuild 1222 BLAKE2B 58f76b44daf9078b0423700621ca00dbb71541b146d9b49ef8026ab953517b0f54c8489317ff601d3f4df062f420d7d65bbda3f543a3abfa4f4d691e8470ac83 SHA512 86cb336d75545cc5ce02f30fe2709e8920c899a35e635192634f61d1e45d252a593264b806db3c9a799ffc41436efbc3238b779f9871a649846ffe0fe9674dea
+EBUILD numexpr-2.7.3.ebuild 1229 BLAKE2B c303852d9c98b2e7cd2e214c81522af0430b333e9878ad94d3f992c258759df58c63ba833a32283d9cfc5da04eb73b49308404498cd7cec861b4129c372bc0c8 SHA512 e315be3550dd96e1bd6efcbe19ecfb4be365d549b6b8034f768ee8b66d87d6794172d03b8cfcb4f717d578f2c45af62421492cef174784aca6a9cc13b1edbfbe
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.3.ebuild b/dev-python/numexpr/numexpr-2.7.3.ebuild
index 75e1887417af..7efd00d6985d 100644
--- a/dev-python/numexpr/numexpr-2.7.3.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index f111be60a1a2..5ba135f13c6b 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -22,5 +22,5 @@ DIST numpy-user-1.21.1.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b175800
 EBUILD numpy-1.20.2-r1.ebuild 3789 BLAKE2B 04b13cd33ea2805716faf5c2d286e3f0928eeda592c0c6217501a1adbea30e614d940732041cb4236a89966db1cebae33b437ab55a309ff6be62e81bb6be5010 SHA512 9a2bb8e998e317e540b7a0fa70979a872db8b0a99cc1e6f72d1fa0ab1c11f26551be22eff1a84b2c25e9d39934246b955ea54fc72c25b2d89badc430bf048f38
 EBUILD numpy-1.20.3-r1.ebuild 3724 BLAKE2B 3d3c2ade82decb593116388cbd00e6c688e0b308b2a4bccb122fa716e7e8826f83f0d9f2fb6edeb43578325007b97c228899be055c5ae90b2740bc5a5dcfc7c4 SHA512 496058416f50bcc39632458bac10017071df0231bb564be2b496c65f693f0bb12c6a01a50df72f70a7f98f872f8258c8030db766fbde2f89a5c8327b1a786dca
 EBUILD numpy-1.21.0.ebuild 3567 BLAKE2B 8bfccf3046fa52a171d97bfe22385688d37a383a772310833fd59ead145d8ef7e1c45567ab664f3462e99595bac7411faddba01863143d553db30017f88f1225 SHA512 77e8d721c372f06aaab330c69d21eaf699cd0b04f91a1466878f9e2e89169a14979f7ec834c906ca0905ce909215f74c0b9c77f0e08b39dbbe34d07f275a83e9
-EBUILD numpy-1.21.1.ebuild 3684 BLAKE2B bec6b2a8cab14cd5348563c635f20918b43fd26e079b10e5bb42bcf0e360b1600111793f64695c0317b06d2bda5efc2a6fa131782b1cd65819598d995551bddf SHA512 06adc056c295c6113f7d69a1cd31330c7dae9460e59e7e7f53dd153392940d6549f5dc3d173a539cee26ae9c7738cde34a9d9e5e96e62992fa4550cf6604fe8a
+EBUILD numpy-1.21.1.ebuild 3682 BLAKE2B 753c9e53177bae352f3aec669b07c6367a86b89c0c97e46b43ce3ddaa322f01ad141b5303c98567d8397259c6fbbd78ea953bdbd7e32b66fa2cde2430003e3e1 SHA512 9309099f1e9869cdaf8a3ebf6682075abd6d41decf123fc25e342202e8250dd55a310d220b0f48b8d71da6e8353ca21e36f996c593a9d44731ef6141e436d5fc
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/numpy-1.21.1.ebuild b/dev-python/numpy/numpy-1.21.1.ebuild
index 32f6ce2b232c..3353915bf361 100644
--- a/dev-python/numpy/numpy-1.21.1.ebuild
+++ b/dev-python/numpy/numpy-1.21.1.ebuild
@@ -22,7 +22,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 ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc lapack"
 
 RDEPEND="
diff --git a/dev-python/opt-einsum/Manifest b/dev-python/opt-einsum/Manifest
index 7ede9ca62c78..238f2417296a 100644
--- a/dev-python/opt-einsum/Manifest
+++ b/dev-python/opt-einsum/Manifest
@@ -1,3 +1,3 @@
 DIST opt_einsum-3.3.0.tar.gz 73951 BLAKE2B c8e39c9589bb6b89150fd5699fafd77c5ac6022f66d1b778a55dd61e606067be4b6df85972dd4078df084e34a39463f5e59d69426b0ed9152e93f93798417eea SHA512 f34c58bd3aa4a15794cfc604167c0e3175b9826da2a2449bb48ea5c3095f8215e3f990daec51e77e505a03204201694df1a09360ee51b8a4a793b9844d9c2d5e
-EBUILD opt-einsum-3.3.0.ebuild 463 BLAKE2B afa86b8b7b6dedac3a885e5eda7edd6505c8494f1e5bbad702a7940ee6dd46ceed9ce4451d5d1db52df19fbcdf887a99124e234c845d78790401dcda779a3026 SHA512 30ff016f7459a69b3127852f20a6378a5a4ec8df9a5fee50820c32f5950beef66aa72872d17cc4f54238c5fe7ee5993051ab48aefadf838bdebab6bd1fe2217f
+EBUILD opt-einsum-3.3.0.ebuild 465 BLAKE2B 16d3c745892adb8eb7da21d41d44fc54ddd090bc318e6060b767efd6909d43aecf9e472f48d821d42fbd3b58dc119178d9046405eda84e20a4fe7862c04423e4 SHA512 68a19c5000287d7bf522a2f380572151bff3a40855c370c7392ab9200a1a146094d167c81323e7415ee72e92485a0324434e219a59f33e3d09c7381ed38b9118
 MISC metadata.xml 470 BLAKE2B 7dd0dfa92800286393d304a888994092cd7b3b673f84f2a542edd166e02c65f91f3248248f05f6cb5b4ac0bc34b557c55db50d4c1fbfdd1483c49b7b1c5db011 SHA512 090fd5fd8157e7118c60700974c6fc94736a23d529572de49ee57679d2dfe5091358e940e5ed34846d5bc6dd236363ec07800d7d12813342c388ce726cda7d58
diff --git a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
index 284c0cea3774..cbe9bf30b1bc 100644
--- a/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
+++ b/dev-python/opt-einsum/opt-einsum-3.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Optimized Einsum: A tensor contraction order optimizer"
diff --git a/dev-python/osrf_pycommon/Manifest b/dev-python/osrf_pycommon/Manifest
index 2bf280cfffb2..9e8dab3f5b5d 100644
--- a/dev-python/osrf_pycommon/Manifest
+++ b/dev-python/osrf_pycommon/Manifest
@@ -1,6 +1,8 @@
 AUX str.patch 1041 BLAKE2B 35abd358988af1cf45975094758d56648d56cdc302dc507a3e5077e90142d31076d89592a06d1d9eae1dcfdfbc434efbb176990af955c06ce414603cdf7efa62 SHA512 94a8f4d42c3929ca7aa077142c4e5ec91ef2848b6f402b0a9a7beedd96865178ccf431aa8a68cf332927e783e56fdcdf4b8321679c0bdcea4e76564dc7f72d7b
 DIST osrf_pycommon-0.1.10.tar.gz 46303 BLAKE2B 3f18b8683a6363e1f15addfe75b8dee31f64fff7c286379d18355dc1f3467063c2cf1a9eb7978c5f9de5d64cb23d18a3922a416fe24fafa618f50f0ba89cddfe SHA512 5d53ea0c3c410a99964330dc22dcbcb3cd8892a359fee2061acc15ddb46e334ff757e8aa5b776fef381246c58e9834003ac818624da4b8e95552f214f3d9e6bb
 DIST osrf_pycommon-0.2.1.tar.gz 46633 BLAKE2B ba89f8d783446d52a328d126bcdfac721dba0a811007a55e48ebd3626e58b732d4f03cc2a042d517698d6708bc72e0ffede99ba82604d1f4204ef3c1da36601a SHA512 d05e6bcbb8e7b5506ea953d37c895dbca59765e9a26081aff2c4d213c02365a4254580843dd7624fe4a046afdb2d5b8935c1fcd4d60b6b1d71c4d22789d26371
+DIST osrf_pycommon-1.0.0.tar.gz 45084 BLAKE2B 83bfd5393575a5032e72ae93c9c3eec87d2907ce3fbd3e9fe14a94e5470d61594ab75bca394ec4b7960bbdb16c3ec060966bd6bf47f9a4037d530501c7ce947f SHA512 ff7204116c94eef972b7071f8d6c68fd7cdb1a518fd6c77cd47f54e5390815ff4b6a7d265ef3ed0093c1baa20eb332d69e92926e856da0e34b7186100b688d83
 EBUILD osrf_pycommon-0.1.10-r1.ebuild 707 BLAKE2B 97b2fd2436b770dbc707b49e7fd1912d0144a9924c69ae5e97d8cf240bba8bcae3efc6692746200185edaa069a435c3af35bba898ccee46f955c68f387dbd57d SHA512 567c9814646ea221b6792ee4887bb6f3339dafed17984542c7c16bbf2e2575ffefe4cc7a285857a55721a133e252e8a11b3083c829c7c9279fa61fbd78fb70a8
 EBUILD osrf_pycommon-0.2.1.ebuild 730 BLAKE2B aa06c126d0c6371aae091c8f8c8650be796714b6e1b1f8a9d758924787467e0b838e1e47b848f5eae8f151d422a92edff80f12ab1ffe39ef9fbdfb083801fad6 SHA512 691ce22cf7a777a07369890de6a255ff57eb66938ce422be5917b482defdafd0d7945d5e0e3b951f1c4c1227278d0af9fc8cfb6fcf1f50950b91d1e88af63a8d
+EBUILD osrf_pycommon-1.0.0.ebuild 730 BLAKE2B aa06c126d0c6371aae091c8f8c8650be796714b6e1b1f8a9d758924787467e0b838e1e47b848f5eae8f151d422a92edff80f12ab1ffe39ef9fbdfb083801fad6 SHA512 691ce22cf7a777a07369890de6a255ff57eb66938ce422be5917b482defdafd0d7945d5e0e3b951f1c4c1227278d0af9fc8cfb6fcf1f50950b91d1e88af63a8d
 MISC metadata.xml 484 BLAKE2B 27b6c586f3d70f474606704d9bfcbd85b0e1bffa67401763948e4cd2b4b4712daf44eeeac8942b3f9705a00a0ec7b43a5674b36a8ebbe32823a626e2f145b199 SHA512 153575d6dba847d766ec346e71b57acd4f7b6355f6207ec71dcd7047736848d9d10ff6b3e2f23f935bf092cca72033aa5e0f428ac6c21a347477df88f12c66f0
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-1.0.0.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-1.0.0.ebuild
new file mode 100644
index 000000000000..76c71e1f7c8c
--- /dev/null
+++ b/dev-python/osrf_pycommon/osrf_pycommon-1.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Commonly needed Python modules used by Python software developed at OSRF"
+HOMEPAGE="https://github.com/osrf/osrf_pycommon"
+SRC_URI="https://github.com/osrf/osrf_pycommon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# linting is something upstreams do
+	# for us, it either means unneeded deps or breakage due to changes
+	epytest --ignore tests/test_code_format.py
+}
diff --git a/dev-python/paste/Manifest b/dev-python/paste/Manifest
index 6db706c41105..f5fdc90124ea 100644
--- a/dev-python/paste/Manifest
+++ b/dev-python/paste/Manifest
@@ -1,3 +1,3 @@
 DIST Paste-3.5.0.tar.gz 638021 BLAKE2B 6c8d856733245a7eef5782f8d6c1fe35093f5247cc76e86ab308f2d98a99ebaaef5309a9c402f1334707e042b52e52d7801723e9404ad0ae454b756b9df31dfb SHA512 a9f596d6fcd95f915990c16830caeb9c9a03412447597258c67a003fd485e2efd27798f2eb2de9978ac529292af4b55136de554bfb501e90f6185f55a6b0531b
-EBUILD paste-3.5.0.ebuild 1080 BLAKE2B f1794decc841119d3a57460e0b45ba6c17a0bf5545a4df72e5d9ab94c866d4fe6561ca8862863ae70104760f0700d301492ce997f453f32e568c6572cbf18c26 SHA512 1ecfc847cdf0c89dc3659dcce7100641b3efa694bc6492335a97ea9ce8bb5d783dc9f901fabe96385ba6bb2886f237f8313b109d6192c91b00ae577d3cfb81f5
+EBUILD paste-3.5.0.ebuild 1087 BLAKE2B 5442735272dcd193c3c2161b0eb9b5d02b1a2e44c0ee82307321907c6e391fcc6744b5d25c36eb771a4de8f7d04bffb7e27327100f59e0f105057c50202a5a7d SHA512 8179d789a0a6f1d2b00e843fb3044d3ebdecdfebc420519049ebb710be6e5bcf9446353d40cccb8e39a147b40015e2381736fcd5039db9e95ba4c6811bf5fc3d
 MISC metadata.xml 627 BLAKE2B 544d8a892fba33e583c08d31ff232d71c71397981b5d51f721545e9d1dae4342b68741d656d8eba8988f57eb9a6990adc2827c4f2f4a7b9262fa2be9bd9740be SHA512 a49e8e5ce28d107c97b02b00e7c0b3c260c780fc4ac7d80ea3e8163cd5a8fb44756470ad2603b0d9db312e5cd36b0039eae61dddc0339618ef0c6ee675f1ef58
diff --git a/dev-python/paste/paste-3.5.0.ebuild b/dev-python/paste/paste-3.5.0.ebuild
index 541b33f53a13..ca4614a321c6 100644
--- a/dev-python/paste/paste-3.5.0.ebuild
+++ b/dev-python/paste/paste-3.5.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -16,7 +16,7 @@ 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 ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]
 	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/pastedeploy/Manifest b/dev-python/pastedeploy/Manifest
index 363d538cd030..461371cd3f3a 100644
--- a/dev-python/pastedeploy/Manifest
+++ b/dev-python/pastedeploy/Manifest
@@ -1,3 +1,3 @@
 DIST pastedeploy-2.1.1.tar.gz 32339 BLAKE2B d11affa480e5c9b7be53d0431090e4ec9d66f8862b1aadf6a993a09f9c952380d7698eaa7442614936a8316e2ac50404a096bf64bb3ef31f55cbee35b5982166 SHA512 0109e30cb5ae9bdd7f06a79f6236c90f96c3bcfe507258572b1329796a1821486d9762d954673ccbac76ee63c6a69e64fe5e2cae5402fecf4a5affe88cf46930
-EBUILD pastedeploy-2.1.1.ebuild 990 BLAKE2B bf4c59805cd8d791c03e697dfa44733a55f3d57bf4fdd61cd0bf6920b83b1b19bc3c85f8a2e1cb22a15130483c095a60c1a963689874af9aa73bc1acc18e41a4 SHA512 7fb8de59ad1fde7f19941a23a6e1798d22f7ec860b79c7fd6875d49980e54719f9ffbc15634ae02542038df70fc579fda1ea4d0c2ab6e9fc0a73460fd927b851
+EBUILD pastedeploy-2.1.1.ebuild 997 BLAKE2B 3cc07f90334c56d7696015595bf167e0bdc178081adadcbfa5d7af5950a159a881743cb065eaa101dfde326193894c80dc14cc68b721937198878f9490f18f43 SHA512 16b9567cbf25d4bdc18b97e7d073006c2579bb4c7d48890742414ccb17e11e70bca5d5f3525bdd06f685f865a41037546e58bb649cbfe85b83a10be8e333402b
 MISC metadata.xml 830 BLAKE2B 646965e3c4e9247a8299b8e3d441e3a80a899107e14489cb1e7f5c85bef9b4c710536caf7cf6f695e9a87f0412cc47b7099312e7e7772691a275c3c2151215c9 SHA512 dde9cd21ca86242148ab89a2e77c88c4f7ec30c1615831a2cb00b20f0051dd23c40537ce1abea7ebeb39da4a8233275f0d3dc91a8f3947307d7acd571f56dd29
diff --git a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
index a1f5d48ca816..48502600d35f 100644
--- a/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
+++ b/dev-python/pastedeploy/pastedeploy-2.1.1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/Pylons/${PN}/archive/${PV}.tar.gz ->  ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="doc"
 
 RDEPEND="dev-python/namespace-paste[${PYTHON_USEDEP}]"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 181bb6788999..b352c587af04 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -1,15 +1,12 @@
 AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc14270cf6efbe8914854c404395beb1126db3278683b940e8fcfee83423d78e2aed6521e0bc57566ab0f5618f473262bbd9b7b0bffa SHA512 d2772105d4f4f880606e1e8ab3381af6768a96604a5fdcaa155dd42f8eea731c3a1b733b027d3e591d81f962ba14758b19da4a2c6c12946cd9a9d77c51ca4e78
 AUX pip-21.1-no-coverage.patch 1905 BLAKE2B d09ebb459bd3f0d7d1f5194c635489aa162d5ed4f3fb75e1352eb80f96a49aef51e7d5e72859321f1558b6a6df9bd0000acdf653dd301a839891078e4a26dd16 SHA512 46afc9f5f290e3547bc18f104fae515a06163f622fd43f7b1e49ae47c720e4aa4fd01c97f171cab24305eddd71f5083ba1d3109a67f2f84e46e5320f4ab7f0bf
-AUX virtualenv-16.7.10-py310.patch 2829 BLAKE2B 3fe4387bd4a9bb4182e002643339692e63e98d0613c3cbec6b633699b2a1688652e00d6f31ec82eb399c7c87e0e80e8f8ff48dc0dbe38f84a7c6f74124e76950 SHA512 46074b0705048de5c7e0be2c6a3fb88f15553dbf44bf92d6e0f23fd18510f4d6a2689277299d748bfc3f44a6ba7eb9a32a5554052b391fe69714ce6ffc217ae9
-DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f
 DIST pip-21.1.3.tar.gz 8772944 BLAKE2B 4c50fcb7c05e05d11b137d08547d9d55f19687442b8d44caf05d19917b200bcf860032cb28745e41d51afda80a7ac09d60afb8d619ade5b965ed87bac1133006 SHA512 21bdc78f24751981ae49c9fda0430fc92b8d33eb7a546bc344e8cea4aa85dcd42191ef8eb3fdfb4f3d1cb5921698f819d73e6e190d8745cf7ddfa52732d95999
 DIST pip-21.2.1.tar.gz 8781474 BLAKE2B 6a6a4972de31cea2f9ee2d70df00acec65efe344fa13e56ecf9b2f55125baa2effb30bf25c7649f5f30b2ecf9b5ebb7d32dc0f2dfa101444510c8573bd0c60be SHA512 2fff39703eb387ded66552ee62c2b3e4d18da6e8a904399919a5c51f65ddf1695ad410408fe5370877a1ce9992e7c07e091a1852dfb136ce5580e31fc1c03b81
-DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
+DIST pip-21.2.2.tar.gz 8785943 BLAKE2B 3e99a4e6e01b6239ff5a45097bbae8ba3459a16d0e78f8da4fc1be0ef5986962d30ea8e376705cd7b88198e324e700d04ee25fc6d1d9faa9bb6a76ae89efd38f SHA512 81ec1819481fa2378404c580a4c60fc48b03ae9bd5c945a3def4af331c530efb19949ab45dcb4be5835673b65299e0245c28c6653f9f60eaf86be472fd31faa1
 DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
-DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
-EBUILD pip-21.1.2-r1.ebuild 4397 BLAKE2B d428deb02df63f482f4951bde9d121217177fa7d4e7372ba78f328e4bf6acd32d54ec9fd9128a81856d093ec1a56c99ea390e6ff5d05f4ad82331babf1fcb301 SHA512 45b0da89df88d7801ed0700ed52d69e1782997e55aa30968e7985a786d8c6077b4e61fab4db96425749be338049f03b437dcc979dc8b3be507298087d9b1bb82
-EBUILD pip-21.1.3.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
+EBUILD pip-21.1.3.ebuild 4253 BLAKE2B 145e72c1fc1cf5eec5d656819f82d6807ff7123cbe01d6fef4f2de5ef3bfba1dcb639d2f494bc8f145a9f5fae092c781d2fd4bc51688c19a9e6ee4a37ff24dc3 SHA512 4b9fe3a4204b914f617ef59cffbf9ac5b224d861c3043d23f91124cd69d837e3f4aa6dbcf605ea7ee0fafbd1b5f85568a88ea86b12c917cc0057289f3cd46e88
 EBUILD pip-21.2.1.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
+EBUILD pip-21.2.2.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/files/virtualenv-16.7.10-py310.patch b/dev-python/pip/files/virtualenv-16.7.10-py310.patch
deleted file mode 100644
index 27c17a07445f..000000000000
--- a/dev-python/pip/files/virtualenv-16.7.10-py310.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From b4aef0a53ba63c34e45413754705af4e438ef5df Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Wed, 5 May 2021 10:59:02 +0200
-Subject: [PATCH] Legacy: Use sysconfig.get_default_scheme() where available
- (#2109)
-
----
- .pre-commit-config.yaml      | 43 ------------------------------------
- docs/changelog/2109.misc.rst |  1 +
- virtualenv.py                |  3 ++-
- 3 files changed, 3 insertions(+), 44 deletions(-)
- delete mode 100644 .pre-commit-config.yaml
- create mode 100644 docs/changelog/2109.misc.rst
-
-diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
-deleted file mode 100644
-index 0b8234b7d..000000000
---- a/.pre-commit-config.yaml
-+++ /dev/null
-@@ -1,43 +0,0 @@
--repos:
---   repo: https://github.com/ambv/black
--    rev: 19.10b0
--    hooks:
--    -   id: black
--        args: [--safe]
--        language_version: python3.8
---   repo: https://github.com/asottile/blacken-docs
--    rev: v1.3.0
--    hooks:
--    -   id: blacken-docs
--        additional_dependencies: [black==19.3b0]
--        language_version: python3.8
---   repo: https://github.com/asottile/seed-isort-config
--    rev: v1.9.3
--    hooks:
--    -   id: seed-isort-config
--        args: [--application-directories, '.']
---   repo: https://github.com/pre-commit/mirrors-isort
--    rev: v4.3.21
--    hooks:
--    -   id: isort
---   repo: https://github.com/pre-commit/pre-commit-hooks
--    rev: v2.4.0
--    hooks:
--    -   id: trailing-whitespace
--    -   id: end-of-file-fixer
--    -   id: check-yaml
--    -   id: debug-statements
--    -   id: check-merge-conflict
--    -   id: trailing-whitespace
--    -   id: check-docstring-first
--    -   id: flake8
--        additional_dependencies: ["flake8-bugbear == 19.8.0"]
--        language_version: python3.8
---   repo: https://github.com/asottile/pyupgrade
--    rev: v1.25.1
--    hooks:
--    -   id: pyupgrade
---   repo: https://github.com/pre-commit/pygrep-hooks
--    rev: v1.4.2
--    hooks:
--    -   id: rst-backticks
-diff --git a/docs/changelog/2109.misc.rst b/docs/changelog/2109.misc.rst
-new file mode 100644
-index 000000000..985f955df
---- /dev/null
-+++ b/docs/changelog/2109.misc.rst
-@@ -0,0 +1 @@
-+Preserve compatibility with Python 3.10 - by ``hroncok``
-diff --git a/virtualenv.py b/virtualenv.py
-index 3085d1d18..86aa65674 100755
---- a/virtualenv.py
-+++ b/virtualenv.py
-@@ -1809,7 +1809,8 @@ def fix_local_scheme(home_dir, symlink=True):
-         pass
-     else:
-         # noinspection PyProtectedMember
--        if sysconfig._get_default_scheme() == "posix_local":
-+        get_scheme = getattr(sysconfig, "get_default_scheme", None) or sysconfig._get_default_scheme
-+        if get_scheme() == "posix_local":
-             local_path = os.path.join(home_dir, "local")
-             if not os.path.exists(local_path):
-                 os.mkdir(local_path)
diff --git a/dev-python/pip/pip-21.1.3.ebuild b/dev-python/pip/pip-21.1.3.ebuild
index dfecccec8ab1..8487817e8b18 100644
--- a/dev-python/pip/pip-21.1.3.ebuild
+++ b/dev-python/pip/pip-21.1.3.ebuild
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/pip-21.1.2-r1.ebuild b/dev-python/pip/pip-21.2.2.ebuild
index b1ccca2fad05..dfecccec8ab1 100644
--- a/dev-python/pip/pip-21.1.2-r1.ebuild
+++ b/dev-python/pip/pip-21.2.2.ebuild
@@ -10,11 +10,11 @@ inherit bash-completion-r1 distutils-r1
 
 # setuptools & wheel .whl files are required for testing,
 # the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl"
+SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
 WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
 # upstream still requires virtualenv-16 for testing, we are now fetching
 # it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.10
+VENV_PV=16.7.11
 
 DESCRIPTION="Installs python packages -- replacement for easy_install"
 HOMEPAGE="
@@ -32,7 +32,7 @@ SRC_URI="
 "
 
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 SLOT="0"
 IUSE="test vanilla"
 RESTRICT="!test? ( test )"
@@ -67,10 +67,6 @@ python_prepare_all() {
 		mkdir tests/data/common_wheels/ || die
 		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
 			tests/data/common_wheels/ || die
-
-		pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-		eapply "${FILESDIR}/virtualenv-${VENV_PV}-py310.patch"
-		popd >/dev/null || die
 	fi
 }
 
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index 1425b22ab048..49072a747278 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,3 +1,3 @@
 DIST platformdirs-2.0.2.gh.tar.gz 11365 BLAKE2B 53257c69f26dde3a0031c991cd6b5c72b361084342617f5c0590007a11a1d7d6e3c925dd6a8d73d3553cf1cc1d2b9fdf74fd0553d6b8891ef6b21d64bc0e256f SHA512 7cdfbcb4e37f2b4b551f3d685a40780518f9ba9c333cef0664965abaca320a10f6e944f967c0b0ba2d00e80df04b0e1e03426e6d1291e28d8f64128f50ebc1fc
-EBUILD platformdirs-2.0.2.ebuild 600 BLAKE2B 498e9ea8874b8ccff398599dd4df4a78240fd0c53292924352f8dafa5c07c530bdaefa16a98cbeec6fed55da7d48344c8077811e288b7186aa998af0ca4a36e0 SHA512 0253ac42806a5e34b1e0bb2c8e3d4be0ece79364665a64f96ac499f097144fd40829092c9398542f073c5dccf52d0fdb1bbf68536148ecc52982cec814ff7862
+EBUILD platformdirs-2.0.2.ebuild 620 BLAKE2B 835319eb3a94ab6adc765332197cb95ce33af57488016606dccbacc4b196c65200ddf4729e7759fdfd42aa0fa9f1a2719a2bd0df69dc58cc69dac5ff9d48ed5a SHA512 14af1e4e2f56da676be18c7289ad8ab39752ab610ff3d233366dcee5aa0c9452a01cb020c25c14ab6a4f0c95acc1a275bdc229f75556d8bbbb196440ffef94d3
 MISC metadata.xml 358 BLAKE2B 59aae3db7ff7375600e504797a7fe4dbd4c0119d5b3fa31ef523854d8a8cd54ee60131f9bac4f608dbb5740a1e9dcf27d47cca75c7c83de4850600eb02aae2fd SHA512 09d5618647fdc5104705ac94e3af0a3bac586e27105f95d14c827b10265355a53deaa66483c12567596c2c4e8285c1cc0520f5475a1404aca3b1d677792d7654
diff --git a/dev-python/platformdirs/platformdirs-2.0.2.ebuild b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
index 71db9d69770e..3aa5e9a22459 100644
--- a/dev-python/platformdirs/platformdirs-2.0.2.ebuild
+++ b/dev-python/platformdirs/platformdirs-2.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
 
 BDEPEND="
 	test? ( dev-python/appdirs[${PYTHON_USEDEP}] )"
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index d4d6c16ec07a..9a1a1445a254 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,3 @@
 DIST portend-2.7.1.tar.gz 13538 BLAKE2B 56e9b7ae4fb9371322cbecf12d9367fc48f0138cf9fa8cb25cf7f0b7977d83852f328d89e93ee2e266e77b393bbabe75d091ce85f688e1ee146edf64e470aa60 SHA512 079bfc286491753e980b5000ee716031225439523a8d9a79c2571359adee74ee024dd680c41adb966487dc39eea3d0dbeb928c5c72fa21ab897283310ef21906
-EBUILD portend-2.7.1.ebuild 619 BLAKE2B 743aa383062ff970ee96202a7d93a5f912628abc817a6f8134a787719809719da112075769963fdc9a6adda2a82a4cd37e91c8e899c90436ece88feac6386559 SHA512 a43fb581be71325573f03e881afc417c0f2a4d984fa7e9c2ef489aa3c70b8c6ea992abd7fdc7e5bd9719619acee06c09efdefb0f9ce847785c2347d1a47ff3e9
+EBUILD portend-2.7.1.ebuild 626 BLAKE2B 69f1a66ca0d3493e177a4702e6dce50a299cc9d06684b46153a7ba896c459f00d90c35a2bca10f366c97ff7b3a77e4ffd29f92cd640982ae330c0cfcf37e3b31 SHA512 9812832570a8c36fee8c651768fef3ac61e14efd6d7406f495174817fba669064a0e42110601f8c9308cbebb696e650cc1134373edd517991cc5c9cd68ff99a5
 MISC metadata.xml 493 BLAKE2B bc4d9e79f1ff9387da6705744d7fce19c8b6cbccfc62878ba79b14312b3612598c6042c5f2842f663af254fb8977a60c34d373624604b69ccb2f861a2f5aeb56 SHA512 7db9144b99d487353a90f70e85d8800418eb92aab0678e934ffe92498c7b0e4c0f574dcf109f1a3ec2c7478174a26346152f15d57f15c9edb89f5d9dae2c788c
diff --git a/dev-python/portend/portend-2.7.1.ebuild b/dev-python/portend/portend-2.7.1.ebuild
index 22abe633fd7a..4618c5c00210 100644
--- a/dev-python/portend/portend-2.7.1.ebuild
+++ b/dev-python/portend/portend-2.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
 BDEPEND="
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index faf9250e2d5e..f55c4a4336ec 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -2,5 +2,5 @@ AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a3187
 DIST priority-1.3.0.tar.gz 13827 BLAKE2B 8c100eb44ed42f4f624bfb37dd6f698a3da84812783bd44ba82afef565562379a7677b3cbc9e16c4ea5a5dcc91d0897fa47c341a81bc1875461a72aff328fcff SHA512 cefb13b15e99ef98c37fdd1486466c9e1d7d04b4574cbca1665fde7b7b44cc7d66964bed41184315a9b51bd6f9d0e02bbe113bfa004a754ac270170309b71e0a
 DIST priority-2.0.0.tar.gz 24792 BLAKE2B c230f74aba3153edafba4bf85965a726ac3d3f5e2293d7c496b65fda260722cc44e4582666eee9d715e0d0686695434f8e0cbbd089c105bb45b777bf6eb4d72c SHA512 f90648a3ff1ee4131f30e99ecd8c36110abf484733f507edefcede8fdcb9ec3a618b9278e85724855709f41facee438061e4c5cae201b6e916c22f4a451db575
 EBUILD priority-1.3.0.ebuild 699 BLAKE2B 1c7cceec979ef8c857192b266b7470a5f60eede6da8cc232f6243e21ffb8387a3628f7eaa28fda944239458a59eccc92c8b4bfd9e3edf32f41717a353f7ac423 SHA512 d124b956e3f493146ceaab4b5c80ebaf83d19e94a24b3577bd90cb31fcdbc0e4519f579d8002e5eba21d48326272380f88f3e457bd5a1883cd395960b0f08906
-EBUILD priority-2.0.0.ebuild 645 BLAKE2B 40ed94bb8d68685f84f739b3e8bb49cabd3a7fe441a52d3105131c341393ddcab10340e028f8588317aabeec543958786bde6a41e85eadd09513a44acedaed5f SHA512 cb1db5a3be022caabb92fe8bca84c7a7edeab87fcd6ecbf6cc9679a055bba743de43ca1a296fb558b3eca839bd9c8919f90255d09c82efbf246cfadb1fc16a9f
+EBUILD priority-2.0.0.ebuild 641 BLAKE2B f4ea289acc3991e4d3bc8ce6d536da4ffdcdc678f8c56fea1d723c4c6c44c465c3c6c3324131bd74d4e05a780f17f4475e955ae6b829f301c05ce3453ab10e7e SHA512 ac6bb364b934773ccdcfc1f9a8a94bfbe8c1c126cc96efa7cb2042cfa2e6d6dafc5ad651a85f8d4d83e7767a39239cb597706c9008e25a5a6f0631d60fd551b3
 MISC metadata.xml 839 BLAKE2B 2a922ade07ccabbde2eaaeaac310e1c89206f7a6194ea14cd83f53182270edfd2cca4b1d13072d8a4c81c96563ba3b81251626eb777ced188bc9a22a37dcbffb SHA512 fbd62fe6b97e29566a18a29d155b8b08124d5c1561a21ad7aef7daac1a68b75b48b82d3edc612a27888da0d24ecde73b808cb90dfb7fe78ee97adc5fb507b003
diff --git a/dev-python/priority/priority-2.0.0.ebuild b/dev-python/priority/priority-2.0.0.ebuild
index ddf8d8fde3dd..21fab37fbf14 100644
--- a/dev-python/priority/priority-2.0.0.ebuild
+++ b/dev-python/priority/priority-2.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc ~x86"
 
 BDEPEND="
 	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
diff --git a/dev-python/progress/Manifest b/dev-python/progress/Manifest
index 06ef0525b70c..d355dee6587f 100644
--- a/dev-python/progress/Manifest
+++ b/dev-python/progress/Manifest
@@ -1,3 +1,5 @@
 DIST progress-1.5.tar.gz 5842 BLAKE2B 235f02edf0f010b4460d36b868be2df0cf4685f360de491f1649f14defffd3f1789c6c036c05b91007efac49cacbed3de5cb38fda3e21d0fd633279b2066c4f9 SHA512 a9bee3498746233f874da2d6509d052882d9592df69c223637279a1fae40174a4dc279b56a7558e95ed173b0d357ae07752501c577a3cb9c79e0f87095838896
+DIST progress-1.6.tar.gz 7842 BLAKE2B 102f1ac481b5d5007d72b02f5451ad4bf7ef986be35034f68fc94108025ea274494d3d9fe56b9473c8ea6ca4abc2cfc458b453550d180fcf567f8a5c5feeafe6 SHA512 58a614bba5a7273a42ba5e9607b3a965fec17f26a4f24563d4c13679ea32b23dda7509c5da81a2a34bebeeedd91154d0457ab8dac95cc7a092add2567249cc94
 EBUILD progress-1.5.ebuild 569 BLAKE2B ae275a2cada0499ab37ff2780582cd357f7cf0a91814f4542613eab98fceb168dd43932623f0915c4103638dc11f253b6c04cf45fb024fe3c9fc3771ca56eb5a SHA512 8258297119cd24bc656813ea0b653d9028e6684e3981e19711039994d828d45ec415484fa33bb15a47eeed5b565f0517921634e19cc5dd1b7d801222c5255dd7
+EBUILD progress-1.6.ebuild 575 BLAKE2B 97d69f6b303f141dda4868fecee44670c48c8159b5b9ff97c2cf3b8a1380b9d7b1f90bc63b9afc96d0cbf07feb7764960e921341a50818426ebfdb67ba09fd4b SHA512 caf2b9f95cff30ae82d4ba95ebeca8d83fbcd710b7a59d09f12da0556b27716cc9e7cc5d090e614e34390390ec2cf8dc59faffba34b5ea20cbb5597a719f023e
 MISC metadata.xml 391 BLAKE2B 8c43d18b83bbba693a62930ea28e8b47f6cd4594e03aed277ba0744d94558e8f32a68ead65b311d1ffda228be6334cf88ce7a1171250ceaef59028785e95361a SHA512 641f3a01855cda8109b87dd9c845ab7bfbe0c8ca406cd8de947e817659b97e7ad0d902ab682620b63fd8eac749d89308d54cd1f666b6ab72687a897bf41c567c
diff --git a/dev-python/progress/progress-1.6.ebuild b/dev-python/progress/progress-1.6.ebuild
new file mode 100644
index 000000000000..4670e5bd5833
--- /dev/null
+++ b/dev-python/progress/progress-1.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Easy to use progress bars"
+HOMEPAGE="https://pypi.org/project/progress/ https://github.com/verigak/progress/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="ISC"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" test_progress.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index 2499b38417d3..b1c99ff7e2e2 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -1,3 +1,5 @@
 DIST pybtex-docutils-1.0.0.tar.gz 13627 BLAKE2B 5a18c29fb64f9b19deb4699017de17b1d4a112e0739d84066c4eb0df9d51005fe3b0132a7d1e46e3dad5b9b8e41340cf1a4da094ab20dd140cc83a3a53d82ca8 SHA512 d0054c5ed27a8c57b85963c5f3443d53fe8edab8ce2cf924eeac73240d662a6ac3cf74b2e38601d708809ddbf0984b3c7f24f177c67f77039bc236360474fa38
+DIST pybtex-docutils-1.0.1.tar.gz 14234 BLAKE2B 3c3946309ad19acb19703c0ecd7fce048808580df27ba39ce7acadbc0db154bee1f1e31d448015a8ebbbe034812e2f76fbed6f47a687c035750fc2908ca940c2 SHA512 8f84a822287e78a09b935a0f358b48e8a02be21303907fdce352515a844fe22dadb44646ca1abc44c8a8e7523c4f7074f3673fd6d565b178c862589cf58e9a48
 EBUILD pybtex-docutils-1.0.0.ebuild 520 BLAKE2B 35d03debc750b593faeef4fe364db5d62c7904d07047e0ea276419b20916a327227fb6c2cfa4ae1c01a0f6e003f981cd6e451704b52137fee4f4c775f53ad04d SHA512 1cf47850d12c4f4804b5f884650162219305ca68d49833791955c4353e8c2938c9c75216390642bd5b8701cae1ffb5ac89a149fb60ed6ea7588b10aa8c672eb3
+EBUILD pybtex-docutils-1.0.1.ebuild 529 BLAKE2B cf6bdac0501820a591e2fa424e9fc29d69ea2e3a0e09fc667a3e3c59fa43d77fc5f8e50efa0109511d9b5a1538805ce0f0004880b41beb7052997981d99ec7d3 SHA512 7ad018471351e33e13c2e6c388634686d82dfb1537ac6fe325a371864e9919a053b3ef7409ddbb87a4c06c3e86a7bbfe3d6f3fdec40f7d90bac4b8c1d8e9cf89
 MISC metadata.xml 427 BLAKE2B 4240ad89f3274e6c809181cf1cc798e2aa0eda209aef78f99f15a25de02277d33b430e1566dc849ba8a1e2eb65101ee8e908171c2f96f3c6a34fc72ee3bdc5ae SHA512 b7d4797d2e06dfe73609a4925c9796ced3f9efecb4c8faac4a0e2bcd7449f3e82804a8bd6debe1e898a869d7119a5d7b0de2e56b46ab1fc5672f4b4af76909f8
diff --git a/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild b/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild
new file mode 100644
index 000000000000..95945ba0ed3f
--- /dev/null
+++ b/dev-python/pybtex-docutils/pybtex-docutils-1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A docutils backend for pybtex"
+HOMEPAGE="https://github.com/mcmtroffaes/pybtex-docutils"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/pybtex[${PYTHON_USEDEP}]
+
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx doc
diff --git a/dev-python/pycdio/Manifest b/dev-python/pycdio/Manifest
index ec818c08d644..ca8eb9901db0 100644
--- a/dev-python/pycdio/Manifest
+++ b/dev-python/pycdio/Manifest
@@ -1,3 +1,5 @@
 DIST pycdio-2.1.0.tar.gz 241434 BLAKE2B eb981fdf52b205e14c6dd353ac4aca9a9e82dba6967a53b9059f8a265ef80832fe7236d68b2af7a6e408665fce0f5ed3541289e0b7d282834c4feb8e6b428fc4 SHA512 dc18fbd212f7040b8b06efaf263b17568e9c2d089cff7dfc4dda50a7225059e44c9c86e2d81ade92cf09c823f7189b5723fb601cb12f0884dc04e9f5418c5927
+DIST pycdio-2.1.1.tar.gz 246562 BLAKE2B 7dbbf384f9d70aade922172c6dd070229c1ffc65a76a491c45f91ec176bced9af0dc0e08f50f8ad78828273de14166eae886b402f282a10bdad3f8302276ef01 SHA512 4c756b1c2f39332add86e01af129ccb608178306be42c9719c163b6bad0ba4de3916ac477c6866450890e094b14a2689a24e7d19bcf13846330555c2bb1feaa7
 EBUILD pycdio-2.1.0.ebuild 1089 BLAKE2B d50db41fa7d845782e0f22972c7888362bb7fd52192445685499ec131b0d7c35e109ae2fe061a67fdb0be1019d15d0478fbdfd4f1eec37209b6902e1650a744a SHA512 8725ca8e1de99a411a78b88a0a58f23af4c8da843f79c0c0d39312326d0190c88a7925c8badbd2d2ae3c5f332b0fd79a8b596223690bd8b7f93b3761bf15870d
+EBUILD pycdio-2.1.1.ebuild 948 BLAKE2B 8649bda8abe1d245b80abd9a4058d36fd0ce40fc7187768f16a86527b22b1ed8b7faee778cb4ab33644a9eff0d1ea7f5179eb31637d13ee454ee93eb320e5695 SHA512 6cf9dcd99dcc0a5dfa48b916f75bc01daaf1081a523e0961db38c7d2aa9e41933e65ce0f3edb71a92121985e148eb650f93ce56bd33c979766bb631603a8fc5f
 MISC metadata.xml 603 BLAKE2B cb7f62b66b44c9e5a0f761b69c44d94a8d55c178b65499c1ed5cf6854a2ef4ff774aa35ef047d84b03450ed9bad349f5591c13294e2676fde1e5a36b6643236d SHA512 6a259fc05469d51ca3ae442570ac2d1170bebae2c01466dd626579a83f9e7adc615c9eecfd2cba1542728cfdbc3e5a4f41671038c4a6584504b96a4be01fa979
diff --git a/dev-python/pycdio/pycdio-2.1.1.ebuild b/dev-python/pycdio/pycdio-2.1.1.ebuild
new file mode 100644
index 000000000000..635e1a54c837
--- /dev/null
+++ b/dev-python/pycdio/pycdio-2.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python OO interface to libcdio (CD Input and Control library)"
+HOMEPAGE="https://savannah.gnu.org/projects/libcdio/ https://pypi.org/project/pycdio/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+BDEPEND="dev-lang/swig"
+DEPEND=">=dev-libs/libcdio-2.0.0"
+RDEPEND="${DEPEND}"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# Remove obsolete sys.path and adjust 'data' paths in examples.
+	sed -i \
+		-e "s:^sys.path.insert.*::" \
+		-e "s:\.\./data:./data:g" \
+		example/*.py || die
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	if use examples; then
+		docinto examples
+		dodoc -r example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/pydyf/Manifest b/dev-python/pydyf/Manifest
new file mode 100644
index 000000000000..e20804bfa80a
--- /dev/null
+++ b/dev-python/pydyf/Manifest
@@ -0,0 +1,3 @@
+DIST pydyf-0.0.3.gh.tar.gz 25610 BLAKE2B c236896e56163bb64267e28106a2058f0c6e85e918bd441537df9a494bd7b75c39dda247a0c4b99a918bb439f88a412763975d2d64ab4d8d7cfd0dab2d142f8e SHA512 bc72d5bf93bd4aff653b6496a07278c5ef8b22629f137f9a3dc8713dce4851d2772d4b1ae13d59fa0203c962405f93842e7d5159be1b276632419d6642add149
+EBUILD pydyf-0.0.3.ebuild 681 BLAKE2B b4d4cf0189e83502b333ee80d819255b5bcff3c29db9cda7050bc3ca395f2c1f453a9a57962b748e323fe656674b67a77ad09d5e35b3f79fed9ddfa6c0a0528e SHA512 27f34e058ccb48b64974ab898e37a1df85f3cdb1f8e48e47d19597a5023b4d2162eced02a1c239c3c5facf74e7b80bbdc7dc480062e7065fc9f6f8e19ef716a5
+MISC metadata.xml 345 BLAKE2B 84502c87aee0578bcc579a95ba2715afdf414125a7f7ed3497fb8929a701fe3c3fa3944b472c9778a4ea617f9cf94b893e546227add9b704e4245f814c5ab21a SHA512 c4d615019768b6ef5b2ff4f7d8736f1061fab264d05df4793f839bdc8e96c31bc12a43c8a78b5875976b8efc065c170642058fdd63a30103437600197efd1fd6
diff --git a/dev-python/pydyf/metadata.xml b/dev-python/pydyf/metadata.xml
new file mode 100644
index 000000000000..94f13647c9e1
--- /dev/null
+++ b/dev-python/pydyf/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">CourtBouillon/pydyf</remote-id>
+		<remote-id type="pypi">pydyf</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pydyf/pydyf-0.0.3.ebuild b/dev-python/pydyf/pydyf-0.0.3.ebuild
new file mode 100644
index 000000000000..0ecfdfd4412d
--- /dev/null
+++ b/dev-python/pydyf/pydyf-0.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A low-level PDF generator"
+HOMEPAGE="
+	https://pypi.org/project/pydyf/
+	https://github.com/CourtBouillon/pydyf/"
+SRC_URI="
+	https://github.com/CourtBouillon/pydyf/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		app-text/ghostscript-gpl
+		dev-python/pillow[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index 35ad4aed6ff7..e538eea11372 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,5 +1,5 @@
 DIST pyenchant-3.2.0.gh.tar.gz 75395 BLAKE2B bff9d4d5038252473fd7673758ecf1304f74f96514d984f5b6cd052042d0b2cf6fe2e149e3675777899107794c9d2fe1c630e87b031f38512ed2499ee1053f34 SHA512 63ca44aea9e7af3fecf554dc6156513c42d278a92170bd6b88b71a737def2e9fe7f7d2ecafd5fea2b860b4d5de55c9e8a6e4b30a58d6f28533bba71cc407850c
 DIST pyenchant-3.2.1.gh.tar.gz 75501 BLAKE2B b70a47484a7f242ff42aa0018f495544f9e7bdab904f835bd52533c93bc28b06ab155132158d2551b9c32eadee83418b6bcb70becee769653196a9bb0d13f130 SHA512 3d1229307b070fa83bd8a287a787b40edfba31e748ca37a94f71caa4b355a9de829f3133db9772a57f0aa922fbd4f32c67c986e86c8905633b3940dd20be32ed
 EBUILD pyenchant-3.2.0.ebuild 632 BLAKE2B 87b17e54a5a4993a3607c153b015b64b081eb4d512f12d0fae660a8b806188c3ca372762f42c71fbcb9d2379e0c84ec67f5aa9f55e1db54e25f1e0d2169d5093 SHA512 8c7a4d1c799f2b7af00cb65e9edf831fd8a4b4a202746113e6325d03a0e76a1f65c9764511d825888846e5807e0478fc581aa885a129e9b77cebe98d474d1d50
-EBUILD pyenchant-3.2.1.ebuild 639 BLAKE2B 955a8bb7660a7dab3ba2b6e0813d50bddc54cf66a3ff1aeebf32f903b255e6fe68dc2a922cf39795b38c600a8b7528333d996b6654801e48dd554d242518c2f7 SHA512 3424b2de308142d1fc2a673eee77532bb28ca4f84d238c6192f3a1e8fa0d6e2a1951101ac5784d8efd7ec715568d080d7cd8d4637d60f20c43ebea1eca3a4a76
+EBUILD pyenchant-3.2.1.ebuild 636 BLAKE2B 4a90ba0d1a547a0877eeecbed4417683a47d0bf52230d5f5fbe92c56678e76636660ff6cf88a0590dedf9cc73d59b6718087f4a071294d5f25af707314b69fc6 SHA512 77eccbcd8775979d47796fcfa8519022aa6f55f8a6f29ba0fa1ad369b17cca4a0ffbfcfa59ab6b716c1759bfbdfb83112d1245b7cfad7918030a66f8f1c2537f
 MISC metadata.xml 876 BLAKE2B 4b2b615496f92b395ca4449e8caba7860223101e142d45f3eb703e829d34b27a0e7b3965f7362739ffc16a61d4e5f495754415047b41473303982eb2bf35e528 SHA512 7e69e0da10236e15c70526eb35b2ae8d862109e3aaa81a2613f5a97ba08816eb71e76a845a0656dbe2a6bc92b45a79ab018386110aa7fa0687b3faba18c63129
diff --git a/dev-python/pyenchant/pyenchant-3.2.1.ebuild b/dev-python/pyenchant/pyenchant-3.2.1.ebuild
index d8534c8b1067..2b5bd2833aa1 100644
--- a/dev-python/pyenchant/pyenchant-3.2.1.ebuild
+++ b/dev-python/pyenchant/pyenchant-3.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~riscv sparc ~x86"
 
 RDEPEND="app-text/enchant:*"
 BDEPEND="
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 566a83fed958..d45e8ba27630 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,14 +1,6 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
-DIST pylint-2.8.2.gh.tar.gz 734667 BLAKE2B 1525273298f39163de4db7946a749768cb9bcf7e11f89791944ccb5fb8d0918eedfc80d5e559d33934d468dd5781d4cb4921b9407daf2842613a8e3ba7d134e0 SHA512 7023603668f540ecc0b35f3289377855c4c0df01e04a9af255f5c8031f568f6b76508bb3a7f0aba8e76a86b63eae423908c30f47258d6dee46bb23320c952701
-DIST pylint-2.9.0.gh.tar.gz 768301 BLAKE2B a86ccb83d3155acee0165dc7b0095f5b7741c62e7b1f127349eef643cd1d0513ed2f5aaa89d78728806f03b08645ed1579aafb073d649e928d4c415e50dc8a49 SHA512 b524a3d3241702c1fc34ca9ee38815d02e7f4572d8ff3c132141ac7d9c7ff59f88995b92ccfcf18fd57e04be8f24571ef0ab99e6b4ce615f0f6957022d1d1467
-DIST pylint-2.9.1.gh.tar.gz 769124 BLAKE2B feabb520c22722df73471e87e05f22f0fb937113c9d02e39bf4e2554479c58a5044afe565c107e9478d868284b8875fec65b976633dddb4bc9d7748b35640218 SHA512 7aea388c6e62fd53e6775a4732da87269f3df22f995241621eb9b8d72c8573b6a4fa9545b1553db91f09eee013bd695e075d69c35436b05623576f13f1317cb6
 DIST pylint-2.9.3.gh.tar.gz 770364 BLAKE2B 3892286ffbd79b417c6decba44bce97f45192299ac8e2ec0e24770b2dd6cf1c28bac790626a478d47a6124ec0470ea9fc0d4230c5a1e807532852844445bb95a SHA512 45c037b970b66254b54a4810a5609dc098b5493d409826333e6a75f9ff0fc02921162711d88c45fd2f437e6521f639c33b25b714830a977c501612ee497501bb
-DIST pylint-2.9.4.gh.tar.gz 777252 BLAKE2B 84bc535b3c471be5d01a02ee67494d993cc257f0938e1bb0e35b1d64415d256c4f0dabd45cdc3319716c67e5e71ea935b63633f56b97013bd8616296343709d5 SHA512 9b5db20cf2d858e662c309b11cf28bf247b7c5f90de4f747733a0288ff4acced02e0e6b83145e7d940772eb9debf297b9ee6976e0f3ffbd73aaacaa3f4cb51e6
-DIST pylint-2.9.5.gh.tar.gz 778090 BLAKE2B cbcf5427665f56cc37afd08fb537fcc3f17697ca7cdbd7da97bad4093f344c9b961a156f5d141e070fa84c7e07293175a70585a8c996c9cffb7cef80717752af SHA512 84695bae88704391752f4b0944e39f5b44933fee8d88a8839729845b93bbe59876da08ab98645217c4ff2a98fd793a92063123b25a595fb332ce0a3943bcf7e7
-EBUILD pylint-2.8.2.ebuild 1747 BLAKE2B a3bb2622c8b0c0efc01f6a768b1810f4c2e5abced9f64d74bfde68262ec499bb2b27f92ca54d53e90c56ddb285e1aa557cde18a1aeece020d6635a601847dfe8 SHA512 7dcc3c7ee9bbfef1251fd49e94e8ec4298c000fa3765fd63ed8737acaf33a59ea36ea655367685c2031eb2ac39e1a604db3d865ec5a2aa54a2b8f368a5e458b0
-EBUILD pylint-2.9.0.ebuild 1614 BLAKE2B e80781de4e7f7659a3ed4eb7b97babc20016788f817f8f46ccada5fc51125523b025b86328b3dae86db97bca1f04ea571318deb691db8ff9740608ce5413c7b8 SHA512 d268f97c235d15eb981eb9c68d3f21837ff3df5b87f7f9a1a7febffda82d1bc99c6a3a9e8fdd470ae523ece06ca351ec232eecd3adac8db3ba098fb320f490c3
-EBUILD pylint-2.9.1.ebuild 1417 BLAKE2B 5bc256a51f5f1789798601c125f28ca97f91de685cc955d687ebfecbb4acd3034f23c722356d2f8e8ba0e5b1aa1c2f7c396a06c5f9458d2ebfc2217cc870b406 SHA512 8508781be857a114574609adf5cf483e199ba21d5fb95a1e553ebf3c9a2a84d683852646498bf9d794d5a0e719206f5dc854e72cbebf402e41f4bb90ec28f367
-EBUILD pylint-2.9.3.ebuild 1424 BLAKE2B 52fa7d9843bba9a2a65c6fff4c724be00f92971707aee9ce9ce601bc8b4beb8ef29366b3be202e773b4f8fcfde58f14afb36061d6a8c7a6d41ebd9cdbfbc725d SHA512 d9721d86a998d9c5f0942a005718d5f71178747916d96b8fc8d170d52fd39b41f7dc6032751d901cdf9f737a41b3c8d4781b9481eb24438aa3543b270c1e2613
-EBUILD pylint-2.9.4.ebuild 1424 BLAKE2B b2275bca805d7f1228f2efa04885e523340ff1977617657e6f69612d532aaa93536d06bef8b920fd31f695698877797596d24fbe11997df3900b6edca10cccaf SHA512 283cd629c2075238db8e2de55308b980d5c8325fc2ebe8e4e0b8996a5990ce7567a99b792e9fed855f10f587d54badc99beb9555385be78a9695b04c97cbe3c3
-EBUILD pylint-2.9.5.ebuild 1424 BLAKE2B a8e024e6460e91525470f51b6010e436384a0a8b44c86af88553aa2a60d7b36c16851566f1a90d6c7cbafed48fd839c6def04e871790c525e672caf6bebff244 SHA512 901678329e3c7a09be3d0d359d3b692ba5663d6f361a84db07c583a3f58525a73d43f044f12f675f937b06b00ce443125f1f26500f51b9af06625b975daf30f7
+DIST pylint-2.9.6.gh.tar.gz 779390 BLAKE2B b1d8794e1e7ccdde87919eb943f83287c0a7b85b67f3722cbbe68887f2c61ab30b354548e25b70c661234647e35f79beb6aaad5f6be6bfde8c2475cf03676922 SHA512 a23ff089853398df2e4232767ca87c21e4ab4fc6805de80db796c78c56e0da1ade9b0586f5c14a98524bf607e0d240c354cf63287eec7dfdce263188eb19ddce
+EBUILD pylint-2.9.3.ebuild 1417 BLAKE2B 27113579fba476d9e389e1186e39016c40975478f61f6a8ad08a01cf7a1a121d3361b78a968419f92cdf075df8e89a3aed6bc48cf40066c7d2650ae5b2ead861 SHA512 79761e88e4234e352575ea1d26afaf52310ac33e08ed6bbd47d82e7fea4046337cfe00189a0f11747e40e19c09e9121be33526d88bce7c74ffe5bf2cb878dd21
+EBUILD pylint-2.9.6.ebuild 1424 BLAKE2B a8e024e6460e91525470f51b6010e436384a0a8b44c86af88553aa2a60d7b36c16851566f1a90d6c7cbafed48fd839c6def04e871790c525e672caf6bebff244 SHA512 901678329e3c7a09be3d0d359d3b692ba5663d6f361a84db07c583a3f58525a73d43f044f12f675f937b06b00ce443125f1f26500f51b9af06625b975daf30f7
 MISC metadata.xml 1099 BLAKE2B 11aa1f9ede89bc8c27e520c8fe9a8219aeff70c1f456dedcc816217fcff1ec67ecc41a528c93365cef316ec863466b706d4709dcc1237a3aae4edb792e2be7b5 SHA512 d2b4e51b129d7c83727310da44ca9385e81fdaeb350f63560a6a328308bcdcb939ec4e570b02e255fe6c8f68cabeb0d651994058b385598380edb42932785ad5
diff --git a/dev-python/pylint/pylint-2.8.2.ebuild b/dev-python/pylint/pylint-2.8.2.ebuild
deleted file mode 100644
index 9397b75c7271..000000000000
--- a/dev-python/pylint/pylint-2.8.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.5.6[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-		# Fails when graphviz is installed (?!)
-		tests/test_import_graph.py::test_missing_graphviz
-		# TODO
-		'tests/lint/unittest_expand_modules.py::test_expand_modules[files_or_modules1-expected1]'
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.0.ebuild b/dev-python/pylint/pylint-2.9.0.ebuild
deleted file mode 100644
index b874f1067834..000000000000
--- a/dev-python/pylint/pylint-2.9.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.6.1[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-		# Fails when graphviz is installed (?!)
-#		tests/test_import_graph.py::test_missing_graphviz
-		# TODO
-#		'tests/lint/unittest_expand_modules.py::test_expand_modules[files_or_modules1-expected1]'
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.1.ebuild b/dev-python/pylint/pylint-2.9.1.ebuild
deleted file mode 100644
index 72070de692f4..000000000000
--- a/dev-python/pylint/pylint-2.9.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.6.2[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.3.ebuild b/dev-python/pylint/pylint-2.9.3.ebuild
index e32124a3c572..bdecb18a46f8 100644
--- a/dev-python/pylint/pylint-2.9.3.ebuild
+++ b/dev-python/pylint/pylint-2.9.3.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/pylint/pylint-2.9.4.ebuild b/dev-python/pylint/pylint-2.9.4.ebuild
deleted file mode 100644
index 5c1fdf9d9f08..000000000000
--- a/dev-python/pylint/pylint-2.9.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python code static checker"
-HOMEPAGE="https://www.logilab.org/project/pylint
-	https://pypi.org/project/pylint/
-	https://github.com/pycqa/pylint/"
-SRC_URI="
-	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="examples"
-
-RDEPEND="
-	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
-	>=dev-python/astroid-2.6.4[${PYTHON_USEDEP}]
-	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
-	<dev-python/isort-6[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
-	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
-)
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	local skipped_tests=(
-		# No need to run the benchmarks
-		tests/benchmark/test_baseline_benchmarks.py
-	)
-	# Specify the test directory explicitly to avoid import file mismatches
-	epytest tests ${skipped_tests[@]/#/--deselect }
-}
-
-python_install_all() {
-	if use examples ; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pylint/pylint-2.9.5.ebuild b/dev-python/pylint/pylint-2.9.6.ebuild
index 75d26e73965e..75d26e73965e 100644
--- a/dev-python/pylint/pylint-2.9.5.ebuild
+++ b/dev-python/pylint/pylint-2.9.6.ebuild
diff --git a/dev-python/pymysql/Manifest b/dev-python/pymysql/Manifest
index 65ff1e99c27b..f2293099d821 100644
--- a/dev-python/pymysql/Manifest
+++ b/dev-python/pymysql/Manifest
@@ -1,3 +1,3 @@
 DIST pymysql-1.0.2.tar.gz 84985 BLAKE2B f2b740827cfa9a4a9cdfe9d711e78d61c2cac2afbc2f15ecc3e317a7fff7771d3d79b8d963e085f011123029341edd469514d84be8cdc5e9aa143cd0fa2caae5 SHA512 c98633c465705154c0607f4508e4d19986fafb647eac01832f8e3fb0175565958289518f9632897ffba924406fce00881a351dbae05c7d68a55eec2b86a55638
-EBUILD pymysql-1.0.2.ebuild 4160 BLAKE2B 3c7812f5774df3a45f5acc10cbeaa1cdf9207c2755d50767bdc1b1b92ee7d66ebd9602df586238be5d13989d807f80859acc7562d270ae7f244a2dd6d3f7a37e SHA512 9ce8fd728b4daf8e2501506bd025bedb119dea7559493157ddc66e4e4faaf4e7c69284f69968263a7c145ce1c21a9a857cde4465a904ea11aaa3d6237a73ac7b
+EBUILD pymysql-1.0.2.ebuild 4167 BLAKE2B 81a641b265451273fdccd52089ae2982b447f719b47e65882454431363a0817d17f0a961cf54a0a6554f4bf078a1de8c6cdc99c218ea0466cdf96f752d8ad85a SHA512 b0a796d130ab03de9869e89ac8f6f70a38746dc6d85641b3fe427bb26a08a8abfd220bb6b3bb5409c3a7ab520baaeedf760ece125a8f5689f38566dab6e5c490
 MISC metadata.xml 493 BLAKE2B df91299acd855c04a29b3c0cf33b450de6a9687b3c45a0c59cc55a69c544d561f107da1d90a1b52dffaa13fe218cef978edb4b7036eb62651da7de39568fdc00 SHA512 ae8cbe0ea29c8457dbbfd4cc21169fce54b868f93045f5ebbd9c8909b052c7efa2cedacc1ba5ec13d1ab9476b39cc595a52ee9ceb489b6aec3f824f2027fc4c6
diff --git a/dev-python/pymysql/pymysql-1.0.2.ebuild b/dev-python/pymysql/pymysql-1.0.2.ebuild
index edfdfad33fb7..16e67d735237 100644
--- a/dev-python/pymysql/pymysql-1.0.2.ebuild
+++ b/dev-python/pymysql/pymysql-1.0.2.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86"
 
 # TODO: support other mysql variants
 BDEPEND="
diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
index 1ad3949b8edf..794bb1ba9e82 100644
--- a/dev-python/pyotherside/Manifest
+++ b/dev-python/pyotherside/Manifest
@@ -1,3 +1,3 @@
 DIST pyotherside-1.5.9.tar.gz 185230 BLAKE2B 7130f17f29ed07cefc641d77631db46d08f3bd836c8517427e38fb454cbf34c2e875bb46798b3d785aa68064c24f154ed166617cde263f722e77eac6d0903980 SHA512 62c171b273b921d8e0220c7b73f0ff95a0a911eb3785cc37f3dab2ec624e54301ac5fbccfb57cac6a4bee967728624d4738b03aff0c5762452b99674cdff6ab2
-EBUILD pyotherside-1.5.9.ebuild 803 BLAKE2B b86f230984f73339fe89344d87782b22886af45181b19a98f4e14451fd3e19a118a5450581f11fbca9cd952ed559ee31df742c475d96c285cb7cd1cbf96044f6 SHA512 e34ab147d78f016d81f15d44bf453fa7e12f64433229500f70d7738fc0b544ef37928f0f41ce63f59be7492587eaddbf87197f4e7c114246a91f061da6ac6976
+EBUILD pyotherside-1.5.9.ebuild 803 BLAKE2B 37b499118ea6679ff3a4a361682cc5662e3095443204818999467223335a7ea9477844672dbcf6b18c193e76cbe1645fe7ed34c49aa60b9b150f546ad5462818 SHA512 e92085ae7cc0f10884bf67134e314584bb4c95f79c8a82e5fb96ddb101637e158cd9639848d146bc73f3528b8c7af44c4a2e55935f96ca9d4e0a0bc4038acfc1
 MISC metadata.xml 257 BLAKE2B fd7fdb57fdce3a565a08cedc4d99216724e4013515d77ea89cb41a5c01e8f5479cab25fe53d44a705e3a71164cdc3c93e658e61deae654a13e5c2471dd83c57c SHA512 35e59430f93d3bb2e7e3042a2464b84f8e6cdf1e1624c1e7674bfc5147f9b9694da6b39ac081ed5fc22f1623aea889b743cfee11007911f3c8c17cf61443675b
diff --git a/dev-python/pyotherside/pyotherside-1.5.9.ebuild b/dev-python/pyotherside/pyotherside-1.5.9.ebuild
index b461490aaff0..d049997d34b9 100644
--- a/dev-python/pyotherside/pyotherside-1.5.9.ebuild
+++ b/dev-python/pyotherside/pyotherside-1.5.9.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit qmake-utils python-single-r1
 
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index cb7c12215809..a506cfe8425a 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,5 +1,5 @@
 DIST Pyphen-0.10.0.tar.gz 1894118 BLAKE2B c33283d6eb3dd7affb52b91826fa0f8fab8ec8f858158e905e8487dc2ad8c77a88e4b25699ed6272d246bcf8a926560e18ec224f59703452ea1ad5c921e4fb4b SHA512 b6d789ca6eb010c1c79b28a9a0e68620ea5600adc43111bed5dbda3cb8b3a4c8c05caa3fb44ea60b0ef4a20272f17cf5e6fe61f0d1e48038395407ff53da7a92
 DIST Pyphen-0.11.0.tar.gz 1967507 BLAKE2B 0bea108e78894082f59693a4ffa6c7f9f6aaec5fc10d0ecf4dc9b6c12fbcfde2cdd835e813b1041797cbc30d5e6e33f5626a517e8cc0535a7a001c8ac779fa4c SHA512 cdb4ee065698e27a4662984b76ee5c494c0d8e7d6b377667399f40d0dffc2b1d730956f3fa1fe73a08c17601152c99321b6fd5dd4d48361c54e9a6b635f02f0d
 EBUILD pyphen-0.10.0.ebuild 515 BLAKE2B 0a1542e49d1116483571bbc7f6fd921f86646f1dbdf9741a5b5224a46796678d4442b9166818ac50ae8d6664d66962da3515539ee34d1b0fbdb96e567e9de494 SHA512 e68b9996049d39c91d52842b2180017f2a066808b75f24c59ed1fe46abb81b6acff6cc72878272fc64290cddd29d5d4bf4e458546555adf289649a079c5c21c5
-EBUILD pyphen-0.11.0.ebuild 708 BLAKE2B 4eac85ae38801013595b822e119b9dde4c0b05ebe3cf9b5a056a2d62b8be1465e4a39318c8474243de8ddac8db83b2859055cbf545641811e4b5a0cf19db13df SHA512 d12540e3e33b823d1d1b2b0c2fb2d3d0904a084903406dfdda686c3de9cc8a2a35c8a53c8f01b9f87dbde4f93a289e6166d1ee069ea44e3d27e77375c1008399
-MISC metadata.xml 409 BLAKE2B 3ec65099621f94904aea69465bdc2163554677e4312d51f925df9d792deb790aa1511b0c9e8fa86a4416f083b1f8b0072a71b88480c46e46ebe30165f560a63f SHA512 4462817e8689c52a47fc71cf2f73204c8a0963bffed85fd803993236aa2d36924c92a232d0bee5b3153a6dbad85c5808c2cf42df5ab8b6bd585d5045650802a8
+EBUILD pyphen-0.11.0-r1.ebuild 708 BLAKE2B 32e73adf13df43c0be9171b95a05c2524db44edbfed1585f384b617e77d284df4babf9dcc7d372c65fe07072ef67055f3829c20f2b90576c6db566c702234595 SHA512 b9e3c6dbd30105a317f4674212cd5ab3a9b8f0cb16e10c3f1fa25786401b0e5f61c5cb55fa668abb2fe8a1dadd44274c333d668c70a68ad34d647b26adff2c9f
+MISC metadata.xml 497 BLAKE2B 9b11a388645cedd25ed7735fb9e383391020c34b7a8d2d1518f14da7a470a1909fbf847dde332b6744dc4c9bc0fa6d024eb1f4ded55a9b85a2d522ea771384b9 SHA512 10bfc4fac128f5c2fc932bc9ea6d507df066e6d29153cd319ad1bed1c41d0bb839414c21e9ff1dedbde232e5d791cee754986e7ed934d4df7e9a3a64622ddb71
diff --git a/dev-python/pyphen/metadata.xml b/dev-python/pyphen/metadata.xml
index 280fbeed7d1d..c71a7cb4d0aa 100644
--- a/dev-python/pyphen/metadata.xml
+++ b/dev-python/pyphen/metadata.xml
@@ -1,13 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>whissi@gentoo.org</email>
-    <name>Thomas Deutschmann</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">Pyphen</remote-id>
-    <remote-id type="github">Kozea/Pyphen</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>whissi@gentoo.org</email>
+		<name>Thomas Deutschmann</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">Pyphen</remote-id>
+		<remote-id type="github">Kozea/Pyphen</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyphen/pyphen-0.11.0.ebuild b/dev-python/pyphen/pyphen-0.11.0-r1.ebuild
index 9fd945456c9a..6483d12818a0 100644
--- a/dev-python/pyphen/pyphen-0.11.0.ebuild
+++ b/dev-python/pyphen/pyphen-0.11.0-r1.ebuild
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 BDEPEND="
-	>=dev-python/pyproject2setuppy-17[${PYTHON_USEDEP}]"
+	>=dev-python/pyproject2setuppy-18[${PYTHON_USEDEP}]"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index ad2ae308508b..0c47e24dd3ea 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,3 +1,5 @@
 DIST pyproject2setuppy-17.tar.gz 12191 BLAKE2B 5be19c9e70abf37d776649237581b1cb281331585c6ffa312f63e50bd2fd8104972861b38958272d5eced086b2a60ed370437807d1eeb382e4ad0cde5f03b0db SHA512 0291f9ad1c3059a4ccd366d8f1078ffd57de89cc128e996126f62a92ac4dded9c7da25be1325ca9f660062ba3a65fd01d62d4ffb22084cec7f4aba79e552ae2f
+DIST pyproject2setuppy-18.tar.gz 12566 BLAKE2B 424aac4c89f498cca61b18bc1e8da3dd72324014d04b2a1e0b7d9aad48b445ddf95117902f6f2d80f9c0e1f3ac808d22dc62b31a2bc41f59820765e49de56a48 SHA512 f29f262ea59cccb698e82de630c8de40fae5a758e71b741c5c5e26639813bc45de13d1479b92a92aaee24edc71ea6f66b0484bba765c4d66eb10e0487bdef080
 EBUILD pyproject2setuppy-17.ebuild 781 BLAKE2B 7777a59955f823ae46991f592da9815467690ea129b0c68449e217700f8e5af25de53407c486245367ecb104a1e8ba570237881de37f9e569a7090ebd5e78386 SHA512 35d001fa3ba56ca4ce3748741dcc1c0761385f1416bef7f8d246d62ded57b94b38c5b2c12343d1635198d9dd1114286952f26e93e3a0bf947487750a84cc8f94
+EBUILD pyproject2setuppy-18.ebuild 789 BLAKE2B fe0e00600f65bd19118748c645d47c6bdc820037a301c847ea5070e7d6d73e469130fd9fbabc01facf39bc93dfe3edc7ebcc5c2c9511bda969eed68d03d228e5 SHA512 2e839ed0a1bd1e69ef9d505c0e2ff0236e093d76bb1018908f08207cb9830bb018c2d1ed8f511e6ac78f9525b533c1a86708b74f2e69bb0dcf3f2277a41a9293
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild
new file mode 100644
index 000000000000..bc478cc41369
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-18.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
+HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
+SRC_URI="
+	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index a6244514294b..dcbf76f4a52a 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -1,4 +1,7 @@
 DIST pypy-exe-7.3.4-1.amd64.xpak 13659131 BLAKE2B f8dc0875bec1027fd86499d13e435f97bd015882260b449de279ef41f8b8e9b89fc6e9f197539314ada54e2435a2cb7e7baf3da6e47b872d6717c847c3b7ddcf SHA512 e14312457c1fed4d815c7dee0487b5d77e781b3139381a142156e6fc524df7e7f4f613799a570716d89c95fd704ecad3c095f839296d7c1e63bd675aaac2c92e
 DIST pypy-exe-7.3.4-1.x86.xpak 10291603 BLAKE2B 62e83aa57b176a02a64a1826515763c24d008a02733ef32040ba2c908dffaca371cda3f55eddecfe93f45c1ba52aa7d0ccb898d84f0dbf8ab004f8a79a3814bb SHA512 73c6481530f4c4305a16d12995b11860023f7516737f892df7911d1effd01142c22f2318fb3b392e2483b976fa2609dbff37b61ad8847e395cbaaccbac0301dd
-EBUILD pypy-exe-bin-7.3.4.ebuild 1089 BLAKE2B e5ae34937ba2774e660e91fd3ca1a1a4e11d505c0ad7783bf7ff24d61bed3138965bc769d01c3fcf6413664f92f4819747fb96badb6c489c730217718a5e4685 SHA512 b85514d575478a4f14dfc19dc389a563d96e91e57b38219b5d65c6a75dfebd353bc19a806d3701e23e79a9d83b038fdde5cd09960c655834ba7a7bae15e944e0
+DIST pypy-exe-7.3.5-1.amd64.xpak 13646862 BLAKE2B ac2aecdb15d5b73cbd27b8a295ef5f11895ed7f897cda93cdff96c72ad727ab7998332231a1166100126ec2252b7c5b69e6b5bbfcb3e7fcb7738f5967809f5d8 SHA512 346f7b47d0e48799edd0e00b6bf683053ccaf20e6663ddd01e5753703082035cb4079a3539981813fc54abd7f83456353c38bd733dacf782e59a6548f861d1a7
+DIST pypy-exe-7.3.5-1.x86.xpak 10297092 BLAKE2B 149672f5714959deeb790b575e7980c1281b1cf37c0853e3ddf8c150104b2da0b8d32736eacc31f67d4d522902599e64bec7427727e560d8d54bbe7c5bd9a06e SHA512 48e4858489e928d44dd8570b783623eb33ce7a1fb62b2a054cd2841ca2be8ab7dd3bbd00c3aff770c1f8dc42ef52f52da3d18c5c27ebd08d19e78bdf56081e96
+EBUILD pypy-exe-bin-7.3.4-r1.ebuild 1126 BLAKE2B bd04e885a90a599f9e64d86460ec8f74abf622d83cd8eefccfcde349ed06f67ecc956770133af99fb48533fd2b8235e54bcef2a719fcab696759213a009c950e SHA512 eb58e00a86ede3626a7c8410ea2e6edcd7bd074f6095d44ad3cac985f9fd94ebc575606fbf31aba375cbeede04f2f8adc2d0aabb3019bae74ec362fa0d26f0b6
+EBUILD pypy-exe-bin-7.3.5.ebuild 1128 BLAKE2B 0507740d1a55e866814928a0d02f62293870caf4bdd0e6dc2639ffed421698f7277521bef8cf67ddef37864574e082d13198396b338d7b67cf8bab32cb988f70 SHA512 98a8fabf20ec50ddd8213eba6d1d5f0015a2543657dc330ec9d62e3fbb806ffd76d07ece7eccc5cea01b495bed6a9fcf05481151c33ccbfc793ef02502ec9c5e
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4-r1.ebuild
index 3d0b3fd13699..fbee1716b1b9 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4-r1.ebuild
@@ -24,7 +24,10 @@ SLOT="${PV%_p*}"
 KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
 	virtual/libintl:0/0
 	dev-libs/expat:0/0
 	app-arch/bzip2:0/1
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.5.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.5.ebuild
new file mode 100644
index 000000000000..9b5d5b8367c4
--- /dev/null
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.5.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 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://www.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%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		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:${SLOT}"
+
+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 454a70fe1850..639b6263909a 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,7 +1,10 @@
 DIST pypy2.7-gentoo-patches-7.3.4.tar.xz 7844 BLAKE2B d06694fa085667e40ef8805c29f7ccf95b49f9de4e99e3ebfa3d69c4202a0ddcebb54c524d7d9f9ec67573a8d2ebe38fb7023d4d3ecef67afc907ecef5c16c02 SHA512 aa8ffefb5d30070ae86c1c14c55c277e39d3da66aea3a0951319158fb65e716e7fa7864e8bf5d26314d4b2a8030c766b63cad6a3663822d2875cd8cc1f3f2de5
+DIST pypy2.7-gentoo-patches-7.3.5.tar.xz 6928 BLAKE2B 41aff14411882e60102866a41de6a2c13983d5489c9ed928e2823714883b5cca289c093426fdec35b6df8d17de7a96528d799e10412a0f2f02563e152acf24ea SHA512 f12c1a414cf40e86e9d2a7d1cdfaaacc1045f8043da479b5270ef983ffcf01418a70bbd21ae740abf544091cdc5026bffe467d631242d5e9e0863a64fa8d026b
 DIST pypy2.7-gentoo-patches-7.3.5rc3.tar.xz 5796 BLAKE2B b1c0fb0a8d86d117a9d4102777605eedd026b614f4b66272b3fc5da246bbe5edf516e95a40471117b61078c18b9fc615e55e0992a5d0a1be7caf9026ee26b6be SHA512 8699813837dfa4560a6e73b96f770c5d5999ce008e17cf62a856a454cb0b63146787a54934874162c79345488959e0936b3bd03823bc9f8e276f80df1122f7a8
 DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
+DIST pypy2.7-v7.3.5-src.tar.bz2 21572184 BLAKE2B 388b8623c2c5de839dea0e60acc5e11a6a774b4a6cdc051691053a97fe13ec12c6735a4be64015653ef420c0d8af2c79d8faa90a7dfc3042e29f35f4e1ded6c3 SHA512 a30c666c29eec7cca7e2e52f26480958b5885cd59c6b2e3d3c0d8c1cc55c298e878fc95f88e38a4297bb3d7d1cc1f77470de958e5acfd317e1fc8bdd5d013dcb
 DIST pypy2.7-v7.3.5rc3-src.tar.bz2 21563312 BLAKE2B e343dcd617026ea5f951f3d24deeb59736c9a6ecc91d1b9c1bd980b6f3c239a5bf0edb9b72a0847a6aeeaead8aca9ecf537af81c9fcf0a2f6647c99edc0d1735 SHA512 e080771ea10a30820f8844b3f512a7681f2e619e8a37fa8ac60198f3c8c3780a8e08aa63749be375c00cd547994f428df44e2cd9f61b272b215ded433374e0a1
 EBUILD pypy-exe-7.3.4.ebuild 4300 BLAKE2B 0b02d3c04a0921c1a0de139ce1ea6990c923931641567e57a5827e40f87d8538ca2d0f500ef062260b43ded984f8ec6063d72ded50600b3a8b643224b5d67a7d SHA512 d3b388afb00117df5c739fdf6a27e9dfe1e8b892b0e248e8ad915bc4661ad24da3119340e5a32fa4c09b9800329461760b0a17b3eb37f6fc294912ec06b9fb08
+EBUILD pypy-exe-7.3.5.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
 EBUILD pypy-exe-7.3.5_rc3.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.5.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.5.ebuild
new file mode 100644
index 000000000000..8678327f1313
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.5.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+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"
+SLOT="${PYPY_PV}"
+KEYWORDS=""
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PYPY_PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${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 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"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 5e7f6e260a26..c3f7ffa4183c 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,11 +1,14 @@
 DIST pypy2.7-gentoo-patches-7.3.4.tar.xz 7844 BLAKE2B d06694fa085667e40ef8805c29f7ccf95b49f9de4e99e3ebfa3d69c4202a0ddcebb54c524d7d9f9ec67573a8d2ebe38fb7023d4d3ecef67afc907ecef5c16c02 SHA512 aa8ffefb5d30070ae86c1c14c55c277e39d3da66aea3a0951319158fb65e716e7fa7864e8bf5d26314d4b2a8030c766b63cad6a3663822d2875cd8cc1f3f2de5
 DIST pypy2.7-gentoo-patches-7.3.4_p1.tar.xz 8880 BLAKE2B dbf76e26b38187aafc5d60ee6189148d6211624689d5c6151d9c77ea5d744774db1bdf7230f97da16623045525449eeefc9d6ead168d8fdb166593c203918601 SHA512 78ed998ec6b8f2ac4bdd381496477d5e337841b1d7da0e77bd39a4748d3dd1a08ac6353561ca618d4cade24d26756ff4c221459162bc532e6597b8e9c7cd8d62
+DIST pypy2.7-gentoo-patches-7.3.5.tar.xz 6928 BLAKE2B 41aff14411882e60102866a41de6a2c13983d5489c9ed928e2823714883b5cca289c093426fdec35b6df8d17de7a96528d799e10412a0f2f02563e152acf24ea SHA512 f12c1a414cf40e86e9d2a7d1cdfaaacc1045f8043da479b5270ef983ffcf01418a70bbd21ae740abf544091cdc5026bffe467d631242d5e9e0863a64fa8d026b
 DIST pypy2.7-gentoo-patches-7.3.5rc3.tar.xz 5796 BLAKE2B b1c0fb0a8d86d117a9d4102777605eedd026b614f4b66272b3fc5da246bbe5edf516e95a40471117b61078c18b9fc615e55e0992a5d0a1be7caf9026ee26b6be SHA512 8699813837dfa4560a6e73b96f770c5d5999ce008e17cf62a856a454cb0b63146787a54934874162c79345488959e0936b3bd03823bc9f8e276f80df1122f7a8
 DIST pypy2.7-gentoo-patches-7.3.5rc3_p1.tar.xz 6932 BLAKE2B 730c52170dc5b6e893dc8c500b0cfd6bbf84830a4813e808a6a091fcd521bf58496fbe66c93b3bfc19a9032be2fb14ed182542d0831a5fd7e862c3fcdb4f5faa SHA512 088dad634acfb052992d0c4a3c54ba0e7f227c86848c88a94e94d84a9f7447a552aafd5566f39af0918b6b4c9dd279da3c698d0d8c9d362bd5ba13aa3f4a4d27
 DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
+DIST pypy2.7-v7.3.5-src.tar.bz2 21572184 BLAKE2B 388b8623c2c5de839dea0e60acc5e11a6a774b4a6cdc051691053a97fe13ec12c6735a4be64015653ef420c0d8af2c79d8faa90a7dfc3042e29f35f4e1ded6c3 SHA512 a30c666c29eec7cca7e2e52f26480958b5885cd59c6b2e3d3c0d8c1cc55c298e878fc95f88e38a4297bb3d7d1cc1f77470de958e5acfd317e1fc8bdd5d013dcb
 DIST pypy2.7-v7.3.5rc3-src.tar.bz2 21563312 BLAKE2B e343dcd617026ea5f951f3d24deeb59736c9a6ecc91d1b9c1bd980b6f3c239a5bf0edb9b72a0847a6aeeaead8aca9ecf537af81c9fcf0a2f6647c99edc0d1735 SHA512 e080771ea10a30820f8844b3f512a7681f2e619e8a37fa8ac60198f3c8c3780a8e08aa63749be375c00cd547994f428df44e2cd9f61b272b215ded433374e0a1
 EBUILD pypy-7.3.4.ebuild 4820 BLAKE2B efb4bb8f194568c909365e06d2f3c1593145bff3c3fdbfab867bd15368df13cef642029b41739b4547256819f322f4dbe251c64cfac1d8c525391ebca4e8aef0 SHA512 82809ab39edfb0cd54a377740ce223baee9ae9abeb348ee2ae2fd2e1dd203900a1def1ee4c276f748d3823cab04dce8da25e12f3c477cad4fe560252bbd714c4
 EBUILD pypy-7.3.4_p1.ebuild 4830 BLAKE2B e71ef5eaf761e2b805b3130c5f008573c088dfbff05ad135bce23e62549f5c1f3570c2c98486d2fe8e852e662574e27e089db25c14543994c31a5bdddb7915f1 SHA512 9c53907ede4770731868c4343923bc929824c63482bc090bde040874544a056aacb45df1a6b2b098febf658ba050facc3ee650275cd62b91dc8044e875612b23
+EBUILD pypy-7.3.5.ebuild 4787 BLAKE2B 1fe07cb6231ea4d2a584fb0e37d4a105f44b4d252f27b88088fa53c74b00bf8c257706afbdcea41b60e57b514aab3fb227f96b8c2534efaf54ae5c267fe58b30 SHA512 e949d2683425f7548326bf2a06ee1eb19b8736df88ab580a784ccff5655ade6804f1a86983103c7d9c45258a55fe80e8272e29fd285ca14ab1b4ef0fa8d541af
 EBUILD pypy-7.3.5_rc3.ebuild 4777 BLAKE2B 7893108718dc64d1514fddbd491db3157b0ae067e4a6eeca980ddc5ed09eec88d8524a733816ad5124ac80c3e716dda1a8b1567f3d15a4e98588db0fbc24891d SHA512 19b23d8467aed4ceacae09b9f06d25ce111578e592a8414217101a8cd9b4a928e9da6e897133e23925ea812365e2fa52a9e1c44b657a2094e0a7ace13c7c4fa5
 EBUILD pypy-7.3.5_rc3_p1.ebuild 4787 BLAKE2B 1fe07cb6231ea4d2a584fb0e37d4a105f44b4d252f27b88088fa53c74b00bf8c257706afbdcea41b60e57b514aab3fb227f96b8c2534efaf54ae5c267fe58b30 SHA512 e949d2683425f7548326bf2a06ee1eb19b8736df88ab580a784ccff5655ade6804f1a86983103c7d9c45258a55fe80e8272e29fd285ca14ab1b4ef0fa8d541af
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/pypy-7.3.5.ebuild b/dev-python/pypy/pypy-7.3.5.ebuild
new file mode 100644
index 000000000000..47c2d5b35300
--- /dev/null
+++ b/dev-python/pypy/pypy-7.3.5.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit pax-utils python-utils-r1
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
+HOMEPAGE="https://www.pypy.org/"
+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=""
+IUSE="bzip2 gdbm +jit ncurses sqlite tk"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/2.7/distutils/command/install.py || die
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	einfo "Installing PyPy ..."
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy2.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 3930799b3d58..5d7755a68bf1 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -1,4 +1,7 @@
 DIST pypy3-exe-7.3.4-1.amd64.xpak 12038379 BLAKE2B 6f51ec285cedef0703a9e145e5ac0ada1d19585be97997a8156a3964949490fd0c874b8c355433d3cd04df4df5c11be7f5badefe2e9c69129052fe51de627a72 SHA512 f1badabde936f5dc5700fda01941be249f4a056f1d61a685bb8c168a5cca6eac4c7e6cd660a5a5d2695307a3b7f4ef1941e5ea63a57816b669d54f497a1a5b91
 DIST pypy3-exe-7.3.4-1.x86.xpak 9159557 BLAKE2B 754fd401084c480a5a2a20c6e9a533fa5f691cbca06b0516d3d44fdf9529541c43f84fccdfdd70422231ddb887a9f5a9e38789b6fc3dce81d9f0fafade587bec SHA512 ff05c3ae252b0a5eeb403a18782707ea8884126763a83bcebe1e60934ad7cd6070db24ebeeffb15397b6c02fc68766011438b2064b484ae6d24991311e2a012a
-EBUILD pypy3-exe-bin-7.3.4.ebuild 1125 BLAKE2B c73b6673f3fba074df41979e3ce6f8f01ed51f3fbd7e95141e3fcb9340a1f434adda98465276d19c235d8dd94aa1422aaac5ef7fb33b4e6853f7c08eef9f48f1 SHA512 b7a4c2074b7b15a91aa546c40c61d24b0c1259ae677260182d6b7eb625c795fc23b9b469b44ee151b45b545431305b53f7379a6fc32f0b93d5fb6571fd741313
+DIST pypy3-exe-7.3.5-1.amd64.xpak 12030139 BLAKE2B f9a76a2304b3a29985209910b2082aeb07f08a22fce771aa7d548af6e662b88563f61b66582fe0ded21a00463725d4b21cb943c6dedba090cdcfcbf2754433f6 SHA512 d223095cc28f5fceb10196a172ddc2e363dd7e0c5e55b79c959d2ff3f84cb96c652e44bf8c2f7b4555d90289fa0768b18cc26a9212264ab397dd7308a14a93df
+DIST pypy3-exe-7.3.5-1.x86.xpak 9156096 BLAKE2B c3a3a329c2f8bd843fc4c882bbddc1ad124dc797d4915818769e79663e53e787b991b04b8006e8b8548249e4e76d8b68545b9d7470d8cf41bece2cd8e085066c SHA512 b58d48e1fde3ec12b497a30035b719a64a16de1292fb34df6a8e3ecddc277a477641d7781a3440ef2b73dfb1b50ca34cbdca702f27d6a5e00ad25e88bd8ebf34
+EBUILD pypy3-exe-bin-7.3.4-r1.ebuild 1162 BLAKE2B 5b49c04df2ba2eed082c45fc9976bb7a02ff9b5fcedb41b25806b012afabd5150ea69e864126193d072dc248540940078a6fedbb9cab1287cf4fb3a95297650c SHA512 272007a6ed553f258a4c12cf7860363620b19b3acc0f74a21b12008bc7efbcbb387f97fe52d690b2d7efe911b9a3e2fee5cfc9afe0edbcfae61c2011093b4ff4
+EBUILD pypy3-exe-bin-7.3.5.ebuild 1164 BLAKE2B 9ccd73f47c4fcfdf77a27b103fc916da17934b7f54a163de93f8f45d20ecab9396222784d76a079c05ad12a82a29d8bfaa55129528d8973753e90b71c6160067 SHA512 7ac8143d68fcfe6ce126ae6ee97d6c1807c47a6dbc07f6b21babdd00ee488835adb6d0205c5dc41aae423362cfe7fc79f870433cb444a554d82a292015005292
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4-r1.ebuild
index 277fe587ef6d..64af9ea94084 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4-r1.ebuild
@@ -24,7 +24,10 @@ SLOT="${PV%_p*}"
 KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
-	dev-libs/libffi:0/7
+	|| (
+		dev-libs/libffi-compat:7
+		dev-libs/libffi:0/7
+	)
 	virtual/libintl:0/0
 	dev-libs/expat:0/0
 	app-arch/bzip2:0/1
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.5.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.5.ebuild
new file mode 100644
index 000000000000..b8309912e695
--- /dev/null
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.5.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 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://www.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%_p*}"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0/1
+	|| (
+		dev-libs/libffi-compat:7
+		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:${SLOT}"
+
+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 dcbd73ef7017..a70cc017d7b1 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,7 +1,10 @@
 DIST pypy3.7-gentoo-patches-7.3.4.tar.xz 8464 BLAKE2B 6d458a41e87eabeb2920b28752fe5cc49bbfc9c5f03d2fc1321362fbd02e9dfb3b41c99cb765b7f2644b9c49c5c60f879ad1c60a66bc991462edb50215b1802d SHA512 1282cf2fa9054209ceb5a91e0b4adcd86de33a326230fabe154b572d5e798d81e93d136e815f1c2816fbfdd5071fcfc175585d4fa5ae93145938bb4cf1d2baa7
+DIST pypy3.7-gentoo-patches-7.3.5.tar.xz 8164 BLAKE2B 0f8707fda16c0358c1d3a2a60d83046bc5c6186906e07d0e2441d26da4c5d2e7978aa9013be211daf0a1bfddbb10f96745ba4be84b61903e177f4d906045ed67 SHA512 95d3acb11c811e4342ba3a56e925433614c5affb6a1fc873ecd2f2cfd55459424088b928f46bcb9a6f0e467fb77905af387ad04bad45a37b928fe0ea320ac33e
 DIST pypy3.7-gentoo-patches-7.3.5rc3.tar.xz 4872 BLAKE2B 15970c21eb209407af5234719755dd5ddfce95f5b7dd5d525126045d71a00f22d56f26e54a85b94e54dd286334a39cb08abf681e56d466547be206322cf319ac SHA512 4a946560daaba8214f3f5cf828128293bc9aa0eec7d0000e184b3791165f255a7169ee63f9a569a1faed9e8095f593ac7982d49a07f93e085b41be50b275ce3f
 DIST pypy3.7-v7.3.4-src.tar.bz2 25344083 BLAKE2B e88dd0cfcc6123dbf894f603162ebe43675c96b992d15c29e14a611a166b8da8d1d2f3298e65e5794b295215440cb88f31d252fcdaef1a0dab52777c24212a49 SHA512 c570d34f284f41dcd8dd909216c69831dd83b8501423c7635a4fe506fb16fd3705cf87975a664735e52d0b805a0432267d611a993437d17aac3defe4b9ea4401
+DIST pypy3.7-v7.3.5-src.tar.bz2 25350766 BLAKE2B 34d5c83284271b184f71492dbd65b8760cc0fcdec71e41ef48b9561280dd67ef4c37fdd70759d0b95114d127446fc0ea5d04feb99022c1a725233862b2028834 SHA512 253d2efc81d55fb392ab810741e3a633f664e1908b2c26db7a8830c971655cca6be1b8d34581d13aa2d738a4a4c8ba23c2c90333b6e03d4608372e8013ea723b
 DIST pypy3.7-v7.3.5rc3-src.tar.bz2 25255084 BLAKE2B 10a7c6c9879b2956726e9457e6939cf7597136dcc54bd8d6c20311468ed622697c151fb6209d49fda21e0710d0c3d18f702f43b01720341b7967663b007b1f09 SHA512 6ec569cf80741a540f39687e3cc1c4bf18c4cd038ed1b0782a333ab03e5f85ca221e3af4549d2332c78fcab5a430bd59a5ab14f9fa333624f6f1b9441049b5c3
 EBUILD pypy3-exe-7.3.4.ebuild 3875 BLAKE2B aed7bde6ddbefa3a5abeeae05cf4c5fec25f6e83141d998a2b6f95fae214fc4d986f01293ea50dfff07f85cbd39fc28c87b8f45810ac552ad97d2b1d1ae16be9 SHA512 026a3a4b44f4d1916c9e8c520ac4021035bc08aeb98b8bc676bab0a2b04e34656b8a5885930b3ba6dad82d0eff788bee14bc10598d7d8a17e4b398c013efb3bb
+EBUILD pypy3-exe-7.3.5.ebuild 3824 BLAKE2B 0b6a08dfbb51402cb56e237197d19a529ac9a6f796f42a0218df8c1eee1335eb59cc7ef222098aad834c62440435391875705b4a323d523bef529a482ea9fe12 SHA512 814805ea1503c05063c0de5bf81674d85cb01dae33903914cc4e9a2a12e9880680065fd04de602fec8afb72fe2540fe81b6ed17551fbbdc937cc28951783b5aa
 EBUILD pypy3-exe-7.3.5_rc3.ebuild 3824 BLAKE2B 0b6a08dfbb51402cb56e237197d19a529ac9a6f796f42a0218df8c1eee1335eb59cc7ef222098aad834c62440435391875705b4a323d523bef529a482ea9fe12 SHA512 814805ea1503c05063c0de5bf81674d85cb01dae33903914cc4e9a2a12e9880680065fd04de602fec8afb72fe2540fe81b6ed17551fbbdc937cc28951783b5aa
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild
new file mode 100644
index 000000000000..70dd2bacbc82
--- /dev/null
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.5.ebuild
@@ -0,0 +1,167 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pypy3 needs to be built using python 2
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.7-v${PYPY_PV/_}
+PATCHSET="pypy3.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy3 executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+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"
+SLOT="${PYPY_PV}"
+KEYWORDS=""
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy3-exe-bin:${PYPY_PV}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	low-memory? ( dev-python/pypy )
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		# unset to allow forcing pypy below :)
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please install"
+			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${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 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"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index ea71e7cc9fa9..fc9ccb62ee0a 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,7 +1,10 @@
 DIST pypy3.7-gentoo-patches-7.3.4_p2.tar.xz 13268 BLAKE2B 175d6bd4ed8345f3e0c2e35b3904e9180b32262482ef530c213505b3b4a0db1912fb8367db6b48786a9ec16f82298fee09683254b86b6c5e97d5c96ec250bfb3 SHA512 e00b0b909a8e7aae33e5fdad4b23072f1d720236c3dfd2dc4273339205af6d575610aa41b779e894db48f48621a0c5544d9054e1a104d5fedc3de9c3df01e1c2
+DIST pypy3.7-gentoo-patches-7.3.5.tar.xz 8164 BLAKE2B 0f8707fda16c0358c1d3a2a60d83046bc5c6186906e07d0e2441d26da4c5d2e7978aa9013be211daf0a1bfddbb10f96745ba4be84b61903e177f4d906045ed67 SHA512 95d3acb11c811e4342ba3a56e925433614c5affb6a1fc873ecd2f2cfd55459424088b928f46bcb9a6f0e467fb77905af387ad04bad45a37b928fe0ea320ac33e
 DIST pypy3.7-gentoo-patches-7.3.5rc3_p1.tar.xz 8168 BLAKE2B d7da84e1b0e8dae1dfd712b5cda98ca021048be40df89a94607819712c6370fd22dafdd25fa2955c240ac7662cf75a76f0fb5c0309db727ce28b0978d7fe9fa7 SHA512 642b831754431b3a4441494dbb434b8d66fa48e67c23fb9fe94b15851a087e663397c39762e80c72f22fd1973c99304d5ca48d9222b4352d5dda55142e899f2d
 DIST pypy3.7-v7.3.4-src.tar.bz2 25344083 BLAKE2B e88dd0cfcc6123dbf894f603162ebe43675c96b992d15c29e14a611a166b8da8d1d2f3298e65e5794b295215440cb88f31d252fcdaef1a0dab52777c24212a49 SHA512 c570d34f284f41dcd8dd909216c69831dd83b8501423c7635a4fe506fb16fd3705cf87975a664735e52d0b805a0432267d611a993437d17aac3defe4b9ea4401
+DIST pypy3.7-v7.3.5-src.tar.bz2 25350766 BLAKE2B 34d5c83284271b184f71492dbd65b8760cc0fcdec71e41ef48b9561280dd67ef4c37fdd70759d0b95114d127446fc0ea5d04feb99022c1a725233862b2028834 SHA512 253d2efc81d55fb392ab810741e3a633f664e1908b2c26db7a8830c971655cca6be1b8d34581d13aa2d738a4a4c8ba23c2c90333b6e03d4608372e8013ea723b
 DIST pypy3.7-v7.3.5rc3-src.tar.bz2 25255084 BLAKE2B 10a7c6c9879b2956726e9457e6939cf7597136dcc54bd8d6c20311468ed622697c151fb6209d49fda21e0710d0c3d18f702f43b01720341b7967663b007b1f09 SHA512 6ec569cf80741a540f39687e3cc1c4bf18c4cd038ed1b0782a333ab03e5f85ca221e3af4549d2332c78fcab5a430bd59a5ab14f9fa333624f6f1b9441049b5c3
 EBUILD pypy3-7.3.4_p2.ebuild 5274 BLAKE2B 45a63059149ff71d2265bfef4def2a21d8ec28a540da920db28632f89aed621f8e08962ef42af4a2c0fa0575cae31f1e202aec38ab588bfcf035209efb6d584e SHA512 6691ef7c48642f8c08cac7d4bcf23f31231c631f9a0437131ed1e92245ef1b16885639920e3f2074c9eb52ba0e5eea681eb97c040a186fe055240c38b7db1923
+EBUILD pypy3-7.3.5.ebuild 5228 BLAKE2B d30e872fb4622052ff0b47fd776c27bd35cf591b34e6602ec8d07daa482db19b3141b2fd37a3dbdca0dd4a86cf7e99cd98d6247eaa2cde15457d30e98c58c082 SHA512 f4106c094e7a51f268d8e8b166aed79ffd1ac2c4580e8acea9f780c3713acfc47805ce8f484e7b5d0ea195a7df6939ebc3290eab84bec610fe2aa6da811a277d
 EBUILD pypy3-7.3.5_rc3_p1.ebuild 5228 BLAKE2B d30e872fb4622052ff0b47fd776c27bd35cf591b34e6602ec8d07daa482db19b3141b2fd37a3dbdca0dd4a86cf7e99cd98d6247eaa2cde15457d30e98c58c082 SHA512 f4106c094e7a51f268d8e8b166aed79ffd1ac2c4580e8acea9f780c3713acfc47805ce8f484e7b5d0ea195a7df6939ebc3290eab84bec610fe2aa6da811a277d
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3/pypy3-7.3.5.ebuild b/dev-python/pypy3/pypy3-7.3.5.ebuild
new file mode 100644
index 000000000000..d75647a2e567
--- /dev/null
+++ b/dev-python/pypy3/pypy3-7.3.5.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.7-v${PYPY_PV/_}
+PATCHSET="pypy3.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
+HOMEPAGE="https://www.pypy.org/"
+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"
+# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
+# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
+SLOT="0/pypy37-pp73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
+# pypy3.7 is in alpha state and a lot of tests are failing
+RESTRICT="test"
+
+RDEPEND="
+	|| (
+		>=dev-python/pypy3-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}:${PYPY_PV}
+	)
+	dev-libs/openssl:0=
+	gdbm? ( sys-libs/gdbm:0= )
+	sqlite? ( dev-db/sqlite:3= )
+	tk? (
+		dev-lang/tk:0=
+		dev-tcltk/tix:0=
+	)
+	!<dev-python/pypy3-bin-7.3.0:0"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		!!dev-python/pytest-forked
+	)"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+
+	sed -e "s^@EPREFIX@^${EPREFIX}^" \
+		-i lib-python/3/distutils/command/install.py || die
+
+	eapply_user
+}
+
+src_configure() {
+	tc-export CC
+}
+
+src_compile() {
+	# copy over to make sys.prefix happy
+	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
+	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
+	# (not installed by pypy)
+	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
+	mv pypy/module/cpyext/include/* include/ || die
+	mv pypy/module/cpyext/parse/*.h include/ || die
+	pax-mark m pypy3-c
+
+	einfo "Generating caches and CFFI modules ..."
+
+	# Generate Grammar and PatternGrammar pickles.
+	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+		|| die "Generation of Grammar and PatternGrammar pickles failed"
+
+	# Generate cffi modules
+	# Please keep in sync with pypy/tool/build_cffi_imports.py!
+#cffi_build_scripts = {
+#    "_blake2": "_blake2/_blake2_build.py",
+#    "_ssl": "_ssl_build.py",
+#    "sqlite3": "_sqlite3_build.py",
+#    "audioop": "_audioop_build.py",
+#    "tk": "_tkinter/tklib_build.py",
+#    "curses": "_curses_build.py" if sys.platform != "win32" else None,
+#    "syslog": "_syslog_build.py" if sys.platform != "win32" else None,
+#    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
+#    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
+#    "resource": "_resource_build.py" if sys.platform != "win32" else None,
+#    "lzma": "_lzma_build.py",
+#    "_decimal": "_decimal_build.py",
+#    "_sha3": "_sha3/_sha3_build.py",
+	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
+		audioop syslog pwdgrp resource lzma decimal )
+	use gdbm && cffi_targets+=( gdbm )
+	use ncurses && cffi_targets+=( curses )
+	use sqlite && cffi_targets+=( sqlite3 )
+	use tk && cffi_targets+=( tkinter/tklib )
+
+	local t
+	# all modules except tkinter output to .
+	# tkinter outputs to the correct dir ...
+	cd lib_pypy || die
+	for t in "${cffi_targets[@]}"; do
+		# tkinter doesn't work via -m
+		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+	done
+
+	# Cleanup temporary objects
+	find -name "_cffi_*.[co]" -delete || die
+	find -type d -empty -delete || die
+}
+
+src_test() {
+	# (unset)
+	local -x PYTHONDONTWRITEBYTECODE=
+	local -x COLUMNS=80
+
+	# Test runner requires Python 2 too. However, it spawns PyPy3
+	# internally so that we end up testing the correct interpreter.
+	# (--deselect for failing doctests)
+	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+}
+
+src_install() {
+	local dest=/usr/lib/pypy3.7
+	einfo "Installing PyPy ..."
+	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
+	insinto "${dest}"
+	# preserve mtimes to avoid obsoleting caches
+	insopts -p
+	doins -r include lib_pypy lib-python
+
+	# replace copied headers with symlinks
+	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
+		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
+	done
+
+	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
+	dodoc README.rst
+
+	if ! use gdbm; then
+		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+	fi
+	if ! use sqlite; then
+		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3* \
+			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+	fi
+	if ! use tk; then
+		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+			"${ED}${dest}"/lib_pypy/_tkinter \
+			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+	fi
+
+	local -x EPYTHON=pypy3
+	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
+	# temporarily copy to build tree to facilitate module builds
+	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+
+	echo "EPYTHON='${EPYTHON}'" > epython.py || die
+	python_moduleinto /usr/lib/pypy3.7/site-packages
+	python_domodule epython.py
+
+	einfo "Byte-compiling Python standard library..."
+	python_optimize "${ED}${dest}"
+
+	# remove to avoid collisions
+	rm "${PYTHON}" || die
+}
diff --git a/dev-python/pysvn/Manifest b/dev-python/pysvn/Manifest
index 4348f8a4fcff..a2358ed25347 100644
--- a/dev-python/pysvn/Manifest
+++ b/dev-python/pysvn/Manifest
@@ -2,6 +2,8 @@ AUX pysvn-1.9.11-respect-flags.patch 5627 BLAKE2B 6a3b4b26581ed05251380eb13b6e77
 AUX pysvn-1.9.13-respect-flags.patch 5843 BLAKE2B 0759be0ccdcdd96fb2d33591772ac399baf46b37186835ecc1f13cf51cbff85d552270afc30240299a1c27cca5df99e9d97a578b0b70c18f9227bec8fbfb245a SHA512 23c7f16f3e1fa9d1ae99360903736232d09ad66591e6c49ae342d33dbd0d27f5a85584d2a4652023425963480773a3b9c0d604905d91192f399c573b06f67fa0
 DIST pysvn-1.9.11.tar.gz 624408 BLAKE2B 2ca13388717cc82b68509843e3b1780bceb5c088c41fadc81206c909eb185ec7c73d0a7453fc4e0c1a78a5186e21d382c79af0fb666edce7f5e72c0cf63e25db SHA512 078dc0e19a1f29d40571de002734943415594bcbe132a4d0e6bf8e8781175345ca1b3a4967a183a15efb1462871a40d8e3879a22c913a649555ca593fb99db89
 DIST pysvn-1.9.13.tar.gz 666722 BLAKE2B 4ada83f474026976309b8fc7876dd860fb68eb73dd0a4db0dd0c2838cc029976d5886462705c8b6aa85c5a6f8081f94df61bcbc1698879537fbeb3125154c1a0 SHA512 26ce9af363efb1aee25f8ed73e5bab56208523cb3e7cbe657a5f1145bc3500b2f370b4dfebf4eaace9f566f5676b053c41acb4d01458e4d6b79bd852ac260aa7
+DIST pysvn-1.9.15.tar.gz 667161 BLAKE2B 35e9e0967d5c0b4cebf546e40df17b66c66406d0f8100c32e6e840220f60b0083c0ed3f3af5f54e2264d06905ea90970d6b7cbfad2bab872a14d5d4aea5900df SHA512 0809507134fd31f6bcc90217e7840eb166e2eb2ed56316010a549dd70f6f855599f596942574343cdefd5997947b12c847df2cd145669f50aa93f603e46a5ee0
 EBUILD pysvn-1.9.11.ebuild 1324 BLAKE2B a4ba06214b0f6343ff0c8af7c86857cd9565c10dcf24a70445bd7c1627828b4abf0afa015e58df190b74b6b7aae48b9fd06278b3e657988d5a7f4abeb0a1ec41 SHA512 66fcd0af0e02c94a7338db96a4fe6a29f955be2ce23f7eb580996e695d727f32985b96db1e35a318be54fce628b931e2387ba9d48de8a3155a13a1d236e0f432
 EBUILD pysvn-1.9.13.ebuild 1750 BLAKE2B 13751eb3b69b91a47b3939eb8d793c412955a5d5db88e9fde574cce071583a04b5f8b0fc6b77fd17dbade1039f2afbf59bb5a5c829f6a9d5417783effd7f11f3 SHA512 9a75ae9734ac1028e80ee6f0627b42f44d7551cc1cac15815f0bf0cd70ab2bfc2941427294e17455e3972dad54a874482398908aec822e5c60e3e055a1abe12b
+EBUILD pysvn-1.9.15.ebuild 1332 BLAKE2B 93b4683afa60b180d7a308fb3adfe9e48c8fa69e368a2327a2faded8b60c43436834c9f7f0e504049e7afef0e969b51c576661629680556bd7c7326b2ab0cab3 SHA512 5fef4ee3806cea84f084fdbee01f265202e6d6097970a7967da29abcdd4637a27c4e2015a3921aebf85b19fd6503335a9b36d0ec2964086d905f719350078828
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-python/pysvn/pysvn-1.9.15.ebuild b/dev-python/pysvn/pysvn-1.9.15.ebuild
new file mode 100644
index 000000000000..9e8fecfbe0e4
--- /dev/null
+++ b/dev-python/pysvn/pysvn-1.9.15.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_IN_SOURCE_BUILD=true
+DISTUTILS_USE_SETUPTOOLS=bdepend  # see setup.py
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Object-oriented python bindings for subversion"
+HOMEPAGE="https://pysvn.sourceforge.io/"
+SRC_URI="mirror://sourceforge/project/pysvn/pysvn/V${PV}/${P}.tar.gz"
+
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc examples"
+
+DEPEND="
+	>=dev-python/pycxx-7.0.2[${PYTHON_USEDEP}]
+	>=dev-vcs/subversion-1.9"
+RDEPEND="${DEPEND}"
+
+python_prepare_all() {
+	# Don't use internal copy of dev-python/pycxx.
+	rm -r Import || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure() {
+	cd Source || die
+	# all config options from 1.7.6 are all already set
+	esetup.py configure
+}
+
+python_compile() {
+	cd Source || die
+	emake \
+		CC="$(tc-getCC)" \
+		CCC="$(tc-getCXX)"
+}
+
+python_test() {
+	cd Tests || die
+	emake
+}
+
+python_install() {
+	cd Source || die
+	python_domodule pysvn
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( Docs/. )
+	if use examples; then
+		docinto examples
+		dodoc -r Examples/Client/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-aiohttp/Manifest b/dev-python/pytest-aiohttp/Manifest
index 78f9985b818c..be67ee3d7c4b 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 548 BLAKE2B bc41bb7754063ca40c08714f2ca32b05eea3bb6f9500afea6e6fe8813f5aaf6b4b889bf608fabde9116586904f4f3994f93c01d0af3a1a3bd4f76ab44e084f3e SHA512 ee4b30294605a806617b01eb06ec1ca4c21a3c534775b1b0231dae3530604cfa968af803a28c2ac7be6e05bf6c9970d7d4d9c30998faf58539704a6002cb7731
+EBUILD pytest-aiohttp-0.3.0-r1.ebuild 549 BLAKE2B dc17c2758b294b805084eed6b5b980aad1fee4ea74093aa72ab13b7ebd8e20dec93daa260159a32a2a68cf38129a8a057468d5ddbc9b1c7a334218903160f49e SHA512 72d4833faf068c58e1ecbf0bf619c8436bc4a3e6b35b6a7a5052881a875616c0494a3d0fc62cdda99f26bb596b0274d3fd7f374bc84bfaf207dc03dc47f73756
 MISC metadata.xml 382 BLAKE2B cd3cf0ec70a8506a0a36c6be50dd70b68c1397c9bac788f15e012d10a4b35d5912c53f4de68bc7cfb3b4c03e84efe053d18b6a16bebff26fbcf935ad6d282645 SHA512 ae3b23c6b0741388a625d45f65e5b51e6ba9596eae3cd26378cca840656cfbe61f580705c82766b8a39dd7c603263bb66299c11d4890ed24b2aa6804bf008791
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 f1ed8d58d2dd..122c4ebbdb2b 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
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-fixture-config/Manifest b/dev-python/pytest-fixture-config/Manifest
index b4d785aab374..dbe815df9587 100644
--- a/dev-python/pytest-fixture-config/Manifest
+++ b/dev-python/pytest-fixture-config/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-fixture-config-1.7.0.tar.gz 9884 BLAKE2B d844b07a8b7d59f6761ee71147a0945225a3f30bdd9b0751972bf6149b444ad95c49f3d5001d6414c535c1a230ed1e47ceb90b26c50324ec21165430e633cc21 SHA512 c861bbbb91efff338255734ddb4a8b615880c32a12c981160e9e7575d38adff8c5febad46bb9b4208634e39d4cfa73dec342265ccc1951168c1b12fd334cd746
-EBUILD pytest-fixture-config-1.7.0-r1.ebuild 850 BLAKE2B 9d0e9c558ab658ecc3b79ae8371a124d5a3a9fc21655d2b168b0463cb3fcb6781f7f37a0d4d106a8a237809f8086b473a5dcb84a39dc7152d03beed370d52eec SHA512 df00f72236bcefdb1f6c64ba30b68eff6e5d7d03d0f289a046037c274b04b3ab8d177e5e056ded4df3e87e3cb962e255bff79062f85181107a8cc5178558ba5c
+EBUILD pytest-fixture-config-1.7.0-r1.ebuild 857 BLAKE2B 6450ce80fc4f686583fbff5af09d0b03f8104876d2a7e1a1d2fc0ce0a30a8dc04f3947194954be8b9b78f966d350784366017805f73ac81423bb9eac8fa497db SHA512 7694ab17f056140928a52cfa754d6a23137d243615a30d68c7636148988b567e05a9cf478250b9af41987a5394f3a7eb1dbbf31beda1abc6a834fe168c5a3d94
 MISC metadata.xml 678 BLAKE2B 9d7e4416bbdafc423e3621840c698db8c0ccacba79340d9c0174301d73bee373dc7aff0e299b0cd787a2813dab517b0bde5f669e5d973eeb2d34a9d6df25d532 SHA512 e65a58f40b53106d63faa1aff2e0ff97e3a184a59294df19346b2c025085395965853794fa90fc7e1d1e8ffcb4b6ea63cdb9fa1f54089adc27158e60eb258416
diff --git a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
index f410e635d27c..a3d6240ccd60 100644
--- a/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
+++ b/dev-python/pytest-fixture-config/pytest-fixture-config-1.7.0-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-shutil/Manifest b/dev-python/pytest-shutil/Manifest
index 32ecdd3b35d0..fe4210e27de2 100644
--- a/dev-python/pytest-shutil/Manifest
+++ b/dev-python/pytest-shutil/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-shutil-1.7.0.tar.gz 23497 BLAKE2B e13641491fb4bd448973b8004ac9ded2f9b7c412ea93af7f9206e5fc38ea7554073374116eeefc529d2ae35e8a25e678fef5a27089af89026077a72d11d6016d SHA512 3746c08b17834621a7142ed9d5915b5c348c13367f5b423b258d3471bcb9c9e983c61c25ca936f879b8b82f80512512b7f3ade5555c24a790c72b502e3f3d144
-EBUILD pytest-shutil-1.7.0-r2.ebuild 1179 BLAKE2B 75e06f8b8b53fc6b6f7be0e27b47457bcca74348bfb950c969e5e1d2fadd1e277d69c0276dde85318006498944aaa8a101c56fcd2b895379f44c4e4577b00c4f SHA512 a0e9544a2652c5bfdbceb6e3c3987ae93356ac734c3d6b10db1111031d273e52c106c498cbdadfb7207ce8b88edbf4045dd55569d7a29dd6acd1eaee479c4748
+EBUILD pytest-shutil-1.7.0-r2.ebuild 1186 BLAKE2B 6fc59754e5a991be4259e0da7bb0355aa1e3cc38c35ad6a999269e0235276e4bf679454578a2322389519857950e69f6f2df814a9002234f9dbedb7ef4c6ddf1 SHA512 1086d7c458b36f133a5e741f8165da51909e4923ada9f1916aeef0fefe96296a38903bec2616f778751f29f4940a5b414feeb098131c097d4a7136e804e0c717
 MISC metadata.xml 732 BLAKE2B afaff2db22c6de29920621f7684dd9cf3a6a070e7d40c2a6ed56fef507fb6dd1ca1b1ac51f106a49c38a556f2c0be244df5c8bae90e71d3ab7d7e1556725d87d SHA512 27c9d4196ec0cad1aa20d3d04c47cc791c9ff19189fd7facf844067c2f81a9c1e00aeeafe2fc65e231fd7039c41eea16c67f6d0f0dcf06386f402ebde03e03ef
diff --git a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
index 8ee1fa7aea61..8fa378acb84e 100644
--- a/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
+++ b/dev-python/pytest-shutil/pytest-shutil-1.7.0-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-virtualenv/Manifest b/dev-python/pytest-virtualenv/Manifest
index bec5996d7c49..afb3553307d8 100644
--- a/dev-python/pytest-virtualenv/Manifest
+++ b/dev-python/pytest-virtualenv/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-virtualenv-1.7.0.tar.gz 15767 BLAKE2B 5ee65aff72c50c8facef682827f58a8053d658aa072f3a69d50d13335dda2da37ffc29af009b52a50349647a4a38e149ba1b9847115fc4b4c4f54f063198b14f SHA512 0463ebf44ae18ee50a60e421a22aaaf0e34f827ec8f21c8f0dc79cbdc253748f9d1e5b33e4f418b52f0d8fd45990e162bb6410686ebe9fdc02650c286901d474
-EBUILD pytest-virtualenv-1.7.0-r1.ebuild 808 BLAKE2B 5fb1b8fe129a8de6ee7ac477b2700740f4a942339da455f10c13dd3867228c14357380fdadec9b084b52ff6d7d9e31b0ccdb22c297c3aa6977d74f9144eb2d14 SHA512 43484a452caf25c2f4dd7a6593f718ba6e666e16b70dd5d69f1bf3681c403b69597ab6dcd1465d63dc6306ad82dee6e18fa237353b64f437530506559747b3af
+EBUILD pytest-virtualenv-1.7.0-r1.ebuild 815 BLAKE2B dde44ca4860214a34a5fcfb96d1290651480915ac79a007342b6b450bc8e35f8222b6fe66e4c90e60311906bcd9adcb0c28d94512c06291ec880381746a2b6c5 SHA512 8cfa7d630ed6ec50c5472650e338b5aa5132722d90db54961899c53a7dad4c7b8e4c3fd3d4077a04c4d6512611c1a34a2bf206bd84c3ba1e6c7388fc6f74cf05
 MISC metadata.xml 706 BLAKE2B 42b81fd5a175fcf7bc0a2e1898cd49c1f2d259b9939d5e82dc0255a222362d51506c48cc8e92265bfeb22d4b6417cd445d052d411a364437cd97d48c5547ed99 SHA512 261bac2994facb6a7dfd0e07c59cdd69f3e01d2a8ee1ee5d023493e01709cfb95ffe9b6f9d7cf1c64c6e27d158a1a12a4f52b1597c714e1e7ea267e0364a10ba
diff --git a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
index 408d56d8e879..2da5a1df5d80 100644
--- a/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
+++ b/dev-python/pytest-virtualenv/pytest-virtualenv-1.7.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xprocess/Manifest b/dev-python/pytest-xprocess/Manifest
index b3d3bb694b23..25f542cb8096 100644
--- a/dev-python/pytest-xprocess/Manifest
+++ b/dev-python/pytest-xprocess/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-xprocess-0.17.1.tar.gz 19758 BLAKE2B 1db4ba7e606caff4591a752cd2a7e368a910ab9b7a28151b1e9c8bdc0f8184a1fa66b23ceb898f1cd7dfbca05b19aeca9a557ab5d3069b8c32ddd9f6f6e75cf6 SHA512 68ee3c8e958f7121d72aca81c32edb7598eb99c3cf6c38fb9c8577ac4860e8241e1da16a44e825204977d6ffa4459fe2742b2ef3b906071a64cd0fcc14920be1
+DIST pytest-xprocess-0.18.1.tar.gz 26976 BLAKE2B 9772fff488414406f487add01fba9ee2e10e12965d5b289b8c17cffb5a6566aaea0653ca1b390e6b4c70d79ce3698b0ce8122ed919f9778cb8cf3f7488cffc8d SHA512 f19cba9954e4b2363db13b7dba373f5e50cfca6f43d6455f271bff4d01dcc2a3b15c13a47076dbeed34feffee856a8271df4837edab413e964a848cbb6228e7e
 EBUILD pytest-xprocess-0.17.1.ebuild 634 BLAKE2B 34b0df6d67136b0852e8205592aae284fbc9aab3ca78d19fee451463c9edf7c515d9b9747db1a8e1f80026dcac21d8edb0b65c3c4703ec0f7cafefaa8a13f1f8 SHA512 12b7d0ed336f6bc98878cfec2fbf685058036c0f6bd9a015abdd17f4ebf19aa9b78c418775b8197cedad7d0da62cbc9a2c209860f6914c77d98e07bfd6a6c6db
+EBUILD pytest-xprocess-0.18.1.ebuild 641 BLAKE2B 9082025ea077b9f05ffa3e717fbd61076ae4d08d27645a15bb81a55bbfe4e9517e8ba815b69a0e73a0844d11cc7236156edc571a1d634e330326782724890cdf SHA512 cd7fad109b0f9ced1373986ef716da8c2887b1cbb07840a829af74b62c23637e3e1e1ee237f004ab38d648e48a6ea440dd0e716de2893381934170c11724824f
 MISC metadata.xml 421 BLAKE2B 616045f871631311e9310ebda14f2bcd936b7a721196f9312b6270bbf8713789329b56ba058cb412d31e68e91957666ce9f44043527efbd0842dece87ebb5f5b SHA512 4d5b9f41b7aaebcb87c8718a98b1dbb3df0f199a5f6940bd12e3504ff5080a0ed112b315c89e2af1a5a3220829879afa0cdf931828359ff98732311200b76b9d
diff --git a/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild b/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
new file mode 100644
index 000000000000..f2ada45a465d
--- /dev/null
+++ b/dev-python/pytest-xprocess/pytest-xprocess-0.18.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} 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 ~mips ~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/python-debian/Manifest b/dev-python/python-debian/Manifest
index 8327f7ab65a2..3e8f720ded59 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,6 +1,4 @@
 AUX 0.1.39-disable-apt-pkg.patch 6815 BLAKE2B 443dfc1c0c60d47709f31f1d3f0196c703490a9491e8de61ea9a093a80e5d87fdf17e1b1ebd5b885a1e2c0104c243aef2dee4a8f1902b9b5f747ec1b797c93a9 SHA512 ffb0659feaaa1538bc7a40b896e6bfc53f51032aadf0c0642a3609d10a13a043c2bbea97e43fddd315fe5aa174a94c9fb3fbb9832bfebdf2acebd7a30cea3717
-DIST python-debian_0.1.39.tar.xz 319020 BLAKE2B de38ddc6e4878404f9685a264e1198e513cb57f7bfea064e4512ee00049d007b6007ee7fea42e18bd2f12dc8132582fbea2235694b5f908c9ae5cbc830cfe98a SHA512 de29ef224a17b149dde8cf6bb4b9fe77aa1fdfc040463163fb97f7e4ed283f16af43422e26c352183fd74e9e0ff6b41a91ee18c63b5534d5c9de2ef663c8f4df
 DIST python-debian_0.1.40.tar.xz 319952 BLAKE2B 4d5c2d3202ef09fc8eba4e0c4f9a5861d0662f288768cb9026e1ab43309a57fb21c0b8e87734c9310f39646e071947b31b17bd48b71510e7d783af9f337c3ed1 SHA512 73ed735a3c7bb43208aa26ea9fd64fc658e111dc201ae8c1947a4e5835ebd675e37b78d2895d72bd5ed2b6afa491e77b50bd5f10d62ea8299fbdda6c0b9e5095
-EBUILD python-debian-0.1.39.ebuild 766 BLAKE2B 8c0fe936e3786037eccfcf50080d232fafb2141800ed726e05ff52f09279ed653b723702b044a57d7f1a49462c0b81e81bd0260cf7155fd18d0fbbd035a4ccd5 SHA512 b6e3e18338d5f5891cfe104654932d551aec3fd1207d776e329562d18068b3ca72f1f9c239c82efbcd0e6769f7cab8b1adf5ebf74889926835d30c4e07b17f7f
-EBUILD python-debian-0.1.40.ebuild 769 BLAKE2B 2f0c3a60abc67fd6a30f9431009d68dcbda49cce0d435af31fddd1c57f89bb2dec3bfbffbaf059c19421a2806a91586e58087b37a7315e66e2097c12b43d8ca6 SHA512 6ee0e983933495de3d8f413229c21f7b48b6188a4d7c94cf02b48d0c74ee34bf55b0efadae4f7225dd55c8836df1a9bb7865a94414e1908bdf035ceb4baf4472
+EBUILD python-debian-0.1.40.ebuild 766 BLAKE2B 8fea06408430f15b62504d839772ca7ad173dacca896c02cf58690f345fdf9cca791ed1c9f359e7e1ddfb235e23ce309612c87e3a0e1694d3980612081121c13 SHA512 de70852ff43ba2cc9d1e4773d6ff1abc46b7b29f51a1ceb8d3fcd9fcb41380f407763cab6cc27585c9454b298bba3387122129e397e389403ba29940d3b9d1fb
 MISC metadata.xml 447 BLAKE2B 3a50201209da0fe9153963a3c84fbfcd72eb2a9065c6ef2dc6d21436d12269d6188e7b5c3bf88688e91bdde0e8f33a1adf9d11e084cca4ef796435655ec32765 SHA512 54c833fe01cfe54156de60c39d5cab5f9324074ddb2efd0c8294cc55d3ef599c0c65e911855c93bbb4f42cdec489dc5b337b0a0a53113816110321ea291538e1
diff --git a/dev-python/python-debian/python-debian-0.1.39.ebuild b/dev-python/python-debian/python-debian-0.1.39.ebuild
deleted file mode 100644
index 63a9d4c02307..000000000000
--- a/dev-python/python-debian/python-debian-0.1.39.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2011-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python modules to work with Debian-related data formats"
-HOMEPAGE="https://salsa.debian.org/python-debian-team/python-debian"
-SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
-
-LICENSE="GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-
-RDEPEND="
-	dev-python/chardet[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-BDEPEND="
-	test? ( app-arch/dpkg )
-"
-
-distutils_enable_tests unittest
-
-PATCHES=( "${FILESDIR}/0.1.39-disable-apt-pkg.patch" )
-
-python_compile_all() {
-	${EPYTHON} lib/debian/doc-debtags > README.debtags || die
-}
-
-python_test() {
-	eunittest lib
-}
diff --git a/dev-python/python-debian/python-debian-0.1.40.ebuild b/dev-python/python-debian/python-debian-0.1.40.ebuild
index dfab437931aa..093dbb450db3 100644
--- a/dev-python/python-debian/python-debian-0.1.40.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.40.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 arm x86"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 2a24fa6e09de..71c7bd4931a5 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -9,11 +9,11 @@ DIST python-3.9.5-docs-html.tar.bz2 6839136 BLAKE2B e05d327c858cb674463b8bbbed53
 DIST python-3.9.6-docs-html.tar.bz2 6848664 BLAKE2B d5e84fc69928e304898120b172629cd724043fff26237908f2adfb13c9ffa11701a87bcd7091eeeee4ef5b2ade12c29781ea26554a7f4fc13fd28efe765b48cf SHA512 b9aa734e9616253278febc5f668ecb6f1d43bc824f84c92e3c13007441388d21e27edd4cb30c463739a271ffcbd8581d6d4573cfe693dca78623762bcdd5bf20
 EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
 EBUILD python-docs-3.6.13.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.6.14.ebuild 629 BLAKE2B 05225eb9e9bb9d334c8b712bd5c15c400c43a85ad3d220378d7d1e4c2783947a60029c81ac518de45c2536acbe47fe40876b4d9f05710206055c88d294adc8d4 SHA512 a69af3959cca52c4a51272445343873911d47fcb83c8edc66f2ceec0dee7b67f518e69cabf4193525103270d240a269c3fcaa64617c6e60cc05d981c005bd64c
+EBUILD python-docs-3.6.14.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
 EBUILD python-docs-3.7.10.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.7.11.ebuild 629 BLAKE2B 4b0fdf8cd90278f72e3a4a0a885c43c165c3082e0637470511061b670387b63d4eb0db594cbd6e4d179342e2eb3fcd39c9c14cd83751f116e526122b4d956065 SHA512 2a89633a30c32f73f7ddcddef64e322865539e0d347c00cb8a30721b8ed8f1a7457ef295b2ba95f585006d352b802c37c9a54852947bb5ce27b4221ecf05db4e
+EBUILD python-docs-3.7.11.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
 EBUILD python-docs-3.8.10.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
-EBUILD python-docs-3.8.11.ebuild 630 BLAKE2B 1aa6674e4fcab8c4b5a11b040602cb58d52005f177aee6dd73a882df3c1554d6ad6247e3918b53a28dcb969344162ed20d9316b537af4a2c53319e36af7f4510 SHA512 6669a6ffab0376095e9d53a464d4662ed903f8702a19655f20986059a128d82fae4068dac75dc0865354db186a6355691f466b56edb9842fb88dd676dc206e69
+EBUILD python-docs-3.8.11.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
 EBUILD python-docs-3.9.5.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
 EBUILD python-docs-3.9.6.ebuild 628 BLAKE2B 5d4afa9694261a40bef1a42bc0c62790866755e09de30249121d4f11c6211bc3dea254751b1e8f3e59e33d4aae0d6f844dac3a515995ef0af96d980cad998c42 SHA512 76fc69f1a7d37147f2388d3601f0088fd522d3401ffad95c20acd720f4b91c1d2201ab9db8b67bff38c88b04fa877a46903045751b0cc37d8c604debdee5ebe4
 MISC metadata.xml 236 BLAKE2B 167eb58da19caba0e03167e2f209e118ce8a468851bca2790a0353112848fffcd72522497e5f951bf5c6eafa9691fa2a1ad980843cb4170a8194f3b8178ebe16 SHA512 0f2c2a0401b53543eac90eafdd4d11c5913be07f47b968e2892ca92c265adbd9564f02a491ff2607d7031194ba3e50c7720851537341b1541120821c487147a3
diff --git a/dev-python/python-docs/python-docs-3.6.14.ebuild b/dev-python/python-docs/python-docs-3.6.14.ebuild
index eb85be6819d8..a957c58aad3d 100644
--- a/dev-python/python-docs/python-docs-3.6.14.ebuild
+++ b/dev-python/python-docs/python-docs-3.6.14.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.7.11.ebuild b/dev-python/python-docs/python-docs-3.7.11.ebuild
index db542dd885de..a957c58aad3d 100644
--- a/dev-python/python-docs/python-docs-3.7.11.ebuild
+++ b/dev-python/python-docs/python-docs-3.7.11.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.8.11.ebuild b/dev-python/python-docs/python-docs-3.8.11.ebuild
index d5d2529bb54e..a957c58aad3d 100644
--- a/dev-python/python-docs/python-docs-3.8.11.ebuild
+++ b/dev-python/python-docs/python-docs-3.8.11.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index b5d5d6123685..89a859edf624 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -3,7 +3,7 @@ DIST python-dotenv-0.17.1.tar.gz 31608 BLAKE2B fdddfa1c39282ceec03fc1569d9a7d038
 DIST python-dotenv-0.18.0.tar.gz 32242 BLAKE2B 6cbef7ea7278a3114b3eaea2ede0c68e2c6dcc3868f655dbcad9596ea6e1ec0b9f5d183a73fda32e53d348ae23c11ca3f9d2e8eadd974eea4dd13903b9f9c845 SHA512 4b120ee45602ce703ee360fb5af07a8854bcb1ecd9084057e00324b152cf230fa6f065b374b6eebbfb7069b32762624ea61dd5d2fa6ac62cb7e3a2bb6ddfc1ed
 DIST python-dotenv-0.19.0.tar.gz 32016 BLAKE2B c9f499abf99b3af8aafe7285347e08e61e770b1a5ca9d9b0cdf9dc306367c3f0492dae814835b637c9fd3c25d81006f78cbcf8d2de18bf7dc917e1bcdb0cb544 SHA512 6207f30e79ce13ccacc00ab1a95a1613317c2cc6bd735060ddca558b498c9d5c1c46ba76d97cdbb282c0f2695aed9346159ecbe08aa8a7c4f143a65708182806
 EBUILD python-dotenv-0.17.1.ebuild 699 BLAKE2B 30991868d0fe6e918e73ac6a627cb310221caf566dc6675086674fae634e0206c883ced4f34e89c8abc19518461ee41ffe880e9a18220f9a7e00a6c1c4171639 SHA512 4bbbfa7542acee21adf7f946904dcd56026186aa8737a5877b15c0d2af47efae1228b1956696fae57ca83c2b6a1fe2d35030ebe58c04164cde781bd824686c61
-EBUILD python-dotenv-0.18.0-r1.ebuild 849 BLAKE2B 6821b07f026003ddb1097a6d42f2da445cac967c67d57b3ed3bb964bae46ed2b673efc4214304fe3d3aff8c855882d27c5492de6d4badfdb5e94e9308b9c1286 SHA512 01007cf2b806e7a99498bd5a8c0e5ff8ef5455b8e0944c95535d143f79d5a161b2da30f40838f407075870d819e747f0f4e683d6f2f1c8fd78c844cb36a9d0ce
+EBUILD python-dotenv-0.18.0-r1.ebuild 848 BLAKE2B 3557a336eff3d9c640c3212673f1946ffb833f68e12494a791b241193a248ec2ac5bb2185c1f013677018d63c5d78e55b9045cd66d911077b2a409c555b205cb SHA512 2cc5e8277d3ee49d0b9fed4fa9234882f7b7045d646c069648f961bd52bd0642784c016cb64ff9ef9f33a782e1f14b3bf02f12c2e5e12d0d783b9096af3dcee2
 EBUILD python-dotenv-0.18.0.ebuild 667 BLAKE2B afa1384333768d7c865ee8c1410e7b2d54899c185fda2940d4dd05a184c78ef334be98db6c05cf093bfdcaf64293d1b4ae2123e036a78124d2f27d4a69013ac8 SHA512 5409f429cbb14e907cd20df27fffd4fc1b8c9ad7ac3a26fcc5ff6c99160baf5486f89a443ea96c0d062547ef4a8b49c92f86ae015a273b2e15cca581b7ae41de
 EBUILD python-dotenv-0.19.0.ebuild 850 BLAKE2B fc149c8425197954deac6bbaf32d30f146a5c932a22e7c9cbe90dc3f9e78cc05400a32ae449c5eadf83b8649b82063d585147997bca9027723b40f080fdf88b5 SHA512 01d909a7670238234c76f026dcb65ffedf5a5ed47b605aa9f683b48897fd14116c1ee6a007b8685514316de1aad6d50eec65e29c336dbf086b31b3174c22ddb6
 MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
index a462def98ddf..6e5625da2f43 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="
 	test? (
diff --git a/dev-python/qscintilla-python/Manifest b/dev-python/qscintilla-python/Manifest
index dbf7f1462d70..9a411f7e9e40 100644
--- a/dev-python/qscintilla-python/Manifest
+++ b/dev-python/qscintilla-python/Manifest
@@ -1,5 +1,5 @@
 DIST QScintilla-2.11.5.tar.gz 3007564 BLAKE2B e1eb7794b2e09f7bbfebde69a7c62c1a952e36b95f9c7a38c3db0b6bbdab8d0bad4a6d780dc9bf9b5e8d64111046f1741c6710d8444504230ee0f4154ce0a304 SHA512 46bc3c896b4ab71fbcc821ce3a248ecc4200378e0b621adef8d39092f940928806c76abe529b7f27ce4280e7e49091d8cbeafe6f303ca85cf5675df2887fd99b
 DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
 EBUILD qscintilla-python-2.11.5.ebuild 1776 BLAKE2B 5fb12707469657cdc578331fecfe6d249ac7a0931c7317ffa0fa21db6a2ed8ce10be77f0be52dea9b90e22a6f2f161c56e44b2042de9c4e7ebe150f612eb4b6a SHA512 1b50ec0477ebfbdc8d646cace0faa2c965de30f2f67cb22d02a2900d0a19dd4d4fd3ab5230bc7f3ed1c601998338a876fa0d391cbfb603abd230037ae36744c0
-EBUILD qscintilla-python-2.11.6.ebuild 1777 BLAKE2B aa252d12003b8f970524ddbd3d687345ef37d020b6eb8476232d3b856f27aa2769080c7a1a3fd20abc3dd7e5a6ae348a0128bc49a0e197ae3ee6d63dc644178e SHA512 8f2cea8087db45bed1b62a2205b8af68b16bb92d82cff19d72780bf9b71b79e577e531bf6dc2526fd005b0232e68840ee1a984639358749260273950c8338779
+EBUILD qscintilla-python-2.11.6.ebuild 1775 BLAKE2B 66678db25f96256fc2180b0202a2bfdc497871b38ac16a4404e5c41ad9ab76108441d1c30372dfe2f63954c7625fe5bef8e16320a9e9b357874cb763aaf47539 SHA512 a0dbf64b283f52c03c3ed1fa0ea176eb65560fc65adbe06985ac8d4d91ab9b01ba785e39a4e502b911f9194c65e6287128ffb84a0568fff236e13ff42e7510aa
 MISC metadata.xml 678 BLAKE2B e849d949281fe5162977ac3cba9c3559258f0534ced3e4e160554e2ee166cd20f979545bebae2effb0690231c987abb0ad11ed2090dbcb1c6724fc3389edc195 SHA512 58afaba4b14bf09297c024e29d51bc6b22c9a8290a6ca7f2c8c5fd63dea01037a637eeddb2ad5dfc09f2fd09d92229f74f1ee9cfb200c835110236407296e530
diff --git a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
index 98e3f4c326f7..0a5d085b95f0 100644
--- a/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
+++ b/dev-python/qscintilla-python/qscintilla-python-2.11.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index 2f5b333c6fad..19b93c0eb638 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1,5 +1,7 @@
 DIST qstylizer-0.1.10.tar.gz 20683 BLAKE2B aa12addac6cbe1ebf043d70189683feda87db3a8c2aa3604a04a969f638647ba32eaf7d156559b8af151136aaca784f26025746d9f3e574ad6eb777801bcf44a SHA512 1a747c2a0d5ce0acd220f528bc54c84c723f50bf39fc8d818f6a5475105319f46700d2f00bc5c0f14de8f0caaee0ab8904a379a3e697ca68d00ef62ec3408b2b
 DIST qstylizer-0.2.0.tar.gz 20710 BLAKE2B 1d751efd74e36e665823b64cfd51760bea489ac3916b7ab206d9c9f1fe9adbc0df2dfd9666a79e20c805dabcaa6f3cf4d11074943e0a54b7a6aa93a815c796cf SHA512 094d9c9c14d2000c2c2f2b428cd82a57424507c6df83aa21af3ab7b90e9006761ed131262a2e70a1c4aa4dcea87ac6d07f9137bc224967139467b3f4796ab158
+DIST qstylizer-0.2.1.tar.gz 20687 BLAKE2B ad158ac0f88c4a0a7c6d9fe9adc611f69cb946c28be8c414dbb40532901b53faee281e7c0a798c9f680d8e5cd8a04179b16df796041133a8dd65d117964e9905 SHA512 c5e4a4194b4282a6d2782c0636ed74e9885409570466765c6e2aee0a176175bb688854244828c56ffbd00e76d297a33de211dedae8d984021c816522ea2b6085
 EBUILD qstylizer-0.1.10.ebuild 1533 BLAKE2B 19a49fb724a3db8d99b89c19c8746f661b96ca424443f11e0b32fa8832298f5b037dd2709aac75f0da11f3a398d76417d8fe1a8ecf314d9bd6bb4dfbd1deeee9 SHA512 a0df706d4da862a15cb23f5d8250464421df6e018dfc8808941f493efe5ade7ccc455e96dc033de44fecae34bb9aff7ea602a1c83936660f97105fe3b278f690
 EBUILD qstylizer-0.2.0.ebuild 1538 BLAKE2B 665a15cce089ecb2f79a9bfff29d55007fd4caaa82babef57c915695d557a5e40483d64233697f85cc70205fa6b20fd45fa40df31670e1c1941dba57b492c6ca SHA512 ddda558e5299d7c21ef33b2c4117b1f50bab2552c4640c6a211ef433443c70d64e18fbd779e6ba7047936fd1ad5251e31190c5d379e8ac5a70ef6e36d83e9435
+EBUILD qstylizer-0.2.1.ebuild 1538 BLAKE2B 28e0c24e1d3423098180b33d83eadb428ba79bf20a65563cd1e1fbc670c95a955d4dba45c0ccad31fe74283ce39de98d558bb79e443c38634b7b8a45437e8490 SHA512 5b81b311255aa5aedfe2c42d4d945a7481fab161aceb63ee7fa7a1164b9073cd47fd1d6e7b0c6b24d33bced9952cf01ed7e25878d3557660e2a2f881a0a35521
 MISC metadata.xml 354 BLAKE2B ea116209c46e48581be418ec1035f3459b375c4fb4623a2af488f98dbde6ddec42eb65f11844477ebe4573366bcb66558c58bc25c50eead585ca70060c0d1195 SHA512 38ac9ffbc6a2ea404f70afd4f0fc3aa8663832116a6182cb05f48736c9f44c4b9211e77c93053e24b1310f0b621784f90ed8261982abba7c6121332593ded18d
diff --git a/dev-python/qstylizer/qstylizer-0.2.1.ebuild b/dev-python/qstylizer/qstylizer-0.2.1.ebuild
new file mode 100644
index 000000000000..3790a3be9a2d
--- /dev/null
+++ b/dev-python/qstylizer/qstylizer-0.2.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Stylesheet Generator for PyQt5/PySide2"
+HOMEPAGE="https://github.com/blambright/qstylizer"
+SRC_URI="https://github.com/blambright/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/tinycss2-0.5[${PYTHON_USEDEP}]
+	<dev-python/tinycss2-2[${PYTHON_USEDEP}]
+	>=dev-python/inflection-0.3.0[${PYTHON_USEDEP}]
+	<dev-python/inflection-1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	dev-python/pbr[${PYTHON_USEDEP}]
+	dev-vcs/git
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-autoprogram
+
+python_prepare_all() {
+	# Exception: Versioning for this project requires either an sdist tarball, or access to an
+	# upstream git repository. It's also possible that there is a mismatch between the package
+	# name in setup.cfg and the argument given to pbr.version.VersionInfo. Project name qstylizer
+	# was given, but was not able to be found.
+	#
+	# There are no tarballs on PyPI, so we do this as a workaround
+	git init -q || die
+	git config user.email "larry@gentoo.org" || die
+	git config user.name "Larry the Cow" || die
+	git add . || die
+	git commit -m "init" || die
+	git tag -a "${PV}" -m "${PV}" || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/readme_renderer/Manifest b/dev-python/readme_renderer/Manifest
index d600e5d43a5a..9ff527c27e81 100644
--- a/dev-python/readme_renderer/Manifest
+++ b/dev-python/readme_renderer/Manifest
@@ -1,3 +1,3 @@
 DIST readme_renderer-29.0.tar.gz 27169 BLAKE2B e500e2a426045104a6cb5bf0eb13036811d569223dbe96d5d37298c1f344dfeb8d1c3d5af55feb822ba7616ae072ad913c0f7c69bd6a9767a5a2d1db2eb61a5c SHA512 b5f462c3ee077f5711c18a4c0243b084730a705bf5476355265d18ce4bfd696edd30a28aaa8f3aaf96b531a2cbf32bd9ed143431bfbbf08cd7ac7234a2d57a7c
-EBUILD readme_renderer-29.0.ebuild 799 BLAKE2B 87e678b85d9873d6b120cc2fb64b1f35db822e3e3b31063a70490ac4659eb7335fbb50dc2c65d8c49f0aedf700f24715c694dd1d2e5d5d9795eed61bf7f1a68f SHA512 50daf1ccce0a7bc136ed24720f88d94ebcd63d953d8efca3644aab948eec172864a0615510515f1acbeb2fcc04ff2f6dd2e0f45a934f16ae555faee8fead8775
+EBUILD readme_renderer-29.0.ebuild 806 BLAKE2B aa480a9e0e52213dd141e5bfd858ca525358635dc69609ee17404588f3f9357bba7b5fe9ac0aa2a5584297ae287a2d37ae24e17a190535597212f32d379630db SHA512 bbd02c0d027c0095c4505929b7e96f620520d7a5f5a854081d9be7f0133da8c8b42184c436f9f2503fbc918beeec08d8d21542480b0c585039ca7322f24bb02d
 MISC metadata.xml 415 BLAKE2B e5cc550becf1313c5ffe212ee846529669e2f321c9e2a1cf66ccd5b93f2c94d71a9506300223fdec685b406c2eb9aa216fc4bcbc5335560062158466b3e465cf SHA512 5e2c1323f0f5005984e3b8ec5cfb978552a45b343fc79f39534206e8ef7c08656c5797df42e3e1522ec27c6dbf3f91432fc68082abcdc07625c25b6e8c67d69d
diff --git a/dev-python/readme_renderer/readme_renderer-29.0.ebuild b/dev-python/readme_renderer/readme_renderer-29.0.ebuild
index 55944251e568..57c165645ed2 100644
--- a/dev-python/readme_renderer/readme_renderer-29.0.ebuild
+++ b/dev-python/readme_renderer/readme_renderer-29.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="a library for rendering \"readme\" descriptions for Warehouse"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/bleach-2.1.0[${PYTHON_USEDEP}]
diff --git a/dev-python/requests-toolbelt/Manifest b/dev-python/requests-toolbelt/Manifest
index 67862558cf36..3eae86ff7a23 100644
--- a/dev-python/requests-toolbelt/Manifest
+++ b/dev-python/requests-toolbelt/Manifest
@@ -4,5 +4,5 @@ AUX requests-toolbelt-0.9.1-tests-internet.patch 1225 BLAKE2B 54af195690d8ac4754
 AUX requests-toolbelt-0.9.1-tests-py2.patch 3100 BLAKE2B 39ecfd8f0bbf2a4d0731c485ada404f405413117e7451d36eefbc4f05b0073f86310e66ad4320e8ce648175aa072306acab551a50a4a516470b0beb4b981124a SHA512 540813a2d69c84d37a4a6ec5b98d2b71693ba34bbf661bb44be69c646d164134702e9fadd341d07085205b476239260167c858983978488553a07bdbf205ba24
 AUX requests-toolbelt-0.9.1-tests.patch 5781 BLAKE2B ff7339a1daf0ba2df49914847000f0b8b5ff2d097a59bcb02bcb2b20a885f18223a1da1f44a99d846dcff423239108411c193da5092bbb27fdf50bf211dd59f7 SHA512 86919154164274efe8bceb42eb9fc17524d4e144a541e82bc10692da66e533220cdc7186362d77fd4f3acdc639744cdf5273c2e4e2091eb4d33c1fdc6c631ec5
 DIST requests-toolbelt-0.9.1.tar.gz 207286 BLAKE2B 6123677a9abafebddf7dffde2150b2426b5132ebe0c330ff891322ecc3d69232a5b15a0c66e3e1fb4832dc04f5a636a939613fba041e499e9fbca9814f548c7e SHA512 12229928df5df71cb57bc65ef453dc0e4a2bbe190c1579811b2c2823673bd81aeba856b00000fa20b253d0f0fa4fff55ea1e750794ca3785f71c376b1df7fd93
-EBUILD requests-toolbelt-0.9.1.ebuild 1232 BLAKE2B 2698f8d78b4d6b095e1bbebd716d25b5298f841a241350ba84093ffa652df44a734acc8d0e1274d8d3b0ec1f9425f46f3d828fb63990f3c3191fb67432cec309 SHA512 e95e0cf138dbe803bd203bed85dbc137ec67108267610f545b2a600219772da850c6d5988cf243ce9661480f266188458ce1befffd2479350c4b6ac941df2721
+EBUILD requests-toolbelt-0.9.1.ebuild 1239 BLAKE2B 72709945d82f999c0818fb96cf27a5b01cfd6aeb868d7a31e9fe6f26b4e88bd2ae9150da6e9486a792de1e8ead3fd7e4ebfd6c5dcbfb050a480813b9ba5c3937 SHA512 37b8d55cfec583b71e2b31a89214ec753d8b7f0918f28154247317e17009455ebe0a6f5db534390c1aa93b0bfac1320f2fb42d0d8c5e8e6470a0c64f95b2ae86
 MISC metadata.xml 422 BLAKE2B 534e8a61bde6a16b268927910d9621c524477410a0dd30bc28928cf80296383845f594da0cddb896d83b1dd0e3c20d4bfa768054e19281b50b98c837e59bb69b SHA512 952ddfb8afd26d322f64fcfb561a8cb724cb0240c7ccd83a6b102025b04d56711f3283f03a49c3de820e13b4220eee6f3a72d629ff2d0122b347b417b4446769
diff --git a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
index afbd3421e3a3..c3c2c1f2eca4 100644
--- a/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
+++ b/dev-python/requests-toolbelt/requests-toolbelt-0.9.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="test"
 
 RDEPEND="<dev-python/requests-3.0.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 33e3d6bf86c4..23c69ae0f153 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +1,6 @@
+AUX requests-2.26.0-test.patch 1328 BLAKE2B 4f9e66505a4acfe7b4bd62c6c95c28fc01eb9fd7d09e151aef7da27fb105d5038ddc99c3d838c7a166d769223ff18ed0517e961ffa345459b4350ccdfa21b50d SHA512 89a4cf8d03f2bf8308cba1a6ed97b4f2340a2b9512636f2244f5f9cb6bae00300e73b58bbe53fad1d9c9e4e2e8e3298fa6741190869cfd4799e3be9bc56b0bc0
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
-EBUILD requests-2.26.0.ebuild 1473 BLAKE2B f5aa4569a4580e69a26c6b11c3217ee7ad0f9cccd8dfba3471c3ea6cba0674aa02df37aaec20cbc0c195bec12cd8c931164ec10650a196367f78343008c6f312 SHA512 3b3cf0cd224cc62849b224b27dd7786fa4de56351942fa3174f62af2b301ea1d676b769b6b32d4e7b02f83d6b22cba8194220f2386ff080365a8e69ba20943c3
+EBUILD requests-2.26.0.ebuild 1523 BLAKE2B 1b2150526f391c64487ae75b331bf782abc62e61f64610889af526ca42f08a43dc093c1d24a3ac8d077706b511e40ab93061cffa1c12df3c90464bc292acd974 SHA512 e65e67180500105b8e63c4eacf1403594f30c42e29550643f4f5ebebf7a4c14a569878307d7ae512cdca4bd3c247d8d7ecfb104becc049696d334f3ee337649c
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/files/requests-2.26.0-test.patch b/dev-python/requests/files/requests-2.26.0-test.patch
new file mode 100644
index 000000000000..6bbf78871713
--- /dev/null
+++ b/dev-python/requests/files/requests-2.26.0-test.patch
@@ -0,0 +1,30 @@
+From 6552e5374c335d62ba960a74b5b978897c823376 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 28 Jul 2021 10:33:22 +0200
+Subject: [PATCH] Fix creating non-listening sockets in tests on some platforms
+
+Fix the listen() invocation for the test server not to pass a backlog
+value of zero.  The value of zero means no backlog which effectively
+means that the socket can not accept any connections.  This does not
+matter for the majority of platforms since the value is only advisory
+and the platform tends to go with a bigger backlog anyway.  However,
+a few platforms (e.g. alpha or riscv Linux) do take the value literally,
+and therefore the tests fail since they are unable to connect to
+the server.  Let Python use a 'default reasonable value' instead.
+---
+ tests/testserver/server.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tests/testserver/server.py b/tests/testserver/server.py
+index 132221f7c4..92dcb6cb1a 100644
+--- a/tests/testserver/server.py
++++ b/tests/testserver/server.py
+@@ -78,7 +78,7 @@ def run(self):
+     def _create_socket_and_bind(self):
+         sock = socket.socket()
+         sock.bind((self.host, self.port))
+-        sock.listen(0)
++        sock.listen()
+         return sock
+ 
+     def _close_server_sock_ignore_errors(self):
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 24926975d014..88f1f9b8a52d 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~mips ~ppc64 ~riscv ~sparc ~x86"
 IUSE="socks5"
 
 RDEPEND="
@@ -36,6 +36,10 @@ BDEPEND="
 
 distutils_enable_tests pytest
 
+PATCHES=(
+	"${FILESDIR}"/${P}-test.patch
+)
+
 python_test() {
 	local deselect=(
 		# Internet
diff --git a/dev-python/rfc3986/Manifest b/dev-python/rfc3986/Manifest
index d7082d1aa605..c6ab186299a1 100644
--- a/dev-python/rfc3986/Manifest
+++ b/dev-python/rfc3986/Manifest
@@ -1,3 +1,3 @@
 DIST rfc3986-1.5.0.tar.gz 49378 BLAKE2B f5ef923626fdcbe4d13729a5599012a8a93d234eef7f9ac9dc61620320062a69646f810a8f0ea04f371b9c423850982685e68201f08ba96ad9ead3ab11a9b40d SHA512 b291b88b6890f8c9fcfc353e05d1b8c0435be62f22768568ecf714af083b3c51d7a9b301fc9196d37ad4e6eeb8c6a237ba40914098e755b4ccdf36b7df7906c2
-EBUILD rfc3986-1.5.0.ebuild 677 BLAKE2B 6f8c27f60bbcd7a147221d969690bb1f67558a6799f4245d0ba340e62b2cb1a9ae646c6bc62ff56a4ddcbbaf4246dbc142af0c6c4ca65936fa4e64ce1132cffa SHA512 c524b8f6e8d0564ed14cbc7a4cb951d476e484f0b9bd625789d75fcc5aec234960dbc4992ffaa466df20145c6daabb35884ad46c08d44869a1ac945cb1f18d88
+EBUILD rfc3986-1.5.0.ebuild 684 BLAKE2B 4c9643c65709e7be8d0532bcfe9302b6ef3f5cf1709ef9e490589e213dc7a4d70bcbff21d01554aa716d839cff8b9c46a2bd9d3d7d26f733b36fd6ee879148b2 SHA512 57b8d28250ce0cde9d437f2d42d32b49714a1f0da6d0a82d8d438edded99d07921d6dc6666992da61148bc52c81e22a95f1613951bd4f6db2d4619906c989bdf
 MISC metadata.xml 740 BLAKE2B ad52fb6e822fe4ab8e910af9f4896079209f0704c649d240464eb283c9796f5bead9303b7bb02f5db5049b9afa430bd190871c1bc391a21647eceb0d353c02c0 SHA512 3b74fb8b21300169b3d9da6c8a14bcd950d277c56ea242a73fc56637d853cba64de931567b19c0cd8b9acd6f7b8e486fb9e1ce0716b1c291669e6588caf6611c
diff --git a/dev-python/rfc3986/rfc3986-1.5.0.ebuild b/dev-python/rfc3986/rfc3986-1.5.0.ebuild
index 9a5d1047575c..29e91f6479e2 100644
--- a/dev-python/rfc3986/rfc3986-1.5.0.ebuild
+++ b/dev-python/rfc3986/rfc3986-1.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="idna"
 
 RDEPEND="
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index f5a82024fd1b..b2676c3e1c8f 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -4,5 +4,5 @@ DIST ruamel.yaml.clib-0.2.4.tar.gz 180667 BLAKE2B 01341ac42ecea437faebbc9b30ebe2
 DIST ruamel.yaml.clib-0.2.6.tar.gz 180695 BLAKE2B 54d0e00544c1716971022257bece3a6c8f83c9188b52e15a136381f5fdf00a519fc5b74792c614a2908ffe68f20fb165732cb814458dadb8498660f28ea67939 SHA512 12307a3c3bae09cf65d9672894c9a869a7ed5483ca3afb9ee39d8bcbf1948b012a0dbf570e315cc8b9a8b55184de9e10324953ec4819d214379e01522ee13b20
 EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 712 BLAKE2B 21715932317dbc77cf8ff974a08d5deb490df557dc696596cf712f5d7d0cf174b37984aaf704a2adf8a166243b6eb4f7497d73ab098107a80590f200fca2bf44 SHA512 1d10a165392ef789b683dd3f726eb39f5b79d57429f20056c1cb4e2f1c8b3830ed7eaadbd25ed36ef64f2fb83cf50cff21f2205d21ced9ca4edf7db476d00793
 EBUILD ruamel-yaml-clib-0.2.4.ebuild 657 BLAKE2B 5225bbfd6231d6fe97068f0db8cdee17f81c64f20f4299fe516c7188105ecfea1ab822859aa27f8c170cbe445cde3428d127d57bd6ea154210f3620d9f9e9eb5 SHA512 b6e66aaf6dc00caf379ccd1dee8a9ffbf3f13623d18066e5592bd26f04d5197354e4d5aac239eca00bc567b881bcfecd45ca361d115c6223ab80945eeac2a5e6
-EBUILD ruamel-yaml-clib-0.2.6.ebuild 657 BLAKE2B 58b1721a76de3ab26136eb97971efb21d657f7e8c65501e9af64e3cdad4b7572caf7f87ad83267a6c7542d168b113f411da4e5242b07ae1205fb8462d10cb7e9 SHA512 1262d96f46b03a8b693a0e9d7fbb5b6949744cb592b01962b6f579838b487166e60945380f289ab380e3f9f11ce2fd85c025688169b5735dcb6eea496f74f2a3
+EBUILD ruamel-yaml-clib-0.2.6.ebuild 654 BLAKE2B 8e2c3860252e933656fbd8428c08cefffcaca1c75f8fb2cc979bdc6839683b43aa5ee0f58d34e3dd285045f4bbab7fd38c3ba1b300a6d70ee600bfd3009ff4f5 SHA512 736497ed7d2c1d2f2053541bc378b5413c4482d14e8c16bedf02175d56d0e08442b79b6f05c356ef10d583786b6dce4a525369aa22b9d4af959d02ddb14ab77d
 MISC metadata.xml 1183 BLAKE2B 5e9198838214711c9fbb5beb4179300c5465079646c3f4268145a3c893f1913ac9a14811b39afe637aadd183e4351a54c2ed160951e995bc4ce3f869b28bd6e9 SHA512 d6e5a8de5f9fe3e71a91a26be44cd87162863b1fede14301694e0a38135fc2ffb5c3ee25a4aef40d7cdb73812d0b6af72aa6b67ad782004648f54ac5e86cc662
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
index ccfa6dccc704..381abd6f3384 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.6.ebuild
@@ -16,7 +16,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc ~x86"
 
 python_install() {
 	distutils-r1_python_install --single-version-externally-managed
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index e489e0bd1c10..d5be2675286c 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,5 +1,3 @@
 DIST ruamel-yaml-0.17.10.tar.xz 183116 BLAKE2B 2795f470a3f7da609780109dfac502a5b47184f465c68420f467209275c8857418a4ec7424e130df2e7acef614d93f91551910eceb06cd9e49b365bb23d2a015 SHA512 3cd2598fa37564c44c74720e72babcd2252b2dbcdde626bdcf771b591da5d2852d90bb1f22428e28cd7ec38304be2a437aa0569ffbd3ebb526b2b79a955bc88d
-DIST ruamel-yaml-0.17.9.tar.xz 183112 BLAKE2B 3dc33257435aa164724f8023c3bcd2f693c5dfbb4ac52467c821902819183e119f46e7dbcdab50216c019aa38a3d8fb94eb382c85edc0a08a278492ef53b2597 SHA512 dabc5540f68454d8abb46434bc91161ceb7bc613593c6aad79a4148c4526248d6053e356eb745e4cec7816885c1352f62d3c0a61d3d8a40315fd3ffb0e2f57ef
-EBUILD ruamel-yaml-0.17.10.ebuild 1320 BLAKE2B 5a4c4f01e172a4a54a025b64fbe6229ef3e96dbfe97b627da9cc37c22668481f05ac68d37eab8b81539fecda88588d63cf9b49e1b2c1cad2e83ca008e5489bc0 SHA512 5db02addeffbac54190032c5c2d66ef4791dd404b3e7990e0a38d58512671581e606c3493347a0c1ffa241fc5133899dd8f0b129acbdb3b8493e49413aea7a81
-EBUILD ruamel-yaml-0.17.9.ebuild 1313 BLAKE2B 545d26daa4b7210c4a0bfab97c8959534dec58e3877906eaea653001f294ee9207123da79df59bea7056ad698c3c2f01398299c1240b19dc95f3739c1d33322d SHA512 ed3019c17273eb7e3e8fa358a7db08cc5c0e21039d18af7b0090ded4ce86ccc5d8cbbe6e0a2f7fc5262ed54dda7dcd218fee02122435ed1bd1b39a90b9c1bf83
+EBUILD ruamel-yaml-0.17.10.ebuild 1313 BLAKE2B 545d26daa4b7210c4a0bfab97c8959534dec58e3877906eaea653001f294ee9207123da79df59bea7056ad698c3c2f01398299c1240b19dc95f3739c1d33322d SHA512 ed3019c17273eb7e3e8fa358a7db08cc5c0e21039d18af7b0090ded4ce86ccc5d8cbbe6e0a2f7fc5262ed54dda7dcd218fee02122435ed1bd1b39a90b9c1bf83
 MISC metadata.xml 870 BLAKE2B 2cecd06b655552acecc4946c417b1737c120ff9ac0c84dde9ab0dd8f1e6ce7499e9568f7be4ebd9ae4835787739f9acf0e3a0a5475fdbef9327257dbb8529e8f SHA512 7162e297ad95daf7ef9345faa2e698576f440baa5dab43816be924327eadcf04925e02076735ec50f764f13dbfe054640c72d723742af76890f517de95ab3457
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild
index 9cf177b48a8b..86fa6a9be480 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild
@@ -20,7 +20,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
deleted file mode 100644
index 86fa6a9be480..000000000000
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.9.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{8..10} )
-
-inherit distutils-r1
-
-MY_PN="${PN//-/.}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="YAML parser/emitter that supports roundtrip comment preservation"
-HOMEPAGE="
-	https://pypi.org/project/ruamel.yaml/
-	https://sourceforge.net/p/ruamel-yaml/"
-# PyPI tarballs do not include tests
-SRC_URI="mirror://sourceforge/ruamel-dl-tagged-releases/${MY_P}.tar.xz -> ${P}.tar.xz"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml-clib[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ruamel-std-pathlib[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-# Old PyYAML tests from lib/ require special set-up and are invoked indirectly
-# via test_z_olddata, tell pytest itself to leave the subdir alone.
-python_test() {
-	local deselect=()
-
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		_test/test_deprecation.py::test_collections_deprecation
-	)
-
-	epytest --ignore _test/lib/ ${deselect[@]/#/--deselect }
-}
-
-python_install() {
-	distutils-r1_python_install --single-version-externally-managed
-	find "${ED}" -name '*.pth' -delete || die
-}
diff --git a/dev-python/scikit-build/Manifest b/dev-python/scikit-build/Manifest
index ad461ca20d66..4a0b2e30331e 100644
--- a/dev-python/scikit-build/Manifest
+++ b/dev-python/scikit-build/Manifest
@@ -1,5 +1,5 @@
 AUX scikit-build-0.10.0-docs.patch 773 BLAKE2B 27303cb8ff439dbf9e44454ed58cffc2cbba53fd639b830e03707fce7aca0749018caac72891c3efa0b66b3830001634ca9e2cd34c769f625d2f735f5c1d4dcd SHA512 d6920e22ec20feec99768d09b3a01244eb6bf079b4d68c0eda1a17d04c640c7b5df6685c883812e7c9bf5455d6c5a8248a503f466db23da82d45b5ba53188252
 AUX scikit-build-0.11.1-py310.patch 915 BLAKE2B 8ae5eb217482f0dfbcf966bbee65e9e2e2d7e74bff1970b6417789ca5c93881958640213ffe6c496a4a7f6578101fb51976528474cb3c8147302ec9221d9d1be SHA512 98bac74f6715320666be75455515efe35b208bc26209323453589cfb0c83ece5acefcaa5d17f625dd9ebb5970c06a3ba69334d140525d6b944066e50efdce22e
 DIST scikit-build-0.11.1.tar.gz 132025 BLAKE2B 0f818d8da896695ee0d6b046249e74cbd4ea643bec0515d6ac6ff4276d92430a1dbf81abb3b7c10890538c373225a45cc21b0906de891f1a5390226be914dacd SHA512 030c6cc727d39cbafd2865722de9c45ba2f13461461cf75019b9caf6afd0a776b4f598fa2ce102b5adbc770140ab1de2c33e2bbd3ef03c958ae8849e5fc26cb4
-EBUILD scikit-build-0.11.1.ebuild 1404 BLAKE2B e5f2fbef3a71a1bca0960e6bf122888b7f650ada67cc2f2b151b14579a58a7613c7569767627e59b62ba7d31e70d7728b1238cc830aa46782086fc4278636825 SHA512 3c60c320085ff46096af8ba4cf27d7d20c2f41e1d1a26e1a12e6cc8f7fc30e194183b73f69b754129a80785333171c058c4f436f13d62925cbde96567c045780
+EBUILD scikit-build-0.11.1.ebuild 1411 BLAKE2B b3ecb92aba76b74d590f63a4b4c075a655482e4eff387a0c1408b94839a9fc3d8b457e6c5de390ae1ff792a1ca1ee7fd88cb4fdfdbd6bf5647bff63fd2ef67e2 SHA512 c0c50342ffd267009bc592e7e8b3e460bb261e55eded793a58236cc9fa69b5f45c58ebedb2cf2fa9108b2175252c8359884f8aa3f7cbda9bcb638257a7e010c0
 MISC metadata.xml 407 BLAKE2B 91cafd558c8797a07a57e8581fe68b3353d6f70a00dbfda9ce1615fc5302f9cce23a806fc31f4359f670546a39a97ddd7958d0fd77ab6d18841f3888bdbda0c2 SHA512 2a06667260d774bf4e49553c709110b14e798cbe4641352c745c5af6e400bf027d1064997b5347e4ffadc27310dfe0bd02a58a891defd6d7cd96f1b2ed3909e0
diff --git a/dev-python/scikit-build/scikit-build-0.11.1.ebuild b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
index 398a1f1c646a..562f7551dde2 100644
--- a/dev-python/scikit-build/scikit-build-0.11.1.ebuild
+++ b/dev-python/scikit-build/scikit-build-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/distro[${PYTHON_USEDEP}]
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index f4afcfe58a8a..4020d847f341 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,5 +1,5 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
 DIST sh-1.14.2.tar.gz 63779 BLAKE2B adc9004334a53f3704e22c318df6b4f60fd9ca2d31f5a9601f84abfaf0fe2ded06938b165e10b1a977ed38fcad7d0fa08799f2f552fc2c6b9b4c2a6476477115 SHA512 b7917504ae85606e1986b681274077777ad3011639bfe933d4133c3ed16f930842e03b572caa396ca4d58f41fd5594bef776cc16c4b0fbd1242e57c6aad19e62
-EBUILD sh-1.14.2.ebuild 606 BLAKE2B 3f2f26d294141052d75d2d621fa6ea1d8bb1ce2386bc50cec0abb5c63366ca4f067b7c462eff8eb6df80e7223c2e6c7ed7eea2ba1cdd01f08617605ea7f06dec SHA512 20014771b53334a05ade781415d824ff083f185e501a2d881716cea3541ada5fdc657a865fbef7f57a3668716f157b19285b33680613fdbd56f0ef6651873982
+EBUILD sh-1.14.2.ebuild 605 BLAKE2B 4041fa9627104d037ded2a42866c02474caf6cbf69d8cd8a12f53309667d569b2678192aa1e491493d27395595a70ca6ff3472dbece06c4e4ef03a04c3508a02 SHA512 b3db3f248ebba97f23f5b64476688d1c497a7927d25a9204114bfb61ee8669dd23ab0000c3f5152b926f30b57b7eb238113d4fe9be18dd5e47a06e2c00ef0af4
 MISC metadata.xml 700 BLAKE2B b28a6dcf657471c09605d90f1dd4ebe20d793939d3fe4efbec1365d8ad9deb93b93fb7d2686c77e05f03421f5914d44694f8828d54cb72d48f15f50c35b92aba SHA512 64fa8aad2743f7ebdb43475c3528a214ec2d2fc27a9147ec33fda61c97d5a08efb8d9d0786a34d16a0a5da34005654c75475dee62c46db9932b73ac4747c18cd
diff --git a/dev-python/sh/sh-1.14.2.ebuild b/dev-python/sh/sh-1.14.2.ebuild
index bc36e16c3855..ccb7226d54e3 100644
--- a/dev-python/sh/sh-1.14.2.ebuild
+++ b/dev-python/sh/sh-1.14.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 PATCHES=(
 	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
diff --git a/dev-python/soupsieve/Manifest b/dev-python/soupsieve/Manifest
index d82a7ea84655..9044de4f0557 100644
--- a/dev-python/soupsieve/Manifest
+++ b/dev-python/soupsieve/Manifest
@@ -1,3 +1,3 @@
 DIST soupsieve-2.2.1.tar.gz 99298 BLAKE2B 94532421f3b8e49d6ab75a54a60ac861a78eee9f6792ded096e39a8a43d46d195cff9b7d8feab918b0f2debc8a6dd35226ab714384fa7f4d795176e269b6c4cb SHA512 c1339cfca237af7f8915b6d644b8271f769f9a37aa68f8acf536236551baaf9bb44a2f2a736f9168a7649cde14d37b8c24614c9491acbf81e3f4fdaea96b4928
-EBUILD soupsieve-2.2.1.ebuild 719 BLAKE2B fef1a146867fa97d78d4bfb6c9f361ef12181a677b2c55d807d77b3a1d03404daaa5f44cea91c6708af86769469e708d817fba8b638d664784e0a70f40967f81 SHA512 ea0aaff2aaea415e6ec4841fc88f7db4ad4962a5ce30d86e12bdb3bca6ad5878f3127c78659181562fef35b0211a2fef698848dede53effd1417b3f086e99c1a
+EBUILD soupsieve-2.2.1.ebuild 726 BLAKE2B 193d11912b7203acdaa8153fe022351de33704b921b645a1534de34e8d47119778a43865dc57189e37b576a2a725bb3588b2f928189e6c0f50e5f981e4702b22 SHA512 bb6aaa874e6d5777fbacbff2efb232871ee7626d9f7f162ffe9c9e6b1bb367332db393e7e495e8bf8ff36ac50c31d4392258d304f8aeb7f7a0552a869b1b2c98
 MISC metadata.xml 398 BLAKE2B 0aea8c93259062872f7899179236d9ee52a85d4055e3a5eee8e3643127611686b989c0985ed571d491734e80e45598dd1ad9e4fc25f56ba5e657b28a8a9eaf37 SHA512 36a527cf2a4572c0149f7cd344c3247309b89ef461d65347dfe30129ade1742bc54ffcc6d1483971a2adbe5e4de3a15ef73f6e8ba631f4dabba8d32a3bb2c288
diff --git a/dev-python/soupsieve/soupsieve-2.2.1.ebuild b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
index 670fe35d2978..a484c1b991b6 100644
--- a/dev-python/soupsieve/soupsieve-2.2.1.ebuild
+++ b/dev-python/soupsieve/soupsieve-2.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/facelessuser/${PN}/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tempora/Manifest b/dev-python/tempora/Manifest
index e3c0ecd58132..b870aa21c090 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -1,3 +1,3 @@
 DIST tempora-4.1.1.tar.gz 19208 BLAKE2B 77901d1f4b19f2c88d4492788f8b351c70ffdb474769597bc2eefc85b4dd503e57876b687b600b49a381dd24133ae30ac547961e7cf8d7005e4cce5dc5049012 SHA512 a272980be5d4448bbd97d9e48d8a992c07cd1e970924f301fd3444834fe112453d5714ff8f3e7af6a5775d931b825601d7f1abf3cd9319b08d148a2a07d40d07
-EBUILD tempora-4.1.1.ebuild 923 BLAKE2B a8ade4642882cd8379218de8f63997a61a190b8f0226409d4b60dfe3bf7b8e767ef7a221822c2eea441db7df2cda512b3d315dc1ac91fbf3c0389aa6c383b594 SHA512 9146ddaf66a8cd1ede4eae7399386da7ab98f1f1fbe8508f3f84fcdfbfa3ea9f0e67ffbb1347379aceb18420e2d7fdcf4bec3735b3e2eaca5708f33e0fd1b448
+EBUILD tempora-4.1.1.ebuild 930 BLAKE2B f04652dbc13b57396172c0035fb0ed58a5d9702e396f35d913447563c51835a3ed84f865cc890bcc14b46ce9af83671e0768b043f0b5f4531972d862c45094ae SHA512 178af61237ffd54f19cd0474bd4de8c8b6a086f2b5f447b9d0c63ee351b3e1e9474a7d34af2264faa52aa5b306f9729522ab15867873b04e160bfd10871df98d
 MISC metadata.xml 639 BLAKE2B 0d9a50a66ac1bcad2bb56a48e3749b50f3b0ed4163d5d1ca75f097f0f67a1dd3104720075c2e2e484e8e9c119f18f62b9217c413dccf62ec19d7558c6b5c65c9 SHA512 a5faad13de686702dae7b796a6a2bf7f0195cd8d1a4154fe006435140cc4d789a9c42251c072c21dc099569b65b67d4bfe02f115c3d4c5a25d76f28532188e9b
diff --git a/dev-python/tempora/tempora-4.1.1.ebuild b/dev-python/tempora/tempora-4.1.1.ebuild
index 35aa7d998cbb..1597a8277be0 100644
--- a/dev-python/tempora/tempora-4.1.1.ebuild
+++ b/dev-python/tempora/tempora-4.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/jaraco-functools-1.20[${PYTHON_USEDEP}]
diff --git a/dev-python/termcolor/Manifest b/dev-python/termcolor/Manifest
index 192004367aaf..515b32b65a1f 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,3 +1,3 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
-EBUILD termcolor-1.1.0-r2.ebuild 524 BLAKE2B d6adf2b0f496bb5ec430462e8fdc710bcc539092cdc246e3d030f09a8d57958930f1188610bd54942db54ba978c90cf47ca69cce9f3885f58247a430062b9efc SHA512 8e3c4d24d72022f6e1f41ccfa28ac827ca3ffe8a055f8f7fd6869d12884611d39ec6d3025a5e48d878e276955be13a3d6250dd526eebbe02474e268dcf56ca39
+EBUILD termcolor-1.1.0-r2.ebuild 531 BLAKE2B d6b16b2143fd793828fa4ab9d379f6a42225f46a8d23320a8a73b25957b66d7c28e2d4503f5b47b4c2cacebc2cfdd7d15fc3cf60ac84de47bd7464118a182e4f SHA512 682537d6c259de31973f3e07750f3456a915f750f3ef245e8bd51accc990804332f054f859df7316055a69163851cead3d829e7b92230ee51447a9a67ab43faf
 MISC metadata.xml 468 BLAKE2B 661dac009a69d3e67a38195747df19e59eeeffe99cf88e0f225526a89b75ecce42708106d21e5902b9e091f7cf3e1a0462c4ba4b521e120cae56effa81d95d20 SHA512 b08572c63375e0f15530faa189263c72d6f9f954d33a36a97df6a427cfa05fe74a650be3f34cb4af4409f9b6748adae5db3268116bd47d25b2752391e2612a0a
diff --git a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
index fe2c8a672d51..c0f732a7d380 100644
--- a/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
+++ b/dev-python/termcolor/termcolor-1.1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 # no tests...
 RESTRICT="test"
diff --git a/dev-python/toolz/Manifest b/dev-python/toolz/Manifest
index 49c94a2921fb..2a2246f89dbb 100644
--- a/dev-python/toolz/Manifest
+++ b/dev-python/toolz/Manifest
@@ -1,4 +1,4 @@
 AUX toolz-0.11.1-py310.patch 720 BLAKE2B e1612b5230fa0f11251957709d8841e423e7f3916506cf55416407689b5d23ae9ef8f9dafe81c68dff1d8bf1c287c7681416c6cfa59bc8062086de8a17e9f565 SHA512 26a4b641f74659c825dc89ed5b3390a09503d92f2e906f2eab167871e9b322d6db1f54c988633a79a36d2c0edb1a5de368031bafe786781a8e7d5b6de710a588
 DIST toolz-0.11.1.tar.gz 64428 BLAKE2B 934f122bbf9e762e72f502f8b9ba8b5aa946b6e2b758e9501c2bc58fefa3443cda4b3e2c423be221643f51b2a12de0961be835ae3a23e97525fa203c969edff4 SHA512 8bea2b75b74d9da988c777577f3ad574192659dcc4bea54ac6d1400a81bef07818c49c8da40028a8c42905f9ab5b5111c50c239fb56f34c315865f90413af68b
-EBUILD toolz-0.11.1.ebuild 535 BLAKE2B 9db4f987213c9f8b835209a959baff6b4f492755463a7fa68a9bd84382825f95e27d7ae35c079adde011e200208fff6d6047b2334038949719a0b89b54abcac2 SHA512 49289239e2fb5bc9cf3d3c56fe8eaeddca6d4eb252361d2143976de331409c53a623e388138ecbf8d9b5731cd5303421138a0c76558a2e236c93729c307c8b80
+EBUILD toolz-0.11.1.ebuild 542 BLAKE2B 85115eb1ca87c5204ca4dce9f8dd3399042e7dddc32c322ea5b4140150c0afb57b9f8556d21130ead3bad93aea7054b5158ffd4e75301f5a4f16f188b70e8d3f SHA512 18fb7732c686d1fe68e0831ebbd1db5caafe6d83e9babb0fc2f50aed9eddeb062371b0c23afe08e35f76fba64aff838942e5c0d26727ff8b8ab3c70d57f5942d
 MISC metadata.xml 332 BLAKE2B 36407eae22ccceadca8dd6127b7b6e1d04d65722e2ac88fd8f875807ec6f08f5a62d3570970c7cc85f6fd9bd6998c38b06100712569baa086dffcee98ef0aae2 SHA512 f32abff7501f0aec08df19ecc6f3b3aece597c396d73c7c025cb6e6f6127c9aa498719f02f55c51bfaf6e0d0dd51a150dab04baecdd9586245a2f8a0fbcb19b9
diff --git a/dev-python/toolz/toolz-0.11.1.ebuild b/dev-python/toolz/toolz-0.11.1.ebuild
index 5ba2982613f8..99a04a7c94be 100644
--- a/dev-python/toolz/toolz-0.11.1.ebuild
+++ b/dev-python/toolz/toolz-0.11.1.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"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	dev-python/versioneer[${PYTHON_USEDEP}]"
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 74775d93d184..d024051b59bf 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,5 +1,7 @@
 DIST tox-3.23.1.tar.gz 303896 BLAKE2B d59160035a6412a69f9434bfb5b2b27aa9a2ebd5344b4898b677dac15dc91ab94feca67b8edde4c0ba68c8a6a12fa885091d82a088439257e9393a99e77ade88 SHA512 ec5daf106287b265d1abec8465df8ad053ecf59876038a7cb419a57e22373809e50f8131736762dc485f559363b1878abb49d909e7b6952b2e49eea77c193281
 DIST tox-3.24.0.tar.gz 304960 BLAKE2B 5f6256d27d75651929f2d4d511f6137f20c71ab44c57e5b908c0ba92d5d7998ad5df69bd937a963bdf27625eefb222b9be2c7dffbf44684092ef345f4e33d0ba SHA512 94879cb65c1d41cfca02b23c7d540b93f5d3667ce72135969c584f09e00e3a246d80851f7cefad1e199f0a56c526e4ffa31c2938428b6632a38ad72388925dcd
+DIST tox-3.24.1.tar.gz 305886 BLAKE2B fcedf8054a19a79045b2edead599fb11b7942986fa4bbc184140603e3bc6700eada452e661f4a576d029804ab2a9282df0cf9198eee9b483c2c6c68b086ee156 SHA512 e4bfb3dab15887ce6432a91b88a7387179cbf2a5ab5fa608b3f1f7349be4122d76ce01d396ae9b1515c211f2905d110a8414e254cc72bcf8a74542db98ea52de
 EBUILD tox-3.23.1.ebuild 2143 BLAKE2B fa09dc3153a5270f787129456d0b5e392867aefe171e6419d0653e8d695ae21594f1dbe4e035e58b4b82b5b7307b001c2642bd07c7e87e35edf0ae7745e3ca5b SHA512 7fa17af47c1f9290fbfcce71dd3907ed4d11a636699acd3c2c0fb7b346ea96525616f26c15ad18cdda158469f9c20f0214f4cf921b1a2a7a2f9b6aebd61a017d
 EBUILD tox-3.24.0.ebuild 2135 BLAKE2B f78d5fe7f3a27431a673c4175b93454d60d315c15b7ad0d7175b68827358319c5325b2de26a304f6a26a98885d69ed7db600f6388f68d7adae95c0ad4ac692fe SHA512 ebf3832e9b2b5c9814a53b134f95f8b0c6fda3b1ac3bb234577c2b22e39839c120ce978df29a9c43d2ec4313fb2d2207c23ce15aa73e885888319a7278bdb2ca
+EBUILD tox-3.24.1.ebuild 2135 BLAKE2B 211ba555220f655051a8cb9cecf1003daa26fa2760c2d393a3ec1099f13a5a0cbb913ba42faf76c3be9490b13f35b25c81442463f69dab7cb4da6681675291ab SHA512 933864001f395a128792c32efc2fb797e04dace82d74c0edb1ca8eddf5e0e63c447b1de8784d06d128a2b7ec5ff26c7bf5d01a5f61fd2fb5afe6fe20575e11cf
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.24.1.ebuild b/dev-python/tox/tox-3.24.1.ebuild
new file mode 100644
index 000000000000..fb84528454f2
--- /dev/null
+++ b/dev-python/tox/tox-3.24.1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+
+		# broken without tox installed first
+		# TODO: why it can't import itself?
+		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest --no-network ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/tqdm/Manifest b/dev-python/tqdm/Manifest
index 18b37ab0fbd1..3953d9c7c1c3 100644
--- a/dev-python/tqdm/Manifest
+++ b/dev-python/tqdm/Manifest
@@ -1,6 +1,8 @@
 AUX tqdm-4.61.1-py310.patch 1030 BLAKE2B 7505087ca6b5db8523a91c831d48f2dcbe34912d6eba34f80f48044bf5ff8a3c0166c02f5b4e2a693dbe49bc8a7db2682813ed495440f3f8f9fc0e69d93d31a3 SHA512 1de7036c469c078028fe0a9044ecb0ad1dc16d3642d65d13a7c61e6fccac9bea652da0dd385a238ed68a423d481b5bbaa09b2deb9a859a07d64d2eee617c53e8
 DIST tqdm-4.61.1.tar.gz 169637 BLAKE2B 8b89f320e13119b24a9e121747bce0b5c6625c31feb8c427a97e71da52797d9de764ce5e5c41c07d5954a1e5e4e21913335a4691837bc243db473821b2dad1ac SHA512 6092a30389380a511abc8bee7e6144556d6dc1a993ba4a2685707afa2838a12f472aa216ac5e55d144da74f9be1d398d4c6f5352986a200557e4aba67831a505
 DIST tqdm-4.61.2.tar.gz 169665 BLAKE2B f5dff67eb549cab0dd667815c25f6e885a2e0cefc2ad68e97fdc09599eb41b13589f7a88d5a445813973454a5e5f835b3139651ec2e09b717db0fd6dc705890e SHA512 bc33e8fe00244f90f61ab51d0c7c0b98d5580efebd9758284d9dbe2a699eabeb0d92871eedc2f95f377e29dd0f7ea4b5247b96cb4cc1687dcfea3a9ed1152ab7
+DIST tqdm-4.62.0.tar.gz 169668 BLAKE2B 64a3df2f00a4fcba6bb67ae15e04f392a73b54cf7284f3c013ad31d00317e9d84ac2e1feed302137aeb7ea9e3c9d1d730623cbd96e8c76c46df6382435146efa SHA512 dd60d5522b68086410ec5f02574477dcc33a887ef509cc1d1735921dd906f951180d6115680517b3abbd2cf6c4ee1c60b9c950654ea9b7642d52d28052326088
 EBUILD tqdm-4.61.1.ebuild 1200 BLAKE2B 0a796c10c2f1d1da67c2790fbdea9192b2ab613427468c73c6e3ba395c10a0aeb7d9db0621a8aba0bba23cd72176f8b7c442069f7c7b12cf46200a685b726945 SHA512 486fffe2e60ef08a9924ecb81588c4a4dace8d1aa5576ed8a2018e1485dab2381c4c176c92fd0cfd75a901433bbe5adf808d9643c4124c330dadf1441ddc60e3
-EBUILD tqdm-4.61.2.ebuild 1163 BLAKE2B 3498857b43003f27f533ea645e815e37e9462d1ea786028c11454b2fe0244e9036d34075c03648253defa0d8404359d4799cf47822478f4a2fe3f6dc1bb43887 SHA512 0e4b11197bbcd9f2b291ddad36afc2a6e442671afd0fc08687ade7c6612287f725d4711aee2c77e160bf6ba44f6696e03cd22b8c227a38bebd276a07cd88eced
+EBUILD tqdm-4.61.2.ebuild 1170 BLAKE2B 2409955943a44f519894be995f246cb779fed309aa1a6be85c4a73fe1c5bd622d92ff3debd3da955804c83ec269a3d01fa6ef8bd1248f25bbdc950e37c4129d2 SHA512 aa59e6ebbef2545054fb3cd3606e55b3c9267af575302b1975d956d15ec2457b7cd46f3657e8e46f63e5f0c6bdfacbb3f5e02122a42c66c5781133eab0678046
+EBUILD tqdm-4.62.0.ebuild 1170 BLAKE2B 2409955943a44f519894be995f246cb779fed309aa1a6be85c4a73fe1c5bd622d92ff3debd3da955804c83ec269a3d01fa6ef8bd1248f25bbdc950e37c4129d2 SHA512 aa59e6ebbef2545054fb3cd3606e55b3c9267af575302b1975d956d15ec2457b7cd46f3657e8e46f63e5f0c6bdfacbb3f5e02122a42c66c5781133eab0678046
 MISC metadata.xml 604 BLAKE2B 574eef287a9260a1c115d2e8751c417962cbc09fdd18c68b189898974c8396bc7fab56fcb71a067477e0701916cc9e4dd6701d19e86e62027fd8a34e630b3f17 SHA512 d12b1ccb6601676fcb18122a94d0f397ed1d411a8f8a40d32e595bf36faa08d5a9aeada278c471f063ea75605d7657f6697c2ed45ccc658b9e7f57a0114e7982
diff --git a/dev-python/tqdm/tqdm-4.61.2.ebuild b/dev-python/tqdm/tqdm-4.61.2.ebuild
index 376ba7ad0389..be993f734871 100644
--- a/dev-python/tqdm/tqdm-4.61.2.ebuild
+++ b/dev-python/tqdm/tqdm-4.61.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 fi
 
 DESCRIPTION="Add a progress meter to your loops in a second"
diff --git a/dev-python/tqdm/tqdm-4.62.0.ebuild b/dev-python/tqdm/tqdm-4.62.0.ebuild
new file mode 100644
index 000000000000..be993f734871
--- /dev/null
+++ b/dev-python/tqdm/tqdm-4.62.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+inherit distutils-r1
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/tqdm/tqdm"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+fi
+
+DESCRIPTION="Add a progress meter to your loops in a second"
+HOMEPAGE="https://github.com/tqdm/tqdm"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# Skip unpredictable performance tests
+	epytest --ignore 'tests/tests_perf.py'
+}
+
+python_install() {
+	doman "${BUILD_DIR}"/lib/tqdm/tqdm.1
+	rm "${BUILD_DIR}"/lib/tqdm/tqdm.1 || die
+	distutils-r1_python_install
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/trustme/Manifest b/dev-python/trustme/Manifest
index 16b6cc1655da..710dec89e6b7 100644
--- a/dev-python/trustme/Manifest
+++ b/dev-python/trustme/Manifest
@@ -1,3 +1,3 @@
 DIST trustme-0.8.0.tar.gz 29046 BLAKE2B 5f2dd542974466dd8e61fa0ba5cd78e824afd243dd3b27ca21aec4ba4905daaa0c46db8f4edb30dcb483acf44758d7ad8de4db9c3e07a05d4d3d084565722def SHA512 93b1007319f7d625410eddf92910607c8190533f9bb02a71ecc4c424e44ecea70749f6bceb917297241e179b0d50ce1ed330c208cf3de77d4d3a619f5436af9d
-EBUILD trustme-0.8.0.ebuild 810 BLAKE2B d5dce7362c72101be2512db8bcf8f28eab7da67f4fee249df7bdf799ffc55a4cc30ffa4b97abc65496bd5cf7f405f19919e2d3bac4bd254b963e708d55a213f3 SHA512 c6f5129605a6f4e8cff554014627298a0c2d17d19bb396fd949cc3add5b13e125be80dae3608480f7b1f0bf1b1ec1294daeb0baa7fd62b4815d1046367638178
+EBUILD trustme-0.8.0.ebuild 816 BLAKE2B b98441c0bf208482ad89506e5f47df5b171f816b539f2b40c004c4aab9a13e68933fe3f3dadb43adda96cdaf5cc680f52f4f21d06667c9b70d928592708f9203 SHA512 91a209bd08a2d1fb97e4bd1d40de82dd5258e793e85ab7e49e4967a0e784f2da23e3991fda497ea10faa661b364a31be43d3f112b92173fed1394d32937b3ffc
 MISC metadata.xml 443 BLAKE2B 8f591132e3a9478741063502a0da9709ba07974432fd9b008c59aee122f234b11b44c29b78b7f69600d7b385701c4c909b98472a7eb3d1a6cf5908acb436727f SHA512 38a7f228253d556064d94478e0e10ccf526368cff06f7201b82911f404e5e6d83a54b2658f6f241b8a8d1d600899dda9588023cb38fda828d94c6983add0f7f2
diff --git a/dev-python/trustme/trustme-0.8.0.ebuild b/dev-python/trustme/trustme-0.8.0.ebuild
index b56cc1f32e33..98d886c57307 100644
--- a/dev-python/trustme/trustme-0.8.0.ebuild
+++ b/dev-python/trustme/trustme-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
 	dev-python/idna[${PYTHON_USEDEP}]"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 23f3948fed89..17a680ce8752 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,5 +1,5 @@
 DIST twine-3.4.1.tar.gz 211775 BLAKE2B 0fdc6a8f5a37ee9695c8db2080987b631dfe6f8ed718e3912c94d77b46d35682d27bef07715c1fe7c0d8b6ab1449a771e18d8ffa5c6044dde1536b56b3e7885e SHA512 eca2a7b6b1386868f67dec1182599a8331981585e1cc0b7eef762aa0e99b87b0c6725a2c776330a8b392254501880a68e01ed8569a169857e8079abb8da43b79
 DIST twine-3.4.2.tar.gz 212266 BLAKE2B 602bb72f4be1c0d28341fb3378a5d55737c14555495640ae3414a1c8e7ca0c06b2c2ce3c358130251c02f0a51b61eb362a1e999c3945d4d1d7afd7bcd4d17807 SHA512 3f6d8992294a35e2a26be64f56c88d31af63b05f3f477d545bc82d928ca1b9939d23fa489eca5232502a49def77d489eaf6a29663d150f78b5cdb99749ff9b50
 EBUILD twine-3.4.1.ebuild 1726 BLAKE2B 5d2749084f74af80645d6232369ecb693a89a8b309b7618f2de647e13ab1df8e791eae950dfe551c23e0efecd7f311bd76cd10bf51a2c423eb6e30008a82e304 SHA512 72e689f1436fa6ba57035074c4c60bc43ba61cb6ecc03db4b45b4c0539b41fd735e4e183aedb28ae146a7f7067e7761f181ecbb7e952538d7bbd1e9cd0d2e6a0
-EBUILD twine-3.4.2.ebuild 1774 BLAKE2B f21412daf87832f0a107b99438928a94abe1c06011c57ad0350d18b1d9d20b8ade9f1d03e8878e01f1e7db3761ceb9ef66b73a6bb63d2c5d25afc6a46fd61f8c SHA512 c172f89b737e69f0ac75ac055127b65c378971182b13e0aa01bab89244948e9ae138e6c983d1e3f1932e2099a63a73ccd2e3e40310b04f6c7b7740be7c113f3a
+EBUILD twine-3.4.2.ebuild 1781 BLAKE2B edea30cb0146b554237d7a8ccbceed3c670e3c4e1ddfc58c8ac2faa454e40efed6b87a5d5ddb3d8153d0b23da219b5fa13ed50a1267574b72261d0ae3ffe2b97 SHA512 9383f28afb2560e8723f262631be74106aa2319b47ef4a8bec385f1c3998b4f1ed9847483dd9cf409c183dfd185dada001e611b0431dcfba40dd6617068282a8
 MISC metadata.xml 382 BLAKE2B 7b1f58005d26a36c877707986c59a6ae3549b9e8118f01fc87aa05a1f7dfa4271ea2100663d49b7b5b8f278409e96b2dabcdb0d9a74809bba75d440fd42d88bd SHA512 c4ce9e0c6029c9efb8be9b36720281ed4ebf0d829e3d936d0a7a864d8f42b1f7c71dc8b605717547ac004bd94c7baebd5b2d2a224899fad0efa0747124ba5bfb
diff --git a/dev-python/twine/twine-3.4.2.ebuild b/dev-python/twine/twine-3.4.2.ebuild
index 72a1dedc5390..97a82eff44d7 100644
--- a/dev-python/twine/twine-3.4.2.ebuild
+++ b/dev-python/twine/twine-3.4.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
 	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/twisted/Manifest b/dev-python/twisted/Manifest
index 7485b613d57c..249f2a706a0b 100644
--- a/dev-python/twisted/Manifest
+++ b/dev-python/twisted/Manifest
@@ -1,20 +1,12 @@
 AUX twistd.conf 277 BLAKE2B 78ca35b410a6597c9afe6a9c8d3dfb1de113411634901f936794e8a59c0644233d0673e710bd0870ecf4312d079c46f62f43928605700559134f1fb62490559a SHA512 76d44caebab8404f16937c2515ad9ae8236732a48c7127366f7fa22c6ed3d88ace2d33b832a6d95f775973d41b7caf75344805fe5b01e964c04eb710bf3c89fb
 AUX twistd.init 563 BLAKE2B 24488118b025bf2068bbf07af900064ff6a7ee99106c3da30f15f2b3f85af7443212afebc6b52a12645488b85656f87b653df9263fc2be6bd09707917899f252 SHA512 7860601beba1efda2b0a045b2a044ec33caff9ee915d45225c05e281760a68da349b4c45080600177aab32aa806714327acf3cf5dda92be0874f781f129bb129
-AUX twisted-19.10.0-py38-cgi.patch 1356 BLAKE2B d172448bd2807dc57ac2a905427f0a91fa93dd17a1e58ab64dc17fc02fe05a81cee4c08aa667c799720cde33877e4b72f8db8df3587d8d8d711988bb2e388128 SHA512 65629acfc2f6dd6686db715024209e9ff12b97d5190c4377e6d88222c85c1d2a1f3502a93801525ee1a0fc0357f2b28ba87db888ea64bccfbfdc74fdfb667f42
-AUX twisted-19.10.0-py38.patch 3997 BLAKE2B 26df585019d5e2aca4257c9a7840a973ee9e1f3dfce65c76b021b8d6ea07ed8c6abca237c11ce75b49994ea7ed95de587a433a6a6f3577cd6f2ddf243d40defd SHA512 bc6eb1b1bbb704fe30c4ef071f8d8e95faaad3089013d11765f30f4b6bdbb108b913b043c071d00c18b53655841cb1810286331c5318d4659ad7c90d90b9fb4e
-AUX twisted-19.10.0-py39-b64.patch 7022 BLAKE2B f59573231a70318aac1f383602725949f033e017c036ab204815816ef168ad122253e903ff577c1a055c12023d06dc49ebfcdecf693d9890476785653860a628 SHA512 5904bcf5eadcd53d038870d6868fec1a81d6327c31b7b2360987a69e6f4046e92e11b52260c53a2361687161a36a5b6f53b24906d404ebe25f86e5bdc11fc6dc
-AUX twisted-20.3.0-py38-cgi.patch 8601 BLAKE2B 6eb76eaa1cfe10ba473a334bfd5e5a4c760739550c4aeba5cf68cbf380ca7f24725e102cf0f75b7a384faf639e03d9e80c11e0cc56339319329207a6342a8d55 SHA512 9877f4e3c0ad6d438cb046a04e60affbcbe7b263d06128ec6ea4d726194b044bf9f6c68891373624b435fb434fc878220834d038180d3d203defe31dab44710c
-AUX twisted-20.3.0-py38-hmac.patch 3484 BLAKE2B b89587da906517a621ba880eb6eb71cc2f397a7bcf7bcf065f79897626f821d965b2daa0d105af7e48c8c30fb79fb836c02db17058b5ac046ae92f9578899a62 SHA512 a6ed24994bf76a7e602144eed706c61cce531408db050dc2a497fb4131b5594f4d29ebd34c0d780b283460d130dfc88b19ad9cbe5436c0290b9b13eb35c9342b
-AUX twisted-20.3.0-py39-b64.patch 6747 BLAKE2B 1bb6960e5049f43b08e2ba7a56a16616e82f3b18290645b2f14bd15a199d3e1b2767e030a8295fc2d3f4a8a3d1a6e4a5d5d7d55a089da643c593b2a3df174119 SHA512 6f58dcecf07925d15a1373726e03da4083a0266ee6629089b30b0c8ab62bd007579942430989df2d550578067e2c2c542062dd20a38851794f6ef86e85aefb95
-AUX twisted-20.3.0-py39-combined.patch 3752 BLAKE2B 687698bccf6af3213812ae29e7e234c36941f0f7ecfdcfa8c14a6a7b5a433b9ff2a40c2ad870e46b3437210202cf0dc58e17c8d29ebf506c499780355cf60bdb SHA512 81f0b597a7b2609bae5f405388bccf759dd6b0295cf05e6ef2aee76d0f3ab4367a474704aab2753d101be2580d097f30d94acc529035bdb3c3ec43dd035fb733
 AUX twisted-21.2.0-force-gtk3.patch 1619 BLAKE2B d167c6e3177a345c03e68d37d596e743af0eb5b7acbc055df032bba26b38acced190baa6b44b3ae8f750fa06d4670a5e85146b95508bfb9acb93980e5a0bdbf4 SHA512 3b359d98c747a3d10e5e16fd3de5f00eb56fa64bef7fdbac07f569ad49033c63092703584ff7127e6af8394fc1b4e94846a0556bd7db38b473a473e4d833f7db
 AUX twisted-21.2.0-incremental-21.patch 2303 BLAKE2B 34bd2eef6b7bc9810466bb5daa97736eb8aba88ed6e9e1bec78a9547d7068a330685eacaaf8b5eb16a33733792a0bff8a78b08f5ff5c6766763e687a98e1295e SHA512 0f2aabc82233dd43a418de38d6b46284e5f7c136e27eaecd423d25908c9a652c7725ea0318bcbee906b2d3cdf8b9cdf44e4ee496ed33aad60f609a3980bbb115
 AUX twisted-21.2.0-int-from-bytes.patch 485 BLAKE2B c436bcfdacc124a1f6d24d1a9500940e18efb2136dbd35f86575495ee1b4afb6ae4e0eaf262167c4d4dacdda28c8ec2b951fadd2570e9894d90f0bf09ddeee6a SHA512 3794ea978ebe82103aedf284a57215a69a68804d43f2def9dba58f600f8af190ae2fd6ddcc064ece35dec85661830eb386c1ce799aefb78f60e530fe23cdcb22
-DIST Twisted-19.10.0.tar.bz2 3118485 BLAKE2B a0d532b67177aa017e463bf823d7842d4f6ff694f78cd7600865718ffe861023a53ea6a922f7de232133edba26f5255074d7ef277ce8f3bdf02d556ccf4abf41 SHA512 de8d7fd0b2081cebeff68b060c8469377011648bc563a94a993d3530fb007ed42c3a54925c9a10c465ee7a3065cc9108ace12d10d358223fab13494becb9ac4b
-DIST Twisted-20.3.0.tar.bz2 3127793 BLAKE2B 2e85fc3ec26d89e563c9e79a5d2adea81ff1745d18f0f92b8d45ae3729fbddf09998664257880372c7a4caeb5977c5cad7c863596b8c27ad7890275cead9f763 SHA512 1b850e5fc21a3630ead4c2cc3622c16e78bb3be38ab11d021779b7ce3d3c30acc4e19d79c7791a5fce6c5c6e09c2baa349901dffe952de67dd98eec419846365
+AUX twisted-21.7.0-force-gtk3.patch 2759 BLAKE2B 65be4e948865a8de6cda3fbb9e90032d8c90b4db2e6b60d5861868273837c2ce846ab1452ca468f2e65be27882ca17ba842a9010607cc0e3969aeb70490e9ab1 SHA512 f4424f2b1f785c459263b4cdd3f906543e99ad6956130dcf3f6b589386a84637ca52d1346dc3465ef23fc82c701751e6053d145a0ca5225b846d6a7c20991f73
 DIST twisted-21.2.0.tar.gz 3882978 BLAKE2B ba37572b0f9eadf2962a2730e4c2c0ed65f582b11b3350034660a2c53c5cd0892b19867d19e0201d4808c09fca621dbe540d153dc6c7d5827d45d2423d19d28b SHA512 fa743dcf22f3c17dfd17f39b7df0cc31fb8ce3e989478ada9a026424ec2de35e6a403ef35acdef5905eed008d42e3c2fee6b7ccdda433e6c250f1feaa83ea8a4
+DIST twisted-21.7.0.tar.gz 3895345 BLAKE2B 510165ad2933f07005e508df5a8bdf2863a7988c0f18fcc089e948d190c65aab32fc876d3120e311e91d6989f1ea2d8b3b5f5db4a9dfc63c38da56213f718728 SHA512 a946769a6bc6c72af26e7763b9e0675788f134b4d005ea89d935da1b1d5f60d92c84fdb2615e442e7da2b98291ee8a63d5236ec7ba72ef04ad3f847b092feecb
 DIST twisted-regen-cache.gz 911 BLAKE2B ffd3fcda6c67ffe6fd3ef581c8d507548396b66ed0708e9a5c790095e579c0d5f0f71596acf05712989da2ddef2b8d437eca973bc4d80ef8a9fa852915f38305 SHA512 95a9b931c73017d16d1b5e6b41345dddffe62b6af1a8e93b5e40d06d3d15be17b0dd0181c767ffeeb791534d463764ef9e066fa6c2ee2ac4b53c86d1da8fce03
-EBUILD twisted-19.10.0.ebuild 5778 BLAKE2B 357cb440aa44c8203865c199b5d00d6da0567a19270065277eed1ecaf4e999d51120aa66db9200c0b18af64e2855cee4986de6e198504b72f9d691b0a541ab8b SHA512 8d0c15bd1fd4aab254053bca7b7b65066dca3ee8078af107dd5388d893ad6edfdb8abb7e89806314d1a755e65e1055c98354774ead50dc0cf64cbe4c5e6ddd99
-EBUILD twisted-20.3.0.ebuild 5612 BLAKE2B 7fec5be0b0ccf4cddcb2b04fdd3de6ce697f0fafec4e622cdc3d1761947f7c469b70e3e4bdb21262fa8645bbfdbeba8b2070723bcee97c02f8029734baa05c30 SHA512 4375f5549010300e6e933470c3be054289acf5e6cebb18189d8c1ba1e2aa9c96e8629c0b6c5fc3aa68218b84d978120be3e703dfec901f49cc75db0533a86e16
-EBUILD twisted-21.2.0-r1.ebuild 5160 BLAKE2B f86a801b1e5b995b821b4e5327ca4cd12f39a530e6251f3344ae24b6b798f2c6a44d28acf24873404b27e38b6d1792ae28a2bbe6b268c39a4004cf9f7322844a SHA512 c98f9376e32b044fc5718455ab1777a4f6347246b33ddd9b25c8f1cb665ce9cf6bc51c67042b08bca17d97eb950ec90eed95eaba0d5ff0dfb1c1aeea76b2fb95
+EBUILD twisted-21.2.0-r1.ebuild 5159 BLAKE2B 9a7bac0617c2416d67abd62716c0434111f6fad1eea367ad9ede428f12ecd09e2569202af6162861d7c4f7f2fd760f0eaa39e2fe87df10981f98f33b82a29d2a SHA512 f7d4a6f3ceabcf59154d4a56938315c5ac881b17474c251d947ecc7292661bf1ec42b82f59cfedbc1bbf6637918fe5748581a7912dfb20b29da59934349247a7
+EBUILD twisted-21.7.0.ebuild 4975 BLAKE2B 6d4d3ebf50e33a99ecd340b824235d86a74d377c655427b27dc826aadb80b1c33d5a4856717e3d6cb8588968bdbcb6fc7e6fd9be7d026b48ed7aa71b2cf9c0a9 SHA512 e8b85128c506ca63847a7eeffd3105fcf02d17290a4ea6205ce55bb0aee9160401b88ab085280f617dbae263b6294a4070fc8ef65d6a69c9c60f89c8c9e08bca
 MISC metadata.xml 1351 BLAKE2B b3a4ccdc922dd4aa902b24b2545f3cc5517b2842c92f1195e8eaa2a8b62558c1ea86059cc23b9ad6a8e6093216a11a01f46360b5ba259e5eadcb351ad3bc0094 SHA512 403d692122913d079c5a93cb5b226f33316776360663a171cd757584d219d0789b24809c9e65840aaeb63eae4cb7cc79258757837abb1e3dd92536369fff6604
diff --git a/dev-python/twisted/files/twisted-19.10.0-py38-cgi.patch b/dev-python/twisted/files/twisted-19.10.0-py38-cgi.patch
deleted file mode 100644
index 5fc4768e5d23..000000000000
--- a/dev-python/twisted/files/twisted-19.10.0-py38-cgi.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
-index 6001d1e40..1cf9172ef 100644
---- a/src/twisted/web/test/test_http.py
-+++ b/src/twisted/web/test/test_http.py
-@@ -9,15 +9,15 @@ from __future__ import absolute_import, division
- 
- import base64
- import calendar
--import cgi
- import random
- 
- import hamcrest
- 
- try:
-     from urlparse import urlparse, urlunsplit, clear_cache
-+    from cgi import parse_qs
- except ImportError:
--    from urllib.parse import urlparse, urlunsplit, clear_cache
-+    from urllib.parse import urlparse, urlunsplit, clear_cache, parse_qs
- 
- from io import BytesIO
- from itertools import cycle
-@@ -2156,15 +2156,15 @@ Hello,
- class QueryArgumentsTests(unittest.TestCase):
-     def testParseqs(self):
-         self.assertEqual(
--            cgi.parse_qs(b"a=b&d=c;+=f"),
-+            parse_qs(b"a=b&d=c;+=f"),
-             http.parse_qs(b"a=b&d=c;+=f"))
-         self.assertRaises(
-             ValueError, http.parse_qs, b"blah", strict_parsing=True)
-         self.assertEqual(
--            cgi.parse_qs(b"a=&b=c", keep_blank_values=1),
-+            parse_qs(b"a=&b=c", keep_blank_values=1),
-             http.parse_qs(b"a=&b=c", keep_blank_values=1))
-         self.assertEqual(
--            cgi.parse_qs(b"a=&b=c"),
-+            parse_qs(b"a=&b=c"),
-             http.parse_qs(b"a=&b=c"))
- 
- 
diff --git a/dev-python/twisted/files/twisted-19.10.0-py38.patch b/dev-python/twisted/files/twisted-19.10.0-py38.patch
deleted file mode 100644
index e787167d45b3..000000000000
--- a/dev-python/twisted/files/twisted-19.10.0-py38.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From d33b90880b8eb024daa73bc3fd39aca0bc791ff1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Lucas=20Treffenst=C3=A4dt?= <lucas@treffenstaedt.de>
-Date: Mon, 13 Jan 2020 13:54:08 +0100
-Subject: [PATCH 1/2] CramMD5ClientAuthenticator now specifies the digestmod
- argument to hmac.HMAC constructor explicitly.
-
----
- src/twisted/mail/_cred.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/twisted/mail/_cred.py b/src/twisted/mail/_cred.py
-index 9d3646948..43c406f90 100644
---- a/src/twisted/mail/_cred.py
-+++ b/src/twisted/mail/_cred.py
-@@ -8,6 +8,7 @@ Credential managers for L{twisted.mail}.
- from __future__ import absolute_import, division
- 
- import hmac
-+import hashlib
- 
- from zope.interface import implementer
- 
-@@ -28,7 +29,7 @@ class CramMD5ClientAuthenticator:
- 
- 
-     def challengeResponse(self, secret, chal):
--        response = hmac.HMAC(secret, chal).hexdigest().encode('ascii')
-+        response = hmac.HMAC(secret, chal, digestmod = hashlib.md5).hexdigest().encode('ascii')
-         return self.user + b' ' + response
- 
- 
--- 
-2.26.2
-
-From 694bc67f3cf7d36a6f512f0b76882e85d0966dd2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Poisson?= <goffi@goffi.org>
-Date: Sun, 17 Nov 2019 19:48:53 +0100
-Subject: [PATCH 2/2] Fix parsing of namespaced attributes with Python 3.8 in
- twisted.words.xish.domish.ExpatElementStream
-
----
- src/twisted/words/newsfragments/9730.bugfix |  1 +
- src/twisted/words/test/test_domish.py       | 17 +++++++++++++++++
- src/twisted/words/xish/domish.py            | 11 +++++++++--
- 3 files changed, 27 insertions(+), 2 deletions(-)
- create mode 100644 src/twisted/words/newsfragments/9730.bugfix
-
-diff --git a/src/twisted/words/newsfragments/9730.bugfix b/src/twisted/words/newsfragments/9730.bugfix
-new file mode 100644
-index 000000000..5c91305c8
---- /dev/null
-+++ b/src/twisted/words/newsfragments/9730.bugfix
-@@ -0,0 +1 @@
-+Fixed parsing of streams with Python 3.8 when there are spaces in namespaces or namespaced attributes in twisted.words.xish.domish.ExpatElementStream
-diff --git a/src/twisted/words/test/test_domish.py b/src/twisted/words/test/test_domish.py
-index a8f8fa76b..cd16e3a4d 100644
---- a/src/twisted/words/test/test_domish.py
-+++ b/src/twisted/words/test/test_domish.py
-@@ -350,6 +350,23 @@ class DomishStreamTestsMixin:
-             self.elements[0].attributes, {(" bar baz ", "baz"): "quux"})
- 
- 
-+    def test_attributesWithNamespaces(self):
-+        """
-+        Attributes with namespace are parsed without Exception.
-+        (https://twistedmatrix.com/trac/ticket/9730 regression test)
-+        """
-+
-+        xml = b"""<root xmlns:test='http://example.org' xml:lang='en'>
-+                    <test:test>test</test:test>
-+                  </root>"""
-+
-+        # with Python 3.8 and without #9730 fix, the following error would
-+        # happen at next line:
-+        # ``RuntimeError: dictionary keys changed during iteration``
-+        self.stream.parse(xml)
-+        self.assertEqual(self.elements[0].uri, "http://example.org")
-+
-+
-     def testChildPrefix(self):
-         xml = b"<root xmlns='testns' xmlns:foo='testns2'><foo:child/></root>"
- 
-diff --git a/src/twisted/words/xish/domish.py b/src/twisted/words/xish/domish.py
-index 2063c410a..fc49285f5 100644
---- a/src/twisted/words/xish/domish.py
-+++ b/src/twisted/words/xish/domish.py
-@@ -807,11 +807,18 @@ class ExpatElementStream:
-             qname = ('', name)
- 
-         # Process attributes
-+        newAttrs = {}
-+        toDelete = []
-         for k, v in attrs.items():
-             if " " in k:
-                 aqname = k.rsplit(" ", 1)
--                attrs[(aqname[0], aqname[1])] = v
--                del attrs[k]
-+                newAttrs[(aqname[0], aqname[1])] = v
-+                toDelete.append(k)
-+
-+        attrs.update(newAttrs)
-+
-+        for k in toDelete:
-+            del attrs[k]
- 
-         # Construct the new element
-         e = Element(qname, self.defaultNsStack[-1], attrs, self.localPrefixes)
--- 
-2.26.2
-
diff --git a/dev-python/twisted/files/twisted-19.10.0-py39-b64.patch b/dev-python/twisted/files/twisted-19.10.0-py39-b64.patch
deleted file mode 100644
index f67d6240558a..000000000000
--- a/dev-python/twisted/files/twisted-19.10.0-py39-b64.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From f56133a2e0d7ddf9ee6e43bf9e1d62e970cb0b3a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 May 2020 13:23:37 +0200
-Subject: [PATCH] Replace base64.*string() functions to fix py3.9 support
-
-Replace base64.decodestring() and .encodestring() functions as they
-were deprecated since Python 3.1 in favor of (equivalent) .decodebytes()
-and .encodebytes(), and were eventually removed in Python 3.9.
-
-While at it, replace most of their uses with base64.b64encode()
-and .b64decode() that are preferable to the former wrt ticket #6446,
-and they do not introduce line breaks that the twisted code usually
-discarded.
-
-Use .decodebytes() and .encodebytes() in DirDBM as it seems to rely
-on the exact presence of newlines, and changing that would break
-backwards compatibility.
-
-Fixes: ticket:6446
-Fixes: ticket:9831
----
- src/twisted/conch/scripts/tkconch.py          |  2 +-
- src/twisted/conch/test/test_keys.py           |  2 +-
- src/twisted/mail/pop3.py                      |  4 ++--
- src/twisted/mail/test/test_pop3.py            |  4 ++--
- src/twisted/persisted/dirdbm.py               | 10 ++++++++--
- src/twisted/web/http.py                       |  2 +-
- src/twisted/web/test/test_http.py             |  6 +++---
- 14 files changed, 18 insertions(+), 12 deletions(-)
-
-diff --git a/src/twisted/conch/scripts/tkconch.py b/src/twisted/conch/scripts/tkconch.py
-index 9c48e8a7f..5e007ebdc 100644
---- a/src/twisted/conch/scripts/tkconch.py
-+++ b/src/twisted/conch/scripts/tkconch.py
-@@ -409,7 +409,7 @@ class SSHClientTransport(transport.SSHClientTransport):
-                 "known hosts.\r\n" %
-                 (khHost, {b'ssh-dss':'DSA', b'ssh-rsa':'RSA'}[keyType]))
-             with open(os.path.expanduser('~/.ssh/known_hosts'), 'a') as known_hosts:
--                encodedKey = base64.encodestring(pubKey).replace(b'\n', b'')
-+                encodedKey = base64.b64encode(pubKey)
-                 known_hosts.write('\n%s %s %s' % (khHost, keyType, encodedKey))
-         except:
-             log.deferr()
-diff --git a/src/twisted/conch/test/test_keys.py b/src/twisted/conch/test/test_keys.py
-index 41e49f415..795e7b8d7 100644
---- a/src/twisted/conch/test/test_keys.py
-+++ b/src/twisted/conch/test/test_keys.py
-@@ -352,7 +352,7 @@ SUrCyZXsNh6VXwjs3gKQ
- 
-         self.assertRaises(
-             keys.BadKeyError,
--            keys.Key.fromString, data=b'{' + base64.encodestring(sexp) + b'}',
-+            keys.Key.fromString, data=b'{' + base64.b64encode(sexp) + b'}',
-             )
- 
- 
-diff --git a/src/twisted/mail/pop3.py b/src/twisted/mail/pop3.py
-index ffe9714c9..057389e3a 100644
---- a/src/twisted/mail/pop3.py
-+++ b/src/twisted/mail/pop3.py
-@@ -728,7 +728,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
-         self._auth = auth()
-         chal = self._auth.getChallenge()
- 
--        self.sendLine(b'+ ' + base64.encodestring(chal).rstrip(b'\n'))
-+        self.sendLine(b'+ ' + base64.b64encode(chal))
-         self.state = 'AUTH'
- 
- 
-@@ -747,7 +747,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
-         """
-         self.state = "COMMAND"
-         try:
--            parts = base64.decodestring(line).split(None, 1)
-+            parts = base64.b64decode(line).split(None, 1)
-         except binascii.Error:
-             self.failResponse(b"Invalid BASE64 encoding")
-         else:
-diff --git a/src/twisted/mail/test/test_pop3.py b/src/twisted/mail/test/test_pop3.py
-index ea513487c..36780d9c9 100644
---- a/src/twisted/mail/test/test_pop3.py
-+++ b/src/twisted/mail/test/test_pop3.py
-@@ -1097,12 +1097,12 @@ class SASLTests(unittest.TestCase):
- 
-         p.lineReceived(b"AUTH CRAM-MD5")
-         chal = s.getvalue().splitlines()[-1][2:]
--        chal = base64.decodestring(chal)
-+        chal = base64.b64decode(chal)
-         response = hmac.HMAC(b'testpassword', chal,
-                              digestmod=md5).hexdigest().encode("ascii")
- 
-         p.lineReceived(
--            base64.encodestring(b'testuser ' + response).rstrip(b'\n'))
-+            base64.b64encode(b'testuser ' + response))
-         self.assertTrue(p.mbox)
-         self.assertTrue(s.getvalue().splitlines()[-1].find(b"+OK") >= 0)
-         p.connectionLost(failure.Failure(Exception("Test harness disconnect")))
-diff --git a/src/twisted/persisted/dirdbm.py b/src/twisted/persisted/dirdbm.py
-index f97c526d0..d9f29cce2 100644
---- a/src/twisted/persisted/dirdbm.py
-+++ b/src/twisted/persisted/dirdbm.py
-@@ -81,14 +81,20 @@ class DirDBM:
-         Encode a key so it can be used as a filename.
-         """
-         # NOTE: '_' is NOT in the base64 alphabet!
--        return base64.encodestring(k).replace(b'\n', b'_').replace(b"/", b"-")
-+        try:
-+            return base64.encodebytes(k).replace(b'\n', b'_').replace(b"/", b"-")
-+        except AttributeError:
-+            return base64.encodestring(k).replace(b'\n', b'_').replace(b"/", b"-")
- 
- 
-     def _decode(self, k):
-         """
-         Decode a filename to get the key.
-         """
--        return base64.decodestring(k.replace(b'_', b'\n').replace(b"-", b"/"))
-+        try:
-+            return base64.decodebytes(k.replace(b'_', b'\n').replace(b"-", b"/"))
-+        except AttributeError:
-+            return base64.decodestring(k.replace(b'_', b'\n').replace(b"-", b"/"))
- 
- 
-     def _readFile(self, path):
-diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py
-index fe88d3373..602a58f31 100644
---- a/src/twisted/web/http.py
-+++ b/src/twisted/web/http.py
-@@ -1540,7 +1540,7 @@ class Request:
-             bas, upw = authh.split()
-             if bas.lower() != b"basic":
-                 raise ValueError()
--            upw = base64.decodestring(upw)
-+            upw = base64.b64decode(upw)
-             self.user, self.password = upw.split(b':', 1)
-         except (binascii.Error, ValueError):
-             self.user = self.password = ""
-diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
-index 6001d1e40..70065e232 100644
---- a/src/twisted/web/test/test_http.py
-+++ b/src/twisted/web/test/test_http.py
-@@ -1513,7 +1513,7 @@ class ParsingTests(unittest.TestCase):
-                 requests.append(self)
- 
-         for u, p in [(b"foo", b"bar"), (b"hello", b"there:z")]:
--            s = base64.encodestring(b":".join((u, p))).strip()
-+            s = base64.b64encode(b":".join((u, p)))
-             f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
-             self.runRequest(f, Request, 0)
-             req = requests.pop()
-@@ -2139,9 +2139,9 @@ Hello,
- 
-         u = b"foo"
-         p = b"bar"
--        s = base64.encodestring(b":".join((u, p))).strip()
-+        s = base64.b64encode(b":".join((u, p)))
-         f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
--        self.patch(base64, 'decodestring', lambda x: [])
-+        self.patch(base64, 'b64decode', lambda x: [])
-         self.runRequest(f, Request, 0)
-         req = requests.pop()
-         self.assertEqual(('', ''), req.credentials)
--- 
-2.26.2
-
diff --git a/dev-python/twisted/files/twisted-20.3.0-py38-cgi.patch b/dev-python/twisted/files/twisted-20.3.0-py38-cgi.patch
deleted file mode 100644
index 5151f297f7f4..000000000000
--- a/dev-python/twisted/files/twisted-20.3.0-py38-cgi.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-From 62ab0203c59c1f9788c53dfad4a212774094d05c Mon Sep 17 00:00:00 2001
-From: Craig Rodrigues <rodrigc@FreeBSD.org>
-Date: Mon, 13 Apr 2020 01:22:23 -0700
-Subject: [PATCH 2/2] Merge 9801-rodrigc-cgi: Change import of cgi.parse_qs to
- urllib.parse.parse_qs
-
-Author: rodrigc
-Reviewer: hawkowl
-Fixes: ticket:9801
----
- src/twisted/web/client.py               | 17 ++++-----
- src/twisted/web/http.py                 | 49 ++++++++++++-------------
- src/twisted/web/newsfragments/9801.misc |  0
- src/twisted/web/test/test_http.py       | 41 +++------------------
- src/twisted/web/test/test_webclient.py  |  5 +--
- 5 files changed, 38 insertions(+), 74 deletions(-)
- create mode 100644 src/twisted/web/newsfragments/9801.misc
-
-diff --git a/src/twisted/web/client.py b/src/twisted/web/client.py
-index 7e4642ef3..8209f5a5e 100644
---- a/src/twisted/web/client.py
-+++ b/src/twisted/web/client.py
-@@ -12,15 +12,8 @@ import os
- import collections
- import warnings
- 
--try:
--    from urlparse import urlunparse, urljoin, urldefrag
--except ImportError:
--    from urllib.parse import urljoin, urldefrag
--    from urllib.parse import urlunparse as _urlunparse
--
--    def urlunparse(parts):
--        result = _urlunparse(tuple([p.decode("charmap") for p in parts]))
--        return result.encode("charmap")
-+from urllib.parse import urljoin, urldefrag
-+from urllib.parse import urlunparse as _urlunparse
- 
- import zlib
- from functools import wraps
-@@ -51,6 +44,12 @@ from twisted.web._newclient import _ensureValidURI, _ensureValidMethod
- 
- 
- 
-+def urlunparse(parts):
-+    result = _urlunparse(tuple([p.decode("charmap") for p in parts]))
-+    return result.encode("charmap")
-+
-+
-+
- class PartialDownloadError(error.Error):
-     """
-     Page was only partially downloaded, we got disconnected in middle.
-diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py
-index b7afa8b0d..94d0ae81f 100644
---- a/src/twisted/web/http.py
-+++ b/src/twisted/web/http.py
-@@ -66,27 +66,10 @@ import time
- import calendar
- import warnings
- import os
--from io import BytesIO as StringIO
--
--try:
--    from urlparse import (
--        ParseResult as ParseResultBytes, urlparse as _urlparse)
--    from urllib import unquote
--    from cgi import parse_header as _parseHeader
--except ImportError:
--    from urllib.parse import (
--        ParseResultBytes, urlparse as _urlparse, unquote_to_bytes as unquote)
--
--    def _parseHeader(line):
--        # cgi.parse_header requires a str
--        key, pdict = cgi.parse_header(line.decode('charmap'))
--
--        # We want the key as bytes, and cgi.parse_multipart (which consumes
--        # pdict) expects a dict of str keys but bytes values
--        key = key.encode('charmap')
--        pdict = {x:y.encode('charmap') for x, y in pdict.items()}
--        return (key, pdict)
-+from io import BytesIO
- 
-+from urllib.parse import (
-+    ParseResultBytes, urlparse as _urlparse, unquote_to_bytes as unquote)
- 
- from zope.interface import Attribute, Interface, implementer, provider
- 
-@@ -163,6 +146,20 @@ monthname = [None,
- weekdayname_lower = [name.lower() for name in weekdayname]
- monthname_lower = [name and name.lower() for name in monthname]
- 
-+
-+
-+def _parseHeader(line):
-+    # cgi.parse_header requires a str
-+    key, pdict = cgi.parse_header(line.decode('charmap'))
-+
-+    # We want the key as bytes, and cgi.parse_multipart (which consumes
-+    # pdict) expects a dict of str keys but bytes values
-+    key = key.encode('charmap')
-+    pdict = {x: y.encode('charmap') for x, y in pdict.items()}
-+    return (key, pdict)
-+
-+
-+
- def urlparse(url):
-     """
-     Parse an URL into six components.
-@@ -486,13 +483,15 @@ class _IDeprecatedHTTPChannelToRequestInterface(Interface):
- 
- class StringTransport:
-     """
--    I am a StringIO wrapper that conforms for the transport API. I support
-+    I am a BytesIO wrapper that conforms for the transport API. I support
-     the `writeSequence' method.
-     """
-     def __init__(self):
--        self.s = StringIO()
-+        self.s = BytesIO()
-+
-     def writeSequence(self, seq):
-         self.s.write(b''.join(seq))
-+
-     def __getattr__(self, attr):
-         return getattr(self.__dict__['s'], attr)
- 
-@@ -513,7 +512,7 @@ class HTTPClient(basic.LineReceiver):
-     @type firstLine: C{bool}
- 
-     @ivar __buffer: The buffer that stores the response to the HTTP request.
--    @type __buffer: A C{StringIO} object.
-+    @type __buffer: A C{BytesIO} object.
- 
-     @ivar _header: Part or all of an HTTP request header.
-     @type _header: C{bytes}
-@@ -579,7 +578,7 @@ class HTTPClient(basic.LineReceiver):
-             if self._header != b"":
-                 # Only extract headers if there are any
-                 self.extractHeader(self._header)
--            self.__buffer = StringIO()
-+            self.__buffer = BytesIO()
-             self.handleEndHeaders()
-             self.setRawMode()
-             return
-@@ -665,7 +664,7 @@ def _getContentFile(length):
-     Get a writeable file-like object to which request content can be written.
-     """
-     if length is not None and length < 100000:
--        return StringIO()
-+        return BytesIO()
-     return tempfile.TemporaryFile()
- 
- 
-diff --git a/src/twisted/web/newsfragments/9801.misc b/src/twisted/web/newsfragments/9801.misc
-new file mode 100644
-index 000000000..e69de29bb
-diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
-index a3067f732..4189b307c 100644
---- a/src/twisted/web/test/test_http.py
-+++ b/src/twisted/web/test/test_http.py
-@@ -9,15 +9,11 @@ from __future__ import absolute_import, division
- 
- import base64
- import calendar
--import cgi
- import random
- 
- import hamcrest
- 
--try:
--    from urlparse import urlparse, urlunsplit, clear_cache
--except ImportError:
--    from urllib.parse import urlparse, urlunsplit, clear_cache
-+from urllib.parse import urlparse, urlunsplit, clear_cache, parse_qs
- 
- from io import BytesIO
- from itertools import cycle
-@@ -28,7 +24,7 @@ from zope.interface import (
- )
- from zope.interface.verify import verifyObject
- 
--from twisted.python.compat import (_PY3, iterbytes, long, networkString,
-+from twisted.python.compat import (iterbytes, long, networkString,
-                                    unicode, intToBytes)
- from twisted.python.components import proxyForInterface
- from twisted.python.failure import Failure
-@@ -2019,33 +2015,6 @@ Content-Type: application/x-www-form-urlencoded
-         self.assertEqual(content, [networkString(query)])
- 
- 
--    def test_missingContentDisposition(self):
--        """
--        If the C{Content-Disposition} header is missing, the request is denied
--        as a bad request.
--        """
--        req = b'''\
--POST / HTTP/1.0
--Content-Type: multipart/form-data; boundary=AaB03x
--Content-Length: 103
--
----AaB03x
--Content-Type: text/plain
--Content-Transfer-Encoding: quoted-printable
--
--abasdfg
----AaB03x--
--'''
--        channel = self.runRequest(req, http.Request, success=False)
--        self.assertEqual(
--            channel.transport.value(),
--            b"HTTP/1.1 400 Bad Request\r\n\r\n")
--
--    if _PY3:
--        test_missingContentDisposition.skip = (
--            "cgi.parse_multipart is much more error-tolerant on Python 3.")
--
--
-     def test_multipartProcessingFailure(self):
-         """
-         When the multipart processing fails the client gets a 400 Bad Request.
-@@ -2373,15 +2342,15 @@ ok
- class QueryArgumentsTests(unittest.TestCase):
-     def testParseqs(self):
-         self.assertEqual(
--            cgi.parse_qs(b"a=b&d=c;+=f"),
-+            parse_qs(b"a=b&d=c;+=f"),
-             http.parse_qs(b"a=b&d=c;+=f"))
-         self.assertRaises(
-             ValueError, http.parse_qs, b"blah", strict_parsing=True)
-         self.assertEqual(
--            cgi.parse_qs(b"a=&b=c", keep_blank_values=1),
-+            parse_qs(b"a=&b=c", keep_blank_values=1),
-             http.parse_qs(b"a=&b=c", keep_blank_values=1))
-         self.assertEqual(
--            cgi.parse_qs(b"a=&b=c"),
-+            parse_qs(b"a=&b=c"),
-             http.parse_qs(b"a=&b=c"))
- 
- 
-diff --git a/src/twisted/web/test/test_webclient.py b/src/twisted/web/test/test_webclient.py
-index 680e02780..672594993 100644
---- a/src/twisted/web/test/test_webclient.py
-+++ b/src/twisted/web/test/test_webclient.py
-@@ -11,10 +11,7 @@ import io
- import os
- from errno import ENOSPC
- 
--try:
--    from urlparse import urlparse, urljoin
--except ImportError:
--    from urllib.parse import urlparse, urljoin
-+from urllib.parse import urlparse, urljoin
- 
- from twisted.python.compat import networkString, nativeString, intToBytes
- from twisted.trial import unittest, util
--- 
-2.26.2
-
diff --git a/dev-python/twisted/files/twisted-20.3.0-py38-hmac.patch b/dev-python/twisted/files/twisted-20.3.0-py38-hmac.patch
deleted file mode 100644
index 1c1ee01b2187..000000000000
--- a/dev-python/twisted/files/twisted-20.3.0-py38-hmac.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 653fb2aea0ca1f60558917d52f4ff0c33cd7b067 Mon Sep 17 00:00:00 2001
-From: Craig Rodrigues <rodrigc@crodrigues.org>
-Date: Sun, 12 Apr 2020 14:28:23 -0700
-Subject: [PATCH 1/2] Add digestmod parameter to HMAC.__init__() invocations
-
-This parameter is now required on Python 3.8+
----
- src/twisted/cred/credentials.py        |  3 ++-
- src/twisted/cred/test/test_cramauth.py | 11 ++++++++---
- src/twisted/mail/test/test_pop3.py     |  4 +++-
- 3 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/src/twisted/cred/credentials.py b/src/twisted/cred/credentials.py
-index 5469e5158..67c24cb01 100644
---- a/src/twisted/cred/credentials.py
-+++ b/src/twisted/cred/credentials.py
-@@ -441,7 +441,8 @@ class CramMD5Credentials(object):
- 
- 
-     def checkPassword(self, password):
--        verify = hexlify(hmac.HMAC(password, self.challenge).digest())
-+        verify = hexlify(hmac.HMAC(password, self.challenge,
-+                         digestmod=md5).digest())
-         return verify == self.response
- 
- 
-diff --git a/src/twisted/cred/test/test_cramauth.py b/src/twisted/cred/test/test_cramauth.py
-index 1ee08712b..d21f2f68c 100644
---- a/src/twisted/cred/test/test_cramauth.py
-+++ b/src/twisted/cred/test/test_cramauth.py
-@@ -7,6 +7,8 @@ Tests for L{twisted.cred}'s implementation of CRAM-MD5.
- 
- from __future__ import division, absolute_import
- 
-+import hashlib
-+
- from hmac import HMAC
- from binascii import hexlify
- 
-@@ -39,7 +41,8 @@ class CramMD5CredentialsTests(TestCase):
-         """
-         c = CramMD5Credentials()
-         chal = c.getChallenge()
--        c.response = hexlify(HMAC(b'secret', chal).digest())
-+        c.response = hexlify(HMAC(b'secret', chal,
-+                             digestmod=hashlib.md5).digest())
-         self.assertTrue(c.checkPassword(b'secret'))
- 
- 
-@@ -61,7 +64,8 @@ class CramMD5CredentialsTests(TestCase):
-         """
-         c = CramMD5Credentials()
-         chal = c.getChallenge()
--        c.response = hexlify(HMAC(b'thewrongsecret', chal).digest())
-+        c.response = hexlify(HMAC(b'thewrongsecret', chal,
-+                             digestmod=hashlib.md5).digest())
-         self.assertFalse(c.checkPassword(b'secret'))
- 
- 
-@@ -75,7 +79,8 @@ class CramMD5CredentialsTests(TestCase):
-         chal = c.getChallenge()
-         c.setResponse(b" ".join(
-             (b"squirrel",
--             hexlify(HMAC(b'supersecret', chal).digest()))))
-+             hexlify(HMAC(b'supersecret', chal,
-+                     digestmod=hashlib.md5).digest()))))
-         self.assertTrue(c.checkPassword(b'supersecret'))
-         self.assertEqual(c.username, b"squirrel")
- 
-diff --git a/src/twisted/mail/test/test_pop3.py b/src/twisted/mail/test/test_pop3.py
-index 4a59c3b49..ea513487c 100644
---- a/src/twisted/mail/test/test_pop3.py
-+++ b/src/twisted/mail/test/test_pop3.py
-@@ -11,6 +11,7 @@ import hmac
- import base64
- import itertools
- 
-+from hashlib import md5
- from collections import OrderedDict
- from io import BytesIO
- 
-@@ -1097,7 +1098,8 @@ class SASLTests(unittest.TestCase):
-         p.lineReceived(b"AUTH CRAM-MD5")
-         chal = s.getvalue().splitlines()[-1][2:]
-         chal = base64.decodestring(chal)
--        response = hmac.HMAC(b'testpassword', chal).hexdigest().encode("ascii")
-+        response = hmac.HMAC(b'testpassword', chal,
-+                             digestmod=md5).hexdigest().encode("ascii")
- 
-         p.lineReceived(
-             base64.encodestring(b'testuser ' + response).rstrip(b'\n'))
--- 
-2.26.2
-
diff --git a/dev-python/twisted/files/twisted-20.3.0-py39-b64.patch b/dev-python/twisted/files/twisted-20.3.0-py39-b64.patch
deleted file mode 100644
index f475614df408..000000000000
--- a/dev-python/twisted/files/twisted-20.3.0-py39-b64.patch
+++ /dev/null
@@ -1,158 +0,0 @@
-From f44c2ff111a8961d295409186cc07aaf414c76bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 May 2020 13:23:37 +0200
-Subject: [PATCH 1/4] Replace base64.*string() functions to fix py3.9 support
-
-Replace base64.decodestring() and .encodestring() functions as they
-were deprecated since Python 3.1 in favor of (equivalent) .decodebytes()
-and .encodebytes(), and were eventually removed in Python 3.9.
-
-While at it, replace most of their uses with base64.b64encode()
-and .b64decode() that are preferable to the former wrt ticket #6446,
-and they do not introduce line breaks that the twisted code usually
-discarded.
-
-Use .decodebytes() and .encodebytes() in DirDBM as it seems to rely
-on the exact presence of newlines, and changing that would break
-backwards compatibility.
-
-Fixes: ticket:6446
-Fixes: ticket:9831
----
- src/twisted/conch/scripts/tkconch.py          | 2 +-
- src/twisted/conch/test/test_keys.py           | 2 +-
- src/twisted/mail/pop3.py                      | 4 ++--
- src/twisted/mail/test/test_pop3.py            | 4 ++--
- src/twisted/persisted/dirdbm.py               | 4 ++--
- src/twisted/web/http.py                       | 2 +-
- src/twisted/web/test/test_http.py             | 6 +++---
- 14 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/src/twisted/conch/scripts/tkconch.py b/src/twisted/conch/scripts/tkconch.py
-index a662cabc8..744734343 100644
---- a/src/twisted/conch/scripts/tkconch.py
-+++ b/src/twisted/conch/scripts/tkconch.py
-@@ -412,7 +412,7 @@ class SSHClientTransport(transport.SSHClientTransport):
-                 "known hosts.\r\n" %
-                 (khHost, {b'ssh-dss':'DSA', b'ssh-rsa':'RSA'}[keyType]))
-             with open(os.path.expanduser('~/.ssh/known_hosts'), 'a') as known_hosts:
--                encodedKey = base64.encodestring(pubKey).replace(b'\n', b'')
-+                encodedKey = base64.b64encode(pubKey)
-                 known_hosts.write('\n%s %s %s' % (khHost, keyType, encodedKey))
-         except:
-             log.deferr()
-diff --git a/src/twisted/conch/test/test_keys.py b/src/twisted/conch/test/test_keys.py
-index 650a19bfb..f76cbd1b4 100644
---- a/src/twisted/conch/test/test_keys.py
-+++ b/src/twisted/conch/test/test_keys.py
-@@ -404,7 +404,7 @@ SUrCyZXsNh6VXwjs3gKQ
- 
-         self.assertRaises(
-             keys.BadKeyError,
--            keys.Key.fromString, data=b'{' + base64.encodestring(sexp) + b'}',
-+            keys.Key.fromString, data=b'{' + base64.b64encode(sexp) + b'}',
-             )
- 
- 
-diff --git a/src/twisted/mail/pop3.py b/src/twisted/mail/pop3.py
-index ffe9714c9..057389e3a 100644
---- a/src/twisted/mail/pop3.py
-+++ b/src/twisted/mail/pop3.py
-@@ -728,7 +728,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
-         self._auth = auth()
-         chal = self._auth.getChallenge()
- 
--        self.sendLine(b'+ ' + base64.encodestring(chal).rstrip(b'\n'))
-+        self.sendLine(b'+ ' + base64.b64encode(chal))
-         self.state = 'AUTH'
- 
- 
-@@ -747,7 +747,7 @@ class POP3(basic.LineOnlyReceiver, policies.TimeoutMixin):
-         """
-         self.state = "COMMAND"
-         try:
--            parts = base64.decodestring(line).split(None, 1)
-+            parts = base64.b64decode(line).split(None, 1)
-         except binascii.Error:
-             self.failResponse(b"Invalid BASE64 encoding")
-         else:
-diff --git a/src/twisted/mail/test/test_pop3.py b/src/twisted/mail/test/test_pop3.py
-index f7fbfaf1e..af335ab2d 100644
---- a/src/twisted/mail/test/test_pop3.py
-+++ b/src/twisted/mail/test/test_pop3.py
-@@ -1096,12 +1096,12 @@ class SASLTests(unittest.TestCase):
- 
-         p.lineReceived(b"AUTH CRAM-MD5")
-         chal = s.getvalue().splitlines()[-1][2:]
--        chal = base64.decodestring(chal)
-+        chal = base64.b64decode(chal)
-         response = hmac.HMAC(b'testpassword', chal,
-                              digestmod=md5).hexdigest().encode("ascii")
- 
-         p.lineReceived(
--            base64.encodestring(b'testuser ' + response).rstrip(b'\n'))
-+            base64.b64encode(b'testuser ' + response))
-         self.assertTrue(p.mbox)
-         self.assertTrue(s.getvalue().splitlines()[-1].find(b"+OK") >= 0)
-         p.connectionLost(failure.Failure(Exception("Test harness disconnect")))
-diff --git a/src/twisted/persisted/dirdbm.py b/src/twisted/persisted/dirdbm.py
-index 3ba7a59d4..7659ff765 100644
---- a/src/twisted/persisted/dirdbm.py
-+++ b/src/twisted/persisted/dirdbm.py
-@@ -77,14 +77,14 @@ class DirDBM:
-         Encode a key so it can be used as a filename.
-         """
-         # NOTE: '_' is NOT in the base64 alphabet!
--        return base64.encodestring(k).replace(b'\n', b'_').replace(b"/", b"-")
-+        return base64.encodebytes(k).replace(b'\n', b'_').replace(b"/", b"-")
- 
- 
-     def _decode(self, k):
-         """
-         Decode a filename to get the key.
-         """
--        return base64.decodestring(k.replace(b'_', b'\n').replace(b"-", b"/"))
-+        return base64.decodebytes(k.replace(b'_', b'\n').replace(b"-", b"/"))
- 
- 
-     def _readFile(self, path):
-diff --git a/src/twisted/web/http.py b/src/twisted/web/http.py
-index 0e115741e..e9a080d21 100644
---- a/src/twisted/web/http.py
-+++ b/src/twisted/web/http.py
-@@ -1544,7 +1544,7 @@ class Request:
-             bas, upw = authh.split()
-             if bas.lower() != b"basic":
-                 raise ValueError()
--            upw = base64.decodestring(upw)
-+            upw = base64.b64decode(upw)
-             self.user, self.password = upw.split(b':', 1)
-         except (binascii.Error, ValueError):
-             self.user = self.password = b''
-diff --git a/src/twisted/web/test/test_http.py b/src/twisted/web/test/test_http.py
-index 112e56f46..02a4674a7 100644
---- a/src/twisted/web/test/test_http.py
-+++ b/src/twisted/web/test/test_http.py
-@@ -1604,7 +1604,7 @@ class ParsingTests(unittest.TestCase):
-                 requests.append(self)
- 
-         for u, p in [(b"foo", b"bar"), (b"hello", b"there:z")]:
--            s = base64.encodestring(b":".join((u, p))).strip()
-+            s = base64.b64encode(b":".join((u, p)))
-             f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
-             self.runRequest(f, Request, 0)
-             req = requests.pop()
-@@ -2209,9 +2209,9 @@ Hello,
- 
-         u = b"foo"
-         p = b"bar"
--        s = base64.encodestring(b":".join((u, p))).strip()
-+        s = base64.b64encode(b":".join((u, p)))
-         f = b"GET / HTTP/1.0\nAuthorization: Basic " + s + b"\n\n"
--        self.patch(base64, 'decodestring', lambda x: [])
-+        self.patch(base64, 'b64decode', lambda x: [])
-         self.runRequest(f, Request, 0)
-         req = requests.pop()
-         self.assertEqual((b'', b''), req.credentials)
--- 
-2.26.2
diff --git a/dev-python/twisted/files/twisted-20.3.0-py39-combined.patch b/dev-python/twisted/files/twisted-20.3.0-py39-combined.patch
deleted file mode 100644
index 0ed1f7b8d9c6..000000000000
--- a/dev-python/twisted/files/twisted-20.3.0-py39-combined.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 2d30860a8b71e90513ead9958f5dd312802b0d36 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 May 2020 14:40:53 +0200
-Subject: [PATCH 2/4] Fix imap4-utf-7 codec lookup function for Python 3.9
-
-Python 3.9 normalizes the codec name into 'imap4_utf_7' rather than
-'imap4-utf-7', and therefore the lookup function needs to account
-for the former name.  Transform the latter locally to preserve support
-for all Python versions.
-
-Fixes: ticket: 9832
----
- src/twisted/mail/imap4.py                | 2 +-
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/twisted/mail/imap4.py b/src/twisted/mail/imap4.py
-index 736ef111d..3f32982ca 100644
---- a/src/twisted/mail/imap4.py
-+++ b/src/twisted/mail/imap4.py
-@@ -6369,7 +6369,7 @@ _codecInfo = codecs.CodecInfo(encoder, decoder, StreamReader, StreamWriter)
- 
- 
- def imap4_utf_7(name):
--    if name == 'imap4-utf-7':
-+    if name.replace('-', '_') == 'imap4_utf_7':
-         return _codecInfo
- 
- codecs.register(imap4_utf_7)
--- 
-2.26.2
-
-From daf928bf0f0371816dddbd4929948c4213d0cdcb Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 May 2020 15:12:54 +0200
-Subject: [PATCH 3/4] Fix verifyCryptedPassword() for crypt.crypt() throwing in
- py3.9
-
-In Python 3.9, the crypt.crypt() function may throw an exception
-if the underlying crypt() function fails.  Update
-verifyCryptedPassword() to account for that, and preserve the existing
-behavior of returning False in that case.
-
-Fixes: ticket:9833
----
- src/twisted/conch/checkers.py             | 5 ++++-
- src/twisted/plugins/cred_unix.py          | 5 ++++-
- 4 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/twisted/conch/checkers.py b/src/twisted/conch/checkers.py
-index 917567a39..e4e327b16 100644
---- a/src/twisted/conch/checkers.py
-+++ b/src/twisted/conch/checkers.py
-@@ -53,7 +53,10 @@ def verifyCryptedPassword(crypted, pw):
- 
-     @rtype: L{bool}
-     """
--    return crypt.crypt(pw, crypted) == crypted
-+    try:
-+        return crypt.crypt(pw, crypted) == crypted
-+    except OSError:
-+        return False
- 
- 
- 
-diff --git a/src/twisted/plugins/cred_unix.py b/src/twisted/plugins/cred_unix.py
-index 211b4ccbc..a662719b6 100644
---- a/src/twisted/plugins/cred_unix.py
-+++ b/src/twisted/plugins/cred_unix.py
-@@ -43,7 +43,10 @@ def verifyCryptedPassword(crypted, pw):
-         pw = pw.decode('utf-8')
-     if not isinstance(crypted, StringType):
-         crypted = crypted.decode('utf-8')
--    return crypt.crypt(pw, crypted) == crypted
-+    try:
-+        return crypt.crypt(pw, crypted) == crypted
-+    except OSError:
-+        return False
- 
- 
- 
--- 
-2.26.2
-
-From 4fc435df0d1eba3e5d6416a2b86d39d3404f82fe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Wed, 27 May 2020 15:37:10 +0200
-Subject: [PATCH 4/4] Use xml.etree.ElementTree instead of deprecated
- cElementTree
-
-The xml.etree.cElementTree is deprecated, and has been removed in Python
-3.9.  At the same time, xml.etree.ElementTree has already been using
-cElementTree implicitly since Python 3.3.  Update test_flatten to use
-the latter to provide compatibility with newer Python versions.
-
-Fixes: ticket:9834
----
- src/twisted/web/test/test_flatten.py    | 2 +-
- 2 files changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/twisted/web/test/test_flatten.py b/src/twisted/web/test/test_flatten.py
-index 677401c55..61d50e20a 100644
---- a/src/twisted/web/test/test_flatten.py
-+++ b/src/twisted/web/test/test_flatten.py
-@@ -9,7 +9,7 @@ L{twisted.web._flatten}.
- import sys
- import traceback
- 
--from xml.etree.cElementTree import XML
-+from xml.etree.ElementTree import XML
- 
- from collections import OrderedDict
- 
--- 
-2.26.2
-
diff --git a/dev-python/twisted/files/twisted-21.7.0-force-gtk3.patch b/dev-python/twisted/files/twisted-21.7.0-force-gtk3.patch
new file mode 100644
index 000000000000..a2e40559ec59
--- /dev/null
+++ b/dev-python/twisted/files/twisted-21.7.0-force-gtk3.patch
@@ -0,0 +1,67 @@
+From eec6b60116e12e015387fe1fa3a729553d3848bf Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sat, 22 May 2021 01:11:48 +0200
+Subject: [PATCH] Force using GTK+3 in twisted.internet.gireactor
+
+Modify twisted.internet.gireactor to explicitly request GTK+ version 3.
+Otherwise it uses the newest version installed which could be GTK+4
+that gireactor is currently incompatible with.
+---
+ src/twisted/internet/gireactor.py           | 3 +++
+ src/twisted/internet/test/test_gireactor.py | 3 +++
+ src/twisted/newsfragments/10200.bugfix      | 1 +
+ 3 files changed, 7 insertions(+)
+ create mode 100644 src/twisted/newsfragments/10200.bugfix
+
+diff --git a/src/twisted/internet/gireactor.py b/src/twisted/internet/gireactor.py
+index 92596db1d..a577825a8 100644
+--- a/src/twisted/internet/gireactor.py
++++ b/src/twisted/internet/gireactor.py
+@@ -24,6 +24,7 @@ On Python 3, pygobject v3.4 or later is required.
+ from twisted.internet.error import ReactorAlreadyRunning
+ from twisted.internet import _glibbase
+ from twisted.python import runtime
++import gi  # type: ignore[import]
+ import gi.pygtkcompat  # type: ignore[import]
+ from gi.repository import GLib  # type: ignore[import]
+ 
+@@ -68,6 +69,7 @@ class GIReactor(_glibbase.GlibReactorBase):
+     def __init__(self, useGtk=False):
+         _gtk = None
+         if useGtk is True:
++            gi.require_version("Gtk", "3.0")
+             from gi.repository import Gtk as _gtk
+ 
+         _glibbase.GlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk)
+@@ -112,6 +114,7 @@ class PortableGIReactor(_glibbase.PortableGlibReactorBase):
+     def __init__(self, useGtk=False):
+         _gtk = None
+         if useGtk is True:
++            gi.require_version("Gtk", "3.0")
+             from gi.repository import Gtk as _gtk
+ 
+         _glibbase.PortableGlibReactorBase.__init__(self, GLib, _gtk, useGtk=useGtk)
+diff --git a/src/twisted/internet/test/test_gireactor.py b/src/twisted/internet/test/test_gireactor.py
+index d15a92622..af5092a36 100644
+--- a/src/twisted/internet/test/test_gireactor.py
++++ b/src/twisted/internet/test/test_gireactor.py
+@@ -25,6 +25,9 @@ else:
+         gtk3reactor = None
+     else:
+         gtk3reactor = _gtk3reactor
++        import gi  # type: ignore[import]
++
++        gi.require_version("Gtk", "3.0")
+         from gi.repository import Gtk
+ 
+ from twisted.internet.error import ReactorAlreadyRunning
+diff --git a/src/twisted/newsfragments/10200.bugfix b/src/twisted/newsfragments/10200.bugfix
+new file mode 100644
+index 000000000..7afb343be
+--- /dev/null
++++ b/src/twisted/newsfragments/10200.bugfix
+@@ -0,0 +1 @@
++twisted.internet.gireactor was fixed to force GTK+3 in order to fix use of incompatible GTK+4 API when installed
+-- 
+2.32.0
+
diff --git a/dev-python/twisted/twisted-19.10.0.ebuild b/dev-python/twisted/twisted-19.10.0.ebuild
deleted file mode 100644
index cd70c36f469b..000000000000
--- a/dev-python/twisted/twisted-19.10.0.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 virtualx
-
-TWISTED_PN="Twisted"
-TWISTED_P="${TWISTED_PN}-${PV}"
-TWISTED_RELEASE=$(ver_cut 1-2)
-
-DESCRIPTION="An asynchronous networking framework written in Python"
-HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
-	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-S=${WORKDIR}/${TWISTED_P}
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="conch crypt http2 serial test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-17.4.0[${PYTHON_USEDEP}]
-	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
-	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
-	conch? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-	)
-	crypt? (
-		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		>=dev-python/idna-0.6[${PYTHON_USEDEP}]
-	)
-	serial? ( >=dev-python/pyserial-3.0[${PYTHON_USEDEP}] )
-	http2? (
-		>=dev-python/hyper-h2-3.0.0[${PYTHON_USEDEP}]
-		<dev-python/hyper-h2-4.0.0[${PYTHON_USEDEP}]
-		>=dev-python/priority-1.1.0[${PYTHON_USEDEP}]
-		<dev-python/priority-2.0[${PYTHON_USEDEP}]
-	)
-	!dev-python/twisted-core
-	!dev-python/twisted-conch
-	!dev-python/twisted-lore
-	!dev-python/twisted-mail
-	!dev-python/twisted-names
-	!dev-python/twisted-news
-	!dev-python/twisted-pair
-	!dev-python/twisted-runner
-	!dev-python/twisted-words
-	!dev-python/twisted-web
-"
-DEPEND="
-	dev-python/bcrypt
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/gmpy[${PYTHON_USEDEP}]
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
-		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
-		dev-python/pyserial[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
-		net-misc/openssh
-	)
-"
-
-python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/${P}-py38.patch
-		"${FILESDIR}"/twisted-19.10.0-py38-cgi.patch
-		"${FILESDIR}"/twisted-20.3.0-py38-hmac.patch
-		"${FILESDIR}"/twisted-19.10.0-py39-b64.patch
-		"${FILESDIR}"/twisted-20.3.0-py39-combined.patch
-	)
-
-	# upstream test for making releases; not very useful and requires
-	# sphinx (including on py2)
-	rm src/twisted/python/test/test_release.py || die
-
-	# Conch doesn't work with latest >=OpenSSH 7.6
-	#   - https://twistedmatrix.com/trac/ticket/9311
-	#   - https://twistedmatrix.com/trac/ticket/9515
-	rm src/twisted/conch/test/test_ckeygen.py || die
-	rm src/twisted/conch/test/test_conch.py || die
-	rm src/twisted/conch/test/test_cftp.py || die
-
-	# puts system in EMFILE state, then the exception handler may fail
-	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \
-		-i src/twisted/internet/test/test_tcp.py || die
-
-	# TODO: times out, i can't find where to increase the timeout
-	sed -e 's:test_manyProcesses:_&:' \
-		-i src/twisted/test/test_process.py || die
-
-	# multicast tests fail within network-sandbox
-	sed -e 's:test_joinLeave:_&:' \
-		-e 's:test_loopback:_&:' \
-		-e 's:test_multiListen:_&:' \
-		-e 's:test_multicast:_&:' \
-		-i src/twisted/test/test_udp.py || die
-
-	# accesses /dev/net/tun
-	sed -e '/class RealDeviceTestsMixin/a\
-    skip = "Requires extra permissions"' \
-		-i src/twisted/pair/test/test_tuntap.py || die
-
-	# TODO: figure it out, probably doesn't accept DST date here
-	sed -e 's:test_getTimezoneOffsetWithoutDaylightSavingTime:_&:' \
-		-i src/twisted/test/test_log.py || die
-
-	# TODO: failures specific to Python 2
-	sed -e 's:testLookupProcNetTcp:_&:' \
-		-i src/twisted/test/test_ident.py || die
-	sed -e 's:test_loggingFactoryOpensLogfileAutomatically:_&:' \
-		-i src/twisted/test/test_policies.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	# TODO: upstream seems to override our build paths
-	distutils_install_for_testing
-
-	"${EPYTHON}" -m twisted.trial twisted ||
-		die "Tests failed with ${EPYTHON}"
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	cd "${D}$(python_get_sitedir)" || die
-
-	# own the dropin.cache so we don't leave orphans
-	touch twisted/plugins/dropin.cache || die
-
-	python_doscript "${WORKDIR}"/twisted-regen-cache
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	newconfd "${FILESDIR}/twistd.conf" twistd
-	newinitd "${FILESDIR}/twistd.init" twistd
-}
-
-python_postinst() {
-	twisted-regen-cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl python_postinst
-
-	einfo "Install complete"
-	if use test ; then
-		einfo ""
-		einfo "Some tests have been disabled during testing due to"
-		einfo "known incompatibilities with the emerge sandboxes and/or"
-		einfo "not runnable as the root user."
-		einfo "For a complete test suite run on the code."
-		einfo "Run the tests as a normal user for each python it is installed to."
-		einfo "  ie:  $ python3.6 /usr/bin/trial twisted"
-	fi
-}
-
-python_postrm() {
-	rm -f "${ROOT}$(python_get_sitedir)/twisted/plugins/dropin.cache" || die
-}
-
-pkg_postrm() {
-	# if we're removing the last version, remove the cache file
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		python_foreach_impl python_postrm
-	fi
-}
diff --git a/dev-python/twisted/twisted-21.2.0-r1.ebuild b/dev-python/twisted/twisted-21.2.0-r1.ebuild
index 80810364d1cb..296e07d25869 100644
--- a/dev-python/twisted/twisted-21.2.0-r1.ebuild
+++ b/dev-python/twisted/twisted-21.2.0-r1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 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"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/twisted/twisted-20.3.0.ebuild b/dev-python/twisted/twisted-21.7.0.ebuild
index 48c006ad930f..68bcdd4ffffc 100644
--- a/dev-python/twisted/twisted-20.3.0.ebuild
+++ b/dev-python/twisted/twisted-21.7.0.ebuild
@@ -3,25 +3,21 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 virtualx
 
-TWISTED_PN="Twisted"
-TWISTED_P="${TWISTED_PN}-${PV}"
-TWISTED_RELEASE=$(ver_cut 1-2)
-
 DESCRIPTION="An asynchronous networking framework written in Python"
 HOMEPAGE="https://www.twistedmatrix.com/trac/"
-SRC_URI="https://twistedmatrix.com/Releases/${TWISTED_PN}"
-SRC_URI="${SRC_URI}/${TWISTED_RELEASE}/${TWISTED_P}.tar.bz2
+SRC_URI="
+	https://github.com/twisted/twisted/archive/${P}.tar.gz
 	https://dev.gentoo.org/~mgorny/dist/twisted-regen-cache.gz"
-
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+S=${WORKDIR}/${PN}-${P}
 
 LICENSE="MIT"
 SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="conch crypt http2 serial test"
 RESTRICT="!test? ( test )"
 
@@ -30,13 +26,15 @@ RDEPEND="
 	>=dev-python/automat-0.3.0[${PYTHON_USEDEP}]
 	>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
 	>=dev-python/hyperlink-17.1.1[${PYTHON_USEDEP}]
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
 	>=dev-python/pyhamcrest-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.6.5[${PYTHON_USEDEP}]
 	>=dev-python/zope-interface-4.4.2[${PYTHON_USEDEP}]
 	conch? (
-		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
 		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-1.5.0[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
 	)
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
@@ -61,47 +59,37 @@ RDEPEND="
 	!dev-python/twisted-words
 	!dev-python/twisted-web
 "
-DEPEND="
-	dev-python/bcrypt
-	>=dev-python/incremental-16.10.1[${PYTHON_USEDEP}]
+BDEPEND="
+	>=dev-python/incremental-21.3.0[${PYTHON_USEDEP}]
 	test? (
+		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
+		dev-python/cython-test-exception-raiser[${PYTHON_USEDEP}]
 		dev-python/gmpy[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
 		dev-python/pyasn1[${PYTHON_USEDEP}]
-		>=dev-python/cryptography-0.9.1[${PYTHON_USEDEP}]
-		>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
-		dev-python/service_identity[${PYTHON_USEDEP}]
-		dev-python/idna[${PYTHON_USEDEP}]
 		dev-python/pyserial[${PYTHON_USEDEP}]
-		>=dev-python/constantly-15.1.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
 		net-misc/openssh
 	)
 "
 
-S=${WORKDIR}/${TWISTED_P}
+PATCHES=(
+	# https://twistedmatrix.com/trac/ticket/10200
+	"${FILESDIR}/${P}-force-gtk3.patch"
+)
 
 python_prepare_all() {
-	local PATCHES=(
-		"${FILESDIR}"/twisted-20.3.0-py38-cgi.patch
-		"${FILESDIR}"/twisted-20.3.0-py38-hmac.patch
-		"${FILESDIR}"/twisted-20.3.0-py39-b64.patch
-		"${FILESDIR}"/twisted-20.3.0-py39-combined.patch
-	)
-
 	# upstream test for making releases; not very useful and requires
 	# sphinx (including on py2)
 	rm src/twisted/python/test/test_release.py || die
 
-	# Conch doesn't work with latest >=OpenSSH 7.6
-	#   - https://twistedmatrix.com/trac/ticket/9311
-	#   - https://twistedmatrix.com/trac/ticket/9515
-	rm src/twisted/conch/test/test_ckeygen.py || die
-	rm src/twisted/conch/test/test_conch.py || die
-	rm src/twisted/conch/test/test_cftp.py || die
-
 	# puts system in EMFILE state, then the exception handler may fail
 	# trying to open more files due to some gi magic
-	sed -e '/SKIP_EMFILE/s:None:"Fails on non-pristine systems":' \
+	sed -e '/SKIP_EMFILE/s:False:True:' \
 		-i src/twisted/internet/test/test_tcp.py || die
 
 	# multicast tests fail within network-sandbox
@@ -116,15 +104,9 @@ python_prepare_all() {
     skip = "Requires extra permissions"' \
 		-i src/twisted/pair/test/test_tuntap.py || die
 
-	# TODO: figure it out, probably doesn't accept DST date here
-	sed -e 's:test_getTimezoneOffsetWithoutDaylightSavingTime:_&:' \
-		-i src/twisted/test/test_log.py || die
-
-	# TODO: failures specific to Python 2
-	sed -e 's:testLookupProcNetTcp:_&:' \
-		-i src/twisted/test/test_ident.py || die
-	sed -e 's:test_loggingFactoryOpensLogfileAutomatically:_&:' \
-		-i src/twisted/test/test_policies.py || die
+	# These tests rely on warnings which seems work unreliably between python versions
+	sed -e 's:test_currentEUID:_&:' \
+		-e 's:test_currentUID:_&:' -i src/twisted/python/test/test_util.py || die
 
 	distutils-r1_python_prepare_all
 }
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index cef081279a40..e76697687380 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,5 +1,3 @@
-DIST urllib3-1.26.5.tar.gz 292865 BLAKE2B 0b22a485635f70f198c022c13d03af2b1a9b6907276e3bc3acaa2242e1c632447762f86e9588e735462e6479ff93a172f458691ea9bf28ceaebd5e1cfbc55501 SHA512 4a1899b223b00894d49f6dff5fc95d410e5b0ab28c11f7e3cd82d03e50438b0c5b0adf693a33fd80f1586312dc0012836713998674da15531bf82d52645881f6
 DIST urllib3-1.26.6.tar.gz 289927 BLAKE2B 197b0df759b27fc4906c565426e9c7b533fad56f10695ab5ae6c6c4d05d5c889dba906be526d8b8f41405f29696046b7db6e2cbb2fa16843af80e072138cc35f SHA512 19eb4b88b7a575db717db420ff79b304769d9a6d2b576a236d69719101c4d52d6b0079bd049c885e630f0dfd60471f8bb33836847e0569652cddece910ec2979
-EBUILD urllib3-1.26.5.ebuild 1962 BLAKE2B 619160dfebe98b7497545a2044c4af5522b54d3b53a956c86041bb50588562784feb41c32faaded7feb7769e364029a695decd7a22ecc5c5673a4bba5ece4aa6 SHA512 a54a2e38a40e134c8cf8fab84b99f5a810ae89452a0204ef12ee695b3aa3d616887b6ec3d908447c2f807a258050bd55ecd4a05687f38a7811f82486cf9b454e
-EBUILD urllib3-1.26.6.ebuild 1970 BLAKE2B e3dee58d1f4b280c2c2c8a84afcb9356450f045267ec321467933ffac73a9de5050473524d971cd65724b8de1b3e22ea824fc0cfd933a3083bd46b0b6bbb6dc0 SHA512 4d14b178b5d4df05883498a6cb0b38d1630ba11e20b3d93ccb57a27bf99e0d510389f1344155177501472f4ec4f39d8bf5c4ef4fcb6141a3d0d0e2eed5a86219
+EBUILD urllib3-1.26.6.ebuild 1962 BLAKE2B 1fe2eae1dd3608a8b9f8a6ef3582f92a78a98ac8ba0378561825708f72c2341c8900ab6aa38b88a74fa8b6f0d9421dbee903a93d8b4ee1036f69d0bedebac4a2 SHA512 b265eeadf3bb12270e604cbd65b570c836b081c8b7e67a19aeba8b29b9b62bd93a2cec945bb770b422e354f97675766ed3451630cdc9c5ad6d44523c603d02f8
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/urllib3-1.26.5.ebuild b/dev-python/urllib3/urllib3-1.26.5.ebuild
deleted file mode 100644
index a718303d1a5e..000000000000
--- a/dev-python/urllib3/urllib3-1.26.5.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="ssl(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
-HOMEPAGE="https://github.com/urllib3/urllib3"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="brotli test"
-RESTRICT="!test? ( test )"
-
-# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
-# dependencies. Do not add them to RDEPEND. They should be unnecessary with
-# modern versions of python (>= 3.2).
-RDEPEND="
-	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
-	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
-	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep "
-			${RDEPEND}
-			dev-python/brotlicffi[\${PYTHON_USEDEP}]
-			dev-python/mock[\${PYTHON_USEDEP}]
-			dev-python/pytest[\${PYTHON_USEDEP}]
-			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
-			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
-			>=www-servers/tornado-4.2.1[\${PYTHON_USEDEP}]
-		" python3_{6..10})
-	)
-"
-
-python_prepare_all() {
-	# tests failing if 'localhost.' cannot be resolved
-	sed -e 's:test_dotted_fqdn:_&:' \
-		-i test/with_dummyserver/test_https.py || die
-	sed -e 's:test_request_host_header_ignores_fqdn_dot:_&:' \
-		-i test/with_dummyserver/test_socketlevel.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x CI=1
-	# FIXME: get tornado ported
-	# please keep in sync with BDEPEND!
-	has "${EPYTHON}" python3.{6..10} || continue
-
-	local deselect=(
-		# TODO?
-		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/urllib3/urllib3-1.26.6.ebuild b/dev-python/urllib3/urllib3-1.26.6.ebuild
index b68c311d9396..c71c6adc940b 100644
--- a/dev-python/urllib3/urllib3-1.26.6.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.6.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="brotli test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index 3e3e73f657f0..d86e6a169c2f 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -2,6 +2,6 @@ AUX uvicorn-0.13.4-fix-wsproto-1.0.patch 1122 BLAKE2B 4190a5e61af991e77271aef8be
 DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977baa2dbc3e2538ce28551d2dee593076b670b16c099056165624c149f96974f64d2847e38234122ec93b65b31cda SHA512 5332494e0b43b4e87f9d6742be679527b1ec2bc4d2e061768594d44b1fd1d6961a2bd1fa23469fca6c530ef36d6123e453306c2bb664cb27b0cd6145b9a70fd7
 DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 EBUILD uvicorn-0.13.4.ebuild 1297 BLAKE2B e2e429e266084c92acf6965e86220494101135001bf656ce9ed1ee08b8ea07b61a8cb844bd416ddfa77ae9c8dd0d3618a8438b3dd1b08d12857efce9e6fbcbbc SHA512 3fd28de46cea2f2b8a2a7aa688155127d1a6d8e7f79137443606019e05825a1f4ab1c1ecd1dd8f4a04c8dc8e6851b59136fdcc68d5d4344be98fe70f97714dc0
-EBUILD uvicorn-0.14.0-r1.ebuild 1280 BLAKE2B 83891f78a5e59c9bafc60663bcb1aa3c00326418f1de3de0d31589103b5d88e86f27c1226542952d93c2b496527fc3eab3f5641f562cdc85c6780374daf6c1aa SHA512 8f98fbf1bd0747d74638ffdca1360deabbfc662038f43cf6939a29f1e2f6b88a67a52f11221c0558f1e5b81b70d50c4dd1d1505bb094095519c667c58d58db93
+EBUILD uvicorn-0.14.0-r1.ebuild 1279 BLAKE2B 90399c2f4a25353b5e59e6468de1b9082370c70942bbc12522060023adcfda8051d28f72960e375381d8f160607fb7f81fe2325e4c49f88c8c072766191d9086 SHA512 fe1564d7e1ae099680c19be4f5f12dcc8d15bb4a277f2bc314f2ec54ace4afaf0641f055e9c93815f82b81e47f300aa51c3a0b3aa000a735fb69966df4d2ba78
 EBUILD uvicorn-0.14.0.ebuild 1426 BLAKE2B 7051151bdae8ad61fe11b8b209f2895cc37b0d0998dfdc110210cbcc5774082e8a5d0b21e6265d7b9a9c2437784e3c499750b48c5b0271691e5a1092c6083037 SHA512 982224e58b7cd8cf7a9596b921b226bebb6d8463b7c844b691be1c284598586d8ffaf70f911644e85f5518d2a21aa1c54eaa6741e5d9227b05b8b3d42709353e
 MISC metadata.xml 450 BLAKE2B e6413874e7247880323b72113f002ade2edff362d7464ebbd5890ec95946b97bc37d74c2d6e9ff7a6a416a45f32bbab1b6eca70db8964adc6be287793c0fb4b4 SHA512 a1138016ec2d87c77f82333a0d41a68113d87c74d50e1bd6ccef0e0300f53663ecb907959be2547b42cc5cd007f47626e98b8c8cdc7e3557d2dfd0a369447268
diff --git a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
index 36625ca3ac4b..90b6ff8d6663 100644
--- a/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.14.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 13ba6947a135..d94b85dc2689 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,5 +1,7 @@
+AUX uvloop-0.15.3-uint64-thread-id.patch 1548 BLAKE2B 2d1af0cd42f1911e2296db843bace2c3281e9defff1b174a7ca3c2bf651af2b9149b4066e9e252b216a33751591e0e15afec035142c35dac2bce7683c52a48e7 SHA512 0ae9fd1210d80f8efdf1d29b84450c60578848467b49616e9c5e71476779972e94ccebe13d99e74cef99ea59cf50617a8152a1768a0c14b812036310b403a55c
 DIST uvloop-0.15.2.tar.gz 2092589 BLAKE2B 05c518ba5854fa22fe72a0224856fa0529af0b9432f366b5b1cb0df09a92c787425713fadb85b151363df28800a94ed2a2ad617aaa1c4e854586e49d16f7dd1c SHA512 e398c7ff85da65344a6ab637e9b2f560e9ba61a3be7a3138d546138949359e30bc2e5f8268f1569b73c3881c66d71cf6298038ca1a883be71a33d7ef86d09eed
 DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
 EBUILD uvloop-0.15.2.ebuild 1179 BLAKE2B 90824270e60d1444e154fa694831fe6c9a6deefa790babfa7afc8deef627295545da7d966998165db1ebff37ed7ad466fbede4ecb13fce22586858ce3b75d335 SHA512 1df3a69ed7cf55669219004c1ed4c620788cee5a9f009e906575aadea9babdfdf61c549b1c850977ac4cb97e4c533d1644de6151d571bbf801b99f6075ad32e3
-EBUILD uvloop-0.15.3.ebuild 1180 BLAKE2B 6b861bf35c1f4b5b44aaa5ca94ae411e17d39f2c9e9237e05046cf867e779665efa6270d9d3165b90be1724c5591af8f7766f11a1b285abde2944513792663bc SHA512 f1388b3d5ac6ec2ae175496e4508fd93e8f45191a241a7e43670a408bc30f59930d4e01611fd9f83fe4700d04ff46b9e60f54e9c454fa2c9e9f3347d5f161a15
+EBUILD uvloop-0.15.3-r1.ebuild 1368 BLAKE2B dbc27abde002b5db0cb9034f092909bb2b5faba902c0de5025c7ea88a91998188a1fe4b5bcaac7ea989ebb1c32b95794615170fa6766c44216fba53a6ef80e63 SHA512 997cb0ae5f2e94e424f5f8f06b6ebb8d750f90a06113607c332cf11121e9ab232bb20a1479087921b8a485bc303a1c4232bc17b48917a0b99a39f4180dad7e1c
+EBUILD uvloop-0.15.3.ebuild 1187 BLAKE2B ee17834d7053f51fea2ab82738e4da26b84709d0f97558dc759f9ce7e0f9da6c465cfa85c30423a85ef21f5732229a6ee117ceee04d9d94c7d579d671c9bbe57 SHA512 73a371db1120e099db3e18926e63902698b2a5594233662efb91bc11549de7f9d2904476c7dde83e1a185a0bb22687e5aeb341ff8d44c2c0ab758ece9a0afe38
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch b/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch
new file mode 100644
index 000000000000..a74fedd308e9
--- /dev/null
+++ b/dev-python/uvloop/files/uvloop-0.15.3-uint64-thread-id.patch
@@ -0,0 +1,43 @@
+From 732df28f0739d84c687d3e6d81995dafa18ac775 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Wed, 28 Jul 2021 09:21:00 +0200
+Subject: [PATCH] Revert 32-bit thread ID hack
+
+Apparently the hack used to fix 32-bit platforms actually breaks 64-bit
+platforms using large thread IDs (e.g. sparc).
+
+Reverts: b5b4abb16ba558cf957cf40120dfd4937c53aea5
+---
+ uvloop/includes/stdlib.pxi | 2 +-
+ uvloop/loop.pyx            | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/uvloop/includes/stdlib.pxi b/uvloop/includes/stdlib.pxi
+index adf9806..21d69e6 100644
+--- a/uvloop/includes/stdlib.pxi
++++ b/uvloop/includes/stdlib.pxi
+@@ -135,7 +135,7 @@ cdef int ssl_SSL_ERROR_WANT_READ = ssl.SSL_ERROR_WANT_READ
+ cdef int ssl_SSL_ERROR_WANT_WRITE = ssl.SSL_ERROR_WANT_WRITE
+ cdef int ssl_SSL_ERROR_SYSCALL = ssl.SSL_ERROR_SYSCALL
+ 
+-cdef uint64_t MAIN_THREAD_ID = <uint64_t><int64_t>threading.main_thread().ident
++cdef uint64_t MAIN_THREAD_ID = <uint64_t>threading.main_thread().ident
+ cdef threading_Thread = threading.Thread
+ 
+ cdef int subprocess_PIPE = subprocess.PIPE
+diff --git a/uvloop/loop.pyx b/uvloop/loop.pyx
+index d9b5aaa..96c9cde 100644
+--- a/uvloop/loop.pyx
++++ b/uvloop/loop.pyx
+@@ -707,7 +707,7 @@ cdef class Loop:
+             return
+ 
+         cdef uint64_t thread_id
+-        thread_id = <uint64_t><int64_t>PyThread_get_thread_ident()
++        thread_id = <uint64_t>PyThread_get_thread_ident()
+ 
+         if thread_id != self._thread_id:
+             raise RuntimeError(
+-- 
+2.32.0
+
diff --git a/dev-python/uvloop/uvloop-0.15.3-r1.ebuild b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
new file mode 100644
index 000000000000..4c2a70b59ede
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.15.3-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~alpha ~amd64"
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/libuv-1.11.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+PATCHES=(
+	"${FILESDIR}"/${P}-uint64-thread-id.patch
+)
+
+python_prepare_all() {
+	cat <<-EOF >> setup.cfg || die
+		[build_ext]
+		use_system_libuv=1
+	EOF
+
+	# flake8 only
+	rm tests/test_sourcecode.py || die
+	# TODO: broken by cythonize
+	rm tests/test_cython.py || die
+	# force cythonization
+	rm uvloop/loop.c || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_ext --inplace build_sphinx
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/uvloop/uvloop-0.15.3.ebuild b/dev-python/uvloop/uvloop-0.15.3.ebuild
index da543faea652..3ff9f3019ff5 100644
--- a/dev-python/uvloop/uvloop-0.15.3.ebuild
+++ b/dev-python/uvloop/uvloop-0.15.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
@@ -32,10 +32,10 @@ BDEPEND="
 distutils_enable_tests setup.py
 
 python_prepare_all() {
-	cat <<EOF >> setup.cfg || die
-[build_ext]
-use-system-libuv=1
-EOF
+	cat <<-EOF >> setup.cfg || die
+		[build_ext]
+		use_system_libuv=1
+	EOF
 
 	# flake8 only
 	rm tests/test_sourcecode.py || die
diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest
index a1f77baa2a6e..121cec59a413 100644
--- a/dev-python/virtualenv/Manifest
+++ b/dev-python/virtualenv/Manifest
@@ -1,5 +1,7 @@
 DIST virtualenv-20.4.7.tar.gz 10625204 BLAKE2B 1233ea45f771fb425b99c966904e2c5444e5fcb617b1d7cd34cdac097ee15566b7f4c841d444393723ed369193f33bef90ea7caa5b3c20aaf65fbde2f865abf7 SHA512 a554fb32cc46cb1cef2a2655bdae598efb52a4e71223eb10d9a36b124390546250aa11cf7da991a41ef4697523ec4562a31e35b5ab7ee8aba748ea4ff28e088b
 DIST virtualenv-20.6.0.tar.gz 8700762 BLAKE2B 718bbfda175ab4ef0820ba66b480060c0371c54a3e6c622c816d8c30141951c85b4f461fa03f71912a767b8d6a40733ab253062466e38a4a2e18b3169812e6a1 SHA512 7eff570f407a4986336d5a34bdcab1621d953aa6900d41962a85a5a44d7b68d378cda4a1bc1ddbfbc468580e051a98c37be17b0a52babbb00166718a987a591c
+DIST virtualenv-20.7.0.tar.gz 8714219 BLAKE2B 81b5ee144614a7c854e03599270d03454f991520e8381b98ef01b64e91bb7520a3949e5af9710ceb6292be6b7b7e3738ed7a08324b5ada37f8f4941b408fb425 SHA512 af0f993045013814d9397419fc9d789a1ad64dc53818cbeceb5146e418a8535f76b74ed36b4b164d6974660be77de91cda244eb70b810c8c9fb522ba1088813a
 EBUILD virtualenv-20.4.7.ebuild 4256 BLAKE2B 8fbe67f90a9b7079b5eb6b6e9c6c28fcc887fdcfa1bf31ba9fa02c62166ee8f7e42d1a98336110d452907133a0d75892b7d28c202a8075f88b32ac354dd57ca3 SHA512 db31bfb20d836ad986acff3b6ff5d16ef00a78379b02cf7d6be853aaaa08cbcbfcd7de106d47d398e9b8125644fc9daa164bfa6cb09a302e1f3135b709f38bb3
-EBUILD virtualenv-20.6.0.ebuild 4263 BLAKE2B 94fe21a4be14a85eadb08db776b648875876d83204b7e673de42cb38b2eda5773baa949b4f69cb0e8ad2e89e5820b9dd1c1b6ec7cc7c7a219a52b3cb7aecd4d2 SHA512 e0ea9767a671948a9fe47696d0d8bda66972782d0dab6194b7bf5238dda8f96dedb608d3500aae954bbde7ae665b3edf785e46270e94b7d50453d84c467bc550
+EBUILD virtualenv-20.6.0.ebuild 4276 BLAKE2B 6533c59050af3916bdf02e38671cb6fa6558bacb9ca47af9a9282594fb5d97d3c8eb405db4c6f41a180203ba54dd77066f7bab75deebc8a101d078b22e8dd5c2 SHA512 f49d6360516804b898fa90bfd4a0592c58ed224e1abea528730f041e7f3cc15d68bf2628323feb5c05f724fdb1c085dd940ffdaedceae7010551f6ebc00d08d0
+EBUILD virtualenv-20.7.0.ebuild 4223 BLAKE2B 750a8ba95e246111f3d7f59db4f724caf2b395d850bfc6bfd3197ae986515ca9aec1ca1ab0f33337c23cafc0dd8afd1a013d0650e5c6dd03b6ce9b982583408e SHA512 d0777e46b38b8f0cd8b986fa506a2500f0a694ecaaeeba5d6d08cad60e79bc364369106cfe88b89b9785ddcddbd6107ba1651dc94e2efd128d0ec8c96179670e
 MISC metadata.xml 405 BLAKE2B 65152299182652973b0a6387a690d6e04066d9ac05167d6f0ef7d27036813a793503d16e65514093869ed596227123f493dfdba021a094b0021b6c5b98cc0cf7 SHA512 13db4a863e2a82bae1d177967fc45821a59fddc9afc5c9bbbc0abf64fd2c57cb1f7053443d4721c3c91b6562c1b3844560fccc5853f14bce387aabc620167eb6
diff --git a/dev-python/virtualenv/virtualenv-20.6.0.ebuild b/dev-python/virtualenv/virtualenv-20.6.0.ebuild
index 2167370f63af..3d63a4a907b5 100644
--- a/dev-python/virtualenv/virtualenv-20.6.0.ebuild
+++ b/dev-python/virtualenv/virtualenv-20.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~hppa ~x86"
+KEYWORDS="~amd64 ~hppa ~mips ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/virtualenv/virtualenv-20.7.0.ebuild b/dev-python/virtualenv/virtualenv-20.7.0.ebuild
new file mode 100644
index 000000000000..848d5dc99614
--- /dev/null
+++ b/dev-python/virtualenv/virtualenv-20.7.0.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Virtual Python Environment builder"
+HOMEPAGE="
+	https://virtualenv.pypa.io/en/stable/
+	https://pypi.org/project/virtualenv/
+	https://github.com/pypa/virtualenv/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~sparc ~x86"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/backports-entry_points_selectable-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/distlib-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/filelock-3[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-0.12[${PYTHON_USEDEP}]
+	' pypy3)"
+# coverage is used somehow magically in virtualenv, maybe it actually
+# tests something useful
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/pip-20.0.2[${PYTHON_USEDEP}]
+		>=dev-python/pytest-freezegun-0.4.1[${PYTHON_USEDEP}]
+		>=dev-python/pytest-mock-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.3.4[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+		>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	)"
+
+# (unpackaged deps)
+#distutils_enable_sphinx docs \
+#	dev-python/sphinx-argparse \
+#	dev-python/sphinx_rtd_theme \
+#	dev-python/towncrier
+distutils_enable_tests pytest
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		tests/unit/activation/test_xonsh.py
+		tests/unit/seed/embed/test_bootstrap_link_via_app_data.py::test_seed_link_via_app_data
+		tests/unit/create/test_creator.py::test_cross_major
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[root-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-isolated]'
+		'tests/unit/create/test_creator.py::test_create_no_seed[venv-pypy3-posix-copies-global]'
+		'tests/unit/create/test_creator.py::test_zip_importer_can_import_setuptools'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[PyPy-3--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.9--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7.10--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3.7--bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3-64-bin-]'
+		'tests/unit/discovery/py_info/test_py_info_exe_based_of.py::test_discover_ok[python-3--bin-]'
+	)
+
+	distutils_install_for_testing
+	epytest ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	elog "Please note that while virtualenv package no longer supports"
+	elog "Python 2.7, you can still create py2.7 virtualenvs via:"
+	elog "  $ virtualenv -p 2.7 ..."
+}
diff --git a/dev-python/weasyprint/Manifest b/dev-python/weasyprint/Manifest
index a9d246999ef2..e650c2e87c68 100644
--- a/dev-python/weasyprint/Manifest
+++ b/dev-python/weasyprint/Manifest
@@ -3,8 +3,10 @@ DIST WeasyPrint-51.tar.gz 308411 BLAKE2B f88f9e1abc09986d51d92d8a153c71242cadc8c
 DIST WeasyPrint-52.3.tar.gz 325076 BLAKE2B 2981a487938d4ceefe20da36262438a64c30beaff340be6bd48b0140f63ea3971ca80a36386dde2db270e1555b137a89480673c4fdc2fa49079efdf58e53029b SHA512 7db740dd8f7264f73efe6e2505c603cedb1f8e5c053447b03517bdb003b933e1ef58f15482d4ab316b04b6631f9102752670f8b56989983cab80f7bd110746c9
 DIST WeasyPrint-52.4.tar.gz 325062 BLAKE2B ead641007e84664dfc1a9b95a227d5c6539e19e629d95d68b663b46a873ffa83b203897dd4d03c5d72f00e2737268c64624b97a37840c86d4a555f5b1a20a7bb SHA512 0003f9b46452e60118e7f6944f0bf48b6f548814dae10f990bedb124d3c67d9c530c30ee142d416f448b3b479f54b4fcdf01e31747957438192c77031926cb8c
 DIST WeasyPrint-52.5.tar.gz 325050 BLAKE2B 425a21acba183a3313069724972a7627aeaf326ce42e84789c02552f51a660be7b1d2855b76a3034ae09c316b6f0a13219464b88af8bb8f0ca59ab8ffd263223 SHA512 0ce86db000adef95fabfb335c069ad2a602ed98056219cedde905c550b04b10b0881d72fbdd38a48fae4e263825f5fbd8a70ce13932083afb8930eacc5817fb5
+DIST weasyprint-53.0.tar.gz 386339 BLAKE2B 6d8e30a02d54061557e549a685944de7cbc61f4c1b46b23dbaef66e87232325f630fd5a34cf5c846599612914f9306b5235fad65a008e19a7c200af2f4c7d9da SHA512 de34ee5654ee90aec82b67c1bc7d9496fe3a4247b2a649ab110d1613c4780fd9ae611c9da177de07e5287749978af9a4a7d5c102d0940e5fd970e5aa8586c47e
 EBUILD weasyprint-51.ebuild 1384 BLAKE2B 8c21b4f54af4c4cfa0d231a5ce02d911a6a8d53acdc7bc530be7e39235beb0f57d8a0c0dc8c399992c7e59af1a455ec39411ce9f85f5c6f731d8cc36e31c0a5e SHA512 d101e24e5f91982c8ca2b555ae44b4a8f40f9ca729ec460404b6e471f9bd3279aa934c136ea80a9af4a26c6cca81ea6cabb18477bc559cdfc85775adb0f6bf16
 EBUILD weasyprint-52.3.ebuild 1274 BLAKE2B c436d65ab599aad4c43e29c2186f2641ec79d14d8a94f77426d2aeb276624430a393e6d76aea2191ee5114d8ad6a0ad1a6e0b953142946557df80c83e6080051 SHA512 9e7a9dbc41cfa111784921375456fcffc24650d9119f726fb3b913d4530c66741f351c6b18cdaf6ac97dc414f07ba1f4791ec15c05cf1ae9b5c8d62712be1f5d
 EBUILD weasyprint-52.4.ebuild 1274 BLAKE2B c436d65ab599aad4c43e29c2186f2641ec79d14d8a94f77426d2aeb276624430a393e6d76aea2191ee5114d8ad6a0ad1a6e0b953142946557df80c83e6080051 SHA512 9e7a9dbc41cfa111784921375456fcffc24650d9119f726fb3b913d4530c66741f351c6b18cdaf6ac97dc414f07ba1f4791ec15c05cf1ae9b5c8d62712be1f5d
 EBUILD weasyprint-52.5.ebuild 1274 BLAKE2B c436d65ab599aad4c43e29c2186f2641ec79d14d8a94f77426d2aeb276624430a393e6d76aea2191ee5114d8ad6a0ad1a6e0b953142946557df80c83e6080051 SHA512 9e7a9dbc41cfa111784921375456fcffc24650d9119f726fb3b913d4530c66741f351c6b18cdaf6ac97dc414f07ba1f4791ec15c05cf1ae9b5c8d62712be1f5d
+EBUILD weasyprint-53.0.ebuild 1149 BLAKE2B 75a2e7b17823bf97c5acde56d847ddcceac9b147f436fecdc4d32c07d1f998dad58b7ac402daf233bc55cd03fc523a903f71ac6ad56a270bbd951cb652213247 SHA512 1c6346543022a699c3e37a676688c901e21ae756a5454f0124ef484b683a667cbe3d8826147fed2f37cc54824f5a8fa430e3964bfa1bbe84e3185246f493f123
 MISC metadata.xml 381 BLAKE2B 422f89ba40bf25e47d53fa91f51ed8b12c5f37a7befd16a2cc2d78335b0dc472180c5e46c6bf890e7a30fc7936e672737e931867097e21a781819fd7ee644e94 SHA512 92ccf545a50a97d2f2cf6f85a6986525ea787d6534682b5fbdd1f0395ed7e938c4e341f5897a663b185d2b2755d4123132b8ec36866b44f2615f08d607a14398
diff --git a/dev-python/weasyprint/weasyprint-53.0.ebuild b/dev-python/weasyprint/weasyprint-53.0.ebuild
new file mode 100644
index 000000000000..15e07a807831
--- /dev/null
+++ b/dev-python/weasyprint/weasyprint-53.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Visual rendering engine for HTML and CSS that can export to PDF"
+HOMEPAGE="https://weasyprint.org https://github.com/Kozea/WeasyPrint"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="jpeg tiff"
+
+# Note: specific subslot of pango since it inlines some of pango headers.
+#	>=dev-python/lxml-3.0[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/cffi-0.6:=[${PYTHON_USEDEP}]
+	>=dev-python/cssselect2-0.1[${PYTHON_USEDEP}]
+	>=dev-python/fonttools-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/html5lib-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pillow-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pydyf-0.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/tinycss2-1.0.0[${PYTHON_USEDEP}]
+	x11-libs/pango
+"
+
+BDEPEND="
+	test? (
+		media-fonts/ahem
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/webob/Manifest b/dev-python/webob/Manifest
index 0c753e733c62..539067f24f02 100644
--- a/dev-python/webob/Manifest
+++ b/dev-python/webob/Manifest
@@ -1,3 +1,3 @@
 DIST WebOb-1.8.7.tar.gz 278544 BLAKE2B 20d8b00f181f2966b918f106080907746dac33b64e75c31749bd774709ed8aa51024258240b89abddacb041073705410845993f93ecfa4b98a7a0fcb8a14e505 SHA512 ff6a1ce796a59d9c078dc908a0d6307a080230a5c806be2278eebcbb78016bed43067e78e3e4a6d72a5f51184c137e8267ac75cbb92b057db008b51a792ff489
-EBUILD webob-1.8.7.ebuild 706 BLAKE2B 86a7befaf884e6835295a12f00f6e347c781c619d8a7cd96e5bb3d48f60ab9ac214fbde8c2b2676fa96fe5d520fccc136d784b6f83d8675a443030802b52f520 SHA512 6c3dabef4ef2a1cff9238d38e574f512a16785764973ff78dfcb5660c99ad17d1294824da6382919a70a27e19fe33d23ebdd2d8f8351729ecc9c1c90e071b72b
+EBUILD webob-1.8.7.ebuild 713 BLAKE2B b680da224e90e4e412137c94bd8345a4aec80096c2216ce0eab86090e6f8e7b2efe1b627810493db489e357d8eb73fe6a1a3b11d6d818c2473a7ff82b124937f SHA512 601c5f1580d5b95ecf431117edb5b3c6c1d13c5c40b9669d77f26716a0cdbff9e6dba747ca6f9d77f266b933d2aab2ff7124cc0b4560dcb63d34cdfce18cf878
 MISC metadata.xml 444 BLAKE2B 377d112b1afec6a033f7688d73d92b4874b31f9401df74624d34870ac4714566019391e877cf1fb10ba1176d3979fb1ca21980b45a96aa7039c9de8e2b495893 SHA512 e180ffdacb38455833badddad5dd9c022d4f20b175f3ec046eef9530d44f511a79ae00743e966246756422645212ece6c142c3e05fbd86b391618eedd827d885
diff --git a/dev-python/webob/webob-1.8.7.ebuild b/dev-python/webob/webob-1.8.7.ebuild
index fb18c79b8392..e2d7091043a7 100644
--- a/dev-python/webob/webob-1.8.7.ebuild
+++ b/dev-python/webob/webob-1.8.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..10} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 distutils_enable_sphinx docs 'dev-python/alabaster'
 distutils_enable_tests pytest
diff --git a/dev-python/wxpython/Manifest b/dev-python/wxpython/Manifest
index 7219d66d6ff0..3dc95f410c22 100644
--- a/dev-python/wxpython/Manifest
+++ b/dev-python/wxpython/Manifest
@@ -1,6 +1,6 @@
 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
-EBUILD wxpython-4.0.7-r1.ebuild 2306 BLAKE2B 845dc17e3f66fdc35effd8c72620ef58583b071dd5c8dac047dbfeefaa2483c2bf8b05770b997e57494b37159379ea00ff01098e3f5f59361ee669168fba9bb6 SHA512 8632153234ccbd5b699c0c98cd4cfbeffd4adddcb8280c0b0f6ed4a02100be833dd49969684bd52064a2543f50a348e7a6682bb45bb9fa35c75afb4c8b7e630d
+EBUILD wxpython-4.0.7-r1.ebuild 2310 BLAKE2B 90fb0b24c3aeb64693ed7b62541b27775192630ab49ce18b83f68fb2e8db1d7aac4b650d2546d81e487068955322d415e786088a7390d429431749b9cd557472 SHA512 75113ecf7f1d9cf8d6f35ef78ff18bd5ed9f27b41a1f8534da526f34fbaac3d6b08917ceb29f4394193bd621bf276256a8456d300c0f4eeace3834e57c09cc9a
 EBUILD wxpython-4.0.7.ebuild 2273 BLAKE2B faf2c0361be73a32f7a27b5010e4fb66c0a7cfb899046f34373bf3c30c344317226bd0c12f1db0c71194084368f8bdb59eaab675fe91153ffc32d52eb169aa21 SHA512 52fb7e58b05874e3f878a23f1c7a27ce7795f89d58ad11bddfd50a30106191d0af034ad0a99826b6303a2de265c16b2a1334e5bdf1b65f1016e20e76d9889ed5
 MISC metadata.xml 490 BLAKE2B b268c95de8e09d5027a6dff7413f8e85030c64610f0f5739321bca1c66892981e2e4273e3e4fc92f3edbbcee1d2ede23a366dfec9ffbc17c8b015b784847755f SHA512 a33e6390e4cfcedbe7a2e950b1f447195f439747e37acfa6ad234b58fd449d80b16d342213e5190fa3143c71a5e95861f11daff1b61fcb5015c3a5255a27cadb
diff --git a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
index 53e159cf13cc..c4eb46fbce64 100644
--- a/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
+++ b/dev-python/wxpython/wxpython-4.0.7-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 WX_GTK_VER="3.0-gtk3"
 
 DISTUTILS_IN_SOURCE_BUILD="1"
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
 
 LICENSE="wxWinLL-3"
 SLOT="4.0"
-KEYWORDS="~alpha amd64 arm ~arm64 ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ppc ppc64 ~riscv ~sparc x86"
 IUSE="test webkit"
 # Tests broken: #726812, #722716
 RESTRICT="test"
diff --git a/dev-python/xcffib/Manifest b/dev-python/xcffib/Manifest
index 3035e1ac2421..ef78bce84146 100644
--- a/dev-python/xcffib/Manifest
+++ b/dev-python/xcffib/Manifest
@@ -1,3 +1,3 @@
 DIST xcffib-0.11.1.tar.gz 84713 BLAKE2B 6ab1ad6e582d71214cd719fdfa898e561e29d5750f5befe5c71173cfe34f2dff7dbd52fe93e618aab695646850f7ef5420114e2b1e725150c643904cdaba560a SHA512 09f4e19b88258446af26628c3a8e694c1f938fe3b5456e797b06174602fa0e9ef6e4eab76daccfd169d98fb7e869c910e6216d1f71fa2853e62b82c62c667669
-EBUILD xcffib-0.11.1.ebuild 684 BLAKE2B 4aa229f01fdb68e73f77ea92bfa21d41a402922656c2a6b6dba4d0c64cbfd8230cfff28c884f6a612b2af0dfb2d267ea081bfd32b08471116ee1957cae366a75 SHA512 fb4612ce2478dc9172aa48482a98a578f0171c60c8704f193b1e3197f641dbb83a7a7307ea9724e68e00b570c0f24342c8b380e3435073615eaacc1cdafb0d75
+EBUILD xcffib-0.11.1.ebuild 690 BLAKE2B c20a4835942b1815e7d09528ff2c6ff9839645524cd6f888fb551565fbe970af1c1ad50b1696880240975ab9d8fcca457dc6c5d52e4f92a05eb5dd19784b14e5 SHA512 360a1486788cc9f4bb742d5ac3c2b349680f65720e7d1c124f18ed7bebb46137fe92df86c5b9f8e9ea04b27a12b0c151e52d504642ecadfd5d137cb9e823d24e
 MISC metadata.xml 373 BLAKE2B e21d3d9113705facf550e641e786485f657d976a1cbc19f5f1513d534e9a6bde20f68b104a95914dbe95347e0144c0cb0bdc8f87df31906f5f70be71324495dd SHA512 2c7291bce1de8d82151379bcdcc039344659570feec49b82ce9e7274b5e0abecf8499fe7c595b06f71c37ab7bfcb3f2ce8771f216282a50b6c1aba5dffc1008c
diff --git a/dev-python/xcffib/xcffib-0.11.1.ebuild b/dev-python/xcffib/xcffib-0.11.1.ebuild
index b76474023be7..cf9ab0a4dcf7 100644
--- a/dev-python/xcffib/xcffib-0.11.1.ebuild
+++ b/dev-python/xcffib/xcffib-0.11.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="x11-libs/libxcb"
 RDEPEND="
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 08f45758c3de..1568cec9f94f 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,3 +1,3 @@
 DIST xlrd-2.0.1.gh.tar.gz 368304 BLAKE2B eaf6dbefde00954452a96214c6a48e5d35526168445d15d721851da690bd99e53bd765a73495b00c8ee7ce243c487da0afbc6d6217abd7a5956820357dc97104 SHA512 b3e2efa216fc73bf55bb0b165ef63e797d16a00c62f0f2f2a2114d2db7204208f2623835697a045abe185f52c426ed5e9ef38a4f5f8e1880f0cfdf642af3c57e
-EBUILD xlrd-2.0.1.ebuild 554 BLAKE2B 106e1726b2f4020d91bd5e31a77df3d2ff9bf4dfb6e8082a103944c165aac2eeacdec2850dad37c9b24585be671bfd45910370d0cb4ab6d1018a342ec7fd7ee8 SHA512 d996490806069c9970db0377f5669c77394441ca587157570091a075211bc7a16697a128b205ff1384955adb02bb14bb7cc036191c76c457462f23c6e3706aca
+EBUILD xlrd-2.0.1.ebuild 561 BLAKE2B 125e1409084b87d614283e6e7b98ae27838dbe51a1e43dcf3b5099d6991f89bd6d825537e22b852c4a5482ccab787b79be8b5d2e73e0b97bded5e93ae9a1153d SHA512 8b8a1b8b04b66aa1c393c17e6163c5b0aa26dd0d83e5d4110dbd903bdab9e205addbff989fe0acae06167e2d7f2a86856e7167f7b6944f1e1f16c6abdea33b0c
 MISC metadata.xml 575 BLAKE2B 2c774bd63778dfc6eb2350a1744ae95a35e415d143bae22d9a9ac4430387d5f1cc9e7285a3d51eda6b115b564248a105b051633c1ebdd43e2a3be029c6a9a5d0 SHA512 4435be91096b2d966d0ea57f9d7ddbaf7e396b87bf18a4c0b54c4dbc9a2983e58705c8440cfde4812b372487a8b6ef4af0145f0db60479d35e1201ae525943fb
diff --git a/dev-python/xlrd/xlrd-2.0.1.ebuild b/dev-python/xlrd/xlrd-2.0.1.ebuild
index e8394a36d29a..ccaa55b06df1 100644
--- a/dev-python/xlrd/xlrd-2.0.1.ebuild
+++ b/dev-python/xlrd/xlrd-2.0.1.ebuild
@@ -17,6 +17,6 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 331a5dac818a..66edcc136ea6 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,5 +1,7 @@
 DIST XlsxWriter-RELEASE_1.4.3.tar.gz 34122578 BLAKE2B 7f9a9f2f9c7eb6f425192e30961d455dc348b51cec72ce4602b975c41cdfcbfc4e8d49efe62877d8f96dc6ce02320f64fa2ff55586a17d29cf2a950c9eaa9593 SHA512 38b12e3c6bd14122ea9bf652ef33078cf4aedc2be7ce8c3151960331827642713d25f3f9bff9ad7d375d251086e1cc58b09e4d77141dd2973c21a1d24c0b0dd0
 DIST XlsxWriter-RELEASE_1.4.4.tar.gz 34138048 BLAKE2B 159c305171eba27c66d3d9b9b1fd0e664f4acc572079c4daa6ac50c72e1e1e6016a93815b7de27af10b6e6653b02efb0291073284dabf9a6f15495c1f61ef059 SHA512 2a459e7eb924ef7475b7fed8f5689d4c2b2669a65d5f3e251a51c5e55cc8c4a545eb1d83534168b19c802740366fe2c4ef14c6c5850213fd690f01e42bbe4ca3
+DIST XlsxWriter-RELEASE_1.4.5.tar.gz 34383001 BLAKE2B 9a00ef80aec818e3b1c80000bdf0fe9dbb5b99ac04a5508ca23c6d76c56e31c94db0b5a38ef6d8345c6a5dc83175e4c79381877415f982fc7ec66d42efe8c80e SHA512 e3b969ef27ef24ce371c0a789a8cac6da4e8245ec349ca23ba9e04d5c2adf0a141f51596bd15117fc400efb9354a6730c4668f51218f0a08b312d25519a492e8
 EBUILD xlsxwriter-1.4.3.ebuild 553 BLAKE2B f3c325966e3b460ef97bb74a867bf6e4ffd10e8b7ae6298ff362e0a33ae3426a83328449cdeb2c853a5842b697cabbab5e387436bd23f06015cfe55ef3ff7a46 SHA512 ccc45f615c70873a740f9ad4203ed7322c913f8935dc48e4d9bab5ad7fa888d7967fd5bf950840ecdc42e5e46e7fa1e5a2ea8dae83e52438d823b931c7f96a10
-EBUILD xlsxwriter-1.4.4.ebuild 554 BLAKE2B 84e1db376b526b3cc358723a0ea1e4952d60b5f2d0e6fa1bb0acb3e255c46ab71dd0056c5294383db116c95f2581768bfc892a4478db42755b9b1b515c27d427 SHA512 5b73a73f39e9c8bdd573dd4bee060fd846cd9b807a4d11c6db7fd6e554819deb9ab024b8e2981126a5be74d57657de73e3a8a9932ac2f8fe191a3c88204d6e2c
+EBUILD xlsxwriter-1.4.4.ebuild 561 BLAKE2B 5e0db9c166c661747d859e3f765f51bdade87ae1bf8bee9e16cfe612540e42ea740206ad2eefe0bb7eb282d03918b97f9b00276d43a4243d72d6e8211f89c0df SHA512 a66af80092cfa4a5a330d4933894a887e96a0f389cbd8cb3227e4415ec7d71e20a6d2ffdf02affd220d7bff164a3757a2bf071f82724047a37565a3095d8e144
+EBUILD xlsxwriter-1.4.5.ebuild 561 BLAKE2B 5e0db9c166c661747d859e3f765f51bdade87ae1bf8bee9e16cfe612540e42ea740206ad2eefe0bb7eb282d03918b97f9b00276d43a4243d72d6e8211f89c0df SHA512 a66af80092cfa4a5a330d4933894a887e96a0f389cbd8cb3227e4415ec7d71e20a6d2ffdf02affd220d7bff164a3757a2bf071f82724047a37565a3095d8e144
 MISC metadata.xml 410 BLAKE2B d1fab95b5fac3e69c5303298385f65062b28934f22fe8db02db02753b5cae36137a3e02e1d38e3762933dc9297045e1efaee8d17c714ca7b22459f342f23f928 SHA512 4f3d74f5afdec59b8575446b444f1af36f71137c980f7790e952860afa98b2d128ddf8477b135715de2852b940926108dafbff3cb60f2f1a8825a02c415810e9
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild
index 71eaedb1ac77..c0f4419513c1 100644
--- a/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-1.4.4.ebuild
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild
new file mode 100644
index 000000000000..c0f4419513c1
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.4.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xlwt/Manifest b/dev-python/xlwt/Manifest
index b812af578d80..79c1bd7e40a8 100644
--- a/dev-python/xlwt/Manifest
+++ b/dev-python/xlwt/Manifest
@@ -1,3 +1,3 @@
 DIST xlwt-1.3.0.tar.gz 153929 BLAKE2B f0edb823201e477aca23af1edaa2a7bcf95aeb5b9b191f4d9a8be9e052d68699887cd829c2304b26334fb3e92d4a1fc1d0dbfabb477889a1295255170408715c SHA512 e09c515bda7edadb9624b842796a537316c1e2e06f3e74aca5440a5797dbc259036539fd64ea61648a30894f4091d3be829411d36e6170894980728c798c5963
-EBUILD xlwt-1.3.0-r1.ebuild 684 BLAKE2B 3d96b142de98d0e028720d75ea58aeffd34ae01fa0240a6499ab330c6e2d683398e96bcbbaf61aa78afb89cc8409c67f7367cd6a8d98e21621cc5dbaafdd6c89 SHA512 6286687c5d3df1a4c26c6bd9fec68a50e661c75da83d68110755e262c7939cf6bc1b02605d8f7cdc132d48ef915157562e9b38c622422e1a3db43fa5dd97f585
+EBUILD xlwt-1.3.0-r1.ebuild 690 BLAKE2B 84a4319924e248d8a91be90af8156006fa9723422a7993f2f76b437cc4ffa61c8f140afda90ade9a7df13bcdcf6568d0fcbc57c914c72ab172099bd8230649a0 SHA512 226190feba825885ec039a2ceb25923f81136740aacffa8161e630c60d42a3c7e2afc5be3bc2450afc06cde4cd02130d3fa926fe276787c6315b2f086878663f
 MISC metadata.xml 683 BLAKE2B e7fb3a5b9305f16f70a91d6c9b0ced04d0372fe5b02e0dbc2107a3a51a81565b6fdcfc7e7d63518ef682cd37c4bc9135203357350b33438340fcce53be9480a8 SHA512 b046e4cb9c128733b280809c6f702b5ba1a082ad83f67525d1cb0c4764a42412f680bc88c1331cd2d8647c671f66d1c0841d968b8ac68fc5e70d64939dad7a74
diff --git a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
index ea04e843e3df..803dcb932083 100644
--- a/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
+++ b/dev-python/xlwt/xlwt-1.3.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
 distutils_enable_sphinx docs \
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index 12569f0fa213..b8efa2b75068 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -2,8 +2,10 @@ DIST python-zeroconf-0.30.0.gh.tar.gz 64301 BLAKE2B ea0d5e36f3f012f217cbd4eeff0a
 DIST python-zeroconf-0.32.0.gh.tar.gz 115276 BLAKE2B 7084c02f989ebc6db6686b82ce3212158595b87e00567e4857e84790a30a2fa6f688288769d1eb118da485a6755da1ef404765070d26905d10ab45b1d95ca849 SHA512 6a612b39be85e673cffc560ea5bcc16facc5a16a370ff6edb1d4f7ff978a01d6ba249a9b313caca3b3ed0c6463a4914a98063eb89f28268cec1c9a2faa4db611
 DIST python-zeroconf-0.32.1.gh.tar.gz 116507 BLAKE2B 03de415620745b75cd43be74b724faf909aad9628175f18cf4b2c04245d02adbca984eaa861e807729f36caa3feecab913f2e4aafcdd9aac1af02de6eeefbb3d SHA512 cefcd1abdc3ca2b5ed796aee09e6826c0d0f54343bdefbf45c425d6e033542dc061c84fb4438ba53774d87c6516801c6e2196c1e6cfdd9dbf9187f5d8d4b1b11
 DIST python-zeroconf-0.33.0.gh.tar.gz 118002 BLAKE2B e5bdf8011777f46207c7f0aafbf4bfc34e704b59e01fcecd93e2ca05154f836bbe206688242eb37578a0e3b6d462de86944bdc81b96b0f3613eed21e9d0b6be0 SHA512 214fc1b25e1b900b6745f808144c0a1d94102dbc30f1e6ae49dfbfe2e75e9611e33d1341d192641be363662a0259aa340f52fe20fcf2bd5cf1611e823754186d
+DIST python-zeroconf-0.33.2.gh.tar.gz 118266 BLAKE2B e239443c778d24895a830ac8d4f23be5eeac701b92ddf945efc955a731cbce62bea10243f57a0929ad21c4444d32c37b0a9e23b53e734362b9c6b9ce85e2eb59 SHA512 9631dc348baf028794934d826a1fd2e874cf9039e6fb1c93a1b9a8e2a95ae436ab2fc1a955e2d89656c37a56b71075b578857f6de041a7e61ff55c7a62a2a7a3
 EBUILD zeroconf-0.30.0.ebuild 1089 BLAKE2B c5aebaa0b0bc8ecf9a809bd2964da3c822c87e5ff35ade028ed69894a277a0cac2f20438a616695275f94c3e32d9ae20ed53451f76ae490588f9d41309d37860 SHA512 986a489207ea2c47bfd3cc02ff53a48e3f3925f6326f1c9911d2da4adc3619c53e671f25ad024168b048b93cef39b43d7f155c1baa379d791e1f06abb97c0aa0
 EBUILD zeroconf-0.32.0.ebuild 1165 BLAKE2B 310bf2df5ace5e3ece81e42e764d7cca4f3124608287e674a308acef4060592f93c2c871c8140aafbe52e4b79d6340053b704c91c5fe227b7cf204cf3e4ae2a2 SHA512 fd1e8e11d8381cdcb38bde8d0da2b6971c3812ec90c389750ec7d23166fbbc8a379f3739c0bc60ac3b810b64e97eab0da41080ed2bb5e27b892fe003c3cb5231
 EBUILD zeroconf-0.32.1.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 EBUILD zeroconf-0.33.0.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
+EBUILD zeroconf-0.33.2.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/zeroconf-0.33.2.ebuild b/dev-python/zeroconf/zeroconf-0.33.2.ebuild
new file mode 100644
index 000000000000..0e1b2943b16e
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.33.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+		tests/test_core.py::Framework::test_launch_and_close_v4_v6
+		tests/test_core.py::Framework::test_launch_and_close_v6_only
+		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+	)
+
+	epytest ${excludes[@]/#/--deselect }
+}