gentoo resync : 29.06.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-06-29 10:15:54 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-06-29 10:15:54 +0100
commit: 9aa80713372911cec499b3adb2cd746790920916 (patch)
tree: b8e99dc5dd60ac2094a27cc52f74aada8df38f05 /dev-python
parent: b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 (diff)
250 files changed, 2583 insertions, 765 deletions
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index cbf9a1edf5b1..a70357fdb44f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/abydos/Manifest b/dev-python/abydos/Manifest
index d7bc1d4be5e9..e795fc69cbc9 100644
--- a/dev-python/abydos/Manifest
+++ b/dev-python/abydos/Manifest
@@ -1,4 +1,3 @@
 DIST abydos-0.5.0.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
-EBUILD abydos-0.5.0-r1.ebuild 899 BLAKE2B 494aec3bb5100a1a9d678e09058dc657598ddd2bfd3240480abfef27b18103ac21bc075f327e55fff9a0b4411aa659519508c729f6b225a1baade8b7a5420007 SHA512 c44d3433e892d0a97bd2c2989f046685fffa43e8bd66df567ec2274bfbc70c31efca7ff386165afbe68f5a0d5553700e00e7bc4e9e805b9a9a68887a0b233611
-EBUILD abydos-0.5.0.ebuild 895 BLAKE2B d91244a3a70f5027f1b7e0baa782a56224c4a64292154ba9befd496b20bce21c2a12dcf326cc162ec6c88231f3046effc0cb493bc2ca2377b81c0934ffa0d739 SHA512 295255138b85134d2c3fc7f1ca35f4031e6b2919e05331a13a36f35502cb97bf8d0e47f7a478996cd0ef080ad21c7f9410563b63f4c2756234c06fcc66a55aef
+EBUILD abydos-0.5.0-r1.ebuild 897 BLAKE2B 370644a19829edf7a2fc5b607099a54f2f442c72d2024cea6c8c329058cfaaba3784c195263a4030d21ca6d46f0cda2b4d9d48433ecd8e75a3706d027d78a013 SHA512 4d8ddb0d6584bf293ad1df5669c4acc68f504135e6121ce936dae0e64887644e4a33acf7ff0c3d5f6588155ed3758d1ae6b8bb19ca559074090cdee7faa74412
 MISC metadata.xml 406 BLAKE2B 4e8c6843dd9cc2c15bf0d33244ee57240db247ecdf6b38e33d621598b64eb59c6a69e7150b3c91ed77bda70b48e6e745dbb137cdac38c468f76b82fe881b4f8e SHA512 026a691d5843d311f39be399b6729c097862a1714ac551cc1d8b4102011a6cc15001a4aa3f58905dced7783d27479ee1012231bafa3342ea6d051454608388c1
diff --git a/dev-python/abydos/abydos-0.5.0-r1.ebuild b/dev-python/abydos/abydos-0.5.0-r1.ebuild
index 7bb0fc5c9d44..2af57c2683f9 100644
--- a/dev-python/abydos/abydos-0.5.0-r1.ebuild
+++ b/dev-python/abydos/abydos-0.5.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/chrislit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Requires access to the internet
 RESTRICT="test"
diff --git a/dev-python/abydos/abydos-0.5.0.ebuild b/dev-python/abydos/abydos-0.5.0.ebuild
deleted file mode 100644
index d4e625cdbb24..000000000000
--- a/dev-python/abydos/abydos-0.5.0.ebuild
+++ /dev/null
@@ -1,39 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Abydos NLP/IR library"
-HOMEPAGE="https://github.com/chrislit/abydos"
-SRC_URI="https://github.com/chrislit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-# Requires access to the internet
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/deprecation[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/nltk[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-# Extension error: You must configure the bibtex_bibfiles setting
-#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-bibtex
-
-python_prepare_all() {
-	# do not depend on pytest-cov
-	sed -i -e '/addopts/d' setup.cfg || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index d56e654b0de3..f7993fc3a072 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -2,8 +2,10 @@ DIST apispec-4.4.1.tar.gz 64424 BLAKE2B b46390659334f5ce5aa83fd15207f5d1ad6d0e9c
 DIST apispec-4.4.2.tar.gz 64660 BLAKE2B 1e53d4b3f8856e76565690773085dfcbaaab4e1771186eb8ea35f469d7c65b8d5bd6319af0ee32539de96ce5ff1889a15d74ac764d7bb9d0b415648af87d28db SHA512 8f8070ec1a084e5c5dda02d30103ff25a2fe096839aa2b1a75858297377e312e29a2d1cf4d373a53b7bffcbe9108489c2a2516e0e053c2de12ef90044b6b7e17
 DIST apispec-4.5.0.tar.gz 65423 BLAKE2B ce6cc6f466d274db6aa5f8b27c3a9340daff7934b9293c501b5305b4a6ccbd22e8b12a163e20e5e02d571a8177adb6d5b3196ffa46ae68f2931b6c3ced2b4d0c SHA512 0abb186182513a6d7e4aeeeb80cd8976eebe7c40932ca7c53cd8be149e65a768235436382bab2006a79bcdf345cde55fd69eb3f28f8d14cde5fe064f7c7a76ad
 DIST apispec-4.6.0.tar.gz 66147 BLAKE2B 98127cb2bf938cc1928e13e1169804eea174351a0f4eeaabc801da711d0861bc35a9761e9f1bc478a44d6a85989a1aba1840b3e472599064240a880fda8e45b4 SHA512 b030e5400a9abce06576406f83befb298814617e06729f29c2ee70517cf456901b67e60880b3b4baec096717a91341e8268bcd8e01fd566b7c6e03709afd7c3b
+DIST apispec-4.7.0.tar.gz 66274 BLAKE2B dbb14dd831eddeb9f086643b6182ccc3e529e22ad7e31d1d4dd2dce54edf76c6cf01a74438383df5ccec18cf863334d5cdbd45214791c01632d7f7efa63f7aa3 SHA512 53c0a1e6db81439a7c3f8e933cac28003dd84444e65986a29aef8a6ec761999c84417902448288d69c5873d12dded2156e79bedc5bd4bd0fd472ea014e65a6c7
 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
 MISC metadata.xml 503 BLAKE2B 2004c77c7f9cf9dc1e3cedc5f2acdfaf7df4c7b7cca45c7cf6644955a042d0a2919560acc6ef838c40568e6cb69bbf5340cbeb1211ce725b005bf652873b396e SHA512 edd05204d0174abc0737f18704d805a701dc4ccc6dd50f7b8da2a8ffb2aff2f4fc993a348e2c549c01d33ae255ec6ad089ff57ba5c3efd608aa6eb2391b2c2a8
diff --git a/dev-python/apispec/apispec-4.7.0.ebuild b/dev-python/apispec/apispec-4.7.0.ebuild
new file mode 100644
index 000000000000..f2d86714d340
--- /dev/null
+++ b/dev-python/apispec/apispec-4.7.0.ebuild
@@ -0,0 +1,41 @@
+# 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/${PN}/archive/${PV}.tar.gz -> ${P}.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[${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/argh/Manifest b/dev-python/argh/Manifest
index 29f48104cefc..8d586ea52714 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,3 +1,3 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-EBUILD argh-0.26.2-r2.ebuild 531 BLAKE2B c659bb4e2984fab1bea036da606b115f583e4d0273baa90cd96619d34ca62a19b2726c7ad0945e4f54d03aa62e9026bd7ece1b775c31e4cd5d1a9b85842d07be SHA512 c5e711b7d789c1000cbe608c3c51235d5d945ec9cf744843a81e9b5402f798d9ad64be5f4c278f72b4ebc925216b31aedac86944ec89b3f057695a8dd2f03818
+EBUILD argh-0.26.2-r2.ebuild 530 BLAKE2B 5831abf9d73fb788086b79d4b9563151f47ff7d81e10167f2b2b3c57ae5761c59759ab270358ca718e1c9c7d4b6ffc1563abc55d010f46011957b0dd56a73bd0 SHA512 6e0bc3fb7ca0ca423ee5cd4cb64609433d6bfb37df725075e937ce307573bc5f88fcb24b5b2404073123bdd87aeaeadcf211a4d3084cd12086e31b5b32c80e98
 MISC metadata.xml 331 BLAKE2B 44a5708cae63fc94540b35012ece30776bc5bbcb99848eb2c4d5e0e86238fc4ececabc011f1a40c78942b91409a7b31580f311cdab02b450804461f620f74768 SHA512 21243b065ecfd9b4a9350b474f66cd50462e35d83e1130f7a1a1a6033430f085c79b763157cfffe2e7133a4e8e2da7a274659f24fefd742a1898884f56c464e3
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index 74670bc78dbd..f76d93a92377 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pythonhosted.org/argh/"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 LICENSE="LGPL-3"
 
 BDEPEND="
diff --git a/dev-python/arrow/Manifest b/dev-python/arrow/Manifest
index 8574503ea059..8bf826a62bf6 100644
--- a/dev-python/arrow/Manifest
+++ b/dev-python/arrow/Manifest
@@ -1,5 +1,7 @@
 DIST arrow-1.0.3.tar.gz 102536 BLAKE2B 020b9b12a529f31c8054cfe98b99ee791cd1f2889422e4bb1b0bb6873ff4c1748951b63d20d2526af2bea3ff13b26d809b35eed36984d1063c35c334d76ee416 SHA512 f8da6574758ca1f319ed9d71e4fc6e44d3c3db0a6fe36c8868c3515ab789093660e3d57d6de60813cf2eb57c7a3a8bfe92facbb410a383528cb1fbc37d860b49
 DIST arrow-1.1.0.tar.gz 109692 BLAKE2B da6cf4feb0048db4f808fc8d8863d59b1501c9e5ea8b171aacd36945e7dee874fb088c1bdcf57858e9126b42b312ec24511ee69e8846cb28c5d97b0cb5ece237 SHA512 9ec39458069d9538bd0f05fcbb03f92c6cf613c4bb686037a92ffcf7fa2f6306fa84ca6bcc2b7ffdb84c2fcf4cbe281ad7cb6698d1886da29d9121805140be49
+DIST arrow-1.1.1.tar.gz 113054 BLAKE2B 7f9d205aaba1c8ea4ad433baad03cf2392e5dcb819a95ef8de612f7d6f8cbb8500d224648c61a0f48403878e9b02fa8e90e3e3fb6411fa23eaf1f333205f7c1e SHA512 eaa6cde1083a0ed1204260ae9b9c850ca2dfcc53858e2391def28b2aaefe78671166bfdefa1c725adceb26fa8425885d3a0c3914782203e1c3be593dd9a00349
 EBUILD arrow-1.0.3.ebuild 787 BLAKE2B bc09a63555e5a833d0e1a9dfd645cd37963fc187a664fe0300b9963ec5e11a8aca745c8b35a7ea8b3866f40f93efef8c08dd212c50143aa11748cc58862fc976 SHA512 fcb1145f467ae6d0f66e420c265206b451e6511bc2cc3844214a920efeeb84a6ad7a1848a2816522f8c08b7f438a7716e55619c335d4bd177cd3c6063ecc87c1
 EBUILD arrow-1.1.0.ebuild 788 BLAKE2B ad9deff9436a4461b95ba0326b31be79eedaee00429b80f6a63ff1e8ee6b23c0517f3816e2eca4a79e849eb9789c75349a372e8dbb72e06d0bb2d9956da35c94 SHA512 611ae0a4e3521eaaf6b6a9f93d7dc9e6d6c33c01662f3966b0790af8fe544822584eead130c1381154132413219a7120fbea4497f6657cc2d24daf06a59be260
+EBUILD arrow-1.1.1.ebuild 790 BLAKE2B 08d8611d6f5d20d25f191904722aaaaaf24c16b41675de9d69744a6284917b3d733df153a0ac38087d1b737d1bfe619c6d03b4f0b222fdc768a513d16c24b915 SHA512 0e3c1cc4418bab96965b72394295f92d0d6bfeebe156d9b30e3aeaf44e3445d3817c8b4e604144c5cc4382e39e2636f50c054c3578210651f7cd2642b57668e1
 MISC metadata.xml 386 BLAKE2B bc1174a003d7041b7741307be147e5d1e6035982b4174cef130017825d20b6a35835f3decce36e7c8c5fd4cee7d9ea77cb083850bc820f241fee1407665bdb5c SHA512 88ca68a6095f8c900c55d4ca1159d78c4ace39b326b1d5c9086d27177c9f5026d83d32e7c8bed3813a623e2be22243c3fd6a268d79ca528ade6f42bf3fe5a7e7
diff --git a/dev-python/arrow/arrow-1.1.1.ebuild b/dev-python/arrow/arrow-1.1.1.ebuild
new file mode 100644
index 000000000000..5064da91ddf9
--- /dev/null
+++ b/dev-python/arrow/arrow-1.1.1.ebuild
@@ -0,0 +1,35 @@
+# 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="Better dates and times for Python"
+HOMEPAGE="https://github.com/arrow-py/arrow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-dateutil-2.7.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/addopts/d' tox.ini || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index a25390745d7d..2a3f80599a34 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,4 +1,6 @@
 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
 EBUILD asgiref-3.3.4.ebuild 815 BLAKE2B 6df2257f14b8497d9b3c2f740310daa1edf8378c9ebb08323126455259854fc37312766f531a151661b49c79d3ea7dd2e166709dde6a7577dc560d54b4b5f98d SHA512 5543d78dcba4dcb6743e1ae05040eb6b1cb465ace2bb17b5a61b27961ff2e842f93f7d13d35f2be9ecc89d07e7ee0205498dc13363c628d37efc9d3e67b7a6b9
+EBUILD asgiref-3.4.0.ebuild 698 BLAKE2B f04dd652264530179490857aef42e3af9a8d4f14a7976602c77f8e99af47d84ceb3a57981db64aa29a519e85beae4535aea99e475a4b82124b98d35457998fbd SHA512 3d11e79046a7ea4e9ff0ff4cd4816d19634cfafb6fc4b18a7305ae9befb672fab0d996da1905e6c721d5c0bd570669d7759df36041fc77c9c50cdabedd2e00b8
 MISC metadata.xml 388 BLAKE2B eb8c329aa8d5220d66dd380ad7c4bb4fe539b3fb5b854e9a6b4912d2212b6ffa74d7f9331c5ec575bfd53407d016b464efb06c3f94c4088dd729f646b5d528ab SHA512 45d74c331619ea754ed36e7a2e9eee1687be49cf698ed7d9e89c8cb006b40001be93a8fc753830dbbba12a5ca61d3407aaa364aff3354708ae79cbb72cba6a20
diff --git a/dev-python/asgiref/asgiref-3.4.0.ebuild b/dev-python/asgiref/asgiref-3.4.0.ebuild
new file mode 100644
index 000000000000..d0582cfb5185
--- /dev/null
+++ b/dev-python/asgiref/asgiref-3.4.0.ebuild
@@ -0,0 +1,27 @@
+# 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/awxkit/Manifest b/dev-python/awxkit/Manifest
index 4ea0652b2e16..baa2781d09a8 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -2,8 +2,10 @@ DIST awxkit-19.0.0.tar.gz 95820 BLAKE2B eadb3ffbfd5a1bf2835e4a7df788e06676cd7c81
 DIST awxkit-19.1.0.tar.gz 94839 BLAKE2B 751084164581dd772c4f99b14d3e3526effd758bffda0820be56f0d963903314458c0037df33606bf0329009186ef86df1fa0c41f9ecd377b8c2d2de15bcd9e0 SHA512 a4be398f81f370e62b60605c0add70775eebf78bbd21080a65caa64c5b9f9daf33315516cd3771d434ff86d2bb9ec089545adbc174bd19ef5e52ae69e6cb79db
 DIST awxkit-19.2.0.tar.gz 94870 BLAKE2B becd8819e5d7f495d73a16302389af802db9fc3d9e24e09f93f0e5a730552e676a2f6514a07ea6d90436837c78a32e6a7be9ba541942aae6e8437c30aa4fb2c5 SHA512 3bcae70da26170a8b9cfc49c3ea3391f4fc03c868286499b5d3303da3559927c1fd2c0aeae282831412825e34fb83d8324fe2e58ba11d60598bbbbb26ff661a3
 DIST awxkit-19.2.1.tar.gz 95129 BLAKE2B b68b98da71e835132993395f50b2b2a9dc344dec3534977da8468bd76c9d401bbf1d931878d79e2123e4d9cae1553d08c7132dd3041ed32d6282b778bce65098 SHA512 be46963515877b11f75e63c606de1900e244617480ebe90f4c5057e4b22c9687d6b371581beeb311c9e7bed94173b88d74838256024055b2fd5f1c5be1c4bda3
+DIST awxkit-19.2.2.tar.gz 95096 BLAKE2B dce95f819f2bbbaa60e09a8f25685a0f75b112f9fc27023f8d27acf4230a29477e14020dc838633a9fb20c65928857806c8a672c0666308798a78d2213ff15a0 SHA512 bab28be15011e9be3bd3f0d22ed5d5e67f0c19db08672ee4404ddd49a2686a2d7de790b4d06d8544b30a6b827def3a6974b0ee2960d9959d4c165afef4202995
 EBUILD awxkit-19.0.0-r1.ebuild 797 BLAKE2B 7ecff34a0436d846d71815c52fe7dc0bc5b02c05e92f7fa0cb726453cd43294d140c3c7bbff1bcf3101fab5adde5b838f091fea9e172dec98cff058de820c6c4 SHA512 a5ab9bf2f37931d183c6f2adb4cdd1a75c573a4cba25ff7b12f2c6df1163c0ada217174ce52da3678f8a8b7cf72954ae3e43f342a90bbf61a61e2a2dc0802ac9
 EBUILD awxkit-19.1.0.ebuild 749 BLAKE2B 385da85decfa2a652ae75f3baaa625d9199266d197586cebbcf8a816657faa07bfdb762934f643f520456eb60acbcde877a75ca61f47e0e622f869a76da70b8e SHA512 d28aff6d2b17fb87efe6b5a4f48a2a8ad54c5153b3c045f2e72d1163fa460aa2167a3857258fcb996ed1f4da0222b9423eccedcdf02f63e4729be662dbc49e8b
 EBUILD awxkit-19.2.0.ebuild 750 BLAKE2B 30b63a533818c0f81ee41a5d3e9b8c11bca3b948e7d5c3293ca33b930efd634b1079a6e722379471b77175ae38e578c27c2e085a6552358f6b277cd3949cb7a7 SHA512 8ae9e13bb0a4fd0cb2834cde5930824b9d2ddac7d2019dc02eb6303b1a01db2b3269cd72efe9efb0edf7f4260ed91290475bc0b38a072c2615c32652eb2ba614
 EBUILD awxkit-19.2.1.ebuild 750 BLAKE2B 13f965813d6e58a28298b278f8e64cd9013f034a1f93c3adec684af42072b6d42cd688f4165d9aea296556945c669b276dde54dd4adc03500a4567155d0394e7 SHA512 1d6eb343227b6c6c289aa67f7b1e6437195c0a304b8308fbca6340f13a2bec6fead8d1f445b855d3e08f28cc2dbd399fd7e662a1b88a9ecb0c2d91b4c3dad611
+EBUILD awxkit-19.2.2.ebuild 750 BLAKE2B 4b8ccda00fe41e68124d8bc22bc74c15c73214230ffb61a058b468aa3d53ad5ac185222a6d4f641bc31faac7ff318defdb7210632f54953ec14a501df9e14941 SHA512 ca1b14d71a46df2e413049cf7945bf5961af2246d32ab0633b23bfd3d8dfd223f42caef4689b05ef6ab25982fa66baa75657811e790c663af7ea335d81b74b54
 MISC metadata.xml 511 BLAKE2B 79a6dd412f75b174ebd0d6dc1e13ec1d95538aae8572c80f0e354c7f2398d9ed3664ad69c9d07ce85572d9f65b994d91c0b345b41170466ba4d7d057b94bc6fb SHA512 05a14ab528d02615e61ee64a79aabb56c34b93b68c13f8ff0c807c6b046dc5b49aa45c793f9122220fd2ba62bc12e3001321801e4b3723f0ba0e52c3686f3128
diff --git a/dev-python/awxkit/awxkit-19.2.2.ebuild b/dev-python/awxkit/awxkit-19.2.2.ebuild
new file mode 100644
index 000000000000..6a4107d47a51
--- /dev/null
+++ b/dev-python/awxkit/awxkit-19.2.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 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="Command line interface for Ansible AWX"
+HOMEPAGE="https://github.com/ansible/awx"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-i setup.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/backcall/Manifest b/dev-python/backcall/Manifest
index cf5cf39b4d82..7c6f31edf834 100644
--- a/dev-python/backcall/Manifest
+++ b/dev-python/backcall/Manifest
@@ -1,3 +1,3 @@
 DIST backcall-0.2.0.tar.gz 18041 BLAKE2B 67f9ac96d26b368972a5749775a70c497b5705b37d45ba7f64c1259be776cc7f4c9d78ae51da9c1e9e46521d33bf511790675688feef88a68d25ae30cd79612d SHA512 7f086121c485c0ea4bc6935e7d116c8b14ff44ff6001a49665d0a698b6cf9a809823b9bca634a78d92cf40656f953dbac0132241327a5fa6be0ea685ff63636e
-EBUILD backcall-0.2.0.ebuild 496 BLAKE2B 7e697903632ab951e4458bd4f13aeb9121ff5ec86c7e4ec349129d22eb3603956e322dc1790a552b601798a09acc074dded4ab7fd9bff91d16136803fb733b90 SHA512 08883e873724d9f35cefab9a03bc6fc93c8a7d95fe893e298b2d46f65299801ce458c4f747935e6d0e2ba786fcca73631a7d4ca1b508b3d6e06e05926d8e05d2
+EBUILD backcall-0.2.0.ebuild 503 BLAKE2B 377fa51d8258277a67e992831ded4516d3ce9e3d08601f9f0732f490c3a89aa13bf7fb618bfb7f4e9b0a56bdc841eae2fda6fcc807c5aa6c0fe80a7f364a2f14 SHA512 6a0a7e5ac8f6adf9b56d0fe910a3d46ecd31eaff31df0ba68039d70d124b4a3a95269e4801aa9cdc5e9b7b25a170f3d22e62a74c7f093335b30e9bbe97a67082
 MISC metadata.xml 335 BLAKE2B 558ac1afbb0fc8c1219d42695ebf1b74214252209d6faf39f23acf1c8512920d1874cf5e69ec13b35d184cd07eb2f0b7901f473d2b9135e3adca0ed279db2ee2 SHA512 167da4e5a744c9327b5dade5001d74d418a6426597ed988db29b083b1d39d66cb2714ebc2a812a91430271837e8ebe6f6512899387309d308eefd2744a4e2531
diff --git a/dev-python/backcall/backcall-0.2.0.ebuild b/dev-python/backcall/backcall-0.2.0.ebuild
index 5575b5f22165..3ad4642ea017 100644
--- a/dev-python/backcall/backcall-0.2.0.ebuild
+++ b/dev-python/backcall/backcall-0.2.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 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index b3963f6a64b4..9875a6dc5b28 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -1,3 +1,6 @@
+DIST boto3-1.17.100.tar.gz 385310 BLAKE2B fef5fb0cf4862819c05efa3eb793cf2c9756c003aa4de2c8288a0b46d2f6f2cace53ba09429761437073fac366ad73cc1e816b480a22d42f1d3b9c5160fc3a07 SHA512 2d137d2dc6265a784af961b4e61faddf2a9b9493fc281da9764fd1ef8e855777d48daeaef7380e9d83408c6358e33c2898ad60c95e685bc04a9821cb0b2cfc3b
+DIST boto3-1.17.101.tar.gz 385690 BLAKE2B 7b98615588eb09513eba33f1fd1019631c862def949f9c8314cc8b8506e83be3b3bfe88c08d97166e9f669db2724b02a247769db7f4262c7b4d306afdb3bf2e6 SHA512 cda7c5c42ef809397002d64f04e23bfac271086b4601595b635dacbab4592cab401b6238291ae2fa898d2419b4a0f2d3d0bc7828c0a7de2442ad0026a5565d56
+DIST boto3-1.17.102.tar.gz 386456 BLAKE2B 25b18f086f8881a237a953c85cecc403fdd1b047f990ae289c16695ca1c1faf50da3cd7363e72d1655d7a887c8f5c0729bb25121fa0066db5d393f5b6cd3d4a6 SHA512 42cbd01626bd11f774466dc718086648eb7a4b73a50226a04485e934010271b0f20c030c300ada074fb0b3bf3eac8f6fa113dee86d0f1cf3f12f12230778c2e5
 DIST boto3-1.17.54.tar.gz 362224 BLAKE2B d67ea9a2833d4cf6ec50fc4eab9c194f813f92ef00fa0d1638e0dca0bf03a92fa5208707b3ceda70759231aa69c35bf83028eada42d04209a55d05daf37ce764 SHA512 795a78807e8aad9ba53b196ac6b3547e23d2f7cc962a34121280fe47dfa8f99eac19765c87817918c6ee36dfb7e2b647e5646b7da27eb67900f29430bfe2fb5c
 DIST boto3-1.17.74.tar.gz 371719 BLAKE2B f6d44206a14cdf395c8963be048e81391ecbf6817b1c00e1cd081abf111df8bd85c05fa1c04b013de7e6d916835e4876cc961891c8d52d8a32e41713080ed96e SHA512 a79012072238286561ab43ca7bb9f24236e858e0bf550be9a074517145445d0d520cc207683d99f6f704416f617b5f89468c87357223db9564e4310a2a2676f1
 DIST boto3-1.17.78.tar.gz 374487 BLAKE2B 8a83cb32db8336351454251a3cf78efad6197885a66c10a4e3f9e13770d92d7cd9e9b51bfc7c4bfdb2f5183c5246872d7f3075d55b5129606ad9d977ecbf9891 SHA512 8ab9f13360f63342219d7b0278e2ca5613f8d051d006ef26da14307e83fcaaf1a546c566cb4b8ba012fa5e8e6b5e409722228da0989e56f50e40df4a733602de
@@ -21,6 +24,9 @@ DIST boto3-1.17.96.tar.gz 383485 BLAKE2B d962177eb5a693aad1900fbe6c44e20853deee7
 DIST boto3-1.17.97.tar.gz 383223 BLAKE2B 1a1b4e9f2c51d830762f27cf3e30038efb88322e300ac304d1cb88d5b7efc6af35ad9810cea7292c9807dcdfedb11ba039ee6d5dbb9162f2a1c6d6936ef75bcc SHA512 e74a59763cc9b8a51fd09121a790d29a7291d9380d4451c2e6af90902f18415a3780eeea7f7d63e052b295792b92c3cdd3b8597f7013241ebbbdb7e418cf73ce
 DIST boto3-1.17.98.tar.gz 383306 BLAKE2B f9fed22e11d2561a5a665105bdddffce2cea357f588200285ba4758809e6f64ded3ef4ad4eb10a52a1852df86d1098f752f432f5bd90a70669d569866262d638 SHA512 223de2234b235773138ffca02eed8187eaa2b74fa3c0822700bfcebe12da69078ab592ca77158448cb998d47dc63a20c79a3ce9dab2398c41faaf94a329c7cc3
 DIST boto3-1.17.99.tar.gz 384452 BLAKE2B a86fcc79242ce9e55101690f2fc7534d43038621c9d5aa9d9f7f1eebbf9bcb07a035e91d62486163894f8598969ccb99047d54918f874dacfb647116a65b097e SHA512 99f1fc890680162b2ec8bd9da77f4de5ecf23ab1f7cee552f51031f2b21ca930b9d2ab27ad5f61d1b7e4a4433b288374615313e00abe8ae595c10fe36f6a49c3
+EBUILD boto3-1.17.100.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
+EBUILD boto3-1.17.101.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
+EBUILD boto3-1.17.102.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
 EBUILD boto3-1.17.54.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.17.74.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
 EBUILD boto3-1.17.78.ebuild 1367 BLAKE2B da22f912dd19d83b7e2a4e22bda42785dba18b67bd6f0b9a5a6d13cc87a1cbec9810e8071a8f7407be4249fae4aa6a27357970f0f9b60f914e9f82b034b862f8 SHA512 568133f9ab499b8ff9e95340ec99b4bb3c9e6f53981d2fe337a3220a189d9bf91dd8f7f03db055e0a02169f36546f5257fa04c1a0fd2918d712c636e02903240
diff --git a/dev-python/boto3/boto3-1.17.100.ebuild b/dev-python/boto3/boto3-1.17.100.ebuild
new file mode 100644
index 000000000000..666cbfa63e3f
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.100.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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.17.101.ebuild b/dev-python/boto3/boto3-1.17.101.ebuild
new file mode 100644
index 000000000000..666cbfa63e3f
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.101.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{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.17.102.ebuild b/dev-python/boto3/boto3-1.17.102.ebuild
new file mode 100644
index 000000000000..75afb4bcf865
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.102.ebuild
@@ -0,0 +1,56 @@
+# 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 eec10f7c6c94..9364b465c5a9 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -1,5 +1,8 @@
 AUX 1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch 1056 BLAKE2B ecdf805cd61e337d4152d56952aeb8b78bfdd871b4da060d025ca4e3f974b3b7a907eee71ce6de1bc6cff8130fa81391aeaa2c5537b1baf159ce23500908a5f4 SHA512 c3be1a6457990168c759f03b24de8f78242b9c06f189553e416ce75fee6a77dce68967a551dfd83e1be096db9baeca019b75526c4886c672eca35282e307f229
 AUX botocore-1.20.64-bpo43882.patch 1106 BLAKE2B e08e112f1afd9a4b80600550550903594901eebf94d44cecdfc38ff2e6007594f796506377096403f3b77a148acf92bcb2373eecb705e3f150cd5ce41c0b3c76 SHA512 1bfebf53c8cf9a2e84b7493365b90e87174cdaf0eb138921877f2f726b5b9acf7d0cb4b4fa4f532f23cfb29bb48150ad01ba582b1a19c3b0702b24f69208e5da
+DIST botocore-1.20.100.tar.gz 7870739 BLAKE2B 0af8337b44f78f0d66062c3e351e6c2805ab4e205e1404a698bad7240abf37f4fd47206c9b3f9a302053c933ab774e8842edefa38979b09d5b111b836137119f SHA512 af20cf638e48375b0adbadac5329aa62008def72e158159acbcdc200b250c0ac27e0ea568cd216ad8e81772b42491efed5a271f186d9caf0dc7e3bbf0197b7c6
+DIST botocore-1.20.101.tar.gz 7872329 BLAKE2B 417f92e0747d32e9238e318af1f4063c86aca6364c63f312755efea6135df9415dd37dfa754896e78573329da0bb9e5f5609cbd836fd771e4ef185d691b1f5f3 SHA512 6641f14bbe9385acc764377be27b8d50f8eb0044330bc7248adc27c7605d4bcb489203f3953cd3ef17ec0f3e49d1df4e84f6ebce2c7d5b2b54d98406d836b49a
+DIST botocore-1.20.102.tar.gz 7881122 BLAKE2B 51d2acb780766a02a2b58bab10c22557614711e944c58fdbd78479a59e1139446a642da7a8192f2d37c22fa8fa60d27024fca68737601d143018a17669f8df4c SHA512 ee756829454bca50e872cc8cb3caa66ff9ff3cc1075a1afdf693d39e4e9f3c7953b1c69c13c78be594aee572752eb89700369985dfc57e7ebc772b444f8d8c91
 DIST botocore-1.20.54.tar.gz 7650344 BLAKE2B 2dd0a3f8c7c5665e849cf74b663a88e63416f1dea8ca3ee7dbdf10cf35239d466919f2ae4b3c9a639b9e25a23d982b723b24f32ece43715d40283e96e3bf10f6 SHA512 77cdaf68378836205c94c7dfd8424f9ca44ac822fd418d323df30639157bb38e5534fcfbc5bb6cdd7695bec62e24a1d52b81a0be54b0f69f16d20c5182db004b
 DIST botocore-1.20.74.tar.gz 7729804 BLAKE2B 0693da2be219ee140c5c00a540756d31651d3e4c78976a7f766705123e9fba23e98d73e551b86a6b661530c20abb560b0e36fea8e1c13600303894b3163d2274 SHA512 51bcf78c6804b4a8cddd57eeff96d7ecb65731dfbd87eb665de1356c1daedb4317323b3a0d905e3d459800d800ce6d6ffd8fd1239b26ecf56884bee37159f2b7
 DIST botocore-1.20.78.tar.gz 7758829 BLAKE2B af13d6c1aa918e2c49c6dc931c9a78e1899c83e62657c063e20ba2a5544c48e4946018628e47d6a56db456a3a8d43fe3b577824bd76bbc339abaef375459932e SHA512 fc96ed8b6b4af05404654e470a4f83419b885fa32d9dc704727f4ffb3d5deeefa752d235b37fd81448b7f3b101bc0f8e7ea09ae8641f8961566f77f6a039cef9
@@ -23,6 +26,9 @@ DIST botocore-1.20.96.tar.gz 7842597 BLAKE2B 1a30d4d29c1200f51284a30ee1f512debfb
 DIST botocore-1.20.97.tar.gz 7846552 BLAKE2B da0355cc229ba8a0632f67866bf06b27d7b257184b53670e5dc183c6b5a1f4d3a34145de0a3f04abd2adc08de3f0775e3c7e0dbecae729acb5bc05c7ce9acaf2 SHA512 7411d5de8ecf0c42c0142ded036189dcf378cd16f761071beb5bc2a2c240eabb0c4a8c669ce89a5b4e798a0aae92f0e67755627c2a84df77fc2e9557265a4e3b
 DIST botocore-1.20.98.tar.gz 7854150 BLAKE2B 3f63f0057555b33fbb69d4f8720b393dc6f866721df0a90be354ae3485e0053bcf2216f180d4f795cd271a5ea77e7d390ff453c5d2655e60b51623be1fe5df8e SHA512 98d931ad9efbcb899bc3f6e1fd55028fdbc88cebb9d2ffe93db08610b8515de8bd784338b2320136319314783fbb65d251526efbf3df76de80be4561bc97f40b
 DIST botocore-1.20.99.tar.gz 7859805 BLAKE2B 41c8afcf4277dd10589209c18281103a4ec288581c08760da380d883542133aec65813792064d70efdd74d94902e45e0a9164d1882d27cdba01ddd12d438b5ff SHA512 45da79b872e8489e6a366106858cf50d5af52d3f1a2df1b831d47b0f72ea0b777c354215b43e2feb2d31cc3646d1995590152133ed865bfc184ad60629a7f61e
+EBUILD botocore-1.20.100.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
+EBUILD botocore-1.20.101.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
+EBUILD botocore-1.20.102.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.20.54.ebuild 1541 BLAKE2B 2a87a90a023a6f4a203b686d8ebff52dcc013ecd083a103e6b77f9f738c4cd9fbb04d6c8a63311aacb867f46328676c296c0ac0fc7c8923eeea6b310295a9bb2 SHA512 293c8a55e0f1c424026e395c05e901ce2f233a42b1105d7ec03c85a99c7f111a4701553598e009210ac6f7517ca7d9849592b81ca7ec62d99265972a7dd5cd00
 EBUILD botocore-1.20.74.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
 EBUILD botocore-1.20.78.ebuild 1508 BLAKE2B 63c6bf25a6af7e1f5e39d58577efd2044a915b4c9679b02941600fb89e061b403b9b6f5c47d12180768f8461660f39771a394dd90dfa851bd6b6d9ac895c7eb7 SHA512 83d93e13674e604cb4a0593fd6e189a689fcb5ce23a60756cb6b2bbe6050d4c07421953ea21b697f83cc876a6e77e1505e89344bf1143b8130d8854bcabc644d
diff --git a/dev-python/botocore/botocore-1.20.100.ebuild b/dev-python/botocore/botocore-1.20.100.ebuild
new file mode 100644
index 000000000000..762144aabf71
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.100.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{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.20.101.ebuild b/dev-python/botocore/botocore-1.20.101.ebuild
new file mode 100644
index 000000000000..762144aabf71
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.101.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{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.20.102.ebuild b/dev-python/botocore/botocore-1.20.102.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.102.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/cachelib/Manifest b/dev-python/cachelib/Manifest
index 80ff587fb5b3..955e6d539eba 100644
--- a/dev-python/cachelib/Manifest
+++ b/dev-python/cachelib/Manifest
@@ -1,3 +1,5 @@
 DIST cachelib-0.1.1.tar.gz 10192 BLAKE2B ce1ac03498e331c0df405e99b26f24cf38f21243c60d90ca3b0fab599abce5ac8c59ba8c566216d761fea170d64934c63fd74f9733c50aa3ebe382c54b80bcfa SHA512 865dba727427907227b021ecc5962738c85fb74f898acfe1612e48247ada9eda3eddb72c3c29c700fe4275ed699accc5af9526afbaf0dfbfb3a1a1a6370cc3d6
+DIST cachelib-0.2.0.tar.gz 17735 BLAKE2B 737c5083b719b6330df4eab3e256fa64b9bd2292d46a1c0b82c72c6f69f4f2fae6623fd4bc167533101e0ff01b5273a1042f5c1bdf35080a5241358de642cba3 SHA512 4011d9ead4fe27a54508355eba46e91a924ce30ef3d7cdc5a2049f7e0e48f924b64d65f203aebcf9a8729f956b6edde4160cdb7edfa7e63293e2853b94bd6601
 EBUILD cachelib-0.1.1.ebuild 514 BLAKE2B a3d34faaaaa1a3d7d254093f81f7a65382ce0d39849df1459deaa3cf4b97d9e4f120fb1e3ae7aa73b8c79b78a338052ee614cab160e02bfc8584f228aac1f9b5 SHA512 2b2d4a1adcd50421722d41170dade21d406213479de203912023434ac6c2c8a75bdbf57c9e273ec99ed40930b615bc9ebb32f32401d1ffd34bbb05eedbc0291e
-MISC metadata.xml 372 BLAKE2B 89972d2b247808fbaff63dfbb83bc494b80badf3b42df803500f1e1599de5c4ce3c87ff7c57966160928cafdf232eb8ef5a4359b0e932d378c2399e3ddfd8bdb SHA512 e180e3dff25f1698feaee7396788659573775068bee815effc89e585306e7f98a09cb3d0d20c9c56918570c7c61c2168cebc6178f6a31e4e6236e62831ea0d80
+EBUILD cachelib-0.2.0.ebuild 705 BLAKE2B 88729d4bc99addf86fea36d3eb022258c64cf4296acd170a98a42fec0407a7e34dcbbb7f17b468c69a391ff61174465663a473c34cc449974aa8cb7b11174389 SHA512 b5989476dd4b992ae79c91730a2efee0ed6fc7a6a8902605f959427973596931f5afec3fa9d884526a8c11c65ab537671cb3547272ff8dc07c79e6f06354e5d9
+MISC metadata.xml 473 BLAKE2B fc55238dc8f1e3bbdf2afd875e27bccd93084c0497826cae167ebcc7ae36529628bc6cd4d28fd0b6ce5e09d09ea9895e808f090ebc14d70db00bbe80e3c59db5 SHA512 ea41f45ce1423d8db2a46c098704516964f35086417377c9c24ed726d33229575dcf6563121c74f04584233a2744d11c699e454832082070a3f6b4738ad4d21e
diff --git a/dev-python/cachelib/cachelib-0.2.0.ebuild b/dev-python/cachelib/cachelib-0.2.0.ebuild
new file mode 100644
index 000000000000..8f80ff98d460
--- /dev/null
+++ b/dev-python/cachelib/cachelib-0.2.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of cache libraries in the same API interface. Extracted from werkzeug"
+HOMEPAGE="https://pypi.org/project/cachelib/ https://github.com/pallets/cachelib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/pylibmc[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/redis-py[${PYTHON_USEDEP}]
+		net-misc/memcached
+		www-servers/uwsgi[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cachelib/metadata.xml b/dev-python/cachelib/metadata.xml
index 0b1c2d9da609..d53e2426cf3f 100644
--- a/dev-python/cachelib/metadata.xml
+++ b/dev-python/cachelib/metadata.xml
@@ -4,6 +4,10 @@
 	<maintainer type="person">
 		<email>kensington@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">cachelib</remote-id>
diff --git a/dev-python/cfgv/Manifest b/dev-python/cfgv/Manifest
index 91fdc52bef6c..702713db0ff4 100644
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@@ -1,3 +1,3 @@
 DIST cfgv-3.3.0.tar.gz 10393 BLAKE2B d4cf565884aaab6a81716382ba8e3244e36a3381b771f7e206053fa80500205bd3b70b62b611ce4a7f0cb143a763d51eb10b1e29333b7f06e29cb406f9f7f6b8 SHA512 23a238c76635404b150bbc3bb1eafd8eb521171e69bb3f3fee55a0a24c12d2ee152cc7453a41952d2f41a6cb72575dacf4b990dbd443f69026a770c87a1e081f
-EBUILD cfgv-3.3.0.ebuild 462 BLAKE2B 15a7a8b96171059fbceb0b7e6e56676c6ab2c60e70e98c5b970aa8de7a07ed60725af8c1ecf526e95465309bf79eaf0be96aaa39ab2a8529b3683c39b22d49d5 SHA512 32980c489010b461b580e3b72ea9a9b649e3e3798d76ed521400740f9c51e062f8c9de740571d098374da9480cbd6532cd3e5a4805b047b3f71a99dcb36cd460
+EBUILD cfgv-3.3.0.ebuild 469 BLAKE2B 17a7ce7b35d2bbcd30d9d72db1a8b09e1c97ef207af8a99de1cc7014d02ceb0280ae7666f052f14304daf17eb96bc11d319508dc340fd207f76fccbc459534ae SHA512 2515fcc3a2991cba61a083d98c46b21383fa3578a12e8f18be4fadc25dc1b06a51aa2dc3f97e44f0c2a3f227e230088c02b130752b544817a7e3573305627536
 MISC metadata.xml 490 BLAKE2B 095a603aa93c514e7d04381159b3ab9442c329dc4270b065bb347671bc00497d7d8094499f45a9b0785f75c6f06a97669f3c1ada39d582065743697726cac1da SHA512 bf284020d3c30c217ffae1d1d114eb3e93d114a6bed44c6dad87abbe11903204cbf300453b7a46d86d2f9575428e8f6c10ea1f7e3c53974704b34f4aa9d3878b
diff --git a/dev-python/cfgv/cfgv-3.3.0.ebuild b/dev-python/cfgv/cfgv-3.3.0.ebuild
index 4c3adc6e854a..6ca33230df57 100644
--- a/dev-python/cfgv/cfgv-3.3.0.ebuild
+++ b/dev-python/cfgv/cfgv-3.3.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa"
+KEYWORDS="amd64 ~hppa ~riscv"
 
 distutils_enable_tests pytest
diff --git a/dev-python/commentjson/Manifest b/dev-python/commentjson/Manifest
new file mode 100644
index 000000000000..c36c2d21b246
--- /dev/null
+++ b/dev-python/commentjson/Manifest
@@ -0,0 +1,3 @@
+DIST commentjson-0.9.0.gh.tar.gz 15297 BLAKE2B a857b0fa5551079d3d37bff94fb51a903e998c4fb84e0f62a5de28d6eafe0cb8a38b3215515e72c56de0cddb661f109921c801d15b9ba93771290135adaaa5b1 SHA512 cd3d28adecbc445ed3faed7847c65a23829f408cf8aa3fa85544a0f0cf9fa5544b8aff560725cf51921f249123daf9ce9953069e99ca64a312bb4bff652512fe
+EBUILD commentjson-0.9.0.ebuild 746 BLAKE2B 08d352060235204766c8c869ccc0387930c379920ad81f9c2b8905ddfca5ff1c4afb5469d1c6baa2552323a3442264b1c1f1708016691fcff866aabc99690a5b SHA512 04af3ef2cb1341e2802fef5c575a95b484062a2734fc88646cc3a0bde798318a197f5a2afb568c0b09f39db329595988d219a3cddbbcd478062d1a2fc85083e7
+MISC metadata.xml 350 BLAKE2B a14a2adc21600c7f65c10bd0d741c0f81ede15baa200532ad346a74f36e4eed3bfd4af40ae30d208bd6cb1064936b4e7fc5acb0db31890a9e7109210f499b3df SHA512 558f86dfd9c937dec4a41df69e50662a86968cf1884484fc0fbe336d95b4fb4c66c22ced5b086024364d8c02aef6ffac436aa6ba80afc5398dcbf3ac12f5f4d0
diff --git a/dev-python/commentjson/commentjson-0.9.0.ebuild b/dev-python/commentjson/commentjson-0.9.0.ebuild
new file mode 100644
index 000000000000..51fdc6a6b383
--- /dev/null
+++ b/dev-python/commentjson/commentjson-0.9.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Add Python and JavaScript style comments in your JSON files"
+HOMEPAGE="
+	https://pypi.org/project/commentjson/
+	https://github.com/vaidik/commentjson/"
+SRC_URI="
+	https://github.com/vaidik/commentjson/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/lark-parser[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# remove unnecessary version bind
+	sed -i -e '/lark-parser/s:,<0.8.0::' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/commentjson/metadata.xml b/dev-python/commentjson/metadata.xml
new file mode 100644
index 000000000000..f4168a14251e
--- /dev/null
+++ b/dev-python/commentjson/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="pypi">commentjson</remote-id>
+		<remote-id type="github">vaidik/commentjson</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/confuse/Manifest b/dev-python/confuse/Manifest
index 37b4a2fc348d..3c4ed50bdb4e 100644
--- a/dev-python/confuse/Manifest
+++ b/dev-python/confuse/Manifest
@@ -1,5 +1,7 @@
 DIST confuse-1.0.0.tar.gz 34790 BLAKE2B efa23f59e6d450160af279042ed3d77b3b26bd1fe2fffd90b0ce1c87821b5540048b45644bfff1a8420007cf2a705d388965daa20034bb8f846085dd92b49186 SHA512 f436a400b9b84db1a20409c70d64fdde44903ffba6c3618917fd297e04ecf3dda806e315972f7cf1f786c93639b10b0652a622a579a2cfa47703386a43433c8d
 DIST confuse-1.4.0.tar.gz 36020 BLAKE2B a11becf564c84177f919b4c6936dc9452a2821d9dec190167d8eefc141c424323a2cf1934e608028ac07c7290eb4e139a9051904b13fc4ea00594185db10ec2c SHA512 4a06568f3369d08f177e9f639f59511c565961b15b6a8bc3a7fd244396b47c19c163aa05abab96cce5078b962a98763fc0c5739ff8bbd98a5976696ad6240c2d
+DIST confuse-1.5.0.tar.gz 44193 BLAKE2B 8af065c061c786cf1389a81e10263fe999523e038e41e4403f49a1eeb5ba138c76da745a9be3290f7b8e82d6ec88d18920904c979b5be5dcb4a0bb02f32387c7 SHA512 aed651c7980b0df75f211d9a498b56473c3d23b316569bfafc3008aebb77f86de38912e41a2c073c99c752bfd46092e7ea06ff31281fb79ed3c20c59f5dbcc9c
 EBUILD confuse-1.0.0.ebuild 947 BLAKE2B 7646728aa4896f5b02de27f5e306d7b6abf7a3ad2e498b2873bcaea4bf38aa990da5bd0af75fcc30a56c13502c22fffe95f3adbdd07b72ede9986073274c1e30 SHA512 2dd66790b600af49ceb0c817f305cd57cb31b940fe9ace76abb0665336444f3e7d7eae7162f2db3166a26483ec0199d7aea633a8d798c5b3879c0546452b3bd2
 EBUILD confuse-1.4.0.ebuild 710 BLAKE2B ebab635705b36a72e14154e960ce881be1a3a080c9e694d4a4dcc52ac052c0dfe4588b205f4d4d17c9d21ecc0d48f5899ebba0cb918ba8513e38835b5cdb5647 SHA512 7d89f06d6b4a2890860dc2b8856ef49c137b320afad37694b4a058928a15385a2473ad2fa362547afc2130fd95fde77d3876bbab2591f484a6db9e193a5782c8
-MISC metadata.xml 776 BLAKE2B 4adb1f8dfc17178e0a31a60768e7faa81303a3a89a3e7a1ebcc809f46eed06743c07afc69d702bc4da7da35d18b8e5186a52daf19a1aba9a15e7ca5fdbee6a37 SHA512 5d5641a7653551fe9909155009ab10f627f29634fd00ae0b142aaa442c4f8d947114c27e56945fa4a7b0e492689a4348c25f359aba47c6ec893f73f9493abb38
+EBUILD confuse-1.5.0.ebuild 608 BLAKE2B efb45b6e5c7f865a575c707039c4e72932f73cc0bf964108132e173bda172eaddf1da7c2a453d00e8fa8d8d116a52441df0b516fdd06fabc894e467c76921719 SHA512 eeea394d705dd8eef002f7eee19dad1e022cac25f68eac4db8e511580234ac8610f2a49a922830b14c2e27e7dbef635dbf86bfda4642e4d959893490e6468ec7
+MISC metadata.xml 877 BLAKE2B fc19aee7bb4b5bb51d9063c73fbda83b4a6aeeeafda7339d653905871bea16407c84f6fead2aea3f5d5ce059490c3d13a27947ac14c0f78e172cca5a1d452f9a SHA512 e94222ed274ff914ac95a677d4a31b08aebcf083cfb756a00fafe205fc1d6a28575b328b3ca586b687ec767ac1adf84eeabc987bf6baa1215086e08e54aefd13
diff --git a/dev-python/confuse/confuse-1.5.0.ebuild b/dev-python/confuse/confuse-1.5.0.ebuild
new file mode 100644
index 000000000000..b55f3d873523
--- /dev/null
+++ b/dev-python/confuse/confuse-1.5.0.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} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Confuse is a configuration library for Python that uses YAML"
+HOMEPAGE="https://github.com/beetbox/confuse"
+SRC_URI="https://github.com/beetbox/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs \
+	'dev-python/sphinx_rtd_theme'
diff --git a/dev-python/confuse/metadata.xml b/dev-python/confuse/metadata.xml
index f084faa2ef82..9906d568c276 100644
--- a/dev-python/confuse/metadata.xml
+++ b/dev-python/confuse/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<longdescription lang="en">
 		Confuse is a configuration library for Python that uses YAML. It takes
 		care of defaults, overrides, type checking, command-line integration,
diff --git a/dev-python/contextlib2/Manifest b/dev-python/contextlib2/Manifest
index 9d9d02da8b8f..d225ab7270d3 100644
--- a/dev-python/contextlib2/Manifest
+++ b/dev-python/contextlib2/Manifest
@@ -1,3 +1,5 @@
 DIST contextlib2-0.6.0.post1.tar.gz 29670 BLAKE2B 927cbc674c2cb568e71bd110773bea6f848233928bb910e0db7114812b3359b9395e43c01be1645d44f3202f94c62bc21c4db883a155c64feb636a61865dd7d8 SHA512 bd3b458b365bc1d556476f6368bc523fde07e85afdad74037aa98d7a498008103a789f6b481b606700da92606ee6477fc5a817f1596e93a6e3c548ed0d4a5bf8
+DIST contextlib2-21.6.0.tar.gz 43795 BLAKE2B 52e62cf56bc11c0a0502d1d43ba361bea579af98a1c820afb73a6c2ab87bdf57317541cb7051b5aca05311ee2df24010e6e96c7ef4ee7192ec792cf2937aae68 SHA512 a85cafaaf66c7c6a59a4e9ac757941b1a98c17e5a49e41573dc759fafbbf17928a21f582e8aaa0fdc60636413ec702e198bde19a78ac304237b6da1c3d47b730
 EBUILD contextlib2-0.6.0_p1-r1.ebuild 937 BLAKE2B 0eed41b8c4b22b91e2c6f707b066477beb109c6039f90dc10ce2881388a8123ee3132198ac671c795f6d5b52f30b619feb7ee01805d66b5206cf7023b0461962 SHA512 1e1a30770834be442a67a79e3ac915380cf34fa6875061e5c3d8e4a21a331a0cd8f8ea3e4a8c0e49ec154901b63a31434bd08c503c369b963b80c15f8ff2129a
+EBUILD contextlib2-21.6.0.ebuild 633 BLAKE2B 91573bdba60a3133d982b0d7261a46ea2eb3fb30b7db79aab68c085d3e5531932d31b49785e1c7b9a628d6e9a526ede4dc38f59e06d4d20e3e7c8de815d84b7d SHA512 d1bdeec008af5e386154a2d63d5dd851fdd69ec230d218f8e282233cdff2e4a095fd3d3605c1a18ba376ac85a226479ee39364ca7611fc737c3790b59ab83b97
 MISC metadata.xml 349 BLAKE2B 199f23d7a13fb54ab53398cdd83d16a2db50767df6ac02c09adde49fc93df406e3be3762840a897088f54481317d4f800c472636c66620ad806d8f04285c1192 SHA512 d7f0e31697124f884401636805e03f4de0f8fdbe2885d64f37880a534574a4c60fd4f96ba6b1286aa28995071422e1199d59ae487296a1261708f2054a06c269
diff --git a/dev-python/contextlib2/contextlib2-21.6.0.ebuild b/dev-python/contextlib2/contextlib2-21.6.0.ebuild
new file mode 100644
index 000000000000..e9f8cddd36a0
--- /dev/null
+++ b/dev-python/contextlib2/contextlib2-21.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-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
+
+MY_P="${PN}-${PV/_p/.post}"
+DESCRIPTION="Backports and enhancements for the contextlib module"
+HOMEPAGE="https://pypi.org/project/contextlib2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="PSF-2.4 Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DOCS=( NEWS.rst README.rst )
+
+distutils_enable_tests unittest
diff --git a/dev-python/croniter/Manifest b/dev-python/croniter/Manifest
index 65efb9f9af78..aeae54005245 100644
--- a/dev-python/croniter/Manifest
+++ b/dev-python/croniter/Manifest
@@ -1,5 +1,7 @@
 DIST croniter-1.0.12.tar.gz 38763 BLAKE2B 28bb662b05d893c782807687261b3bdafa0b1412d98dc8ceebcc0d9fff941f58b22a3abf9462c0f601bbe8701460350dad70d1239aa4f28978444698836b87b2 SHA512 ff5e35ddb0a6080ff95155de2ac5942fa1cab827a4cbb6e639553f8646b89063d0292b7fd69bc38fca90429da0272f3efeeefe0cbde0d83b9915ecb078340f08
 DIST croniter-1.0.13.tar.gz 38907 BLAKE2B 436bb766c39ad61343913e354d0838458e56048115ed5d15ef95b0dc0c22b38fb4e7ec3fe6162856d208d45268fd360c8b18698b7c61bb0f70636b79a6a84988 SHA512 721749a268734e06776ab968a1fb01926f416e1a42678ee28dcac9b4655a92b5cb17984a9b9d886f8d963484f1af7382b17e72fd3998e3e1e8101fa5038a4fa1
+DIST croniter-1.0.15.tar.gz 39164 BLAKE2B daf40bcc7c791dd2a65d2cd132c380dff03353ab6d7920adddff2b1b6a87166050be6ed2b7bac5eb2b9543dcab9a4f2f65738506dc35eff0836cc591e486f885 SHA512 5aebc8a60d278acae3cef7eee6ee0ec223e44ae01b69dae601f76cb14f135547557b1417498d71a84e187dd478605efdf15355f8ad0344e459b6b40d41e994af
 EBUILD croniter-1.0.12.ebuild 610 BLAKE2B cf3d4c1f620c95a3393fdf8ed058fbab4ff2945c569d142c880abaeffa51e5bc5ab4a21074aa7e4e5008ba2fa533ba1042a43e9f49c47133deade5d5d859a90c SHA512 a3107a73fc30c5a8426e250b4b4b6a52ba6b5622058ef82687ab9e6a216b171592ad087049664378ce22de19f2790f707a62fdc3c90ba99eef2d0642a9fb3d59
 EBUILD croniter-1.0.13.ebuild 613 BLAKE2B 44950745d0f17ca83fa917f90208a5d9cc9f19e29185ff3fd23f3c38a7f4f5e1928b864993513c04886b8cdd85d6895e43e9d8f1a17662d7961911dbcff641bc SHA512 e72ddbd17f2f33f96ed94eaf6bfa6f10a6bba4ef2dc06d4f078ee9257634ca28a0e2d0d6a7dabd9c658d8712e5f7bd0503b0b42392cee767e534153aec768b39
+EBUILD croniter-1.0.15.ebuild 613 BLAKE2B 44950745d0f17ca83fa917f90208a5d9cc9f19e29185ff3fd23f3c38a7f4f5e1928b864993513c04886b8cdd85d6895e43e9d8f1a17662d7961911dbcff641bc SHA512 e72ddbd17f2f33f96ed94eaf6bfa6f10a6bba4ef2dc06d4f078ee9257634ca28a0e2d0d6a7dabd9c658d8712e5f7bd0503b0b42392cee767e534153aec768b39
 MISC metadata.xml 469 BLAKE2B 94811bf25a8bef886ba5ab75039994f844ba8d8311f993667e73492fff7775ae7846db93fab9b28d90c610f53ca3b8757d683a0e032c4c5693c0c348719529bf SHA512 092ee760431c977b57ba891289c77aba3f54616e7c2b8a48b6232c562c31c2a6e5d240bb7b7411d32080e5da119f47f6bff4d32b56ff10c22a0d4952b027b250
diff --git a/dev-python/croniter/croniter-1.0.15.ebuild b/dev-python/croniter/croniter-1.0.15.ebuild
new file mode 100644
index 000000000000..e9f104d3af45
--- /dev/null
+++ b/dev-python/croniter/croniter-1.0.15.ebuild
@@ -0,0 +1,26 @@
+# 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="Python module to provide iteration for datetime object"
+HOMEPAGE="https://github.com/kiorky/croniter https://pypi.org/project/croniter/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/tzlocal[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dictdiffer/Manifest b/dev-python/dictdiffer/Manifest
index f727720fc91f..45b4556a5d11 100644
--- a/dev-python/dictdiffer/Manifest
+++ b/dev-python/dictdiffer/Manifest
@@ -1,3 +1,3 @@
 DIST dictdiffer-0.8.1.tar.gz 28555 BLAKE2B 0a6d330134c368e11e07b23d7fe592e72b64b02ede99eb2d52c2d7452b4d2505e7e3afa75ba76c30cbbd663d9cc4c073d8f236200fdfa2866c8beadd097d63b7 SHA512 e221bb0e25a35380519bf775a63fc0d692112dab15a46c8878ef2c9a6780932c8550a4486c4eab7803619a79c2f794a590a5c9ae0fbbccac04b5b11feaf38bbb
-EBUILD dictdiffer-0.8.1.ebuild 996 BLAKE2B fbb5e8aae98fd58daba27a3a5e83bc215861b4a4f243225b1722149b12a53d84ee1851d7a9ae973ddcf34dc14c27a2434bfb457b028c0ae9cd03e87acd7911aa SHA512 9eb583c86ce443db7fe354d374f6705451d702e5e30dd913d347e3b910ac2f7d8ce911c66f14c76940ab1732e4be96d93bb4b952335724f5eeccb93238710300
+EBUILD dictdiffer-0.8.1.ebuild 1003 BLAKE2B ea236f1aecf61a18297db715e3b8ea30de231dcd08a33455cacfdd0a78df6b3ee7a2d1e1ed1a02aefd69ebf37a7c427e2278ff1bec986d12f8f414884d7261c3 SHA512 169c63dd866c75f4c88c4730bd41365a935cb28c41523a7cc58f28e726a543d13a4fcdef04a4921dca6d33211b3d9a0489a3f5840f7cafd19985004caf83cc91
 MISC metadata.xml 422 BLAKE2B f926b468982f49d593d7752f56f8cd984dbeb0ddcbbf853612a56ffc63d3a2fda04c2780cb81139eac4801b1a0ae494dcbb9777850757a9e256136660dbe8f69 SHA512 e823a29e9d83a8b011c66085debed2ae9f48ed3208ce7f79e1f51854c9ca7231993e7a426da6273ea82e0c30f1ad6fccb0c9564290026f187fa94dd6e7c7e098
diff --git a/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild b/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
index 2e19cc07eefe..c0771d96705f 100644
--- a/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
+++ b/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~sparc"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/dj-database-url/Manifest b/dev-python/dj-database-url/Manifest
index fbfc8f2fd079..a4d9fd5425cc 100644
--- a/dev-python/dj-database-url/Manifest
+++ b/dev-python/dj-database-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-database-url-0.5.0.gh.tar.gz 6309 BLAKE2B 72647f8651d595b4020161b15364836b8483bf8a12ec72e434bc9d0583878ee9f4e4c76110581f285adddac3e7c2d7bc071f720a7fde91c84c3ea53b6c979300 SHA512 541d5177bff0fcc21372d2d9dc699ba11de1b1cabf10d61fb9f1e844a6dd4d46df5c7fdb6ccb4505cf984e41d7a2ae4e3af5e7d05072b0ed6982499eac5aac66
-EBUILD dj-database-url-0.5.0.ebuild 560 BLAKE2B 29114e02ca82946b9e65b5bde8e7e55ac35c85275c5c9d8a577233e564006feac5d2f3201899ac43da29b6ec6597417f671e0df644fe59de205b73d24b438367 SHA512 52fee255dda8cf8f262e12b6ff00c7aa52637a2fa43f2bf322addb392ade69dc9b7108bc549b54524bfc8b91e82c3d6f266359084ff894351cf124a218cf3c86
+EBUILD dj-database-url-0.5.0.ebuild 567 BLAKE2B 64e1231fbe2a6788fb1dd244f20ef8809f53c92af5be1ce26637871f9e4047cf567143519e20819ca686ee2ccbc78950f9c9adca3a1c4389e63ff5fa33c9a60c SHA512 205d75b9e44e8841974c38db2390e702aa9dcc0e383b394832bf96befd5a70e0c756e4a97f7815b9773601fc95f87c116e587a59a8a174b227cf06e458d5a2c3
 MISC metadata.xml 406 BLAKE2B 9e373049eda15ee3ac87de1a93c2c6ace80868cd42166bb9d8a895b0d558e84160de131c2e9db969dbfcaf0f8400176919800cb5b0b07202533022d707af1f0c SHA512 0003de2818ac2fb9acdbe55fb3c40d46f1a32fab1e9b4e03c7b9426a7f841d31abb323bb863282ff1b10503d751cb31c67d4ffb693bc56b8f262edbfc382777b
diff --git a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
index 70b6e3e3cfc9..3711e5754ad5 100644
--- a/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
+++ b/dev-python/dj-database-url/dj-database-url-0.5.0.ebuild
@@ -17,6 +17,6 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests unittest
diff --git a/dev-python/dj-email-url/Manifest b/dev-python/dj-email-url/Manifest
index 0640f35a2c9f..ea26e6610481 100644
--- a/dev-python/dj-email-url/Manifest
+++ b/dev-python/dj-email-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-email-url-1.0.2.tar.gz 7213 BLAKE2B b538fe96a1bcf0ab2fddb4f09f6bfafefd07a9a8d61fbdeaa3be3e21bd90d87488c852200a100c544023ee0a8b57dcc8d75cf6aeaad6489da106e911ce8e683e SHA512 446c2e9847f135981f32bb2116d8abd3fbb80765dd1301821992a97acbbbae8d74d1109fbf7bdc3ee469b9d40c4ac08f39befee36a06926a1d049291a5c0c837
-EBUILD dj-email-url-1.0.2.ebuild 617 BLAKE2B 40befe102f929f39ec42e0c04a42b1e4b33608601519fd735e93efaf0500c39bc5df584b09a99e992df18875d5e45e1a5c33907657833e9b04e417b8806fb3b8 SHA512 21d0dfa737175a1448d40c8a1558e7c6eccb0d789672a0753f33be073737e0b7587a05152c1559263d76de36a70942d38272d8e4befce15215c94fbd8e2a8de2
+EBUILD dj-email-url-1.0.2.ebuild 624 BLAKE2B fa333a4aeb92456b13bbdfe78addc904081363c3a6075bc979d525e9c51067a8955e2e2ffd2a055b298c1ba1513e0e280eb7daba3073dd94673c2c076fb28b7a SHA512 f639fdb4ddd351d0722683136f374d2a92ecc8a7d72360c77076312ac69848d98c272d2ae96095b177832e0a43e02536d89076df921e9fd3888290ba45bd3766
 MISC metadata.xml 407 BLAKE2B 724ee962580eb5c4ff6b2b8d82d7cc50a6d6778b73a06f1cad1f7dd2f64289de5b72dc9713aae488dcf23c57ee575d5080765f2d8bfe41b9f845fa81919eb628 SHA512 fe1d3809c17706d0801daf8c073ed5f70eb56c525a9ea978d1b449720a2cdf43086adbc61c4585123d6712b40242dd145513d9fab15e35889b1b4caa62ea9c33
diff --git a/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild b/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
index 09351696320a..a3cc58516c25 100644
--- a/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
+++ b/dev-python/dj-email-url/dj-email-url-1.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/migonzalvar/dj-email-url/archive/refs/tags/v${PV}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DOCS=( CHANGELOG.rst README.rst )
 
diff --git a/dev-python/dj-search-url/Manifest b/dev-python/dj-search-url/Manifest
index 6809f9eca2d9..341854185c58 100644
--- a/dev-python/dj-search-url/Manifest
+++ b/dev-python/dj-search-url/Manifest
@@ -1,3 +1,3 @@
 DIST dj-search-url-0.1.tar.gz 2815 BLAKE2B 75abd5bcd0d4b39a40c2c1a28eb02e903a40198f111364774af53375c21424ce170dc4d5f2fe7b51e884849d7700efeb3c99d534272002f60397099ea27da898 SHA512 9b233a8dc1ec8d6a81154ddbf6966beeb8fe4b62c1c7faf5e623409403dc2d64db1749552878b2a1edab1d3264820840bf14e7fcc2e54fafe5ca4d68a207fa5d
-EBUILD dj-search-url-0.1.ebuild 457 BLAKE2B 0b5f98c72675e9d48a1eea482c2bb62d0cd301c52011091c7aa9225ee2243f588dca1d3f008a11615ffcc8b21b2970a5c0bb35f4db9a3ff65935b912001a704a SHA512 81c50b11f4cb161aa95135f96f5435527eff418c75f35946b2e961e92170e70471022363cb9c63d7f4d75841d2b0689432872db01cef88ada6b83a7b784b4e44
+EBUILD dj-search-url-0.1.ebuild 464 BLAKE2B 1736b13890bee21d112be99a91552c40f104874adb63c99b62dc59a5a0c85fbd4ee9c5648789d08e8cedb383382b7cbfc676e1e4cf6e0b8679ab8b79c53f1f43 SHA512 2201e9cff8ecfafee0f2708c38dc442ae1a977720cf8b57992f2e18556bf98bad86a249a29b990bbe413871cd5a17990fe067f02e86432e81d483584536eedec
 MISC metadata.xml 355 BLAKE2B 31e54d6f53ffffda0e1b261309311c03e4e3ab8e500c06bef6fb8629800fd32f779b4c6c1e69b868e557b47fd4b697db86bac49fc42b173a77d0b4765a8f997b SHA512 be285d36a522b446fa95c6ef5a976566922a9e2f0c9fd71b2ebaf2e0b8a4ff91c148e749e698f36fe618c57267cb01f2e5a56b950cf4a99cb9ee23b1b8807045
diff --git a/dev-python/dj-search-url/dj-search-url-0.1.ebuild b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
index 217ae91b7bb8..18576d01aa52 100644
--- a/dev-python/dj-search-url/dj-search-url-0.1.ebuild
+++ b/dev-python/dj-search-url/dj-search-url-0.1.ebuild
@@ -14,4 +14,4 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/dev-python/django-cache-url/Manifest b/dev-python/django-cache-url/Manifest
index 70898b99c03b..b99f1d3a9d0e 100644
--- a/dev-python/django-cache-url/Manifest
+++ b/dev-python/django-cache-url/Manifest
@@ -1,3 +1,3 @@
 DIST django-cache-url-3.2.3.tar.gz 8198 BLAKE2B 19c91cdb519fea9c80e4d5e89ec9d340fb9193ec3891f6fbb42ba07cac26aba2bc69c00c65797f0f70c1a4590ff7be2037eebf3bf4589270e68afe289f74945c SHA512 d5b3653de755a668c33d28d66d38d938fef84d3acbfd726463c85a45c49a4d13bf880723226be2946ef7ea784e10623e164e448263893f779effc3eaf75c959f
-EBUILD django-cache-url-3.2.3.ebuild 724 BLAKE2B 6d14067dbf728a7e4fd3134bf7948cce156e603b49f12a47a28dc02c33c2cca4e42a7331615632816cd0f0b18e599128142ccff96346d596725aead832ebb67d SHA512 60959169a7d4f0a2c9921afb551d0d348f2089e04262779a81ad9a5fab055871cbf3a851b13719884c883af4b677e203ef5003ef7e7708e0d0ad8e456942cc47
+EBUILD django-cache-url-3.2.3.ebuild 731 BLAKE2B 9ccc87c05eed78b8968ba9baa036a7ce8e9d6c3b27a2d6e4c2fb4321ba9f1dd882ba6f624ad078b6c20fa5c54d7fa489f04602ffca2b46d92752b27f48ee6eb1 SHA512 cc181f0f6d4d2bbff65d90feab4a66d156e9706bb94883fe09b9e724cf48d3e1f3bbfd26fb3f84fddc90da6be65f18c51f09ff540b9f4f0138be2da49b647d6f
 MISC metadata.xml 413 BLAKE2B 7a014841105ea407191ef0fad8df2365a13101fcccf9324a3dfa3a55f67be9d5f9c3c33b766660cb1cfef9d14358634e304da3e62eb97b02652ff331b4643dba SHA512 89fe4d187320cc50d60a1d4821fd88d57e42efc6ffe4ccdbeb6b62c1d2d6e3b642997b1bf7bed054f0ec1fab0e774af7c2ca422a87dbf37b3d210d03073beea6
diff --git a/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild b/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
index 1909cfc9a087..72fca067574e 100644
--- a/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
+++ b/dev-python/django-cache-url/django-cache-url-3.2.3.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 DOCS=( AUTHORS.rst CHANGELOG.rst README.rst )
 
diff --git a/dev-python/django-configurations/Manifest b/dev-python/django-configurations/Manifest
index e1d8b3cde0f3..ddb612ff3291 100644
--- a/dev-python/django-configurations/Manifest
+++ b/dev-python/django-configurations/Manifest
@@ -1,3 +1,3 @@
 DIST django-configurations-2.2.gh.tar.gz 41909 BLAKE2B 4107e37a694d4c9670f855886d870c7aea30e9b95788a6c09f6fb3c913d3ffc4d17ed250264ce9ff0408856787b4768cda67eecf26c135ccb338ffda7530fd41 SHA512 9c53811016c20ae4dedbb9e1951b45440b656fad2fb9544e94bbbabb65a5883846ee063647f107ac57c08e54db71206b89903ee1d02cbfc0c8d3dafe7520e5a2
-EBUILD django-configurations-2.2.ebuild 1444 BLAKE2B 482266473b056da21d6b80f40dacd5857b9e517abe1123a9df9836a4ba2d18b97f19bb2ef6f96c3c602b987d3fab995f9c1c3b02192e1bbcafcbd99db2a96b21 SHA512 260a8cf9fa98be3a1b4d580449261c8a0b7779852edd124fd9451a8bcf5824bd6176757d5a6b2cb7d9b76e11e7f3ab581fa609b690d6bbde2b7f7d9432f6b8f1
+EBUILD django-configurations-2.2.ebuild 1451 BLAKE2B 08a4891cf646ac5c9c2afd1965ed4915ad88ab9141eb9c73888727edab3aa90040482708a493327e8a38cda54223f19447ad13ebf9e8994fc9fdf5ac027ff644 SHA512 a33ae01bc2cf8b12693f5424438848c7b9550c43ae3cbf027fcb619e9fe7035f97dead12e16162a3815973a675ee4580d3acabc8bbe337e74391fb2eca03b640
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/django-configurations/django-configurations-2.2.ebuild b/dev-python/django-configurations/django-configurations-2.2.ebuild
index 4dd4211e9136..603cc16737b4 100644
--- a/dev-python/django-configurations/django-configurations-2.2.ebuild
+++ b/dev-python/django-configurations/django-configurations-2.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/editdistance-s/Manifest b/dev-python/editdistance-s/Manifest
index b20415508b58..d92901d40b62 100644
--- a/dev-python/editdistance-s/Manifest
+++ b/dev-python/editdistance-s/Manifest
@@ -1,3 +1,3 @@
 DIST editdistance-s-1.0.0.tar.gz 5408 BLAKE2B 5420dff814de4d61f7c36c88113c568562a174205d8a4ff2b52b60e797f7459d95fd2a909b70911cfd7d0d67096a3844888bb88866980a2c43f8967a96ef4c55 SHA512 148234a38f54f70a2d6bc64f6a166a8954c79fb89d5f5c0bf3f041fe60056332901484a0626e218a72ae992f476305cbb662dfa0acdda794727fc682c569d718
-EBUILD editdistance-s-1.0.0.ebuild 527 BLAKE2B 372ec88d60e8efd89a13ddd3f9a59f756bddfe66a43f60ad25b31d8f123c437dacf8114a18fccc3b2a3c8ac64eec04ed6c6fdbdd48567b3f2e4eb3f65e0e4ff7 SHA512 b5b267f1dce17446ea8f2bb26cce76ea76580fdd93a32f7fdf28327bed51161656c6d3d0963b626cc448842c9e4e19207938eb15951e1c151b832bd5a1481467
+EBUILD editdistance-s-1.0.0.ebuild 534 BLAKE2B 93d8dfa56d0d23eadc4b62a3a31f37ee864e2d8c840ad1809767f735d1e7e6ec8a5e59518405f46a4064c0f45796c59726209c582be1c858c32a47f53ee262ce SHA512 daac7ad3c73809f0effd66d530355c3e86ecc109b75faa9abf961f4f56cbc9cc51a87934962c92879a4ca18488190af9ee97d8824561ff4c0fb3c25884c6dea9
 MISC metadata.xml 769 BLAKE2B 385d6e712da66dfd89e385bc712157b3861c0238d2fd807755d636feb4625782e76e1f5272c4efe758cf0de14fa5bd63d519ddd04ff9c4fb4528566c5620f419 SHA512 df3869e4c09d072ab860470f74958a25a446e0c71c7529f13e85b3f82f8c18245aa1dd7e4594e1add53675f3b87da9726260a367c6c9cee17ea758b0bfe99b99
diff --git a/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild b/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
index 9684cdd1f1d3..005f719417eb 100644
--- a/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
+++ b/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~hppa"
+KEYWORDS="amd64 ~hppa ~riscv"
 
 RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/emcee/Manifest b/dev-python/emcee/Manifest
index 5a1ba0a743c8..8dbc2a868f68 100644
--- a/dev-python/emcee/Manifest
+++ b/dev-python/emcee/Manifest
@@ -1,3 +1,5 @@
 DIST emcee-3.0.2.tar.gz 4054969 BLAKE2B 16b9ebd34b450f8fb92dc50f0652a34f06d20a027ff1cacd73474f4c74ecce7102d5eea54182598fc17175897980131742c0d60ef217b0dc8285c18406ef4d7f SHA512 517c447b9426eb97b72b6e3b21d77720b58a42fc1efe9495cf7ad8a0682841b8d7178a6f070641f68a09aef507e854ceefab9a54afe6baaca8b41f16f34dce9e
+DIST emcee-3.1.0.tar.gz 2868282 BLAKE2B 333bb3dfb1b88bd768dc824763827d7b5f7f6dbef83c98a3934789a52d2989fc09474f628a609b3c0b930f3582bd75240895a4f0fe6e2cab486bc5cdc6947c56 SHA512 45f4ee3a9f6e7f8b4e3cf6eef187facbc1c93dece10a6b0c9c2d55da093f26e159c254818aada3abb1c45985950cd83f286b7f3e5acc467ebd2f292df9f1202b
 EBUILD emcee-3.0.2.ebuild 647 BLAKE2B 09dcb337e04ae0dc70ebd284c41eace4fbc5527ec9ebe64c285f3c14a378f0544f347cc3bb26185fdaeafa94de141b34579a73c040914dd9db62787778156f6c SHA512 d72959fcfa29f2ab984e088242cf31ce3c9d8f3f4215a4f686046b51990da104ce8ec55655c26468c3fa0d6e78b2ccd1777b07ff1263d5c6f701228b0a58b526
+EBUILD emcee-3.1.0.ebuild 795 BLAKE2B 7140d6499017f17cb304072c97192314d839f28f7ed9ac0c3a90dd3fbf3beb1954a52641553b883c46f3778c863403b57538e52729d6e2af3855161c5ea545c7 SHA512 a9ca8ed4df5f17c292bcf1f94d847dfb4f2a3380cb62528911c0056bc5dcbc7cf66be8bb8ed1ee2e5263a647d2e654ac8e073b91226d81f0002ca35d667214c2
 MISC metadata.xml 865 BLAKE2B 5d1067b3f5aa4969bf5e50ca73aceacdf45795f0e28562b8800d1b0c84d1d0df36d50f788392b3c508aae9c7eb3bc80d8115ea2becdca370f046f543d6f66112 SHA512 e3a8df62f73e85de2462f6f631706f2940cf7903017065e9b1c1e639e409bc7e99d2213ccbeba7da20f8ef15dd04ccb17be6664d2dd10b285f53b204f97e2102
diff --git a/dev-python/emcee/emcee-3.1.0.ebuild b/dev-python/emcee/emcee-3.1.0.ebuild
new file mode 100644
index 000000000000..4939478f08ba
--- /dev/null
+++ b/dev-python/emcee/emcee-3.1.0.ebuild
@@ -0,0 +1,38 @@
+# 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="Python ensemble sampling toolkit for affine-invariant MCMC"
+HOMEPAGE="https://emcee.readthedocs.io/en/stable/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=( AUTHORS.rst README.rst )
+
+src_prepare() {
+	# unnecessary dep
+	sed -i -e '/wheel/d' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/entrypoints/Manifest b/dev-python/entrypoints/Manifest
index 0a099631da46..73c17e5c7fc6 100644
--- a/dev-python/entrypoints/Manifest
+++ b/dev-python/entrypoints/Manifest
@@ -1,4 +1,4 @@
 AUX entrypoints-0.2.1-init.py.patch 243 BLAKE2B 79706eacd51f9eb2b9bb319befc01c44894e2fa0c394585d2ad578b07e64fa4a6fce5e7c8f1c50752b1fa63e05776186759bc1ce426559405fd0a0e6c8b14aa3 SHA512 f25cb047aa8743dd9145c8e5913c53b5faa6a2b0ed3a50a957d69739bef43b3a6612ec38754bb088c2f9a8e116df61e00962fd1a78c45e5c107cbdd40a9569d0
 DIST entrypoints-0.3.tar.gz 12315 BLAKE2B f548d98eeb9dcf5760b26f66e5dec0849c9a9027cd68447c07a585e7b80f79a7c66712d0dd270b6960db167d26f9cf0c9c221edd21f2692c2221d36e952ede65 SHA512 aa1274362d3a4b00266103319ca51aa266605b4999c89a9d0673eb61bfae9e646cb0ec6b86c95544493f6fe048385a2c7641d64adca8f45815546fb1e663c858
-EBUILD entrypoints-0.3-r2.ebuild 746 BLAKE2B b2c7b80b11d880366ac59bdb4bc003f488b61f760a7aadf1e92dad974fbbca912f2959167e3b40b9bf6cfb15c0dc9a8a5f2e9a3b571c721221dcb1875f1de3f7 SHA512 0474f684823a206ad453c601cf4ddc931083edc91941b78367a6428b834d518e78c76bff33d126c2614f75cbeb0f5271e589a29ccff39155300be2981160c233
+EBUILD entrypoints-0.3-r2.ebuild 753 BLAKE2B 77d2709bf6d4a7d212532dbfedbfd98e99f6a2fa1658a806d07a1d0cb387a4d488c9481432983e6899c7945a650b6311a8afab3149f25bc2287f3bf86ff7d2b8 SHA512 f11a72adfa81a42000ab62e8f0e76e1a73136d7f748da56bda05410b56591cfce939c54efd93b091fbcec0db2bc230c1ffb168a0ca1082df7b81ee048241ff2d
 MISC metadata.xml 780 BLAKE2B 13f639cdea65735e24577eb5b327a9ebe00909457ccbe181817a02c973a83a6e037c48d09b885bd5da38b4d0c29ce96cbe4aa334f9ed8c0253c392e133639a87 SHA512 5c09061fbdfe9e7fd844175ed774fdf176dc681c5f4e6432ca10d8730d36e0aab3df07cbb58da02050c64ba875fe8e069221b94283e81d5b50d830a63c9f2e92
diff --git a/dev-python/entrypoints/entrypoints-0.3-r2.ebuild b/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
index 2410523b9886..25d0299fbb21 100644
--- a/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
+++ b/dev-python/entrypoints/entrypoints-0.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/fuzzywuzzy/Manifest b/dev-python/fuzzywuzzy/Manifest
index 997ff427c5d2..506254b51b08 100644
--- a/dev-python/fuzzywuzzy/Manifest
+++ b/dev-python/fuzzywuzzy/Manifest
@@ -1,3 +1,3 @@
 DIST fuzzywuzzy-0.18.0.tar.gz 28888 BLAKE2B be2729660eb20a33a14acd1c5fbcefa48bd8a6a3dcfa6dd5137b0414fb283d279990f61250dbb2526e8faa80da23eb6de36618ae0d98166d29655b8a71cd15a1 SHA512 4a21ea67278fa525842d48fed8db666d00eae6d13254e8844d11f63b47c3a305b3cac760f28c24c6347aebcf73e96180e0a7cfba29c75f01ece2f7751e0398c5
-EBUILD fuzzywuzzy-0.18.0.ebuild 637 BLAKE2B 6324bfea4d640ea9933a92f8b9b2bfb07b7de111787d8b2a4db8051b8c3f8bea7e30c8a34008732e1b1b23c9d07d43c6960beedc085bf153de0cd5b1b23a402a SHA512 c74d9ef6825548dba1a463d5ddeb4dd596a29bcbf14779b858b1a379883689a21a7817c20139d70d7c04930114d312ee338ef2a0abc75b13a2f72b8f79c347a6
+EBUILD fuzzywuzzy-0.18.0.ebuild 644 BLAKE2B f43bdf1d2b46bbf8cd951f93e4129404407fc4b5f36b42057b166241f2f8161b7b09141867b4b764bd5d9aab4d5e64327faecec5490170e38f336d62b72fa61f SHA512 6821e01c298d3165007587e61696794a833097f34249ec40d7416066df5a0cf95f022df30973197ceda76b93044864af7060b9802f3eb403f7e723e07e74e717
 MISC metadata.xml 396 BLAKE2B 9d393923d1967fdc5ed931d8a0767c3b9fede9d39371349e1a6a6e1119d6fe5118ab2191bb264ecb119d28cc2f2f07816b5cfde02da1dbda0b0226a838913a9b SHA512 66404a0ba9996258fac47a0e31d6d4d8bab13ee48bf90adbbc6bb5c268ff7d4a504b6e6840bc5d9217614c6d8966c931e268af20f32689d4f233c67c6c576442
diff --git a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
index cfbb700aba0a..12c9b983d11d 100644
--- a/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
+++ b/dev-python/fuzzywuzzy/fuzzywuzzy-0.18.0.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Fuzzy string matching in python"
 HOMEPAGE="https://github.com/seatgeek/fuzzywuzzy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~sparc ~x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="test"
diff --git a/dev-python/gast/Manifest b/dev-python/gast/Manifest
index ae5aacce1e19..745e42f2b84f 100644
--- a/dev-python/gast/Manifest
+++ b/dev-python/gast/Manifest
@@ -1,5 +1,7 @@
 DIST gast-0.3.3.tar.gz 13760 BLAKE2B 0298ea81d3d133f8305fc6a7cf020213a75c2dbcb09c9648e533b8c2c58cf3e3f363448f905c8295bd34db0023be6dea00de0d901bffb1d55650773f7acc0135 SHA512 36869a5e0976223a5a82be8bf25a01654896f4de70affe0fec5252104ea6d1fea3eb8c5153530fcac8addc47b51535b02e3920a0e82aad11ba1ca8350cd11341
 DIST gast-0.4.0.tar.gz 13804 BLAKE2B 9f614dbf5e7f635f2179481d933f9da53224e1d623548c14a0df4302e47d7c08237e46d13e73e62402bfd060ba002179c0592094f5c47612051973cafd0f3d2e SHA512 d132884c51f7172db9b807095619b2cf3ef92acea18aa1de65f6a338b381b7d3fb3f79ff0c1f9ef9388ef885700b7e58309bd95ccebce46bd3173cc484c9c4f5
+DIST gast-0.5.0.tar.gz 14933 BLAKE2B 5d70d832d69185227e574a4bf88752e1dff43ef0e3e78a1de8ac7ab96218530d37a6dd0a3e6e4bf1fe8e11afe98b8d87722bfc2d6c8b68d8ac4905f335c2b85a SHA512 31c204587b3abcde61ce7343bef8439fab7e36c46de17eb2e02138e3d709f8f70e24c2c5d045044ef06e42119a50566c881d293c1c815743655354e72304701d
 EBUILD gast-0.3.3-r1.ebuild 425 BLAKE2B b5bd50096c839ccd16d7422ee793eaf642b04b8904fd739fcbd75f102fc7420f9409044bb08316c1bb71bc3ef5360e76ec836dfab9c61f5f33961a4daa680721 SHA512 eac215e1527ba1d8028f17101da808d41084bf8883c72a53a54b60f72319e83815d88f9d1640ac99cf8ca6b20a85f83e2ca5d373dab12ab5814b2fc2d9509e86
 EBUILD gast-0.4.0.ebuild 495 BLAKE2B 5aec96c67a75f47c4035eb9507bc954a71eca2200f5e359bd6e503dc4f52c8269118087475de736a89a8f422652708219adfcc3b484c9f6fe44c0fb384b5e37a SHA512 894ef43d290b613c58868ab3a3eec36357154f5bc38380d8c007c2a22cb67873c742d83fe794b8ded58a6f7b9a9f587e111d6ab66bc86778c1275b2f064710ae
+EBUILD gast-0.5.0.ebuild 496 BLAKE2B fcca9acd62ce1a452e95747793b48e9fc6e865020bf8a6dfbf43ca1583ee061b7e1700cf1ec9cb2ac965d74348d28fe95330235608cf91451261a8b8d260ec14 SHA512 c8e208f3b930305a07b0cd7a55f38bb3e60a21b7bf47358e3895bed93489305122982091eb1c75d125a619e9c63374b340d1cab15841b3bca0af9bed5838b476
 MISC metadata.xml 652 BLAKE2B 487de5ab8f3b93f2a1546f307429cf547162f59ac6f8d35da73b9a116517c53e3c365717746f4f0369a44a4863bb2e423119b775ef3c18e4ba61aa79966c099e SHA512 e9b2688651207c7a7384e099b2ddb7d083fb5419681446ed56a6cbe18ec302a689e71dd7e795f934b0cddab96a0d46b2f1c0aefe90132c22fa2ec4700ef1945a
diff --git a/dev-python/gast/gast-0.5.0.ebuild b/dev-python/gast/gast-0.5.0.ebuild
new file mode 100644
index 000000000000..f25219967d31
--- /dev/null
+++ b/dev-python/gast/gast-0.5.0.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} )
+inherit distutils-r1
+
+DESCRIPTION="A generic AST to represent Python2 and Python3's Abstract Syntax Tree (AST)"
+HOMEPAGE="https://pypi.org/project/gast/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/astunparse[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests unittest
diff --git a/dev-python/grpcio/Manifest b/dev-python/grpcio/Manifest
index 58b487ba2573..056b1383018f 100644
--- a/dev-python/grpcio/Manifest
+++ b/dev-python/grpcio/Manifest
@@ -3,5 +3,5 @@ AUX 1.37.1-cxx-no-gnu99.patch 1366 BLAKE2B f8dc0d4cbcf5868d74c168dc1103a4b89d3a3
 DIST grpcio-1.37.1.tar.gz 21678919 BLAKE2B ea1c9a1ce1d888d0e9aca27a9e12ebcaca5c79b6f70a282e4e9a12a4aba982c2cef3f755cc2e789de2302071ce3abf12c91f329febd04159b3c8abded96818d5 SHA512 e7697a6d0da40b7d63be7f4f31223d2314bf16fcab8887a41bc4750c844a58ad55fd27fca0a9f1016fc725076a16c3b2db5a9eb040a86a2acb9f45083835d90e
 DIST grpcio-1.38.1.tar.gz 21392075 BLAKE2B 92f1ad9e119fe346bc1f8f10ffe7067fb736c975ecd276eb8ab37a3b25d0a818fff76cec164db5745ac157ba7b94b841c6e66bb332d9f3b2c08974cab415a973 SHA512 c4f831ee654eec78f01c099fa5a6d9dc7e9551b1db5e5c89e3b8bd4e5c3bae622aee32cac9212bb60bc1baec98e4a49f8e18c0043bc90d1144729dee337072f9
 EBUILD grpcio-1.37.1-r1.ebuild 1298 BLAKE2B ef7cf673b021ded68d29c46f506d76cee781bd62ff03aabb8dbd03488c810032ea1369418bbd2800439642eebd2e327e5a7cf2153631aaef64497ca4a7bce4ac SHA512 28bddf5c20d4902166dc68c944f26699cfb85045bc3a7ee700486d2c1d6b55543d0383ee48ce188232529b3364048bafcee65f49ce313de767e2b496839ebafb
-EBUILD grpcio-1.38.1.ebuild 1258 BLAKE2B 3af6763da350a7ed0c4739c12bc7cd092dab65303b0d6aa55b64d8c3bc3b209c80e8bb2b202d486081dde610a1ef63e8a8b3fbb1ed80f6af0b22587b7bc34fb8 SHA512 b1d112b7f3022fff157c71bb5ec3f7a0f81dab7f63bc1b7911c69e27c40970ae259b6351108761df05fa76cd33a27890656456506fc0e707d7626bf6a14c5f55
+EBUILD grpcio-1.38.1.ebuild 1265 BLAKE2B a0ddb704569bc2b7e7f1552eb2c5cadc00d86f342048c1edc7da2c103b9204403487fec4f7aadaebfb6d9cbfa524e29e1592ca7cacc72e327c29d6bb8cc0a65f SHA512 c1631b0479ab9b451f053f676e9c51e832d81611861bc3ea942901f5b8b53dad67453e4084c5481d688762cbae3178eac85593e04fa41bc41546750d7e4ea88f
 MISC metadata.xml 369 BLAKE2B ecee9ae9625e7571842df207d1798107ea3dc8a16b8b3fba8a2fd861d6201061d325b7b0045a4b02c80dff1ddfff28dbe1f9315f73fc6ebb8c8626e5ba2e0c3c SHA512 b8e9539af700e83d3b7311dd26ccb10eec608c2360b0cdfdbc5d55a75fc40299f6cc2b18ad67fdec1df0e42b5cf8d740f3d52b81d54cce5697d5dd06cfa75e75
diff --git a/dev-python/grpcio/grpcio-1.38.1.ebuild b/dev-python/grpcio/grpcio-1.38.1.ebuild
index d32f26672e4d..9260d4de4f68 100644
--- a/dev-python/grpcio/grpcio-1.38.1.ebuild
+++ b/dev-python/grpcio/grpcio-1.38.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
 
 RDEPEND="
 	>=dev-libs/openssl-1.0.2:0=[-bindist(-)]
diff --git a/dev-python/hiredis/Manifest b/dev-python/hiredis/Manifest
index 6b673b883512..a37c5406915f 100644
--- a/dev-python/hiredis/Manifest
+++ b/dev-python/hiredis/Manifest
@@ -1,5 +1,8 @@
 AUX hiredis-1.0.1-api-0.14.patch 1332 BLAKE2B 08d5c2f1e85db8f0eb81e620c08f150c613f34f3e0e96716891dc60100dfbe5f3c74ad3bdd312db909951ceddc44f5516a14fb9719c7e8be7c676c93b5981db6 SHA512 3c32c157a9f86498c42bfad043577d981d611a6396408932595d7f58eef2737e7d9f3879c714e358c2233fdebd36958919875f8ff5da90775b4205625de0adb8
 AUX hiredis-1.0.1-system-libs.patch 519 BLAKE2B 8ba885963970dfa0a32b38f4b03e26b2a295a480a7d2033082317ec3b2d598f02acce32c95a784b439d938402a41716d6885e9450dd642b7240af5c6625cced3 SHA512 fb646b968cc14d06de0ec2cbebd6ad1418e1bc0d7c03b529d5c1febe3db9f09933b23e9cf1aa80c6c382923d4b96ce0100709337eb375cbe08508ebbb842059c
+AUX hiredis-2.0.0-system-libs.patch 390 BLAKE2B bf64bb9ad6ca84c5cdabe505dfed0417e71d9585cd60c0fa2bd9627b2cb90f8502f5224d5854a14213a5b4a9e01814e23d2295dba0acc122102181fab955297c SHA512 04521b844c346f86a44608bca76f706ec5f70a35c6ce2678fd7c4b958e6053d56aac0fca0d301ec8bed6aaa369c883370ffb946930d46d0fc8c0f7f9e52f7bed
 DIST hiredis-1.1.0.tar.gz 54620 BLAKE2B 9991745d277e87efe836c1c8eabb2016ce401e2be52c7e1b3a154350776fae6fd3c49e3096da57231e42c57bf36ba692ce26bc993d0923b5246376d8694ad058 SHA512 ad37868376de91303c15ffe6109dc7fadb4f458efdd44b7ddc0a410937a389b8e062ab7d36b1aec3fe324ecafe6b1e5e6b92f547cbf619251dad22a28e02ee9c
+DIST hiredis-2.0.0.tar.gz 75807 BLAKE2B dc7535f117c8ecfb2c924fe44a1cba2f02271c544588249de6794ce3aec27f66038ecb9f6364ca87b71f66ba13870a3be192eb79c1f360d2eb6dcb6dcae41caa SHA512 b9a313acdd00676dc046713a81bbf4336959f49f09bd2828997c23ca41259935047c657a4b6f81913715141a75fb6bbe7fc4429c7a5b0f4bc3d5de66b9cfa909
 EBUILD hiredis-1.1.0.ebuild 711 BLAKE2B ea29b6b1b3715ad14044459e8afe8876716748b8ebcf38f6ec9d9d16ab6d08108efd5bf4f498101618354707f5afc65957ce38a02e491296d0fde4c2b5897a24 SHA512 414f9b7b60adc607f5fcf4ed4d4898a3513fcf0dcbc99bbad842e26b473b07bfd55cae75b1d737f4227e9911035608d205cabe68a69cdd3fa47d31065ba0e047
+EBUILD hiredis-2.0.0.ebuild 664 BLAKE2B 33feff366f8c7832224a086fa3a741ddf695eae454e4e117134161e61e978323eaa3bcc58199ed43a89d33dfc773d6ea0dd936ffc55fc359fcf0bcfa5d76efec SHA512 60beb20d611ef4f2564284a4eeb77fafa961f42e6aebe882580527f3bbdea1decdc1990cc6544bd8d8524da9e0894c3079f80a6e0ef8986e2c1eb22496341bca
 MISC metadata.xml 578 BLAKE2B 39cbb3058e829134e69701f8acf4c89995d6ef1553b911b956a38ce2432267b78a7db070713d230dc2895c5df0c8e8295278caa442642fe64378a5cfdf444ac4 SHA512 da2ecff30312f5eed7611b107bf678af6d1fa45d5d87f75474d70412d7a17db4a37dae578a3047c45758e22a8041c123fa349c5f23580fdc98439300335636a7
diff --git a/dev-python/hiredis/files/hiredis-2.0.0-system-libs.patch b/dev-python/hiredis/files/hiredis-2.0.0-system-libs.patch
new file mode 100644
index 000000000000..74f14cdc00b4
--- /dev/null
+++ b/dev-python/hiredis/files/hiredis-2.0.0-system-libs.patch
@@ -0,0 +1,14 @@
+--- hiredis-2.0.0/setup.py
++++ hiredis-2.0.0/setup.py
+@@ -11,9 +11,8 @@
+   return module.__version__
+ 
+ ext = Extension("hiredis.hiredis",
+-  sources=sorted(glob.glob("src/*.c") +
+-                 ["vendor/hiredis/%s.c" % src for src in ("alloc", "read", "sds")]),
+-  include_dirs=["vendor"])
++  sources=sorted(glob.glob("src/*.c")),
++  libraries=["hiredis"])
+ 
+ setup(
+   name="hiredis",
diff --git a/dev-python/hiredis/hiredis-2.0.0.ebuild b/dev-python/hiredis/hiredis-2.0.0.ebuild
new file mode 100644
index 000000000000..c2881e5aae37
--- /dev/null
+++ b/dev-python/hiredis/hiredis-2.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python extension that wraps hiredis"
+HOMEPAGE="https://github.com/redis/hiredis-py/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="system-libs"
+
+DEPEND="system-libs? ( dev-libs/hiredis:0/1.0.0 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use system-libs && PATCHES+=(
+		"${FILESDIR}"/${P}-system-libs.patch
+	)
+	default
+}
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" -m unittest reader.ReaderTest || die "tests failed"
+}
diff --git a/dev-python/identify/Manifest b/dev-python/identify/Manifest
index d1621a33da14..14b48540ee8f 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,13 +1,5 @@
 DIST identify-2.2.10.tar.gz 101073 BLAKE2B 7049424855d23727180a4af137ebd7cbf88d6ca0187901bbe43abfcb820c1db17af8ff89345612909fc869f9ee8503d84e3d1218548535abb6f499eade284def SHA512 a6f9dfc3d969a30f50922cb9ad285d76c39774706b8c0d868bcbf96564a49841e54b6021e4fced56f17cebd25fadc69dd93714d475e4f517a05677bdabada4dc
 DIST identify-2.2.4.tar.gz 100967 BLAKE2B 9473a157ce2aed13ed45d6e8d83b4510c40ae977406b9d7b211caa70c27d1850cf49da8848495841281b1f192b576d269a5372215effd7d89c9211e51d51151d SHA512 25e255fd62d0e75aafa7037085362b7bf2ba8ae142bfb11e0e20452d503d8ec3f90ec84c8ef8966fb021fe1054c226862b3ce99d2288ec9aaa758a8971d1c87a
-DIST identify-2.2.6.tar.gz 101016 BLAKE2B eac32751d54379e3ba5ca5970c3fc02b6ac9f677a26f7a2c91986ba6ce8773a8e51ed98f17b6b12ba920cabd3d66ca23cd765d2cb6c48253ff97c34ddb9cb81e SHA512 09694ea3d92265385a79464ef948effb5b074f5b67a8a25171b4872b2cd70537a17c87c2aa94b66e3079f2047b290300beb7ed74be50ecdf09cb723948bc11d9
-DIST identify-2.2.7.tar.gz 101032 BLAKE2B 988aecb3f32b1d1416984ad7cb5937f85600e222a1053d2800dda1c498fea2660f86ee42208611c71e29b9827e212992fed35697a3d24f02814cc6ea8a560615 SHA512 f3c4073a9018ba595c8535447c7ccb20ca1f8d8bb006b4662db19b3356afc33d810b2073810b86d7dec4572b151c53301feca09bf0662d4d683febbdf7735e06
-DIST identify-2.2.8.tar.gz 101040 BLAKE2B 46bf6631c6006ad2326f175257ee2cb4324ac463419cb50df0919768b2787afcc135dc1982ee1feb4a5efef6990f3224f63fb2dea19dc6795a3fe736e6b8555e SHA512 d166f37fa60cafc0fb624cac9626115adaecd8ec88f42ce71b81794b6aa8301e42f459bfbc1da3d81709ee5681184e927e9111a906a22ec8c977b24f1e9dc17f
-DIST identify-2.2.9.tar.gz 101065 BLAKE2B 399acf1a946c5fbb54dc88897c51b00cb02965c306ce87b52bd1cf4e7cc2836dd4051bca8a3b9533b6ca954a0b9eb4c12ef1d391e1334f9106fa46daadf150b6 SHA512 b26e80cde3225d9fd9f95e4b2c95d3e8ea35f5848301c1e3430be72ce9fd49755ea09ce8d933605839d5919255b25b05c1102fad5923dcc0c5066160c501ee29
-EBUILD identify-2.2.10.ebuild 493 BLAKE2B 7133425d9ce107a54903010c837123ba198e910315230374ae928a78a91468fdcefa145190bda4d6dd8fdf2069eb6deca40618207df563372c8bc4d45c967cba SHA512 ef6fbe4e4b33f4a762e09647f52dbf43e5aa5735ca840ba3546494a2728542652fee8a551170a86d18c23c14f7604a13754215f0196c2c58825ab868665ec440
+EBUILD identify-2.2.10.ebuild 506 BLAKE2B be82932d2a630689aa0cd4217acfa4eed0262d397024f901e5e53910c434dc28a5fdb4edceac1c2632220ba6ac04472bee412a8b0f704705767c2472eabf1d5c SHA512 8cb9735e8915b62f66a5070cd77170cb25d2ba18fad33db8730dc52230483d36d55990880f6306b85ef56398611ccb158c294e370e2beefd29ac9d33a1dced29
 EBUILD identify-2.2.4.ebuild 526 BLAKE2B be61e9ff39f3a18ffb9e65cea4fe6823619d2def1a381b5e95d3f098b0a2c721d293c8b0e2843bfb65fa7dd78cb5dfc0fbca27302b4f5220d715e4669385577c SHA512 a0f5d34c699ad1c71fe721fde559dc76a3ec3edf142b162665d0b543710917ecd18817eb33b9f5928a153d248b72365fe55398e4d378c05492dde2b7479dc375
-EBUILD identify-2.2.6.ebuild 493 BLAKE2B 7133425d9ce107a54903010c837123ba198e910315230374ae928a78a91468fdcefa145190bda4d6dd8fdf2069eb6deca40618207df563372c8bc4d45c967cba SHA512 ef6fbe4e4b33f4a762e09647f52dbf43e5aa5735ca840ba3546494a2728542652fee8a551170a86d18c23c14f7604a13754215f0196c2c58825ab868665ec440
-EBUILD identify-2.2.7.ebuild 493 BLAKE2B 7133425d9ce107a54903010c837123ba198e910315230374ae928a78a91468fdcefa145190bda4d6dd8fdf2069eb6deca40618207df563372c8bc4d45c967cba SHA512 ef6fbe4e4b33f4a762e09647f52dbf43e5aa5735ca840ba3546494a2728542652fee8a551170a86d18c23c14f7604a13754215f0196c2c58825ab868665ec440
-EBUILD identify-2.2.8.ebuild 493 BLAKE2B 7133425d9ce107a54903010c837123ba198e910315230374ae928a78a91468fdcefa145190bda4d6dd8fdf2069eb6deca40618207df563372c8bc4d45c967cba SHA512 ef6fbe4e4b33f4a762e09647f52dbf43e5aa5735ca840ba3546494a2728542652fee8a551170a86d18c23c14f7604a13754215f0196c2c58825ab868665ec440
-EBUILD identify-2.2.9.ebuild 499 BLAKE2B 0225c82581c39d13d725c064bb616e9c21c5da676347b5be12f178f758632915b78d60c0fc2e3111a29b4d215c706be672c4f22c9e81ddd378170923da845b38 SHA512 f5e501ea881d0e035420f01caa1b87151472d545c60cd1283ed979d91ca30e35294af7b62ff0d55bc1d05c980a46303dadddadfb214beed2a9bf3d761b64ddea
 MISC metadata.xml 476 BLAKE2B 396158e97712197ecfbad701cd368433e75aba1d79f81ed47726271c7b3a68675116aa994b8fd5ae2a5ea66cf9e047b23c1f81dd10b1f2812aba19e8a0aa3af4 SHA512 e2fa23ad8c27872eada3063f832eaa1962fee31301bbd36abc19f2e03bc8e984cbc0d9680afeeeecf928c8e2ccf9944c4d56767ec04491ccce31e406d9c0180e
diff --git a/dev-python/identify/identify-2.2.10.ebuild b/dev-python/identify/identify-2.2.10.ebuild
index f4471b5191e4..b60aeca6272a 100644
--- a/dev-python/identify/identify-2.2.10.ebuild
+++ b/dev-python/identify/identify-2.2.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~hppa ~riscv"
 
 RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/identify/identify-2.2.6.ebuild b/dev-python/identify/identify-2.2.6.ebuild
deleted file mode 100644
index f4471b5191e4..000000000000
--- a/dev-python/identify/identify-2.2.6.ebuild
+++ /dev/null
@@ -1,19 +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="File identification library for Python"
-HOMEPAGE="https://github.com/pre-commit/identify"
-SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.2.7.ebuild b/dev-python/identify/identify-2.2.7.ebuild
deleted file mode 100644
index f4471b5191e4..000000000000
--- a/dev-python/identify/identify-2.2.7.ebuild
+++ /dev/null
@@ -1,19 +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="File identification library for Python"
-HOMEPAGE="https://github.com/pre-commit/identify"
-SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.2.8.ebuild b/dev-python/identify/identify-2.2.8.ebuild
deleted file mode 100644
index f4471b5191e4..000000000000
--- a/dev-python/identify/identify-2.2.8.ebuild
+++ /dev/null
@@ -1,19 +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="File identification library for Python"
-HOMEPAGE="https://github.com/pre-commit/identify"
-SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.2.9.ebuild b/dev-python/identify/identify-2.2.9.ebuild
deleted file mode 100644
index 12dd06a0e2f2..000000000000
--- a/dev-python/identify/identify-2.2.9.ebuild
+++ /dev/null
@@ -1,19 +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="File identification library for Python"
-HOMEPAGE="https://github.com/pre-commit/identify"
-SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa"
-
-RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index 325e63be6204..909eb962e4f3 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,5 +1,7 @@
 DIST importlib_metadata-4.3.1.tar.gz 38637 BLAKE2B f9c9330fd9b63bbea3fc30ed6d3cc384f9b241f0089ca7b0b5fe1934214e9f644c3884ecfc866b9b9e6af6c0fd7d04fc5e8af83e252d2e1b0e274fcf408a7323 SHA512 2202be5f7b7f1c1fdad4c6b290da60fa5c9576c665c11f9c62012791b50ee0b6da029bbe424c9501ac1f663f4df883fbd3c6cb9179cb80491b2b350cfa2eec30
 DIST importlib_metadata-4.5.0.tar.gz 39595 BLAKE2B 22ef03a47637f523b583cb8c442f7351e0b94633772978fea47dab9be583f35daa32691997b4110b832709658568b6eb79a006f109b969c6f25a638dcfcd4702 SHA512 62b9cefa502d751d36b5f43606ea86c46574fea159941b68319e5dd9aa53d6d990e630c36d72830c54eb2bba2f2be53201be2482974f833cc1da8869eb2a8dc2
+DIST importlib_metadata-4.6.0.tar.gz 39664 BLAKE2B 62278f46b0fb3428384ab52696de724c0b13409d2b80a07885beab34019fee9d8bd49c096a0b71b10801941ba9d3e66445acbdfcd589e6a44cec5ab7855dabdf SHA512 abc98e3dafc51f1c02c6a2bee8134c17d205d3ecaab301c0abf9a5e1bc0454fa8ad316caf78d764db88688271511f954c6eefbfd91750b5c026757436c63fbdf
 EBUILD importlib_metadata-4.3.1.ebuild 1279 BLAKE2B 9ccebd49fbb6f0af8c93beb89040b67f844b1311d089bfcda67790f900424df84830fd7a09d9066cdd8c84abfd5269082217fc7ada354fa757893c3a563d99c6 SHA512 594b68ffee5b91fcbf1577288f0b35e70e7567a93d3a99ba7f6be60b102ea3ce66d0c1c059597b2699d2b66748cc8f5de7e63cc54bac8dbb25f21ed6a545dddc
 EBUILD importlib_metadata-4.5.0.ebuild 1270 BLAKE2B ede4cc8856fe330f979294de30f3970c13a63b80d056354b5f06e458fecdb68828581737f4eb63e0dd60bf37b371b73a9411ab040e261514f21f1d46b3cbe2f8 SHA512 af85ffddd5fedb39e2e23d1cbebd8588e60d7ed350fc38ef7ac9feb0f3784ac4eec6e1a03b1fd18de4fe46845bca5b9b2a9b066f83aa50b89c4117bdd8be7f97
+EBUILD importlib_metadata-4.6.0.ebuild 1270 BLAKE2B ede4cc8856fe330f979294de30f3970c13a63b80d056354b5f06e458fecdb68828581737f4eb63e0dd60bf37b371b73a9411ab040e261514f21f1d46b3cbe2f8 SHA512 af85ffddd5fedb39e2e23d1cbebd8588e60d7ed350fc38ef7ac9feb0f3784ac4eec6e1a03b1fd18de4fe46845bca5b9b2a9b066f83aa50b89c4117bdd8be7f97
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild
new file mode 100644
index 000000000000..e583ebb91129
--- /dev/null
+++ b/dev-python/importlib_metadata/importlib_metadata-4.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 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 fe73b23163a8..7cce1308bcc1 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD importlib_resources-5.1.4.ebuild 830 BLAKE2B 70ae32481116b16bf0abbd7d78571dd465a11f271479231e20d2e63dea8d9736a22e82874b7cb33227bb12287438816b5995528c5b79af6ce2e86db11d6a3014 SHA512 44cb6fb5648ae86d152219043c3bb595fd1410eb93662428dcbe74e4a86b52fa4018a2690bc640e9aa7898494f6c32a6811e64dfbf1a0ff54a995ff6a35833a4
+EBUILD importlib_resources-5.2.0.ebuild 834 BLAKE2B c2e04f2127b99d26a90d8eef22f6f21558f1aea0e340eb08663d17666acc73386fa8ad48af88a3b42d4a2b645342f767dbbfc7e9d1bf3db19bdd280116512e11 SHA512 e1212a34a31d74c9ae5ca56a966dda10508947147830df6dd548510e5b06d77ffb3ec1e1d5b08d355a59e636bad5f752578cb494292755697314786e2a72dc20
 MISC metadata.xml 944 BLAKE2B 7a5aa1dfb947b0115f3e22f9550471b452204daedb386e78374c5dc19b408ec52bf5887d3e645c41be9ebd16f3bd003a2ac1bb3bac539e603d44decd86b92458 SHA512 f17b2ad2e3eedd75db96765537c30d68aa28c60137b12bac3bb47307347431a19ca064a94c8e41e4a3947ab2669605d7183b5b62e55def66631d20ab903e1ea9
diff --git a/dev-python/importlib_resources/importlib_resources-5.2.0.ebuild b/dev-python/importlib_resources/importlib_resources-5.2.0.ebuild
new file mode 100644
index 000000000000..1fb714a82b6c
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_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 python3_7)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/iocapture/Manifest b/dev-python/iocapture/Manifest
index 4f546938739f..4d01c1ea52ad 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,3 +1,3 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
-EBUILD iocapture-0.1.2-r2.ebuild 533 BLAKE2B 80e9af6fd8e2fb3f035b68d3db5ef5fa207262771f4987597b6b65f79f1ff126f2f188e22d87f79ed081bedd5feae90215a4a6fc5bd56c998d12b591c1f82066 SHA512 68b3afa59e8f0b95ef9b927fe36a5a4145efcfef8086b58f1eb8e21d30d96aff120e9a0207d9035fb7a7a57a2d0192cca3c7f2a7bb2ebc7a1a6032208ca03e8a
+EBUILD iocapture-0.1.2-r2.ebuild 532 BLAKE2B 2aad2a38ba336bd7b73d5eef1d109dea68e57f58c9c580c0fee7c358d8d84b34453e89d3485fc9de23ad34ba418ed0ac138b9501e0aca43eb9573098b890961b SHA512 646ba19237968eeb433446c8b301c3e29a200a557e26adaa762edca7d1c6edee4612bdeee25ca548a005496bf543182ee3cee1d40ca846396c115a9c66519821
 MISC metadata.xml 368 BLAKE2B 5cfce1df114286d06d7dc4482bdc3d9475c50a17cd9778acf6cfbd04fee31e171db4ffee2803580f2865f07e646d63ecc2ca878846609b7cf43fccbddcbf8ee4 SHA512 3d11406f243fdf87bb03f9d2d9b7ff9af902ff006b6095b037c15ba2756f9519fa1289123f24163a211b302c1d4df484d66fb68688413dab23580575d55f343f
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index b412d273dbf0..7c797cdac9b8 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/iocapture/"
 SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 LICENSE="MIT"
 
 BDEPEND="
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index 4b0f31b6dfa6..8b394569bf4c 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -2,8 +2,10 @@ AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc
 DIST ipython-7.22.0.tar.gz 5143229 BLAKE2B be78fc7089d620cb9ad437ed8154b37ac8c7cd68ca18a2569cfcf7ea9af968c58eeee18c8d18a1f26459ccef73e59083ac27055c19e4df254836e484ce0a9908 SHA512 2647dcd5e0d9b6afc8d990d2c099ad7ed581b5eff6d657630929e0d0d9f8965e7c7924c51a10a797e7d7406212d7a06c941c163e6f6046aa62130049a9bbc0d0
 DIST ipython-7.23.1.tar.gz 5188898 BLAKE2B 9713b0f1f75e283e53ba19044c9919f0c4d0b1c120e63d7a79ab9c6b8783499ed115e86a24cab34fc13c46245fb43865b851e6f98a2ee729ee35c3db242fa2ba SHA512 9b35626a8a07c6bd0b93552341e5a61d3d90a60c72ad6e3fc71266d9509134366c46a7ae8aeca9c3acc7509dfeab47b5144f105cb3d1d05ef1c7acca6c2f365d
 DIST ipython-7.24.1.tar.gz 5146561 BLAKE2B ae63d024f488f44dbd61eb9f3e14ac5b8ad801b1db195632c184c6106d4c2e6d6143c1524ae6fc5a2f6f631683b73f241c9115c439c0f97a4fe540cc232fb181 SHA512 0ea8843a1f2e7f9357ff9896f2b6da058adb5fcbbad5c3b1fc4138a085eb57034c62c0b50d82dea0e563523649ec112edd4ef0c267a914f6a7d33b44be30b977
+DIST ipython-7.25.0.tar.gz 5147224 BLAKE2B 0a2ae7cd315ba1abde18cdfcb7ed5227e5fc43b9a053f82e7db0146cbec66b0c2a1585158e60c37559523b457ab339ad42ab8fb3fccfc9e5ea7b880593de2e73 SHA512 726d3577bfb05d0c01c55d7111f8ee03fa879427de0750ee25b0a6451365728b5fb8ccf79c42585268f768680b13f628956d292f27b9e622e5dee0b4d368d22b
 EBUILD ipython-7.22.0-r1.ebuild 3761 BLAKE2B 0fde64e41f1827ffaccc69fcb62db96e81c4c755bf7085d8890499eca01c776ed1ef500c20f277c1597c63c231587d2ddaf3ca68265629bf897d08f75a482cfe SHA512 bb27d30f8fa1fae515f1f92cca52846fe78bda310e35c84053cead7438898ec8b3d30475f36db3808d74e4ac02caf80f7bcabce4c570376a9f8661e6fecdb378
 EBUILD ipython-7.23.1.ebuild 3838 BLAKE2B a48aec0e4fe0de58169bccb994bcf0c19d8973d69496e2c19a4c9f8463ba76aa79312548d59bc7a11bb5a7ec6961c5cbdd97e05094cd7aae4e53928e5637aec8 SHA512 de1faf13bded5832d60748b48e98344a9e8fefc47bc2ff0e0090fc2579ee2d760ba65546691449c1d86d95de1a27681ecd23ac7de42e34f21449060310f79ddc
 EBUILD ipython-7.24.1-r1.ebuild 3837 BLAKE2B 0df904cebd3696dc2468b455f22ed1b374f7d5df1c77c3554ccde6356fc8cd1c71e00991ed2c95f6a88ccc20bd3a1a6267178afc8026a942c0335fe294872782 SHA512 b7446d3f4443044d60a4cd86a61f7f9bb18df87779124c10bfbc83865ee46fee9531b792adbe0cacd800924291f89455320aa8ff49e71ed29a6be790fffbf5cd
 EBUILD ipython-7.24.1.ebuild 3842 BLAKE2B 93e66fbd1e931294001afdad43c3a46f1aa0518fe17b2ba8dd04e928333ac7010f1cf505a67d8a79756f235833a1987027c19892b5b0a212575e8c1012ccce0d SHA512 86423c9f303347a54ba84a1eeeef3d67a4e622b56f4c42c314576056fdee9bf28bd5b19d40340c975d5f72ce34249fc0ef6a3714667ef73dd5b536336825d305
+EBUILD ipython-7.25.0.ebuild 3837 BLAKE2B ca587e8357297a124cbfd87142ab20d91cae8701a8769633cf8782712d9080a6214b047058f9b9542b5d5523d4aa15cc7e65207b7741b8b07e45e7d8d3154b5f SHA512 988b7f11f07b8c8b3f3c8f4d2ecbf590e4b1181b312e1f3156c02525ee923072e97bb09c57dc0f1650878a9dfb23b665c1fda313027e8e0150c792927a4d7a50
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.25.0.ebuild b/dev-python/ipython/ipython-7.25.0.ebuild
new file mode 100644
index 000000000000..5297ddabde62
--- /dev/null
+++ b/dev-python/ipython/ipython-7.25.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE='readline,sqlite,threads(+)'
+
+inherit distutils-r1 optfeature virtualx
+
+DESCRIPTION="Advanced interactive shell for Python"
+HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/backcall[${PYTHON_USEDEP}]
+	dev-python/decorator[${PYTHON_USEDEP}]
+	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
+	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
+	dev-python/pickleshare[${PYTHON_USEDEP}]
+	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
+	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	matplotlib? (
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="
+	test? (
+		app-text/dvipng[truetype]
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
+		dev-python/nbformat[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/testpath[${PYTHON_USEDEP}]
+	)
+	doc? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+RDEPEND+="
+	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
+PDEPEND="
+	notebook? (
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/ipywidgets[${PYTHON_USEDEP}]
+		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
+	)
+	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
+	smp? (
+		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
+		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
+
+DISTUTILS_IN_SOURCE_BUILD=1
+
+python_prepare_all() {
+	# Remove out of date insource files
+	rm IPython/extensions/cythonmagic.py || die
+	rm IPython/extensions/rmagic.py || die
+
+	# Prevent un-needed download during build
+	if use doc; then
+		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
+	fi
+
+	# Rename the test directory to reduce sys.path pollution
+	# https://github.com/ipython/ipython/issues/12892
+	mv IPython/extensions/{,ipython_}tests || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	if use doc; then
+		emake -C docs html_noapi
+		HTML_DOCS=( docs/build/html/. )
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	# Create ipythonX.Y symlinks.
+	# TODO:
+	# 1. do we want them for pypy? No.  pypy has no numpy
+	# 2. handle it in the eclass instead (use _python_ln_rel).
+	# With pypy not an option the dosym becomes unconditional
+	dosym ../lib/python-exec/${EPYTHON}/ipython \
+		/usr/bin/ipython${EPYTHON#python}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+pkg_postinst() {
+	optfeature "sympyprinting" dev-python/sympy
+	optfeature "cythonmagic" dev-python/cython
+	optfeature "%lprun magic command" dev-python/line_profiler
+	optfeature "%mprun magic command" dev-python/memory_profiler
+
+	if use nbconvert; then
+		if ! has_version app-text/pandoc ; then
+			einfo "Node.js will be used to convert notebooks to other formats"
+			einfo "like HTML. Support for that is still experimental. If you"
+			einfo "encounter any problems, please use app-text/pandoc instead."
+		fi
+	fi
+}
diff --git a/dev-python/ipython_genutils/Manifest b/dev-python/ipython_genutils/Manifest
index 4dc7026ebff4..e78b77fa4284 100644
--- a/dev-python/ipython_genutils/Manifest
+++ b/dev-python/ipython_genutils/Manifest
@@ -1,3 +1,3 @@
 DIST ipython_genutils-0.2.0.tar.gz 22208 BLAKE2B 1a898e11cec26787f530f72e2d2a79e7834664e0f6be6a27ddd426bc2d0b3f39ee46e9ea10ad03e01a08054873c9752007038e863d7dd9e501613a68e40e1635 SHA512 0e5a9f8be17d98dfb74ec77d1360ee79276a13fe1914e6d31e8740f06375ed1671c49356a77f118495f50823b8384c1e2c5b6fae73965e3d4249c831b9a2b095
-EBUILD ipython_genutils-0.2.0-r2.ebuild 560 BLAKE2B b2d6a8867c8dcd38fced2ce3840ce0c6fc1f046531cef9de9638ad5ae81335f08872b3f5113df0e913ce67491554763903e98018928f9408623978db07384d42 SHA512 8bdec50997c5de447edbecec79b8a7fc684cb05d0972a7566351a26b9291b57bbfaa59b3435823f1c6d46164bacda2653971ca41a6a250bf8e73f1d75f066735
+EBUILD ipython_genutils-0.2.0-r2.ebuild 567 BLAKE2B 1945b4c213d42a2c68217eb8a43e5d7e4b0fd6284cb5c04bd5c36a2d22d63560f95d493cd43cfd23308c5c9f20216b8ed0d13a82d0f392ab0d5e6c6e55e9b594 SHA512 09a7067f9ca9898296a416baa4171a7ec87adde174f3f5307d157400264ead53632c7e58660e87527e60af4166790802f1266e07df7426a667863b68b48676ba
 MISC metadata.xml 861 BLAKE2B c2d0b90a2e95e3a71c9309011c5dfe8bf711c2143e91c288d0ee42bc9cc1143e17f2cf2a6257bd675c17dd33ec3bfd764c62ba90f40204bb30ec6135e35a811d SHA512 f56d734c089641d8e615121f026702ae47b46be7b8b8cf0dca3c42b866b1c8f1f5240041834403a82ab6a22acb3a0986b11cbd6fecc9171655dd23f2509a1e0e
diff --git a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
index 1b26443f2e8a..00e18bbf6e57 100644
--- a/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
+++ b/dev-python/ipython_genutils/ipython_genutils-0.2.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 # Needed because package provides decorators which use nose
 RDEPEND="dev-python/nose[${PYTHON_USEDEP}]"
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 3dec5952dbdb..04bb2f04df1f 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,5 +1,5 @@
 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
 EBUILD isort-5.8.0.ebuild 1609 BLAKE2B c248dd41fd9e90985afedf5ef572abfa0fa46775af0162881518aeb1f9b999334063aeab7f2364eabe10108169833e1037bb25e084c61006c3fb866f664d3d3e SHA512 3cce76276c44cf58ad9a6301618fe43f5765df0fb3961634841171ca09764fc4066a1462b2dd46dbab8d54f77ff43cbf893980755a43894ac149175c92e52a40
-EBUILD isort-5.9.1.ebuild 1326 BLAKE2B ab2ac289c96e4adac0fe28667a2126860fa3b70a73324ecfa81fe5b1cff3c2f03f3effacf0d243b3a9bd72d277ba9c4dc79fbe0630f41ed29b80264d54f1394b SHA512 3e6ef128dad16b901c002720b01906ce7a3b95607a609e089c9019b589999a781017ae6808cd78b51d16133046b404cda5c3614e9cc35cfa27370d69f3f505e0
+EBUILD isort-5.9.1.ebuild 1350 BLAKE2B d3d6276bbe38f543b6a244a5cbdc39dbf144528676030becc052af9af3d155f919a36a8102488051160a7da341d5eb233c8f6cc2b0000950166fd0d6c3000ac1 SHA512 b9a1b66a9b76d804f40c560e0fe451d3b974d00859e4535a95a9a1cfc59b2b4989f4e03685983b062208e01efb69f81039e17b03a11467b59d61e91d700bd9d8
 MISC metadata.xml 573 BLAKE2B 2c70619aaf4f917f377e17b73d59656d6e0254bb0aa6c4a01159bd46b5e2e24e22b8ca04ab88ad71c9d4979ea3b484f5efec05e6ce3b40093e010108ef2a80d8 SHA512 4c06a138d3d06e1f9dbf570e6c59819de182d8453c46a5dbdabcfed424501aeba89fed659d19a6e329c33c0307790ef5c1b81d2ee5d7475c102c2bd689255259
diff --git a/dev-python/isort/isort-5.9.1.ebuild b/dev-python/isort/isort-5.9.1.ebuild
index a551d25dd85e..90f66b2f5210 100644
--- a/dev-python/isort/isort-5.9.1.ebuild
+++ b/dev-python/isort/isort-5.9.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ia64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/toml[${PYTHON_USEDEP}]"
diff --git a/dev-python/jedi/Manifest b/dev-python/jedi/Manifest
index 792e1a0b54bd..20f1ac2e59fa 100644
--- a/dev-python/jedi/Manifest
+++ b/dev-python/jedi/Manifest
@@ -3,5 +3,5 @@ DIST jedi-0.17.2.tar.gz 474372 BLAKE2B cd0bf217202e4413a7d4f1d4095fb22ad5c3de557
 DIST jedi-0.18.0.tar.gz 462786 BLAKE2B 35021ed1566fffc24056060f16b8a0aa6f8b6e382f716ff5978711fd66340e96f4e0b628463aadead5605db32cfc20df06a6c53a9b435658f1c455a6212da6e5 SHA512 fcee84496285a0b0b1cf1f3827593d0603bd87c84baf725cc7bdbf594979f49729b18a29b7465848413bdd3a5670fcc41187dd3eadbd9750d77788c5a9408dbf
 DIST typeshed-jedi_v0.16.0.tar.gz 497407 BLAKE2B d322d70d3c46d1abcedddbd10aed5c6f213698f4e9f9aec1b4bd7e7186ab7ce384ec6a95d6adc46c7459e3bbb748d6ff432115cae744a315aed60972d2390eee SHA512 1551082938b52717f90e28ffd25e838ab04798ea86ea719fa35975a9de006bcc063a00cc8c8babd994990cdff694d48490f4d8c898c322666450d7ef3be8688a
 EBUILD jedi-0.17.2-r1.ebuild 2129 BLAKE2B e9f5a3ac3f0f9903f966c7ef0261c1b16d44828411e4d37dcb3096f9b708885a4296c86e5346d807e402da6c4dc7c25138522d65f45a933fd1740a5b34c7a058 SHA512 f4d01fe866bac52768e21f011fb6e4cb7d710b55b5daf1570451fc76942831be9aeaa8a96e2dec21927e9b9d76f5af09ce20dfd809c70ca7ec7cf9a916d452c1
-EBUILD jedi-0.18.0.ebuild 2175 BLAKE2B 1835ca9bff1ce28b1c2db8c4ae12937a5e6d6fede132a187064466c7b8d4654c93a1621eaefa5a46cc6d86f750dea7a745d008e0d6b6178f2f2493cecaee16e0 SHA512 b2ff99232c8d858feb3dacc2d260d85442eed71b2088e988e3ddb97460fde08a038e71188044fb6f2de44571c0b27bbd8dbe0fa32588651a4a0dc5c1ab436083
+EBUILD jedi-0.18.0.ebuild 2182 BLAKE2B 87e194f62a4d3addbc8501fc079eb11b95f5cfb357dfd2652d7f7ba0243ec77c9b540c13d3e4731f716ff135fee9653bd69c3aabf35a109954528ad85bd52939 SHA512 52e66c6efd4505f5594fc4ebe43561e029b00b8454178a816433a1e25357d5539dfc3e53ece7d09701142aa62ec938f174ddf2ca5a83f07aac3ae1e26b6db791
 MISC metadata.xml 400 BLAKE2B 7ae1b5a2edac295d8d1cce978fd3c6470eacd06b890c960c33c58050a5bebdfd091cbcf48190e2f6b3681341db155f36e9492f41a4c5d88b2f1ebaacd92ca15b SHA512 f3bd9785ed160ea3335a03139abf10e68d10d2431b4b6f56da12c9a074954ad70972e953b2d283646009af180b9a50e59adffd455adb2937905812a98146360c
diff --git a/dev-python/jedi/jedi-0.18.0.ebuild b/dev-python/jedi/jedi-0.18.0.ebuild
index 379e644099f0..2c588b7dc472 100644
--- a/dev-python/jedi/jedi-0.18.0.ebuild
+++ b/dev-python/jedi/jedi-0.18.0.ebuild
@@ -23,7 +23,7 @@ SRC_URI="
 LICENSE="MIT
 	test? ( Apache-2.0 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="=dev-python/parso-0.8*[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/jeepney/Manifest b/dev-python/jeepney/Manifest
index 5b4d7fbf6c5d..925514294386 100644
--- a/dev-python/jeepney/Manifest
+++ b/dev-python/jeepney/Manifest
@@ -1,3 +1,3 @@
 DIST jeepney-0.6.0.tar.gz 49513 BLAKE2B e5f9b5104cf07dbcd2d40c2d22b690dfd56c456ab56daf44f4abee83f0bfe7e1dfbad797348044d51e3dc20fbc6ce68bf8df54f9c1e46d7a86ceb22d3ab30f8d SHA512 140be9dd28ed853d2d41b6a8bbeb2f22c0270ce7bf33b943ec2ac010db17d4f06e253fa8637fbbb3044fe9ffdbfa1e15f0c663eb44bdd538f8c47c2e7dab3ca5
-EBUILD jeepney-0.6.0.ebuild 1031 BLAKE2B 88c55794ca7a7c3c1c3d8356ab36fb8ae84cc0cdd6312032693de0ebfd70d765d49c8bf36fbb95897561618948e2855358e8984263d5c2f36d94b339b06a204a SHA512 de24006bfd73517a5be34f11662ea5e301ec010e9a63af6f5c65f7824c91f776b7d4965850870f9c59b71b4c03ce8acca70bdab56a5edc3e9bd0ba9b3d9c3a6b
+EBUILD jeepney-0.6.0.ebuild 1038 BLAKE2B 2c7df2b5380f85a8f19645135db863eac3038e58a031065d2a5f491fd5327651a774e37e7e434f1846bbe49abeeec90229c6874081b6c39a5116b08860f4b1b3 SHA512 f6143bbffb239ff02ee46ef558ae5296b98abb3e0a8387abf49a8776d7acf131ec348ba98ae63bfc83b9bb0cc454e0637eeb8e5bd435533edb9277fbf87de9f7
 MISC metadata.xml 456 BLAKE2B e597aacc0128f9cd06d21a03ca156343861a56adba6449e12127025265c6019308ba2e8f360d7a4f43bbca3f95a78789d964bdd3e5bd5fea7d21d7b8eb413c74 SHA512 6cb3b5fae02190cce838221a1d5269bc005f985d5935f77880b066999340818338a747a9e24aa5d39ab71f69c842747068e3b573dcf475c7d552af1bc9af031b
diff --git a/dev-python/jeepney/jeepney-0.6.0.ebuild b/dev-python/jeepney/jeepney-0.6.0.ebuild
index 42dd4172cf33..6c674f7d103e 100644
--- a/dev-python/jeepney/jeepney-0.6.0.ebuild
+++ b/dev-python/jeepney/jeepney-0.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 4ab3e515e87e..75118881512a 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,7 +1,5 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
-DIST jinja-3.0.0.tar.gz 271882 BLAKE2B 7013d74802534273c62db275d95f05f203af97f52fdf9f9be9ec89522e2fce2d4cd0dc00611ad1442680da9ec624dd4ca8be375f021bc9572ef736801fb4b0d0 SHA512 54841f5fc07349eb01002156fb148e8e5905574dcb6e0d51bef2f340c8b94f2b50964b94e09d888d8cd6aa834de3a495301bf2b3cdf3282bce1b04129ea6d69e
 DIST jinja-3.0.1.tar.gz 272329 BLAKE2B 71aff8e78c49a522ef78d418be1b3b104dc149dd623b75aed3022f979930c8d6071c2adc3693a6110425469d6092e84a7721ac9d7907a8dc0c8414ccdf7c9049 SHA512 da3238bbab9f5966df933dd0511faf010d799aebf06d17b9352f412417ceea842145ee970a0ddd84f49a3ef1f7fbca29f62a14ee75c136a083168311eda89ddd
 EBUILD jinja-2.11.3.ebuild 1558 BLAKE2B 11b319f676e492a970f2ade22a208431ae247aa5277219c5cff90ef23e21b675b779cf1c09402f6c07f41629f77b4f8be427bdcb97d40c8b8de07c6ab45e9645 SHA512 26f8f456af243710d4fe9d2b7782f90c6800b23403b6da77742f975b4fb151c1f18b34b091689ff8b84fbacfa78b81564fc363fae467848d2841572be1007a5c
-EBUILD jinja-3.0.0.ebuild 1321 BLAKE2B a26cfa25c06793e7f6a64f0d5822ea4fdd1d05925ecfcd6236278740d825b29474fd693171a2593364e72974f40110f4f550cf3c0b2637a019af9ed147a78ece SHA512 b66905f4f7b230a266d0b3500066604de1cc9823276ed87f988a487a5d971a93ff7bce3e11727f6e3a9326d05c8b75e613c655c1035958f5b44800227f3a2bd0
-EBUILD jinja-3.0.1.ebuild 1311 BLAKE2B 84173aae632a788ecca0b1657a8a26a7ecc607a42dcb46555a1bb7226bb808e58b3b2ac2e73e76a90f7a7f0dec75714e638dd88961eeec3f4839fcb634382829 SHA512 237f2fb19871dc31c75dd806e406672bada812386cfa06d8d54d398e58706d9d59021f4ccba04ede7768caab39c5b61514229237282be46ee511ebbd0cb71862
+EBUILD jinja-3.0.1.ebuild 1310 BLAKE2B 5f5b74b41477c1af7e87917436eed303b5ce9fb5545e8ef89717babaf93e95648881f6dcd302bc96206ff0ca5912b74d5b70f43b18bbebf5a3f528c2e13f0f31 SHA512 019e506427bf72eeb15e16d7160d5f62c834001bcf4f840898d3999ee065d6ce44bc20db378acba491d5b194b45aa5f83f5a00221e404e3aab614ac50c42267c
 MISC metadata.xml 466 BLAKE2B 76540215466d45bb582810d8e8fad3db88cf0ccb7d4340d3ddb2c6c85e3ce552fdfe81517466382db89adf660269711a0fb861cf881487d7e4d1ce474114d6a0 SHA512 3ae5a895f264984d8538551346b7031c712ca244c154ff435847949db29239ca1c7d9ad88f82dd7cdd02ea8906600b6d7f7d4c0c6dec1f025a5d5e1173569c10
diff --git a/dev-python/jinja/jinja-3.0.0.ebuild b/dev-python/jinja/jinja-3.0.0.ebuild
deleted file mode 100644
index c8cab106f7da..000000000000
--- a/dev-python/jinja/jinja-3.0.0.ebuild
+++ /dev/null
@@ -1,52 +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} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="A full-featured template engine for Python"
-HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
-# pypi tarball is missing tests
-SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
-IUSE="examples"
-
-RDEPEND="
-	>=dev-python/markupsafe-2.0.0_rc2[${PYTHON_USEDEP}]
-	!dev-python/jinja:compat"
-
-distutils_enable_sphinx docs \
-	dev-python/sphinx-issues \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
-
-# XXX: handle Babel better?
-
-src_prepare() {
-	# avoid unnecessary dep on extra sphinxcontrib modules
-	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_install_all() {
-	if use examples ; then
-		docinto examples
-		dodoc -r examples/.
-	fi
-
-	distutils-r1_python_install_all
-}
-
-pkg_postinst() {
-	if ! has_version dev-python/Babel; then
-		elog "For i18n support, please emerge dev-python/Babel."
-	fi
-}
diff --git a/dev-python/jinja/jinja-3.0.1.ebuild b/dev-python/jinja/jinja-3.0.1.ebuild
index 73ff924880c2..2c2a5c2e3791 100644
--- a/dev-python/jinja/jinja-3.0.1.ebuild
+++ b/dev-python/jinja/jinja-3.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/jupyter_packaging/Manifest b/dev-python/jupyter_packaging/Manifest
index 5ea21c6c3525..6971e37881f9 100644
--- a/dev-python/jupyter_packaging/Manifest
+++ b/dev-python/jupyter_packaging/Manifest
@@ -1,3 +1,5 @@
 DIST jupyter_packaging-0.10.2.tar.gz 21735 BLAKE2B 92de31e6835a2228f85b008b0fa3b3b8b5ebd175399fa82ee79d328f97b50c09a86dbc325e0378a7f946de34522d4af12fa5997507895ff6d85e77d4e7d38e3c SHA512 c1f5562b8fd72d64998d32d1a85dd1af2b730fa7e4a0d9e2036ea4d5a607ce02b1e9c641f01997ea3b0d6e047fa797009ce3c2ca52ef866ec9c7492ef836e679
+DIST jupyter_packaging-0.10.3.tar.gz 21530 BLAKE2B 43392f938d40e859e79f42b7942a199f808218c1da697c48a8ae0b1c5a4e8a408f983196e9d148edbf17d1725186216ed79446bd42fe8f18baaf8fc9f66efe1c SHA512 7634a056d506328af6e963ac7a8d6ac5fdb5d5303a31495af2275a7feca3732b60aeebb332cdc009ab690aa4185f5b3687ae002300b4885620cb9f2da6d2c79e
 EBUILD jupyter_packaging-0.10.2.ebuild 1008 BLAKE2B b1568c777b9f90b2f9136fae2cf5f5e960bd3bc707efce70db4ac58da79adaf99bd5d103740f275888f46dd93f6db4487a27be579202991f4f6cbac403f95474 SHA512 e73d2649138659e4cb5b2dff4748c4deafc89b11aa8bb7740b90652c26bc930b572d9743a8a11fbb9f80e55c4ed136616ff9c6221d7e63bfbf3ea5663675604e
+EBUILD jupyter_packaging-0.10.3.ebuild 1061 BLAKE2B 0f8ad05bf71bb09db0e54b40ab8660e0490816925f953dbdc042c43bfe2eb663bdbc427411ef48bd75167da4bc470ceb7533caa3b04c0c85525f94989c64c677 SHA512 e48dfd6994b7db2bcef686067c19085e65eca017b81e281c8cecdf048deb4ed3a94b5241e7336cca2d7278dc301442fa225484b066bcb3c3a87e1456827a7b97
 MISC metadata.xml 435 BLAKE2B 7b243203f2745e996b80926ea2ff4737a7ab5e64c307e17fc2c354c5193fd1f543927cf4308d6101c8e38923f1f6fdd5726c219f2cec07c6ac34593faa05aa56 SHA512 cb7ed210410efaaea5f63f43f51e3da0f7c12ec66ade563456c3b3af54fd061fcf135d88e5ac753564b7eae2306838cd1cc0e5fe05181f96b2ffd436655e6da1
diff --git a/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild b/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild
new file mode 100644
index 000000000000..109b4c393ad7
--- /dev/null
+++ b/dev-python/jupyter_packaging/jupyter_packaging-0.10.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Tools to help build and install Jupyter Python packages"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/tomlkit[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	dev-python/deprecation[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO: package "build"
+		tests/test_build_api.py::test_build_package
+		tests/test_build_api.py::test_deprecated_metadata
+
+		# broken by Gentoo pip patch
+		# TODO: retry when we finally make the patch less intrusive
+		tests/test_datafiles_install.py
+		tests/test_install.py
+	)
+
+	distutils_install_for_testing --via-venv
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index ef030b1e891b..e76938f8a4d1 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,3 +1,3 @@
 DIST keyring-23.0.1.tar.gz 48614 BLAKE2B dd56b92464934a7596bba97c5a1990eb2b3bf33da2eb469aa028ad346c09fa14687cc9214cb48ed82c0f32fc4fcf779391a00a5c9fffdff25f31e7f70f2bd731 SHA512 9f779e419049aef699c67dcb93277f336a2063b42394a4ff2350b8e72b81fe6763f6a6fbe8f358e90bf31540513095e2e56b83742841ee567e5d46b91995c063
-EBUILD keyring-23.0.1.ebuild 1176 BLAKE2B 90e7ed50f8061d5f8d672970825d5a9f1e02fff85636d6b48da9129152130cb6a5cb191eb148c14c84bb005e95db968a154c505d2f8c2f14d554adb4ef27c17d SHA512 8d3ed254fffb73ce306da1e07ad2e1275d2b827a02a90a458bbcd51829a1640d536b71c80c985c728f2bb8e102f7f62972ce39bbb4a75e4308141a676bef5578
+EBUILD keyring-23.0.1.ebuild 1183 BLAKE2B 10f561a5fe7733894a9c18e03b6d463b71757f860636d32b7b0b77ef5b4a19ee8be01d93f36a3f7496ae10fb664a24917303fcb6bcf7cc3ede3fce7399ce98f6 SHA512 7c0ecea87bb0c1454fef5418ccac2817396d8513b515e756b0eaface1b51454dd4fee9c48f448779198a4b49359d52c604841144fb1c4e28043935a57d7cec27
 MISC metadata.xml 610 BLAKE2B ef90c15fdeffa82a8a08a063d43a4045e98c8ce21f6055c3671bbf94c2719c4668e0a87b607b9dd39da073283dfe5b7c3490fcbe023014c0337ea83def27b893 SHA512 98b2619a52bbf177eebdce6f589e2f777992963696a75f0481db849825372890dc631b14da230f7bb3e92aeb5e8c60a0f7931092bb9e273300a5133eeae00112
diff --git a/dev-python/keyring/keyring-23.0.1.ebuild b/dev-python/keyring/keyring-23.0.1.ebuild
index f1b73ebf00eb..4e13723b2dd4 100644
--- a/dev-python/keyring/keyring-23.0.1.ebuild
+++ b/dev-python/keyring/keyring-23.0.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jaraco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 RDEPEND="
 	dev-python/secretstorage[${PYTHON_USEDEP}]
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index bb4f7a4cb4e7..a87eedaec408 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,4 +1,4 @@
 DIST keystoneauth1-4.2.1.tar.gz 258328 BLAKE2B 62f8b065a77d4150c9491f4352a3a2d37d42cc54df8db6a1eabdbe93f18714838ebed2dec0d6188e91f2dc3708b0c3cfbcf17a96411df05dd96c409a1b6c8beb SHA512 cb137d259dba7cab31fa39293d40d6654c6b36157f088948995d55755fb4dc8c29df1f978a58fbc0881516f11db840f0a25c7621bb092ab95d901dde6bd210ca
-EBUILD keystoneauth-4.2.1-r1.ebuild 1703 BLAKE2B c68b88cf3781bde9ea0d8b6c7ee2590478a15810f7ae9094a9011f243a1762561105d3301d8c9249c6341087fcd9539223ccb6ae261e145cae6ec851a2f9f78d SHA512 04e63cc94bb1fc2ce499ba1c8b3ff2fad7610ce9700f8fa544c932edf675c951ffc61417129be4fa16719a13479fe5ee0ae064414b1bc1fcba8bef1ba6ae12b6
+EBUILD keystoneauth-4.2.1-r1.ebuild 1715 BLAKE2B fdfc5016a16a9f6bf2d52db78d5d1896e9b029d2f44188f39f656c10a07d1ce5b320826a2e8297d67e3350bb80ffb904b320eb7dee2ad259fceaa57cce7dfe21 SHA512 f7f1ee43d776d59b52686339fb5f3064b49bce1ad1ebe68188fb212fea9298c5c100e8e3a651117a8efc899bdd4e66634c78bf489c344e55f5f5f579dded775d
 EBUILD keystoneauth-4.2.1.ebuild 830 BLAKE2B 502144036bfd08295513a411ab874b6b6509ff44ffea105dcf8480403527dfa37b15600b5933d0c55e151bda675dc5899ef8b7c8ef551687b729d9edb606bd48 SHA512 a395a3dc0f20357373e98c9b3f28e0fbf9fd4d3107f2d502f66701a81bda93123b0757d305c3d837692854ffa842cc686b3d068bcb0a9e2b6670093c3c36fc8d
 MISC metadata.xml 517 BLAKE2B 89f053e99c44426b0681055c4ff962db6579b45cbd69b30d1ce3451daa7f7d358d60dd8fb0b76c47382e420941d4dc01e7c841d96b30166b12cc79d8ad45b1b4 SHA512 237f3c06e5ba66fd6b583c21e3cbc67866fb25eaa701c5eb1eac1b15d89dd9082255a15fd02a28bd2610e47ea3b6975013b7a18ad9ad8f3ec8fd6b0da9dc6bd2
diff --git a/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild b/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
index 905b712644b5..7c32b61382ed 100644
--- a/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.2.1-r1.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0"
diff --git a/dev-python/lcdproc/Manifest b/dev-python/lcdproc/Manifest
index 0f2dc72b952d..9c087d886d66 100644
--- a/dev-python/lcdproc/Manifest
+++ b/dev-python/lcdproc/Manifest
@@ -1,3 +1,3 @@
 DIST lcdproc-0.03_p20150508.tar.gz 337211 BLAKE2B 426ddb2e951d096dc8ec149e47dcaa4c31501c9993e27c6a7fd686baa7e0799c92f40bba4eb3250c846625e6f82d6a202dc9f55a7044e6d4edb08437edb9d2e9 SHA512 344a15566587a1f7e3a50314138fb320ee341a41484061cc143498c86e058badefd38589b74a6668e3c082b1cd4ceb3aaa8a9369eb9d8f900af5da0aa7823430
-EBUILD lcdproc-0.03_p20150508.ebuild 587 BLAKE2B 87d007d7ba44a0fb29ed93d631fb65a3ff2080976403a2b44336e6ea94ea0be090902616827f438793eb6b4ea501b27725ade47878bcda9f38fec9d160dda16c SHA512 f02201bfede5d279a72aeeeaba99a9793edb5ae38ce2ced43f3bc9abee96217467e93db27dee76a4f522f1f5b454b8c4c105942a52e9e57fcde6deac48f23c0d
+EBUILD lcdproc-0.03_p20150508.ebuild 741 BLAKE2B 6dc266578b2d29b13c1765c81cbe9d01dd47cac2f448e973558b9e6f6c0c01e4891830f505aed7a279e7a823181cf7be1e82545196c7b648f02e1fba88c44b54 SHA512 b90f2b3918b8bca708d0cf787fb15366b65d5752d526007dc94e52f05cab881b0fdbd31e232db5b4954997eb5419efd1f57eddf5349f99bdcfb1ebd55c5fbb61
 MISC metadata.xml 622 BLAKE2B 2f18955cbbb7efd91a6ef29be088a91006bf0cf81ac924a8338aa3eab7403f9ddb0e045eecaa268d6ff9029f26f459a2ae2dc445ea712f01770e4f37a8204a5d SHA512 041d0b83528749b6d79aeed66898eebee395f2121ba81afc762126f13cce63a923d7289b5c43cc978d30206b98a4b2116a19262540af53ce4085b0a8464c923f
diff --git a/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild b/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
index 49c1a0cf570b..91f15979c1a7 100644
--- a/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
+++ b/dev-python/lcdproc/lcdproc-0.03_p20150508.ebuild
@@ -1,16 +1,18 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 EGIT_COMMIT="973628fc326177c9deaf3f2e1a435159eb565ae0"
-PYTHON_COMPAT=( python3_{7..9} )
+MY_PV="$(ver_cut 1-2)"
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Python OOP wrapper library for LCDproc Telnet API"
 HOMEPAGE="https://github.com/jinglemansweep/lcdproc"
 SRC_URI="https://github.com/jinglemansweep/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
 LICENSE="BSD"
 SLOT="0"
@@ -18,6 +20,11 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="app-misc/lcdproc"
 
-S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
-
 DOCS=( "README.textile" "examples.py" )
+
+src_prepare() {
+	default
+
+	# Fix setuptools version warning
+	sed -e "s/${MY_PV}/${MY_PV:0:(-3)}.${MY_PV:3}/" -i setup.py || die
+}
diff --git a/dev-python/linecache2/Manifest b/dev-python/linecache2/Manifest
index 9497fe31469e..4ba5923a6238 100644
--- a/dev-python/linecache2/Manifest
+++ b/dev-python/linecache2/Manifest
@@ -1,3 +1,3 @@
 DIST linecache2-1.0.0.tar.gz 11013 BLAKE2B 5f9b125819d9c812d37f1c14ef9ab52f2d5787c83a3d0d891a4def65f17aea26d903b269a610b7247927f72c1594b434ce9274c5358b29799e4ca5b426b37836 SHA512 e585a6e4c054c1965bc4241a1e36b57cb04f32b2d778df0ae4381975700497975251f509354d3622e36c82973c726a207b815f8b12060d9d583b6669a9eb279e
-EBUILD linecache2-1.0.0-r1.ebuild 711 BLAKE2B 6bb2bb5a53c84d001575f9c591559cb1890f62b13a6c1fc2b784002b7859e985a1bd60215b3471e1eaef079e5fc447498b485d0f9472658537148701ae2d3674 SHA512 a2e8da8bc8bab37f9b840ed3db03c9ada501c76677426497ccd05192f01f4a1a87fb12d287b15d7eb29aa12181f4c8ca7a32324b5b012af8e38b3c27e557b4c5
+EBUILD linecache2-1.0.0-r1.ebuild 718 BLAKE2B 6427ae040f42ea89e64c70bb6a70f351840e2b30cf15711c100aac6d36b50fae6592b5070e575ea0bbb902fcce9b6b3068d5f8ce3dfd0d98137c58640298b7d8 SHA512 100e09abc41168246f982b357a321192827c9775190cf8f4c26a4a7c15071552f0f96c75059801e07c318abe9096884ebe7e96ce5577a863cc36b78661345d74
 MISC metadata.xml 377 BLAKE2B 7de50cf7b25ff4a5670c0976205066353aab31ca2c46d14b037253b9843af6a6d973b7a43aec2d213ea4256de851f6ed7accda0aeb1378ba04ae52e69d1c5977 SHA512 577fa842cf618ecfe56bb1661a9b5e124d0f53c204d36df681f2d2601cc797120bbbe9cb863b8aeb268127044c5d2fcc1cf5f21e953262d793d97d9c9ad98aac
diff --git a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
index 790f2a6ec713..9b0a2e825b13 100644
--- a/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
+++ b/dev-python/linecache2/linecache2-1.0.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/logbook/Manifest b/dev-python/logbook/Manifest
index d273cf1ab089..192e96899e8f 100644
--- a/dev-python/logbook/Manifest
+++ b/dev-python/logbook/Manifest
@@ -1,3 +1,3 @@
 DIST logbook-1.5.3.tar.gz 371901 BLAKE2B e37924e06613ccf27380004b159966b7b42ec7b766afb6904751eafb3d774c5a9994b9d63f834fbe949fe345953c0da4693e093d717b589046412bd4056322bf SHA512 c9068324f12a189ced98e2c02753489847fa533ce3a3af07b62c73e9959c2e014d47515d47e756d031639cb220a2c4a9a380cba4cb3ea1b190c50106decba686
-EBUILD logbook-1.5.3.ebuild 1067 BLAKE2B b288beb4ffacb540c778b4faa51a885ac438c9eeeb8711f307f400e82933922b20aac19e5026a76c1d882014de3802d94c07593b97af7e3ba3dba3db4eb76325 SHA512 b27ad978506f980ef21b6ebf77dfc8712be635c2e3d341431eee5efe51802ab8769b93893abf84c599882c340860f5d231827d78c89904dbeccf1443b857cbad
+EBUILD logbook-1.5.3.ebuild 1074 BLAKE2B 49887151d20666f3d379f65eafc4a5c3df9c25bcd99566cfcc6ccb1ee82117e85be761ce8ade2f26935046170212bdadbb09bbb101641108a295d7f2b0cf3784 SHA512 e0becfef1e7a3688b6646094c13cea0e7daff21f7f1487e6a3cd1a2e42efd8f5644295c8f17d9ece4da6548aa868391194cb40909ecd733c16d158d7886dd539
 MISC metadata.xml 518 BLAKE2B 24cf900c81292224d8d3338685bef3a236a6bb52f83ef57623420b270650c2dc676f8793aca159029d487fddfbf6b6f2205543d931846241d11574c520e55da2 SHA512 f2ccfefb8e64dc932e222ce35816ae9f32fdf4f8afd56c17f4aef715fa4356155bf2ac8b75f55182b7a5898ad4aa6ba504b7e991bcf8c105f2244149f3a069a0
diff --git a/dev-python/logbook/logbook-1.5.3.ebuild b/dev-python/logbook/logbook-1.5.3.ebuild
index 44f62ada2978..c6cca63be0e0 100644
--- a/dev-python/logbook/logbook-1.5.3.ebuild
+++ b/dev-python/logbook/logbook-1.5.3.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
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/getlogbook/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~riscv x86"
 IUSE=""
 
 BDEPEND="
diff --git a/dev-python/lunr/Manifest b/dev-python/lunr/Manifest
index 03ccc4a8f93e..f7714bf4dda1 100644
--- a/dev-python/lunr/Manifest
+++ b/dev-python/lunr/Manifest
@@ -3,5 +3,5 @@ DIST lunr-0.5.9.tar.gz 837871 BLAKE2B 988d4b6a59a868b2e06d5454dd1e4932981328ddfc
 DIST lunr-0.6.0.tar.gz 839533 BLAKE2B fce81bfe0e12138b8ab335ecec828ac18be13f0d9f823218de11d701c4d44f54c06360c4c8f1c96fd36b634094b6f10bd964c9d4e154dc208cad1f36e4b32f47 SHA512 2067c34c12f77ab0fb32c7f800ea3c647a1073c061a14f2b72b2b95fc8d624429aa37e85992eee5d5b24add179eab1d81af52af09f0db67d6cae459a5faa0925
 EBUILD lunr-0.5.8.ebuild 1059 BLAKE2B b5477761c205f3638b85445424b8e75fbabaa7e4b5898d0a2005e096c51d4ad8d582525b8f0a15943cd46d21cd9bb7693036d168d9e1e3371d529d65d694790a SHA512 2f7206d376c36be97f0563a7e06d7c4cce5f5c99dff1a9fa85110a40eb6d97fe408bed86b193514432e57e7d602b57061628663a3d11e78fd3571030d87da1e9
 EBUILD lunr-0.5.9.ebuild 989 BLAKE2B b7605c7d002aacaca0c3f861378f5aa48591e72cee1cdb98100450646a26172797a96d623d276c65f7a76097a65f51c500b8ed5675592a415340550cbd2014b3 SHA512 6a78310034dd0ece86dd579b0d200fa2a582dfc34461375812c21f1a633e219b9f9b7236708ce24a383e4444e5423ff98a58e9fe9c67798b8b3af56cfdc2337f
-EBUILD lunr-0.6.0.ebuild 658 BLAKE2B 1ec9dd7c866c1f425cafadc6b2e748c49b795096a857932735fd8b41e06d2235dd44e96fac6dc5fc1b9b28a9c81e3c94c06ffa10d983ea94c28d161db28ba301 SHA512 824527620addda5615f624cc3f46f60483cc009c5f36e63001a78347e429073af1bf2fcfb6709a2d8b4cd998ede6dec66a88196889e59705c4fdf5bef3e4696f
+EBUILD lunr-0.6.0.ebuild 656 BLAKE2B 4dec4e10ba3fec027e1dafff559685512f4b09493d3f92bf3528b81238538267bf13b5bf13dfaa4ef8eb6ddaafc9b5d07d79e288720367ce9132d3b2873b86f9 SHA512 4423555fe1075d096acf3679c19d264680e73974c663c694b156b57cd5219d8781f470e2cd54485141ecff609668b7ad30c76545d409655e22daf324bf56816c
 MISC metadata.xml 493 BLAKE2B 76427e64dc660b83bf96afd10026bd8751346876ec99e1557fab59a9eb99e3da48c555b515f32aad30d2ed48638dcc53d93c5d25d3f1d754e2eaea26a58c9263 SHA512 fab22bf59bae341d289baf58e3ccb60029ed1ccc8b20000c624ba7cab9e315af46a8583c1c834493d8e1fc6dea2d60fc1637f771936f4fdbf2f9829d50414bc9
diff --git a/dev-python/lunr/lunr-0.6.0.ebuild b/dev-python/lunr/lunr-0.6.0.ebuild
index 665f1c777289..6538993f5d0b 100644
--- a/dev-python/lunr/lunr-0.6.0.ebuild
+++ b/dev-python/lunr/lunr-0.6.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${PN}.py-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-python/nltk[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 15482392daa5..00e3a2c4ef63 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,7 +1,5 @@
 DIST mkdocs-1.1.2.tar.gz 6987352 BLAKE2B 98bf604aa15eac693368e77e6658c3906909a0cdc323772550a65c35cc301929cdc136919a612438563cefd74c9076b2e273cb89e3ffbe04bff2a419e6e36513 SHA512 bf0e5ba8a15524ebe433fce9f2d16404922850ca562339d60e7860e243f9523321cbab5dca1f276a71d3158c7b1bfadfa25b134da50ef1cedc0b1a9658b6f10c
 DIST mkdocs-1.2.1.tar.gz 6918891 BLAKE2B a17fc551735de28391809971fdf8973c5adf23e512286041eab73bde02ae9ae597e357f4dcbb3fa9ea90a4b47e12a8390c3626641e89da45770b4df6f9d66029 SHA512 c1f9c3a46fd2c5d6819ea069bd48a82cbf5816bc1586a88e9eb776b2376106d9d5f8a0d9a70a9f9f56e39e9f29eaa3cbfa26a8c588acf568bde86f4028af9796
-EBUILD mkdocs-1.1.2-r1.ebuild 1699 BLAKE2B 59e02ec5ea24d932eef86268220feff250e3f2aa7112c29e74829fc747cc9a27b86ac544ddea54759f019def3d5b2c17958b809d94ac63f87b5ab54aed2ccb3a SHA512 c10a8b6bd1ee42777d69225963521b5941d595f6a8f0fabca19ba830d3a7389a4ce7d9d88f66b63f370595bf07be33c7b69920044faeb61d76b418c177086347
-EBUILD mkdocs-1.1.2-r2.ebuild 1866 BLAKE2B 41ef609e6648cd0d082143b975b0a8c3f9685808c17a1f089907b3e55a813628efe7d1b5533f2b00b9fdeac94d20c50b6d45c03be2543b21e3b262e365aba095 SHA512 f931df4b728f9e2814084a448017ae1fc1fb8942816cc25fc5a631cb797f56e9d3adda6bbd0162f70dc1d47a1fda363b25404da6cabc167441474e803da8fc36
-EBUILD mkdocs-1.1.2.ebuild 1353 BLAKE2B 14ed1990f54f4954dba6afa3b01f967508412573e2826c7feb40c873a2f55000df8186166ea7a31f8bfadd6d040f357747007f889c19f072026bb86887a3a43f SHA512 7d24f6aa455983535ff489f3a34509e236b336a65750b383429dd7304e3243feddc6bdd94164545284f5a29b7e111ec3911591b6e478671637589c24d50a3d11
+EBUILD mkdocs-1.1.2-r2.ebuild 1864 BLAKE2B 4139562e8eaa9e525cab3da9bf98e8d026eb56ad4586a1fe9779fd4cc22a2637064b7449a33480f804b8fabab6cf94302a0407f23384e568b080f6cff2bc60b9 SHA512 7c0b734b407cd72f928527af9bd3bed6babf7f18d5c1dda43c7271c76496a2aa7fe34c62ef1e5cb03cc776a72bd47695f5bd180cc024ab1671fc4a98bc2e2427
 EBUILD mkdocs-1.2.1.ebuild 2119 BLAKE2B 241a1a7cb0b35db402c8d3447cfa505aa5560e7fa11f52812e472a1ae7b28a80e64a75fd315ee0c8eb2d22660600e0fdeb63830e39b8ad88b72f894d07a3af59 SHA512 63efb54b90930e66e44093ad8a454f703282c12beaf2d6fa2643e25065487cca90eb461dadb63bc8a20975020d82fd02bb7129353b3e777b63300b80bcebfe6b
 MISC metadata.xml 404 BLAKE2B 69b46289dc5228603da7575ea456d95e456c969bb5821820d91fa85599960ff9442bd1d7af810f936fbe94e9fcbc3ccace1156572d52f5445322a22c163bd2c1 SHA512 27dac2bb6455dcf92d9d86e3e1d9e29c87d5fafdc6d3e1f8afa059e562cfe9b233a29ed890cc7c3dff1e948d243b007f08b5decc4915deda6a0357d496a7be3f
diff --git a/dev-python/mkdocs/mkdocs-1.1.2-r1.ebuild b/dev-python/mkdocs/mkdocs-1.1.2-r1.ebuild
deleted file mode 100644
index 6d18515e6d89..000000000000
--- a/dev-python/mkdocs/mkdocs-1.1.2-r1.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,8,9} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Project documentation with Markdown"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="doc"
-
-BDEPEND="
-	doc? (
-		dev-python/mdx_gh_links
-	)
-"
-
-RDEPEND="
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/livereload-2.6.1[${PYTHON_USEDEP}]
-	~dev-python/lunr-0.5.9[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.1.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Tests fails if additional themes are installed
-	sed -i -e 's:test_get_themes:_&:' \
-		mkdocs/tests/utils/utils_tests.py || die
-
-	# Upstream pins this to workaround with a bug
-	# in lunr, from 0.5.9 onwards lunr (mistakenly?)
-	# depends on nltk<3.5 if [languages], which does not
-	# work with mkdocs. We remove the [languages] part, and
-	# allow the use of 0.5.9 instead of 0.5.8.
-	# Tests pass.
-	sed -i -e 's/lunr\[languages\]==0.5.8/lunr==0.5.9/g' \
-		setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	if use doc; then
-		# cannot just do mkdocs build, because that fails if
-		# the package isn't already installed
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild b/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild
index 7b12540ddb37..29682e6db706 100644
--- a/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild
+++ b/dev-python/mkdocs/mkdocs-1.1.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="doc"
 
diff --git a/dev-python/mkdocs/mkdocs-1.1.2.ebuild b/dev-python/mkdocs/mkdocs-1.1.2.ebuild
deleted file mode 100644
index 853c0a488f31..000000000000
--- a/dev-python/mkdocs/mkdocs-1.1.2.ebuild
+++ /dev/null
@@ -1,58 +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} )
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Project documentation with Markdown"
-HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="doc"
-
-BDEPEND="
-	doc? (
-		dev-python/mdx_gh_links
-	)
-"
-
-RDEPEND="
-	>=dev-python/click-7.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
-	>=dev-python/livereload-2.6.1[${PYTHON_USEDEP}]
-	~dev-python/lunr-0.5.8[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.2[${PYTHON_USEDEP}]
-	>=www-servers/tornado-5.1.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests nose
-
-python_prepare_all() {
-	# Tests fails if additional themes are installed
-	sed -i -e 's:test_get_themes:_&:' \
-		mkdocs/tests/utils/utils_tests.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	default
-	if use doc; then
-		# cannot just do mkdocs build, because that fails if
-		# the package isn't already installed
-		python -m mkdocs build || die "Failed to make docs"
-		# Colliding files found by ecompress:
-		rm site/sitemap.xml.gz || die
-		HTML_DOCS=( "site/." )
-	fi
-}
diff --git a/dev-python/mysqlclient/Manifest b/dev-python/mysqlclient/Manifest
index 90ae4682d769..60043f1af1e9 100644
--- a/dev-python/mysqlclient/Manifest
+++ b/dev-python/mysqlclient/Manifest
@@ -1,3 +1,3 @@
 DIST mysqlclient-1.4.6.tar.gz 85517 BLAKE2B f5e604094b06b919b92ecadc8b3f0249dd038149d1182ba882fe6b0ecd34f0bcceeed21b310318ca3291d9483fd3d1ac385c29415e07a8fbabb6cd65ccee8a2d SHA512 11ecb8a0a6f78edb193cd07472579aec1626994a80a584ff74de18774e7db8896de595f3e4d280b78e8636f53323ebcce8aa294ec7b2a54a839742d9699650ab
-EBUILD mysqlclient-1.4.6-r1.ebuild 875 BLAKE2B 1e95139a2bcd059c3f6b3d4e80467f257544501052d0d0b377e826582401b4ed8d2c4ea64e9998c0be9afc54ef3db7955681d4c8ddaddcd281a145eb230dc5f4 SHA512 4656fb343683f0918ca358735d69a1210d466a7931d5adfb146ced1265b9a9f08e1272f26a7a3049a8d3b600b9dbf27aefaf0b759ac461e22f35a692180a2dfb
+EBUILD mysqlclient-1.4.6-r1.ebuild 882 BLAKE2B cddc4e111d81da2ecb0578ead854950dfa7154a5305ad11d45c0cddeb7460756f276ab2a71b514dc5102397b3def80c6692274e57c6349898218aa9ab70a4a65 SHA512 4474ff3d671bee527ccd47eb78d646b07864db62dbf813d5ecd7378f4110f8e2cac16cfc11a05e8a603122984c24b035fa924c6b4ef5f1c8f3670056d713965f
 MISC metadata.xml 513 BLAKE2B a65aef9c59557dd33af579ee376553bd46fbd53158d0a02585b2403d6ee45acb281599ec593d5d75d69cc8bafd509a0851ab25764b5a79f3501a7cdad91faa40 SHA512 4a2756c3bde70c4fc73ba347e9648b356983662146cce5c1161f5d0c8333f795bc27d0aebe6019dcfe6402a51611dddfd87609c329a3c2fa6aa20808cee46b38
diff --git a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
index 2265e20ac85e..71fa953f1fc1 100644
--- a/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
+++ b/dev-python/mysqlclient/mysqlclient-1.4.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/namespace-google/Manifest b/dev-python/namespace-google/Manifest
index 712b9b5089f2..bc3fb8bb2bcb 100644
--- a/dev-python/namespace-google/Manifest
+++ b/dev-python/namespace-google/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-google-1-r1.ebuild 820 BLAKE2B c2c669611f1919607c764c00c5ea157b1ed956dbd4ba6c9e99f273011f472ec96ff70bce979a30fa10bc164ee3207d0cd0dcc8ef05e8fc6dc8568f1cb2a1e83b SHA512 26d7ecdadeea0488c96dc35b231c3496c0aff49b52f9183223dd1edecd6bf52f3f49ef1fa6a50026cd5dca300554cbe78c60a0f3e618d5228171c2647753c170
+EBUILD namespace-google-1-r1.ebuild 827 BLAKE2B 438d386367e9f75e01ae6a20f4c4c2baa9b63ba75562a1db795c3f3cd4ab6acd973e9976a6072705a8cad976172052d477844639fb75b703ac1b680ae41a8a7d SHA512 777f4c4eba7a6ce78286bee6795996706192518cae140f1a7bca2b4975cc13c20fd1add488fdf1d967fb1fb0cfdea577e6b5809d4fecb9ea680c93fb32f70a45
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-google/namespace-google-1-r1.ebuild b/dev-python/namespace-google/namespace-google-1-r1.ebuild
index 33e8a6f0998a..c390f6a2fc8d 100644
--- a/dev-python/namespace-google/namespace-google-1-r1.ebuild
+++ b/dev-python/namespace-google/namespace-google-1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI=""
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 26d8bbf6babe..106ce0546dd2 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,3 @@
 DIST natsort-7.1.1.tar.gz 142749 BLAKE2B dffd5b7b18ac49653d4d65ae1335c85d441748903aa983df092778476988cf0ca59c08526ee0da1761fce1afe4849d4c9a9e2f3e0c5400ebca2478781d0986dc SHA512 1903c933c6203ef0cd194ea444d79276b79ec385728a92b6e73d1698abc8e1351e96ed8ea4ae5f9f413ef6daecfd269a4d0de74c45eedff682fe929d8f977f30
-EBUILD natsort-7.1.1.ebuild 506 BLAKE2B 221ae324d458de4576654be823b0fb1e4d72cdcac51bb478e1e5c30567f6117138c7bb9fee19b0bf7be71ffd99fdbc907cf9a0106c4da4dd59ca60cf6c4918d0 SHA512 6ef6e12f9b606c88eb91ae2d879adff8538037f43a31f667ea25165a856134b6abf1956c5bbe65e64efa6c73e86f370654f1921bc73a14fc766f42eb23d341a0
+EBUILD natsort-7.1.1.ebuild 530 BLAKE2B fdf2c03b05cfa10439ed4da9b83531f267587eb1802d32ccd2cf83c8bbe395f7fecbb52009eaad020acc18e0fab851233ad8d2a459ee9170fbfd84d120b54efe SHA512 742a14a092f9bfe52ca6c1f2ddb2a0eb550a4950e73109cfbf625f8bc738eca6bd4356521ca2d3d9293678d101da8b8ae5ce864e4c900ab484acf87b49cd2281
 MISC metadata.xml 406 BLAKE2B 1bd6819234aa6417e45d2e38c65863145930ff04eccd05690ca9d210fc9572394c18ef59e0d2c5adbd6791047fc8090baca5d6ec0c1118aaaa3fa23e2fa9427a SHA512 693524d7b020bdf70374c4ab784d6e230963dde0ba168fb9b5a4c39652a81bf67feecf091720f1fc1c853830705bf7aa4da64f2c3b4e921cf316507c8a79aa17
diff --git a/dev-python/natsort/natsort-7.1.1.ebuild b/dev-python/natsort/natsort-7.1.1.ebuild
index b9d6fd8c9887..bda15089bcde 100644
--- a/dev-python/natsort/natsort-7.1.1.ebuild
+++ b/dev-python/natsort/natsort-7.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ia64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/nltk/Manifest b/dev-python/nltk/Manifest
index d65d4fb33b03..f0713b05ef3a 100644
--- a/dev-python/nltk/Manifest
+++ b/dev-python/nltk/Manifest
@@ -1,8 +1,4 @@
 AUX nltk-3.6.2-metadata.patch 1166 BLAKE2B b87a79ec16da57add95b83857c285a1d3e4907b90e9a430750f2189579b9531d1d455837506f99251468a6b53a250e5d6ed1da298cffd1805f4818d7d303bc5d SHA512 d382da1e8cee0eef56c5e85bb4a57b7ee4f150a4f42043977351b940653eddec55e67d9c404b282f7591170a7f970648b496c88d383073f8b218fdd97323f121
-DIST nltk-3.5.tar.gz 2805844 BLAKE2B d2494d831cf5503ac938b203e405ebae606166dbb907655113d3a5267bd54f03b6d8d5ac9e545fefd0b7855ce0c985064c9e746e402c540e19546e2d11ec151e SHA512 056ae219af607c158f1f2adc6fb9b4f402721778c13bf5ebc178deaf631142ad3e571d8b1fd96145067833cbeac4db25fc07c3fd032188c2d8ee7e5d7bd824f6
-DIST nltk-3.6.1.tar.gz 2820223 BLAKE2B 74ae44376e8f59e4ccfd4bdb5d6f535a8480733a2fdc6a8f1117a551f64d9f6404ca237bd27cd4a4a9d32443d38179c7a1c824e00e808868d45e468ab84eb1bd SHA512 ab0e8abc938fa0bfadc3f02dc583749775a6c06d2d2ee30692ccd9c118277fd79cfed02f858d4347dacbe87f146cb8f9af1203a8d68685f131da5f6b127b86cb
 DIST nltk-3.6.2.tar.gz 2819833 BLAKE2B 9796822c35c524432e9790d0890b4388fbaa85b659e5415037422a22e8edbaf20775196b4416f441d62592b387066de9f7741b988c0d463349fc5c906bfd75b2 SHA512 3fd2cba52377613f35f6574f859482de987f969cfc8d4243a859be365ab1bd8300f9013dcedc6caeff7aa7fc035b331a47b557027209ca9a85b0cc7fbde44d6d
-EBUILD nltk-3.5.ebuild 1658 BLAKE2B b78651baeef0a8715ad9eaa33c7e8b240aa285a24e34f5e67fda72b2ec3021248a46e0de36a1d41f8b7debeca53515943bff736323071b0e3da625bca96c1c1b SHA512 1aa2310c120f22af4f5099de7b07ad9851da3bb732bf11851d00e29fc042302bd922d50c3f827b4753685c1e23dbc95740f9dd08d9c2ca0d941dfd7bd0b2ab40
-EBUILD nltk-3.6.1.ebuild 1620 BLAKE2B f6e0423ca7ac08bff5fa08ebc0013b4fd9975822c4d37b399943fc06bc79fbc99a99da8758d13ecf75e96771c209f00df2daa45ced7b768dd1fcbe929b66bb3d SHA512 86e1d0682913de2b7a5e9f9cdb631c230857353ca92dcfa1227df82459b7e67cc2cc871dfc3533970b24e6e7d6d8982bab1245c9f3faeca21ab00fa46d5443de
-EBUILD nltk-3.6.2-r1.ebuild 1668 BLAKE2B 9ffd88dc5f8c27227920b90833678fb434a8db384eda00849b7fcb70920875debf5643ce9826a562a9a9c0404c75e27fb74808871412c887f746c764d2733a39 SHA512 7439225ac3fc2f0b0b2b4a674dac70ae0a830818f02222bd1cabe61b10eefd7c88a0555dc17c77dd7b4dfb59102b943075652d5c38835602451a1e8f5a7a699e
+EBUILD nltk-3.6.2-r1.ebuild 1666 BLAKE2B dc7af2beb009cbd1219176f728bdd1cded2edce0d663f26f9e6c9d25281aad9cb9bae78bc6c3b411fda32f9ac63bdb59c4e7585a31150430f10ce9f7dca8355c SHA512 7b643797fd8a4922c75f3624c14acaefa030d141dad4d9e82f96eb388e6d874c78f7df2b08ee4ee97a03f49c86f85e61113c579dd8dc8fc48ab27981eb6404d1
 MISC metadata.xml 405 BLAKE2B fe64d9154b1ae508bc30bf6aa0f5f6daf1b72f1f08cd9a57ac4421d93d889609eb1a656b8e95671e0235cbd8d0bbe1ddba1ec1eaa78d97b10d8cbff9225cc7c4 SHA512 a57e3953db801948b62deb294b66421e209c75995715d23483b75afe150144a821f0f88d4faad2564aed8bdd1ecf61153431c5f2fb8e42b6d017ec1c9762b3a4
diff --git a/dev-python/nltk/nltk-3.5.ebuild b/dev-python/nltk/nltk-3.5.ebuild
deleted file mode 100644
index 527521c9aff0..000000000000
--- a/dev-python/nltk/nltk-3.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} )
-PYTHON_REQ_USE="sqlite,tk?,xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Natural Language Toolkit"
-HOMEPAGE="https://www.nltk.org/ https://github.com/nltk/nltk/"
-SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="tk"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-		>=dev-python/nltk-data-20200312-r1
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-		dev-python/twython[${PYTHON_USEDEP}]
-		sci-libs/scikit-learn[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)"
-PDEPEND="dev-python/nltk-data"
-
-distutils_enable_tests nose
-
-src_prepare() {
-	# requires unpackaged pycrfsuite
-	sed -i -e '/>>>/s@$@ # doctest: +SKIP@' nltk/tag/crf.py || die
-	# replace fetching from network with duplicate file URL
-	sed -e 's@https://raw.githubusercontent.com/nltk/nltk/develop/nltk/test/toy.cfg@nltk:grammars/sample_grammars/toy.cfg@' \
-		-i nltk/test/data.doctest || die
-	# requires X and hangs in Xvfb
-	sed -e 's:test_plot:_&:' \
-		-i nltk/test/unit/test_cfd_mutation.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	cd nltk/test || die
-	distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" runtests.py -v || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/nltk/nltk-3.6.1.ebuild b/dev-python/nltk/nltk-3.6.1.ebuild
deleted file mode 100644
index d03c61527233..000000000000
--- a/dev-python/nltk/nltk-3.6.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="sqlite,tk?,xml(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Natural Language Toolkit"
-HOMEPAGE="https://www.nltk.org/ https://github.com/nltk/nltk/"
-SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
-IUSE="tk"
-
-RDEPEND="
-	dev-python/click[${PYTHON_USEDEP}]
-	dev-python/joblib[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-python/tqdm[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/joblib[${PYTHON_USEDEP}]
-		>=dev-python/nltk-data-20200312-r1
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pyparsing[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/twython[${PYTHON_USEDEP}]
-		sci-libs/scikit-learn[${PYTHON_USEDEP}]
-		dev-python/scipy[${PYTHON_USEDEP}]
-	)"
-PDEPEND="dev-python/nltk-data"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# requires unpackaged pycrfsuite
-	sed -i -e '/>>>/s@$@ # doctest: +SKIP@' nltk/tag/crf.py || die
-	# replace fetching from network with duplicate file URL
-	sed -e 's@https://raw.githubusercontent.com/nltk/nltk/develop/nltk/test/toy.cfg@nltk:grammars/sample_grammars/toy.cfg@' \
-		-i nltk/test/data.doctest || die
-	# requires X and hangs in Xvfb
-	sed -e 's:test_plot:_&:' \
-		-i nltk/test/unit/test_cfd_mutation.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_test() {
-	cd nltk/test || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/nltk/nltk-3.6.2-r1.ebuild b/dev-python/nltk/nltk-3.6.2-r1.ebuild
index c11ff6910967..6d587bba02ca 100644
--- a/dev-python/nltk/nltk-3.6.2-r1.ebuild
+++ b/dev-python/nltk/nltk-3.6.2-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/nltk/nltk/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="tk"
 
 RDEPEND="
diff --git a/dev-python/nuitka/Manifest b/dev-python/nuitka/Manifest
index af1b77c4ee5a..a1c04f503582 100644
--- a/dev-python/nuitka/Manifest
+++ b/dev-python/nuitka/Manifest
@@ -2,8 +2,10 @@ DIST Nuitka-0.6.11.tar.gz 2582563 BLAKE2B e65c3a01f3283b24aadefc47a17a41ebae1162
 DIST Nuitka-0.6.15.1.tar.gz 2712603 BLAKE2B 8e639b19975410143d1b91b4fb4f71c65bd1d9382c07d2f1f431c16b687954cec62c2e4dbe9bb1c6f6981dda1948a87040b2e300919dbe72c7d6bfd0772b73c2 SHA512 70bdb55ff4b57f06f67e3026c6a1fbeaa729e85f0a7e698ba0ab40c4acaebd31925327dd0f5fbf8187779421968bf29f9b0fbc2995193468411b40a1d30889e2
 DIST Nuitka-0.6.15.3.tar.gz 2713332 BLAKE2B e8d61221839bb961cda14575aa1de5979510113a09b7e8df47aefbf8985b09f554b32210db9b91ca5f02593a11d7537adcdf0fd67d397b022623534bb25368c3 SHA512 960f2ef33aa2c4dcb6a86ed15b8d8fc8ca1c5f26a0dc98a925e8c0669599912f25d10e20f547d51d57c0a63a18e2f07fa45141666b740b3d8804014db5b89bb6
 DIST Nuitka-0.6.15.tar.gz 2712097 BLAKE2B 78c43be4a2ef5678d7a0d6164d7cba2b3a67a738215915b001cdb3774e209fcecc167c52db4c3b22d87dde9169e48077875d09f8601df7c8b079e3d57b21aea6 SHA512 9a41e9b8fb3f51ec16dccd5415b3b7d7d201230fea6aff902931be1764ba65e1d5e4885cd772b4c1cb9f36b1b14a02a73351bc5c1b8e7f7bbb87e5d74aad16b4
+DIST Nuitka-0.6.16.tar.gz 2891639 BLAKE2B 4d8b9c29115e333b7a876eed664c0ec7b2a9b25b00d35bfb163834579b28d6b1250b015eacced01e2c27cd9841fcc5d2a3b10c626a5c7fc098914e675e3732a6 SHA512 908ddbab62a085a478f09c18215fd9b457aa7fe926e5809cd25870665366660f59141b431346e4af6593e4bb0281d39103919c46435c158af6f2ba7c354c3834
 EBUILD nuitka-0.6.11.ebuild 1152 BLAKE2B e8d9bba83ca5b1766037e8b0154839fbc456920dcec7d4762a106a09e3ee010becdf3872c8260cdf87c9aae9c5135e5383af63568eddf2aa733563237f7b5ccf SHA512 611dd278f1d44692977293c59d5d6f2a3f490c8352b50b0c2c0dd36852d175e5b6fc4be67bb8a68082245c9d27b430b0b7b8eb568f45241401d33acd697d35de
 EBUILD nuitka-0.6.15.1.ebuild 1152 BLAKE2B e8d9bba83ca5b1766037e8b0154839fbc456920dcec7d4762a106a09e3ee010becdf3872c8260cdf87c9aae9c5135e5383af63568eddf2aa733563237f7b5ccf SHA512 611dd278f1d44692977293c59d5d6f2a3f490c8352b50b0c2c0dd36852d175e5b6fc4be67bb8a68082245c9d27b430b0b7b8eb568f45241401d33acd697d35de
 EBUILD nuitka-0.6.15.3.ebuild 1152 BLAKE2B c9c2553f754f9a417ae2716bc233fd9cedc7a970608c3c778501c9441192c42c0d13e7dfaeaa0e434ebf86f251cc0581df9e205849bf53e888163b89248470b5 SHA512 e8652741f2b8c54dedb68607b3cd94a38e93651f6fad83bed88aff63bff34ea2b17ef43bfef07940eebdf099a7de913157c497ddb6c68feb26c55163288a4a4e
 EBUILD nuitka-0.6.15.ebuild 1152 BLAKE2B e8d9bba83ca5b1766037e8b0154839fbc456920dcec7d4762a106a09e3ee010becdf3872c8260cdf87c9aae9c5135e5383af63568eddf2aa733563237f7b5ccf SHA512 611dd278f1d44692977293c59d5d6f2a3f490c8352b50b0c2c0dd36852d175e5b6fc4be67bb8a68082245c9d27b430b0b7b8eb568f45241401d33acd697d35de
+EBUILD nuitka-0.6.16.ebuild 1152 BLAKE2B c9c2553f754f9a417ae2716bc233fd9cedc7a970608c3c778501c9441192c42c0d13e7dfaeaa0e434ebf86f251cc0581df9e205849bf53e888163b89248470b5 SHA512 e8652741f2b8c54dedb68607b3cd94a38e93651f6fad83bed88aff63bff34ea2b17ef43bfef07940eebdf099a7de913157c497ddb6c68feb26c55163288a4a4e
 MISC metadata.xml 942 BLAKE2B ec5857515914046bc074009149a2e830fd94da026e6563984f914d72183595617e1437e1d3dcff9caeeca20fe0f2be0cf33d45489a36bfde05b35815a9a34df2 SHA512 c2bcbedbfaf567f0813291fc890fccf9d59fa52808317cde9bbdfdda79337f15a1e6551587557bc0bf8ea27f5cc646674d3857c1c960f72469730fa23a43eac2
diff --git a/dev-python/nuitka/nuitka-0.6.16.ebuild b/dev-python/nuitka/nuitka-0.6.16.ebuild
new file mode 100644
index 000000000000..8810e82b4d14
--- /dev/null
+++ b/dev-python/nuitka/nuitka-0.6.16.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1 flag-o-matic optfeature
+
+DESCRIPTION="Python to native compiler"
+HOMEPAGE="https://www.nuitka.net"
+SRC_URI="https://nuitka.net/releases/${P^}.tar.gz"
+S="${WORKDIR}/${P^}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/scons[${PYTHON_USEDEP}]"
+BDEPEND="
+	${RDEPEND}
+	test? ( dev-util/ccache )
+"
+
+DOCS=( Changelog.pdf Developer_Manual.pdf README.pdf )
+
+distutils-r1_src_prepare() {
+	# remove vendored version of SCons that is Python2 only
+	# this should be removed when upstream removes support for Python2
+	rm -vR "${S}/${PN}/build/inline_copy/lib/scons-2.3.2/SCons"  || die
+	eapply_user
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_optimize
+	doman doc/nuitka.1 doc/nuitka3.1 doc/nuitka3-run.1 doc/nuitka-run.1
+}
+
+python_test() {
+	append-ldflags -Wl,--no-warn-search-mismatch
+	./tests/basics/run_all.py search || die
+}
+
+pkg_postinst() {
+	optfeature "support for stand-alone executables" app-admin/chrpath
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index 1c8c3c127e4f..64bf7cf8dfcf 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -2,14 +2,20 @@ AUX numpy-1.20.1-no-hardcode-blasv2.patch 2582 BLAKE2B 5057f925a12e6703ab5d9d4c3
 AUX numpy-1.20.2-fix-ccompiler-tests.patch 1616 BLAKE2B 3e2796029854207187322b1061201e7f014472c64d8c66a2dd3f82ec2eed7311f5cc3351d98aeb4b8b75d95608853066a30394e5316bb91e443744f33d66966b SHA512 5ed01b466a0da96b5d7c56b78e420d6c589c48c20053b9da66344384fa93048f90e281d3ed5caa9325f6afe00ff48841b24abc926c75aacb8a6bd5418ed32117
 AUX numpy-1.20.2-fix-popcnt-detection.patch 2852 BLAKE2B c7b97d54649e33fecfa9cdd7e79fbd6a0f599648edd9a923a4d8ff428f774813d81f045e82905e236828608f4c969e56d681a828ed0190f86f8731a2c22401d8 SHA512 cb0e461b4ec788812fcdb528be18dcc04222c1aedb9ecef96d8f0ccefd407640dfb7d10b2bd392e0e40054b016a0d023f4a397432904496b793c8a2f1fba8f74
 AUX numpy-1.20.3-float-hashing-py310.patch 4677 BLAKE2B 410438f8b9ba7bc346cd9fbb4d3087d60af6cc54b7ba4a839a1d9559d5b09db623932089ca8c34a70d30622d6260f3bff13fd2d97c94f6af437502f2e5b3c27d SHA512 a7605bf4db0886f4e7d4edd65c7b46d6b47ccb43140555cc86b35c2f003cdf29e8704593d77f7cc551f3be1550af209e7910a95e1421fe45b5d0ea5716d62588
+AUX numpy-1.21.0-no-hardcode-blasv2.patch 2671 BLAKE2B 78d7072241148874d746546ce50f7b451df4608aaf27bb469300893a0585b54f8da130e85995363b768d2dd3c8e6af10b106b3b2540ade2b53ec1a9c7b2c6e68 SHA512 f745f0e68ac6a8229b44b357a2cd45d7b606eef7e7ed43efea8d43cfd1f2670ba60cf145e9a34f858f266539164f97d7094b3b4abbd0a1bb79a5c1b2a979ae9a
 DIST numpy-1.20.2.zip 7756879 BLAKE2B 8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e SHA512 337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c
 DIST numpy-1.20.3.zip 7761912 BLAKE2B a4da49f7c1aadca299acb1b6d92deb4f50b1881c4b131cd389524a88ffc70179b2acdc88235dccd1ffd09879893db45b16bf2f54ced9b9639b806e85f7346285 SHA512 897be1cd6f3880711149dcedd838357e2d937a3c5f36b2a0db6ceed341654acf96b8b775610e1b43bdb6eacb987bbc51aaa8906244ca02cc8c2eae359ccef405
+DIST numpy-1.21.0.zip 10252686 BLAKE2B 98f69855fae35f53a3bd467ca9bc0c06438519e6dc84808de829a4b1e41402b764c35ac4f94edba72496693241f85f488d6f91c81e7e5c3e33fdac264ce9ba56 SHA512 b4653ed78030d3c411fcafc08c6656072480704379810b7e3a4d907b55c255c27dcef6d519cdc0bb2dc79324c475baf0263248fb456be18a9ce80e3a2c5c7120
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-html-1.20.3.zip 22936526 BLAKE2B 9c0bf4edea0c34640a2f2d84f117aa383f8690f5c99eb9c504aa27c07195c1e5a4219efc798398d8de709803b67d4a41a2739b1319b6dd7aeba3e70e817c2488 SHA512 181ff49fcde40f2d260e480d4a90bd8b439aecafef4ea581749b5a432c7e8c163b1714a97fd447c512b550d5bf3d9b104c575b4939eb5c8b7b70bbce1153982a
+DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-ref-1.20.3.pdf 7362241 BLAKE2B bf17564d7aea0db25ca9ef6b24dbbd25093c09e2a93bb60b69220d4e666024c50f3373fdb65aac510c06420dc415102d552fb0435e1986330ffdc41e9e356098 SHA512 316e645402125ca41d1e8b4da33374703f4379c31cf572c8ad429e0e89b6968776f480f9159bce53b9fdec918f03b82e5bb6446f127f43f138d6c0990191af5a
+DIST numpy-ref-1.21.0.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 DIST numpy-user-1.20.3.pdf 4977046 BLAKE2B 3548463cc878645bb169255d3332681685d0f05e02abf4cfcdd03773826d34f5a25c020240652839867a76258b25ca601ed292462f80bdf18b92ecfb46710487 SHA512 f6c37152228eac1fb69ddfc3a37454066ed678d57f12a587e0edcfe0adb390cc0b470384c2751033f7407bac44df9f69b0da4f3da1c300e6fc02231035ff634c
+DIST numpy-user-1.21.0.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 EBUILD numpy-1.20.2-r1.ebuild 3789 BLAKE2B 04b13cd33ea2805716faf5c2d286e3f0928eeda592c0c6217501a1adbea30e614d940732041cb4236a89966db1cebae33b437ab55a309ff6be62e81bb6be5010 SHA512 9a2bb8e998e317e540b7a0fa70979a872db8b0a99cc1e6f72d1fa0ab1c11f26551be22eff1a84b2c25e9d39934246b955ea54fc72c25b2d89badc430bf048f38
 EBUILD numpy-1.20.3-r1.ebuild 3730 BLAKE2B 7099a2b62a5d366b9a5b099fe7a8b675d1488659e48810d2e014526338ff67eec04b68577db68ce9f97b301de52dd58bd9a1df903b1b7492c6c157a34f61f274 SHA512 97c9046f0d2548cb7ff6f91c8f0d000f0e90caf9d748e9c723b957f28bdad3faad66d44b5bada93577f40cebd37fa2ad213069bec86eb925ae7c4d0b79e88cbf
+EBUILD numpy-1.21.0.ebuild 3567 BLAKE2B 8bfccf3046fa52a171d97bfe22385688d37a383a772310833fd59ead145d8ef7e1c45567ab664f3462e99595bac7411faddba01863143d553db30017f88f1225 SHA512 77e8d721c372f06aaab330c69d21eaf699cd0b04f91a1466878f9e2e89169a14979f7ec834c906ca0905ce909215f74c0b9c77f0e08b39dbbe34d07f275a83e9
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch b/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch
new file mode 100644
index 000000000000..bc3fbda4bf29
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.21.0-no-hardcode-blasv2.patch
@@ -0,0 +1,51 @@
+diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py
+index 82e864a5c..1d77e5854 100644
+--- a/numpy/distutils/system_info.py
++++ b/numpy/distutils/system_info.py
+@@ -501,33 +501,7 @@ def get_info(name, notfound_action=0):
+       1 - display warning message
+       2 - raise error
+     """
+-    cl = {'atlas': atlas_info,  # use lapack_opt or blas_opt instead
+-          'atlas_threads': atlas_threads_info,                # ditto
+-          'atlas_blas': atlas_blas_info,
+-          'atlas_blas_threads': atlas_blas_threads_info,
+-          'lapack_atlas': lapack_atlas_info,  # use lapack_opt instead
+-          'lapack_atlas_threads': lapack_atlas_threads_info,  # ditto
+-          'atlas_3_10': atlas_3_10_info,  # use lapack_opt or blas_opt instead
+-          'atlas_3_10_threads': atlas_3_10_threads_info,                # ditto
+-          'atlas_3_10_blas': atlas_3_10_blas_info,
+-          'atlas_3_10_blas_threads': atlas_3_10_blas_threads_info,
+-          'lapack_atlas_3_10': lapack_atlas_3_10_info,  # use lapack_opt instead
+-          'lapack_atlas_3_10_threads': lapack_atlas_3_10_threads_info,  # ditto
+-          'flame': flame_info,          # use lapack_opt instead
+-          'mkl': mkl_info,
+-          # openblas which may or may not have embedded lapack
+-          'openblas': openblas_info,          # use blas_opt instead
+-          # openblas with embedded lapack
+-          'openblas_lapack': openblas_lapack_info, # use blas_opt instead
+-          'openblas_clapack': openblas_clapack_info, # use blas_opt instead
+-          'blis': blis_info,                  # use blas_opt instead
+-          'lapack_mkl': lapack_mkl_info,      # use lapack_opt instead
+-          'blas_mkl': blas_mkl_info,          # use blas_opt instead
+-          'accelerate': accelerate_info,      # use blas_opt instead
+-          'openblas64_': openblas64__info,
+-          'openblas64__lapack': openblas64__lapack_info,
+-          'openblas_ilp64': openblas_ilp64_info,
+-          'openblas_ilp64_lapack': openblas_ilp64_lapack_info,
++    cl = {'flame': flame_info,          # use lapack_opt instead
+           'x11': x11_info,
+           'fft_opt': fft_opt_info,
+           'fftw': fftw_info,
+@@ -947,10 +921,7 @@ def get_libs(self, key, default):
+         return [b for b in [a.strip() for a in libs.split(',')] if b]
+ 
+     def get_libraries(self, key='libraries'):
+-        if hasattr(self, '_lib_names'):
+-            return self.get_libs(key, default=self._lib_names)
+-        else:
+-            return self.get_libs(key, '')
++        return self.get_libs(key, '')
+ 
+     def library_extensions(self):
+         c = customized_ccompiler()
diff --git a/dev-python/numpy/numpy-1.21.0.ebuild b/dev-python/numpy/numpy-1.21.0.ebuild
new file mode 100644
index 000000000000..d6940ebdf3aa
--- /dev/null
+++ b/dev-python/numpy/numpy-1.21.0.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV=${PV}
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://numpy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/numpy-1.21.0-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# disable fuzzed tests
+	find numpy/*/tests -name '*.py' -exec sed -i \
+		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
+	# very memory- and disk-hungry
+	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 6bfc9f76edef..b3ab6532b003 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,4 +1,4 @@
 DIST openstacksdk-0.50.0.tar.gz 940210 BLAKE2B 0ca7740206139ced4e8fc761cee90c7b1d3a31a6fd64afbe1de9d46552dc6fe206351854a80f4e56d5a2852ca9c2714f8e8001434fafc39e16c60b8c5c935323 SHA512 d0e69ad046712d3d54b4e21faa20627faf96d633b1eeeac09c3b9c129a5912883f22945200b65233ff8517c67dab4c6eeac73817d2fe543cc5ba05c0d751e157
-EBUILD openstacksdk-0.50.0-r1.ebuild 2634 BLAKE2B 01ef2ee64a330d3df3420eeb77da654ee7ef05287a52f058791046d83b30624e13b1b8794c61bcae0796a93e9d6a46b378d9eb2ab1d0a3771b7e4935a0d76cc0 SHA512 23f0729ffb3c37e73054f28b46f4b4df4f6eaf6703a282f653c28537db689bcdc072cab4706d986128aaf5fe166fbf0f2f5492e78cc73a284ae4c9e2105072d1
+EBUILD openstacksdk-0.50.0-r1.ebuild 2639 BLAKE2B 240d308c4f45d07e6da19cc08453ae41c8d10436384d205c7ea546c6830e6a894c53ffaef6fb867d8c47f758b6fb9ad61085011cf12cf4f4f71f0e2e533f869b SHA512 84d2231c52757d026521df5b5d0d2703dc124688d898a2f8561484775083252a7bdb9e09ca2e610095f0ec6a6f12999a6686d6550993644cefeeb4578ee521da
 EBUILD openstacksdk-0.50.0.ebuild 1326 BLAKE2B 07fece6346948f5271f30aac64518ff3f123db35da212a9f0e5c37ec96416c8f56c1d6ef14c767b5c226b0608aaebd7a9528531a8da38ac20dce104da1a0ad6b SHA512 dcecca99c2329242e4ec4b4acb296e0d36bf78142a797b1f4d0b7c640862e33aedbc784f385d770b3ee707c2596f59be006c80ac08f9c863a9e1f65b10621243
 MISC metadata.xml 523 BLAKE2B ebaf30ed0d1a7740cf6ab3d1c4166d425c52bc729aaf44984905e658dc6821756c6d652dc3ace972e0ecff1a3331147c8d016ef828f99c5fe3c1c559cec92b23 SHA512 82035e25a5b7090fa89cf36e623a972de79884ddbfdcbc3d425e989230a9e0a458048cc352f353ff9fa4c7520cd5c4d6da472862dd919c706839661499a4540b
diff --git a/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild b/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild
index 6b4f1fbec8c2..e6d70cfc647a 100644
--- a/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.50.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/outcome/Manifest b/dev-python/outcome/Manifest
new file mode 100644
index 000000000000..5bdf6413d4eb
--- /dev/null
+++ b/dev-python/outcome/Manifest
@@ -0,0 +1,3 @@
+DIST outcome-1.1.0.tar.gz 18675 BLAKE2B eef22274bb4d1ddd19fa223167b6c8ce96f015ac0b3b0609aed3717deb306087457ab068fd2466d492fcc5859d561e6d3172ad14611a937ec59a75b604565953 SHA512 65de1c0a38b8cbb041a9fc3a79518eeacea54ec87341846ae80a9a2075369f72a397f5aa747ae179eaac8f341a7e07cc1641555fbb809cc7924b2171f7f3d90e
+EBUILD outcome-1.1.0.ebuild 715 BLAKE2B f115d97b883b2c313c432d2772b63c64861fadd1f2f84832aed29055f977eb05e839a8f27257e0546f295196b08f3da2f9e40788de9c738f67dfe2c8fcb8e4ff SHA512 a91a46f6022fa56f4b603637de462b34ae1bfd3bdfe26520887593428f1995cf95e7ae5356bdedb51d8f4729399fe42735f888a7b9c293033b73b6d430f802d7
+MISC metadata.xml 412 BLAKE2B a6981a62dd453c13e7568abd6842a1e800ac403566f6a719bde8eb2cf39e85d2d23790af491e44e00219937e8ceabda6203b9a9bb94ace8b42a3b1df9303607c SHA512 ac1240cfa6facb9a0703052eedad4b22c7176a7f1b6b191ddc52b80a9de4087c5edc910cf1c9906f5ffac0d74f4b6fac18cab8c34d5f478ce6146aa78768ad0b
diff --git a/dev-python/outcome/metadata.xml b/dev-python/outcome/metadata.xml
new file mode 100644
index 000000000000..8423947bf6d0
--- /dev/null
+++ b/dev-python/outcome/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">python-trio/outcome</remote-id>
+		<remote-id type="pypi">outcome</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/outcome/outcome-1.1.0.ebuild b/dev-python/outcome/outcome-1.1.0.ebuild
new file mode 100644
index 000000000000..ca48567e6299
--- /dev/null
+++ b/dev-python/outcome/outcome-1.1.0.ebuild
@@ -0,0 +1,29 @@
+# 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="Capture the outcome of Python function calls"
+HOMEPAGE="
+	https://github.com/python-trio/outcome
+	https://pypi.org/project/outcome
+"
+SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-python/attrs[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+	dev-python/async_generator[${PYTHON_USEDEP}]
+	dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio
diff --git a/dev-python/parso/Manifest b/dev-python/parso/Manifest
index 475a31ecded1..49e3c4e3e063 100644
--- a/dev-python/parso/Manifest
+++ b/dev-python/parso/Manifest
@@ -3,5 +3,5 @@ DIST parso-0.7.1.tar.gz 399842 BLAKE2B 1e47c1dd6846d01aa5820d7cedc3eafcf12ea0d4a
 DIST parso-0.8.2.tar.gz 394419 BLAKE2B f4e86ae55140adc9bbfdd34a8044e7fdfbf9d318a6385ac5feedc07127061943c2d690581af144f158846e3bf6f82124046c7e625369a4055ab92a54f9210c49 SHA512 a90810ad89301d804d215392ed77593b015f13bc7ef8512302a8893b314a9e74c15e2aaa77157c8595a134d3481e8115f306f9628835271478837ec6f19e645f
 EBUILD parso-0.7.0-r1.ebuild 735 BLAKE2B f4a528e4639cb6eb70f830b234bd8391281571e9c7a3f21c02cc20b2361de21888be0549b356f4a9643e692fa2ae17471ff9a7a87a6edf3826afc73349441ee1 SHA512 adb6667165cee33cb3d46d737473e8d5c01b7313c88d2af8161a9933f6ac6c6ab70ea098574cf1d0f161cd5a02ca16ad2b5abb99c23ac7932a2501f8aec6a3c9
 EBUILD parso-0.7.1-r1.ebuild 555 BLAKE2B b714ae60de33af14b0093768310ce7714ca139b6d9d97641cb28216d2c4e5b2af82b7e198f21cfa8b57bbeb8fb521c7a1096beaba672aa109e08708384d6c0df SHA512 f1a064feca5a367e49a0d4c09035633ab5cf2659fccff08c158dd01693e8548c885ff656461a9b356d946447132299f0760f0bf81bc13646d100266b3135cf50
-EBUILD parso-0.8.2.ebuild 555 BLAKE2B b714ae60de33af14b0093768310ce7714ca139b6d9d97641cb28216d2c4e5b2af82b7e198f21cfa8b57bbeb8fb521c7a1096beaba672aa109e08708384d6c0df SHA512 f1a064feca5a367e49a0d4c09035633ab5cf2659fccff08c158dd01693e8548c885ff656461a9b356d946447132299f0760f0bf81bc13646d100266b3135cf50
+EBUILD parso-0.8.2.ebuild 562 BLAKE2B bf7eba8c3272bbd63d9e3d124762cd24c4c9473de760d19773deae58ecba913aeaa557d122809ee34eceb64f1f5f99170c4181889ac09e9c9751fca16fbcba0d SHA512 aa81e4af15969b635637a06ff225a2bea55c3c3b73b65d7744d9701ce7c252635440d002423a1e7a8216624f9bae99cff5322ee0997cce7c6c31565b924ec6f7
 MISC metadata.xml 402 BLAKE2B 3dbbdbbd15ec82aa4f38d92f52f4342a14b209edff3aa09b5dc1866784533e21f8c5d75146e3b9b535c01bb4dd36cd259abb2deb959382866242d99fb5d8fad3 SHA512 61cca7520333f595582f3e52602afa09d685d8072a211c4b8a2930fccbd98645c8c69ef7f687a25c05e2e2dc7ddda2fee16b7666cc2854b0b5ac6e23a95bac42
diff --git a/dev-python/parso/parso-0.8.2.ebuild b/dev-python/parso/parso-0.8.2.ebuild
index d06ec052d5b5..3ceece3224e7 100644
--- a/dev-python/parso/parso-0.8.2.ebuild
+++ b/dev-python/parso/parso-0.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/davidhalter/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index e993551afdb3..f5d455c3dce5 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,5 +1,7 @@
 DIST phonenumbers-8.12.24.tar.gz 2257982 BLAKE2B b7fa2a29c1c9a4a1029013d7de3eed9998c764a12b41a9db2db8d4c9c2fcef1bff00167809f9cdffd484ba1c9d22ef244d45e7c21bb61899a37fc4d3cbb0b6d5 SHA512 1145c527e349436ecc8eaae5bf2dc2e10d25eab73d2ab3b566d7aaddc2cfcd9ae1ada4e3b9876f133f42f7ce023c74a91e48619df69d817f74964e429ebc20a8
 DIST phonenumbers-8.12.25.tar.gz 2257994 BLAKE2B 4bcd5e21819c1f42281fc684c97d41824a0dca1fc296b1968094e3a88ff235823d76cdd3b31da68bec677aea15021689ea40906b2c50363b999958029a05fcdf SHA512 24e6f1fb903d07214eed80eefd8f67e73dd4d66f0bb66308867453d05ea1b6272a8338e11bdb45395a37eb2ce8d6c3b80d90491763f843b3da4c131b43f5db73
+DIST phonenumbers-8.12.26.tar.gz 2257950 BLAKE2B 67d146b4c82691d2d4c481dd52ae23c8ec075af0b20e64947bc203aad538e5f45f63b0827458b8504679a8f5b84782793c3c11636b344c8cb4d21b418a7444b3 SHA512 12d5daaa9f82b0646bf22ece9d617971b21bfa5ac3a9731a2917bc33e6f790a7ff1423f49da14895a8de3004babf3a83b490397b0b7551c144f4f14776d1ab62
 EBUILD phonenumbers-8.12.24.ebuild 434 BLAKE2B ca7366984b77d662a0d9239e2587005262270921ea388226c39aa9e8639a92957b3bb831b99df059a0dfc4ca68772ecc5f38a38f2953ca784eac1ae4c4e3c936 SHA512 269022a5fd237ec45e78bb73ac97dc90d7ae7b507225b8d7721d1aedc77344dff47adc5bc093a07b2fe7aa5e5e2e0a626b3477cb91a23e52d3d5c8f0b95615d5
 EBUILD phonenumbers-8.12.25.ebuild 436 BLAKE2B faa8e8bdcf8872a1ba317599365f4119cc3f5ee4dd499f39f368cb1cf3b65d8b326096cad692d4f5b9ff09b01b0482468c576989a867be35487f40625cf447ee SHA512 17b68175c9bc3356db3b33b34fa39a3db46a1415808fde79a23abf107b413856cdb889a8883dd7dfacaa1947e7e1992d2aa0c79d821bd9df34c6ddda73a48737
+EBUILD phonenumbers-8.12.26.ebuild 436 BLAKE2B faa8e8bdcf8872a1ba317599365f4119cc3f5ee4dd499f39f368cb1cf3b65d8b326096cad692d4f5b9ff09b01b0482468c576989a867be35487f40625cf447ee SHA512 17b68175c9bc3356db3b33b34fa39a3db46a1415808fde79a23abf107b413856cdb889a8883dd7dfacaa1947e7e1992d2aa0c79d821bd9df34c6ddda73a48737
 MISC metadata.xml 412 BLAKE2B 3244f00cf537fc9f8129cb4c499963a121ce2b33ea1edf0c1cc3833afbfe22c9afd5442e532b7324ccdb13cbd6a25e64e312715b13fe31ec16cf8d12a4e218f4 SHA512 a527e1c4d9bf2446bb5ef628d22731a2647bd937260f015a7cdb02c42fe3ce8a9c3d6a27660f3ab2521bf0a1400575063682dfc3faed2187edfe3f531e8427ed
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.26.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.26.ebuild
new file mode 100644
index 000000000000..0a99481a97f0
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.26.ebuild
@@ -0,0 +1,20 @@
+# 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="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pickleshare/Manifest b/dev-python/pickleshare/Manifest
index 01adea0c75e0..a8873f75bd60 100644
--- a/dev-python/pickleshare/Manifest
+++ b/dev-python/pickleshare/Manifest
@@ -1,3 +1,3 @@
 DIST pickleshare-0.7.5.tar.gz 6161 BLAKE2B 9c9327d16350b6610d9e7b844a70352c802463a110c13c670cfbd6a6cb0e82d8dea0f9eeac83cda65eeecbf27a2b8c4b1bd21809117c07eb1b67a03d3679c4b7 SHA512 6048634b7c08b6997b75be1d8fc53dd3218294e1f04c5e287ef3c6e4d80da6746fd242980f58b9671b4a4cf639a64bd25861b62fd28d435bfd2386fa655a30ff
-EBUILD pickleshare-0.7.5.ebuild 506 BLAKE2B 1124753ec9d29b9240303aeaa1cc33429978dba2201881ad9c8c16331ad30b0f7d9f27b0dea42f9673c66a599a4182952c2616703b023a331aaa9b7f156d9799 SHA512 c5e26eb0f1f7b8627ff61b37430958d173b8d79423bbda741fc4fbd8d624b391bb57db4ee962dc5d09308ff25530195cbe0ae60d0140c2e012113974da6e4f4b
+EBUILD pickleshare-0.7.5.ebuild 513 BLAKE2B c879c618a0f9bf76ec84e240c4b23fc3981b84d1e35c0b5a97d22dcd38403390c43e83bd995ee962937fcacccca548bc45bda69fce33ae270eddb1e2b2bef491 SHA512 6d6b7750e00dc3104e1b4b829083c26d17eb9a459b6721446abb0218912803c506d47d46a39561f62396d60640732619bf95acae53854c8eb41b941493e62e71
 MISC metadata.xml 969 BLAKE2B 7bbecd2168cada8eeb3db63f3b7799e0ea6b87ad9c8d976a16f731102079b5e57e83d420a05a7ad7824316b2af96a89d16308bf3f7260bd8063978186d95f495 SHA512 331d094592a66da7b84c3361dcd88455897a6d77385f82b42521980fac07d2b5e86937df52cdfcf39b29c4be779e8d9ca81f2523607ec88573a176b368914f1f
diff --git a/dev-python/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
index d8297da6c36f..b1bee1444e27 100644
--- a/dev-python/pickleshare/pickleshare-0.7.5.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index 71cdf9980977..cd0b7fb88946 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -2,8 +2,10 @@ AUX pip-20.0.2-disable-system-install.patch 1298 BLAKE2B a384ee2114e59b8bc719fc1
 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 setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
 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 4405 BLAKE2B 5c61b37de4c8be7f2bffaf54d6168f79d65ae088d9c9fc1f8f0a0f60b11fafbdee889037bbe47354b74a5d14d449870ffc8e2666695903dd159d7d7047427321 SHA512 424fdab07a6e752b2d577928399fd5fb150f214b9689a41bec6422c005638d4948d0ecf4d40ccf19e10893f08c3775a5d2f756c001f3b5d0317c87bf777af082
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-21.1.3.ebuild b/dev-python/pip/pip-21.1.3.ebuild
new file mode 100644
index 000000000000..6dddd21d4f6a
--- /dev/null
+++ b/dev-python/pip/pip-21.1.3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="ssl(+),threads(+)"
+
+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"
+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
+
+DESCRIPTION="Installs python packages -- replacement for easy_install"
+HOMEPAGE="
+	https://pip.pypa.io/en/stable/
+	https://pypi.org/project/pip/
+	https://github.com/pypa/pip/"
+SRC_URI="
+	https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	test? (
+		https://files.pythonhosted.org/packages/py3/s/setuptools/${SETUPTOOLS_WHL}
+		https://files.pythonhosted.org/packages/py2.py3/w/wheel/${WHEEL_WHL}
+		https://github.com/pypa/virtualenv/archive/${VENV_PV}.tar.gz
+			-> virtualenv-${VENV_PV}.tar.gz
+	)
+"
+
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+SLOT="0"
+IUSE="test vanilla"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/setuptools-39.2.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/scripttest[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)
+"
+
+python_prepare_all() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-21.1-no-coverage.patch"
+	)
+	if ! use vanilla; then
+		PATCHES+=( "${FILESDIR}/pip-20.0.2-disable-system-install.patch" )
+	fi
+
+	distutils-r1_python_prepare_all
+
+	if use test; then
+		mkdir tests/data/common_wheels/ || die
+		cp "${DISTDIR}"/{${SETUPTOOLS_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
+}
+
+python_test() {
+	if [[ ${EPYTHON} == pypy* ]]; then
+		ewarn "Skipping tests on ${EPYTHON} since they are very broken"
+		return 0
+	fi
+
+	local deselect=(
+		tests/functional/test_install.py::test_double_install_fail
+		tests/functional/test_list.py::test_multiple_exclude_and_normalization
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-download]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-install]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-list]'
+		'tests/unit/test_commands.py::test_index_group_handle_pip_version_check[False-False-True-wheel]'
+		tests/functional/test_install.py::test_install_pip_does_not_modify_pip_when_satisfied
+		# Internet
+		tests/functional/test_install.py::test_install_editable_with_prefix_setup_cfg
+	)
+
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		tests/lib/test_lib.py::test_correct_pip_version
+		# uses vendored packaging that uses deprecated distutils
+		tests/functional/test_warning.py::test_pip_works_with_warnings_as_errors
+	)
+
+	distutils_install_for_testing
+	pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
+	distutils_install_for_testing
+	popd >/dev/null || die
+
+	local -x GENTOO_PIP_TESTING=1 \
+		PATH="${TEST_DIR}/scripts:${PATH}" \
+		PYTHONPATH="${TEST_DIR}/lib:${BUILD_DIR}/lib"
+	epytest ${deselect[@]/#/--deselect } -m "not network"
+}
+
+python_install_all() {
+	# Prevent dbus auto-launch
+	# https://bugs.gentoo.org/692178
+	export DBUS_SESSION_BUS_ADDRESS="disabled:"
+
+	local DOCS=( AUTHORS.txt docs/html/**/*.rst )
+	distutils-r1_python_install_all
+
+	COMPLETION="${T}"/completion.tmp
+
+	# 'pip completion' command embeds full $0 into completion script, which confuses
+	# 'complete' and causes QA warning when running as "${PYTHON} -m pip".
+	# This trick sets correct $0 while still calling just installed pip.
+	local pipcmd='import sys; sys.argv[0] = "pip"; from pip._internal.cli.main import main; sys.exit(main())'
+
+	${PYTHON} -c "${pipcmd}" completion --bash > "${COMPLETION}" || die
+	newbashcomp "${COMPLETION}" ${PN}
+
+	${PYTHON} -c "${pipcmd}" completion --zsh > "${COMPLETION}" || die
+	insinto /usr/share/zsh/site-functions
+	newins "${COMPLETION}" _pip
+}
diff --git a/dev-python/pockets/Manifest b/dev-python/pockets/Manifest
index d1b7466ecead..a67256a4f6af 100644
--- a/dev-python/pockets/Manifest
+++ b/dev-python/pockets/Manifest
@@ -1,3 +1,3 @@
 DIST pockets-0.9.1.tar.gz 24993 BLAKE2B 9962655f755bb96853f1b4450f2bdcbd111ba945dc3a5cdaad84bb43a84150e7384ecb3c5758274b9cf578adc1c8991c163c56f72a00a00bf8fed634397e02af SHA512 436f2fd8cfb9c5612733b1163d381f52c28b8749de28f5e0de609d012ccfc10ad77a31851d3e1010feef5b517f287f1e5c7fc4b447e7b080e5536fdaf8d2e9d6
-EBUILD pockets-0.9.1-r1.ebuild 493 BLAKE2B 64e7593cfa950732b0f59e329d5df0f3a0d66dba259dc931def798696ddd67af6fff36bb6bc535c5818690bfed3297c9ce9bbad1d9bf64291e691678a1cfb398 SHA512 64311081932abf091cce72cc6df6da1d24ffea2293b2392153020735000dc1661ccc9730bc66901ff6c9136a8479a802777d7eec300c77c59b12b5e0c4016fdc
+EBUILD pockets-0.9.1-r1.ebuild 595 BLAKE2B 05dbea40222ecd161b81ef971a96486119fe3e539766b5836df97a951280bdbd2326e8456504d9b27427c624b3e14d72d1e9fc5010886d71c14fb9df55020b33 SHA512 b01b2a6a5886a4de0937de8a47c0266546ab0922a065013f440c3f20ab7a7131a808fb0a873fb45a5e34749ae9b9c095d2cb38f7101fb95728b4dc52d298df02
 MISC metadata.xml 331 BLAKE2B 57ff3f70f5b0cb42df8457080661731a0441e28a962e97106bcb0d7b53250d28dbd1278bab79ec649aa23e13ac6244b124df55119b62a55877381dd1c917f6ef SHA512 4f0519feb2582567a86b066ceaefffe6d1b11c7b50afe60b5a730045bcacfac0a8b24f485cd4ad3faed9b03fec69278d7eb8ba33fe72269bdee274ac05185707
diff --git a/dev-python/pockets/pockets-0.9.1-r1.ebuild b/dev-python/pockets/pockets-0.9.1-r1.ebuild
index ba43bdbdd2ce..4abde4b91189 100644
--- a/dev-python/pockets/pockets-0.9.1-r1.ebuild
+++ b/dev-python/pockets/pockets-0.9.1-r1.ebuild
@@ -19,3 +19,8 @@ DEPEND="
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
+
+src_prepare() {
+	sed -i -e 's/description-file/description_file/g' "${S}/setup.cfg" ||die
+	default
+}
diff --git a/dev-python/priority/Manifest b/dev-python/priority/Manifest
index 9b190dc0e6f4..faf9250e2d5e 100644
--- a/dev-python/priority/Manifest
+++ b/dev-python/priority/Manifest
@@ -1,4 +1,6 @@
 AUX priority-1.3.0-test-timeout.patch 716 BLAKE2B b48691b508a4116c9656acaa3a31871e5c8a66c45d6724506590c95e09eac027969def8198c5bdaa14e50cd77ea105881b7ddb7f36c95665502799f5ea751b6d SHA512 9e809600bc972baf4e1f5366c65db5e5d050bcfd0df23da3d1f75f653a0fdc27f7e4a59e96e13bd42636360653dfdc1de1991e6684e95bfffbf0c4384d7dc550
 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
 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
new file mode 100644
index 000000000000..ddf8d8fde3dd
--- /dev/null
+++ b/dev-python/priority/priority-2.0.0.ebuild
@@ -0,0 +1,24 @@
+# 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="A pure-Python implementation of the HTTP/2 priority tree"
+HOMEPAGE="https://python-hyper.org/priority/en/latest/
+	https://github.com/python-hyper/priority
+	https://pypi.org/project/priority/"
+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"
+
+BDEPEND="
+	test? ( >=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/prompt_toolkit/Manifest b/dev-python/prompt_toolkit/Manifest
index 9501cca795f3..226e04c3cb26 100644
--- a/dev-python/prompt_toolkit/Manifest
+++ b/dev-python/prompt_toolkit/Manifest
@@ -1,5 +1,5 @@
 DIST prompt_toolkit-3.0.18.tar.gz 3034754 BLAKE2B 27334b7009fc162af67a1fa14bd30c76efed6a333c5c93f3100a2c9ad3299a1139c3c3cf530e7e048b5700c0dc4ec1087d1aecd5412785b09221ea2d55796008 SHA512 be2dbd72a1e08553c0e50453958b6085a7d743464acd02b303e5002e1174d672d2cadd7a992e71d0445aa2f2be7565411ae4d00c3677c275eca056a20ad9efc8
 DIST prompt_toolkit-3.0.19.tar.gz 3034818 BLAKE2B d1f0741931d4711952cfaabd992e64aa3fd252627c50f2a0ad8ad1aef5882bd4ae054c0d281b141595488fda6328c102f900445a42bc32cf018d37663deb2cb5 SHA512 0f3f7c5a2d12e03e06e900a4239f86f27d959fa7337d072dae8c79bbcd2ffd4c1026d1531210e34a4f4669d483b20b9d2f49c7625d0d7aa1fcb1e3f9f3894349
 EBUILD prompt_toolkit-3.0.18.ebuild 598 BLAKE2B e287f94484ff34e154da4a9a30c5d76303a0ef2292637e70fe4e88dc16102d8454dd89f2a4b1e8543a707e1231786215677963f99383037e46401826e9040b2c SHA512 4833b51a432cb17b2160c0c989e8f623254c7476bbb5d6f94e5319d1e2917dfe3bc51c449e6416fa145903eae67a3c286236b7bd3c92f8b87a2bd02b444c694d
-EBUILD prompt_toolkit-3.0.19.ebuild 609 BLAKE2B 1f27b3dd6540ba8ef0d4a90d26bdb132278885b006f9ca90d8efa4e89d86507972791dcc732563972ee52520f45ab57938447b690c077d64905fb4158e47b7b8 SHA512 a60ad2c90f9e14a7e52b0009ef59d6554bd10f383fca5e954a0023ec5a902c97b84aa3da07cff5da726794ad07df2b88b0f154f06919ff46f0c472b6c1e5ed67
+EBUILD prompt_toolkit-3.0.19.ebuild 616 BLAKE2B a509e86e5de45b98d31e0ab0d722806081a3ebb29fd7838e2e9a393d41d8071205885241254fdde3f1a9268bbe2b8ac03a70a5ef688e73a06d92203ddbdb0e7b SHA512 db2014b268513f765bafdab0b598cef114f31f8d1b0afb3d3dd1f9124dbac95cd3372794dca1af8d2d8820e5f66889d4092ca185c1820f3bb6184763968da88c
 MISC metadata.xml 430 BLAKE2B e3e66ce24a2ac8bbe9d6f6c0bef07dc0bbc3222ca281cf374abb492898428de9f84404b5575b122cdd1dcea44faf395350a14f4fa985d1ba29681ac673560132 SHA512 259a53798ccc14411b01184139e72d633473e2539d7c93911cf71db94bbb01166de3b3abaa76fa32b51e1107cf0ffbbc84644d8c8615ffd3a0e95b95e1f4c5f2
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.19.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.19.ebuild
index 258d32b73b8c..1a3d2d6f58fa 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.19.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.19.ebuild
@@ -13,7 +13,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 ~riscv ~sparc ~x86"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index d2008a485f3b..7071c36e08b9 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -10,6 +10,6 @@ EBUILD protobuf-python-3.16.0.ebuild 1590 BLAKE2B 09843dba7ac5025af39e727967bd7b
 EBUILD protobuf-python-3.17.0.ebuild 1586 BLAKE2B 9d20c8ea57558ce75e4f4b9f457f5491c2c364a12bcd12ada9c81cb36b480e2c52a2710fb82654709a251b74f74bce3edec14c6ffc55857110860315a362cd0a SHA512 f0f2223c67cbbc2212b58a1efca1eae4fc92ebdf9b67e04262f43ba816bcc3f96e1bd40ae00787a6a9026901ed25d4e7812b6d1bfe46b0f9124caffe3acaa5b3
 EBUILD protobuf-python-3.17.1.ebuild 1586 BLAKE2B 9d20c8ea57558ce75e4f4b9f457f5491c2c364a12bcd12ada9c81cb36b480e2c52a2710fb82654709a251b74f74bce3edec14c6ffc55857110860315a362cd0a SHA512 f0f2223c67cbbc2212b58a1efca1eae4fc92ebdf9b67e04262f43ba816bcc3f96e1bd40ae00787a6a9026901ed25d4e7812b6d1bfe46b0f9124caffe3acaa5b3
 EBUILD protobuf-python-3.17.2.ebuild 1586 BLAKE2B 9d20c8ea57558ce75e4f4b9f457f5491c2c364a12bcd12ada9c81cb36b480e2c52a2710fb82654709a251b74f74bce3edec14c6ffc55857110860315a362cd0a SHA512 f0f2223c67cbbc2212b58a1efca1eae4fc92ebdf9b67e04262f43ba816bcc3f96e1bd40ae00787a6a9026901ed25d4e7812b6d1bfe46b0f9124caffe3acaa5b3
-EBUILD protobuf-python-3.17.3.ebuild 1586 BLAKE2B 9d20c8ea57558ce75e4f4b9f457f5491c2c364a12bcd12ada9c81cb36b480e2c52a2710fb82654709a251b74f74bce3edec14c6ffc55857110860315a362cd0a SHA512 f0f2223c67cbbc2212b58a1efca1eae4fc92ebdf9b67e04262f43ba816bcc3f96e1bd40ae00787a6a9026901ed25d4e7812b6d1bfe46b0f9124caffe3acaa5b3
+EBUILD protobuf-python-3.17.3.ebuild 1593 BLAKE2B 38ec65726b273ec5d9d6f63ac1fc73e4c38f0a4df481a5bd0c7af9acefc71df499ca6f51e2e65a1e7f4411ee2a4174da4f2ea4f8ed6448e0c39e5c69c079fd0e SHA512 4e7756e6e08cfd774f012d97dc42dc071fb09590a87fd956d6fdea97d830b96cbd856057b548d0d35449730d0f7b143ae9428c50a30efe91cfceb2dec62bb4b5
 EBUILD protobuf-python-9999.ebuild 1488 BLAKE2B e2fd094fc844aa663c5601f9c3a4d16889a7ce4c378b06568d9ae6147bd21348b954e75e228cacd7359dc8d4d2ddeb4da8f248f6e41d9c640d598b3493ba4938 SHA512 a8d40bfeef805a8afeb01d51198692fbbfe264315aeb8f9c56baec81686c80b2c4862f49be5c05b638bf1c75efb9395a014c6cddf4c3c8d4c27555eab6131cb2
 MISC metadata.xml 553 BLAKE2B 21140c27d2faef17e40528a3a90790083195432bc84b8af3c7f34c836fdacee20acb517cbb1ba15e7c699faae125fd9bc2f40ec5398eff8f01a882a5a02bac3d SHA512 6dcaac2b38128ac9f13de5f4c38e8e10b3e85f73b7777fc12ac15229bb2c94aae6df4e135540d01ae33658df524bf3a6519270c59f1d4f06355f3d786607a13d
diff --git a/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild b/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
index 94a49219ee7a..d9e5ad54cb4e 100644
--- a/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.17.3.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/28"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyclipper/Manifest b/dev-python/pyclipper/Manifest
index d45e017520dd..c27c7bb427d6 100644
--- a/dev-python/pyclipper/Manifest
+++ b/dev-python/pyclipper/Manifest
@@ -1,3 +1,5 @@
 DIST pyclipper-1.2.1.tar.gz 51862 BLAKE2B be59011d44ba4364e3e0d1d789c10f76635a5bc690dad8030104fa7965cc118e3529bf6505e5c4e743a8ff21e0d24129be716cd91e09b7521baa64359de364ab SHA512 0fc411bd8fa33fc3e5a71ec149b720b5c2f2e9a5e704d5e175b5930e0e073bacfd26b68e19c00802ab68e7a8946bdfcacae858e2d6d81b87d85b3747fa4a316b
+DIST pyclipper-1.3.0.tar.gz 51405 BLAKE2B a7a3e81452c8178d907528b7595fb92521dfb039a6ea116d7f189639ea2975d8058ac1f685a211c98be921c41a694d89f7f431264dfe366e3acc842b25d670f4 SHA512 bee6c5f835e84baa65cbca1d812219bd94272010bbeed365b3835ef3d191042129fdcccdd85ce7841f60f46cbfd52edd270d108ff81d64b0ca712c1369394d40
 EBUILD pyclipper-1.2.1.ebuild 784 BLAKE2B 5a715ed6e4d4bb14f288ace9aab40b979f641d8312e0f55507435daa0021c42abfd1063842ccd3a8972d7001710038abbe867cbf4dfef249364180cc1562f093 SHA512 33ac5860b47a74be93deedeb60888ce6f8c9134839afe8a6adb8f9fd8473221ffd0fd10106dd7f86eee182fe43c851ea71f293669378dcc484cd90fa0a749fc2
+EBUILD pyclipper-1.3.0.ebuild 811 BLAKE2B a8d1d0c90a6997525589c5b136776fe4d956382d045dd3823824865e16026e864eabfc63a9fe2db68ef2ae48e7dc916a62d1b6f86c8d614a583cfe6f533be78e SHA512 4bcbad102d89e991cb47c9ea4016225c7a2355c9a2029f9c8e3987f5e40237721af7e669a961a95181b8daab55f93aa7d2547bec4424a31b8dbdae65f08ff0c8
 MISC metadata.xml 315 BLAKE2B dfea428911659d721c46baf73e32549fd98d51aa056ef26b98f305f447292b75a1ddde062602dbe03cf4b7f4e08d0a32a7e085463df1e650ac40f997cd6c0c9d SHA512 15f70085b3bba01136c37bc97ab84749d0d6f99e785c753929c00c3f9de7cec360804f44001954db05d650eae634038791533a1d02e9e1286e8fcdffda3bf597
diff --git a/dev-python/pyclipper/pyclipper-1.3.0.ebuild b/dev-python/pyclipper/pyclipper-1.3.0.ebuild
new file mode 100644
index 000000000000..3bbd1db8a19e
--- /dev/null
+++ b/dev-python/pyclipper/pyclipper-1.3.0.ebuild
@@ -0,0 +1,30 @@
+# 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="Cython wrapper for the C++ translation of the Angus Johnson's Clipper library"
+HOMEPAGE="https://github.com/fonttools/pyclipper"
+SRC_URI="https://github.com/fonttools/pyclipper/archive/${PV/_p/.post}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P/_p/.post}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:from unittest2:from unittest:' tests/test_pyclipper.py || die
+	distutils-r1_src_prepare
+	export SETUPTOOLS_SCM_PRETEND_VERSION="${PV/_p/.post}"
+}
diff --git a/dev-python/pyenchant/Manifest b/dev-python/pyenchant/Manifest
index d9bb2b54e95d..35ad4aed6ff7 100644
--- a/dev-python/pyenchant/Manifest
+++ b/dev-python/pyenchant/Manifest
@@ -1,3 +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
 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
new file mode 100644
index 000000000000..d8534c8b1067
--- /dev/null
+++ b/dev-python/pyenchant/pyenchant-3.2.1.ebuild
@@ -0,0 +1,27 @@
+# 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
+
+DESCRIPTION="Python bindings for the Enchant spellchecking system"
+HOMEPAGE="https://github.com/pyenchant/pyenchant
+	https://pypi.org/project/pyenchant/"
+SRC_URI="
+	https://github.com/pyenchant/pyenchant/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="app-text/enchant:*"
+BDEPEND="
+	test? (
+		app-dicts/myspell-en
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 4d8a1a106cc2..c51c7cd6f13a 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,5 @@
 DIST pyopencl-2021.1.3.tar.gz 447070 BLAKE2B fcd8c5d06de9c14a7bcf3c3d37f89cb208adf0225cc88a081aefc86aac82a99026183f2c9975f34cd8247f784335e4ba6c0a09164ce01e527123b5c1dd952a76 SHA512 8799e73b3b1596387f619fd997f643228679fb1d9ab5ce6704da9df51922f96229efc98ab6b7a7361234848078b15bc67946a4188f4d17cb8760040b48b346e8
-DIST pyopencl-2021.2.2.tar.gz 450053 BLAKE2B 577e328aa5999b499aaec759256b60c1ef5e41ad8d9e19ffafa9b1e7562e5f74f15f2c8ee344f4f2bd80c27375d6a303a813f80241932d22988f6afefa61d6c0 SHA512 ec148d5b05f8df62d35ddf85d156e75ef2effab6dfab12a998e8a79cb559313c5a7fc1b680790eeec12f4f31fb5af80e46c6a18e8b641b6485659a5c89758735
+DIST pyopencl-2021.2.3.tar.gz 450895 BLAKE2B 0395ee6ef32baa57fe9df0c9960f5d761cfced1cc8b87e51e7ebcc7cda6a6b651fc491acf6be525239576fedec2a8375935799fc77568e131dcb26436a59c6f1 SHA512 41ef44eac0112ceac15c1260198a0bd642c244f3ad45aa1d7feba70b55a3f257ce01f7c5a8eaf2ce1df263492452055286caad004101d8bdb2d4f7307fb339be
 EBUILD pyopencl-2021.1.3.ebuild 1491 BLAKE2B 627fcf87c2a199260cb4697729d7fffe01dd0da7e0146fe6c981a7e2673c97496bfb1d90fd5c7354b64bb7a7f871d46b692855db6111f9cb4f559595de0f90f0 SHA512 820bbe51273f64d1f5aa2e781e68baebbc6ebe014b281b3c477876442e9a218d3cdad26b693aaacf48fba07df450d4c754b7356c140c553de9e6908b6af6447e
-EBUILD pyopencl-2021.2.2.ebuild 1493 BLAKE2B 7d112cc13cbbc739e3381905e67af5fa82e7f837a2213d414bf1be2fe33a63182783e47a5aa0f781846e338646e24b95c6c4cdd429f0bf37e09f07fe53328f43 SHA512 3ff3ec895dc210d35a32f41e72e8e4dbe2a0f7a601e61f8f6428aae41a6543ae652e85e805d9d781aec3968160ef32142638bf1d0a04da6ff35e630cc0ae1123
+EBUILD pyopencl-2021.2.3.ebuild 1495 BLAKE2B 31a08609895d8c8f7f7e3578bc02a13d4be00b0bfc3c18fa72790b61294e8b139aafe497e9acbc3aef4556b001bbab8189a6032b116a76e82d2bd36ba4c78f84 SHA512 8aa8bc4ab3bf426cab9e441489c0d537e51306ebef8a5fe2d26f7e6cb37599defd807ec140611c5d0fdc6e6a139ab84eb8d8a80bbbd43820b71bd8dd04863571
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2021.2.2.ebuild b/dev-python/pyopencl/pyopencl-2021.2.3.ebuild
index a1278e628527..32a5237b3e9e 100644
--- a/dev-python/pyopencl/pyopencl-2021.2.2.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..10} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
@@ -23,7 +23,7 @@ RDEPEND="${COMMON}
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
-	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 DEPEND="${COMMON}
 	dev-python/pybind11[${PYTHON_USEDEP}]
diff --git a/dev-python/pyphen/Manifest b/dev-python/pyphen/Manifest
index b7205ea38434..cb7c12215809 100644
--- a/dev-python/pyphen/Manifest
+++ b/dev-python/pyphen/Manifest
@@ -1,3 +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
diff --git a/dev-python/pyphen/pyphen-0.11.0.ebuild b/dev-python/pyphen/pyphen-0.11.0.ebuild
new file mode 100644
index 000000000000..9fd945456c9a
--- /dev/null
+++ b/dev-python/pyphen/pyphen-0.11.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python module for hyphenation using hunspell dictionaries"
+HOMEPAGE="https://github.com/Kozea/Pyphen"
+SRC_URI="https://github.com/Kozea/Pyphen/archive/${PV}.tar.gz -> ${P^}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="GPL-2+ LGPL-2+ MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	>=dev-python/pyproject2setuppy-17[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# avoid dep on extra plugins
+	sed -i -e '/addopts/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index 04f11f7f1760..51c3ddd3c77a 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,5 +1,7 @@
 DIST pyproject2setuppy-15.tar.gz 11796 BLAKE2B 7fd7176fa611e293d35db0cb91a029c0896921947252ffba51ba25599fab5ebe7d4a5c2f65593ec83bfcc180983de6e2022053bcaa3583c3f6cce9640e57c5f6 SHA512 dee048eed352ebf178981fdf9fd69143a72658d9161e2d65257001b3ee6773bb7040d12145e79496cf141cdf86aa5e5eeaf4de7023c4e721a3d978f9eb267374
 DIST pyproject2setuppy-16.tar.gz 11902 BLAKE2B 13b9188d46064644ec5c549bdfaceef1a3df2da0d333cec37e593231cdcbf9277c81b32a95a2d2355a995feaec605bb0bb4610e51b1c06c1c3b50b3c9a73e1ca SHA512 e8e13644e5c88cfcc9f06ee9ece5c715ac1917d1eac9ba0d7a68a71d78ce84f50229890442c5c41e766083c302ae59f67bd20736e502615006cf35c41c2d3a9c
+DIST pyproject2setuppy-17.tar.gz 12191 BLAKE2B 5be19c9e70abf37d776649237581b1cb281331585c6ffa312f63e50bd2fd8104972861b38958272d5eced086b2a60ed370437807d1eeb382e4ad0cde5f03b0db SHA512 0291f9ad1c3059a4ccd366d8f1078ffd57de89cc128e996126f62a92ac4dded9c7da25be1325ca9f660062ba3a65fd01d62d4ffb22084cec7f4aba79e552ae2f
 EBUILD pyproject2setuppy-15.ebuild 781 BLAKE2B d403d6dd98399d391ef1ddb3201fb950f1cc99efb8e2f4761be7ad2b3b1b09254d86d19473b838b7c9e2a7fd0d359a6434174f0d123fb3bed848d0dbf4d62028 SHA512 2abbd4d0bed4683738b352b7f32629069bc29892077e72209dc591ada05e5276f36f2ee6f551a39ccb3158738e9270c59452e7c2ea46336158385c18334093f2
 EBUILD pyproject2setuppy-16.ebuild 789 BLAKE2B fe0e00600f65bd19118748c645d47c6bdc820037a301c847ea5070e7d6d73e469130fd9fbabc01facf39bc93dfe3edc7ebcc5c2c9511bda969eed68d03d228e5 SHA512 2e839ed0a1bd1e69ef9d505c0e2ff0236e093d76bb1018908f08207cb9830bb018c2d1ed8f511e6ac78f9525b533c1a86708b74f2e69bb0dcf3f2277a41a9293
+EBUILD pyproject2setuppy-17.ebuild 789 BLAKE2B fe0e00600f65bd19118748c645d47c6bdc820037a301c847ea5070e7d6d73e469130fd9fbabc01facf39bc93dfe3edc7ebcc5c2c9511bda969eed68d03d228e5 SHA512 2e839ed0a1bd1e69ef9d505c0e2ff0236e093d76bb1018908f08207cb9830bb018c2d1ed8f511e6ac78f9525b533c1a86708b74f2e69bb0dcf3f2277a41a9293
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-17.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-17.ebuild
new file mode 100644
index 000000000000..bc478cc41369
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-17.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/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index b39c3ba0e489..1a5e34c8f5d6 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,5 @@
 DIST pyrsistent-0.17.3.tar.gz 106911 BLAKE2B 90a05617ad1e32801286d3da834bf52b4ea864e7463a0789904e4a3bbfda2f7b987e13ea93e16980f2cf3b5d999e6040b7c5980a81b516999175b4e5f2ed392e SHA512 2d18e1d4cfe9a0a576fd363f466ba920094af0b1cbbb49aec11b32df6c23e59f6552235a496838dab00928cc7f6dad2a4a8aaa0b52cb6a38eba6faedd12846c8
+DIST pyrsistent-0.18.0.tar.gz 104215 BLAKE2B 028c26a6b4bcaa8c3e3e1ad1748a6b45f664355c66f0f97c70e4d26c66946a55b346d0340c2e697e9890039692580c03032055cab7c198c39530e5561be83801 SHA512 f56062430f914a884a9317ecf5278ccc09d98f1d6867716f89173db47996b8d4c1ef4f5c0121c955d81fc4fe8aba7d30f38679baea6208168c3952846064cfeb
 EBUILD pyrsistent-0.17.3.ebuild 603 BLAKE2B 176343e3253e7f347dbea0f041d2cce8fff737a077966ff35a9732ff41960af3becc8bdbe7f3ffe0576009dca09855a093ecbe1c71faca9a0df131835f819087 SHA512 4e3b82ad673aaa549926ba6816a4554f26f8cdf514987894b8f0b0aad31602870bce140c2224fd4d70ecc8dfd6812ffea377651424db349818906a1320d2987a
+EBUILD pyrsistent-0.18.0.ebuild 610 BLAKE2B d1b0db46505e54524dbf865ce9ad3fb9fb9510b386893faf0d15d3c61bb427210d5221ad989abbcf8a8a497d8dbbe59a4309ec4d91f2149a1347dc3d5f59b50e SHA512 430a05a93db3aa6609e71dc7938915d051f44fbfbaa61cace01ce3ce8421b977573d3f987c30355d7291000c4fb861be4d81d27137818b184b771cd81c68e189
 MISC metadata.xml 521 BLAKE2B 45117f7fb0cdd4111f444279144a45d49984102e114ba758260dc69b313ec818a4556a57a682f6762522a71a810855ead85ee667dd7524de16d97b37b77d5cf2 SHA512 f16890488984b1d31c74bb697f38d0d880390f8633347db56ef4633e77f502bfa56d9427ac55bd0da4d3edc6e8e1897f6e76b37ba75d3b4b738217607e0883fd
diff --git a/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild b/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild
new file mode 100644
index 000000000000..2fdd1872803e
--- /dev/null
+++ b/dev-python/pyrsistent/pyrsistent-0.18.0.ebuild
@@ -0,0 +1,23 @@
+# 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="Persistent/Functional/Immutable data structures"
+HOMEPAGE="https://github.com/tobgu/pyrsistent/ https://pypi.org/project/pyrsistent/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index 45d922ce6d82..eab7bc63e7ed 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,5 +1,5 @@
 DIST pytest-django-4.3.0.gh.tar.gz 71525 BLAKE2B 0eba9d9917759369aa2e126539f17fc36874453caf59838be2baf660fe29487aa80490f2af4ecbd72a9ba1f63a8a87202af2eff7e9d28c9c0fc686b09b07e82a SHA512 3c3ac31ed75daa29ab473ef3b87b5c66333cf7ccd8d217eb120b7899f463aafe5982b1e867e26e3b9ab51f312612fbc3d9f1ed9169815507816267fd4de76757
 DIST pytest-django-4.4.0.gh.tar.gz 72905 BLAKE2B 4532bef9afdc7f11fdf9a16f019810d10e4e580b517958722184d361a69a195f6c66f7f3bc18be6cb7f63fe4576963c59a00d72bd8a42f104d26e5ad091c6d54 SHA512 47e4a84606aeb6bb99ed74603faf988298d52f81f74ec8e4608cb670f0f331ad0c6555f3e4a516fc7834aea4e634f849dc0ff6d446a86e924a116fbe90bd79e0
 EBUILD pytest-django-4.3.0.ebuild 818 BLAKE2B b27be5e4ef794426900ad4997bfeee3437f326baf706945efcec9679f1969435a96aa5c5ad58051ded1834bdcd4e20dc3e000643f20bc06c6a2ea7a935b0d089 SHA512 103a3ede84e5f4110a89abd25bbd0ed4b7d5d860399e912e7b1673e046b58a35c1ff21e4ee9e3a4647e1d4f5a01f7c75a0278f46033d1a5cdb34441e7e9051cb
-EBUILD pytest-django-4.4.0.ebuild 1283 BLAKE2B 541f6c141e1d928dbd62b85bffd4366862712913bcbb25b0f87b79413c1e4f7a65139f14fff125d77bea91b0b3b50f486ae5e0bc1265d905789c3bab403cf408 SHA512 1b59126b4dd169d2ac64a0cba46e767f3c36d0702629319b19c5d7ebd68c6bec861c2bc342536cf99d9cc9fc1dbfcc50f4553b62e1c382f03e4faf4cb0b2951f
+EBUILD pytest-django-4.4.0.ebuild 1290 BLAKE2B 5485f3b3a0685d11d34267831f9c41e2dccb086e3873b7cfec931a1ccf719d49bf037bb0e0dc2c1712a3a9f9a442b6787576ed7950c845b4811d05576b78c7f9 SHA512 bb0d2381f2d5450565f064d923488eb6139cd47f426deaf598bc6d7525c1ab2263a005be86f7a64473fd985b5a9cf04966df56dac10c96dd9bd05a73491ec542
 MISC metadata.xml 404 BLAKE2B 24556c59793b77f5c6de6f5c1210575d7bf7b5dc55aa7427d630d21311a77b31e3c846d5198ebf9b0407a0b1a36eae17bbd37a988c376eda666680871de30ea6 SHA512 33db1ea8ab6490e9b09daf334f48aa8db16db565e264b47b120797aee63c08c99aa27cae3c0a55a21c87552f99ad1ba9a13ba3b53e4562608209efb87a227268
diff --git a/dev-python/pytest-django/pytest-django-4.4.0.ebuild b/dev-python/pytest-django/pytest-django-4.4.0.ebuild
index f37ed5ce4ec9..8f1caf61c800 100644
--- a/dev-python/pytest-django/pytest-django-4.4.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.4.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-ordering/Manifest b/dev-python/pytest-ordering/Manifest
index ea277cec6530..fc592dfe143f 100644
--- a/dev-python/pytest-ordering/Manifest
+++ b/dev-python/pytest-ordering/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-ordering-0.6.tar.gz 11046 BLAKE2B 468ae5f04029b96ed3058b7f429aec0aaf96092453b229c3de5eab174702af2c1a9fe83171c68d282c4a144b3dd736daf9ed87b9e139a7bd175114f504049ebc SHA512 fd3aec83914f64d1295e1a1bf3fdc580c6824a749a1da8cebae275fef940d6ed6e5dcafad321d94f504a153e13e298b6544dc3c2db716a6b25d3148c2365fe15
-EBUILD pytest-ordering-0.6.ebuild 845 BLAKE2B 4cde2668ad80a3b9a568d788572bf3fd9c849a25e84b1c93eb611e5851bce038e3f31920194b566eeed770d9b5121814a8795b4f9e20a276899e07056b4b0096 SHA512 51512b09c06247a775a9bce133073e0ee034fa3ef14d425451f32a13979d1f0ebb1e3832f12ae55a0e73c2f249087c5a440a9878d8bbb909811fe4d00857a05c
+EBUILD pytest-ordering-0.6.ebuild 852 BLAKE2B 2f5ea8166dcea691c196aec86c79a2eac7ecfc27fa8e470a057938d583c7ada7fe19d1a00f5c16436c9b4969314087895d87da177d87248b6cc8c423732813bd SHA512 d443affd46d59354437174e7e2541eaf4da64fa792fd1bf096694b5224e6796674204ac9f6e3b1fc6aa219b7af143f3766efcc234a9e821944b789ce0ee55ef6
 MISC metadata.xml 422 BLAKE2B 428335d7d103e4ad6722a61bd4367ee07370c3a73f628496b73ec9fe11b6e49ac973838c790237ab489c66bb4354d098aa46a456ec96dbeb42fcea0e8a7cff0f SHA512 e3195a89dbe739651d06ed2e996877469d1c39383d2377ae5d56d56d01ed0ce9edc2e1274e3711d00f7a95d3e5ffd23cb2592e462ffb9e535995b32ea14a8fba
diff --git a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
index 06fe691e0796..553f01d42fb2 100644
--- a/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
+++ b/dev-python/pytest-ordering/pytest-ordering-0.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ftobia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 
 RDEPEND="<dev-python/pytest-6[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pytest-trio/Manifest b/dev-python/pytest-trio/Manifest
new file mode 100644
index 000000000000..0b0a172ebfa3
--- /dev/null
+++ b/dev-python/pytest-trio/Manifest
@@ -0,0 +1,3 @@
+DIST pytest-trio-0.7.0.tar.gz 47784 BLAKE2B 59b28df45e87804e0b6eb557a0cf259fdc3636cc7a03d78248fb814d55904ed01d00a530b194b2bfe93ccfb9de528d70a372faf1f6db24531c230319122db2e5 SHA512 547036c94f33cf8e755c88d608c5fddfa5c583fdaa7e604598d470e250a006c571702a81bac4f273b74450a8c10e4be404bad74d4104403fe1c9c70e872dff53
+EBUILD pytest-trio-0.7.0.ebuild 1072 BLAKE2B 3fb2f11af8ba24b57cf3ce03b5829df8b27d5eb5ae83c15b140ac418519fba125bf4eff58ea8731cc14be9b6cb237f3deafc0deeffa16134bf2b94e457b41bd2 SHA512 40fc06af79f7937cda2482c69e1ed4a63bb4dbf936f7dabd8b8c48afde991d9503f03e32859f5a2519d7e00c2e79dce58e152ada0ef5890936e9cc664499ba2f
+MISC metadata.xml 419 BLAKE2B e4bf5b235b2b851e2677e138ab488308deb5265d00afa1c5ff2760e817c7a8c9fdbaeb095bf63ad6c9ff0a5dbb60df5c047b6ab9564c590becb7da76a3258db0 SHA512 1d21a7481afb771ee6507f6475f9460bd0f8441de68987e2a31923091b33bba4a9fe5d6a8ec0b313d8277942656388c1ae6fb9b7cc0de601655762b66b111e0a
diff --git a/dev-python/pytest-trio/metadata.xml b/dev-python/pytest-trio/metadata.xml
new file mode 100644
index 000000000000..e724d1bb8497
--- /dev/null
+++ b/dev-python/pytest-trio/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="github">python-trio/pytest-trio</remote-id>
+		<remote-id type="pypi">pytest-trio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
new file mode 100644
index 000000000000..5f6946b22be2
--- /dev/null
+++ b/dev-python/pytest-trio/pytest-trio-0.7.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="This is a pytest plugin to help you test projects that use Trio"
+HOMEPAGE="
+	https://github.com/python-trio/pytest-trio
+	https://pypi.org/project/pytest-trio/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
+	dev-python/outcome[${PYTHON_USEDEP}]
+	>=dev-python/pytest-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/trio-0.15[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx docs/source \
+	dev-python/attrs \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinxcontrib-trio
+
+python_prepare_all() {
+	# Defining 'pytest_plugins' in a non-top-level conftest is no longer supported:
+	mv pytest_trio/_tests/conftest.py conftest.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index 5d15b87e8194..8327f7ab65a2 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,4 +1,6 @@
 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
 MISC metadata.xml 447 BLAKE2B 3a50201209da0fe9153963a3c84fbfcd72eb2a9065c6ef2dc6d21436d12269d6188e7b5c3bf88688e91bdde0e8f33a1adf9d11e084cca4ef796435655ec32765 SHA512 54c833fe01cfe54156de60c39d5cab5f9324074ddb2efd0c8294cc55d3ef599c0c65e911855c93bbb4f42cdec489dc5b337b0a0a53113816110321ea291538e1
diff --git a/dev-python/python-debian/python-debian-0.1.40.ebuild b/dev-python/python-debian/python-debian-0.1.40.ebuild
new file mode 100644
index 000000000000..dfab437931aa
--- /dev/null
+++ b/dev-python/python-debian/python-debian-0.1.40.ebuild
@@ -0,0 +1,36 @@
+# Copyright 2011-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 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-dotenv/Manifest b/dev-python/python-dotenv/Manifest
index d97664d3ef1f..9878595f075d 100644
--- a/dev-python/python-dotenv/Manifest
+++ b/dev-python/python-dotenv/Manifest
@@ -1,5 +1,7 @@
+AUX python-dotenv-0.18.0-second-entrypoint.patch 582 BLAKE2B 48921b086c2d4dcf86aafa743d78767a1dce50b447f429232614e9e61cb222d0190f0b1e65bf98044b286746f6ad3c3706a987fdbbb51bdfef6a9baa721bafb0 SHA512 bc7c5e35823730ff520b1862af1807dd4f0f21152bd9ae5df7d79020894df0ecf9bf785ff157b99ff668e1e23c227f8a461e13be0fb842ce06d2b1ebc1752e0b
 DIST python-dotenv-0.17.1.tar.gz 31608 BLAKE2B fdddfa1c39282ceec03fc1569d9a7d038e91a046a1248dd27af011dc60361f06f5324504d623a6109d783bb3b5ccac7cae758d918b17f5b0c65a1085bda627ea SHA512 42cdca1356ac2ad80884a5bf3ed419d1202d6a54746f7a21dc9c1bc7579383ac5c72e8b708bc33dfea3904228125fe7b3b2190bfe53e8b4767f5223d59050417
 DIST python-dotenv-0.18.0.tar.gz 32242 BLAKE2B 6cbef7ea7278a3114b3eaea2ede0c68e2c6dcc3868f655dbcad9596ea6e1ec0b9f5d183a73fda32e53d348ae23c11ca3f9d2e8eadd974eea4dd13903b9f9c845 SHA512 4b120ee45602ce703ee360fb5af07a8854bcb1ecd9084057e00324b152cf230fa6f065b374b6eebbfb7069b32762624ea61dd5d2fa6ac62cb7e3a2bb6ddfc1ed
-EBUILD python-dotenv-0.17.1.ebuild 658 BLAKE2B 351ba0bda692ac281e924ed3a5c66e302b78a611b7a381c6dd7fc09d955ce5c386a8fa56bc4394430f69bf852abe47d7a8508067434246e9fb07311547400686 SHA512 261bb061544b4de0a3374e86ac272176f010d960ebf8661b990b3104173527fb0ec0fc69439abba10380c6bc2e4138e0ccdf98027e588bb1d076668a60a9344c
-EBUILD python-dotenv-0.18.0.ebuild 626 BLAKE2B ffa78d2f5bb37c74df4cf620fe47fe8ca7658cc748e50de88d23820aadaf63055946f5bd26e88dbc11145e738f8a22a66fbd9313c70c6a7d8039a5cec7c0d4eb SHA512 8d5d3c31b77a3f457e4526ab176d4fc84b78387c000513623d3a6622ecc4884addb986c79f6ead9767d836045c9f17c287f7a898f2c985f9197e34e88d68eddd
+EBUILD python-dotenv-0.17.1.ebuild 699 BLAKE2B 30991868d0fe6e918e73ac6a627cb310221caf566dc6675086674fae634e0206c883ced4f34e89c8abc19518461ee41ffe880e9a18220f9a7e00a6c1c4171639 SHA512 4bbbfa7542acee21adf7f946904dcd56026186aa8737a5877b15c0d2af47efae1228b1956696fae57ca83c2b6a1fe2d35030ebe58c04164cde781bd824686c61
+EBUILD python-dotenv-0.18.0-r1.ebuild 838 BLAKE2B d543c9d99fae04ee1e45371c1d4c111f8a149814680321c262e7062825c5f39e0fa8e8391b56d056db070bb9e9fb2a5298674fcbe7241c907d9c6792a9e00394 SHA512 dc4cbc2c3ed28a1ffb438f0ebef946afda630d0ea070cd76c2a024130550f03d5677f40536e0875f28479e5f50b7fc46497ac8c91416edb953bf6761001962bc
+EBUILD python-dotenv-0.18.0.ebuild 667 BLAKE2B afa1384333768d7c865ee8c1410e7b2d54899c185fda2940d4dd05a184c78ef334be98db6c05cf093bfdcaf64293d1b4ae2123e036a78124d2f27d4a69013ac8 SHA512 5409f429cbb14e907cd20df27fffd4fc1b8c9ad7ac3a26fcc5ff6c99160baf5486f89a443ea96c0d062547ef4a8b49c92f86ae015a273b2e15cca581b7ae41de
 MISC metadata.xml 465 BLAKE2B 9b67c317b80cf8956d86e3482f9bd4b8824013c758e13c53865c4c8b428127a39188b23776176e038b4e58f8eb4e28b6ff7030df75a300bb647f969ef979a551 SHA512 f4bbf11566f50c90aeb7684755651f9112d3ce12dbfc425aa209eeff7c5a2636688a9236bd5227961cc334c07c82f49da0f4f27c3189bb7a0a8f76b517e9036f
diff --git a/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch b/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch
new file mode 100644
index 000000000000..9d69c8b6b008
--- /dev/null
+++ b/dev-python/python-dotenv/files/python-dotenv-0.18.0-second-entrypoint.patch
@@ -0,0 +1,24 @@
+From c57f0aa05145ff84b708ffd64106ae741096027e Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sat, 26 Jun 2021 01:38:14 +0200
+Subject: [PATCH] setup.py: Add second entrypoint "python-dotenv"
+
+---
+ setup.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/setup.py b/setup.py
+index fd5785a..bb31c40 100644
+--- a/setup.py
++++ b/setup.py
+@@ -42,6 +42,7 @@ setup(
+     entry_points='''
+         [console_scripts]
+         dotenv=dotenv.cli:cli
++        python-dotenv=dotenv.cli:cli
+     ''',
+     license='BSD-3-Clause',
+     classifiers=[
+-- 
+2.31.1
+
diff --git a/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild b/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
index 037518dc4898..eabf304977ad 100644
--- a/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.17.1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
 	)"
+RDEPEND="!dev-ruby/dotenv"  # bug 798648
 
 DOCS=( CHANGELOG.md README.md )
 
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
new file mode 100644
index 000000000000..aa3667814def
--- /dev/null
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Manage .env files"
+HOMEPAGE="https://github.com/theskumar/python-dotenv"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86"
+
+DEPEND="
+	test? (
+		>=dev-python/click-5[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( CHANGELOG.md README.md )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.18.0-second-entrypoint.patch  # bug 798648
+)
+
+distutils_enable_tests --install pytest
+
+src_install() {
+	distutils-r1_src_install
+
+	# Avoid collision with dev-ruby/dotenv (bug #798648)
+	rm "${D}"/usr/bin/dotenv || die
+}
diff --git a/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild b/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
index 3fd9aa665e52..e412eed05fb6 100644
--- a/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
+++ b/dev-python/python-dotenv/python-dotenv-0.18.0.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 		dev-python/mock[${PYTHON_USEDEP}]
 		>=dev-python/sh-1.09[${PYTHON_USEDEP}]
 	)"
+RDEPEND="!dev-ruby/dotenv"  # bug 798648
 
 DOCS=( CHANGELOG.md README.md )
 
diff --git a/dev-python/python-levenshtein/Manifest b/dev-python/python-levenshtein/Manifest
index 4607d553e148..4465f878af45 100644
--- a/dev-python/python-levenshtein/Manifest
+++ b/dev-python/python-levenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST python-Levenshtein-0.12.1.tar.gz 50567 BLAKE2B 795c377a29045caecee245b23138ef5499691177e2d50f1729f3145c667818b34a2c05e86e5fe8317357570347e7b21188fb64a84e85cb9645513e19f1438509 SHA512 e5b9dfda4ebe1f1111e2ac86219be5659a763368759d13393bd32c6c5d78d9b183c757c7e8ff1bd8a2f73450f0a255cc78664f03d899e1e5af2e58d871843722
-EBUILD python-levenshtein-0.12.1.ebuild 647 BLAKE2B 0948343d474495e5d581f7af75580909cbd4d915ed6cf698c27828f5adf0f351aeecd02532e71384042a680eb946535b53748b9e626ac091127f2dbae123bf10 SHA512 1a311a8f92a80be82c32072ea39c606c75edfb38e887cfc2f06b2305083f795a55ac74826626449b16571403a0b40112e0878d843d1f704bbbad1b2cb256e91f
+EBUILD python-levenshtein-0.12.1.ebuild 654 BLAKE2B 7a4cf340392e131a2c5c5f25f31d1af090d5b5e4af21b572110110ddeced9dd7a4ba6fb6defddccb5f8438cd9382872800eb923555c8c4765d946f79a248ea33 SHA512 c510723ab3e21c8b8e17533c3e399b4438efbec7f976cac171283d85cec6d95c05bee79ddf3e7dcc2cef65934d6ab684f3c3aac6e46ba64cdf46007d64512800
 MISC metadata.xml 385 BLAKE2B c550a5bf9e27b3e514164ec28c311cfef21144c746e71dbb4ea8554d87cefa97c4a94ead564a557e15bda4f60cde32cfd3cb5140524a711bf57ac72e75103b82 SHA512 4314a89127d81a04635029b87baf8b9d71b931441d6e5ffd01b96fa9cf9fb5b2f1ed5c4ff2ab4f5befab2fb0ccec8890601e98ab2bcca93da548e07bb6ffbe57
diff --git a/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild b/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
index 4a5de3c0845f..41e500bef28f 100644
--- a/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
+++ b/dev-python/python-levenshtein/python-levenshtein-0.12.1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc64 ~sparc x86"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 2424c085282c..365e02d1d123 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,4 +1,6 @@
 AUX pyls-fix-test-with-pylint28.patch 9964 BLAKE2B 8f8f4a2a874f0f4a3b146463301b997b82a0b05d662451faf77994ede1057f7be71e2916d74944e0b30fb6d6c0d7b7a9bf5eb651085033b2279974d2005191a2 SHA512 248bfc639c6e534ddaa7775ec09e8c108e1ab8b071b99e2b9fb855c22b9427112a6e46e6f9261150700ecc752206c36a99398973bc8a10b48587f12bc42bed7d
 DIST python-lsp-server-1.0.1.tar.gz 56835 BLAKE2B 430e215b7d65bff2008136783539c262ee201d651bf83750333d41353483882fe7a603208c2725c89530a34cef22e73fe1ef26ec80fe7fb42d2df79eae511528 SHA512 bf116d92bdebea41e4f6647673d390887d84be70d612b92b8c3973aa55db4b151c1188b06fb8e3b6dccb814fd22f938572e998f0b1329bf0b69d0e4750b8f5f6
+DIST python-lsp-server-1.1.0.tar.gz 58194 BLAKE2B bc1d542e90a1295e7bddf68d366a738b371895a453e8fb7de5b0d688c49b45b9c3441d479c1f760291e32eedc6fd42cb5ee0966ed32a10ee7f883dee3559932f SHA512 fd9f1985bd55f93740671e83696b02567b12b9b77db14c495482494d23f0a73b2048d99fce9c1be0b7d7c847f213a681d379c342d128a95cf40bd3ffeca9766f
 EBUILD python-lsp-server-1.0.1.ebuild 2286 BLAKE2B 13a703acc5377bf150118ca12f626bb8bf4025df6499f0dd1bf9ba0d8f504cb0cc1505355f94262a4336f3328b778682a0144bec6f022161eb6c9f3a034c07ee SHA512 0dd9e1d7e0dd54da5f9a2986eb7dd72308cd053d10dd563dc7efe99c2e7ed7287d7c15a3e83a6b34bf51f2d5be73cd6905e2307ca24bb26f24003b1e9cdb5c74
+EBUILD python-lsp-server-1.1.0.ebuild 2333 BLAKE2B c4cc7c4391c57be88ff269d5ca84af0b9257d2ecc8d599bdd4041c3860beb9bdeb2aa675d8ff64bc1f59ef77cfc0de2417cf855dc57c4657dc54b7a2add517e4 SHA512 1378780230a14f885b4575b9082af179840c961a87f6e90df60a548769866a17bd229ffdda337e5ab7f147aa45dfca388734ad20e51e0295228799838d08b800
 MISC metadata.xml 463 BLAKE2B 4b7c9f0dd4bf6631ed4da34e4c048a5ce16b676b6c56a7f7598074db744e1ccff4c977b5dfcf46d77221d9b1821e56df1722a626f02a6fb7f7c6ba303308c514 SHA512 f868ad2bb319f1ababb0d9a70cb368dec36935822678a6bc365eb2569cab661d300d4d347cd207f6b2f537b5ffebb84dd804fc2faa35cf85f17d437edb177eb7
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild
new file mode 100644
index 000000000000..7bfbc16308b2
--- /dev/null
+++ b/dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python Language Server for the Language Server Protocol"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND="
+	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
+	dev-python/pluggy[${PYTHON_USEDEP}]
+	>=dev-python/ujson-3[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e '0,/addopts/I!d' setup.cfg || die
+
+	# This test is continuously breaking
+	sed -i -e 's/test_folding/_&/' test/plugins/test_folding.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+pkg_postinst() {
+	optfeature "Automatically formats Python code to conform to the PEP 8 style guide" dev-python/autopep8
+	optfeature "A wrapper around PyFlakes, pep8 & mccabe" dev-python/flake8
+	optfeature "flake8 plugin: McCabe complexity checker" dev-python/mccabe
+	optfeature "Python style guide checker (fka pep8)" dev-python/pycodestyle
+	optfeature "Python docstring style checker" dev-python/pydocstyle
+	optfeature "Passive checker for Python programs" dev-python/pyflakes
+	optfeature "Python code static checker" dev-python/pylint
+	optfeature "Python refactoring library" dev-python/rope
+	optfeature "A formatter for Python files" dev-python/yapf
+}
diff --git a/dev-python/pyu2f/Manifest b/dev-python/pyu2f/Manifest
index e7d861ba3c9f..dcbc9cb1723f 100644
--- a/dev-python/pyu2f/Manifest
+++ b/dev-python/pyu2f/Manifest
@@ -1,3 +1,3 @@
 DIST pyu2f-0.1.4.tar.gz 38797 BLAKE2B 4240083b03bd596d1f87e42047980ab7c75d0064eec0ed2050d77bb92d26fac651af515c2c9b10d338e27ecd778e80ff47b5c33a68cd86328dc913c0e70cb1da SHA512 16f948b812edd5f0e4d97350872809b7c1b52f38eea49170e4aa21e0f695935dc0d71d4fa077ee1c1a3ef2f0711d62f0cc49983a89c841aa31aadf7b76340035
-EBUILD pyu2f-0.1.4-r1.ebuild 936 BLAKE2B 71298156888834f5aa8e3249b0b17943f53af0fe10fe6b49fde6b29cbaf0daaa8c9687f85cf47f924f6a9b601b3730d0ae49f8f09a58175fe2b835702e4e8bc4 SHA512 c72b578fc38bc9eb368c8ddcba959df77333ee87e695e8b947fe0e3820c348930b5b7e99f084d7034bcf141b6a6eabe4e9908837105f709e05c2d76ca81a3bba
+EBUILD pyu2f-0.1.4-r1.ebuild 943 BLAKE2B e296d5681b0d08734b49d9bcd030606df114557e19bb9175c6116f1fbe8ef1a306dada7bfbabf08688b1b6d7c76470fc9f035f19ae8a7f8cd40e33490d3861fd SHA512 4ec28baf47ab4242534be583d3f6a9f2d2aa0dde65b799da1e0174b7853295f27180b237219159fae74ad4021e7cf13ee76dcf8efc6de6cea5e8500f93081904
 MISC metadata.xml 364 BLAKE2B f739254d4208658fd33151170987b9214670cf97ec8babc6c97ea4acdd19f3cd29f35e9d719b8462d90fbf0ff71e3bdbf30cadc2fd91ee54f2868018cddeb220 SHA512 d1f71740b09b54385ca269bedf3ce44ac424272e69881245a77796eb6c9e618e63c8837009d097b43dee477c765adf31b9e4bab7fa26606e57c3894c7bed429e
diff --git a/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild b/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
index aeb26bb83da2..5c2de55fbadb 100644
--- a/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
+++ b/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyxDamerauLevenshtein/Manifest b/dev-python/pyxDamerauLevenshtein/Manifest
index ad90ffc228de..134fbb575c72 100644
--- a/dev-python/pyxDamerauLevenshtein/Manifest
+++ b/dev-python/pyxDamerauLevenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST pyxDamerauLevenshtein-1.7.0.tar.gz 41867 BLAKE2B a8fe379a10bfd37e1675dab83d83d1b53308b5539c86e31f507a0243da898d57c4d320661642e23be439c4aabf88b1aaa559bc620e193e58586568cdfd8040df SHA512 11704d3968261cd844ce248c913f1b9baf813d0f8c712971ac4ec05466f8aa5719932e282b49e378d6799ae88483804055765a881d3cef8e7adff486b450e98e
 EBUILD pyxDamerauLevenshtein-1.7.0.ebuild 536 BLAKE2B d466bbebf0120387a47c3d4201581b1c09822f0c4797f3d1d4639ba37d41c44c242132b6fedee4531b3f9024c0959a59229f47ffcaeb1c7d1c5ab65788a916c0 SHA512 121dbcace2efd346a384cd59606e1ede6eee1307a5db094914b5cc40bfa4fc31d22947c688b1912b49cb756710606b7e773d03a5c6a250b72b6da0c4789adacd
-MISC metadata.xml 438 BLAKE2B 00de77610517b9aee2f1dadc9e6867350337982a71fc23471d06e369cdbde8c76a1957eb5bf417ce6b39bf45a15b1dd04b6734448710875bc66cef725a072961 SHA512 0ee101c503f1c162efac623dbe7f58664b8b46a389f261d93997d7b5cc40d9c3f25211109089c19c97a3cc014b5d206fbfcd94cf0958fd13a236ea52ce7a2eaf
+MISC metadata.xml 414 BLAKE2B 48de5d98fcef6b8c2deb0ca89662ac5d571c05d496779548b89a4c3dff03efb64deefc009736b94affb7066cfcfe46c597ded43e6bb64a01853de66769124c4d SHA512 1a022ac4c0ee8115b44bf88426eee0899e35fa563180b2add0490c4e3cb581b0618d31c54aefe09bda0ceb4a1b3c57814ce3b02abf1e23912b1da81eda24d102
diff --git a/dev-python/pyxDamerauLevenshtein/metadata.xml b/dev-python/pyxDamerauLevenshtein/metadata.xml
index e20cbddd254b..5a2a2d0429aa 100644
--- a/dev-python/pyxDamerauLevenshtein/metadata.xml
+++ b/dev-python/pyxDamerauLevenshtein/metadata.xml
@@ -9,5 +9,4 @@
 		<remote-id type="pypi">pyxDamerauLevenshtein</remote-id>
 		<remote-id type="github">gfairchild/pyxDamerauLevenshtein</remote-id>
 	</upstream>
-	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index f0ec27c33b56..b542e938363d 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1,3 +1,3 @@
 DIST pyzmq-20.0.0.gh.tar.gz 393041 BLAKE2B 1f22f556f5d0f2755c2e56411fdb9f583bbdfad6315e4e72fbaa1fb18d0ad5436ee0ee8d17497641421cea3f4e1b53b8ff85bf7ced96c8f1c80db0be901ca3d5 SHA512 30359e501e76d6ec14175622d6c970d9ec0f227b372d2b1c6e6650be812dd47017b797a016f5a2da83f72d00536e64d2f005a38003c9a1b4fbb7266f2640782d
-EBUILD pyzmq-20.0.0.ebuild 2666 BLAKE2B 8d23eb2b74d3ba408f57b5c86a310188ac9fb32984e7bc7a051bc555c45d9a67bb3867e9a44c8f172f45f594a83023ff71600f19946b49b6a8004ef2d0a96cdc SHA512 400259fc32cb283e2746854d625bd925a6f5976d0917da0981ddb2534c6e3ee6b41d036797b1f780bcbf21bf82ba682f11b54f7df440606962d731bdb39b6634
+EBUILD pyzmq-20.0.0.ebuild 2673 BLAKE2B 50c577da5d69834d1cd3f6ab350e198c94fd42f348827b1267b6087064204fe7f416690b6805c8a1145c786941d2fb1f2510af8fe4b4954eac7c6cb39bdc301e SHA512 010d9e997d59887f85911753b0dde3d5932c6872c6a7e06595a8e81f3e576fd73e2577ecde4206bf8372b0d6671c80b50b5adda98f42d9b69c51c7da83ab9344
 MISC metadata.xml 428 BLAKE2B 36d5533b4bcb9fe9aa69847e05599da6400c634c73f1f00321e0a4492b053fbc9e1fcf0f9a22782162b8bbafadb9a343b19da35e732e7898fb3784473564438a SHA512 af1c8716dbd0846be80b90587ffec0c51e0f56f277a659cce15f1114cc0d3889ebe9fd92fdbcdc62b04a9919f48037b44153f7cb5e66d4719ef649aec933ca12
diff --git a/dev-python/pyzmq/pyzmq-20.0.0.ebuild b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
index 0fb0d72966d6..27c307eec8e9 100644
--- a/dev-python/pyzmq/pyzmq-20.0.0.ebuild
+++ b/dev-python/pyzmq/pyzmq-20.0.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+draft"
 
 DEPEND="
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 702c16cb20fd..233d51814911 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,5 +1,7 @@
 AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79ccab0eb7ccc28ed306b524b0fced1a37605c0c957090c39c5a0b71dd6d3c47c60cb7b714142a2f339170b7dcd965363ff2df66 SHA512 32fbd4410846ba4d0a3a8a5521f21f445f76ee75d0adde6ade210816901f1bcffc511efe3822c9b473d71b3541a716f9b2a3aa39181afb21de3aad9d13026476
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.5.67.tar.gz 2911726 BLAKE2B 8dbd3bb54c2c651616c3b6be905ac7b43b3a8f30f630d2f9b91882416cb4513751affa507870fdd801b5aa53480498ecc9a5fe3902ab38d72288b6f48ce892e9 SHA512 5a0ec58f0ee925079f3756bac309bd5aaf159118a4ed7ec6467721ead23e5db37839014bb49f1804a0dee4532ce21f9c78adec99ec61a4aeffd957184d489a6c
+DIST reportlab-3.5.68.tar.gz 4512985 BLAKE2B b38fea7704fcf08ff25d314286830473b90e75a80bcc65fc7b2cfc4c270347aa7c68f31716e635048428c24bb0ca0afc3d0e22bebedb1d1bc50901c13d278fc4 SHA512 4d41f9d9708d2bd172928985e1e2d22ffcc61d2d6fb21bdf1f3275f9ff576f06e712cd9c9d1707ff364608ad8bed6c30754893a7b142dc3accd6eef8aa19c975
 EBUILD reportlab-3.5.67.ebuild 1492 BLAKE2B d9b54242e7d90d7ab8df30cdffe52fb2ac3ecfc8b4727f7c631fee7d000f7e231a097dbdc67ea0999bac6360da963c43c05231cf61c20cd8c66e113e1b3e30fb SHA512 5401c2173c88acb054c37ac0acbf894d2c741e391300cf38e042b90115de07418639ce65275ca0edfc11a7139b43371487f58ebb9356f32b53a7edb3013b7dfd
+EBUILD reportlab-3.5.68.ebuild 1499 BLAKE2B b49545fdec1a8e65d73d157fc2e2fa20d83ea2d3e87c901675def17712ef56869e9e2c905bff0138d859902a78a401c97e462d6ad4ad976972e6b5e12ca53c72 SHA512 be3712634f72644c9d5ae78e5392e6a2212d8d9d52cf31839b67b796c2e358fa32a4339ba3dfb39f1e0b54261f88c9b7b74964aa723a360241aefaf3f0fb5586
 MISC metadata.xml 1972 BLAKE2B 92f398fa2c71a354bf25e35578038cfe62fc7687dd9f378574d7221d9982fb96f668f63fe8811b8e189eecd9f02edfe44d53cd17471e226cae8e5ee742ad0872 SHA512 363607498faad8268e3e9aea57f52240d8f5e7f0f9fa48436d7383b16138ee6e2eba87bfd54077dd475a37201324dc83f05a0c53d9c8eb5941be4026f3454fbb
diff --git a/dev-python/reportlab/reportlab-3.5.68.ebuild b/dev-python/reportlab/reportlab-3.5.68.ebuild
new file mode 100644
index 000000000000..e525a1a47f9d
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.5.68.ebuild
@@ -0,0 +1,66 @@
+# 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="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:="
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip"
+
+distutils_enable_sphinx docs/source
+distutils_enable_tests unittest
+
+PATCHES=(
+	# bug 738312, remove -L/usr/lib from link line
+	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
+)
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+python_prepare_all() {
+	# tests requiring Internet access
+	sed -i -e 's:test0:_&:' \
+		tests/test_platypus_general.py \
+		tests/test_platypus_images.py || die
+	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_configure() {
+	mydistutilsargs=(
+		--no-download-t1-files
+		--use-system-libart
+	)
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-python/requests-kerberos/Manifest b/dev-python/requests-kerberos/Manifest
index c239f2b1432e..8367a4b558ed 100644
--- a/dev-python/requests-kerberos/Manifest
+++ b/dev-python/requests-kerberos/Manifest
@@ -1,3 +1,3 @@
 DIST requests-kerberos-0.12.0.tar.gz 21579 BLAKE2B 297cbecb0fc3508f5f62440c5860dcd94eeb077e68757c0646e7e3bec65cd34e19212b9992dad491ce0adeb91234db533528936f740599e42ff439f78af103ba SHA512 b925b5f9f6753e87368dce451927df09568d0d6126d4ae8514bbd99a794d983e32298b92b6239be9f95595483e2682259cf165c6997d17d9cea64a81d4af1a06
-EBUILD requests-kerberos-0.12.0-r1.ebuild 801 BLAKE2B 36e0bcae4f70c9e628e76800f761d8fda7def102f9ccf0b3a21b92cd8e71f0ba8e27d7e25adacbce7a28d811ac7ce937f203795c7133c5c3d868610b7a2b53d9 SHA512 b0fd4926966c9d74f40da302184eea10456a5510deab7ce7182ff1bcf7064e7784a6d5832f37d374023c0d41c3f3290110d514f9f203e36bc31c20b79ec1aa7c
+EBUILD requests-kerberos-0.12.0-r1.ebuild 813 BLAKE2B ef06da51557c0735da67f9cc0b0ec86ebcf67401eca0bfa6f6f1e508edaa66a57af3d5def1e380b8ca75841a96772801a7309b612b9580afd27abbc014edf237 SHA512 9e79694513d9eb3e8f2d5410bfccd7517f26d73cbe77e0fed9ea44c72419e38c582b3ba405f0da3a65cf8c8e9a960654b7e035788f8a360c7ca80ef029aeb1d5
 MISC metadata.xml 386 BLAKE2B 6eee29cfd3bc3387cf97222bd167b60be9c45f8d0dc417c428241660c8151f74d284423f7a7c324d652f99f677c86b34e48fe1a627cdae52af349f37e7a77aa8 SHA512 885e86f315747187bff26ee29b88892a93712250923b5ec94a7baa1e30cc4e28cced1d93e055eb4a0bea15362fe9047d133747812393cd83ee327b9092a95127
diff --git a/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
index 7fc7fc968c67..9fee5e2978af 100644
--- a/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
+++ b/dev-python/requests-kerberos/requests-kerberos-0.12.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/requests/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/resolvelib/Manifest b/dev-python/resolvelib/Manifest
index a490b3d08584..3ae66107045b 100644
--- a/dev-python/resolvelib/Manifest
+++ b/dev-python/resolvelib/Manifest
@@ -1,7 +1,9 @@
 DIST resolvelib-0.5.4.tar.gz 14474 BLAKE2B d1424bf6a019e16e9b662741b6c089258bfef26d5bffcfc9e0c8d9ba105b689654fdce7bf9068f71c49a2ce590f05c16b93c53bbe468fc1a339e7fa489adece2 SHA512 cb027c5478c217f6f8288b42a933665aaf6e59280e7aa88a25f6594e589e34ac2b75734764e331d0889ad9cf0c60b8cbdfa14b01dce023a76870bb21cfc4d926
 DIST resolvelib-0.6.0.tar.gz 16471 BLAKE2B 2cc7b616d1818588070e84f42c195b828f32da374b5cfe16d89ae0e32bf6d8bf0fca37065f570f1ddf4e769b9eab5cc3082ada1a1d907f258e099c45072d3f2c SHA512 7d73d9368783bf5657b95c19470d4e8c444bfce3902fd986f80f5ad44d04f486046113c540c879601bcc29a420630a74117bb5f6b77ad28fed75c94769deeac4
 DIST resolvelib-0.7.0.tar.gz 16439 BLAKE2B 5e48f3b5618b84498ec5646e4ef502c9cf1ba6ec720ea450064983d26c8890a6399839261f92a471bb5f235c6c7d976bd7a1c0e2ccc29ba51c0fdb740ce607a6 SHA512 4cfc4ca58c3308209b4fc5c96e8e379a3ec897943493478cdd5b63a6edc21c7c416877eb3ce12954be98131e5f37a9727d753347414790c625284a8e9dc393ea
+DIST resolvelib-0.7.1.gh.tar.gz 764630 BLAKE2B 32c50ef0a16e07716f18994efe4b2bd212a2ee5068ff155526e17358e3bbe4c92c4d59817c17de152882a738c924c7f5ba389d2a7d13ee1b2dc0de54e8175c3b SHA512 de5c1c29790ce1eb4393021f17f1a19a0f2de29e5d8688fc307e412d80052319b822bb24fceca47fe550e21393ee38d58fa6e6cfefd207b7a88b632b9670d282
 EBUILD resolvelib-0.5.4.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
 EBUILD resolvelib-0.6.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
 EBUILD resolvelib-0.7.0.ebuild 514 BLAKE2B ddc301b7c8b2e4f0a8a6b9ffa5fd6491fffffa7a156f98968c560e4b86c044c4c07b75c3cd61eb5f088987d1e0255dd40edf07ca76db86b619cc311590be75a4 SHA512 6cc501ae8d9dc932dd90fa6da5e45f2395291c525b7f4df7ba9c6b9042d4a10dbe0e7c28150abb745508819318b6bedcc937cf50a4813589290ff2c9593b364c
-MISC metadata.xml 746 BLAKE2B 0a3ef5d793c24d91afe9bdbfb7337ebd1653d4d7e281197f66eaac8b934bbceab74e54964feddd2a1d63c56b9c65d19634828cc26bd1be23f533965d646f8db0 SHA512 9062907f4295661308d4a7754aa430ea8f4a1e850d29efe62653615ee91deb4c2cb65c246b16b1032da119e78717684c88aeabd812fc20b2297283ed076e5f0a
+EBUILD resolvelib-0.7.1.ebuild 574 BLAKE2B 2b179bdcdcfe5ecd75eb21bd2874dd39a4f7b99571ef8841049d6b73b72acd528383055340170b6372b9e2aef1932fd10b3078de0644a827dcc35e84c270dcb7 SHA512 ed59942aa892f60476c9270743fa436effc33260f6d20d78ff9e02e9047f449e278584cd9f7b13150b846b91aa8e687bd8360386a3cd600490848161c5805238
+MISC metadata.xml 853 BLAKE2B 6b194c20227de800cc062248107ee5b0726199789af9837807523b335b1e9a63e850270060fb4d306996a4113ab2975102e285bcf52f8dd4177f71038bf65e2f SHA512 a86ffe23f2067369d2794f3cf013fb3e3d4a685273397f6f221f67e251939c17147a8cd30aec92cbcc40fc38e770755ca53507c42f8b84da66a96ad46e24e90a
diff --git a/dev-python/resolvelib/metadata.xml b/dev-python/resolvelib/metadata.xml
index f7e853ec0571..436f6b4cabb0 100644
--- a/dev-python/resolvelib/metadata.xml
+++ b/dev-python/resolvelib/metadata.xml
@@ -5,6 +5,10 @@
     <email>prometheanfire@gentoo.org</email>
     <name>Matthew Thode</name>
   </maintainer>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
+  </maintainer>
   <upstream>
     <remote-id type="pypi">resolvelib</remote-id>
     <remote-id type="github">sarugaku/resolvelib</remote-id>
diff --git a/dev-python/resolvelib/resolvelib-0.7.1.ebuild b/dev-python/resolvelib/resolvelib-0.7.1.ebuild
new file mode 100644
index 000000000000..c9746c36a67b
--- /dev/null
+++ b/dev-python/resolvelib/resolvelib-0.7.1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="provides a Resolver class that includes dependency resolution logic"
+HOMEPAGE="https://github.com/sarugaku/resolvelib/"
+SRC_URI="
+	https://github.com/sarugaku/resolvelib/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/commentjson[${PYTHON_USEDEP}]
+		dev-python/packaging[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/retry-decorator/Manifest b/dev-python/retry-decorator/Manifest
index 1f7f5526b29e..29929272b82b 100644
--- a/dev-python/retry-decorator/Manifest
+++ b/dev-python/retry-decorator/Manifest
@@ -1,3 +1,3 @@
 DIST retry-decorator-1.1.1.tar.gz 4466 BLAKE2B a64836bba5620974e393a952544c82074b667a5fac80d6944069bf88e9162d03cc48cfe511f09476571c46561331576a2b06b2aefd087f905f968aa8257a596c SHA512 2241b24a02424905a2f3b7660c7ee4f6cd034c67c5019cce54d38ae250a9ac9e011fe323b25254bed051a0d3560d48ecdf4e2a1ee84cf2d7c5b1c12dea2921be
-EBUILD retry-decorator-1.1.1.ebuild 461 BLAKE2B 8eb4a02448c4be3052e49fa683170297d45d5774c31ac1a29ccaa50e9993b0d9590633c2bdc1ed918b8fa8b7a283e5c495303525fa1836ec6f13d5225a0be0fc SHA512 667e687101cababa4169a410d8701e4cac02b6249eef96311b11cec941dea7c59212da4016f66670bde0e086f974c5086e5c0c888aef2a561a0097da5d897518
+EBUILD retry-decorator-1.1.1.ebuild 468 BLAKE2B 614a2d00079e7a35914ad9d8980346f91ad73a3e9688954d37c193c14ade5ab093f635e19c380491739c57af1de7849f55f963a7f1b099a1e04066e21ee242ec SHA512 55080f646dd21da9b6ce34356fdaf79f7285b2e92af2976c8667fee6a5c92edc9f2a1fb8eef1533dd7b7bcadeb94c23544751945eadd49a5f422da0f843d9eb2
 MISC metadata.xml 404 BLAKE2B 1eaa65e01a0b62a084085fc066b33a6356d5c62043faf8937a6929d047e6ea08d6afabefd9093b28c7ec05b447746d8a58865afb1ca36e703bda72d10375c0d0 SHA512 0596346f0c4eed5f17cb2e346aab4c3f3a7e2d038e863eeed640aad7ade590c7649dee4cf0196c45521be0d3737d0d31c707cb2d61c83c5c9521a064aa1118ae
diff --git a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
index 29acc4e66599..8d6cb60a8ce0 100644
--- a/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
+++ b/dev-python/retry-decorator/retry-decorator-1.1.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/pnpnpn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm x86"
+KEYWORDS="amd64 arm ~riscv x86"
 
 DOCS=( README.rst )
 
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index 83b6a994f779..78fa2da4a471 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,4 +1,6 @@
 AUX ruamel-yaml-clib-0.2.2-python3_10.patch 1223 BLAKE2B 6d221d4ef7aab6d8f9a367fd877abe459243159d5e199fa287fa3a526d8888512ac16611cb377f50ba53fd8811a1d7193a0216ac37bb5bbcc16145e979f7b9a5 SHA512 0817dd4c459067b4545276e8cfd9e8e1ecd73bac5d9b3fd822501c80a41ecc766f0440a7b518b7554ee6cab82586920b19dc1c340f8136a0e8cf5724d5e53846
 DIST ruamel.yaml.clib-0.2.2.tar.gz 179914 BLAKE2B 90fe272c3c4f8943e944d43dcf1f61367600bd3b1fb296d7434b27183433267a510b6e41cfd50fac8e17bebcfaa51d7d1ca89d4d23da0b1107c468cafa65ac3f SHA512 5bbab2a23c65b1416480758cf0d0a75dcf8ddece0f8df603ce90f2b1c54356bb6876ac113d53e01c4869e3c9fb22b13ea29e66dc31a09144d4426c3e0f3b9399
+DIST ruamel.yaml.clib-0.2.4.tar.gz 180667 BLAKE2B 01341ac42ecea437faebbc9b30ebe2bdb9a6e5b15144b808c3065f3a003f12ce99c4b97d4b5056235a78295ed7a3237a325c8dd2cac036da3ac54c8aef2d7949 SHA512 f9d986175c241db4417a1d71e47a6eeff6f059ff204ea25a5b4ed365f732ae6872000c53f0ad1336d3ce80383e056df42f2ad9a6a05b92932332289c5129abf6
 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
 MISC metadata.xml 1183 BLAKE2B 5e9198838214711c9fbb5beb4179300c5465079646c3f4268145a3c893f1913ac9a14811b39afe637aadd183e4351a54c2ed160951e995bc4ce3f869b28bd6e9 SHA512 d6e5a8de5f9fe3e71a91a26be44cd87162863b1fede14301694e0a38135fc2ffb5c3ee25a4aef40d7cdb73812d0b6af72aa6b67ad782004648f54ac5e86cc662
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.4.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.4.ebuild
new file mode 100644
index 000000000000..dd1483ec93f2
--- /dev/null
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.4.ebuild
@@ -0,0 +1,23 @@
+# 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="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+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 25bfbd2573dd..e2f3cbaafc2c 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -1,11 +1,13 @@
 AUX ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch 647 BLAKE2B af2f03b775539038b557879a7d01d42ca050ad2abcdfd60db07fa48129fdc90219577fe9f0ba1a51b897057ee36e6abe5fabd61b343956bf6edb3584144d6912 SHA512 55ae9245470076938d1bd5322b3dc6042267914eef30b3a64a278f5bd06c0fd60500463c6c0a33f80d09e326f0dc0f87986a56f1d05e2e7b6fd9c20e83949a9d
 DIST ruamel-yaml-0.16.13.tar.xz 178756 BLAKE2B 19ee4713786a33853f42256e5cd3187e9e19b931ebd83a133365de3f080721c5a6f5fb41ff3079473461df47a0ab149981c5e94d08321da8b3c9eb311c226945 SHA512 1366fc0b3b5ea2699ca324636403576134ccc7c725b13c21a7752d1b16c644c93c7f7d82ddc337087d2c02947f95263d7a3fdd162f552ac3a78fa36f1f17b3f1
+DIST ruamel-yaml-0.17.10.tar.xz 183116 BLAKE2B 2795f470a3f7da609780109dfac502a5b47184f465c68420f467209275c8857418a4ec7424e130df2e7acef614d93f91551910eceb06cd9e49b365bb23d2a015 SHA512 3cd2598fa37564c44c74720e72babcd2252b2dbcdde626bdcf771b591da5d2852d90bb1f22428e28cd7ec38304be2a437aa0569ffbd3ebb526b2b79a955bc88d
 DIST ruamel-yaml-0.17.4.tar.xz 178028 BLAKE2B 24c9f61cf8e158377ae839f73dcceab8fdbb8071d1a792a37bd96158993602625967805f177719bbe88e917ccaf10ba210b6c01e91bb750f4df6bcc8a4a66450 SHA512 4c3d51ff00ace64e00d5bc8314c8cb6bc193da2a90e2cc9b9ed97510a7035778917c56e10b85cafab50f296f2f46d8817ad1abfa01b0498715f4972d91545dd3
 DIST ruamel-yaml-0.17.5.tar.xz 182484 BLAKE2B 8e06b08799a2b8ec8cd5a732e689dd8413bdb3afdc621fbedfc769fea9cee6b06b33434765dfff048840b4b25b5b9784db6b93e22336cc4306103e91b0269e6b SHA512 99c8ea0cfcd3877b9a17fc781e32302359b9e704f72dbb53ede17fd63a78cce7f670de36a35d3ce9bd64f604c14741fba74a2c6c422a5adf484bbe5a31d464b3
 DIST ruamel-yaml-0.17.7.tar.xz 182984 BLAKE2B 54c196f07cabe7cc97e4e652cb1c66443461f1555e0feb002e7c02e725a094a468733bcb9423c3a6d7450d25ad508a6a7338a107f0b015b2bfb0c42a57d8957f SHA512 0e5c638ac69d41ac5ea4712a97a05a43ec947a6bf9890f7c29aac057ef554fe65b92370bec91eae2803fc83be6ad01f60668f3d81458aaef32871312a62a86b8
 DIST ruamel-yaml-0.17.8.tar.xz 182988 BLAKE2B bd9f19eacac51bf5032738c8cd3da08d42ee109abf69442ab079a2d88267146d23d6facb6bc8683d4b78cff0577271574a7012799828a77ba23631b7b6af5b65 SHA512 69fdcffdb3b4cfb4b7933750b2f3a0ee2f44166c38a0cf3c5ba72bb14c1513ed28138435fecf8f23d72cb76b0489450403f726c5740ee9715f7d993f95438c0f
 DIST ruamel-yaml-0.17.9.tar.xz 183112 BLAKE2B 3dc33257435aa164724f8023c3bcd2f693c5dfbb4ac52467c821902819183e119f46e7dbcdab50216c019aa38a3d8fb94eb382c85edc0a08a278492ef53b2597 SHA512 dabc5540f68454d8abb46434bc91161ceb7bc613593c6aad79a4148c4526248d6053e356eb745e4cec7816885c1352f62d3c0a61d3d8a40315fd3ffb0e2f57ef
 EBUILD ruamel-yaml-0.16.13-r1.ebuild 1232 BLAKE2B 8f8eb1f7f8000aabec62f1ce4a457c2c4989ad83687baeaa0db22982b3ec45d60114661690e6d38ac6c7c2f420ce21e22c0314ef7334c532b994f3f814c03466 SHA512 e01a262271a37c1539d9d1eacb30dc327cc0610182be70b71605a9d636f807aef52e5013dbdde898deae887e28b24b252a9a2d0660c89d67b326975ba5886bc2
+EBUILD ruamel-yaml-0.17.10.ebuild 1320 BLAKE2B 5a4c4f01e172a4a54a025b64fbe6229ef3e96dbfe97b627da9cc37c22668481f05ac68d37eab8b81539fecda88588d63cf9b49e1b2c1cad2e83ca008e5489bc0 SHA512 5db02addeffbac54190032c5c2d66ef4791dd404b3e7990e0a38d58512671581e606c3493347a0c1ffa241fc5133899dd8f0b129acbdb3b8493e49413aea7a81
 EBUILD ruamel-yaml-0.17.4.ebuild 1306 BLAKE2B c63cd6753e7d39171aceca54e4f10b8a931b524167eb164d8d21fb786e154f48b51533b2a3f5bfb2357d2dbb5f7992459d878bd1eaf24e23c7e46c99788745c2 SHA512 71ccc3cf41573b25f0d378481c6f5e7684c2749c155520eec6afc37691d4978f9adb8f82d9dd3aeffa6839220b88ce64b3312581500f69643ef35d8bf4a45e99
 EBUILD ruamel-yaml-0.17.5.ebuild 1313 BLAKE2B d82f64eae5cc376514fb980eb46712b80c65930d3c1ecf633d73765470a9670cdc4a706dee4781b32f01166ddacb0e8f7f7b728bd81a96f38c8e005fe9a9600f SHA512 b64cc65d822351eb3792acb4b30627845b08ce3e00f43d89283d3246bf48edc838c704674c16b2dc27f30109c745fd16d934ea1233438917b32952f89cc50b06
 EBUILD ruamel-yaml-0.17.7.ebuild 1313 BLAKE2B d82f64eae5cc376514fb980eb46712b80c65930d3c1ecf633d73765470a9670cdc4a706dee4781b32f01166ddacb0e8f7f7b728bd81a96f38c8e005fe9a9600f SHA512 b64cc65d822351eb3792acb4b30627845b08ce3e00f43d89283d3246bf48edc838c704674c16b2dc27f30109c745fd16d934ea1233438917b32952f89cc50b06
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild
new file mode 100644
index 000000000000..9cf177b48a8b
--- /dev/null
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.10.ebuild
@@ -0,0 +1,50 @@
+# 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/secretstorage/Manifest b/dev-python/secretstorage/Manifest
index cb0272837ff6..9b6c79bf93f0 100644
--- a/dev-python/secretstorage/Manifest
+++ b/dev-python/secretstorage/Manifest
@@ -1,3 +1,3 @@
 DIST SecretStorage-3.3.1.tar.gz 19566 BLAKE2B 0b1ab822ee29f3d56148b558b3029fd882f1d10ceb3e026586de2e9bc72b7ac1b35df11052117a7c07524ca72d004ef56d99c845bc3600984fe84e5300f3dfee SHA512 5e874d08c9e00626a217db96b131884daf92429a91f690b32f62052747275ad0effbe2b4abe048e67fe7f81df97507f8375408898ff986e6f883b5fdfbf2a76c
-EBUILD secretstorage-3.3.1.ebuild 1134 BLAKE2B b17048e118c6b3474752509d349a47a54331177ff756cb3e8e7a1d39fe4cc4eaab7877c359c9451aa255a4ca6a1cb62e5f148b3a164550e7e3e661d58cfc1217 SHA512 00056f94165ecc717f491d175d3bac6f9b89170498a00bae4d2684e8c813c5d5621aea91f0e3c832e7bf641d4de2232448c1a0ac8da3d29ac02bffabe0a27135
+EBUILD secretstorage-3.3.1.ebuild 1141 BLAKE2B ca4495420e8cd09be40484f91c7094742c2380b98eb252dc64b2055ed5b642b6609785e7a7b63afeb190c1e457879de4539d48d669e231be27aad4e2c9cd4031 SHA512 ecd3fcfe2887a7e8a90c216c109eecbbc82b084aee55f2c5eaf9598974a9e3865995209895df38f9302a41f07e9fc414bf69b06f0f2e57fd2ee1342861258a4f
 MISC metadata.xml 401 BLAKE2B 1e09ec717263668ffdbfd377d7ee0eadc43561eee8b5ceff7458a811023cdec32b22c0f319dfc78ed4d12c90b7a62aad5c0e724d6f96af3c7eb2dd9c10266292 SHA512 a6ae799e1f90431bca1b4c7ff19a89c8f4a12e927f35b18c2457749ee37e92c56204dd526b85cbacbadc75f07f9e4f1e84a1a48eae2f79e44b43e5e7590455dd
diff --git a/dev-python/secretstorage/secretstorage-3.3.1.ebuild b/dev-python/secretstorage/secretstorage-3.3.1.ebuild
index f5d9a484cb85..b32f80914daa 100644
--- a/dev-python/secretstorage/secretstorage-3.3.1.ebuild
+++ b/dev-python/secretstorage/secretstorage-3.3.1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/cryptography[${PYTHON_USEDEP}]
diff --git a/dev-python/semver/Manifest b/dev-python/semver/Manifest
index 60636a938949..6700a6c00aad 100644
--- a/dev-python/semver/Manifest
+++ b/dev-python/semver/Manifest
@@ -1,3 +1,3 @@
 DIST semver-2.13.0.tar.gz 43674 BLAKE2B 35d0ca0b61836d0e6deb97f067a0c1cbba310dde6eb83d78f02f85c3f7485114ad549559d572d4494aa7c4444c7d6feabcb36394561a238489d56bfd04ed8590 SHA512 ca0d408d8bb7305e90802ea04d935cd7b76b8f166a9ec97ed3427dbc2cf60eeca0b2d27ad0cb2f15f32f5b2589d6717a63717c463183374c5335bf79e1eec222
-EBUILD semver-2.13.0.ebuild 612 BLAKE2B 5e5f075e67f8d86bab88d7d581a8a73bd50494c3b15e13878ca36290bf314b930df3e166bb36f654f2d9a10f55923e894dcba0b722dece2c16fd95edf737e91e SHA512 1bfe7ef08b29937cc3424501841a19ccd61bb8c11d2c4936f0f4cd47a1da917218e068b7b84d7491c9d52d4fea35c50adb048f8045583de7222d1868883344e9
+EBUILD semver-2.13.0.ebuild 619 BLAKE2B 971611d048e6a62777c0408b783028e2d7bd4b353df7d372ba22500728c2c5b937a09551fcae2d8d3308dfd523ae91789eb4f241eb9ac0f7966687883096a195 SHA512 e58f81584a24d1b3a5631d746bec89d530d7d4655718dca117b1b0b131804e5c2fdd4826288050f5569dfcb9978ecfd4401a3ca7f8ffa0f021f40f0356ae9db4
 MISC metadata.xml 387 BLAKE2B 93c31eb7f9fbdf45e6666658b243ceafb76094bfa748b90d19c93c9e2513c462b1a406e40f7c1aaa828cd2358edcea7ff7c0a63c33949b4cf35c0295aac718bf SHA512 842e7528ea24deeb18e87f030827ab91ab49e82f3623c111ae53dd2d530210c1123afc25dfbd771d48ba3369229045df577e2b953ffe058c6290072e2929cebf
diff --git a/dev-python/semver/semver-2.13.0.ebuild b/dev-python/semver/semver-2.13.0.ebuild
index d9a264e61cff..c4ed05fc9562 100644
--- a/dev-python/semver/semver-2.13.0.ebuild
+++ b/dev-python/semver/semver-2.13.0.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/python-${P}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index b43d5b133daa..15be32d1df65 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,7 +1,3 @@
-DIST setuptools-56.0.0.tar.gz 2054762 BLAKE2B 3fc0f47304109f765ff0f8430dae735005d508aaa79609c5ca08217eb3802014267bd0f1a4f4678b417143f0d22b4b27f166573e41685229e0d4491b1789713d SHA512 951d43a0192b9dddacd7bd7ff6b76e281c14071771096db3c413fde6ea67b0c534f17a770cb3464cd3a6a4e8145b82f4cf5c0228e76e6f2cefe88d33748816e9
-DIST setuptools-56.2.0.tar.gz 2110133 BLAKE2B 90c75ba006becc9f564eecd7d46a9ce70c9ad17eacf2e17b3551116b962e08af0084919fccc18ec29a54b98e8fe2419d129554a7b38fdd1104f472fb2e6f9995 SHA512 858d46909335ff0b0441d5860788803100a8fe9f5a1d1f17353bf961bc77191c3237501c1838fdb6ec8e4b2c66874ffd4e8342b42cc2673cb866706660704ea6
 DIST setuptools-57.0.0.tar.gz 2144749 BLAKE2B e1fc99503ee5de425b70bf2733b1c489693e38cd256bf95cb321671bdaf87745eaaf40c43bcd03756a4cefa408dd1414f8c30af274963e3a0ae57f7b95d3f9c0 SHA512 5277d8630367d6b16a49e36ed84d8cc6abfaedf87dac3f795b204626a8f15ca9fd80d158a465d8bcabe9c074c76b87c3378d82a4ba5feee1ac6a5f2c91db061e
-EBUILD setuptools-56.0.0.ebuild 2233 BLAKE2B 0474e7ac4c8f4f74f05eb031143a29342f0cec87c89603552142ae87daa053c3f6ee6301cb4a09eed078272448c9a754e3f7ee4bd4493bfaf96b35f9c9b28262 SHA512 677933aa3cf01c60a686229349bbce6f9d1d937e2fbc25b508c78005ec335e875ce9922ead6ccb3418f30b577a6077a5bab9ea4d91bb99880f29ed4c53557101
-EBUILD setuptools-56.2.0.ebuild 2384 BLAKE2B cdb6906701bc92333c56ae2848132dd46ea276304083a7f15bcbb58731dd9f03c9952b1f80ee55bd7490ff60644c86dc9c3e23503db588b4bb3adfe936388c62 SHA512 4f17b9ef8252f8301595512a2bac69837e84fbc68895f9f22d0f859dc673b2805386e06c115e1bc7c421b72927a00a281b1293a217948fb993877b586c78a4cf
-EBUILD setuptools-57.0.0.ebuild 2327 BLAKE2B 7c7c82243eca1d9ade6e6eac2b61ef75efb1ecf0d36fcfde82faaf6c76afb93e6df90ff09e108fec6ee1993beb5cc4c6f14fca5c2ffc536f1f7315f2e1b35a50 SHA512 384c4e2eedf3992061e0ccb4b79deb2a19106e7f21399d959369966c3722b714389eb2edee2ca96cbf02a0e5871470c93014fcc588a8063ebdbed03d94ad4582
+EBUILD setuptools-57.0.0.ebuild 2319 BLAKE2B bde0c2b2c28dca1d79a688e838340404c1c21f4433f1ee104d2fb4df05ee39ff74403cc56bae332c4ccdf1faca4b6d05a58526c6b858e7c7fea04642ecf5c52a SHA512 aa0bbb2debf43915d698a6a94ec8b71441b4aed0cd0b991dd39dc61409ca8edf3245486fc5b5bba4566512181eb193d1811bf34f394592fedc0361dcc3ffe8f8
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-56.0.0.ebuild b/dev-python/setuptools/setuptools-56.0.0.ebuild
deleted file mode 100644
index eb7a4adbdae9..000000000000
--- a/dev-python/setuptools/setuptools-56.0.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-python_test() {
-	distutils_install_for_testing --via-root
-	local deselect=(
-		# network
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_distutils_adoption.py
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# this one's unhappy about pytest-xdist but one test is not worth
-		# losing the speed gain
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		setuptools || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-56.2.0.ebuild b/dev-python/setuptools/setuptools-56.2.0.ebuild
deleted file mode 100644
index 77c8325733a5..000000000000
--- a/dev-python/setuptools/setuptools-56.2.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/jaraco-envs[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{7..9} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	' python3_{7..9} pypy3)"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-python_test() {
-	# temporarily skipped, until we port all test deps
-	[[ ${EPYTHON} == python3.10 ]] && continue
-
-	distutils_install_for_testing --via-root
-	local deselect=(
-		# network
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_distutils_adoption.py
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		setuptools
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-57.0.0.ebuild b/dev-python/setuptools/setuptools-57.0.0.ebuild
index dd369730c7d4..f61396e43569 100644
--- a/dev-python/setuptools/setuptools-57.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-57.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
index 3c05ff400e9e..28f93ecbd49a 100644
--- a/dev-python/sphinx-autodoc-typehints/Manifest
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-autodoc-typehints-1.12.0.tar.gz 19494 BLAKE2B beacc4f8ab453612dfd5264f1c65fd6bdd957269a28ee5b71b762d0baf5a3d4be58398b32d4263f996648281c1139f47a7564e8fc6444a94095f6a970b4cc27a SHA512 92fa340495a48111fa3d600d8c46d83214505ac2a5c71cb1303e846ac439f1e0ff14f8ce8dfd5ffdb6a62a9fa15dde8a5227f946840d9377ad5f7fde25894b75
-EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1064 BLAKE2B ff785ecbac11aa6028e8f5f824cb70fa03a27a3964e7bc8246d743d70364aeb6a9a0f1f8768f2a3214b25019c5b60b9d7c3807ba31ba5c0a8a742c9077e214b9 SHA512 579140abacd69215a24a6170e5d8852df7d0342adf00d86be31ee62ffa81cbf1e0fd772fe70c0e68a39d3ec2eefefb33981f5a320dccb7c59cadfb2e628d40d2
+EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1071 BLAKE2B 232e4fc5172631566c439f9e5e05c7517794d57b93706a82a3cd51a83347f6358d51f7ad5cda6617b09f89b9b436b2f7dd0176ffdf340a972bbc677f58c78021 SHA512 ed6ac9f0b68f26eec2c409b8e1f85937a5ff9c30b7e23f421c7923312e6da76fbbcfd1f02f99281d1fc7d473b75a36159fc8678d62438cc38f7f0d99c4a444d9
 MISC metadata.xml 701 BLAKE2B d1c41250ae7a9f233e1e208443b764522071d4d0ce3274b28ca95135c01b780d38faa88c8bba7ab7874584b420dc81c8b43e629718fd085d461bdcf755bb9e79 SHA512 952f4e2a940fe23acd47a9e0f101c6d78c6939fb9ad69920a9cf9770b44ba3dad7e65e708ca0ad54fac5ef871a18a737e9ed200a678210e93740eb065be81a0d
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
index ff4736f4e53f..6aac93cbf715 100644
--- a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~sparc"
 SLOT="0"
 
 BDEPEND="
diff --git a/dev-python/sphinxcontrib-programoutput/Manifest b/dev-python/sphinxcontrib-programoutput/Manifest
index a77894505c85..f1695561db79 100644
--- a/dev-python/sphinxcontrib-programoutput/Manifest
+++ b/dev-python/sphinxcontrib-programoutput/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-programoutput-0.17.tar.gz 24067 BLAKE2B 07687a221aa9be1e02629b2961b49eace217631a1298337f77a01986c3c6444a50069a8a8b9c96ca224895ae0f9490158a720519fdf3fb544e9d3e513282eb36 SHA512 cbb564830b8a627de6ecfa83fcc235d7dd7981e191ab3cada66a74d79a5bb2ec0a993eb8ae6249db553dc1814eae98891ea285f2c3cf5e745eabce7b8647b0c4
-EBUILD sphinxcontrib-programoutput-0.17.ebuild 810 BLAKE2B 9eac407633390667c1ca13c7d4861b926e7b626945a95fcb35778dabebfdfa5727a913d51eac7f063b77b3cbe9152e339fd1d47f25752afde91f8aac85481b6e SHA512 a5d09e6f3a1c05a963fe9d6aae5c3577575fc4f73f256ccbe9eb4a1546f1867483045aed94be4313cab34b36cce7ba7e2eb90acc73ed2f29ed61b24a59696caa
+EBUILD sphinxcontrib-programoutput-0.17.ebuild 817 BLAKE2B 9dfbec11e83045884e6862d2f0bc9f31962fffdf8bebf3965e59c176a7b6d3ef736904269c0829e869aa147be37da25fc03fd28c684f69742b0ea8961e51b247 SHA512 8c23c1480257ce2790c674c6bd7066fddaeac0f9c386885f7970d3f35285f6bada862ef6e89e7730892b0a8ebd73bdf406d3d05237c4e914f8a90952252a275b
 MISC metadata.xml 1356 BLAKE2B 26ce7a37f737618f8788ee73f94f25cdbf5063044ac9014235f907932184168912a75c4c9f08cdace99522b2d8f157bbce8da79c7e3a55953d4692716c738849 SHA512 1f950132a2e93fe93bebcec0146fd343548b2ceb2f4d2cb99ac4e4afe428282e81b87ebdec77ae8191d51f35385ada447939a9d92f0b8e3c36af1b4fab0cedd2
diff --git a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
index f24b3f8df331..798cc4319b00 100644
--- a/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
+++ b/dev-python/sphinxcontrib-programoutput/sphinxcontrib-programoutput-0.17.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/namespace-sphinxcontrib[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinxcontrib-trio/Manifest b/dev-python/sphinxcontrib-trio/Manifest
new file mode 100644
index 000000000000..85f4d23cf9c7
--- /dev/null
+++ b/dev-python/sphinxcontrib-trio/Manifest
@@ -0,0 +1,3 @@
+DIST sphinxcontrib-trio-1.1.2.tar.gz 24131 BLAKE2B 5ddaf5ed6c85905275e206fdd966745ce4dd7296595c488864df291cb7202725ccab722f306dd9d6c27d660f5cb3e43bf9ab2fe50e8aa5a7232c2615dddbdfd0 SHA512 cb90f37f463fbdd3f810eb6d76b4bdaaabe83317de0ad747fcee55980849d691e272884ecdfcbee58851cf536f268f2520caba281d7550fe3250e92c69164434
+EBUILD sphinxcontrib-trio-1.1.2.ebuild 994 BLAKE2B ee66aa5670da27b77ce7924dc59f9d28db58b6e8a579aca18ee738804a7abd547f00743733c07f2269ded748b899ee03a8072b3853c29f1b9cd5bdfe6e1050a5 SHA512 7968d02e4c7064528fc4a7b62eac4c70d769403f088229e7872f5fa5d323dba7c402c34b2862ffe9f3bc8262eabae0e27ce9efd8b3eb9752967d0fa9193e6f4e
+MISC metadata.xml 1117 BLAKE2B 947c7c2b888c24101db258e47efffbc6db4873c99cb9dd5c2076dfc25d25de04736db46d9fff88667f57f8f09f01c17f2937b2d7f641a8b7cb5baecf9d3d2b2e SHA512 57341896ef4194b5ddab0485e46bd8567c4514518c02e1049db21e9174c420175e47644d948c9c1a6dc03bd4248f235d2d811c6252be7c67f624e0b2883ff2ed
diff --git a/dev-python/sphinxcontrib-trio/metadata.xml b/dev-python/sphinxcontrib-trio/metadata.xml
new file mode 100644
index 000000000000..0cfc4ecfa6bd
--- /dev/null
+++ b/dev-python/sphinxcontrib-trio/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<longdescription lang="en">
+This sphinx extension helps you document Python code that uses async/await, or abstract methods, or context managers, or generators, or … you get the idea. It works by making sphinx’s regular directives for documenting Python functions and methods smarter and more powerful. The name is because it was originally written for the Trio project, and I’m not very creative. But don’t be put off – there’s nothing Trio- or async-specific about this extension; any Python project can benefit. (Though projects using async/await probably benefit the most, since sphinx’s built-in tools are especially inadequate in this case.)
+	</longdescription>
+	<upstream>
+		<remote-id type="github">python-trio/sphinxcontrib-trio</remote-id>
+		<remote-id type="pypi">sphinxcontrib-trio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
new file mode 100644
index 000000000000..384fc0ddd4c3
--- /dev/null
+++ b/dev-python/sphinxcontrib-trio/sphinxcontrib-trio-1.1.2.ebuild
@@ -0,0 +1,38 @@
+# 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="Make Sphinx better at documenting Python functions and methods"
+HOMEPAGE="
+	https://github.com/python-trio/sphinxcontrib-trio
+	https://pypi.org/project/sphinxcontrib-trio
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/contextlib2[${PYTHON_USEDEP}]
+		dev-python/cssselect[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+)"
+
+# AttributeError: 'Sphinx' object has no attribute 'add_stylesheet'
+#distutils_enable_sphinx docs/source
+distutils_enable_tests pytest
+
+python_test() {
+	# https://github.com/python-trio/sphinxcontrib-trio/issues/260
+	epytest --deselect tests/test_sphinxcontrib_trio.py::test_end_to_end
+}
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
index 9eb8d976c32d..da9c3d47fcd2 100644
--- a/dev-python/sphobjinv/Manifest
+++ b/dev-python/sphobjinv/Manifest
@@ -1,3 +1,3 @@
 DIST sphobjinv-2.1.tar.gz 1144017 BLAKE2B 71878e1bac5202ab74298b56cd6172236ea524050323e0d6b8bbc0c89f1937d75f10d40b4071cfbe8c9031641e9a0ecb283da908c40840a61c12a7c892438241 SHA512 cde77d73b09b72358b0ac5b0d8f1a748e78dce6664d1b849ba68f5ff70dc43cbcff4581374d0151be29c4d97efe2920c5c00ff68918371243be158031e9554fa
-EBUILD sphobjinv-2.1.ebuild 1379 BLAKE2B a2552af4f6937bd028280d8d5b4f05e243d78153934f59e2a65b199dc342f83190fce53a7e45fd8c9b105897f7a5cc1b259187ea9dc8f6885330eea5ff8c0a80 SHA512 6e553f70b269035dab1b1b3ddcd1af4e489eec789d05c6f1e4ab6714abe8a169629b5854089144e90adfb68c69473fcecd3d38fe8af6390163d0670216ade109
+EBUILD sphobjinv-2.1.ebuild 1386 BLAKE2B 998057e12baa9c3451edd31be2c8819bab204090fb25616041a226f0cb1fdf76c0e188f1c1487f7bc4feeccb379c3cffebc68dc10e1bf2eb2f2baee78527d436 SHA512 358c4c640e1afa0635f6a0b4547f157eb85f73e0bae575d7dbd1b8b4015c1d023b0dfd80137a53d43448ecb0544ac8fbc7d58667b2120e1e40603b7d9e69b9a8
 MISC metadata.xml 893 BLAKE2B cf258281d276e039b3eef66ea4612b3b8df3578265939084d02f9743c5aba3a5b27cadcb406f8dab157d9c0b52bea1ed23a71b989ffd20c236d7cb93aa8c52d2 SHA512 87bf6bb4eff58e18e351fd0512c89cca99bb72dfca01dc33b892656a6ef283d3545072bb47a0f1034f27781df1647f3d046440392fd040481b687f75f589d44e
diff --git a/dev-python/sphobjinv/sphobjinv-2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
index fd0b41788dbe..678a76fbef07 100644
--- a/dev-python/sphobjinv/sphobjinv-2.1.ebuild
+++ b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~sparc"
 SLOT="0"
 
 # This requires pytest-check, but that does not work at all, even if it
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 744362c46a48..5eda6cd45deb 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -3,8 +3,10 @@ DIST SQLAlchemy-1.3.24.tar.gz 6353598 BLAKE2B 6eb92b20fa3412a1f1398e18e902e33383
 DIST SQLAlchemy-1.4.15.tar.gz 7621840 BLAKE2B 74299b92e8ae9d6017c961c44281cc43921f8505e9b141c75cc19899f693a2276b2849daef6dbe35f0d62179354740c76adc318b6b37d551679cc8ba3c47681f SHA512 b9a640ccfb7caabb88c4891748699442073db2bea6d1e5a33eb508863616c94ddbf162b3ecd5e502daf20d798d20b8ef5b4b29ed679af9161e117a23862327c2
 DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f6cd79ca3c393abf66d7370754e8433d743e739803929aaf0e2788b0c0419c022ddda1517d38da6580f3afeee1bc4d4 SHA512 06110bf727fd6d83404da2e031a27163c06059bf9eae4cc5b79ce047b5bab67b54432890091fa03abd9644156b92569001ae78c48c22799ab3bec220d4bbe1a0
 DIST SQLAlchemy-1.4.19.tar.gz 7675110 BLAKE2B 61afe9e8937cc1eca9a6c10eef03959422a6dc73e562b47c820b01fbeb61099113d1d30e4de0448ae07abc064db190a9a0b9550d4f8c324a73d277c2c9e7958b SHA512 656e5fd2c1e5c5f9979ad3e38b0f927e8756423d5c988ccb5247cde2f8d354b4623cb57af24c7226758878e429514ae828047fad623ee332ae524b714ab3f18f
+DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc162cb21e747b889fa032863435b6a922b9ad21c7ba136b94617710d3aa6ec331941b11b0fd87a8d543b633d3d605c36 SHA512 cb9ec5c74b27c93824b7d46844d2a122c719e358d917563039f3dd96a44d057d4daa239b2820893db42348f46546efc469a202999be2c722027abbb6eed50063
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
 EBUILD sqlalchemy-1.4.15.ebuild 1699 BLAKE2B 5d6c0890d1352b0a96b01005a9bc8623956c5cfd5df44b1956200e9bb4b786c0121443d90997260b6b543456c3cb166704d60f37b8212e2b30b3e3ea37436710 SHA512 259402945476720ebe4aa1ea860ae8f43095b6916d1112fc4bc8616838a8efecddab01dca1937c800fa32bc8df8d15de67bc5eccc5330371a250473b4a8fea61
 EBUILD sqlalchemy-1.4.18.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
-EBUILD sqlalchemy-1.4.19.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
+EBUILD sqlalchemy-1.4.19.ebuild 1704 BLAKE2B c6e674ffe8efcfcaab23945ff90090411622da56f9d65414a0c849b2f01bab12904c4a79c71383b4fac21aad265e6dc83a4543adb532fd44ae84aa7079185981 SHA512 1e6cc2c24dcc02930e1687d9c0424b3a98baa6e4be7182e65beea5c836dd0b6396d47abd84c0927d497a34b8cfa39b1dd84449753a471dfd99e65dcbd21c64d9
+EBUILD sqlalchemy-1.4.20.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild
index 144d57d9ca1b..e9bd1afd5434 100644
--- a/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.19.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="examples +sqlite test"
 
 RDEPEND="
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
new file mode 100644
index 000000000000..144d57d9ca1b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.20.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/statsd/Manifest b/dev-python/statsd/Manifest
index 7a2181df1dfb..9a931b5e4afa 100644
--- a/dev-python/statsd/Manifest
+++ b/dev-python/statsd/Manifest
@@ -1,3 +1,3 @@
 DIST statsd-3.3.0.tar.gz 259045 BLAKE2B 015eb32d40d1eb45d64266f0bd62d9496a7eb8815dccf4ad482bb3b81b45fceef14a25893b05ad3b5a8da8582434a46725598a90ebd06c6120dac32169a1f201 SHA512 e2693bc7f179e275c53044d13a4685dd72ebd47adafcab5064e803fbf9e8df4a0f20f61c3695846d3c33178be17dd7286f487213fa2bd8545ed1612e200c8f36
-EBUILD statsd-3.3.0.ebuild 506 BLAKE2B 740aa3846640388ed6e7c03d70c3cbc74132725f13c3422963982a5a9223c9efb3f79667cc4ea765b8dd4ba526bc4b0e2475c8704cbec6f74c3507f386bf4b11 SHA512 a208c07dd64707ac0f935ced4051a41e0ee9446344cb91a2cfb46d83392f6a75501786c451e2e6f85ea9f6f66029faf531d57f6c0a5dd3d887fc8242a735a704
+EBUILD statsd-3.3.0.ebuild 511 BLAKE2B 47b82a5de8cbaa2dc8e3c7490e05fab00bc09a96a828fef19ed0bffca471ff65ffd02d4e28f49d165d1c82734c1b41e348875ab4cf59ffc73ed9c874c3e68f19 SHA512 b2d3de39249addce7c64e58a3e4d967e752efbeadde94af78698e88f150f6b09853080ac3dbfed3bb1a39a8cab47e79525064649610ba29105393aa590e5c126
 MISC metadata.xml 498 BLAKE2B 5b04a0ca7dbdadb6dcabca0314db852b0bd1bc5a9034af6d0ce278be50e6ae64f089f3735cf58b34446e03c7a3ece7af7d9526ef61c7d730b3a95b5670239dbe SHA512 6c083a1ff7255ab9f40c56358411f9bbcdffc52df95b928f518927e632fc4d892aaba03340b3fe9e0c7b7913d375f2d3fb3ddb2485f5f7a42c2dde23397c77cf
diff --git a/dev-python/statsd/statsd-3.3.0.ebuild b/dev-python/statsd/statsd-3.3.0.ebuild
index 034ab97433eb..d21c127fa961 100644
--- a/dev-python/statsd/statsd-3.3.0.ebuild
+++ b/dev-python/statsd/statsd-3.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/stdio-mgr/Manifest b/dev-python/stdio-mgr/Manifest
index 12e48b1ae9d7..6c7b9d595818 100644
--- a/dev-python/stdio-mgr/Manifest
+++ b/dev-python/stdio-mgr/Manifest
@@ -1,3 +1,3 @@
 DIST stdio-mgr-1.0.1.tar.gz 8447 BLAKE2B 72038ea34177829d77ac239585775557b5a0a253879c027b2aad64045ec8bafbfdc250d94fe61cde96f06616f774edf42b384bfef7fbf69af442b0a9b703cf9a SHA512 2d18e5d65faa7a73373b56fdac3893768a65a36bed17f017b647e71431a6bff44ce1d39022f1dbbd31ddc9c0e704743a164f4b7610fb62d75aa34ecb53331366
-EBUILD stdio-mgr-1.0.1.ebuild 775 BLAKE2B 41a5d2de2fa9decb5705c50823cfec6cf0a2e3e30d2b990ae32d2faf0eaad2dba078031568fd8a8643da6896643e1a70dac97c14b8b62e3681eadfece181d130 SHA512 9c18bf894ac836c13223847a8439c196c70eec2ca4943fbf7cff7dec9592cd1157b5e62505ac05844bf0ffc2494f3d63545f77d3ff04336c16b3a29be4e93fe7
+EBUILD stdio-mgr-1.0.1.ebuild 782 BLAKE2B b4e3c23d8e427c549fddddecfee2bb76561ef237be093a63bb58e04c18837d0da21ea0a7eadf3cd32e0ffe9ae510b2bcd6d1f05e5e5e4f036672de3432bdf57a SHA512 0d5fc93b2cefda85289810e90c874689dcbe74f16e085031eec60a69859296f314f6e7c6b3ce770ccd6412e8a334001a44b7c4f0a1e1365ec28cf5813de52094
 MISC metadata.xml 938 BLAKE2B 63b86f805c3eb74bd92a09792c04f91083198595c38def2fa795bc66d37af74b6017c801adcb17ad0cf65b7fa5a9a5271ebfdf1bbe295b465ef94d8b11535b7b SHA512 9850613726ea4ce8f6bff5785e2531479bcf1754999273b647f77d6774cffd79925193d37793b55702271364339a128b906bc4b9e49bec98dec5bfdb60f78759
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
index ba3711080f9b..182d8813b39f 100644
--- a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
+++ b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="
 SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm"
+KEYWORDS="~amd64 ~arm ~sparc"
 SLOT="0"
 
 RDEPEND=">=dev-python/attrs-17.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index fc911fee9e34..44031215a245 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,3 +1,3 @@
 DIST testpath-0.5.0.tar.gz 93168 BLAKE2B 864ac80e027192fb1a83f1a15db55fe72729154c7236f2054abfe161be36741614732efbea2a6b4eeb1fb59befa36002d767b4113fab98202ff22330ad15e21d SHA512 d960da04b490b355c5ca9d8e348d81a0d528f13dc7a2b5d6d3c09327a603c1582bce76f7de6d1666b490112306a10d6a19c7979c1119fb726c08c712a08bbcb0
-EBUILD testpath-0.5.0.ebuild 665 BLAKE2B 167695d48377e36823850357bee8712995e334541bb9074544d1c3b3b082ceaea14adf31da9657439b690c80a8d885ba7b7c6ee0c060eacff5d3cf2cb5c9dfb1 SHA512 e3dc3adbf05407ea509945571090fa23577399df19d98a951138b2ac519148b1cdac1b3dbf0f2bbe1475c2ed3f903b98b9a7d0b387522ad127d642453cae5f79
+EBUILD testpath-0.5.0.ebuild 672 BLAKE2B 2bc7fb158c854e8459656dc71f4d23b7b2adbf91bb10a9c485a42bc1fbbf5da8414da49e508ceb8116342d744b5366f2e797c4872d0bbcc0c1705c9a018a027a SHA512 f9d26e9a3b881027d3b785059c33c643a2bf91f982ab45da76366507560609ad03ce4dc820cc19a33ae285547736846db740b40784da3d6eb96124dd503e597e
 MISC metadata.xml 764 BLAKE2B 66ca0cbf31a2ae4f9e59e232c029f530b9b6fb5d6d53c9a3a4fd69293a987f3a46c6530e20a9c4cca4056a91b546062b9aa2135d537de276255ae6188633257d SHA512 7787d485d68e575b8a0e01dd20bffaa317c8168a1dfb38cab9c6bdbe80778131e9ac1bb8dee91bcf6ee91de5ec466027f7b1fdcd65d5fbd81dc8433804e3f3d1
diff --git a/dev-python/testpath/testpath-0.5.0.ebuild b/dev-python/testpath/testpath-0.5.0.ebuild
index d18ddaae5f73..f4aa974c8674 100644
--- a/dev-python/testpath/testpath-0.5.0.ebuild
+++ b/dev-python/testpath/testpath-0.5.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND=">=dev-python/pyproject2setuppy-15"
 
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index bf6f845c4570..2b0284dd903f 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,4 +1,3 @@
 DIST textdistance-4.2.1.tar.gz 45095 BLAKE2B c0b7fec8adb3a90fc2f3c939a39492887a4989e16d6bd9c548fceb1d5020323d2782dabdb69ae17dc4c3cd795425b3fbdf9bb6041b1ef7df840c2b3a9e2a7e05 SHA512 daff22077800e42ae266edd8614a1300f3f2d080868dbd38e14d035f19853e555485d27ab0392401318e0c4ddc81fbf1b537dd3aa1ba25d7a89e5f0edde8ce46
-EBUILD textdistance-4.2.1-r1.ebuild 1074 BLAKE2B af7b120b00b9256ea3f7f2c39f6177a4fc004336f1ef342fbd47aae44f6a80ca636bf1848a9421f37dd8ca5b8785bb492b736aae25b4223d0199343626440b0c SHA512 8a688c15def007024bbc777890b7dedbc6dc04c3a8ad7415528df46025ad852cccbfdcf9a1dabb55c0080d7204cc4adb69683c4e0cc22679dcdf40742df8a8b8
-EBUILD textdistance-4.2.1.ebuild 1070 BLAKE2B ea01755ffc5dc171ad3c0a192e2f09183835853bc6ca5f79b38bb8da53d1f7afb967e31753262e917efc1ff5c3bdd26d0a524aae345df28dd24be7d9378e7b8e SHA512 98b95403d09f2b70e7061c10239fd704e923181d330e28d22efdff7f1402e851cf01b7556a697823dcda5bfbebf57122b3be75f9547354b763982ce75fc049ae
+EBUILD textdistance-4.2.1-r1.ebuild 1072 BLAKE2B de70abed69520697d19a440b589926eeac729189f4b635c9968383be2657a8e5bfca6765b3431ec4a6955bf3625e8a3e98a1d42a0203abac0867104b9861dab9 SHA512 5781c0f902e97be8bc45f6284040e00ad6931a4851ceb48e558a9762663593dc2210cbf00ee2370ed092feb44c1ed00911de665c3d283945e634869a9dbba897
 MISC metadata.xml 415 BLAKE2B a8a3649de603eea73f305f59cbcb73e50a6774579d1431cb92d2597d9704d3839d27b4bcc6d40ff2b6d7212a0946f664d1b9520d35bd14289e2a3e5603c289fe SHA512 2a46c37d723adaa0ee69c5f22d0267f8f3e89f59cce17c2aa9d0a5333f3737ee4db2adc535b6b561c027a12ac5c99ce8d595dc3ec7e4e2e1a79b1a86fc4cb1df
diff --git a/dev-python/textdistance/textdistance-4.2.1-r1.ebuild b/dev-python/textdistance/textdistance-4.2.1-r1.ebuild
index 3628185a3371..9466d5a900d9 100644
--- a/dev-python/textdistance/textdistance-4.2.1-r1.ebuild
+++ b/dev-python/textdistance/textdistance-4.2.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/life4/textdistance/archive/v.${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
 	dev-python/abydos[${PYTHON_USEDEP}]
diff --git a/dev-python/textdistance/textdistance-4.2.1.ebuild b/dev-python/textdistance/textdistance-4.2.1.ebuild
deleted file mode 100644
index eea667d2ea26..000000000000
--- a/dev-python/textdistance/textdistance-4.2.1.ebuild
+++ /dev/null
@@ -1,41 +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} )
-
-inherit distutils-r1
-
-DESCRIPTION="Compute distance between the two texts"
-HOMEPAGE="https://github.com/life4/textdistance"
-SRC_URI="https://github.com/life4/textdistance/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/abydos[${PYTHON_USEDEP}]
-	dev-python/hypothesis[${PYTHON_USEDEP}]
-	dev-python/isort[${PYTHON_USEDEP}]
-	dev-python/jellyfish[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/python-levenshtein[${PYTHON_USEDEP}]
-	dev-python/pyxDamerauLevenshtein[${PYTHON_USEDEP}]
-)"
-
-S="${WORKDIR}/${PN}-v.${PV}"
-
-distutils_enable_tests --install pytest
-
-python_prepare_all() {
-	# RuntimeError: cannot import distance.hamming
-	# these optional things are missing at the moment
-	sed -i -e 's:test_compare:_&:' \
-		-e 's:test_qval:_&:' \
-		-e 's:test_list_of_numbers:_&:' \
-		tests/test_external.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index 8d8fcf1c0c98..395e584c9382 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,3 +1,3 @@
-DIST tikzplotlib-0.9.8.tar.gz 589858 BLAKE2B 81bb2ece7d3f5976d928095caa3d8d51b619c97a4b36eea14f4b4477d31e78a978c2eeab81e9829bb9113e70f0035a572a82a229fea61ee08530d57334fda986 SHA512 a2b25d9820fd8185d4e7a03fb0669fa4c9b35aac9b371b0a873174d615bd40615f1fafa4208d2019af0b7ffe80a8eec6b56ad6075104f6c3a4f8f237ad5b4466
-EBUILD tikzplotlib-0.9.8.ebuild 1012 BLAKE2B b01ce8208ee5d2e59cd07c6af272e358164919c4aaeaa3fa9286962dcfcd201d1b7c947a54dd8db8d89856866dcba31422b03a8a09afa4b2233a1e0659aedb11 SHA512 83cb654f079e8f847bbf9d725b49e133a2eb845ca1644b2a4de3c7ba806901279db7a741050499d0073ca0601f35c22a05edfe3da094b0cd3e92ff195b3d0752
+DIST tikzplotlib-0.9.9.tar.gz 591659 BLAKE2B c8ed8069387aedc154ea1541c7e4f97cd43a74c384be4810029acf2dd1de348d732c004850b3248ba6a892451afec56fc4de0c6b05c3f4edc7b72b741e46b558 SHA512 3b6bc8b23693b1817b7f8969352bfe45f81762f86d30b9329c3c57fb1897ee5965f5759e357bbe68d21b84ac3e53e5ce80ffafccfac22d9a4a36ce104d5a2966
+EBUILD tikzplotlib-0.9.9.ebuild 922 BLAKE2B b4815d76979b0b54774c1907b447482c512e5aa56c3d92eac67b204580fcb157ed1b2d63039c6e67c578d31cd75cc300208e99c233c910214177d25830577928 SHA512 87cb7ac58c25c67c1337e0122aedd405aa29a0515cc55c9a6b833e11b0d00e21a6397a9e9f6bdbf427c4b2c2921925305b9de21bf6c35e52b3978de243fc4110
 MISC metadata.xml 971 BLAKE2B 9bce78f1e6c08facc5705eaebeb99170e50d62a3e35d55aeaf746cc9a3b81f12fd67761f8582505e5916e62301f2962776f656e1242f17646efc3ccc08010dc9 SHA512 1490aea00c7e5fa17fe52f59366308740c4c247d5da77f4a64ea3118ec69517ee8f94b977d2048a7f3824b737c28dff7d5d51214c99557bac4cd11e12de5ced2
diff --git a/dev-python/tikzplotlib/tikzplotlib-0.9.8.ebuild b/dev-python/tikzplotlib/tikzplotlib-0.9.9.ebuild
index eec9580243fc..7a307bf1c63f 100644
--- a/dev-python/tikzplotlib/tikzplotlib-0.9.8.ebuild
+++ b/dev-python/tikzplotlib/tikzplotlib-0.9.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=pyproject.toml
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit distutils-r1 virtualx
 
@@ -18,8 +18,6 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	app-text/texlive[extra]
-	$( python_gen_cond_dep \
-		'dev-python/importlib_metadata[${PYTHON_USEDEP}]' python3_7 )
 	dev-python/matplotlib[latex,${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
 	dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/timeout-decorator/Manifest b/dev-python/timeout-decorator/Manifest
index e466c6f0a7d3..3994c817fa04 100644
--- a/dev-python/timeout-decorator/Manifest
+++ b/dev-python/timeout-decorator/Manifest
@@ -1,3 +1,3 @@
 DIST timeout-decorator-9fbc3ef5b6f8f8cba2eb7ba795813d6ec543e265.tar.gz 6178 BLAKE2B dc89ba8c4fb861d3e69322b531a944ce6587800ea1f6d871fd5bd95e69ce4fca74c403cc430adefeda08675972a11e872e2296e14b7d7819c78a46fa08db5fa9 SHA512 2e691d40fcbe55a3d6be81f9744c2a06c436b61a17d701ad0e9df7003e7cf41b6e4876b48d4bd4a5b429ae2139e8f6ef8ae05092b599d80b3b5aa05716bb124e
-EBUILD timeout-decorator-0.5.0.ebuild 587 BLAKE2B e7b9d3ee952a0cad8e93f61ded971827b2ff23711c27b0bf9f43120b4baae03b3c1181fee7f09d411d16b6ddcc1453594dc4e7054c5c46386da2e05152043548 SHA512 0101fb6af5ab7f3c8d8cbbb7c8bd4c400099b91b6e9bb87f5d714bfd2c2fb23daa68d1fbe79d88a02914c7de31771fdc9979656f71302eee2134936ec104c3be
+EBUILD timeout-decorator-0.5.0.ebuild 594 BLAKE2B 3cdddf3f62c3a9af396c4d8eb11295cd2789843fdfb47e0be863841c8db43e74d1737527e41b410c94147cb92d7cd0b08a3b861528a3bf2e473d6cb219f7c65c SHA512 6dc03f22b4c5a5c0da4a4710b9294889470c848166ee6756b711651a33e9166434264ac7f12f6c00e16532f89f799b72898008dfac4cafbd3d010073d830c452
 MISC metadata.xml 386 BLAKE2B 4f198691f778ea9233ba84506a7a598558a1ef412bea88e50ba63d7567d51fe79586ff416a5e016b8604c0c96a7c0eba427d279667136617f219efd8db24b2dc SHA512 aac2b6666862755f80fce2932cc9a22278ebc445820803667fb23f834cfb07210c9f84cf5fb798f0d82702a1c1300cbb1acb7553b237c03817cda8f2b5c8e69c
diff --git a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild b/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
index c8cd23b5e344..3d7f90dd9adc 100644
--- a/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
+++ b/dev-python/timeout-decorator/timeout-decorator-0.5.0.ebuild
@@ -20,6 +20,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/traceback2/Manifest b/dev-python/traceback2/Manifest
index 9fbc07220999..5278541c4d1d 100644
--- a/dev-python/traceback2/Manifest
+++ b/dev-python/traceback2/Manifest
@@ -1,3 +1,3 @@
 DIST traceback2-1.4.0.tar.gz 15872 BLAKE2B cd2e1fe91e1e71a6dd764675e083857f359cfa5aaa3d2fee7f1709e24c545bb9e337f0af1d87f9e286fa2c36dfa12dca84589a936dc9f9805a1c4891739f337b SHA512 84c7fc291c8f2d4cee10441cdef1820aa453e631dfa91ed58e40fc205e97a9dd2101388d5689e4fdf10edfbf06bdb5b895d1635ae7218ba0c9b697d3f95f9342
-EBUILD traceback2-1.4.0-r1.ebuild 993 BLAKE2B 913877c5c8f59bb8d7b61f60eb7ae97e82296c60e7feb03b496c9f29b54c85b866011029bc882276be089301e07f0a8ad1fdb54491a00c29ea7f5ffcc08ec228 SHA512 154453d7872f514009a812dfa816ce9760d6afff1f6b5de8e4ee9520267403722fe737553e848916acd4f3a188a5a201423e5614340954e1a6bba9cd6ca324ca
+EBUILD traceback2-1.4.0-r1.ebuild 1000 BLAKE2B cac4769fd8ff573414792ad3bedbfed411f193162022bf8e7f5a18e81711b196de20c469fa63500ee5960b85b7ec5a7d4c030f2ac440197f9c42164e2d0dc257 SHA512 f03cd5d08bb1afed3f72ae7c5a279a5ecd5ed124595fdd0a9f1683afb7e01e6e4ffb21129bbb34516fcb1513c218e2ca3be4111e4f691ece65211d617f1c1bf6
 MISC metadata.xml 377 BLAKE2B d9559b04f5b5494558e9441673f5f903a07e14d4f333a48c6b0091d1e254ac555f26d9fa4f48a794f197026f8683d80c7bd80020233839840cbf277bd72e3c9f SHA512 5323b19aa003404610d2ddfff36c8e7117412afa058486b02dc949e6b39a8a52dcad78aaec92ba62fed72f0dfe5ef501905ade41a3c018dfeffcdbc8ab9b6378
diff --git a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
index d0efd47ec9ae..764320ce82f6 100644
--- a/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
+++ b/dev-python/traceback2/traceback2-1.4.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/linecache2[${PYTHON_USEDEP}]"
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index 7c37ec132f9f..e7265dffd0b8 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -2,5 +2,5 @@ AUX traitlets-5.0.5-python3_10.patch 1221 BLAKE2B a3f8617f09ae6a5def19d319d2e488
 DIST traitlets-4.3.3.tar.gz 89838 BLAKE2B 04b50fabdc312c427f0cff6d4e8be0a5afcafe6d5a7a5804fb37e6f92b867e6a9c6401c23b7cdd7b0a6372eadaf3e8350018db5d21c5cbc546390138932a2820 SHA512 a7ae0276e5234d6d428908e1ec74c0b92f2b1b73e37402ad154151c41ef6e4aaaad53e8990d4233d8023c31d919e4ea66f100a82324abcb0e6ffb92283fd3c9e
 DIST traitlets-5.0.5.tar.gz 128856 BLAKE2B ad3e5d6dbdf3f118a86be0106e0243146ff833c40300c5fd4c5704db323fcfa4b30d87a88e66608e3a54672c9a7cd6ce07bd9596827fa7ce08625626c9610f7e SHA512 ec5901bab493949f656269a6f7a9211f919a29510d22a6ed440f1e3577dfcb73a6aeca8a0e7d2a6e23192b9ab4844beef1012a847ef08180e64cfb1e2cd40bfa
 EBUILD traitlets-4.3.3.ebuild 623 BLAKE2B e54fc9f3aadf2e16e61f0cab8639bee2202492eda146f39a76c8575a0b4a7656aab292c50d0f728697fa146c1db60c9baa0baa57902a05557213dd7cc1f516aa SHA512 7cd01dff3e9e707475a77f6018f71d1a20010820b46e9aa1e27c80bfb9d3bbd5bfe6fa3dbc1cb3049571722404281882ad135dd1202af4e85c1ca1e93fbd652f
-EBUILD traitlets-5.0.5.ebuild 672 BLAKE2B 720d551bb8ad27d2b55df71d590e4dd310517b159d7995f18fb47655e47126427d8377a7621940a5d89e62561abdf95eb767032a59031a91624049e7825ca07c SHA512 365486105e057e9f667824a6a533c236d4ceeb78d2afba30e94b4a5d0fbb50c1617a5d728c98cb1ece4e551698642a294141187d04c5dd0a77839cd0fe55c014
+EBUILD traitlets-5.0.5.ebuild 679 BLAKE2B a602d7947c2ec6aa58ad93ec901952a9e76ddc8b77c890b9033d46fcb0ec2916e04e05e1facd46db76e9822dd3b1713ef74847220c1b237c277e6da83bd18f36 SHA512 6ee7933de6af6c74ab4aa87ed6696ec4012837e53b2f3fb5a2c2f43436d5fcdbfe95caa4a673a2bc1c93c08c629692a3d192a1dd54306cd79ae43299fde045ff
 MISC metadata.xml 736 BLAKE2B 4b61d7d9106717f7233fb7e4ad676efe0d543a0585ec99165d2253d75128e99be4336fcf8a473f0bb161d41d479b458b4470efb1ec2dfa6820d4a82939f8723f SHA512 5261fe54741b898efc3290f3b939fefd03a6686b2be0d43e8a9eb0bd5e506e7df4ef04bfcd6079f69e83e4c88aa6d035e572a9d6a577f1f4e8b56e01c49b0b89
diff --git a/dev-python/traitlets/traitlets-5.0.5.ebuild b/dev-python/traitlets/traitlets-5.0.5.ebuild
index d1bd74f7d5f2..2784aa2aacdd 100644
--- a/dev-python/traitlets/traitlets-5.0.5.ebuild
+++ b/dev-python/traitlets/traitlets-5.0.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/ipython_genutils[${PYTHON_USEDEP}]
diff --git a/dev-python/transitions/Manifest b/dev-python/transitions/Manifest
index cca713abadf7..722c61b967d7 100644
--- a/dev-python/transitions/Manifest
+++ b/dev-python/transitions/Manifest
@@ -1,3 +1,3 @@
 DIST transitions-0.8.8.tar.gz 1100609 BLAKE2B 18ebbb1d45e33e7933208b043b56dca40e8dcda936ffc2af4c38ad9325f3e19c0d3c9a35e4d728be05b97feb47eb922fd48317018761bc5c3243887d2f077e33 SHA512 ff6c039ed5ce9fe484c3469d2aee791010a99af7a9bc8777842f1514d7eca3fd7714694240cb57839754367c58228d59b41a88f12c2b7d75353f75e63768160d
-EBUILD transitions-0.8.8.ebuild 849 BLAKE2B 8762e70a41840f5496932b676a6e871702c736a047960bfef143e71f41eeb5f4bb900d1444f3db3c27f7364aa5b7044ca03a826a981b08081d75f3b5813e0833 SHA512 2bb087181d62898093f9d3452e39bed029268ab343b5df1035655ced623c8664b41849c9f9a6dc0902e52807ecb1f6003a74f58c0436cea9b7eaebb8b69b6da7
+EBUILD transitions-0.8.8.ebuild 1003 BLAKE2B 89bb3764cb0e2637a85061f64890d4548a482b93953b6a0e4e3a0b4e19de8b4a4f7bf6c1d3b849f353a72d1196ce67fabbf63919d7c1a0efa8dfee78ffda4132 SHA512 555c6d27c60ae73e34198482f6eef49475733440652f461dbbb83491202275ed8c1654806a3570cdc84a86fe86d5a14c09ec16e5ae4451d3ee51a17c1e6d6b67
 MISC metadata.xml 862 BLAKE2B 32352ca5b3a7877cee77cdbde85ad75db077f8b9de8e7d38bcef726db2e071095fb17c41075c457c226a0756ecc321cae83fdc2b82a21480a30cccf2e7b4ccd2 SHA512 23ff20aa82f9d97efc8b0a396f8dc289c91d3e8ffd3335757369bc45012319120614e276c719d9e5f61b7877ca37689a7f6576ad1107bd8d5135857f2fbe0b7e
diff --git a/dev-python/transitions/transitions-0.8.8.ebuild b/dev-python/transitions/transitions-0.8.8.ebuild
index c4dc2836302f..fed98ff0c272 100644
--- a/dev-python/transitions/transitions-0.8.8.ebuild
+++ b/dev-python/transitions/transitions-0.8.8.ebuild
@@ -34,6 +34,13 @@ DEPEND="
 
 distutils_enable_tests pytest
 
+src_prepare() {
+	default
+
+	# https://github.com/pytransitions/transitions/pull/538
+	sed -e 's/description-file/description_file/g' -i setup.cfg || die
+}
+
 src_install() {
 	distutils-r1_src_install
 
diff --git a/dev-python/tree-sitter/Manifest b/dev-python/tree-sitter/Manifest
index 06b794fb0fb1..915c87e7dc69 100644
--- a/dev-python/tree-sitter/Manifest
+++ b/dev-python/tree-sitter/Manifest
@@ -7,7 +7,7 @@ DIST tree-sitter-python-0.19.0.tar.gz 129336 BLAKE2B 8a37b0d74ab89aa56d7164bd38a
 DIST tree_sitter-0.2.1.tar.gz 110417 BLAKE2B 263f47b9c8beab4b99fbfeb40521467f7f507ead77b20eb1bea7d6f076398d4f0db02299290a552aaa35959dff4a87866d010d628269e64cebeb06d86856fdc6 SHA512 72fd602689a78f51184820fb15891863873f8b290811152ea568cfa6fbd2d3f182ae8627f028c8d485d0e9bbe7b81a9d6ed57e7a8b551ba38f8dd738fb7c858a
 DIST tree_sitter-0.2.2.tar.gz 110585 BLAKE2B 2798469b65bdc2447697797f937242dcfd2fe0dbb0afa7a41fe05463ec6c93afa63b26ee4e3e65585b57a2592ac444c2522469472cb0562f313f1261c358e5b3 SHA512 b32d7e3be408eedf52b53a5ae7613b3c423eb84d175d0fb31d63c052c2c4d3a7539b53d45276629a2a02c460289e877efa519c2055cdee477e23fe50cc452892
 EBUILD tree-sitter-0.19.0.ebuild 572 BLAKE2B 435e4dcfbef4d0bb3acbbe40222b1b834f2bb5fcf4b62a727f2421015110ec65b8756d38d0d8046d5436756c8523ebdb37eba89f0258404ee45294abf7eac3b4 SHA512 41d6e08dbc381bcb68b40f1d420f11500e0c53e549e68d352840bdc2079ce28c3aad741953c29e1680251df124fd9f84b8aa38bf86b120b881ca1254369ffaaf
-EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1280 BLAKE2B c672d6b163fd7dd2b8e1af8ed519ed8892096436b7df083ac9607ac53688c81c6bf3272e81e36449aa9becd11837449fb06b6b55fdfdceeea929f13a2031d309 SHA512 cc68a4dfde9ea3bd703abeb7b23c9e1fb4495dc365f69560b00ac8aeddf2e87550c2ec366ec6847b064280ad918d8546b32919e83252430d9fff561963c49609
+EBUILD tree-sitter-0.19.0_p20210506-r1.ebuild 1287 BLAKE2B 3a1f9ac9ed82bbb3e79f52f3a51e7af8d66d1b559de7fd0646e73dc142819c8a74b11a4199cfa612684a3b0d17d8b0b0cf244e0daec3bebfe67eed73d1931221 SHA512 89fa71cbfde8ce26136a74911cb40a3e9a14771cb6dbb2039e6c50eb7c9102b0292e45bdf4529d45904cd7c56caa4ea41430cb78ca47496e9a4cdbda698c84e1
 EBUILD tree-sitter-0.19.0_p20210506.ebuild 1444 BLAKE2B db1ea486fc9c3e8c586160d2d2e4cc1fd916f93f39c1394abe68f8e4247c98ae89084fd1512b0776046218a2f24d846e4f0cd9fef9da9f97f1f4ce8af31a8751 SHA512 f85feb015a225a3087be16b9e3c0adcbd324063caecc98cc52277e42288516d3a9f739d5c544c6893c1ccfa3b9f8760f52f0e5968837bb2c19dd9a3427d29769
 EBUILD tree-sitter-0.2.1.ebuild 543 BLAKE2B 351e3b054370ca42891b610933ed42997ddcb65e92accc84a7a4b1221f51caff54e76f7efd391738a24173f8207f68da78a456f041f29659f74b295eab566039 SHA512 3c62dc7df641bf32196be756fbb08352c8daae9e8fda39a5c60a819c98d9f12bba5289d7eb132d05cfebc10b1e793f73e856aa165209f9700eebaff881fa7359
 EBUILD tree-sitter-0.2.2.ebuild 549 BLAKE2B 9fe8a70cf46d813d37a63689a4895884998933a4e28d48ec9331173df1f68a0e61f8378b22d8c0ecaa08ba6f7b940eb92c981abb2ba6cab10e37ffff716569d7 SHA512 18fb5537c3571a9e5abf9c94ae81149755b4df19d8d97e07aee0380d30f4c64ceb44781a5d305873a6aeeda3ccc089562fc507618a899dc7852da2b4210dd7ae
diff --git a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
index b0c6e0c2a398..fa217361cd3e 100644
--- a/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
+++ b/dev-python/tree-sitter/tree-sitter-0.19.0_p20210506-r1.ebuild
@@ -25,7 +25,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="dev-libs/tree-sitter:="
 DEPEND=${RDEPEND}
diff --git a/dev-python/trio-asyncio/Manifest b/dev-python/trio-asyncio/Manifest
new file mode 100644
index 000000000000..abf01cdc5ee9
--- /dev/null
+++ b/dev-python/trio-asyncio/Manifest
@@ -0,0 +1,4 @@
+AUX no-pytest-runner.patch 442 BLAKE2B ff5900203f9c5d113a822f6233e2391d7eb1dd815709dd8a9e2ed30c18273125cdcd9ac2940870f81e9de3bcf9db130f2dd3a9492820b15ddec282759fb5e52b SHA512 7776f8a2445f35ff83324eba5aed4672f2e20e57a8a89c13360e32aa6c12d13df6fa1801b4a671797d5f7de8e1fee174f4e94d36617a382e536261bf05a64bcc
+DIST trio-asyncio-0.12.0.tar.gz 72508 BLAKE2B f2dad48e20dadb81f603f8e7edf5d108f5c1dec332e65599e06495a9e3b919d20a15e3cb0d4f06c46a0e844cd79a88c172043b5cae2bc632661679a9ac854c04 SHA512 da630bf95d0736efd419a7b84d3fcb55f4440ef5f3ac584f36b2eca9188145d4581b20d4842b1322b07f176822f7c76e32ae57ac71899ea2445ce1783bcd382c
+EBUILD trio-asyncio-0.12.0.ebuild 836 BLAKE2B 05a5a2df4f84eefe7f3f8ec20f60fc0f131b66d14e82fe2f66019fb7315d7848d0e6fc0bf85eb801810db25d90bf3f2a427da9115d1db75f90875a5699bb2cc9 SHA512 5b70b92265cd452d286a7927c4056d51dee87b56d54e32ba7967d622b7111316004466459db4616f722d85e8c95b884464c8b62436df79fa083eced5d0fd68c0
+MISC metadata.xml 1454 BLAKE2B 83ff665a02485c83a88fa3337d2bc4aa6192ddf3f02624a4c44d081656a32477ab9bad59d8c02e333e7634cbced29b64d527c0eca7cb33a602d2b78df18ac678 SHA512 9c374c5b75e586c5549e58d3238c3ea6952641774857396118992f8a6aeced4f85afb831d6f3b00965af22d37eb9d5e3efc21a65c6f5f3a598fa8307e41009c6
diff --git a/dev-python/trio-asyncio/files/no-pytest-runner.patch b/dev-python/trio-asyncio/files/no-pytest-runner.patch
new file mode 100644
index 000000000000..6eec59da4286
--- /dev/null
+++ b/dev-python/trio-asyncio/files/no-pytest-runner.patch
@@ -0,0 +1,10 @@
+--- a/setup.py	2021-03-27 18:54:07.104800689 +0100
++++ b/setup.py	2021-03-27 18:54:23.197091635 +0100
+@@ -77,7 +77,6 @@
+     include_package_data=True,
+     python_requires=">=3.6",  # temporary, for RTD
+     keywords=["async", "io", "trio", "asyncio", "trio-asyncio"],
+-    setup_requires=['pytest-runner'],
+     tests_require=['pytest >= 5.4', 'pytest-trio >= 0.6', 'outcome'],
+     classifiers=[
+         "Development Status :: 4 - Beta",
diff --git a/dev-python/trio-asyncio/metadata.xml b/dev-python/trio-asyncio/metadata.xml
new file mode 100644
index 000000000000..e006b6313aca
--- /dev/null
+++ b/dev-python/trio-asyncio/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<longdescription lang="en">
+Rationale
+
+Trio has native concepts of tasks and task cancellation. Asyncio is based on callbacks and chaining Futures, albeit with nicer syntax, which make handling of failures and timeouts fundamentally less reliable, especially in larger programs. Thus, you really want to base your async project on Trio.
+
+On the other hand, there are quite a few asyncio-enhanced libraries. You really don't want to re-invent any wheels in your project.
+
+Thus, being able to use asyncio libraries from Trio is useful. trio-asyncio enables you to do that, and more.
+Transparent vs. explicit translation
+
+trio_asyncio does not try to magically allow calling await trio_code() from asyncio or vice versa. There are multiple reasons for this; the executive summary is that cross-domain calls can't be made to work correctly, and any such call is likely to result in an irrecoverable error. You need to keep your code's asyncio and trio domains rigidly separate.
+
+Fortunately, this is not difficult.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">python-trio/trio-asyncio</remote-id>
+		<remote-id type="pypi">trio-asyncio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/trio-asyncio/trio-asyncio-0.12.0.ebuild b/dev-python/trio-asyncio/trio-asyncio-0.12.0.ebuild
new file mode 100644
index 000000000000..296d8886411b
--- /dev/null
+++ b/dev-python/trio-asyncio/trio-asyncio-0.12.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="a re-implementation of the asyncio mainloop on top of Trio"
+HOMEPAGE="
+	https://github.com/python-trio/trio-asyncio
+	https://pypi.org/project/trio-asyncio/
+"
+SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/outcome[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	>=dev-python/trio-0.15.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/pytest-trio-0.6[${PYTHON_USEDEP}]
+	)
+"
+PATCHES=( "${FILESDIR}/no-pytest-runner.patch" )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/source dev-python/sphinxcontrib-trio
diff --git a/dev-python/trio/Manifest b/dev-python/trio/Manifest
new file mode 100644
index 000000000000..f46b8137dd06
--- /dev/null
+++ b/dev-python/trio/Manifest
@@ -0,0 +1,3 @@
+DIST trio-0.19.0.tar.gz 486036 BLAKE2B 052cadb8d251960b20349659b92f4d26c5b65128cbbfafee21a4a4b90463e43d9c9db6b35f3659d2b062c7d0b8b8914b31b38d2faed6c9d948c0ccbe85a0a250 SHA512 5297a3f48b786eac05b686f1e8bb0603a9c0133d6c4872a307cdc8f1e37aedb57d668b61c2568c82b7d1058b6604a22d2c5c2298f13d13f0daf8e9259aa76d7c
+EBUILD trio-0.19.0.ebuild 1431 BLAKE2B 01e010f8fb421a7eb43bea26432d30172211a29d429cca4450d0378c0801f89b172dc888acc262885e87fb6353543e879cb2601bb7aca171646e0c32478d0970 SHA512 5bdc48ef281b52e0b9419ea57e1d3a12b38e2cdc53846b7bb85c4caba65deae09a0e23f4ce16c35e07097669575c59afe1667f33451fe1cf74ba6493a60973ba
+MISC metadata.xml 1958 BLAKE2B 303fd88e174740b04b8a3f5f7c4b55fb6279c54d7682dd455835a7071edc66c46b31833cef66f4880e4c047c783b928af81a1e8e9fd1e4f9303cee337bef103e SHA512 e916d2dcaf9ac82be7a1163d67017640c227e707589e830072f1af17328f77d3b721bb6014b99c53dff575a6c7448767056b436f50438c9ad04f820d1b292de1
diff --git a/dev-python/trio/metadata.xml b/dev-python/trio/metadata.xml
new file mode 100644
index 000000000000..1bb5fd59d255
--- /dev/null
+++ b/dev-python/trio/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<longdescription lang="en">
+The Trio project's goal is to produce a production-quality, permissively licensed, async/await-native I/O library for Python. Like all async libraries, its main purpose is to help you write programs that do multiple things at the same time with parallelized I/O. A web spider that wants to fetch lots of pages in parallel, a web server that needs to juggle lots of downloads and websocket connections at the same time, a process supervisor monitoring multiple subprocesses... that sort of thing. Compared to other libraries, Trio attempts to distinguish itself with an obsessive focus on usability and correctness. Concurrency is complicated; we try to make it easy to get things right.
+
+Trio was built from the ground up to take advantage of the latest Python features, and draws inspiration from many sources, in particular Dave Beazley's Curio. The resulting design is radically simpler than older competitors like asyncio and Twisted, yet just as capable. Trio is the Python I/O library I always wanted; I find it makes building I/O-oriented programs easier, less error-prone, and just plain more fun. Perhaps you'll find the same.
+
+This project is young and still somewhat experimental: the overall design is solid and the existing features are fully tested and documented, but you may encounter missing functionality or rough edges. We do encourage you to use it, but you should read and subscribe to issue #1 to get warning and a chance to give feedback about any compatibility-breaking changes.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">python-trio/trio</remote-id>
+		<remote-id type="pypi">trio</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/trio/trio-0.19.0.ebuild b/dev-python/trio/trio-0.19.0.ebuild
new file mode 100644
index 000000000000..14417d4fa8a4
--- /dev/null
+++ b/dev-python/trio/trio-0.19.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library for async concurrency and I/O"
+HOMEPAGE="
+	https://github.com/python-trio/trio
+	https://pypi.org/project/trio
+"
+SRC_URI="https://github.com/python-trio/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/async_generator-1.9[${PYTHON_USEDEP}]
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/idna[${PYTHON_USEDEP}]
+	dev-python/outcome[${PYTHON_USEDEP}]
+	dev-python/sniffio[${PYTHON_USEDEP}]
+	dev-python/sortedcontainers[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/astor-0.8.0[${PYTHON_USEDEP}]
+		>=dev-python/immutables-0.6[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		>=dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pylint[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+distutils_enable_sphinx docs/source \
+					dev-python/immutables \
+					dev-python/sphinxcontrib-trio \
+					dev-python/sphinx_rtd_theme \
+					dev-python/towncrier
+
+python_prepare_all() {
+	# these tests require internet access
+	rm trio/tests/test_ssl.py || die
+	rm trio/tests/test_highlevel_ssl_helpers.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/unittest2/Manifest b/dev-python/unittest2/Manifest
index f58f657f38b2..05da69946bf8 100644
--- a/dev-python/unittest2/Manifest
+++ b/dev-python/unittest2/Manifest
@@ -1,5 +1,5 @@
 AUX remove-argparse-dependence.patch 424 BLAKE2B 6b59d1913f24b336f9cd8bd40a0d42f281fe452937be9b1f2b7187aaff611c07de8bfe138ce9bbd42c5c812d217400d4a49ee991e44821020b5d3a131b5dea18 SHA512 e4a7b803ba5e77484f4e800df4c78d5b4d35f2d66e5c416c256bd6e7fa3db193c32aa0a455aac66b34f27c1038accf7949f64d98bf4a31a896a43d790de810f7
 AUX unittest2-1.1.0-python3.5-test.patch 1304 BLAKE2B 390a1972a4f24ca348f6d1d35badd2fe9a88fada8961c16e759f39da6843a1c931040ea3cd236f20b9671efa505c58857a2872553029c88a98b75c8358ac7281 SHA512 502a72811581e3551ab8fdd80f0f72ee4f6be9a3b0ce01a131f240f2199babfa115ecb18c5d4efe297521e6951f9371869b9419c829396720623bff548f09398
 DIST unittest2-1.1.0.tar.gz 81432 BLAKE2B 02bf191baaa895689078e8f484bb368cd178ea2d1e275a5adcd3413eb25d18b9109c353046f60819c7ec26cd233867b7397e6e38004389aa928b4c53cfeb637c SHA512 3fba15728905f437767416ab4fd3573d3fb2319486ef84c52a9fa930ea84aa1f2ae29d6f58993e3509083625790e17b1ef8d9ac5de0e166c254897a3e7a202fa
-EBUILD unittest2-1.1.0-r1.ebuild 951 BLAKE2B 2d458d942bb0f023998240413f95841ff1ef97cd757346c1b918a0b566db0a586818c4b129804308150608955a70e11bdd2e545f950996c2436ed4305cc8ac90 SHA512 e476569a8f4203c14982e30f2c4a7359cac38b5609985d36c3a80b555653dd657a8e035fc07c234303367cfc82751d1cb821f9090bd8c8bb1ada14f6a55f40ac
+EBUILD unittest2-1.1.0-r1.ebuild 958 BLAKE2B a1ecfa570c8d9b8bf3b314a2f804d95e5532574004538037d00142b974d918740dadbc58ccaf1f1baff22b2e601d239ec3ecba41c7ef706d13bd5b92aa35fb1b SHA512 f3ca65512da1c351fe9aa81e911374fe05bb68d42f610ba7b8b79765b5577f353e0dadd9dd51baac70d59632f3eaa254e70b77aa3759277bfb0e7d56aaef9e4d
 MISC metadata.xml 378 BLAKE2B e0a0ad885607d8593e090798b8facbacd746a69c3325f6d429743482a6265bff57b2d0fd6d12122e15336e063c4c1e539da10cc41ea5ab159b2c5673e8316c8e SHA512 b1db02e32f39f739de9a077d770579cd1adbca7bc7b9c1eb3e5800f5242a1706ec5a61694b98ea7e3e6f6099b128d22e731f4c49cf3c719bb38be52679845d34
diff --git a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
index 91794288fa37..232865bfcf40 100644
--- a/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
+++ b/dev-python/unittest2/unittest2-1.1.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	dev-python/linecache2[${PYTHON_USEDEP}]
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 0c0d5afe6ba9..7dcef89bcfa5 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,6 +1,8 @@
 AUX urllib3-1.26.4-test-ssltransport.patch 1267 BLAKE2B e82ae435cfa8a2821f3f61d91a2e4f9011c5f68d37fddd1a40ae4658566db45717379c48d11299eb260c2f8816f416ac69b0379b3c7f925075ee9c1051aab1bd SHA512 bf5d2bb2b48444724ee1cfb87f4a84b3a63cd6ca598ba4d92a44bde71c66a35b815905de51fe027abb2eea63ae353dc0df2338ddd4f819f678f8a39b5c6d685b
 DIST urllib3-1.26.4.tar.gz 293008 BLAKE2B 6ca88861baa87814d3856cd0f1fa0a6cb9e11ee745c782b598c4f5fe74b195ba47e8430b993ed8a5fb269153d700e4a803cd2ebc177e20e3186b3b26612262c7 SHA512 daf2ba432f2e4edaa6aa8c6bdaaea21fcb77cc5fdfd991f89b1f753b4f9901faab04120841e9fa8d93e2bd3d72cbdb647f1492d882266b4e0281c725e8d55a7a
 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.4.ebuild 4265 BLAKE2B 17f981911cc9adf17b7fa989833a47554127d9bdc7c1f49605c0c949c0c82ca24e48e5e1bea38f8f549c5eb00e047cfddf03a967a0ea7bf1e83afa9901044f7f SHA512 f9d2190c141b4c4daa2d9e3d4fe577acb3d0787c8591ca46bce3ccf5e22872349fa459e63cd5cb96710f25a5910a2ce600d0003b7e72e5f9c4e0797c459d07f2
 EBUILD urllib3-1.26.5.ebuild 1970 BLAKE2B c59e0c4b55feb44a0880f19ab50ddf8ff49bda077d89acc071bea27211ebcec6f8f41c275b2e87a2395311ce380d5e547f554315ceb0807f6780e0fec151256f SHA512 7cae227afbfe5d4b8ca30f5a85e2267af6108a64f04cdc96a3b474b7f039dfc9326aada8636758817a3dfe5f66039db58fcd0de2cb4b456c4410723ccafad187
+EBUILD urllib3-1.26.6.ebuild 1970 BLAKE2B e3dee58d1f4b280c2c2c8a84afcb9356450f045267ec321467933ffac73a9de5050473524d971cd65724b8de1b3e22ea824fc0cfd933a3083bd46b0b6bbb6dc0 SHA512 4d14b178b5d4df05883498a6cb0b38d1630ba11e20b3d93ccb57a27bf99e0d510389f1344155177501472f4ec4f39d8bf5c4ef4fcb6141a3d0d0e2eed5a86219
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/urllib3-1.26.6.ebuild b/dev-python/urllib3/urllib3-1.26.6.ebuild
new file mode 100644
index 000000000000..b68c311d9396
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..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/watchdog/Manifest b/dev-python/watchdog/Manifest
index 7006f37295df..7364bb3368a3 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -5,5 +5,5 @@ DIST watchdog-2.1.2.tar.gz 97407 BLAKE2B a847089409537391287a146670864c7721344ba
 EBUILD watchdog-1.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
 EBUILD watchdog-2.0.3.ebuild 892 BLAKE2B e4be44b841127430ac9f7fc683b8ad7d088fe51d7579cbda444517be3435ec4051c3568ec030dd4ef6a7332a3e8f4d5550f0b76bf96da00746ba820b8e21fa43 SHA512 871894c2e566a524ce7abb58f7e324def71d0a80871a6aee11c5d37f85455e7121e60b9bee3d25535e23386fd537d06a8e218b8b1c777174c84cd9df6a26ce3f
 EBUILD watchdog-2.1.1.ebuild 1039 BLAKE2B a98977e3101c049dfec77c6c91f7f813ce7a715adccb2c294c88030d0414989d28b58e3a2f7fe963984b227c4398ac2175ace5d8ef41f9c8ca620c906eb3e834 SHA512 a8d0636fed98cfb94c3bab2a07d76ea0eb4df2988c807f91ccab08bc31981d8bae41d4d182838fc53d342dd7de8a352ad6c12f45b126bf866f81c5d3972a72d9
-EBUILD watchdog-2.1.2.ebuild 1043 BLAKE2B dcc88e2fa6b6c300b4ee78335ea17a5807fe02ec943a4d9bc180ffa677d0f87fdf417c5781569afbb88369c958bb9a55b963d57c9592a5ca39895d971887a4b6 SHA512 88e48e6398dfc62150f5b27fdfb2562721e5a54006990c1b5f1f336069bf016a964c113655b334de7962d72ed9e15aeb83a6ecba3b0944314a9376c6b58a2e7d
+EBUILD watchdog-2.1.2.ebuild 1042 BLAKE2B 1418bfff491d1f0694b71dca2b28c177fbe783a247f1f095f8d1644bacd44b523a8f3854dafb6177953bb03120bd4e3f27826cb167d57e72fe1a1027371ed3b8 SHA512 9d0b4f8b76e8d897327e66667d3a62639cb9a85206f2afd2320931ddd90ee629d2c9b9ee05c579dea942ec6a1827a963c84fbfdb612cf6ebc6b9417d45b5ed70
 MISC metadata.xml 462 BLAKE2B b18ac987fd2ea50f8f05f5ada3cf82db92cfedd0e032759b0063407d54acdf3ace017ac4321af37cdcc5a4d2a2872185db22971226aebe1914596e5f8bbbf580 SHA512 46c75850890be381d2d45d00c5118d862aa97ccbac569fa3b44a85d880de2a2c6a6c0d266d518826f4e4206003d2aedc508707258890b60c5e42c2a564459ab2
diff --git a/dev-python/watchdog/watchdog-2.1.2.ebuild b/dev-python/watchdog/watchdog-2.1.2.ebuild
index 3de398dca868..9ed9de0edfef 100644
--- a/dev-python/watchdog/watchdog-2.1.2.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index 7d2543299211..dcb0c91270e1 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,3 +1,3 @@
 DIST wcwidth-0.2.5.gh.tar.gz 47514 BLAKE2B 0ac5fb08283c23039453408da2edac36e2079fde8fc903002785e2e0f8bed55d1d6a291181097f73e4ec8152b6eaa4f4553b0b39fe1cadc7a99bacb2d7e55d2c SHA512 3f1f1fefd3ee9f06ea2051842e8c3bb09a92501f031124b8514bec444eaa8594ab9649534b4264340d475716d5a6571dbe5ae932f685160defd75c19295e60f9
-EBUILD wcwidth-0.2.5-r1.ebuild 1080 BLAKE2B 112369e788e7e6cf2a53f0d0f7b8a28da28ea6a7e125eb338b1cd2aafdf93ac53245f976448ec4afdbb687d02ebc9b7ed4c762ad6a2f2300783dbaee96602f7b SHA512 109aa6b9bcd75ded5366162a8a25f69dd036fe20aa5d9e46fa130900ced57a0719b84e3bcccb67f5201414ed53d97b5deb84ad8c7dd1fbf2109314724f8584a4
+EBUILD wcwidth-0.2.5-r1.ebuild 1087 BLAKE2B 40af034385470ca38af9d449043706314a2125250f0fa118299391a1d1704a11982b8f6938aa98ccac65dd486b32ac242e5f4d36622a990d5aa55aaa33e64369 SHA512 f9297000e7ffbf9479b8d5c6dbb60f1dc8a3b4e34afff7d139d8c0c9e511cb4d476e419919e589850706e321d120c33b6fed60b06c5e2e502359c5c801ce153c
 MISC metadata.xml 401 BLAKE2B 539430ada34933bd8bebc7146f9fc472a9a6e076cce36d6e34026d54464da99cc520e3a473f246c807531fa7edbefec87cde6cb948c8d295f77aae122466a608 SHA512 d416016c92307a1ae828e8135fac401dca0c005d4d0739874f6cb90ef9c36b9f41674896f30298826b200aaffad674c985ab7d06f76ac8897e9dfe1652aba426
diff --git a/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild b/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
index c4313c41c6fe..6e0777ccff64 100644
--- a/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
+++ b/dev-python/wcwidth/wcwidth-0.2.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	$(python_gen_cond_dep '
author	V3n3RiX <venerix@redcorelinux.org>	2021-06-29 10:15:54 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-06-29 10:15:54 +0100
commit	9aa80713372911cec499b3adb2cd746790920916 (patch)
tree	b8e99dc5dd60ac2094a27cc52f74aada8df38f05 /dev-python
parent	b4d43e8c611df4a8061b6f88d9e9f6b1e3c83903 (diff)