gentoo resync : 17.02.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-02-17 10:35:54 +0000
commit: 463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree: 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /dev-python
parent: c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)
167 files changed, 1858 insertions, 236 deletions
diff --git a/dev-python/GitPython/GitPython-3.1.13.ebuild b/dev-python/GitPython/GitPython-3.1.13.ebuild
index 29261d5b7df4..f1e63e903be0 100644
--- a/dev-python/GitPython/GitPython-3.1.13.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.13.ebuild
@@ -23,7 +23,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 9358f9d4b704..c82a94550899 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -9,5 +9,5 @@ DIST gitdb-4.0.5.gitbundle 1497722 BLAKE2B 8ee85368db7f408f96f0b48250f1ed96c8df2
 DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
 EBUILD GitPython-3.1.11.ebuild 1591 BLAKE2B e6f92dc504aab3c0dd9fbd04b7d47d233dff59cbca6f8189f899d6c3c9ecfbc715e5584a417a82132f9f103c974cccc226a437eae1ecbec49e749007d79babf7 SHA512 dcf70c3db925e29177cdf0f6bf45766fe0a2e4765cf197cf2f875b5f7c557f0eb79677136cd8d067372bec47e0fb7c2364dcaf02edfdecd5f986c97b42158030
 EBUILD GitPython-3.1.12.ebuild 1683 BLAKE2B a7ed728bf5e20b0f02ce2c1e5924b09e85bc5292c90cbc28b95dace511202287a2dc96c1e0c0a79120171ad921161e4795176b0cc03943acda735bcd203c8485 SHA512 57e550000fcb7c22895766e9d0944d1c5396572a9794683691cce2a51f3e3f336f5293141cd88bf78186ae16b4cc8b4b8ba08f74c2bb2832c61d72c96b1387b5
-EBUILD GitPython-3.1.13.ebuild 1686 BLAKE2B 657bb1aee42e191d181ff7e875d9b76790e819de8b61bfe4bb267e6ae0aba7c8d0eb310f123b7e5da16ba2262167f340877f34f988913b0f2ec2bdeec3440b14 SHA512 802016f7d4cbd9359eadac37e3337499cd4b1f3d40cb190af99c86dfd96aeecf93ec0c60c6ad0b4d67e2e7f1e7faf122d7e356e9b7d079fdf207b1a273287ed2
+EBUILD GitPython-3.1.13.ebuild 1693 BLAKE2B cbec842337af6c945f8d898ed7767ceba29937947471471195da4c9804136e4e06dd588beb32dd6af5f6e6776aead818464f394d7bd90339ca1f23174541cb1e SHA512 ec0bb8a35f4789648025920e9a013215f62821da5209927290970e65afccf0e976880233edd78f52a5fb183d1e24f06dc3b228ed433ebed4662b73a04b1bbc4a
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5c9fd5cfd911..c141274b3dfd 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/asteval/Manifest b/dev-python/asteval/Manifest
index 3338c5189562..41a0cd2ae8bf 100644
--- a/dev-python/asteval/Manifest
+++ b/dev-python/asteval/Manifest
@@ -1,5 +1,5 @@
 DIST asteval-0.9.21.tar.gz 54203 BLAKE2B c5232b41cc73184f4a9d21e257d4c517662e7a7e5c6beed0d0a1f46572310263b5370ea455f2d0640410cecd7e3b8a7686a56931fa61c3294a57a2e5ea984336 SHA512 b2930963641486f208c629300f70e41924aa59bd9c64f767ed5a4db0a39e79c02a02fed48eb0e113fb6e3fc594973c9d0afa56d768ac627758a096b1c4fe6030
 DIST asteval-0.9.22.tar.gz 55120 BLAKE2B 5712e72f69e3d48df6a6ac33e3bf87517525efb3907cb954d5a4427b4d41aac5bdfbf71376967633d36574a845c40bbeb391d2ef0a2deef280235c468732e80d SHA512 0c6e0d1273fd9794828e006c56d243e2afbf336314dad9ccc95f40b790851460beb42400defbf4ee09eb7d65532b499a762b4b19c3102bbe6d2553a3a6debb37
 EBUILD asteval-0.9.21.ebuild 445 BLAKE2B 0294274fa252b94bb4f937680a9de156133c19a5ac725b6f669663500f52542988b00f0d3dfd8dcd7d3af45122b152bd3fa08f87accd4e743bc09b424d2aeac4 SHA512 88ff548a117141fd37aae50fe8588e7fd711de11edba3e03f8f0bb80173b160459204b18211c5513f9be7253fa1177428f6fa66d0357b5f5dc046f844d9373e1
-EBUILD asteval-0.9.22.ebuild 445 BLAKE2B 0294274fa252b94bb4f937680a9de156133c19a5ac725b6f669663500f52542988b00f0d3dfd8dcd7d3af45122b152bd3fa08f87accd4e743bc09b424d2aeac4 SHA512 88ff548a117141fd37aae50fe8588e7fd711de11edba3e03f8f0bb80173b160459204b18211c5513f9be7253fa1177428f6fa66d0357b5f5dc046f844d9373e1
+EBUILD asteval-0.9.22.ebuild 445 BLAKE2B 32f8fd2189111aa3551b1bfd5b57d8d12ec07925b78d6d5f08be2ecf78137e85ad25a78d444bc1cbf18d5ea39cd766ed90ae7f164b9c729a62bf618178a36636 SHA512 177bd76beb744fa6fdbe3eecbe10de70dd4025761583b5e41863aec9b9a83863265e6a38f63d0b9ea956cd0dfcecfdc4a165a9769d2f78a338f224f61e761ff1
 MISC metadata.xml 387 BLAKE2B f4d9e9dd7e5537c9f87e74daf1af859e1a14e93aad3a7a5c702cc3860288a0200ff822f8b25ad1ab9f8302214407493b125caa0b7baa3ac4af668f0ced764835 SHA512 604adbf69eac36bb9e70109021a3c3c6aae60dc67eede274b10874ebac1b21873cd6ce09bb97a2c0618c101c06e63456752f066de0bfd485c16c1307bdddd429
diff --git a/dev-python/asteval/asteval-0.9.22.ebuild b/dev-python/asteval/asteval-0.9.22.ebuild
index e3e5e94c9504..9b942b300584 100644
--- a/dev-python/asteval/asteval-0.9.22.ebuild
+++ b/dev-python/asteval/asteval-0.9.22.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Evaluator of Python expression using ast module"
 HOMEPAGE="https://newville.github.io/asteval/ https://github.com/newville/asteval"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 05d95139882d..23001ac263ed 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,7 @@
 AUX astroid-2.4.2-no-pytest-runner.patch 643 BLAKE2B 830b0d604e988701faf6c75f148ff65775bbd349ab11669ff9e50809541d45af5a575f5d8874e4260f2e300ffac2446a1f9469da21ab288f325693eebc67f5b7 SHA512 3b2819eda0bdf0847aa7153439dd2cd766aa588921f8c7acf6da85a966ba7047e19a508a208141f7be11fc3348a7757d23a1c0835e977a9fe545cbafec09eb3d
 AUX astroid-2.4.2-py39.patch 1723 BLAKE2B e05c71961478c4a9ea76d5edcff3d1f775fb225a98a4b6849068fd387a4061e25078c14d374f5c60260d1678f34cc9ed6db96b20567bb04a4dc089e0a611a328 SHA512 3afefb42e9bda1666820de490c6d4a8ad7c873fce2965f5a8a159bb00617fe71deda231c3f810d238af1b1f386cd4b5c9eba78f6012ff05a7b6f10e50573b5d8
 DIST astroid-2.4.2.tar.gz 310972 BLAKE2B 23ebe5ef418ce19b64eb1c0f8d711c3f0d86ae32cff112d9a99db48d20a34c73cfa97c96229fd0f0f1169720d24e2cfd0b5a327c29ea0fc0f54a57ede45fcebe SHA512 f5d759c07a13e06d3d071faacff2dc775924566aaef8bdb6e526c4ebf723b6b561f5824b711b33e33a2a69df0a2ff4cbf0f4302c9a0d55610e031e81c4a4be91
+DIST astroid-2.5.tar.gz 304788 BLAKE2B 3d9304dcfff72aa8172fe88b5ee53b723b47b3e602b7c30cae15a61d0cff7d578ccfde4885b56c09c8254ca3fe185fcf297bf85184d68798eb51f1860c516db6 SHA512 eba7e757a12f89a74bff579731a157fda3c8d8dd1b5a4369791d47f7f6e321b23e167260d0988d389428222c8c98929e66ad26f379ff937e274dcd1abdb3b3d2
 EBUILD astroid-2.4.2-r1.ebuild 1870 BLAKE2B b6fb0fedb655a60c9771384b11adb8132d8ea9ca54e61f070e74fa029eee1888a736287a71e094b90ad304bad7f517e3cb52c4813afb4b2321d36d25eb5cab86 SHA512 3d36a5d9fb124927ba9fadb51c22356d99f190c6ede44fa933286de16c4101e45a484489d79e8617e5642ca3a74ef77b55c8cc5f71d138c3d41dc44d740f67fb
+EBUILD astroid-2.5.ebuild 1837 BLAKE2B fa11dd5895f1c711d8c2a388186304adeddf0f4707270f9dbf51a000f16a567429c52ec7a37ac79ad1531bd2633241635c5817cbf885bb7463817390fae6931f SHA512 1c83ff367c6c5627e491b4bfbaf33fd3b1d111ba6820e851ae3fa6670c05c31e19192549310f71d5624421c91534b13204293117bd9cf3fc2be9f310543eda1d
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.5.ebuild b/dev-python/astroid/astroid-2.5.ebuild
new file mode 100644
index 000000000000..c706f0484515
--- /dev/null
+++ b/dev-python/astroid/astroid-2.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="https://github.com/PyCQA/astroid https://pypi.org/project/astroid/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]
+	>=dev-python/typed-ast-1.4.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+PATCHES=(
+	"${FILESDIR}"/astroid-2.4.2-no-pytest-runner.patch
+)
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -r -e 's:"(wrapt|six|lazy_object_proxy)(~|=)=.+":"\1":' \
+		-i astroid/__pkginfo__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		--deselect
+		tests/unittest_modutils.py::GetModulePartTest::test_knownValues_get_builtin_module_part
+	)
+	[[ ${EPYTHON} == python3.9 ]] && deselect+=(
+		--deselect
+		tests/unittest_brain.py::TypingBrain::test_namedtuple_few_args
+		--deselect
+		tests/unittest_brain.py::TypingBrain::test_namedtuple_few_fields
+		--deselect
+		tests/unittest_brain.py::TypingBrain::test_namedtuple_inference_nonliteral
+		--deselect
+		tests/unittest_inference.py::test_dataclasses_subscript_inference_recursion_error
+	)
+
+	pytest -vv "${deselect[@]}" || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/atpublic/Manifest b/dev-python/atpublic/Manifest
index 5ad6fbfbf5e6..2e1c2da51671 100644
--- a/dev-python/atpublic/Manifest
+++ b/dev-python/atpublic/Manifest
@@ -1,5 +1,7 @@
 DIST atpublic-1.0.tar.gz 13611 BLAKE2B b5ce4cbbe950943c001e25c3f0c1fe6c25a99a96e4c630844a409cb0ae9a2e7d8fae8d010864364bb2bc948ce78ed17bef5c1f1ca1435faca439f62521bcc719 SHA512 f9e6f7bbbe12d86df5bc849c432e789fb55c6d19b9d6b3fb2462ea38aa8ad6602504a30a95ec14e001f62709ae5e11ae29258b9cb7a71eaa48879f9cb0cb19d8
 DIST atpublic-2.1.2.tar.gz 16298 BLAKE2B c388743e2348b9143926f4c3a5e7908382799b6728d1768fcc5779eae93d45b5741ec080b5255de39be14a2a3a9e2fecc657802f91df1df8e626910582785a9b SHA512 cfde028756f56c7ca83b91e7d8653cee4575fb581669ee02c56a08c92ae2a6c1e51db76b6def1959354d3e931418a4dd09b78236268170d8c79620477836fe08
+DIST atpublic-2.1.3.tar.gz 16373 BLAKE2B a93a53fbee7b46eb949090d6c8ffa911db613b926f9acdd56932576b492a5ac3949ba958ff6bb988e0f2783c4630a7bffd9610af41cc983a63983d198962b342 SHA512 deba5654471330454b6327e0911f71426e31f78128b8c5607e4dfca292f017da2c2326a6a59e76097ed30560e3404a47a0c0e034bc053c8348c20f40c002ec9f
 EBUILD atpublic-1.0.ebuild 522 BLAKE2B 8bcbf2ad0ba8691cb8dbc3199a315ce2ed5568e4e9abbc7549ed1629e0f3952e069a7f0c4d557f2db961c1bc27ab6e76235b4085a1e9a835f758d935bc6083da SHA512 8e2ff962969fe6e4d963c5df19bb48e724168729f6017f977513519602e14b0d885dfe66b7d13c7cea92b7dff68fc0e7ed54dbe864c49c292c129af0312d36da
 EBUILD atpublic-2.1.2.ebuild 667 BLAKE2B bb29f24f2e9f4f6c784b2fa5c3b46610207a659a8fac5eadcdc11c39f3187247d2199241f4c4a1aa6d71a7b7e7022bf16fb2f55f340cfc42833efbafe896e543 SHA512 6c9d5707924e3fe049f6535cdde6b68bbd0964f238c960ecde943cfdc501ee65c7c93b76d7410b7a28eb1163731f8b3cf2e1a1b92e065751928729897997efe0
+EBUILD atpublic-2.1.3.ebuild 667 BLAKE2B bb29f24f2e9f4f6c784b2fa5c3b46610207a659a8fac5eadcdc11c39f3187247d2199241f4c4a1aa6d71a7b7e7022bf16fb2f55f340cfc42833efbafe896e543 SHA512 6c9d5707924e3fe049f6535cdde6b68bbd0964f238c960ecde943cfdc501ee65c7c93b76d7410b7a28eb1163731f8b3cf2e1a1b92e065751928729897997efe0
 MISC metadata.xml 457 BLAKE2B b91ad6dc30ac1c073112ce5c1acc0a548bc82f2fd1c500baf4ecf1a4ec63104b38b9ddd7a4c8e2cfa3b664f26648f790f69c516d690224ca89bdfc6008111770 SHA512 09d0eaa9125e43241a155e97eca8a80a3a195e6a76c37a8ea36902836f7c7fd9920f7b671be2e7ae569f0a7c373365a7adc441b5e1fb1aa792828d8605fd84c2
diff --git a/dev-python/atpublic/atpublic-2.1.3.ebuild b/dev-python/atpublic/atpublic-2.1.3.ebuild
new file mode 100644
index 000000000000..81e2361f4d03
--- /dev/null
+++ b/dev-python/atpublic/atpublic-2.1.3.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_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="A decorator to populate __all__ and the module globals"
+HOMEPAGE="https://gitlab.com/warsaw/public"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov=public::' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index 9e31194d4e38..56914826fca6 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -7,5 +7,5 @@ EBUILD autobahn-20.12.2.ebuild 3038 BLAKE2B 063b7a3996d586d09fc14f110f50e6d239c8
 EBUILD autobahn-20.12.3.ebuild 3094 BLAKE2B 0a1435ef4d1e9d0f957377a751af0bc7e4486720b627c797cb290db2ad1570a4297d161e90c0f3aba34701b385c3486bcc2ceab9a6b798b5c3b82329766a2afd SHA512 3aa3276154faaddf3db0b615364a2c65cfd19f112beae9dee0fd83fd1963ab272a01be6bde878ae283c7e5489d55232209773978c4af5b250d379b6ecc2675a1
 EBUILD autobahn-20.7.1.ebuild 2995 BLAKE2B b1a4536d3153fb71bf0c83d89bdab51beff8cafd9a3686791c8697d8d249505843fb9ea7059ebc5e0d299884731b472d9e6255b2c8e800378c0a12336151361c SHA512 b64c89beb8c60179b8fef2dd9fdfb69b32a1bab0adf5e39fa3982bffba9cb55d2cc046216ee29f1a2248b1b15002a6e1f5e1e48f19507385dbde7235427d5157
 EBUILD autobahn-21.1.1.ebuild 3145 BLAKE2B 5f8844a8228ffbfac12b6c36e782f07707f62336fa9c098ece49f4d23d1ac934f9ee91ea26abfa662fddceb6ea5302912ac3f237d62bff674be3788279aa5f3e SHA512 c7515208af81cce17bd51d9f31da17335938777f0386e2c1ed205f809cfec54eb8ffc3407127c4b5d14578ec644abc14e62b93b52b57ff63132f4c094733c345
-EBUILD autobahn-21.2.1.ebuild 3107 BLAKE2B b2afd1c70300357794e0b6b1995c0efc7703e812c5a645078c9557402d9f5fc2db449e93ea909785a2ad1152ef6e4d32f54696bc2d6147a63d11be1d75cb473a SHA512 53b68d9879f4b7d68b36d6aef5f865f87189b9e969d3b5bd21b397de269db733c2aa9ea44fcc3c57985c58234a3a848dc0d6c150902a87da863eb55baa2299a9
+EBUILD autobahn-21.2.1.ebuild 3108 BLAKE2B ca119cad37f38de68e006a7e7947ee27e7fc2e7460a1e5f1cc292772ab93b3055e6915f6413f98f52d9d814bcab946f59f48085da833717572b17da17d052a41 SHA512 9a755eecb6e8c856f95f5867cb3144470352515a1641eb473ec9532b945c2bdb8d75fd6278bed8ca71551153518b5753d6cd0cb6cde9c14f07e5a131653db4d1
 MISC metadata.xml 665 BLAKE2B 11ce0fe43744ff03c46a4e4b6b06733807a4674956dc885a3185bd353f0617841a6f6d1afbbc02c02b7e6718b5c0ccce69907920322e2966c8f7e9d1f63d6485 SHA512 9e154ce907c9868b86a70c4c2f6173e4fa8cc6e1f63380978d4a9c706f00316a9eda488fc39c32c5ea70f31a1a12187629665b590e79f64906ab982bf1401fbb
diff --git a/dev-python/autobahn/autobahn-21.2.1.ebuild b/dev-python/autobahn/autobahn-21.2.1.ebuild
index 8cc01e514d37..78281c5cf7a4 100644
--- a/dev-python/autobahn/autobahn-21.2.1.ebuild
+++ b/dev-python/autobahn/autobahn-21.2.1.ebuild
@@ -72,6 +72,11 @@ python_prepare_all() {
 		# remove xbr components
 		export AUTOBAHN_STRIP_XBR="True"
 	fi
+	# remove twisted plugin cache regen in setup.py
+	# to fix tinderbox sandbox issue
+	sed -e 's/# regenerate Twisted plugin cache/# DO NOT regenerate Twisted plugin cache in Gentoo\nexit()/' \
+		-i setup.py || die
+
 	distutils-r1_python_prepare_all
 }
 
@@ -89,13 +94,6 @@ python_test() {
 	rm -r .pytest_cache || die
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# delete the dropin.cache so we don't have collisions if it exists
-	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
-}
-
 pkg_postinst() {
 	python_foreach_impl twisted-regen-cache || die
 }
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 963dfa388352..318f87fc6f45 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -13,6 +13,8 @@ DIST boto3-1.17.4.tar.gz 346342 BLAKE2B 3fba8f8b68edb268f20919bb65c5f8715d6c89c5
 DIST boto3-1.17.5.tar.gz 346437 BLAKE2B 43cec95e82c2f4b78132966aebb3fb1b8e8e01929731e0a9aace2a281a86fb789ec940a62b13c2c8f82e03d7c2a7c89b3b919aa39be85e6d14e1459782b90ef8 SHA512 bd3dde9acd33371eaee9715c4d5dfa095f6571f728213992455864da15a8f49053991babe4cc57bb808bc7733101b50baeab6ed6a6e58fc04f25a4eee00b774a
 DIST boto3-1.17.6.tar.gz 346445 BLAKE2B 778dd820ab134a0c9bc0e67e692e8e1200f84335895a5ed3150eda53ac90dadef09f44c18c2a80858e2c37617c315ff411efec8f1008b8c21179ff519fc4bf9f SHA512 0cca89bd4bfbda7039262ce570c4235bd2ae33e46972026e5f6f66ae42cee9562d23854c3ea23e0fb9b472fc2a28cdabfbb740ae1f0db306c6342cea3c077e82
 DIST boto3-1.17.7.tar.gz 346682 BLAKE2B 08c06dda1d59b4f555cad075673917b38cbf9ad8d0037f66027b17076e60b4d5fd32a93e088635320ebc3226a9cd8809c9208ec84f8588c26a77766b21dbee98 SHA512 2ba1817575c4a64c232c84a75a9d3b0db1de8634ded9aa31844930a82ccf4611805c6dd31b2e4d36cc9a2cc1813d233b4d7366305eaf28efd46a3b843d3c2993
+DIST boto3-1.17.8.tar.gz 346837 BLAKE2B 44a89727a93320ae8feeef584ed8a04fc5e95598252b3943cfba8b6dad7a6fd3872d5f6f6b7c77063cec0081f49d000adaf26f447386193758902e0a45ff63d6 SHA512 ef5fb47f1023f1c6e968bec9eb6be7f2cf06b5517cf5f9e19656be0cdec3dd75f749decd6fada9f789e378cbef7bb9d71c1bc94aebfa8b84b5efe0647e59250a
+DIST boto3-1.17.9.tar.gz 346868 BLAKE2B 58433cb38615da1137e7ad4abcee2a9e20f8621ef540b0d7830bffaa14dedd65aeb16a52a41466eb9bdbcceea05092f747069e7a1b42c6c5483bed7677ac0925 SHA512 a0603783909dbf16d5f46742760521d25c6e90bff7fa1d763c8800fdbbb2ae444b75e1a74833c012c2ae614ec66f9db80a55197388f9af18e900351ab1d28a8f
 EBUILD boto3-1.16.43.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.16.50.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.16.56.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
@@ -28,5 +30,7 @@ EBUILD boto3-1.17.4.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c
 EBUILD boto3-1.17.5.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.6.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.7.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.8.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.9.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 93fe4639ced27cf1ba9a359e276c7fa8f88642fc5e1c086712a4b167cce520ef5cb0a499303ca0c544924b22d37b8928edbc9989605e792bd0d8354d772349c6 SHA512 8140e73da7a57210df954e46c9cbb4f0a76beb2817ce4f1799bd58da71eef1a032cc80dec8c25de2e47f827fe0b015bab0fe237a30ba0cc8bb360de3a60f19ee
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.17.8.ebuild b/dev-python/boto3/boto3-1.17.8.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.8.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_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.9.ebuild b/dev-python/boto3/boto3-1.17.9.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.9.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_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index da19d3b92112..7524f96e6873 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -15,6 +15,8 @@ DIST botocore-1.20.4.tar.gz 7447611 BLAKE2B 05cb501cf40748ac1053c4687bd6de7a17d9
 DIST botocore-1.20.5.tar.gz 7447859 BLAKE2B 56b6ecbec1834c414983679e4f3cd01f295c48c87bc972ccec77fe972b88a1785ef82c403576f6aa96ebe9041a29535566280228f8b5a5e35d2e4fdb14cac472 SHA512 488584be3ea9b8a7467384a3947349704d0bf0e6817936a70fda69bc8d682d88601188446d50eeae29b4f0680e8f20d717519011d6beecd3f35cb322fb526853
 DIST botocore-1.20.6.tar.gz 7450975 BLAKE2B 56ad69b958233a94f6bacff28bffb644bde8cc87dcb8d842f542059548d2aaf5762666077f9b429bc0487808282b806725a05dcd3def6c975f4418f209fc2ec8 SHA512 558c3c3b123aeeeb5aff420e7ff3edbba9165e1cf434f8136ead21e9d94dd85d857732902b10e09386ddc80754d7be37970573ce039296e532b593a101a97950
 DIST botocore-1.20.7.tar.gz 7458254 BLAKE2B 8b9a1edda73e2564d3a3d67c6b3542d1ec9372403cb4d88396e58dfbcb5987821f278f2757e079e1ab32e03243ed3a6d1023ecc591b965512b3af5e2d43ea7b0 SHA512 9b023a31be866a50b94017a28aca40b5fe2e720959c928a3fd93db96041f3886049717f50461222a09572c0c56c5961a4614b80e400e4fa6d8b3ff4b4ab681df
+DIST botocore-1.20.8.tar.gz 7460687 BLAKE2B 51a11afa10058fee4cfcd17ce9181bb39910833f2f1e002041ebf713b292ed8fe6b5622c1742a641691e9d662d8d21e66bcabcf1ebf25b1ce1663f251050550f SHA512 6ec14c1c81c3f4d79a6783d5bba934140703a63bd0c852e71a9e1ec78016b531300ac6932f349561a4018487c82e8a4b44315cdf9eae4394920b710fcf4adbbb
+DIST botocore-1.20.9.tar.gz 7461420 BLAKE2B 114c2e491dc7ee38e67cbe257aee01be067172ce999b5ac4ef506faa50878fd902ff5e77cabd482919a11d4962f10acc3ac03b837b8bb97d22985e05c9908111 SHA512 e3ec9eb16afd33ff576fcd023ca161a54768738d79af884724594cfb4a9317bddb24404a01cf3e8f9278cec7305feb0a887ab22d9a2deb1b169e3eec27ffa9a2
 EBUILD botocore-1.19.43.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
 EBUILD botocore-1.19.50.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.19.56.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
@@ -30,5 +32,7 @@ EBUILD botocore-1.20.4.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a
 EBUILD botocore-1.20.5.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.6.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.7.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.8.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.9.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-9999.ebuild 1606 BLAKE2B dd2cf59015a5d45b8b0d6bf20e711d982d5314d7aacd20ed74f4c93f6d77a2fd753cf97214b7b308ba5a32afeaa32e170195db7269509fc019a0861cd3d5879e SHA512 1363331284892dd6675d5f5a5ad484572ffbc25f262f37eb14688302120a37e41b87ab35954253eca6aaad6c73f7b5221c1cd25a91baee4cb9daf53f0c48cf4a
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.20.8.ebuild b/dev-python/botocore/botocore-1.20.8.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.8.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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.9.ebuild b/dev-python/botocore/botocore-1.20.9.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.9.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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/breathe/Manifest b/dev-python/breathe/Manifest
index 240fdbd8ddb4..122bfafe7ef4 100644
--- a/dev-python/breathe/Manifest
+++ b/dev-python/breathe/Manifest
@@ -1,5 +1,7 @@
 DIST breathe-4.25.1.tar.gz 76931 BLAKE2B 3f910042f3822e5887da8239ba1a65bf7b1c8903a514c359ad64c58928fe8fe6b867a99351e18fb394a0a56aa0dbecc040203406a1e64961266fbd69aaddacfa SHA512 417adc7facbd5ec9eb69ec79028987fde537cbd928e3d552e7020377b683816b1b670614daa24c2047d711043f0a9116a09e8c1ca7aecb82db97b1f6fac872d8
 DIST breathe-4.26.1.tar.gz 183929 BLAKE2B ef31c8b900aa2a943dc592b630ce60ecf7ca484fb455aeb081b4c7783f7e25ffe169343a98f2a2635d243c25962bde81b6bc116e6a381ce0a8a6d116a7fb6686 SHA512 d272b99295f2d7d2d118aca61f3ecbe6679a2cf84c143d7fced8387af129f68996e07e513870e6cc2573e39a6005a76e36337b0622bd3e46edffccfbd59ab74f
+DIST breathe-4.27.0.tar.gz 186352 BLAKE2B fd4cac6e32a4988812085a71ea6b7222058d6856c377c9ad147da4a9eed980904f09cc04d9524bb20d6495d593c3fb3aa05792b1f0a6a8ce58bff4ca3c29d643 SHA512 b5fc79f8d7728b39e5667d1d763b02a4c0556d9b79ee6b138dc7b1951d9896d18cac1d418401edcb5eb7c4da416c77f177b40b34f85a7ea823cc2d8a4bf6dda4
 EBUILD breathe-4.25.1-r1.ebuild 767 BLAKE2B 432eb6d33c10ba963b27222783a32d94d1baac4b8c065eb57ba7a4bc174eeb41c0f17a1296a221cf612dccf86fb414b2a1cb5641c6e002c8e3188c5c96284b0a SHA512 753c8679b263013821cffce3118750a17c346ab60f0b7b71cd573336b5032df974942ac0e0f4c874f9359a5fb8f058abb1a1da56794fe243530cf50703dd29f8
 EBUILD breathe-4.26.1.ebuild 841 BLAKE2B 68d43d13852b87fddfe4eda017fd3129866cb47c4908e85063c0456c9a2868621be0deffc2a8c97e8c260402c0d40f7d7a1ef2ccb26e9367462b1f84eb213ceb SHA512 fef5efc44b25425b3fc4eb99663454b8faf7d47409a77238b6c219b3ccb1bb5541c755960790e2557f8a805d45e48bee2202a2319a933dc0032af3f3fee1ce60
+EBUILD breathe-4.27.0.ebuild 841 BLAKE2B 68d43d13852b87fddfe4eda017fd3129866cb47c4908e85063c0456c9a2868621be0deffc2a8c97e8c260402c0d40f7d7a1ef2ccb26e9367462b1f84eb213ceb SHA512 fef5efc44b25425b3fc4eb99663454b8faf7d47409a77238b6c219b3ccb1bb5541c755960790e2557f8a805d45e48bee2202a2319a933dc0032af3f3fee1ce60
 MISC metadata.xml 821 BLAKE2B 5105f5b60fd5fb3852dcc4d9c6acbeeb2f15e561256799162b5db18c1dcd665f2ac94f9e766fbab3c17856da7936694700850f84e7ca3bab196a5d96454b5083 SHA512 15b0904261afeb1e16da06f81bc78ed099268c7119086e04899eb6735656d508f3eb1dcc8bc1d8a0f6ae59943f1b2aea4204382eb78474aadb72b9d2030bf3de
diff --git a/dev-python/breathe/breathe-4.27.0.ebuild b/dev-python/breathe/breathe-4.27.0.ebuild
new file mode 100644
index 000000000000..335bb076fa0b
--- /dev/null
+++ b/dev-python/breathe/breathe-4.27.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_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx Doxygen renderer"
+HOMEPAGE="https://breathe.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/michaeljones/breathe/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	app-doc/doxygen
+	dev-python/docutils[${PYTHON_USEDEP}]
+	>=dev-python/sphinx-3.0.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-texlive/texlive-bibtexextra
+	dev-texlive/texlive-fontsextra
+	dev-texlive/texlive-fontutils
+	dev-texlive/texlive-latex
+	dev-texlive/texlive-latexextra
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/catkin_pkg/Manifest b/dev-python/catkin_pkg/Manifest
index 0d53a714b5bb..9cc5edef43f6 100644
--- a/dev-python/catkin_pkg/Manifest
+++ b/dev-python/catkin_pkg/Manifest
@@ -3,6 +3,6 @@ AUX infinite_loop4.patch 1327 BLAKE2B 609c67413dcd65db3961d0c96066d6921cc909ca1a
 AUX ros_packages.patch 622 BLAKE2B d155ddb5cf084b660914028b89f061be243ff15ca934a0513afa10f64ae31adbf25acdb294e6fcff441fe598f2210f31f91733038519ce01765cf51b0cf5ba02 SHA512 6675a4a1396b5f8ad0f62b6a2d1c59511950685c85f820f3b2c34f3c701052e2e678aa9d5c6f6e6dca72ed8b94372cd3f442dd1634c53981166efb8ec1f30164
 AUX summary_single_line.patch 886 BLAKE2B 0fb24b9297a5a65e891204cb02c1bc4d7d9ad3739fea95b27e4069a2007248c9cb481c226d0da08f9a3906bbb8e1591ddce3f3ef29a4db0428eee0a8c74dd8f6 SHA512 78f3e5180778dbfbe7f945f7dc33dab284267985564dab974c33d4998d2ff44f2a17c52b83925b8f9ced38c5c4731a1028ac28989ffe617d49f5954857d3c1e1
 DIST catkin_pkg-0.4.23-gh.tar.gz 64677 BLAKE2B 7bdd6e748561fd7e1193bdc85373e621bba0f1f80452c85c9d90d3b7cf758a83596376dae841b0ccac56a4ba7732111d464a47bc50cf4d9f29fb607f00ec66d7 SHA512 f388eb9ae588dc3a7b69d20fdba127081c9bfa24f7d5d01fee4cac7b57cfb05beb342a23e96052d4952dcb16be87495a9514edae57ea9d7c9742dce9a8a99dee
-EBUILD catkin_pkg-0.4.23-r1.ebuild 1333 BLAKE2B fd12125e0ebec9bcbd083d1ae7e049eb7076ff76c8df381db1a7dfa455532f668b7d3501802ff6980cddc158dd354210244e3b821e2f637b44bd5c145083e1d1 SHA512 1711f9ae6540eb8fe298dd93f21be2a87d4a3dac1efdac577373f4aab02bfe2fbc1222bfc0d0bdc2dea3280674d95752f841fb7903555c7062fc23e80d77c367
-EBUILD catkin_pkg-9999.ebuild 1333 BLAKE2B fd12125e0ebec9bcbd083d1ae7e049eb7076ff76c8df381db1a7dfa455532f668b7d3501802ff6980cddc158dd354210244e3b821e2f637b44bd5c145083e1d1 SHA512 1711f9ae6540eb8fe298dd93f21be2a87d4a3dac1efdac577373f4aab02bfe2fbc1222bfc0d0bdc2dea3280674d95752f841fb7903555c7062fc23e80d77c367
+EBUILD catkin_pkg-0.4.23-r1.ebuild 1320 BLAKE2B e84ce81e231cfcea67141348e49bfa2d15247a8a42fc58a79af2d88051c9ca9297da33ec260c19eb8558a8e39fbbf1889c2a3f0748f52d5f5c952319e4a8d1d4 SHA512 426df33b29845828be0f08b1ed41ba2d96efada5a5ff63c493b47a10be2799626fc58bd4509300c20c50058747e2c82e1607aff46967c11b23962f98c64c8246
+EBUILD catkin_pkg-9999.ebuild 1320 BLAKE2B e84ce81e231cfcea67141348e49bfa2d15247a8a42fc58a79af2d88051c9ca9297da33ec260c19eb8558a8e39fbbf1889c2a3f0748f52d5f5c952319e4a8d1d4 SHA512 426df33b29845828be0f08b1ed41ba2d96efada5a5ff63c493b47a10be2799626fc58bd4509300c20c50058747e2c82e1607aff46967c11b23962f98c64c8246
 MISC metadata.xml 391 BLAKE2B 47b8c26f89a501bb1701d68c80d0027b09cbb52fe46f639f119814fc589c21d7ecce01c5e0cfabfc579c3385fa16b974913b31481f9761573e61c2d14ad94786 SHA512 b9a7270d2ab39db2b7f08c2cc7386424f642ce43e031ee256cb6081f9ac0f9446ab6af0b3cca641a97d3cd88b6eadbae3b127f219a1eda9dd59e1ac0bc2ff75e
diff --git a/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
index 7f8594fa4be5..5a64a0e6f182 100644
--- a/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-0.4.23-r1.ebuild
@@ -17,7 +17,6 @@ DESCRIPTION="Standalone Python library for the catkin package system"
 HOMEPAGE="https://wiki.ros.org/catkin_pkg"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
index 7f8594fa4be5..5a64a0e6f182 100644
--- a/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
+++ b/dev-python/catkin_pkg/catkin_pkg-9999.ebuild
@@ -17,7 +17,6 @@ DESCRIPTION="Standalone Python library for the catkin package system"
 HOMEPAGE="https://wiki.ros.org/catkin_pkg"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ros-infrastructure/catkin_pkg/archive/${PV}.tar.gz -> ${P}-gh.tar.gz"
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 480b86143329..dea4dd76dd50 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -6,6 +6,7 @@ DIST cfn-python-lint-0.44.4.tar.gz 5632477 BLAKE2B 3520cb016f926e180bb1547b4e467
 DIST cfn-python-lint-0.44.5.tar.gz 5657765 BLAKE2B e35fca9cf8232bc802666333184a52b544bad5858ec8e4c16fe435ea5c421ca25296bb9d8a3bf351276dc1e36ee3101cb0c950ca9d8ce87f5dd2f64cf347ba30 SHA512 e23e415f7d5dd3933e70e7c5b0d9d001bc9aefd0ec67ba9245b4cecbad0c5470376439c12d2cd532eb39e900a325de52c4856351bba2ca27cdc0760ed091ccca
 DIST cfn-python-lint-0.44.6.tar.gz 5689226 BLAKE2B 19f6d4f09a621d8389893234dea2cc5c9e2e04fae7f1519bbd95657f5bf1ff97e34c1ed66a6f2bb0ffc2851e99cae5ea2734aacac58b87088a5430346ce0d102 SHA512 8c4414145e039d8b2b32008871dc0d2dbe946bd10eb9b7a78a070ce16ca13c3c0f4a37212bae07fa798b8b0d0868b342735ef406c6b651f6c85b8ec92bd563b2
 DIST cfn-python-lint-0.44.7.tar.gz 5711448 BLAKE2B b38b90ca7d181dc655b07a0151acad6a22ed1a0d34223cb813c3257cceb0f9ef5ca175cd4992a9d72a843c2b40b0830c433cbbe8b71550c9c9c482ea62783142 SHA512 a4ed91383f80e437338f7afee55de5e7cb0f3f8690c4324de77f2d35a665e5947f07945449aedddbd9d996270495ee63418e38b97639c4b7852b1fe50e8ce6e4
+DIST cfn-python-lint-0.45.0.tar.gz 6259853 BLAKE2B d6b930ac2dcdb5b629e5bfc1cd37cd694355de16585712a55a2b5f1cf5e2f234668c180dc77c1904d9de1d588e2675523210bad0bdf69d5b9e9032d47e73c2e1 SHA512 d89a6fc6f2a29c3d8294b7daa033f22b5e2f45576d8cd6abc25a30c3039c4c539bab2a8c45cde094e2cf4482227a09b1da34abba0424861307ced91b957ce13c
 EBUILD cfn-python-lint-0.44.1.ebuild 1339 BLAKE2B ebbbe1a8c2e871603c4ec619274dc30743b5995150e8641ddaa3bd0c652252e900ed9ec7858098f3b9ba9cc024b328ff7bb0816d1d4dab0690ec4e00fe19be0e SHA512 d543235b8cf214f1388adb6e1c4b3067659fd1dea232c733a595ad0292eed5769bd7534da0d548408118caeaa3348247306a30b37484f28f28c7af5955978865
 EBUILD cfn-python-lint-0.44.2.ebuild 1341 BLAKE2B c7814de5062b749b6707a9077a6cc778d62a0d8c5e3c1c6af27f2122e0deb458f4c08c61bf6b092ab81e8cee49b7c2fa872569d099079ff846885162c755626c SHA512 ffb4617f5ea44c9eb4acee59b17cc473c6edf3202a651fe5a2cd61c363672bacf5a9b558d75a950b742384e679ed62c02a68372288ea05e3f75718891bc8a584
 EBUILD cfn-python-lint-0.44.3.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08b5cb2e1d2e6119a18c9131852fe44cde34b064a5c44a9c960f4d4420df27f09c158efc7f711def911277a1b3898b9ca268 SHA512 8f30cae0e21f0728416c4cfa5951d79e6e3002acc30f09c5a368114bc3abb33959b4ded0a7da46d4998324adc67f168d379490386b46bda7550ed3f2fcc7d594
@@ -13,4 +14,5 @@ EBUILD cfn-python-lint-0.44.4.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08
 EBUILD cfn-python-lint-0.44.5.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08b5cb2e1d2e6119a18c9131852fe44cde34b064a5c44a9c960f4d4420df27f09c158efc7f711def911277a1b3898b9ca268 SHA512 8f30cae0e21f0728416c4cfa5951d79e6e3002acc30f09c5a368114bc3abb33959b4ded0a7da46d4998324adc67f168d379490386b46bda7550ed3f2fcc7d594
 EBUILD cfn-python-lint-0.44.6.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08b5cb2e1d2e6119a18c9131852fe44cde34b064a5c44a9c960f4d4420df27f09c158efc7f711def911277a1b3898b9ca268 SHA512 8f30cae0e21f0728416c4cfa5951d79e6e3002acc30f09c5a368114bc3abb33959b4ded0a7da46d4998324adc67f168d379490386b46bda7550ed3f2fcc7d594
 EBUILD cfn-python-lint-0.44.7.ebuild 1341 BLAKE2B 74f6c99a1b76c9f67bfb2280154e08b5cb2e1d2e6119a18c9131852fe44cde34b064a5c44a9c960f4d4420df27f09c158efc7f711def911277a1b3898b9ca268 SHA512 8f30cae0e21f0728416c4cfa5951d79e6e3002acc30f09c5a368114bc3abb33959b4ded0a7da46d4998324adc67f168d379490386b46bda7550ed3f2fcc7d594
+EBUILD cfn-python-lint-0.45.0.ebuild 1485 BLAKE2B c6cd9d6d148a185c3da1fd878f3cd0dbf5b6d7cd1fe4edcbaa559064fa749bef285e353ae24d80839b71ce705a9892747d8479dd5669103ca83959d709d70eb3 SHA512 b48edc2e41dae3629d694cd23e379093158d0e2ee46c458359def8a22439b031f055bb8813b05ca62cbfe63b6f59d071024b376ac573e8d15df7f462af0f4840
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.45.0.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.45.0.ebuild
new file mode 100644
index 000000000000..c3edcec5c4eb
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.45.0.ebuild
@@ -0,0 +1,52 @@
+# 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
+
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-python-lint"
+SRC_URI="https://github.com/aws-cloudformation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.25.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	# requires Internet
+	sed -e 's:test_update_resource_specs_python:_&:' \
+		-i test/unit/module/maintenance/test_update_resource_specs.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cleo/Manifest b/dev-python/cleo/Manifest
index 3b4dae23c5fb..1214ec209fba 100644
--- a/dev-python/cleo/Manifest
+++ b/dev-python/cleo/Manifest
@@ -1,3 +1,3 @@
 DIST cleo-0.8.1.tar.gz 96220 BLAKE2B 57971f6254a31ecf5101d89e96607b5915ab5138d727279d445172b89a10acd6b76619d344973fa2bdbc320866fa1dbdf05c889f4eca879839fa6bcbbad0af7c SHA512 9cd470063db9866a526f0bb8619d772c585377d5b1a662e0f94bad9fb9c853598b176444ca1ac0fadec82992196c471646504d6a28d4dcd1171433b8d160be9c
-EBUILD cleo-0.8.1.ebuild 624 BLAKE2B f4facee66564db1c0fcbc0a25f21fa1cf351bc0815f1bb22ca05b906ce8669ce170ae7ff271de568ccccf593d36761b093400332c25b813f9222007c52824650 SHA512 1f287931f398686f62307d4343ba789c0bc3c8f015a4a8efcc07143a741acbc56b935281776e3472a4895f9a7bbe611de5c18f91bccae14187acaa1da3af5b13
+EBUILD cleo-0.8.1.ebuild 623 BLAKE2B a0c0d5d3862334b3900e9e7ef4e30c195a275685aec3df8477c95abeb792b095965b83664bb94b7c42bb8e331d2622b33c24b6427a46e229cd6e901474affc1a SHA512 a6c49c76b46152e51dcc5885cb22ef65652bbf1c5b5f87ff39939fbc005e8a20cfc2dc6d07d6fc28b5232b29e4e7ebbebb102ac57c49829833b0a4fa869f84a7
 MISC metadata.xml 507 BLAKE2B 21dc64d2772ae701ec2297232c11b08c1a3c8bb1a4444d65370c80c655a90642a1eb421c85d87fdd7414ccbe0e707d108ae4e2dff56fcceaeff952053dacdcc7 SHA512 4e9ee663b00c7faa3f160ee78d6fa02ea1947b5134fe173129a357646b0e35049a6b59e630c4eb4f94ea5da514bc44140765955a9f1788760d955b69f0d00fc1
diff --git a/dev-python/cleo/cleo-0.8.1.ebuild b/dev-python/cleo/cleo-0.8.1.ebuild
index 6033a88c728b..cb555e481fc8 100644
--- a/dev-python/cleo/cleo-0.8.1.ebuild
+++ b/dev-python/cleo/cleo-0.8.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/cleo/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/click-plugins/Manifest b/dev-python/click-plugins/Manifest
index 994c132792e5..54ecf6ba26a6 100644
--- a/dev-python/click-plugins/Manifest
+++ b/dev-python/click-plugins/Manifest
@@ -1,5 +1,5 @@
 DIST click-plugins-1.0.3.tar.gz 7950 BLAKE2B 4ed7d15c37b2eb127faac6179c06467507405d4fd3eb55d93e2210df0eae124167e0206fe9996298abbd7ee26edc8849d5c4062875db12ea92937f225408b4e6 SHA512 1eac03d57931bdf8e2f387164490436b3b921738936ee6cd9a58246e05e84133e77c47dd606a00d1b3e238a806bf83ffe7dc7c758a92d789cc229a94ed26e17f
 DIST click-plugins-1.1.1.tar.gz 8164 BLAKE2B 48d75b9445b72dca41516fe81d02c6fad8089630c0d49963f559a847b90c7897c8db64773c4ec5f4c162d0f2f4fdd14fe212d485765d38977145fd32acdd0dcb SHA512 bbd838f50603ac4e76daf3535fd5d27a17e17549addbc8b582df6d6193b4f07d743101ce52f0b71f326995fdfeac159805025770350ca2e7697f212dce0c4b1a
 EBUILD click-plugins-1.0.3.ebuild 510 BLAKE2B e63b33d0247a3c3c26f8a16e2d30905eac38f3acc2f4c45209469c4ba94de8a283c1b24c3f2a8d7667478383c39f402252c24170780642a356c9f80019cb76cb SHA512 71e97d7ba0f48147f701192e90564c4e533b6fc40b2782d4c6c29daa37ae9ee00a90782042388835b1c5b665311771eda4cfa66b531ad44cf9095f1475b222cc
-EBUILD click-plugins-1.1.1.ebuild 541 BLAKE2B 5a519c2f32e411920fc627fb05f482dfbb5b3aad205849a6e7ab0b4f592726103ae1dde54e6f3fb8007b461d297c55550aff65880a4b283d5e7485a88129271c SHA512 27ee7929d8e46e66f4e12db74b33036c0c5d5838b28fd4fa56c966f298fd8d2ac5bec46c7d950dc3b5afc931f983353ec5eab6d9959f367a4ce590eafedb05f6
+EBUILD click-plugins-1.1.1.ebuild 543 BLAKE2B 471f7a8f04381974c6c437f4f274c5732fce7a1f9e8d8dd5ab5b52031b556a7dd661d4dfd0c8b8d2c515059f33aa26dcc0c04313ef9c9727e7e16564782d6b17 SHA512 64f25d9cc6606180b802144d8b3f6b7b83a98cb286f38a4efa663603d14768fc2956870e1cdb855a1b7a4ce9ece25add5cfdb19e719560b3779c46bc565c9a47
 MISC metadata.xml 310 BLAKE2B 6b5b9178909dc6dba63fb0395ac30ad3de9510ce33b933052450f3cdef5bcfd8b67c161ca7c050f7124028353608e21aa24d48ba98dc2048f6d476ce716c4a3f SHA512 32fc9c04ab42bdd5c246166e5e2c44e4b1b8f6dd21cc5ce6cb291bcfbd6babae60d998dce4196a83b5968c63e517132aab79472ae784019fe6fab1c1ad53e1c7
diff --git a/dev-python/click-plugins/click-plugins-1.1.1.ebuild b/dev-python/click-plugins/click-plugins-1.1.1.ebuild
index 43be1f4ebd57..f6f8c4edcedc 100644
--- a/dev-python/click-plugins/click-plugins-1.1.1.ebuild
+++ b/dev-python/click-plugins/click-plugins-1.1.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cliff/Manifest b/dev-python/cliff/Manifest
index 602fe95e2cb4..f014ec8c39d9 100644
--- a/dev-python/cliff/Manifest
+++ b/dev-python/cliff/Manifest
@@ -1,5 +1,7 @@
 DIST cliff-3.5.0.tar.gz 82997 BLAKE2B f169770a0a956e6091e56eccda8d10906bee09bdb03b474f3b17837b3eda858f3afd21beae1d6945bcdabfa89fc1555d13d70ddd0454a10fe05bfb63c8de75e7 SHA512 215f22e5dd2c4c17bd0f19866189b6b247377a7d5bddeb4a07b7536af7545bd0440b5fb0a98474fc018e3b12f6695f60028c012f3e7eeb6498b20f2923939d08
 DIST cliff-3.6.0.tar.gz 80464 BLAKE2B 2b7efb07123fd9939c5717d6bdc1685d2e6474f3852e920c8d93f8a3e7ba20e433dbead97040ab035c4081058b621740ff64045c282a0568393fe8453da245d9 SHA512 ed4077e8b9e848dbd8aebb076b9f55086ea861cbf22322f7c9fb03a66b88bd60f5c09c6914481fe5f02bad25c0183e245405d9ac54d37b6bf0f14c9c97bd7684
+DIST cliff-3.7.0.tar.gz 81853 BLAKE2B aab3ad056c13232978e93b380d9d0d48748778f403b4200c09f92bcedc6c2806213d81612aa453277e2c99acc5959ad666ac888d4a0726f50a5c0f04be0e9fdd SHA512 d3cf3ecc6778bbc676e47ebfcbc6be4ee120dd864684da58e476f52d021b5932bf9361ce2aa6a8ee4d68845ba79ec7a9174cfa7f21fa3fa16a945b96c968cc26
 EBUILD cliff-3.5.0.ebuild 1204 BLAKE2B f9d1d9c89bf8b17d42c6d1a15e6102989122ff519c7a311adb2b00e1a5d819bd5316c8b437122dc5c6a3658f1cd5a6e2e8be9b8593b45813529b0f0ccdef0d88 SHA512 f77a41115371641add12f0e1f0b435bc5bb3d34f0c0059b86d27c8d178d9460ebeaaf253e6e7628527892faa9d26fd3727c8f13b9ebb58d86c6aa439bb2052be
 EBUILD cliff-3.6.0.ebuild 1171 BLAKE2B ec6f23e9ec71ea96843a9fa5872d7c1ea3765e9d6582db81ffae5bf1d3a71daf2eb038072fab3a22ac9e2c4eff1967c43f0085b2ee4a70372e0e19a8a17f4f14 SHA512 ccbf1486f07ee53651d60b61cd305e4856d526454c1cda3de134759a26f6e9947f5a1619aa00dcaed427f5e0c99e6217275115892b3bff558a98e113ca6955aa
+EBUILD cliff-3.7.0.ebuild 1166 BLAKE2B e89da7bdd0205270da5e3fc9e42c6465004edf82c46933f4024a5ad039db7ffc29f93351266442031a89c6b3c5484e7220427cd819dec08feea5beefca6c8a83 SHA512 1931493eea1badeca99161b6fcaaddafc7d4106204e3e9cfc8e6de861976d5e6cc5643d020701b5f96c255b88533ea7699c56a5f904f5ddeceefde5058b6014c
 MISC metadata.xml 766 BLAKE2B d1e77f1b381c58cc9d5c004cbc5062bc8b024bbd416ce4f3e44d6fc817252980193d7f3990b4f0248d23d763dc62a489fbc68093eacf8e3e7fd82cb596b6fcf5 SHA512 bdeca590929247212b707d2faf686d70102aae0fefd4904a9bd091e041d926740df1fe0556b485d0947c7ff879c190341fbc3cbca535aa0e2140104a8b618f1b
diff --git a/dev-python/cliff/cliff-3.7.0.ebuild b/dev-python/cliff/cliff-3.7.0.ebuild
new file mode 100644
index 000000000000..fab20af93f82
--- /dev/null
+++ b/dev-python/cliff/cliff-3.7.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+# TODO: revert to rdepend once this is merged
+# https://github.com/openstack/cliff/pull/3
+DISTUTILS_USE_SETUPTOOLS=manual
+
+inherit distutils-r1
+
+DESCRIPTION="Command Line Interface Formulation Framework"
+HOMEPAGE="https://github.com/openstack/cliff"
+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 ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cmd2-0.8.0[${PYTHON_USEDEP}]
+	dev-python/prettytable[${PYTHON_USEDEP}]
+	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/clikit/Manifest b/dev-python/clikit/Manifest
index 7e29dbb683a0..98938ef4148e 100644
--- a/dev-python/clikit/Manifest
+++ b/dev-python/clikit/Manifest
@@ -1,3 +1,3 @@
 DIST clikit-0.6.2.tar.gz 72115 BLAKE2B b72f245128c698375f97139cf245bdc8c017e3e2d142f6e3183a42620b23a024531e5b14f05163c6defa9ee54c52c19a64932c62484f2ec8da5c75ea1b7d3d27 SHA512 6f6e436b2161349ce03c705df594e564dbc594b03370dfd62e3b1c8f2accbbc12a1cda881ca392a096435ee243e4f772589ce6f6dfbd3af63d1656d49c3fcb04
-EBUILD clikit-0.6.2.ebuild 832 BLAKE2B ab611838886946431c838bade0b9ce8ccd4af1efaaad9dbc8400a365ca47fca0e1c32bec2810fa28ad3c2ec5549453dc97669731aba30de47aec08c7237addaf SHA512 5c2f175f7d2daa57b626f533081e71e09d19d91d7a056da1b647e9fb52038cfb0020642f101ac61c0e9c69b7fdb8536eadea854cea4a186e1f3a7e774b60fce8
+EBUILD clikit-0.6.2.ebuild 831 BLAKE2B 12b1023060a55aa7b33b62b6a0fde166f843ef2ceb4c78f32fd92524924acd0c2e36e79e6fcd9ef2b0d21057a34a45d5e10b94e00409894934d140d91d393c97 SHA512 774db03d66e86b2c03259ed500edbacdbffa7aba425d85380586f3bc9f78ecec6b28af2111d2d5eeb84607eb301ea7f11b002f36b81da9d2d03b2c85b199594b
 MISC metadata.xml 513 BLAKE2B cb8c163c3be7c18a28edbd53b48d20d30787b2006cc23f68d7b5575232b5fa6fcda37c3b07e5afb6ed5d02779533cd3aed463e4c9aa2c5dcf4ce6de901b014ae SHA512 ea5929f2f091b02c368c6faa4a227b2a2423f05b4aed82abe2122b51630a6be4b9061ec078a5844074cf94ef0a609ab827731eaad6d5c434cc911ce67ae8a3bd
diff --git a/dev-python/clikit/clikit-0.6.2.ebuild b/dev-python/clikit/clikit-0.6.2.ebuild
index 7decec498434..8ae49bfa3bda 100644
--- a/dev-python/clikit/clikit-0.6.2.ebuild
+++ b/dev-python/clikit/clikit-0.6.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/clikit/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="
 	dev-python/pastel[${PYTHON_USEDEP}]
diff --git a/dev-python/configargparse/Manifest b/dev-python/configargparse/Manifest
index 2d736d5e6b80..eeed982a8f9c 100644
--- a/dev-python/configargparse/Manifest
+++ b/dev-python/configargparse/Manifest
@@ -1,3 +1,5 @@
 DIST ConfigArgParse-1.2.3.gh.tar.gz 27858 BLAKE2B f8dbb1dfc9312107abcd0c715b93736cdb86a7742270932d13b768ac7a13f805902f026d5cb34e196a8c5c659af65c13698c2cc301b522b99bb0c019b2c0e68d SHA512 bfa8f9ca8ab5c6d4cdf2a7e7c577c99fafdf7f743c81057bebbb6045c45de2cdbf5d738f7765e5dcac5a45baa92e2a8bc7ad3879776b9cf4862e3da94e78c4cc
+DIST ConfigArgParse-1.3.gh.tar.gz 28274 BLAKE2B 0ea46747425d978da0de35e7ac29c91ee637f1c793265eeecf702ec504b1d1083d31bdaa48134de2916733f845cd68690af2ff0765b3a5bdc98365d03aad4492 SHA512 7f7048babacaada3495ece42d6bd484b07d648c2b2c1a8e700379aae6c65d96c37bf15a20f90281e2c0d83948e22986689c4b02e0388d9bf01e77d9d1561b0c5
 EBUILD configargparse-1.2.3.ebuild 724 BLAKE2B d4c63814f7c0e638961e225b5e70c9c0f905065940aeeb0fdacb9c5b686593c2013b7423a9b8605264d0be8428306469568132d85881e5dd8d9c88aeade3e7c0 SHA512 422753e0534d5a8e0f762604ba4c7ce3651818edde0b00d1dc9c88eefdfb9bb9f3de70d249a6d8197ca51cd813c87e3bddea226a4e0cd13abb6724fc8fff98a6
+EBUILD configargparse-1.3.ebuild 726 BLAKE2B 757e0a3331a1c4d444d683ce1c9e9cbaa14f0c2710d384d20321a16dff02bd4607af89f240de4e916138f82f0d9432bd5100031bec8d4668e83f535e0a1009df SHA512 9a45b05452df4ec1c51ca6646d99180e09cf8bce88e716ff1c5bf0d948a1c1dcf73ecea7ecb814329228164d8d9252fa02deacd441bc885d162f9f57e51e817f
 MISC metadata.xml 412 BLAKE2B a4c428193f261d78065fe0a62c06de40fbe96b7dd20c113959ab1c5ce4d715faeeee9ab02fbc858ff070f641b2f16535721374db90a1b50ebe33867d95e0fcef SHA512 85a1b3daeb42979ada3210f978be84f5ca5f4b744d77e9e7140fe9b9595f55f16f4d15f9d40dd50ae5901f3d186aea6e42a4c70ae58b5032aaf22760889c4e44
diff --git a/dev-python/configargparse/configargparse-1.3.ebuild b/dev-python/configargparse/configargparse-1.3.ebuild
new file mode 100644
index 000000000000..1c8ac6ffd0a9
--- /dev/null
+++ b/dev-python/configargparse/configargparse-1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="ConfigArgParse"
+MY_P="${MY_PN}-${PV}"
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Drop-in replacement for argparse supporting config files and env variables"
+HOMEPAGE="https://github.com/bw2/ConfigArgParse https://pypi.org/project/ConfigArgParse/"
+SRC_URI="https://github.com/bw2/ConfigArgParse/archive/${PV}.tar.gz -> ${MY_P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/pyyaml[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	local -x COLUMNS=80
+	esetup.py test
+}
diff --git a/dev-python/crashtest/Manifest b/dev-python/crashtest/Manifest
index 0c7e3a9773c5..9cc8369eb4ca 100644
--- a/dev-python/crashtest/Manifest
+++ b/dev-python/crashtest/Manifest
@@ -1,3 +1,3 @@
 DIST crashtest-0.3.1.tar.gz 16223 BLAKE2B b90465ee736ec0d9c378ed16327fe5bbddf19066a64a2a9d1c454f38eac5321235cafeb20756b2018e1dfea0e07726696084b8965a2543edc5e9fe0d79c33db1 SHA512 1ec80159416e820336d2217c2327f26638e235797ac73edc96fc5e568e2d9fa6e8746e11acde71953a960247f73a6ed9540e3f01c96d3a65f2071dc3e6be5be6
-EBUILD crashtest-0.3.1.ebuild 498 BLAKE2B a4cf25a711120c6ab16e4ffac1e0df591d3221b6da669f3e9af5a45d18163fc23fcef878738257f4a01142963b88671f497d82d792973b32c8492658395fcb2d SHA512 4b68250fcaa7bafbc23a85566037e229bee3f91e6eb28d077d2129a81b7c64cb23a4ba5777bfe75ae1e91f5787cba03d1d2e810bb8618161b653d48d7ddff73b
+EBUILD crashtest-0.3.1.ebuild 497 BLAKE2B 4ac873a35540852c527dd7b22a75f11f901ca7d0495a480168cbe936e337aae23c76677c3cfadc1cc9cfaa9a62629abf5226c734c207243854871eea8e3be124 SHA512 175687f7039e446ed8a100749dc165c7b2d7c46319c72426688cbaebc86815dec15a03f0aeedef7c5b6c78e93c4d791c16851a610fe796063405b02d88b9c7f4
 MISC metadata.xml 517 BLAKE2B 0975f95441e6bcf402d1214b987e8bab096300387c758dadab39b4d047f43bb1c112190cf6f0d068eacfc39895355edfa3249430a10d4400921c8c6b4ba48d35 SHA512 0bb7b4234db5f0a7bf4faaa048d47a8543fa981a266beae9518eb8f3a14fff421acd3682457095c8d375f5c95ccaa73c0741bb2d247d84b62dda099ffe21a2bf
diff --git a/dev-python/crashtest/crashtest-0.3.1.ebuild b/dev-python/crashtest/crashtest-0.3.1.ebuild
index c671836813f0..bbe908e96438 100644
--- a/dev-python/crashtest/crashtest-0.3.1.ebuild
+++ b/dev-python/crashtest/crashtest-0.3.1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/sdispater/crashtest/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 6dbd92733594..a47db2b62c11 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -6,5 +6,5 @@ DIST cryptography_vectors-3.3.1.tar.gz 35168171 BLAKE2B 72cf5d79773a728c16847e3e
 DIST cryptography_vectors-3.3.2.tar.gz 35168168 BLAKE2B 3991a16556ae5be0d153cfe302dd9a860918a80bd0bdef7104f3c170ba63941c4b1ff74750bc12329422a6061161cb6452bea60e191d85c0d79e0852566c6c0b SHA512 18590adb96a6f04b8a41d4346b126b8adfc854cbcec85f8c1c0a23b1b363f215b37da60ea94a481b8fd7752f07fba515b08fc18faf2e29fb858e133129971f7c
 EBUILD cryptography-3.2.1.ebuild 1939 BLAKE2B 864e5132848b955c862df3540b3358ead1d91a98807e7270eec064e19d5c99ad66eed9aa1d971751b5552da9f2f5db0d8da5a23894d0cc84051dfc1074e13fce SHA512 0a4452744993e5db8210dcdb0a9913113c26b276972e703e905e49de2d2dd0d03af094624b9e5338dc1faeec798cb8e2554d41edd0729f3502deaea4ae5ff598
 EBUILD cryptography-3.3.1.ebuild 1941 BLAKE2B b02de77b6a7a9cd982859e899acc43da80a5a877effaa7e4db7107ea09a56c919989a67017330582c6b0a891ef829e4846728f05f30b220c3355ba4a14802144 SHA512 7465483567f1306457cdc1d468e886d553fecefa10fe79e3bdb95d960f4a444a49b3ad099cb06988828c98dc594506bcd5041e3c34d75f9210a3368904ff9e40
-EBUILD cryptography-3.3.2.ebuild 1943 BLAKE2B 216da66973c7eeccf423c5cade89254f1c97682392856b967f0fbba123484043582682b300fcd644c459ebea1fe043718e324aea63ec02d6d607b2ac628c9008 SHA512 48af37ef056ccac156c92397da8c1a4d7b89df5c39e337268904c8bef44e0e08c39e4777b5a9bc6103d143c7b7e882e5c7f602b8c534f49a3c9cc57d6f2fb7c4
+EBUILD cryptography-3.3.2.ebuild 1940 BLAKE2B c134594c15c4bd282db7a28682f6ba968d0fd3c1110f795dec457bb5cd4dc15b46448aaf64f405baba145ad8d50e0494f7a6cc188248fb2715ad01aec91ec0dd SHA512 43ba7342011798ef09884483439aa789079fa3f1a0324f17434d8fd9fd977f01f9c63b47b586b8d561052d89be8422b5b26eb18d046de89533520df4fc933497
 MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
diff --git a/dev-python/cryptography/cryptography-3.3.2.ebuild b/dev-python/cryptography/cryptography-3.3.2.ebuild
index 37a6d9749241..47aec5679472 100644
--- a/dev-python/cryptography/cryptography-3.3.2.ebuild
+++ b/dev-python/cryptography/cryptography-3.3.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="libressl idna"
 
 RDEPEND="
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 3a3c67ae4e3c..09b5d56a4303 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,3 @@
 DIST ddt-1.2.2.tar.gz 15170 BLAKE2B 4fb4a4493b96b7d45e060146212d6f2b4b31ecfa8ad5650da34cedb53725b20cbecafc765f3208cffbb3bb3c4f92579e94f369c9b8216e9693eb0fcddff96af9 SHA512 9b45c4b422cab9e6858235b413b622f077bf4e5254214165c50afdea767dda7d9f39e7be7b0d583b87849a078271f4fba34ac5fe0f35bd196eb7f396bd308fe7
-EBUILD ddt-1.2.2.ebuild 610 BLAKE2B 793edf08ebc3e243660c19da1a974248e168368fb3ba2c6eb9f5de393e6a2ec7b600964b7a3151b61703635b76d98050f67270f7504b9347e76a136ec3686ecd SHA512 e58a088d7a5a4cce6d9538ecf48dc884412f3bcdb37a6ef8e3bcdeeeed5af5602df609071b0502f6a197b8846441b38aefb9d3ce193bc5482ff5feb77e3df2b3
+EBUILD ddt-1.2.2.ebuild 617 BLAKE2B 2c6384fb5b3f75c07ef4dca2da30fc65cd572fc76ff36fa3e0090dd4da2b613673ae8bcab6edb10fab9d8804de309a1c9c9664c95c4506ac9d56d42c062ce0a5 SHA512 5771f0000c0986b276b4c122d72893ce4059b728cb1c66abe7ba80216910d5ce629a81c56063a60173385a3553d97691001da194987449ed508acb41a52e1bad
 MISC metadata.xml 626 BLAKE2B 38700523353a601a81f8051783177167efb8f07f07348b6123070bf6933fc4463f2ff86a9a96cb5fa638bb92f695a5c932f6567eac7ff3db4e6f7488f0e135fd SHA512 e846017dd044c76958586bbbf7578d49f93a2b2231827a8d779e18649c3b1a6307cef13f12f01241d7fcbfc2bdb880f1dc9d7adee1b41dd9697a5e1644af0800
diff --git a/dev-python/ddt/ddt-1.2.2.ebuild b/dev-python/ddt/ddt-1.2.2.ebuild
index f98aa4494a0c..7019eb433a5e 100644
--- a/dev-python/ddt/ddt-1.2.2.ebuild
+++ b/dev-python/ddt/ddt-1.2.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/datadriventests/ddt/archive/${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="test"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/dev-python/defcon/Manifest b/dev-python/defcon/Manifest
index aaa7f0c1b599..37a447a4db04 100644
--- a/dev-python/defcon/Manifest
+++ b/dev-python/defcon/Manifest
@@ -2,4 +2,4 @@ DIST defcon-0.6.0.tar.gz 403682 BLAKE2B c85cf4f846cab3f7543dcec885221e9f828cdf56
 DIST defcon-0.7.2.tar.gz 424146 BLAKE2B 6a3cc6c4bd8ccf030cda5fdaa3d7d2ba8aabc74daf71ce9a006de015d459ff0e5d876d584e7873fba7349a2941490db8d0ebd9a9c880e80db534b231639d3147 SHA512 9cf402b6626b75222e351d11afcde3e0c8be88b3ceb6ed4ff68cc3762b636905b61f31ece288f4d7e5273b6cd2b044661188a39fde1941e1bb5b483b23f3b42e
 EBUILD defcon-0.6.0-r1.ebuild 593 BLAKE2B acc65aafbb0131f2f39150d7f37ef57e155b67b3497a5ba0e34a1461fffc4d25fe943fe19a2710899c4bd8a4eeb3251673b61838db1a9207616b2d3cda28e392 SHA512 b8ec2d630d5eac98a90b6c860c1d08e05a0748d69a2eac930c562e5427d6f50df5d1811c135d29d82b95938ee1ab55de2a18ae04c937dbdaa5585c036b2d3311
 EBUILD defcon-0.7.2.ebuild 597 BLAKE2B 8b4475b2e1b2726856ab694f3f4ddc051aa6b94d76956afda2e7ece4a39d25a93bef0023e6ed5bbd2f8fceca4f2b22515a87dc2aedcaf65910a4fe114aa97c40 SHA512 4c444a8c46f56358d8e3a7ac10a786ca97c3e1cda14bd3538df20760ed4367e7f5834487f63b2cd63bd131dd2069edfc752ca6aea992180a98e691cff42a8f72
-MISC metadata.xml 368 BLAKE2B e99b9b950a6b060499bd76d17bed5b749b7bea284c7226bd54c613f6c64012c7d858e474b817f06137923dfa67f1700a2aaf41a487f54be9ef3c13e16bad9709 SHA512 73ba1e560ac21b734b3938609e61926ac45819a6cb546f2c8058fcbdf888f468e6b6158383cb538e3dcef70fcda2f63a2c17f185653abdb327402adc3db3751a
+MISC metadata.xml 392 BLAKE2B a4d2092bcba7205623f44d3f461f3c9f869c9a9e7521b491232f9ade8c3f457c0e60c435b7f0751721279441e493ab0ece6b6da0f6d89a594fc34a18c4d37088 SHA512 70bb099659e2c90b33ecb2ecb2bc3b54bfb0bc148ef872a564df8470ece1ba0b7bf07340a5c6ccfa4f0a9ca574dfb652117dcc88df33ac2bf11a5652c66e0aa6
diff --git a/dev-python/defcon/metadata.xml b/dev-python/defcon/metadata.xml
index cce07bdefb95..36a0292bbdc9 100644
--- a/dev-python/defcon/metadata.xml
+++ b/dev-python/defcon/metadata.xml
@@ -5,6 +5,7 @@
 		<email>pacho@gentoo.org</email>
 		<name>Pacho Ramos</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">robotools/defcon</remote-id>
 		<remote-id type="pypi">defcon</remote-id>
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index 593b0f83159e..6b6e153708fa 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,5 +1,7 @@
 DIST django-auth-ldap-2.1.0.tar.gz 51027 BLAKE2B 1229d184746cf05f9c7ddb9e6674b2c529a0fc6d051f78ba01de6a80b0e5e408a8da10e35087efad60f1fef90be708e8a0c05b04c4408500329d9dfb567c0f8b SHA512 4c204eee856e33fae80a22a80bd0f3a21d1f2ee33b1ad56087832f89e91d7e1441579cf77541c1c35e8e0532d4da937b736fe3b4708d7c2d7bbccacbb0b24061
 DIST django-auth-ldap-2.2.0.tar.gz 53148 BLAKE2B 1f83a2f174d9fcbd264ce7e298c0dfebc720482b058e55833416440627c9e1fc02f2ad4e585e6fe01102f100337df5835020b8ff48a5dccb850cfff28ef902a0 SHA512 2ed1913e81a4801d683280586018df57067ec84b44299da4c6415452c978c8f1d2ca1d36eaced40efa0737180d7e35971e4570753f60d946b32d846b455ab744
+DIST django-auth-ldap-2.3.0.tar.gz 53383 BLAKE2B a07b487f386cec06b89a90979ef904790fcc1460bf0cab5a5b3539b4fee28cc281487c0db1996ac5b1d2bae756cb8a353fa92796654b689a82a13854cb1be9dd SHA512 08bde0ea25baaf1bcc42b500572e63636ab247a846222d3f16f25874c26c6799b37fa23dc2bfde3dfbcfb041c942ec7a2e7a4e6c7bb391eb3210568f77a8657b
 EBUILD django-auth-ldap-2.1.0.ebuild 805 BLAKE2B ab4d61e4f082a0599a7cbfc80323978d719980e688dc870eaf0d864db73eb43621dee538a910dd719c9bed5b2b2857250c469bf8c3a575915b93dab6044e7f7d SHA512 9f44a05587f0e080d6725b52aa4db2b4a1dea5f6368c85de269dcc78bc2a8b0cb1b22b16c7990ab9e0f5ef14c105c4025cc4dd009930bcd8ccaadcfaab8e03fa
 EBUILD django-auth-ldap-2.2.0.ebuild 889 BLAKE2B a4ad917b62807db3f0a895fcbe3049ca0207b42cf4c31dd424684e918c0711a6c6d353c0a06bb891d7495a4904d3727eef44c1a5d38bf4803e856e0ffd424b74 SHA512 9c992070ebd70d95f78adb5aa6a9214d44a0be0722fe910abcc941ee3c6b74e2f72970be8f9ec8435ce985c66ce4706ac4baa5d58200539dd03dea25523a0b95
+EBUILD django-auth-ldap-2.3.0.ebuild 888 BLAKE2B 63e2603e90f39e3a98dfce26142f83a5cfb689ae108e55259b3c3858a271845d2de128d95aba8e0201a94d0c3b13342f4422b52fdf00a1507172d18fdf813a84 SHA512 5e3dff77fa73754acd3d33cca398dd6c35ef7fb871264201bbf2acc9014021d3d504af2af7c0ca04dfd32f4dea2a697c1612f0e3a08032698e039bab2fb849bc
 MISC metadata.xml 404 BLAKE2B 5f203773409d544e168b6be9303ff7ad455977584df34b302fec6c84993362bb3b5058984e3e7b4c413081c47f2b0ba7301e1e866fc88297f524e3920afef353 SHA512 dee72beea7aeec5097d015e83ba95cd256005545294312d9dfa80ebe52489d6d5a1ef132177d6dbcfe77ef4fa306b532c86a5de86cbb84c8f1e0a02c86617c6e
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-2.3.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-2.3.0.ebuild
new file mode 100644
index 000000000000..d87561115bc9
--- /dev/null
+++ b/dev-python/django-auth-ldap/django-auth-ldap-2.3.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_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Django LDAP authentication backend"
+HOMEPAGE="https://github.com/django-auth-ldap/django-auth-ldap
+	https://pypi.org/project/django-auth-ldap/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+LICENSE="BSD-2"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	>=dev-python/python-ldap-3.1[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		net-nds/openldap[-minimal]
+	)"
+
+distutils_enable_sphinx docs --no-autodoc
+
+python_test() {
+	# for slapd and slapdtest
+	local -x SBIN=/usr/sbin:/usr/$(get_libdir)/openldap
+	django-admin test -v 2 --settings tests.settings \
+		|| die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index dad43564e645..686d6236ca25 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -3,5 +3,5 @@ AUX eventlet-0.30.0-tests-socket.patch 607 BLAKE2B 3da02ca5cbc16ef2a8ecbd6fc9f81
 DIST eventlet-0.26.1.tar.gz 398200 BLAKE2B f14024d0825fb5530929766c63dceea7446057d9ad5dfb98ab013e96cab9b0eef5440f2d4d7ceeef17691c8a2a9055cac2b93fb23653a6facba4967c4e7cb0b3 SHA512 55b9b214130d0482ea005ea570a5aa3eafdf66e6d315a95c5ba60186a2d9a9df5c2638c86d886968954ce39e5ac2153e1f9e11631e6aef237078c3776af7d6c5
 DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c98750455e5eb096c266c46257a7e30e0278a6a8f509e47e6ab40297129ccf52b347a723037f9cc9b85a3e06a203 SHA512 c2ba283063333e9e74536dcda33276f98f74051ea0e9c8669506d2e3b11715f37cd5963af6130f14761a42cc6c8346e59c756efe2cef0ea3547dc30ccb8bf0fb
 EBUILD eventlet-0.26.1.ebuild 1765 BLAKE2B 790fd2aab4cb7eeaa9fe10e6b8ea6d5bb3d6d1dd0875b94da4ccec7c47da271c0646f9b5dacec5ddd7700644504ee5a3cf6b6ec46d81f1d9c37df7f74ca63b84 SHA512 92c6e1340f3b68835097554840007c1b8903c4c41b68ef6e709a2da7f66e6f1448fcfde55a5948717253fe6feebf372e4b41f52c5d17b228ac6d8ceef3025f8c
-EBUILD eventlet-0.30.0.ebuild 1833 BLAKE2B 3e75b7b8ab6e319105584ee267a92a4e0ca6adc910945d6b6417c2300b79708c41ec51b2060d32376261b504ee1a1157032d8b2f382c056d3c4a6d71d3b1889e SHA512 f790282b69f24d38f99f23ffb0150cccd017134569da38b574bea076dfefb33a1ac55cf8e526d5b04f6f3377f2b5157bd5e819f0d44758eebe148a7ab07691ad
+EBUILD eventlet-0.30.0.ebuild 1832 BLAKE2B 2e1767937f09cde5d9727f85aced3772886f3cc3cea5f483da4d94ac82ecfe66dbccb10f77be7e28553ef1a26c3a587b781fa38aaf01bf5e6e9c579b099cb487 SHA512 3572203402f9d4f4316df59c04b7d56f6b4e49c1a3194d473706703375b88a5a5bf8eff6a9f5af2c3f9f273d1e7d1304ea8d875b1703f2528aa381b7843ee670
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.30.0.ebuild b/dev-python/eventlet/eventlet-0.30.0.ebuild
index cb0e463caa3d..ad755eecf21e 100644
--- a/dev-python/eventlet/eventlet-0.30.0.ebuild
+++ b/dev-python/eventlet/eventlet-0.30.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~s390 sparc ~x86"
 IUSE="doc examples test"
 
 RDEPEND="
diff --git a/dev-python/exdown/Manifest b/dev-python/exdown/Manifest
index 56fba8e8cb97..996747cf3e47 100644
--- a/dev-python/exdown/Manifest
+++ b/dev-python/exdown/Manifest
@@ -1,3 +1,5 @@
 DIST exdown-0.7.1.tar.gz 4863 BLAKE2B 819e66bed1028a98293a4f30ec6dc70a8360bd018821e332719793b4c72e60f0ec09391825ee0c6eb5f4e1132f1c22d48fe0dc19fe8c42253e92a833b7821340 SHA512 4cd0abc734850b5bf8b4531f4c690400d0f5fa6a9e6efbd3e20f75f646f0373f47a04a1655ac86d95a0d6d55019a174e0361d3bdda91bdb9197e8d64ffadcab6
+DIST exdown-0.8.0.tar.gz 4864 BLAKE2B 084e359b5797484486d9554f85e07bc671da5260bcfebc5cdf20583b91f13e52f9a4332afd8b69ab3c80313d18e1f1bd0d36415a2297589c5bc65c04fde18046 SHA512 cb80d355666b57f4c35fd5776d01deb36b35547d87d152d5b5a26d5c46ecfda28af10c54a3d4ac9bd6b69f99ff3e62b07cfcade07b4cd1f51969562931aee687
 EBUILD exdown-0.7.1.ebuild 952 BLAKE2B 0f696fd01e8307bef9da0962b93e9f65ea4512b8a61c0b0feb0d14b23635ed51331733bfdb5d243b4c72a5a1c82f5f567473a6fbea460898504648740bb44c40 SHA512 26b511a610da0f6ae791496aa2f5f62da209953905ed7a589aaa1af88cd3381dc9264d78df2682e453812fd29ce66828f0dba1bb2c90f7fa2892ceb6af9a0e07
+EBUILD exdown-0.8.0.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
 MISC metadata.xml 498 BLAKE2B 1e328e87490d3e8c0eb1e34e83ef44dcf557851459015d87433fd892b012dbe805952e0f0fdefa68004f2024c7dc0a957de53e1458fa496a5bceaaab907da2c8 SHA512 52f4040fc042bf37b4f8d4d802d021bfb85ed2f510c1dea8dd1d2aa33674eebe6c5c4d24110609d200ef4b59529dd7ac1be30d2442381b6b36f5d3f11445026d
diff --git a/dev-python/exdown/exdown-0.8.0.ebuild b/dev-python/exdown/exdown-0.8.0.ebuild
new file mode 100644
index 000000000000..d8894682f3ed
--- /dev/null
+++ b/dev-python/exdown/exdown-0.8.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Extract code blocks from markdown"
+HOMEPAGE="https://github.com/nschloe/exdown"
+SRC_URI="https://github.com/nschloe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fido2/Manifest b/dev-python/fido2/Manifest
index ca6e88b40965..612d3ae1849f 100644
--- a/dev-python/fido2/Manifest
+++ b/dev-python/fido2/Manifest
@@ -1,5 +1,5 @@
 DIST fido2-0.7.3.tar.gz 188262 BLAKE2B c1d832229ce741be3b81e4cded65b77e57c008aaba8ccbdf640bae1c27f4d86f2c0ce7ffc83405e3693646a8f2868030619c958ecbaa58a6a6328ece2cf6d3de SHA512 715779ecc9dba19de0e45df13d018e7dd223f20f5662860874aa8aa6f811c1df71c07656d21b49a4b6f14a149134d8af6bac076a7f71cb7392ca2fef70b173e1
 DIST fido2-0.8.1.tar.gz 201198 BLAKE2B 33411dd05d7f513445afa8a6fc4bb90f3989a655fa05d2ba9da411aa7eea3b30ffa253fae6586f76c416115e5bec90f6f120472a49a0acfbd91020d2cba8f74d SHA512 fc0753ea694f2170d529129764cd9f9c5439cd2f467e4f384d7a698266ee8391a5c9c7c6e51d2dc2a99b93fca1c7d5288d5236e302672a87b8ca7704f328c0b5
-EBUILD fido2-0.7.3.ebuild 1063 BLAKE2B 30a9b2c57db56b90b4d523892651fc19c5e838c76ba0ca6a0597c29f2cfa2b9aea0f959c2d9c2721f7091e5e772e1ba7aa32d053e7eb94cf42a084038d46a7ec SHA512 f21cc28537c86812461e4d832a0c59c9f91c958758263112b36fa0c45cf06553560f3da471706fbe3bfb8284287127e4f2310c3156b02f8eef20bb976ba923bf
+EBUILD fido2-0.7.3.ebuild 1065 BLAKE2B 2a1d9cbfe3e799cea753ad033245c0a07896293f9110546d27ef142281169bbecb7ee211a7f05900aa05c014e8d18cd5a4d277eb91a982636294d1639d066e66 SHA512 e2e234af86388b43365a5fb50543fb95972ff67af3b1b4c1ae0d9950461708aeecc5e8319cc3a6fa5f2416de91a766ef2ef04e2d93ebde6ceb02ce60ca7b9b3e
 EBUILD fido2-0.8.1.ebuild 1065 BLAKE2B 03714bfe2468a2914760d886b9e9913c6e671510280cbe5e29d6124e6cf08e2894cd91bdb8129ebd28b2f26da62f7f969bdde2a3bf50cf4995a07d06c5ea0791 SHA512 877bcb037b68c29aec4f2ca8312643f3783d2cea4f5eb09adb277a8f9504b7c16f0146ab6fb3a95cc88de7a0b0721228773d3edbbdbe55054de57983a8c3c484
 MISC metadata.xml 589 BLAKE2B c9c7be67189c6857e4c4dce022289bd43ec0d9d2ef5376a2369d942f61f59309f6c211648ca3507bb740471cd3c0876846fd992e6d56d5b9828aaf86a57693bb SHA512 2197002048163ef201936db666780dc77e635f318f10e8bf9a4843042f05ca001044695dc47460ad758cd5520cb454b9678f51a30cbd640c86a1a4923a66f426
diff --git a/dev-python/fido2/fido2-0.7.3.ebuild b/dev-python/fido2/fido2-0.7.3.ebuild
index 4deef1259bc1..c6da07ced17d 100644
--- a/dev-python/fido2/fido2-0.7.3.ebuild
+++ b/dev-python/fido2/fido2-0.7.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 inherit distutils-r1
 
 DESCRIPTION="Python based FIDO 2.0 library"
diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index 591473c86a51..13bc191546d5 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-Compress-1.8.0.tar.gz 10182 BLAKE2B ff292503dd0a141ffb3d49e57f62755c59244129e53268f97d0ab5bdf4644108d9eea5567982fbb000afe54d7a418751f5b8ecb685b3e42c25413e7740d03004 SHA512 9bdc45b6d189e8b896a781dc48b761ac99a551a32bdaa9695556e7dabfd76f7ef98249397a31492e629ea35d82c5104d99b5803b9ecf9b2637cc802a87939f1c
+DIST Flask-Compress-1.9.0.tar.gz 10322 BLAKE2B 4dddfd8a5c4c182a0cb3c5f346ccca611517ab6471dd23512c885e3e370ac09f9a099994afd2ee28eae47cca6cba2d49220d8733103e6cdcfbae03b98a2480f1 SHA512 5f13f20a3a2f8e646a4324cf75a419ea5111252db701a17dd37bbafdb9228d0e279a6c957c5cfd69468bbdffb435e37a50e0dcf5d1a160f7397df1e6a9e6ac9e
 EBUILD flask-compress-1.8.0.ebuild 580 BLAKE2B b5d52f10dbee1163498c4749e0d34f7321c404a62e99ca0114e76a551b1a8cd22ed824eb8473d490004b8a125c84069179d2c25cba1fb1cafb39bccf64aca2b3 SHA512 5295788039e66aa309e43f294288c997192cf4e847630395c79122b52366d8e2c859d3fb528c5c4d037d7499ff4242652cbee5e5ac8001f5564b58a79d5170bc
+EBUILD flask-compress-1.9.0.ebuild 581 BLAKE2B 613116444f4b14052f19093aea47c01c99bc9f0ca0369f193856a46610e5adb85e0759d2cdc53f0dfdbc22decaf08d53725508245206ebbb1fc4523b5cb9e6b7 SHA512 e24e6b6a7d4d8617ba17291d806d5413f8d29a4fb352988cfc22086e9829acc5c68f86576b9f7f65ab0b92639db2f35ac54eafe936d8a3cd655901c2d7d7e61f
 MISC metadata.xml 455 BLAKE2B 32bea36b88ad19fed08198fe3ac37b3853dd3a50b1d24c67f56e06a222537e48ca275a701a11bd5d2027ef3533d1603f44daa9aa7d2c5b41081bf78e1c1ad842 SHA512 c3f44e2c49cda143874476662b0fb3458d2bd1f2651d2664e10e45cf373886765e0d6ffd1125bc9e8de9c0c0ce9ee1d9b23279ff4afc1ce40e60e5bb748850f9
diff --git a/dev-python/flask-compress/flask-compress-1.9.0.ebuild b/dev-python/flask-compress/flask-compress-1.9.0.ebuild
new file mode 100644
index 000000000000..09ca669397be
--- /dev/null
+++ b/dev-python/flask-compress/flask-compress-1.9.0.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=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Compress"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Compress responses in your Flask app with gzip"
+HOMEPAGE="https://pypi.org/project/Flask-Compress/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/brotli[python,${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/flufl-i18n/Manifest b/dev-python/flufl-i18n/Manifest
index 8fc2092422e6..f2460eb38e46 100644
--- a/dev-python/flufl-i18n/Manifest
+++ b/dev-python/flufl-i18n/Manifest
@@ -1,5 +1,7 @@
 DIST flufl-i18n-2.0.2.tar.gz 19106 BLAKE2B 407f69708234e4c24403733c752ed79dfc0ff7d269a325c2d599ac00a0de077dfe63078fd050556f683008296885f397a59ea42b6d0692549856535166e63805 SHA512 05d9283bed456ee8d48704dc595f514e13b0c74096df177ed49bf178987baeee014ddc4331cc7d36edffbee1dcb58fcae152c2cb317b7ce73d9630864b98f1cd
 DIST flufl.i18n-3.1.4.tar.gz 24058 BLAKE2B 1652ea9d0ff7b853298b3647da0fa4c692b9f227f42873194dcff00b119316f425012c534bbd5df87125517bf12cdd7a6d5eaa807f1bacf7c6c82967e8880adb SHA512 02de410e1ca911e2c452b5dd48868c8c409817b867c58dbebdda6aff6dfe4d09b2f7ac4c293cbc1306eb5caa17c1f5a63e9d8c0ee59e8e41058ce0a4517257ea
+DIST flufl.i18n-3.1.5.tar.gz 24116 BLAKE2B 6fef2f6d1cca30ccd21d71fa4f6209fb01f14e576951ba7137326ca18184983adb4825b721f046dd85a39803630c3090d5a29cbda68cf4687aee620cf3afbc63 SHA512 16222e243bdc7527f040bff8e7492fafa15a7c49ef20218d4563a70b885fb497d3b4b7a8a008079b7ca6185fa640105062c0d5e26dfbd11922d7fcccd5c3b786
 EBUILD flufl-i18n-2.0.2.ebuild 569 BLAKE2B 64c1a3388694297adc6a8389cc8ae038b54f2da974b9a3a330169f1fef7583ecd93444bf3e341f7632e33d9114c188adc18c996b2fb4fe4ff6a9b4bdb41cdd69 SHA512 27bdc802c0f90a11c5b8ccd7e7fa89587d754135cbf7de7168bdcb406906a8c6e2a186a67e726d1ff6eae629acbfe26d29c10d05f60a17575e01467aa38dc7c8
 EBUILD flufl-i18n-3.1.4.ebuild 845 BLAKE2B c76d225e4098c499b2b1cd5bd636edd2f1c828cd59b8be80bf3b2ead23df9999cbac29a91929a4efab34339ffabc96c10c0be8de6e55c4bfe8381a6b967b66a9 SHA512 a3d4283c9318130284128d5fe896543f997bb201f30feda517d25bfbc24e15ac5a5539f4b7f7ac18d527355596ff65375b228b9c0aa00fa392686eba99285940
+EBUILD flufl-i18n-3.1.5.ebuild 845 BLAKE2B c76d225e4098c499b2b1cd5bd636edd2f1c828cd59b8be80bf3b2ead23df9999cbac29a91929a4efab34339ffabc96c10c0be8de6e55c4bfe8381a6b967b66a9 SHA512 a3d4283c9318130284128d5fe896543f997bb201f30feda517d25bfbc24e15ac5a5539f4b7f7ac18d527355596ff65375b228b9c0aa00fa392686eba99285940
 MISC metadata.xml 406 BLAKE2B f6f83f2aab363940a49aeaf94e1c6071c03ffc43f0d055d495a46c58340f2bd7d7adaefb20a78c27ed5692f28c08503755a80c77a76259f05697ca154ea401ea SHA512 7b1c0ea21d0af33b9adf005343a9c00a98a14df62afc734456dbbe2346dfb9e4cee5c78037e9de08f5d0297f9fb78f2855e4994d631da546688bdc41eedcd4bf
diff --git a/dev-python/flufl-i18n/flufl-i18n-3.1.5.ebuild b/dev-python/flufl-i18n/flufl-i18n-3.1.5.ebuild
new file mode 100644
index 000000000000..bc9300e4f4e5
--- /dev/null
+++ b/dev-python/flufl-i18n/flufl-i18n-3.1.5.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="A high level API for Python internationalization"
+HOMEPAGE="https://gitlab.com/warsaw/flufl.i18n"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov=flufl::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index c3aeac99a737..f23fc34fbf70 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,6 +1,8 @@
 AUX flufl-lock-dontinstalltests.diff 554 BLAKE2B 4440739b038f1a73e035555028152c14ceca39ad42ddbd5457c839c154d12160fbd6d3da1c4f0e24977b9f2d0f117fd031e2f65599198172a61ea0f19a39b84e SHA512 e0a918f69563e5573fb245736ebf7557ad98e917cf9cac51d331fa7265a6a46f3b9b1fee0f14f66d0d8ffb8d4e5b57cbc4271f3b95362ce0029e36046138b578
 DIST flufl-lock-5.0.1.tar.gz 27788 BLAKE2B 2651898e881719f24bc61e14f697877ca39f2747fadf52de1a5fc917b26e23001df5f0a4ea2e48271da69198e1a1336e69cc0167a4f46fddd21f464b355fa4ca SHA512 f937fb6c7f7bef2b85674225f83f3162f34db3fe2df3d9a896f772c4489c3e0611361e3d1d9efda7727112d780f31022d3045d3a3b8e78e9412aca2f2418ca24
 DIST flufl.lock-5.0.4.tar.gz 29486 BLAKE2B 3fc6c3bfdac3c877c82f9f56e739342604be9f855a42a99bd06e5fb89fe8b3bc4cabd2e357e8e0992f7aa3f5ec7ea4a18e1f59a05beeeed7074a72440d3f6b9b SHA512 c08d8115c836f7523887d86539e9f11a2007913936fd8a4a116a610b648adf289fb086e8904b2163a6af7449e92a6edf9fad09fb770a34473768ffc4d8eb146e
+DIST flufl.lock-5.0.5.tar.gz 29537 BLAKE2B 978581adb55ce468ed2dd0f84978234a54293ee7cda4517dcdda2a2fc3507c965c419424f6a6bdc8cccbc15b14ebb739ff02e0c00d427f4f92afc31f913d0201 SHA512 11d0dde6addd34fd3812b346d851692addee49e7a65620acae87da791051f89638036a652645cb7fe34edd786afe3112bf5efb3fe4aa36760e2054622b0c1c8e
 EBUILD flufl-lock-5.0.1.ebuild 818 BLAKE2B a44aed8dda606290e57056dde43ff5d00c944b9a4e7bc4319e7c42339e435a8d63ad2d5d617cb4c04370b67147ca0f6bcc8fa6129eeaea500c6df450859726b7 SHA512 6a82f7608a57ebdc7d3cf4e2c8fe3d744beae03a8e58785837b3ff790dc217c16588adfb47a6f1d9837bc99db9ebc771b4062e2d794c64a2b353bfb3645759b5
 EBUILD flufl-lock-5.0.4.ebuild 887 BLAKE2B 1a9d383d6234f7d16dde89e9232288c5a1d9b2989f33d23a1f77bfbc3362ac6ee565cf8c6a272b3aadc2a88fa3d46fca0b1affe6fcf09c1d7ec1aacda9012647 SHA512 cc93d16c153b5b45041dc786f5e407e478662e60e59068b25bc4713dd51e154a47cb58ce7175adf5dd8a2ad591f78147e764d5d779aed27f02988a2518efd626
+EBUILD flufl-lock-5.0.5.ebuild 887 BLAKE2B 1a9d383d6234f7d16dde89e9232288c5a1d9b2989f33d23a1f77bfbc3362ac6ee565cf8c6a272b3aadc2a88fa3d46fca0b1affe6fcf09c1d7ec1aacda9012647 SHA512 cc93d16c153b5b45041dc786f5e407e478662e60e59068b25bc4713dd51e154a47cb58ce7175adf5dd8a2ad591f78147e764d5d779aed27f02988a2518efd626
 MISC metadata.xml 406 BLAKE2B 292a253230d4c718cf487d4ef1d760ba4e4910af7742462e99263a28f74b8a83bd12832502c918f2630a3e8afe2a9eed348f0532535253610cebea49979c83f7 SHA512 5e3d8954a932195a7cde168d5d86eec59babe5214af33da08805f1c2cb463d4369d14d7ca59bc8e3247281a556863236eccc4e317833fb560c5ae7dee84596dd
diff --git a/dev-python/flufl-lock/flufl-lock-5.0.5.ebuild b/dev-python/flufl-lock/flufl-lock-5.0.5.ebuild
new file mode 100644
index 000000000000..57e4a8b7e444
--- /dev/null
+++ b/dev-python/flufl-lock/flufl-lock-5.0.5.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_{7..9} )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems"
+HOMEPAGE="https://gitlab.com/warsaw/flufl.lock"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? ( dev-python/sybil[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov=flufl::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/fs/Manifest b/dev-python/fs/Manifest
index 716e869106d2..ccf1b15c5b3d 100644
--- a/dev-python/fs/Manifest
+++ b/dev-python/fs/Manifest
@@ -1,5 +1,3 @@
-DIST fs-2.4.11.tar.gz 163986 BLAKE2B 953e50da7002512029c0a1a8e7fe8be3a7c31fc48e2c66f0fe7d71dc908aab734f724e09c16074c3e4cdd86c9c2e1a847aa21176af07311012090375a3a6808e SHA512 fe4596bf213f9b1721cd3c665e6af180d6617eea07afbaa9d83847dc3f7dfe64bca16c8ccb337d48bbb49bf0d2fef90903e3c4aecc63f61faac6a2b6f6c59cf6
 DIST fs-2.4.12.tar.gz 165536 BLAKE2B 9212ffc1f2d5c315091116770e045e4c5365690d61ca34c3f4a9ce82764c4ba5be6af886e62c8baaf57ab461539a02aa042d50a9dcf314b0894710953571d37f SHA512 8b4727ea21cb9e1b69e31688c46f0732bb1536490549e353c1f88ab0c794b867c5212d1003b094cc86f562108ab4a7ee9dbc7e9aa5dc1349371de583277eb93d
-EBUILD fs-2.4.11.ebuild 1324 BLAKE2B 3913f83349ca74aa7b655c8da6f356f1b0205c8936cd666fe2d040158a0b420c58b31896ad231fa1ea19e7805defe89728a257b19513f2e0926871188778630b SHA512 dd698318f621fe7be9a99ae040f1b8ba049b59b2a49336456ab28d54d1ddbd81182986cb90ab89a975d855482c5417a5721714b467c25a8e9b7cc24a64d18ce0
-EBUILD fs-2.4.12.ebuild 1250 BLAKE2B d0d3b385b0ce541b284f0179f3484d944922a6dc216b5afd7eb8a270094c676eceee4d7b1b58dcfdf22dbc8699a534f2bbb5b6d9335efc99044e858587f7cbe2 SHA512 52ed781a7c00f986b5b9c9f02fa9891cfd0bdd5f79600455870d8c1549338f4986d10ab1f0414bd07597af7d1d33c3203fe7ba6b1de0ed8e76af296efc75baef
+EBUILD fs-2.4.12.ebuild 1241 BLAKE2B 92eaea2dc1890d21f7954f6585c7a0ed214d5fe1704d5d0864b7182ed1b2d251dbaede2e04fe6382196fe12ce61180004370219899d117b29121aa0731e9cf62 SHA512 ff8cd5fef51e806dc29dd9407b9e090600cc1527585f3eae406b03c952ab811bc143162cd56c98820c409f2719725de8573e296aef78de6070ed013b49707f93
 MISC metadata.xml 580 BLAKE2B 7fa906a1331fb39671795b92d09a71dd41ed44f08820f20e7fbc8fd9f1edb6aecc7168d9d3bc539fd58767122db918824a46ed9c4ae345618dde439a27299acb SHA512 f675af4b3cca4ec6caa96414f0e72dd03d1ed1208afa46ee9ac28eba16071fd44a03acb24e2b6930475fc906f46a3f50ca4e1d4a59c352dec7b476906a1df1d6
diff --git a/dev-python/fs/fs-2.4.11.ebuild b/dev-python/fs/fs-2.4.11.ebuild
deleted file mode 100644
index 9a9494cfc41b..000000000000
--- a/dev-python/fs/fs-2.4.11.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Not yet ready for 3.9
-# https://github.com/PyFilesystem/pyfilesystem2/issues/421
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1 optfeature
-
-MY_PN="pyfilesystem2"
-
-DESCRIPTION="Filesystem abstraction layer"
-HOMEPAGE="
-	https://pypi.org/project/fs/
-	https://docs.pyfilesystem.org
-	https://www.willmcgugan.com/tag/fs/
-"
-# Tests from the PyPI tarball are broken
-# https://github.com/PyFilesystem/pyfilesystem2/issues/364
-SRC_URI="https://github.com/PyFilesystem/pyfilesystem2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		dev-python/pyftpdlib[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-pkg_postinst() {
-	optfeature "S3 support" dev-python/boto
-	optfeature "SFTP support" dev-python/paramiko
-	optfeature "Browser support" dev-python/wxpython
-}
diff --git a/dev-python/fs/fs-2.4.12.ebuild b/dev-python/fs/fs-2.4.12.ebuild
index 3c3ba7eba881..6ad7b1373417 100644
--- a/dev-python/fs/fs-2.4.12.ebuild
+++ b/dev-python/fs/fs-2.4.12.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/appdirs-1.4.3[${PYTHON_USEDEP}]
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 4a3b10627049..a943963f9e41 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb-4.0.5.tar.gz 392815 BLAKE2B ab0c557f1233ec6f454769c3d72d982c876cf7b8f67d8b36f9ed8a6a2ee4a04a7a22e1a7453aad0d128436e679940ffea9b2c1e6d433083634b47ffff08b396c SHA512 a3f562928a863121c4051663a0674aa94937527b2fc40a7f392d2913d4d1443bda278e2f7cf362d499389691d24a2d965ab89a6533d42a157db3ab629a377e83
-EBUILD gitdb-4.0.5-r1.ebuild 1347 BLAKE2B 205d44c5695c5f73533a68637a951df4e8533d0ab5f5b7bd183405cbd45e830e8dbf156763b3a61a2ea226a128ba16e779f575441dad04864049cbaf52f960b7 SHA512 e39f7a11195b48ee3bbb405a8f4f3a400ff08d83ca7817919387b8da6f8b49051540b1dd51e9714cb268f05a115e4d32281c1acd4d3996ec1f7b14b8668d2a54
+EBUILD gitdb-4.0.5-r1.ebuild 1354 BLAKE2B f8d9d018ae2dcbcd902c608cfbff10e3d1033e54a48e375e374bc15a2b97514ff2d5c2cb8a3d01a29687a663d36fd9a724aedd958407589910a865aa2772bbcd SHA512 55c9b2ca5988f2c7a1f71aa947e69e7e073635ff54c6d0ede3befef7f8fefd0f91ed0dd6cd81aa8f16631439fe8f337750c09b7fbf5e00121d1c9bf8d7974a83
 MISC metadata.xml 411 BLAKE2B 270925cade7731451404999603981322c15224b7a6a2580c957af06cf8dbc940adeb40a63452ae6ce11f725a01af58ff56e85c4ba63a92e2027f4c13c81e1689 SHA512 361528c0a12026a9bef55a22d172ca8fbb0f82389ad2e867a2d8bcf65913cff9a2d510121f6b54be00a1d8ccb2bca471e2c3579054d3746fcedae910d4f3b361
diff --git a/dev-python/gitdb/gitdb-4.0.5-r1.ebuild b/dev-python/gitdb/gitdb-4.0.5-r1.ebuild
index 9b989f33a302..c8eb0eab45fb 100644
--- a/dev-python/gitdb/gitdb-4.0.5-r1.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.5-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/smmap-3.0.1[${PYTHON_USEDEP}]"
diff --git a/dev-python/graph-tool/Manifest b/dev-python/graph-tool/Manifest
index b082a9bbf044..addc85754cb8 100644
--- a/dev-python/graph-tool/Manifest
+++ b/dev-python/graph-tool/Manifest
@@ -1,4 +1,4 @@
 DIST graph-tool-2.35.tar.bz2 15153787 BLAKE2B 31f815f564510bb9628f43e8afab1a561222d23aabc3417ce474f0db69625954fc46119f61e8d7764d49a291e16e3b32f2e4249304f934c08d17af3e47a39ce8 SHA512 eadb122b75ff95fde165bfe1be8387deb08b48d041236aff11a0b8414d1a5027931a5e4b3216348edb61c53187b191a5e78af4eabb1ce679dd8736651f142bec
-EBUILD graph-tool-2.35.ebuild 1813 BLAKE2B 4492f0346dd21b1e6349854f4b5d3dc7a33250554e2f7381ac52c11bf700d00c396b5cfda950baf6fafb5593bd4214303ff640aa70ba60a2157eba214f839f85 SHA512 f14821742e75813722682b0b530ba2e59d07744ae208ceb3c92a79be55b83076d68406ba04f4c69e3ee6f95032a9fb2110031d4b65d43cb84f96657dc0626922
-EBUILD graph-tool-9999.ebuild 1813 BLAKE2B 4492f0346dd21b1e6349854f4b5d3dc7a33250554e2f7381ac52c11bf700d00c396b5cfda950baf6fafb5593bd4214303ff640aa70ba60a2157eba214f839f85 SHA512 f14821742e75813722682b0b530ba2e59d07744ae208ceb3c92a79be55b83076d68406ba04f4c69e3ee6f95032a9fb2110031d4b65d43cb84f96657dc0626922
+EBUILD graph-tool-2.35-r1.ebuild 1815 BLAKE2B cb65e5ba786709a47f3f2bd909acda70d1c8d45f67fea579c0591a88930e03a9e3054b0d00ebc711a97c0aeb3b16810152f1588cab290d3afd572dff7241c3a1 SHA512 ba853f7e3359f2f9ee572c797948d18c681e82394d6860fe85bea9ec81c5dd80391dc8abe9bcbe089ac242172868a95dd6dfa61e0ad9b81cca93c7a3d565610d
+EBUILD graph-tool-9999.ebuild 1815 BLAKE2B cb65e5ba786709a47f3f2bd909acda70d1c8d45f67fea579c0591a88930e03a9e3054b0d00ebc711a97c0aeb3b16810152f1588cab290d3afd572dff7241c3a1 SHA512 ba853f7e3359f2f9ee572c797948d18c681e82394d6860fe85bea9ec81c5dd80391dc8abe9bcbe089ac242172868a95dd6dfa61e0ad9b81cca93c7a3d565610d
 MISC metadata.xml 422 BLAKE2B 1c7f3c8b1248d17d74731cc9ba33296c89d48fa7af3fcf167ebccd238110fbcdd9e3a158a031fda91d9e9d1db339442d9d6dcea1c8af79c65e4092027b6e670b SHA512 59688166d701de2da4a9c1e951c70b228881c7fa4d80f10057e073605360be8930303a1553ca86d901d292f26d1300e95b177d97c2e89321be6eb1bfec78f41e
diff --git a/dev-python/graph-tool/graph-tool-2.35.ebuild b/dev-python/graph-tool/graph-tool-2.35-r1.ebuild
index 7f2bafe429c4..7f89339ef83d 100644
--- a/dev-python/graph-tool/graph-tool-2.35.ebuild
+++ b/dev-python/graph-tool/graph-tool-2.35-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ RDEPEND="
 	dev-python/scipy[${PYTHON_USEDEP}]
 	sci-mathematics/cgal:=
 	cairo? (
-		dev-cpp/cairomm
+		dev-cpp/cairomm:0
 		dev-python/pycairo[${PYTHON_USEDEP}]
 	)
 	dev-python/matplotlib[${PYTHON_USEDEP}]"
diff --git a/dev-python/graph-tool/graph-tool-9999.ebuild b/dev-python/graph-tool/graph-tool-9999.ebuild
index 7f2bafe429c4..7f89339ef83d 100644
--- a/dev-python/graph-tool/graph-tool-9999.ebuild
+++ b/dev-python/graph-tool/graph-tool-9999.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
@@ -31,7 +31,7 @@ RDEPEND="
 	dev-python/scipy[${PYTHON_USEDEP}]
 	sci-mathematics/cgal:=
 	cairo? (
-		dev-cpp/cairomm
+		dev-cpp/cairomm:0
 		dev-python/pycairo[${PYTHON_USEDEP}]
 	)
 	dev-python/matplotlib[${PYTHON_USEDEP}]"
diff --git a/dev-python/gst-python/Manifest b/dev-python/gst-python/Manifest
index 5d7be0d75ec7..593e1f7d12db 100644
--- a/dev-python/gst-python/Manifest
+++ b/dev-python/gst-python/Manifest
@@ -1,4 +1,6 @@
 AUX 1.16.2-python3.8.patch 1400 BLAKE2B 67e870a837f8fe2a2b7a5cc38ed0528a1afc56035074e95437df260fbea52834217617a18520dea55e71fc5b71b4f86120125b1ef35d88daf19f35504ab6fd5f SHA512 1dd7623488f9612ad195f3e920e1ff8bab321c9009dcecc0d359807c2cef6b733777c6aed8f500c0925c3a6dba356a3e2a333991bf232f302e0f028eb3de1234
 DIST gst-python-1.16.2.tar.xz 414912 BLAKE2B 016e59fc7d29047dcf49901d4ccb1ff2e96950dc723cd7e9dd31e0fe92257e881ced1c93e7e4e531320be8fb9d6cb8382d2c31e460448d5d630ec7c8a0378024 SHA512 c274591cb820a2576ca236de0d1a2c2c53a9db11afc689e0385afe3d38fadc59c9230d65198e79e4059abb90c0e5b6d71f1ee4cf1439d92feaaffd2ab5cd3a23
+DIST gst-python-1.16.3.tar.xz 419932 BLAKE2B 3c3d7d8dbde7d77d57e340c68503c436ab03f8768be4dd67561b13712bf88d7f8025118cf6a2ff115fbd41b28dc9a3208f612d1b72bf449fd7b23be4437f837f SHA512 2b038c4fc4891ddcf09e58c9e3e8d8462c150589dbb8a1f8d0a1266cffe49fd83531b2eb97cd57baab0f416a2bb1ba81383b55bb953545f3eedc50b6895986c4
 EBUILD gst-python-1.16.2.ebuild 1607 BLAKE2B 1aa78d47124bbf30ebb5935aadaa604da1e210be332b6729e1fecd3f5ec236391cba222768331c0636037f2a966868a862130ef370c9840baaf3d6edb3026984 SHA512 1468188abf402361dd050bf9cf74b41e672e8d51eed084fe80d59a2344aae86b207269114dd342955b82c5596240f887d9071432df65d9dc50e7ca32ea437c31
+EBUILD gst-python-1.16.3.ebuild 1558 BLAKE2B 4309170c795f3e85264118217e35a0c4de8dd450dbaf9d8c8747c3bc7ad20e5c624c25aa1c5b07a309510a753db09ba0c53692f6f7ba725e7738e695e145029d SHA512 e7b41500c58db496a581e0630b71ba5759736b4e486bdd87812c9207214036f4fa64043763e3126cb153fb5afde1babb65720a607d2f87ace3b13ea9a2745976
 MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/dev-python/gst-python/gst-python-1.16.3.ebuild b/dev-python/gst-python/gst-python-1.16.3.ebuild
new file mode 100644
index 000000000000..11df6763cff4
--- /dev/null
+++ b/dev-python/gst-python/gst-python-1.16.3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+
+inherit meson python-r1 xdg-utils
+
+DESCRIPTION="A Python Interface to GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=media-libs/gstreamer-${PV}:1.0[introspection]
+	>=media-libs/gst-plugins-base-${PV}:1.0[introspection]
+	>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	# Avoid building plugin - it must NOT be multi-python as gst-inspect will map in all libpython.so versions and crash or behave mysteriously.
+	# Python plugin support is of limited use (GIL gets in the way). If it's ever requested or needed, it should be a
+	# separate python-single-r1 media-plugins/gst-plugins-python package that only builds the plugin directory.
+	sed -e '/subdir.*plugin/d' -i meson.build || die
+	xdg_environment_reset
+}
+
+src_configure() {
+	configuring() {
+		meson_src_configure \
+			-Dpython="${EPYTHON}"
+	}
+	python_foreach_impl configuring
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	python_foreach_impl meson_src_test
+}
+
+src_install() {
+	installing() {
+		meson_src_install
+		python_optimize
+	}
+	python_foreach_impl installing
+}
diff --git a/dev-python/netcdf4-python/Manifest b/dev-python/netcdf4-python/Manifest
index 7949a40745f3..b0c826a75e4a 100644
--- a/dev-python/netcdf4-python/Manifest
+++ b/dev-python/netcdf4-python/Manifest
@@ -1,6 +1,6 @@
 AUX netcdf4-python-1.5.5-tests.patch 1309 BLAKE2B 04876bde9d60bfd48633366eb35d20dab843537673c04ff26fd979cb2de4b6cb36296c2f77b89b2227e7d103a2171827330b4dd0febcffa7aaba288b89becdff SHA512 c876c492c0d5004b1f4092ea580b11f2faf902ed5ce7bbbf16f591e76c12966c15c6616a272ee1e8026b0eba614eb2bdd4cdca495c60f7d7957228eedfae3fd1
-DIST netCDF4-1.2.2.tar.gz 679107 BLAKE2B c15ed9332bd8e4bb18c312cd4418add169716ef29b6f5c4b935c880259a6a16c8388ed7c790919bfbbee631e9e96ce4b9a9afaeabb305e4dd32028353e62207d SHA512 e09465d125077e71b8aad4332be844099c7fa29d0ea8f1dd0887f7a5e849ab778361026323466b1d4897bc3d8f8be1818cfa5f426773c765ee9c5f3728ff3da3
 DIST netCDF4-1.5.5.tar.gz 793676 BLAKE2B 15783e359ed65062464874de24b3fabf07c5666f54f979cb4abd5429cb1668df9dc5aee6d96fb171f597b670ac87ac15400549659c82754da60dc9b00ab734cd SHA512 da6ead22ca60900468fbefdb5d1e9486555e73cf4d99096227404094e94cd4d0488320fe4eb2b7944e1183c39817d9e593065297f921016811b7dc6eabb918ef
-EBUILD netcdf4-python-1.2.2-r1.ebuild 690 BLAKE2B 7c4ab0ec82906910c8e18028dde35c17ec23a7fd7d0ca903259aa91e3439d22eb0527511631f74abd603db7d08120234dc64f0c7660f0f32bc25ce8350829ff2 SHA512 2c97e91a07336a04563c5038b1c99dec7f11a1ffc4351b8ee1ffbdbeb8c192510dd7edbfe98a34367ba81a445b2df40b2d4f8e3da3d18004c5857914a4b7b941
+DIST netCDF4-1.5.6.tar.gz 763732 BLAKE2B 0bb08ed81206c7d14817dad0f93683b5c44678869c760467071e2a0a76be76c9d78c0f714a043d77dba9b4535a83d59d8197340c105070a4f0204900b1e50410 SHA512 cc5bdb476fa034576f8e1a19e709dba53ad2db68cd10221df2de46a47fc7e5bacfc90fe8c4458ef45b20bf24a1cf52f275b1891af5574e2a139e95cb0d793a8b
 EBUILD netcdf4-python-1.5.5.ebuild 1001 BLAKE2B 49a197eb0969a25645131ce17beaa1fe7d44ec0269e1fc6f2e8dc1a9b7210b5a1dc79448357d458106e6c99c2d2aa484d6057f2680bc99e017dada5c7daf6bde SHA512 4c2e4fa1797d6098e55d40d8510ba26de6837df1166a3b3f363f6aae13e0d2efbbc63590d1a07755d0d8277b2710855c3010f1fad4e2f6dcad985c07c5eb83aa
+EBUILD netcdf4-python-1.5.6.ebuild 1165 BLAKE2B 794f9296c48a0df0339aadfa5eeed5f096ff8fcb53afff5d29764fe3d198e32b6e9a3fba168c5962ddea8cc9481dab0066945385494a721c6fb143ebea751889 SHA512 a52abb9570d1ca7eeea14c4df741c9ca9184c19b85443aa3ebbadeb0aa4c9b4ae2fd5d92f23ed99aef361550b674b5be627dfdb25c6f282fe35e1daeca3eb558
 MISC metadata.xml 680 BLAKE2B b380916f10fadde1beadde6b0f97dabdada2a183db75b345dc6bcc8723a24ce5b1d266048e758d02cc53bc0e92339fe359c86741212f9122a984825ebaf45e2c SHA512 5825d714a75190fef8b60360221425c5feed48220920b854f5f2e1a6489b4fa1952b7a798e42c4750b69c83902879ce263fd5b7d109ed9d43a147e6298a329bb
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
deleted file mode 100644
index b74d15d31698..000000000000
--- a/dev-python/netcdf4-python/netcdf4-python-1.2.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-inherit distutils-r1
-
-MY_PN="netCDF4"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Python/numpy interface to the netCDF C library"
-HOMEPAGE="https://unidata.github.io/netcdf4-python/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/hdf5
-	sci-libs/netcdf:=[hdf,hdf5]"
-BDEPEND="${RDEPEND}"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${MY_P}
-
-python_test() {
-	cd test || die
-	${PYTHON} run_all.py || die
-}
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.5.6.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.5.6.ebuild
new file mode 100644
index 000000000000..9340c275dbf1
--- /dev/null
+++ b/dev-python/netcdf4-python/netcdf4-python-1.5.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1 optfeature
+
+MY_PN="netCDF4"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python/numpy interface to the netCDF C library"
+HOMEPAGE="https://unidata.github.io/netcdf4-python/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	sci-libs/hdf5
+	sci-libs/netcdf:=[hdf5]"
+RDEPEND="${DEPEND}
+	dev-python/cftime[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		sci-libs/hdf5
+		sci-libs/netcdf[hdf5,tools]
+		dev-python/cftime[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	local -x NO_NET=1
+	cd test || die
+	"${EPYTHON}" run_all.py || die
+}
+
+pkg_postinst() {
+	optfeature "HDF4 support" sci-libs/hdf "sci-libs/netcdf[hdf]"
+	optfeature "MPI parallel IO support" "sci-libs/hdf5[mpi]" "sci-libs/netcdf[mpi]"
+	optfeature "OPeNDAP support" net-misc/curl "sci-libs/netcdf[dap]"
+}
diff --git a/dev-python/olefile/Manifest b/dev-python/olefile/Manifest
index 6199070713f6..9e82ccfe6035 100644
--- a/dev-python/olefile/Manifest
+++ b/dev-python/olefile/Manifest
@@ -1,3 +1,3 @@
 DIST olefile-0.46.tar.gz 97587 BLAKE2B e6dbadda6f18ec287f5b1b59ab4b92ceee25b4ca47499ed31a03992ae4e3a7269ba0c641f631c4beafdfe43eccab4881d06f7ba372ec47b376b5eb3ed788f45d SHA512 e70975cdda11004ab331908085e0cbd9cf3e44f49fa1453a7af5373bfed0a98729bb7600fee7a1042be6c40c58649f3650972d9e4520bbab218cf715f6264f98
 EBUILD olefile-0.46-r1.ebuild 554 BLAKE2B d1333a3f8c56c5cc483346007e51b96fc49c77e67c4541d8cef6911b465620ab04c41e667aab1d559c770900cc2713237d07e25acec51af71aee81668a5c21a7 SHA512 8dbdae45ba65bf1f3d24daf0c85bcc3efcda770a84861588ec242651a5363f3180705ef8d401b493a1f57fad6810fe9528a7c54bb96c4a441e4c8c85deebefb5
-MISC metadata.xml 383 BLAKE2B 45351ea99d7f164ee4e5ad18fd067d96c23fd2b6496b7ab979242cd12261fa167afc521b684b424754b8888f1a843bd42c9d15f87fd4a3c7af60148174ce27fd SHA512 9f6c8f0826a156a2b56d449ed0fd175a22e410f288194da6dfbb2b4ced638410211cd1020e26c3cafeb60aa70a99fe961a7188347118be42f9ef37a8f833f69f
+MISC metadata.xml 379 BLAKE2B 1b76ae228143f7e6fa4e532f8b6fcadc19e36b40abca620267edd0e7f626ba27a865bbcc92c5f1889301841f190e8b58484524db667d196ca4ac4be92bcdace2 SHA512 3da4b083834b368bf4f4f0f2bef54fab1306e199f38e3f763f98d26662cf9cae01acbb15db07e39d2a97aa5c556efb4241043da5bdac998c905a4538c33088a8
diff --git a/dev-python/olefile/metadata.xml b/dev-python/olefile/metadata.xml
index f67f501f4ef3..37988c3230b1 100644
--- a/dev-python/olefile/metadata.xml
+++ b/dev-python/olefile/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">olefile</remote-id>
-    <remote-id type="github">python-imaging/Pillow</remote-id>
+    <remote-id type="github">decalage2/olefile</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index f18941293e9f..bd9c60bce4ff 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -1,7 +1,7 @@
 DIST parameterized-0.7.4.tar.gz 23389 BLAKE2B cc1ac334c0209a7471799587e1d35f6d8db84df91f559514bf3067ec8b2110948a6148613efd1d0111a65d43c52f7be16ab56cb69dca339fe7049f64484b7889 SHA512 71c51ad57900f5b1b6f4866c60ba4d23649df7740e7f7e735a2e0faf4810bc8dc552a1647da8c174f8a0b80db7de5727ce24dabc9fee6b4cfe12ee98c18945d7
 DIST parameterized-0.7.5.tar.gz 21830 BLAKE2B 9ec717797f0aed058200ec3359a20d83f3c21f36b112c9395a6d7d20e5a28eb00c683e7829ab3e8ac161cf80d31b820d14edd0567fa569f29aafaabcef008dc0 SHA512 d7d3665f0ffe5449eacce2b0dbb01a0b8a83c0afea8a62320d49e3ed71996d5cb3a8ce51de58c17d41edace18c3491587d012c65d1d8990edf3b6e2553afd3c0
 DIST parameterized-0.8.1.tar.gz 23936 BLAKE2B 3d36b049071907f66ef17dcae0ef9480210344f2466744b2bee8e964f46e2553411a07b233fab032d1acbc2523dc32890bc5e6e4ffc5b37d1fee3f0db3a70cbb SHA512 ad6e31b2bb27623bf070ee5c30686a5bd6a531bc71602f77ca6aa01a77fc246caaacca121098dcbe13b1a174cdcfafa6545bf6e62f6a5337a647821c02fac64a
-EBUILD parameterized-0.7.4.ebuild 530 BLAKE2B 1ca52a7932619707127c2d49c983ebf5fe94a6c2629fd72e8862c1cd38a9cfed9aaa9b3f1aa3f96613df379cc1ddd81da19621e15916d51530a2784734f47040 SHA512 ccd44cf10afff121fbdd11801b3bc5ea10e7b47b289404b0af707c4e579c69bf8205bc221fcff97ba4322336c120813f46ffd4a90863631b9f9790068fd5939f
+EBUILD parameterized-0.7.4.ebuild 528 BLAKE2B bf4db038458729e803347981ebede57e97b88f983ce982ec1a9399e14ffd64eb5da94fdc028da7ca8dd2ee395c4c5f39f37baefa3e4c93a4033f7921f2fd8e48 SHA512 6a59fe6d6095cd8cca25e884c515c01cbbafde2dade209649d83b4c2da1b256f33fd53ac4571a4c19984a571018ade4f2bb6e5b8e7a4e55df7e8c9b53b377141
 EBUILD parameterized-0.7.5.ebuild 533 BLAKE2B a2c3744f4e240786fb90a060beb976cb4377754cb9423428cdc96803496c2cf512b796727ce7ece72529e81a0c48b8efe01d0f8774943972be3dd850d3230f4f SHA512 2cfe903912bf44c2cc4f23a8b228f2af60480e4a89657fa09d6f88f4c289237e402fb157c0098a9b7508aa76d2580d1f3d51e4d6d289041678f8725a42729c84
 EBUILD parameterized-0.8.1.ebuild 540 BLAKE2B daeffd97e5e30ce952106baaa82af28e09e20c9c1bcdc1bed6428ef464d62c75e4579c7485513a882353ab342c853defb75474c1fb836b397e5f2231dc255034 SHA512 0157b4b00295debb3d68e2fd33f9cee225150394ef90fa131be4f15f3ec74bebdbc292555664a817a0dc0e4d13a9058684903dcdb10a06fb14b249b68630a887
 MISC metadata.xml 293 BLAKE2B c517b622aca43d34db85ca377dad646f979c601e5adcf20f51ef84f10b92bc3e07ed42eaa4eabad883bf720fb000aa744ca38b2d418370435d5207f3d2f33aa7 SHA512 efd47a3325bd1ea4c343cf4bfb0ee0dbcef1d38939449eb5b4257c6d97eedb9a60e3d2c2930dcbf503c569588ee38317aa82e0e27bcdfe6b39a805b640470548
diff --git a/dev-python/parameterized/parameterized-0.7.4.ebuild b/dev-python/parameterized/parameterized-0.7.4.ebuild
index 4c6e0c85bb62..b1993de5f13a 100644
--- a/dev-python/parameterized/parameterized-0.7.4.ebuild
+++ b/dev-python/parameterized/parameterized-0.7.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/pastel/Manifest b/dev-python/pastel/Manifest
index b00b34fe7b78..49bca81ad402 100644
--- a/dev-python/pastel/Manifest
+++ b/dev-python/pastel/Manifest
@@ -1,3 +1,3 @@
 DIST pastel-0.2.1.tar.gz 125760 BLAKE2B f9b3c29444bb6bd0e710cd80d4e48cdc9099ad6512cd99b0224559b87504f5b61cfcb90165f97b101b8ff5e9f8b7e230878c5cf50ae2b0555447f5be28977cb0 SHA512 585834d035fe208313a77e0c824f6b67630a85697d4aef802800911cb1da72bfd6c9ba47fe5502359bdf244a98b8f6dea300a788ff1cfd56a8bc19eb7b7dcc16
-EBUILD pastel-0.2.1.ebuild 454 BLAKE2B c420897c0db80b2c1e4ac0599a93e86a3237b643d93d93c493ed8d0b23979c84afc88670555e7bb88408563938c084326d55919ad28c30586680885f1a3a06ab SHA512 996e0f9042deee52f1f928190b11909d480f9bdc6332facec92d728f411a2a6d5221e7fb2c509629692ab6a8414fb0e8b18e04f18a793d6f5f1601f3dad69dd5
+EBUILD pastel-0.2.1.ebuild 453 BLAKE2B 6dc1ec0a10931c80ef5e4f7e4a4499a9360bb8d3c82b71fcb52933fa8af674cbf745258f1f01fc6610485c9ff1abd6c86bdf59385d77bcfd9d119b21467b322c SHA512 02b9458f42bf6259f5ed4f3bd6edb5de1a1aaa9e2e65d89610279d47028d33bd7cb95c48511682b04b52221704075baae197c983e8243cf34ea7ec55b953d2b7
 MISC metadata.xml 511 BLAKE2B 682644ff41bdbd8e94235ea9543edc06ab335e6a910b0121c1bd31e44d6511e924cfe45f97d9879fcc89a65ef8060261e459c42b4aecb3b5e87e6f6672d2d07f SHA512 a53766208c3a3d23607301f5098a2347a603973d68360b2209e34db0e2211cad4881fb39218575efd97039c5cc15c11247e1ccb3a552b7d5d29f19985adb776e
diff --git a/dev-python/pastel/pastel-0.2.1.ebuild b/dev-python/pastel/pastel-0.2.1.ebuild
index 39d75b2ef39e..9a1bcc9ea9d7 100644
--- a/dev-python/pastel/pastel-0.2.1.ebuild
+++ b/dev-python/pastel/pastel-0.2.1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="https://github.com/sdispater/pastel/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pdfrw/Manifest b/dev-python/pdfrw/Manifest
index b21cd5d41400..5e37d53d4d3e 100644
--- a/dev-python/pdfrw/Manifest
+++ b/dev-python/pdfrw/Manifest
@@ -1,4 +1,4 @@
 DIST pdfrw-0.4-1.tar.gz 143615 BLAKE2B 281dc94c762dcc776e2c9c84609b59ca32387510bcfbec39271a6073533f9ad5d416cf4250b3dcd8564973d197ce090719c5561f58b972c89d463b90723ac8e6 SHA512 f2ef6a966cb1b947425679e6c16e658b5d1dbc13d62fb2e1edc278508b03f6c6847b3c83dab8bcd7df3438e587df066bc16b653461ae402bb8688ddb05f4e886
 DIST pdfrw-static_pdfs-d646009a0e3e71daf13a52ab1029e2230920ebf4.tar.gz 25243391 BLAKE2B 5c491d56c9731352907787bbe10b8b3ac362f0c7892ddcd15a1299d3b2b4bb604662f6231aa22478290992a345e769af2e2c2459a25a16c370ea05fa68101f80 SHA512 9bf1d5ddc8f55b40b50041e745579406bb0036fb7795ac40064aad7cdf592869051ba84a5ab080042e237690bb2f1811b86b2a4424535aa4c367f6e29a0c34eb
-EBUILD pdfrw-0.4_p1.ebuild 1613 BLAKE2B 484a3d8a22e6de91b34e9d7cfde3358bcc08b276ae288ab24c09535d6f491dc2ad0b6bdcfa3dd206df76774f6726ca2936ac90346c294e4c6107cbb8d06070fb SHA512 e1947188dd50f672a5a475301ccfbd8ba05da1e36221702d877070b637daf418633fda40378c3604dc683c53a3424f84a68540a80ea09c487ac7635d3811fdb8
+EBUILD pdfrw-0.4_p1.ebuild 1600 BLAKE2B 35cc2d51d2a6699ff4525159312c335d5049c70eb5755edd40b0d994df4482e2fba794b42b71db2fb8804ca0742db2d87368a01fbed3f3f72f1a43efe6b1aa27 SHA512 b1c697810aa14830b468ffe5c3840cd3df0309f88db73172d3fb352bde967e520c7492e6f8252efa8e0e6091eb7d6692e19eedae7f5e5ce3980a734321ad6ea7
 MISC metadata.xml 385 BLAKE2B b0005d90a18dd6fc946a8d578b876cc0b18d3f8ccd5208bc99c9e514d5a13e5e8991bdaebe5983edafa18c5e8388da6db54f2669d9e1aa6b9205ac7280b38992 SHA512 92a6a0b16cea383eb074ec90baacdd17daffd2644f8a2574db3d1843e06b9ca5fbd6bfd8d2ff6452c2b10519f0ae6967df4dbf9a5d0265b5ad951166b7a6d226
diff --git a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
index f80b58e3e7bf..701e68557c1d 100644
--- a/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
+++ b/dev-python/pdfrw/pdfrw-0.4_p1.ebuild
@@ -15,7 +15,6 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/sarnold/hexdump.git"
 	EGIT_BRANCH="main"
 	inherit git-r3
-	KEYWORDS=""
 else
 	MY_PV="${PV/_p/-}"
 	MY_P="${PN}-${MY_PV}"
diff --git a/dev-python/pendulum/Manifest b/dev-python/pendulum/Manifest
index 02630f747e7e..20c2e87c8043 100644
--- a/dev-python/pendulum/Manifest
+++ b/dev-python/pendulum/Manifest
@@ -1,3 +1,3 @@
 DIST pendulum-2.1.2.tar.gz 159885 BLAKE2B c95cd131fc95a0d19ef11f180cc42126cb8a6ea3aaf4b3bbedbc5ce4c1b37a6624f2a1be92f1a6fd6b1f14f5d20fa5f32e8230f896ab7a216f02f00e85b98738 SHA512 c367320ade0d10b7eb9c880286176161b925d7df052f7de85ddd169594bbe778776ea74df451f00186df98be3e32b7399c68ca4b40123e2c456206410e3a1ab2
-EBUILD pendulum-2.1.2-r1.ebuild 1014 BLAKE2B 3004e99eb4aaa8fd5dba2d993139c239da5ad20640ba3f9048130bfdde4fcc782720c1b5e6392ba25956fa6ac5d2919d53fb0c3a005f862f93bd57ca0ddca01b SHA512 397902ff82c38634d62688170b2ef60a8a96d062f0878a14333cb5359a588e255b1cb5186d775e88e3adfe130ab1832090cb25cef01327275080950619401844
+EBUILD pendulum-2.1.2-r1.ebuild 1013 BLAKE2B 932790e068a9f39ccb7ecdffd381d15a85a414f6a27424f44bf6e14b5f6a1ace335b13f6c25cb6c9f98dc17d2fad69af63f8089150c252888e9636c58d881cbd SHA512 66e3b624a7210d74a8935d8c46929e546846f58dfe672fda3521165904dcdcca92f387eb55f8fd7ecbc9deb8f48bb838fb1082240ff4bdd11bed2aba04a6d771
 MISC metadata.xml 515 BLAKE2B 836e056a0ea2aa33fd1d3fb9bb6fda8539ebb1395038e3b264302e8b6b63397840f3413bccd4bd1fe24ecceec8075ed3313f8404cab60a386c1c9eed902bc6d2 SHA512 e61f93ccb5176ea9693f9d03bd6b583db8154b9673e63ab683841b4ab9f611ffc2072bcb9c19c199f93b7fdec1cdc87c82fdfb688733de449f1a59a7a25f70f4
diff --git a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
index 5134b18bf3f6..87d8f8fe5c55 100644
--- a/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
+++ b/dev-python/pendulum/pendulum-2.1.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/pendulum/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 # Requires timezone information which is not installed by default
 # with dev-python/pytzdata, and otherwise approx. 50 out of 1600
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index a04ceed7990e..813f91948cf7 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -3,7 +3,7 @@ DIST phonenumbers-8.12.16.tar.gz 2257000 BLAKE2B 33e513840f1147af9169ae4b01527b0
 DIST phonenumbers-8.12.17.tar.gz 2257177 BLAKE2B fb47b020d78c1f91973c5a316b1c08dafaa7847650c19ac012304f855701fbe6ef5068c26c125a52c69bcb02c68e7465e376f5f521c06f25c92402d60416eb6b SHA512 59999dd64c78d69cfe39c3fff7ac41e57739e7363073fd871c7ede6088e0b32085d92e560954cdd3db1c986cb2f17f884fc2ce04b23cd7d10eab1ea4b8b5c4be
 DIST phonenumbers-8.12.18.tar.gz 2257229 BLAKE2B dbfea2209ffa671eb619fffd8e10da793718b36dd193eedc5ea02ffc69bc967a5ed7f6ee2cf6dd2b85621d3b9dad33c552b839abe7597155d702f59a3a8dd140 SHA512 01efb25e5f47b314cde706c8d064fa6c3e6b3ceb76be775fba456720036bd69d95fb03b775a4c510dc6d7cad662a30208839f93fdf6274f82488e06ef35ce508
 EBUILD phonenumbers-8.12.15.ebuild 433 BLAKE2B ee125018a884d96c9aeac1ae7c3e387393389c5c512437a46e34e8f5a32de1f64e015ddc02f55530c13246cb7dfcf097808c79381b0d8861214ee8579be42f7b SHA512 607f9740cf7c0a5226b14450b9c0c07f6a44ff4add54e70abb278221c4779018e88bdbc4c16bb8f45a1fe712a49b33939ddc9889bc49f3148dacb77518d8b8dd
-EBUILD phonenumbers-8.12.16.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
+EBUILD phonenumbers-8.12.16.ebuild 433 BLAKE2B ee125018a884d96c9aeac1ae7c3e387393389c5c512437a46e34e8f5a32de1f64e015ddc02f55530c13246cb7dfcf097808c79381b0d8861214ee8579be42f7b SHA512 607f9740cf7c0a5226b14450b9c0c07f6a44ff4add54e70abb278221c4779018e88bdbc4c16bb8f45a1fe712a49b33939ddc9889bc49f3148dacb77518d8b8dd
 EBUILD phonenumbers-8.12.17.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
 EBUILD phonenumbers-8.12.18.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
 MISC metadata.xml 517 BLAKE2B fbbefd64340f179046eff07f02cfc01416d9c99817d8bd4061aa908eaabf59560e704e40876b5d514389766b26697ee811a1a4ef9ee5a306790156892f45e8d1 SHA512 5246cff049767fba3892ae49499127453cc26806d3eca35de98012c71df29cca4192d104810ea21921a1160e736a2225e3538e829016d9712a0b489be0e5a17b
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.16.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.16.ebuild
index 8f5b4d0422ab..e1586dbb97b8 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.16.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.16.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 10ef9898fe23..67ee64e32531 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,5 @@
 DIST portend-2.7.0.tar.gz 12732 BLAKE2B 147d47295d702e6e4a41da1af91afc72ecb2a29713431aada6c98fe527c96f86a88a845cc1afe6507e2fd0d749e146f8b349df13d2e1fb1ff2c0a12fc7d6bdae SHA512 8c81e524e94c4902806a6d33a2811d405e6024796fdbfb5ee1037a177b0aaed4c1b87b76822eee5ca55e552ffa569f4e619d0c1645f0d10c17f8d721ec73787b
+DIST portend-2.7.1.tar.gz 13538 BLAKE2B 56e9b7ae4fb9371322cbecf12d9367fc48f0138cf9fa8cb25cf7f0b7977d83852f328d89e93ee2e266e77b393bbabe75d091ce85f688e1ee146edf64e470aa60 SHA512 079bfc286491753e980b5000ee716031225439523a8d9a79c2571359adee74ee024dd680c41adb966487dc39eea3d0dbeb928c5c72fa21ab897283310ef21906
 EBUILD portend-2.7.0.ebuild 789 BLAKE2B eb5b5ae00ce2bc10f7e1da8646fb43fc49d85f79a4b4a1f31ea59fb3f90fa2299e4241006c0cd4e85e868dc504d454917a5c0149e397259e05d5d267f682962e SHA512 1d0468521bc6fbf802b95a7de28934d2c4aee3bb78dc04952e9d5947779627ac497fd3919c7988d791da48aa0ed196c9f7dbbcd8c01d128346f55675ca8e1e60
+EBUILD portend-2.7.1.ebuild 626 BLAKE2B 6035901334c6d01b482fda9a17be7dba872fe8995f293e3125ffc99930c164bb9d1b28dbb5bee971be6977d0ee3169c025782a40ee2d8c72891c527c693bcd86 SHA512 aa09fbda4bebd3fbfc6385460c98cd19b539cda636c514623bd67b74e8f2b40465a51f890b501fefbe1ed61d8a82f35afe0ceb6a91c13b060de4728c8f45af58
 MISC metadata.xml 493 BLAKE2B bc4d9e79f1ff9387da6705744d7fce19c8b6cbccfc62878ba79b14312b3612598c6042c5f2842f663af254fb8977a60c34d373624604b69ccb2f861a2f5aeb56 SHA512 7db9144b99d487353a90f70e85d8800418eb92aab0678e934ffe92498c7b0e4c0f574dcf109f1a3ec2c7478174a26346152f15d57f15c9edb89f5d9dae2c788c
diff --git a/dev-python/portend/portend-2.7.1.ebuild b/dev-python/portend/portend-2.7.1.ebuild
new file mode 100644
index 000000000000..951cb59e9aec
--- /dev/null
+++ b/dev-python/portend/portend-2.7.1.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=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="TCP port monitoring utilities"
+HOMEPAGE="https://pypi.org/project/portend/ https://github.com/jaraco/portend"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyFFTW/Manifest b/dev-python/pyFFTW/Manifest
index 8f163fdcacc5..6085b85233f9 100644
--- a/dev-python/pyFFTW/Manifest
+++ b/dev-python/pyFFTW/Manifest
@@ -1,4 +1,4 @@
 DIST pyFFTW-0.12.0.tar.gz 147372 BLAKE2B 1ea1f1f8de6759c42781a535b30d7119c0cb02dffea3abfe4130a97c465e000aa9b3064a219718569552304513a77ac51aa309f1be29f9eecae25c63cce70c6c SHA512 e4d7258d5c053b5367d8c4f1892eba8e595f9d540c1c3e6caf61e0c113d598ba872b5e72a21edace66be70d9ad75c599e4b1fbc692e0015c3c1ae35e9a7ba599
-EBUILD pyFFTW-0.12.0.ebuild 654 BLAKE2B 4eb24cdca02da578035d6d4fbc428255585bde3b4880fbb05236f963578649062e26f99001e97fc7765a14a6647a627f00790f21e48d64f0ab8d33c50768062c SHA512 34072e7e0f8d66715e91989703c11bdfe432e05c51eb49d76ce7c9444910fb930ff308f4c6c3e1d7fac57e6c485bab856201cc4e5879f89aba6f7d65a6fde708
-EBUILD pyFFTW-9999.ebuild 654 BLAKE2B 4eb24cdca02da578035d6d4fbc428255585bde3b4880fbb05236f963578649062e26f99001e97fc7765a14a6647a627f00790f21e48d64f0ab8d33c50768062c SHA512 34072e7e0f8d66715e91989703c11bdfe432e05c51eb49d76ce7c9444910fb930ff308f4c6c3e1d7fac57e6c485bab856201cc4e5879f89aba6f7d65a6fde708
+EBUILD pyFFTW-0.12.0.ebuild 641 BLAKE2B ccfaf6daa16f840ce89bcf9764cebcb012d5f30cfa88041341c0bbeea96b463166ebd4585b8fd5fcaf00bb4ae6c6e6640de6d3454f81c23fa631fb433a2a1662 SHA512 f7f63d1361120f313fec0daf7302777d5772feae12fba4501b52a6fc0d06a5f7010d02536c74f525e968c7ef2c8f2d1d9b01b9a3d7790017cea9f8d80260d208
+EBUILD pyFFTW-9999.ebuild 641 BLAKE2B ccfaf6daa16f840ce89bcf9764cebcb012d5f30cfa88041341c0bbeea96b463166ebd4585b8fd5fcaf00bb4ae6c6e6640de6d3454f81c23fa631fb433a2a1662 SHA512 f7f63d1361120f313fec0daf7302777d5772feae12fba4501b52a6fc0d06a5f7010d02536c74f525e968c7ef2c8f2d1d9b01b9a3d7790017cea9f8d80260d208
 MISC metadata.xml 468 BLAKE2B e194260c6ef62152730eaba4b41cdb62313327a29397ceb80bb5d01e2e10b90111368becb2d13098ce91d06322c651891882a6e423401e1e5c49d509d26cb0ea SHA512 f21d715e91adee75fbd7d1eb25c10b7149bbb04bd41dadc01292afd80dce349367335e47a294b49033e54f8d26ce91c9dfe5f9fd58a738dacf6ddcc16091ca68
diff --git a/dev-python/pyFFTW/pyFFTW-0.12.0.ebuild b/dev-python/pyFFTW/pyFFTW-0.12.0.ebuild
index 609c78ed1ff4..af2331671882 100644
--- a/dev-python/pyFFTW/pyFFTW-0.12.0.ebuild
+++ b/dev-python/pyFFTW/pyFFTW-0.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,6 @@ HOMEPAGE="https://github.com/pyFFTW/pyFFTW"
 LICENSE="BSD"
 SLOT="0"
 if [ "${PV}" = "9999" ]; then
-	KEYWORDS=""
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
 else
diff --git a/dev-python/pyFFTW/pyFFTW-9999.ebuild b/dev-python/pyFFTW/pyFFTW-9999.ebuild
index 609c78ed1ff4..af2331671882 100644
--- a/dev-python/pyFFTW/pyFFTW-9999.ebuild
+++ b/dev-python/pyFFTW/pyFFTW-9999.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
@@ -12,7 +12,6 @@ HOMEPAGE="https://github.com/pyFFTW/pyFFTW"
 LICENSE="BSD"
 SLOT="0"
 if [ "${PV}" = "9999" ]; then
-	KEYWORDS=""
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/pyFFTW/pyFFTW.git"
 else
diff --git a/dev-python/pyGPG/Manifest b/dev-python/pyGPG/Manifest
index 10afe3b409ad..1d0e34d608da 100644
--- a/dev-python/pyGPG/Manifest
+++ b/dev-python/pyGPG/Manifest
@@ -1,4 +1,4 @@
 DIST pyGPG-0.2.tar.gz 15439 BLAKE2B 92c82b8b23c279461a872f118c636fa9cdae3f44910fc34a357983b0b4afea2a7b13c6400499a0fdbb4365357ade64294642178ca07a79ab3b7df89e60146e73 SHA512 93d892a57a27b254bfdc9778b73d341dfec654c2104c578014628df78c43beaf93eafb571ac544d52f334e63f6e5b8c0cfad7c8a0d585ee7211e8649efce8c67
-EBUILD pyGPG-0.2.ebuild 1118 BLAKE2B 0ec9db10b09d7ab644c7532ce7b6f47c31e612c5e7f5d96c7662bab4c55c31ad3501072c69c5bbb415b51eff6a967833e3655d4c94bae30a287bba39240d5baa SHA512 4ef5bc2374ce93189c19625375c4b91dd02d51b905318b00781160fecf2d9df99902d2d951788506751617fb4056795e236af7dea78a9b24e7da50ffd0adbd8e
-EBUILD pyGPG-9999.ebuild 1125 BLAKE2B 6cce0a686826eec85e2e850925f23379a829d775a959d3b0ea1a3b3d01895fa2d07ed106ceef880664ebffc1fc40ee7ae6b9669fbe83979a770d9cb47e4e2b59 SHA512 ac5175d3040e9ec7ac8ca1bb2551d66ecdef69563bd2c0417cedb0d2deaa1d82858e20758286c40290f08a2217b8ceed1fed4ce5de7cb7e05d9c18f7ac7be529
+EBUILD pyGPG-0.2.ebuild 1147 BLAKE2B 01bc392fac74785958a978098c34d13f515c09ca3a0d25182e231c264d1d9a6ffcbd3d08492d0adc493c7ced012ffbfff482a2bad5818b863ca47709e0c74a3b SHA512 cb087a06178a5837aa823872c439814e7863583665bcd4e2450577e084d53696546d7217a1b435bf693c6260642baeab24ec335993eeec7e70ef721b67beddf4
+EBUILD pyGPG-9999.ebuild 1154 BLAKE2B 38081bf06cebb6f35fbe209ac2d812cd5b14060a4a7d4391a6aee0c081d726c28d01926ea9bca6569d882a25cea3c1c3ab75fed746d2b185b1e5257fc631f3ce SHA512 3d878396c90f556799e6c3063f297134c065c88af7d359ed59fe5567dcc1cba86bec5da225e39fc35b044d3441868769b0cc6bdd0d10a93a1d0a7f7c4fb100f1
 MISC metadata.xml 566 BLAKE2B 85f26a61bb3bbdc790bbd1f67133d51d522f492f16ee59dca909eb1c33668cd330faa69cd75603e65b41fc3a0ceb760e0a9aace292de9c7fad248273d0c407ee SHA512 03125338286f45302cc2b60257f4650a8bbcb43e8b7d433b6f012e646a2a2ef7f84b994057a93c3fbdeddd94b838a428d1409d965e0d190c937e4e2463ad34fb
diff --git a/dev-python/pyGPG/pyGPG-0.2.ebuild b/dev-python/pyGPG/pyGPG-0.2.ebuild
index 28a2dff1e5c9..49a6a7efaf24 100644
--- a/dev-python/pyGPG/pyGPG-0.2.ebuild
+++ b/dev-python/pyGPG/pyGPG-0.2.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
+DISTUTILS_USE_SETUPTOOLS=no
+
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/dev-python/pyGPG/pyGPG-9999.ebuild b/dev-python/pyGPG/pyGPG-9999.ebuild
index f5467923e983..a857c473d66f 100644
--- a/dev-python/pyGPG/pyGPG-9999.ebuild
+++ b/dev-python/pyGPG/pyGPG-9999.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 PYTHON_COMPAT=( python3_{7,8} )
 
+DISTUTILS_USE_SETUPTOOLS=no
+
 inherit distutils-r1
 
 if [[ ${PV} == *9999 ]]; then
diff --git a/dev-python/pydot/Manifest b/dev-python/pydot/Manifest
index 5af44fdb535b..327f7c1f730d 100644
--- a/dev-python/pydot/Manifest
+++ b/dev-python/pydot/Manifest
@@ -1,4 +1,6 @@
 AUX pydot-1.4.1-unittest.patch 3496 BLAKE2B d5aa063d1700836c2aa967c0856c4b693f0820f1c3ecf41de444781a29f4ff4fde6d8d2cbb30458364efe47154fb6ad50c545fc45fff6fd27864483ab4bef2e6 SHA512 0204de6a767d062e4074344ce093da6789145407c7aab3706abc72d15e655489b7e43f1038b8d5951ac9a107aa0ca8a399e119826100d05433d13b537ae48cdb
 DIST pydot-1.4.1.tar.gz 264987 BLAKE2B 61db2b6dbeab582981bf96054686c927d8d4548ac19a6c197ab1725f92c87e973c2dcd84d4c6c04cb2ca76b8f40814cfee1d5a53e4952065a538fc271e75d2a0 SHA512 b5f16b59908586df61cd415cb1a3e242fb69c39674a82b171862beff1f3727f47cba39bdd806901cb56bc8a6888783a53d112b1b70044e124ea992789d77f938
+DIST pydot-1.4.2.tar.gz 272678 BLAKE2B 966f2c4ef3e26a63cc50ab89b5b6b5b413aabdfeddf994f2d5ba9dedaa1ed3152dd8060186e7380c3e768b783f7bfe1971cd600c18d1b73f7ac63db08ee3ace9 SHA512 caa8051561710129b5164fd1392da941829fd977092a6ec8b00efe7a199d2d60bc7ef13cb0e51615f384550f0fb80190d0f56b83d8d80d1fe372efb5dbbd3632
 EBUILD pydot-1.4.1.ebuild 921 BLAKE2B 9fe83e9bc4769bf75bc0148e04b2e45ca2d5a349fa84aa590505651a3ec85564662e2a15d070fe906df251b7777312d760fa7ac9a61eee2b4be39d3709ebb91d SHA512 eee5e4069681e0a24116d919d77f0c0e1158edd9ad7aec3f5e9a3e24fa4a7f1ffb09e03cebe69b35a0a0ac860813b8577381966c0979f3cc6f06bc5edac7a4f7
-MISC metadata.xml 376 BLAKE2B 2118896ad9769d359f3d1573285cc61affc3989d2ea81d0914e01b5e8882ff94fd70a06324ce3cdc38146edc8513aa67457dc65b81af93474568e9a1b3b23c47 SHA512 0f67a0286f6ff6c6b35e67ff08abb0b86f9ac60e57d321ac7ca0508383b5ce8b0c091a3b023e87d20f3705887db40a5edde2055fa96ec7bca21a5b8aacac31ce
+EBUILD pydot-1.4.2.ebuild 870 BLAKE2B 4f5df3506ced7df19443271d67f608ebfa3885e8c19f18efd440d0c3938bd47815691339d29a64fdd19ebc7b906a870f11d8bd53b7d99884d3214f02d6e02fc0 SHA512 55026fab8691d8c647967ab533ffd347039f35d5d0e44cafa4b5a8fe23e0a0a300e704fd5dc78266f9f16f2022f6b994e0562844b4fd4488c9ec9549328cfea7
+MISC metadata.xml 371 BLAKE2B bacf89a8119699a66d6747fb44ed332c702888255a5c43bc5aab332de7de3a74369f904d7acbf1fa24d7bce044b46168206f85f4a5c24c8d6a06f7eb340b6c50 SHA512 595a09120356df285eca84fcca5f676b149580ea8df2284f2eb60b1c9b594b8e01088f0fe8a37b285573fdd79c0065891038ede2f526676e0fb428b44697b08a
diff --git a/dev-python/pydot/metadata.xml b/dev-python/pydot/metadata.xml
index a44c00e7d6b3..479f36316c2b 100644
--- a/dev-python/pydot/metadata.xml
+++ b/dev-python/pydot/metadata.xml
@@ -7,6 +7,6 @@
   </maintainer>
   <upstream>
     <remote-id type="pypi">pydot</remote-id>
-    <remote-id type="github">erocarrera/pydot</remote-id>
+    <remote-id type="github">pydot/pydot</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/pydot/pydot-1.4.2.ebuild b/dev-python/pydot/pydot-1.4.2.ebuild
new file mode 100644
index 000000000000..5a4226cebe82
--- /dev/null
+++ b/dev-python/pydot/pydot-1.4.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface to Graphviz's Dot language"
+HOMEPAGE="https://github.com/pydot/pydot https://pypi.org/project/pydot/"
+# pypi releases don't include tests
+SRC_URI="https://github.com/pydot/pydot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/pyparsing-2.1.4[${PYTHON_USEDEP}]
+	media-gfx/graphviz"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/chardet[${PYTHON_USEDEP}]
+	)"
+
+python_test() {
+	cd test || die
+	"${PYTHON}" pydot_unittest.py || die "Test failed with ${EPYTHON}"
+}
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 48c08ff03541..29e595943bb1 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,3 +1,5 @@
 DIST Pygments-2.7.4.tar.gz 2325473 BLAKE2B 48e45f8d58e4d06be71cacbfbcbee57c69fe0b4c344c1dde2054912f1b74c67db19c24de2661acab7026ea78420ff90e4596e1a89b783ce79ebea12c8d3a7a60 SHA512 84fb2e0c52e4683d52524ee1d70c11a9ff6cc0b21fe6aa3e1a6c4fac393f87267756b1c04b7c2555799e387b2e9ca7d2e7703ddc1690a642aa263ed27510e030
+DIST Pygments-2.8.0.tar.gz 3999484 BLAKE2B 5267a4a9e18a01897906239d2cb4f508675e0de3d9a33ae9b144424b18883da53937d92755f8ab1ddc7b10a248031fb693b4012407079aca1d08c8924360e75d SHA512 7e3dd2119769b704d6bbd4867c85eedb0d3c8ac415280fb35a1194284511c6fe6c5696bf6515e14da7a944b7ad5aeb945a71e79abcd1a42949ca30bbfe2e31b3
 EBUILD pygments-2.7.4.ebuild 1234 BLAKE2B 1abc07b72f10c8bbc95dc597052682911eed7fbf49b3e9f37fec207cd602c3c4837200c84eaf00abccbfeba93641caa1ff033379902f69a04479c17cf72856f7 SHA512 cbe478ba3832cf4a28fac676e2608e7758052e4a166316a77fd26a69eb20995b4d04939271ad40c54bd58d26c423667e6609fbee45dff4bc5c24a961efa13b5c
+EBUILD pygments-2.8.0.ebuild 1248 BLAKE2B a13c017b5279c248b9cda129f413d7f725955417fccf38a4a0ad3877cc13fecaa9f90381037139339af83777dfd01c0e5eff9e3621b45afa487621a486b18042 SHA512 5ddb26823783fda50bb0c97626cafae831ed16977666b88e093ebfc464d8919f5c689b64f40e9e15eefda9e3b8aa56b240ceebb3686228fcee88598d2164e7be
 MISC metadata.xml 556 BLAKE2B 87120b6aafeefb97b45a6895b23d08c6443cb177d5bc337845bec55ebdb59ee9eb19ef41c10b3ce4d61452c602f925b4120a441959b5b5d5fea26e15de4a1510 SHA512 b5f4491bb714e2abef07da4e960609aae651ceae3153102467e19bc4d06b9006418729f0b915cc026842253287786faa083d608c0ad5bd7f5c423922740580bd
diff --git a/dev-python/pygments/pygments-2.8.0.ebuild b/dev-python/pygments/pygments-2.8.0.ebuild
new file mode 100644
index 000000000000..eb9fa4c20022
--- /dev/null
+++ b/dev-python/pygments/pygments-2.8.0.ebuild
@@ -0,0 +1,45 @@
+# 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} pypy3 )
+
+inherit distutils-r1 bash-completion-r1
+
+MY_P=${P^}
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="
+	https://pygments.org/
+	https://github.com/pygments/pygments/
+	https://pypi.org/project/Pygments/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+BDEPEND="
+	test? (
+		virtual/ttf-fonts
+	)"
+
+distutils_enable_sphinx doc
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=()
+	# there is a known bug in regex engine of pypy3.7
+	[[ ${EPYTHON} == pypy3 && $(pypy3 --version) == "Python 3.7"* ]] &&
+		deselect+=( tests/snippets/crystal/test_macro.txt:: )
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	newbashcomp external/pygments.bashcomp pygmentize
+}
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 9eca17a42e71..7d6e81251e5f 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -1,6 +1,8 @@
 AUX pyilmbase-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch 1192 BLAKE2B 7590379873fd2be694a70d272a082fe6916e596f3b0945bc5f6c390880cc31e6b07da9bcedeb4e9bb048cd50f87ccff5b61857903f0e295af37dc005e4792a7e SHA512 7ef4a769086e5cf62cd3ad18bb169578da5557bb7006250f7dc13e6b623e46e2805ec9b51926f0eba27fb414eecf2f0017dc282f67ee639edf013ff135c54086
 DIST pyilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
 DIST pyilmbase-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
+DIST pyilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
 EBUILD pyilmbase-2.5.2-r1.ebuild 1482 BLAKE2B b7145c71881dc1a9dd07428adead308ab5e11797bf6c73e54e0fd85f047e30467c3d9aa15eed78372043de9328b29366b38d954f6a5a1ea83546f3c53d787e29 SHA512 ec730c7d8fae912b524a07000e09a9b54ec101b964d379c252ba08d1c01973c9efdbe39152459e167847b60a7dc663c9b6f2073e7a1842a8e8c90b991afbe78f
 EBUILD pyilmbase-2.5.4.ebuild 1529 BLAKE2B 3f5b87fc5883a5af729d930a03a217bea0ffcdc9c41bdff9a0d5de017dd3937de4c7f34ff2fcff7deb3bd5c3e4daa645ff0d94b8210e8e96b13aca64b38f191e SHA512 26c197da6cb9ddf0404454bf929499cc328989ec4c0722e2f52ecbe81f6d8c0be5c515602c917115db5a6021d49ca70b130068738c1c18d14b25a3bcc1b43506
+EBUILD pyilmbase-2.5.5.ebuild 1529 BLAKE2B 3f5b87fc5883a5af729d930a03a217bea0ffcdc9c41bdff9a0d5de017dd3937de4c7f34ff2fcff7deb3bd5c3e4daa645ff0d94b8210e8e96b13aca64b38f191e SHA512 26c197da6cb9ddf0404454bf929499cc328989ec4c0722e2f52ecbe81f6d8c0be5c515602c917115db5a6021d49ca70b130068738c1c18d14b25a3bcc1b43506
 MISC metadata.xml 660 BLAKE2B e1a4d9bf411ee4d67651d4783313d813652953abaae6b04b2e1fb11bea190f2d8611778fba87623ba859b6792225759686fcdce3f7b7690f569e64bac733f2a9 SHA512 740e753bc83c71ffd08c20d33a34a3fce7537d87b168d5ccec51f0810c1253e237fa6a97dba18651f17a8d9fa4a730d3d916ee46731efaae817651282e37c219
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild
new file mode 100644
index 000000000000..223f1a8e4a37
--- /dev/null
+++ b/dev-python/pyilmbase/pyilmbase-2.5.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit cmake python-single-r1
+
+DESCRIPTION="IlmBase Python bindings"
+HOMEPAGE="https://www.openexr.com"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25"
+KEYWORDS="~amd64 ~x86"
+IUSE="exceptions +numpy test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	~media-libs/ilmbase-${PV}:=
+	sys-libs/zlib
+	$(python_gen_cond_dep '
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
+		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}] )
+	')
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-admin/chrpath
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/openexr-${PV}/PyIlmBase"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.5.2-0001-Fix-pkgconfig-file-for-PyIlmBase-to-include-prefixes.patch
+)
+
+DOCS=( README.md )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Python2=ON
+		-DPYILMBASE_INSTALL_PKG_CONFIG=ON
+		-DPYIMATH_ENABLE_EXCEPTIONS=$(usex exceptions)
+		-DPython3_EXECUTABLE="${PYTHON}"
+		-DPython3_INCLUDE_DIR=$(python_get_includedir)
+		-DPython3_LIBRARY=$(python_get_library_path)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use numpy; then
+		python_domodule "${BUILD_DIR}/${EPYTHON/./_}/imathnumpy.so"
+		chmod +x "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+		chrpath -d "${D}/$(python_get_sitedir)/imathnumpy.so" || die
+	fi
+}
diff --git a/dev-python/pylev/Manifest b/dev-python/pylev/Manifest
index 415bd104e6d5..5da2f7a8436b 100644
--- a/dev-python/pylev/Manifest
+++ b/dev-python/pylev/Manifest
@@ -1,3 +1,3 @@
 DIST pylev-1.2.0.tar.gz 3048 BLAKE2B 3bb8c18350667cd6405ae87afb0bce5c7aa987bb318f6ede0220b268facc2bb06f0c0daedb8cfcc9e7a64f65ac32d75b80e9c2718214925fe9965082f434f47a SHA512 848bda63a3bb5f686944ec1396ad916fe18546fd681a106b7b9641231bed540db6ad9f88f56bbcceb71cedd2c2d7c567295071b1de81f3d10cf115b6459bc793
-EBUILD pylev-1.2.0.ebuild 418 BLAKE2B 6692fc87cf7d85bab7f0e57f8959b1ca0ebe2fa32113082e6f1d72d5ce095e43f70020f6658cdcb3ee60be2e9bbf284f88d2848223219786e822a03bd18e315d SHA512 8307a4e0397d18b2ac2f366c3419a6b0fb896cf50ccc774d2d7e6acef74bdc8b1bd3e06dd86a36b8ef437f819a7ef8d4ca8847761dd1853dace9523359ab7aa2
+EBUILD pylev-1.2.0.ebuild 417 BLAKE2B 0f210f66ca15b028f5cc77f07ca02b895d542edf5b9a250d3c84e8d83e48c76c2313436e75feb5d5996ff4a0f835919b3cb4ee2b44ec8a4ce1f8829edcd51a6d SHA512 8042ac1989df45bbef01807c6361cd3c30484280736cf4159459a9f02dc679a8068b4409c5aefbf29f3ddd592d0daae1a20b31d1eb5f51ffd8d768f45342b1a6
 MISC metadata.xml 511 BLAKE2B 2a6e66dad341afe9386031a90d395cfc9518526e4c4441cab70c98c700c0d64b706dc7680f71e282f549239ad0e5af386772e3f1aa0848a4cbac9b37627134a2 SHA512 632108658c5730efe8bc9132d1b1023c0b3daa54b95f2ce6477ead3f0723d98ee24fad95df150892b4b3c6ce7783b26200a4e4d3ff55b6c36960d882a648aacc
diff --git a/dev-python/pylev/pylev-1.2.0.ebuild b/dev-python/pylev/pylev-1.2.0.ebuild
index 0b7b6e90b6bf..f046eff3c311 100644
--- a/dev-python/pylev/pylev-1.2.0.ebuild
+++ b/dev-python/pylev/pylev-1.2.0.ebuild
@@ -13,4 +13,4 @@ SRC_URI="https://github.com/toastdriven/pylev/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index fd4ff3add4ca..efe8ed9a2515 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -1,5 +1,9 @@
 AUX pylint-2.4.4-sphinx-theme.patch 468 BLAKE2B 741a362b51d35f574b245b4df81309b1b08be7a38ca7fd5c04d6c9ce39bc830e32531a29103d1261d9fea6eecf5f52fb1d4cf74ab0ec3bda5f6299e4edfecf94 SHA512 7f1896819d4f2766a83ce2600754d7a698ce13388de9127e83b42b76b332ae5eb54eb538b9dd5d81dafe1cd5798e703c1f3fd7fa318a8582aa7c2c0db7cc7a30
 AUX pylint-2.5.3-tests.patch 455 BLAKE2B 608ec913ea9d8088c3e7303026339eca69cbf706601ccb841642eef83ae9eccb7d6863da6c7957f9f49a81f24d17e72d835c3740ef177ced6356bec7510a0221 SHA512 dd1930e47dc342cb76fe55fad22cde3b4d5935a62c62d740b75e27701606bb8d5513b8f2c9e2f3116c0456a545a2c56f6d75b87903e2cdec1df97e4b8ed1b532
 DIST pylint-2.6.0.tar.gz 680289 BLAKE2B f7d4159478f667a3234beefd148857f26c8f7ea3aae3bfa70fa06fe2a8d86fcf22a0727a9fa5d8fc3de4aa0bb7a4d6e13bf68029f359122762d1e0d24a0b715b SHA512 02881fe14401bbe946618ef947c8db320a6c8dd93626402260d60468538ce67b61d1e8b921bfb1a6020514dd392e9b0021c97ddb60b45866c2d2241224f93f08
+DIST pylint-2.6.1.tar.gz 694232 BLAKE2B c169939a49a9a8f3225e120cf56df12fabd8d1940504231d0e1c3783dd8b87beb24e7095e15b332189043d5790b69bd2a41b0baf56cffccb4ef5d7cfe2be9cf8 SHA512 6a6bda57ed22df8378aea3de3fe3b97deb7c0742abeb08463d3d2e0f0cbf6bd2166861456b3fa7cd2d7cf148b052fc4913479c3f632b8e92ebf8d26189a122b1
+DIST pylint-2.6.2.tar.gz 680364 BLAKE2B 59bd18d5458f86a7279a7fc895f1564fc575c27e7ad7b4a668456d6005cc2a4d920e2221c2ec3f447c1c63376e1b35f1e1c5177c355f52872d3c556aa63ae462 SHA512 75e88aea23e4e68714451d22b0a6a2106a4821c05cdd7d077e12ea7f6198959ebdace6824b1e2fb42a632051e049a2c84eb93990a7b6af23c7fee7e2f56bf6ec
 EBUILD pylint-2.6.0.ebuild 1595 BLAKE2B 883e2c8a47ad5bda161ced7eb0e0c5b233d841a5190544b6201f2abe76b4f9d3893c6dc56e1fc5e526234fe29bd053cf59f12dd1b3b486335ac210e9ae3d1564 SHA512 b8e0432af850450909cdf68962e5ac82409b462350fedf158badc8b651d43d9ea599f4c57ff5c609287ad0020bb89984f701c7af28402114d30b25148a354199
+EBUILD pylint-2.6.1.ebuild 1601 BLAKE2B 191e4d652f1d7a43073026c1074cff9bd5130cc2d01ad2a2816b268c018fe5b0fb8e157622506ac211c3a332cf0f298929942bb93d5d932aeb221109a9227aee SHA512 ea7ac2e41a567cd88b5061ecb5ccd434eecf3d70d1d5352b41b84033aa56569735869a4e033e2b69dfe064e44ad1c6442fbc9ed25ddd5ce3d90456d2d5473440
+EBUILD pylint-2.6.2.ebuild 1601 BLAKE2B 191e4d652f1d7a43073026c1074cff9bd5130cc2d01ad2a2816b268c018fe5b0fb8e157622506ac211c3a332cf0f298929942bb93d5d932aeb221109a9227aee SHA512 ea7ac2e41a567cd88b5061ecb5ccd434eecf3d70d1d5352b41b84033aa56569735869a4e033e2b69dfe064e44ad1c6442fbc9ed25ddd5ce3d90456d2d5473440
 MISC metadata.xml 1099 BLAKE2B 5933d1532c718b45075ebcf1c4d5010d855f4d8d1034b0a96ae6c64ecab6f03212a7e261215dfcb70e688521f17070e7875fdefe427a4f4a3be2eedde2b36605 SHA512 0d7fb923cfaa8af4c4d1fb294f16a686a22f10c248111b135b76f2b56a1a42f7bdb3337d5f0080d6d4d2b449743ad89358e86f3090488d0d6baf4f8faee2c79a
diff --git a/dev-python/pylint/pylint-2.6.1.ebuild b/dev-python/pylint/pylint-2.6.1.ebuild
new file mode 100644
index 000000000000..7135b98dde48
--- /dev/null
+++ b/dev-python/pylint/pylint-2.6.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Not ready for Python 3.9 yet: https://github.com/PyCQA/pylint/issues/3895
+PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+# Mirror requirements from pylint/__pkginfo__.py
+RDEPEND="
+	>=dev-python/astroid-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/astroid-2.5[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+	"${FILESDIR}/${PN}-2.5.3-tests.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# we don't want to run the benchmarking tests
+	rm -f tests/benchmark/test_baseline_benchmarks.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/pylint-2.6.2.ebuild b/dev-python/pylint/pylint-2.6.2.ebuild
new file mode 100644
index 000000000000..7135b98dde48
--- /dev/null
+++ b/dev-python/pylint/pylint-2.6.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Not ready for Python 3.9 yet: https://github.com/PyCQA/pylint/issues/3895
+PYTHON_COMPAT=( python3_{7..8} )
+PYTHON_REQ_USE="threads(+)"
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="examples"
+
+# Mirror requirements from pylint/__pkginfo__.py
+RDEPEND="
+	>=dev-python/astroid-2.4.0[${PYTHON_USEDEP}]
+	<dev-python/astroid-2.5[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/six[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+	"${FILESDIR}/${PN}-2.5.3-tests.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# we don't want to run the benchmarking tests
+	rm -f tests/benchmark/test_baseline_benchmarks.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_install_all() {
+	doman man/{pylint,pyreverse}.1
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
index 68be2a44bb79..80a308386e3a 100644
--- a/dev-python/pyls-spyder/Manifest
+++ b/dev-python/pyls-spyder/Manifest
@@ -1,3 +1,5 @@
 DIST pyls-spyder-0.3.0-gh.tar.gz 8545 BLAKE2B fe2ec3ca6a4440bb9112970550a096389a0969eea9f0cdd631110c19358ac387a97902cc21ee61c8961ef2ee020689c30f7c86f6448bbb40258d730b3cf79cbe SHA512 94ce684d8c7fdb8ece003c1965a001bd745a38086f382e0185f6750edb3103998165a5e2554f065d6364409e5438272e5c256b7b756b971f61f1dd5cbcf3d503
+DIST pyls-spyder-0.3.2-gh.tar.gz 8781 BLAKE2B ac24e0433c2e5ba43274d6266bc7532e7a1f1b0c3c34b9acfe10e5c7d789937536e81c4b19f96090f32d34c932529c0f4c23b49d2b01e7a0b628f8c2dd6f7611 SHA512 c08910ebaf161ceb712f273f054add1f3a202684b001d8d95650555bd67fa5675b3fef9e3d62d0d1b9da0f5adfeae9ff0fbfee44e4362856550d77582dbc6e95
 EBUILD pyls-spyder-0.3.0.ebuild 593 BLAKE2B 393d2a7cd130260dd81158408652872cf35dd270b02814e696e05e86e2a8cfdab94aeece5d184321583864b25ce61db57c95dc55194bb1f0d798f2bc26144b4f SHA512 e1b485c45aac28f1f31b32c7cf68f6fc762d02c7bb8f87f4420cf57f7119df2b9f6405bbddd4caa87fefc5dbc8935a0ca190c069e57d19a0c46273ffd85fba06
+EBUILD pyls-spyder-0.3.2.ebuild 595 BLAKE2B 184d4ff0d6b9478d2c6ebaf35de2a7cefee5cca5fb4b1ca404d951482ff0b2b7a5826fb56cf2774eeb84913752acdf2e9c14b888565837f3593b2d05cfc952ac SHA512 07875d3126ea57a1b3a43f7f50d91d6b779d66e13eef40c2f7434e87e996be3e6c130db9654430fc1ab31e71ae0bf323ed9799f21946ccb3ef136efb0c084ae1
 MISC metadata.xml 554 BLAKE2B d92e4696e31a986927d50e9e17fa0d202681c4c323430ca9dc7006a203e5fbac10a2a33107dbdaff9b3ab21a5473c678f282a76ba63178909e687a07cb0a82a0 SHA512 83e82a6f5fe43cbcb305046744600881214625e891b708d45ec6f31ecb41e9f6f4e6524d10d41823aeb6b43f3e96e6e484d9e579f30de7608228449cafebe27a
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.3.2.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.3.2.ebuild
new file mode 100644
index 000000000000..513608b147d5
--- /dev/null
+++ b/dev-python/pyls-spyder/pyls-spyder-0.3.2.ebuild
@@ -0,0 +1,22 @@
+# 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="Spyder extensions for the python language server"
+HOMEPAGE="https://github.com/spyder-ide/pyls-spyder
+	https://pypi.org/project/pyls-spyder/"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/mock )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pyotherside/Manifest b/dev-python/pyotherside/Manifest
index 4776151e084d..1ad3949b8edf 100644
--- a/dev-python/pyotherside/Manifest
+++ b/dev-python/pyotherside/Manifest
@@ -1,3 +1,3 @@
 DIST pyotherside-1.5.9.tar.gz 185230 BLAKE2B 7130f17f29ed07cefc641d77631db46d08f3bd836c8517427e38fb454cbf34c2e875bb46798b3d785aa68064c24f154ed166617cde263f722e77eac6d0903980 SHA512 62c171b273b921d8e0220c7b73f0ff95a0a911eb3785cc37f3dab2ec624e54301ac5fbccfb57cac6a4bee967728624d4738b03aff0c5762452b99674cdff6ab2
-EBUILD pyotherside-1.5.9.ebuild 801 BLAKE2B 1e1b0373d386b93a79a2c10770d8fac2fe2bdee3cab2be912c91de82e1eadfdc7bee5ee75e3a9439466204da31a9fddf06ebbeb57dd4c7dbe8bb50bc8db7dbcd SHA512 81a94ecc047bfd2c95aee64f2c856b90a1bd4211bd6ce98f87c5c18ff42a2706ee9faa3ed0f6740e1ef2fa5ac14d60d9a7705e5f8ca3a871f98b5c1de6491db2
+EBUILD pyotherside-1.5.9.ebuild 803 BLAKE2B b86f230984f73339fe89344d87782b22886af45181b19a98f4e14451fd3e19a118a5450581f11fbca9cd952ed559ee31df742c475d96c285cb7cd1cbf96044f6 SHA512 e34ab147d78f016d81f15d44bf453fa7e12f64433229500f70d7738fc0b544ef37928f0f41ce63f59be7492587eaddbf87197f4e7c114246a91f061da6ac6976
 MISC metadata.xml 257 BLAKE2B fd7fdb57fdce3a565a08cedc4d99216724e4013515d77ea89cb41a5c01e8f5479cab25fe53d44a705e3a71164cdc3c93e658e61deae654a13e5c2471dd83c57c SHA512 35e59430f93d3bb2e7e3042a2464b84f8e6cdf1e1624c1e7674bfc5147f9b9694da6b39ac081ed5fc22f1623aea889b743cfee11007911f3c8c17cf61443675b
diff --git a/dev-python/pyotherside/pyotherside-1.5.9.ebuild b/dev-python/pyotherside/pyotherside-1.5.9.ebuild
index 50c1707cf1af..b461490aaff0 100644
--- a/dev-python/pyotherside/pyotherside-1.5.9.ebuild
+++ b/dev-python/pyotherside/pyotherside-1.5.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit qmake-utils python-single-r1
 
diff --git a/dev-python/pytaglib/Manifest b/dev-python/pytaglib/Manifest
index 7d399c09dbaf..b7d4a95929a5 100644
--- a/dev-python/pytaglib/Manifest
+++ b/dev-python/pytaglib/Manifest
@@ -1,3 +1,3 @@
 DIST pytaglib-1.4.6.tar.gz 467771 BLAKE2B ad0237829d203cc3fecf90c8d1d4ce6a98702afa2a6e6d51e3d3dd6a933c31e3c9f7bc9c4d5efa6eea33e630b3213651ed5afdc07db1cba058a9036ddf459ab4 SHA512 4b438759440790b3c850cf165b553f7e6066bf0064e041cca3e46831046b12a87decd4429772ea0c50e1b27cbbd2c82ba709361bc01aa2e8ec3064458aeae0ff
-EBUILD pytaglib-1.4.6.ebuild 454 BLAKE2B 10c304bbf3fafc96709d3edf879ce380a1c634a1b3d1e2b98f1cf4c20bf1361f4776fe7af94085b27cac680b7871c2d0eeec8853ff7db583f8ddbc63eef8f9d0 SHA512 47287aa83b604ca25a90b4b942a21354e4d3dbe9c230e210a56d2dbdc0814b5e11c5e0a636b70a476b6cb7556a8ac608c30d34e2fd552c851be254b39ad5c67a
+EBUILD pytaglib-1.4.6.ebuild 453 BLAKE2B fc6a5a687943846a443e04d1836f4b216d283e6f95a9afa1f8397dae8ff4c34188b0ac4b333a56ead7aa230e131c8e98244912510613c9ca0a4a7c69f69f26cd SHA512 4ba895eccf4b3d2285ed535b7257cc1d9693bc25d9e8f286d08d8354bf3f367bf58917ff0b6c8de9842cb9c02f387ce818e79f04b2068d4b5936f171cad7c457
 MISC metadata.xml 381 BLAKE2B 7479c1caaec26f8428bdb07a20018a66fa00bf3ba2d6cf9c0d204834ab5450536d5c21f4e0266606041ec52408d02811438adc085e0c02d5650b2bc00381083d SHA512 a278b1b37ec3a259ffaeeca9657b99e09c243b27f4105f8d66fef120a6cdc4a2594ece6b9a381a7062a94d91836e17ddb0fcf35170c2696918ff3bece944a308
diff --git a/dev-python/pytaglib/pytaglib-1.4.6.ebuild b/dev-python/pytaglib/pytaglib-1.4.6.ebuild
index 47d0dd8f73ad..bde30c1d0403 100644
--- a/dev-python/pytaglib/pytaglib-1.4.6.ebuild
+++ b/dev-python/pytaglib/pytaglib-1.4.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/supermihi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 IUSE=""
 
 RDEPEND="media-libs/taglib"
diff --git a/dev-python/python-slip/Manifest b/dev-python/python-slip/Manifest
index 9f4372947b17..3b834f35e862 100644
--- a/dev-python/python-slip/Manifest
+++ b/dev-python/python-slip/Manifest
@@ -1,4 +1,5 @@
 AUX python-slip-0.6.5-no-selinux.patch 2942 BLAKE2B 87cb1fee6aba70228b78ffc8b8a63b6b3bc0b11aad8f5e38369919e6c5a33780a9f255c2c81cc9220fe02b11b8d6daf24278bdbc495a831af03c92f1f2bd25f1 SHA512 64a742f93a38a2ff15d98e9d22c30a821ecd2044457ac958bf34cd7fd8e333b16a5fd56e80b169cc67c9ab35d13298d0caf418ad7a693372539701bda56f123e
 DIST python-slip-0.6.5.tar.bz2 25996 BLAKE2B f2c512274c35a451aa5a97f8c8b16d117edc34901cb2cc51d7d99314eec9c2e90c95019290ef9a35511b62a822471f40eac8c4228c0094bd72c71bd579bbe0c5 SHA512 84dfd4d74602e996797261aa4021fc1579a6aba554d2b3d497c0a7b8618366a9c0a6f12051b00c5653845dda923eedb58afdded37f2a1f31b5b0ce1a0532ccff
+EBUILD python-slip-0.6.5-r1.ebuild 1116 BLAKE2B 07525835731560ce5e9a0a279da61a78542b1405115f229beb8537d66794fc3d03d29782c30fc746a778c9cb7057eeda65cde94c6484c017f46d54cb7b5a8a3e SHA512 064012118af772a241eb53d55bae054fcc927d31b3b004b8359d9dd55e3a38da893728947cdba982b39b5e6b7717c705eb89cdb4f61a8858383787488948269e
 EBUILD python-slip-0.6.5.ebuild 1219 BLAKE2B 717994a011b6f496749131fb8cab3af553de7f33b61ad9ba85588b2d093aa16dd090d668a0250d10a55c839ebb5af4c7268e755a59d6cb45c02e37b47454b1a5 SHA512 8a74e30721166034494235462ead53b82788f7975c3cc8cc7d87002f85babd5de31480877a40459d672f92b6066cf1f15a203985649d84d9723f6cd64045d598
 MISC metadata.xml 277 BLAKE2B fdd3d0858258cd42bb21a1759e210802c20d42422a6b527e43f7c2488162ecc74b31a8098018999b986f23fefa9ce8752f59bce9dbd1becc6044e5a5b999c2cf SHA512 a7f1ef17d50370f30622f5a9f9a3d69623214ce9e1eb76fb9d59fcd8e016a2dfa18e6141ee130e7e1c6dab517d274ae8d252638a27320e356d4f7267d09587db
diff --git a/dev-python/python-slip/python-slip-0.6.5-r1.ebuild b/dev-python/python-slip/python-slip-0.6.5-r1.ebuild
new file mode 100644
index 000000000000..d1ccb54c86e0
--- /dev/null
+++ b/dev-python/python-slip/python-slip-0.6.5-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Miscellaneous convenience, extension and workaround code for Python"
+HOMEPAGE="https://github.com/nphilipp/python-slip"
+SRC_URI="https://github.com/nphilipp/${PN}/releases/download/${P}/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="dbus selinux"
+
+RDEPEND="
+	dbus? (
+		dev-python/dbus-python[${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		sys-auth/polkit
+	)
+"
+
+python_prepare_all() {
+	use selinux || eapply -p1 "${FILESDIR}"/${PN}-0.6.5-no-selinux.patch
+
+	# Disable gtk interface since it's gtk-2.
+	sed \
+		-e 's|sys.version_info.major == 2|False|' \
+		-e "s:@VERSION@:${PV}:" setup.py.in > setup.py || die
+
+	# Enable / disable dbus support by user choice.
+	if ! use dbus; then
+		sed -e '/name="slip.dbus"/ s/\(.*\)/if 0:\n    \1/' \
+			-i setup.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-slugify/Manifest b/dev-python/python-slugify/Manifest
index e59de635b82b..d84c25b98be1 100644
--- a/dev-python/python-slugify/Manifest
+++ b/dev-python/python-slugify/Manifest
@@ -1,5 +1,5 @@
 DIST python-slugify-1.2.6.tar.gz 8439 BLAKE2B 74699bf80408e1b6a705525b0ada2612cc6224a2ac1e17ce21230ed684af144c0f72ad99b32674bf19bd716d2cfc3a2f0da6f74facc99acba16e3ebc1873f3f3 SHA512 ad45958d03892d8db75967b150f25509c05ab2a87d5ac4a2ed12fccccfe1f86d7db26c406c6de22ba759b77fe772cc0c00d0e517c71db085618f62094ddadfd2
 DIST python-slugify-4.0.1.tar.gz 11509 BLAKE2B b505c62c959dae3823db4441b8811ed98ec8afa0278325cb2715abb63a84b5de1506362699bc39216bbac4100ae265671f940dbbbdaf9164fd251bdaa7af462a SHA512 c1d99a9dc891c4cfa927e4d2bc5701f47b23b7882cce22350283a53c6ded18e1290196c3bb9838883c29c9cb3582e5e684edffd50dfbb4e9da9c2b821ea54bb5
 EBUILD python-slugify-1.2.6.ebuild 591 BLAKE2B 55ace80e2b6c0f3b22ef75356bdd0d0d885edfa30fbb2022fb0839fe42ec968cd4331a08d081fb81ca39c10b4a506c052893addda6963ba576e3e99eae6092f9 SHA512 0b6479877191bfb5513a86fe807fcd119970f88528a138c5cb0574008cc59e0f9265df5c873061023b1b8ecd1000b95aa338c3a13dbbe6ecbdcf34dfd2119933
-EBUILD python-slugify-4.0.1.ebuild 576 BLAKE2B 98246a6f6743bd45e561473ecbef6e09a3e6601cce8e1696fbd1a37bd9150b5616cd708636ff1ffb923894da69d484e4250a1948e290b8ea5f9ce8243e337e77 SHA512 3505d73ae79091d06cd3b6cf67c1f6762cb5d0c4d643ba84238e763e031490b47e5a4fec09d402c7fd28aa84031214b4ce099ca939fb04987859d5682eefc5c6
+EBUILD python-slugify-4.0.1.ebuild 583 BLAKE2B 8a24e14e645cdcc33b3939f59be05fbfa392e8c45f3f470faa2a4c4399ca744088929151b7879635a42cf33dbd488f7126bf4deb830773100676f1f92372ca7d SHA512 1a7b87916cda00f28d41751f6d306137d9a04ca78e300a0b3846bac7d8e07b50e794f84418240823d1d4dea78a77f9c22719ccfc3ba4a56690f9935d5378f70d
 MISC metadata.xml 582 BLAKE2B aec9e0c331eb3b395607d2de104195cf7c6bbd88f3546420844ddd30407fa78ecfb6eb207ea208d910ec280441aac8c578b94a5cff71adede454e04f55ae60b3 SHA512 95eaa04f1332aa04a3f20e6e6d0ab4f8f86a8532d35c3e8059732febac20c8157c017d66abd1fc70b75e1f069b9ac90aa6ce64851923bd8db9efb1c219ebcb1d
diff --git a/dev-python/python-slugify/python-slugify-4.0.1.ebuild b/dev-python/python-slugify/python-slugify-4.0.1.ebuild
index b769e7d80415..4463c603e80d 100644
--- a/dev-python/python-slugify/python-slugify-4.0.1.ebuild
+++ b/dev-python/python-slugify/python-slugify-4.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/un33k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-python/text-unidecode[${PYTHON_USEDEP}]"
diff --git a/dev-python/python-socks/Manifest b/dev-python/python-socks/Manifest
index e4f9a4e187e1..b42c7aeb427b 100644
--- a/dev-python/python-socks/Manifest
+++ b/dev-python/python-socks/Manifest
@@ -1,5 +1,7 @@
 DIST python-socks-1.1.2.gh.tar.gz 29948 BLAKE2B c110cd8d5d055aa30a63cdade10e7e67b0d6f0b1b17e76ff40bfb85563c90e026f0169a7e943d1391d75e20d7dd715ab070a6adf9e1e247eccf906d63c324e66 SHA512 c62259e86e7afeba7ee3ef5cdca104846352137e5d5bfa6f475e2ac38b21fe1766aee6a1fcb6b9f725576613ce3d92663fab3682516b96caa3948a05d89333a7
 DIST python-socks-1.2.0.gh.tar.gz 31969 BLAKE2B f967d8100513455533132e7bb276a8f15a8486656c04493cb803640951d2cedaa0b9229386322846ff8992cfd13cf04470b017a615f33392880a4285c9ecd041 SHA512 c5db92b22ef1edef3a22b7ce79975e66f379da2bd8e9a629a15dc2995dfaef3d99d93eaf768ef593b6a7571ad580397290274e319707f36a883a9bcad20434b1
+DIST python-socks-1.2.1.gh.tar.gz 32038 BLAKE2B 56f3c885095090f4b3441294977b4af142ace8d2814f5f9b965a68e129baf90a6385dbc7e78463aac2249f97c6d60f03c9ae8b1159e30fcdaaeba00c19831e7b SHA512 8ecc35c51096b1c0312895dcc1169b7f475709f5bdd81572257257cb6bdca00ebcbe9e6b211c66b26ec2dec4dd86051077b7b30279174585428dca0fa7098403
 EBUILD python-socks-1.1.2.ebuild 839 BLAKE2B 19b849cb60492be44f34c4129cf3b04c290ef8d953985de1c37a19d482b57f4576631877498bc498487be7b825ad4708ff960823094b26a950e774e1d8ace9ce SHA512 17ddef9d8a9ee4b989aa6b891edf4ff2049141577fe1b91fd67eac7091db7c53f6ce00108731c625b36b958c4f68f1e982b8928c06c524b007130ca5e89d33d7
 EBUILD python-socks-1.2.0.ebuild 841 BLAKE2B 89dac8cacdd10aac51f4f1ab086f6f27e5fc3ef2dff96088b5e524eb29bb382689054c76351dcc976ee5440715460ea12af857a3fc21d2abe5b63acc6827d438 SHA512 e23e457a7e29001779a33a2953e2f7f4f9ca9bd172de5a0f307ec0074a7e19f4e260cc0624b3829f2aca19934215c7db1b24953ee79cc569f8029d457801ab40
+EBUILD python-socks-1.2.1.ebuild 841 BLAKE2B 89dac8cacdd10aac51f4f1ab086f6f27e5fc3ef2dff96088b5e524eb29bb382689054c76351dcc976ee5440715460ea12af857a3fc21d2abe5b63acc6827d438 SHA512 e23e457a7e29001779a33a2953e2f7f4f9ca9bd172de5a0f307ec0074a7e19f4e260cc0624b3829f2aca19934215c7db1b24953ee79cc569f8029d457801ab40
 MISC metadata.xml 379 BLAKE2B 837cc3435249b88e94e6b35aeb9ff95ca1e88160f4f2352acfc353fdb0891e361d376f3278207e9bea3eca1742f634ae3dd165d9c48c3ba4a4c60df7137172a4 SHA512 9d81d94484e23f22cbeff22a0d8f19052b01c60713295d9d3aa40ecb250255dda4096588201fd0f30b2954ce81569e66de1ed0f88e6ea9545c0210259fefe3a0
diff --git a/dev-python/python-socks/python-socks-1.2.1.ebuild b/dev-python/python-socks/python-socks-1.2.1.ebuild
new file mode 100644
index 000000000000..e4a5b571d8c0
--- /dev/null
+++ b/dev-python/python-socks/python-socks-1.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9}  )
+inherit distutils-r1
+
+DESCRIPTION="SOCKS4, SOCKS5, HTTP tunneling functionality for Python"
+HOMEPAGE="
+	https://pypi.org/project/python-socks/
+	https://github.com/romis2012/python-socks/"
+SRC_URI="
+	https://github.com/romis2012/python-socks/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+# tests rely on connecting to Internet
+RESTRICT="test"
+
+# trio, curio are not packaged
+# asyncio is the only backend we have, so dep on its deps unconditionally
+RDEPEND="dev-python/async_timeout[${PYTHON_USEDEP}]"
+#BDEPEND="
+#	test? (
+#		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+#		dev-python/yarl[${PYTHON_USEDEP}]
+#	)"
+
+#distutils_enable_tests pytest
diff --git a/dev-python/python_orocos_kdl/Manifest b/dev-python/python_orocos_kdl/Manifest
index fe1afe2f996a..d2e8cd051143 100644
--- a/dev-python/python_orocos_kdl/Manifest
+++ b/dev-python/python_orocos_kdl/Manifest
@@ -1,5 +1,5 @@
 AUX 0001-Declare-assignment-operator-private-for-SIP-Closes-2.patch 4179 BLAKE2B 376165750100ca16cc1ce21825b4ada44f90847f0b126d1fb96e9afa8279f3629e89470a2fdec0a12a1a855896aedacdbea64b799f7e929da3fa0bbe3b076630 SHA512 5300db08820cce2584da4a4f5e45ffd7d047d5dd0e5cb9bada7e967bb894e07d86760241db437b16973d1ea47d80bd94bcddd1be2435886b1767a0f19384350c
 DIST orocos_kinematics_dynamics-1.4.0.tar.gz 215004 BLAKE2B 02ca44195af2ae2bd5c2293869893c56846501e2055ca1cacef602ffdd44824fc618ed528d351ee2212b7c087ff5e69438ab87e9fb8813d8a4eb4c143fdbfd27 SHA512 7156465e2aff02f472933617512069355836a03a02d4587cfe03c1b1d667a9762a4e3ed6e055b2a44f1fce1b6746179203c7204389626a7b458dcab1b28930d8
-EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1410 BLAKE2B d02bc6836dd0082bd94651b785a8c6155a2253c7f1ebe82105e0eaf5cfc5b5cbde62261eb728b96bde922d336a565926b0fd137f5a226f2fa1e660868067c61f SHA512 572559db0a1d9b04720293f1f880f4bfb0d7f56dfe049bab5ecf4ea566c4dbeac603c55e3b0b4ff84fddb20c8b504e44bd1773f8eb91e407bd9b8581407dc0ca
-EBUILD python_orocos_kdl-9999.ebuild 1320 BLAKE2B 8e3e805424499d53a4c9d3138fa587a9c6bf6604fe6b0cbe24fc52c70da476139d8caee7f021c6c838f112693e8da9567f5455cfba449813c525c89dba2b404e SHA512 7a062bcc36ddb73bfbc7baec8d6dc2515afc50817ec59fd87dcdd1c821b4f57c70b31539c89cecc31a1ae65831d07ba8fbe7cd9ab58683095a616ccf66e61d9e
+EBUILD python_orocos_kdl-1.4.0-r1.ebuild 1397 BLAKE2B d181128610ce714c397c1ed60ba808a7bbf181decedbe54a877e173ae22f6cdf32faea4c1a035cc085a135affef643eec8669d7c82ec1b20417c74a8458e2321 SHA512 5e034ea4bec9a6054151260d03a53a0922ca476f305162b6323481a31b1dade2605bd51371d0c40ef8ada455d13f52f66d1876521840aef827d06fd2507b2805
+EBUILD python_orocos_kdl-9999.ebuild 1307 BLAKE2B 7946e3f4970c307fe956b84127b8556d9a6b5a8cccbd6c31ca50fdd9666569fd51db2b173e3ab11cfcc2b17842f49bcc2ae95e7056c5edea226310b362d4ae71 SHA512 04e603716b6ce2916107162719cabcb31d106571216ed170d56083557e7f8e0af2a40b92bc67c785e9d030b6a1ca763f47dde4bbd1a353b3de5d9fd8ce4711b2
 MISC metadata.xml 347 BLAKE2B f798f437c41d07bbcf1918138506db38727087f9437d0abb5082bde5802cc5f7a29173d788fb8b8b8f6c150f5f1c642795dbde30e848512e6d1f9ada39a951d9 SHA512 a32a6de7eece8df29d9542f14dccacb7d046e7205af6bd996d41279175111c9416cddf78cc8a87e2319cc1b25bf880b38e8d2d0573ba6747820a5c328d809074
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
index e369ad493570..92cb225cbcd8 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-1.4.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,6 @@ fi
 inherit ${SCM} python-r1 cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
index 6e29d89ba24e..414f23421153 100644
--- a/dev-python/python_orocos_kdl/python_orocos_kdl-9999.ebuild
+++ b/dev-python/python_orocos_kdl/python_orocos_kdl-9999.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
@@ -13,7 +13,6 @@ fi
 inherit ${SCM} python-r1 cmake
 
 if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
 	SRC_URI=""
 else
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-python/pythondialog/Manifest b/dev-python/pythondialog/Manifest
index 33e128a9189e..d6e25197d9e0 100644
--- a/dev-python/pythondialog/Manifest
+++ b/dev-python/pythondialog/Manifest
@@ -1,3 +1,3 @@
 DIST python3-pythondialog-3.5.1.tar.bz2 1418034 BLAKE2B 28dbb76a213d702abd6fb4571ddd28acea0bd9757424e99432aa58c1336fce2aa9b248e4de0631fe34c7ac52b928c8b3dc65afc42a826cc268ca4247be4dafb8 SHA512 f032e425ce1ebac53ade1401e48625b5869497367f788831d08fd22eb3b3b14fa5aebd26fd3681b47222ef0247ebb5c1ead127f111ca296197e258650dd675ad
-EBUILD pythondialog-3.5.1.ebuild 731 BLAKE2B 8467e68f46f9753f5ab5a5702771c1dfd31a83e358a144c551fa98e187a2eee7e18fa96a7ffacb5fb03a0f34c784839bbc3a2d1ff2b041812e18b3755025ad81 SHA512 c71c4eb96ddbc1d90d28b1c0499a5f10aaf5980a203a56492805635a733bae15e64e7fa4652a04efeb6dcf47039aa3708245dda985174be38f49fff580854cde
+EBUILD pythondialog-3.5.1.ebuild 732 BLAKE2B 8b7bbf72082e9d2f771e5bad198e36200dcd7304e68acbdaaaba13b029703b48e24e4ecbf7f67a2c49286b93d543686f9aeac630679cc5c1b5a41948a1a56e52 SHA512 e98bc26387aacf553f07319696a93db711e146671c062bfd28478c1d32fd7860cb691f609ec19a26cca00a9ec42096885be7741c2d515667fc943f69b53c2f02
 MISC metadata.xml 476 BLAKE2B 7b503ba47b66c7d0429557590fd070e977e0ffa1bd9b5a25f29d396996ef7efeb0343cd6ffb5324b52c22f7fdf607824ef1f15dbb90cde51fed66160cfa5c7e4 SHA512 0797cb8228d91a59931a9b36151bed33e8a01dba279b503d5d76e70b2674a2ec7dc0ab04f1aacc4f5c4571ea397efff8c087e701e0e6304608c1193de0c1102f
diff --git a/dev-python/pythondialog/pythondialog-3.5.1.ebuild b/dev-python/pythondialog/pythondialog-3.5.1.ebuild
index 795589a29487..e0351dc83d4a 100644
--- a/dev-python/pythondialog/pythondialog-3.5.1.ebuild
+++ b/dev-python/pythondialog/pythondialog-3.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytzdata/Manifest b/dev-python/pytzdata/Manifest
index 2a9f43eafe23..6bb07f6d7892 100644
--- a/dev-python/pytzdata/Manifest
+++ b/dev-python/pytzdata/Manifest
@@ -1,3 +1,3 @@
 DIST pytzdata-2020.1.tar.gz 249045 BLAKE2B 6f07a7577edc87030fd70e720b32146e9044a8c6f74d0bafb9239ad666d0d6fd0ac7c3cca070914701af301b1a3368ace2985f8169b9747937fa6ed066be7302 SHA512 fd154bfbe90ce07a90f769063b772234036d2627c1e6d78a465d9ddbc894e50cb9d821c04ebff1a7cc6a327266f7843fe54e5592d37c41db023329d6e0f668c2
-EBUILD pytzdata-2020.1.ebuild 532 BLAKE2B dc1311fefbac7021b48c9ebd8efc2be7c5880e8f67ec3064b5289635f62e9a0f9f710e77f1300554f01e636119e2c8cd88b5cb4c564410a1c6bc3342b8cff561 SHA512 190fafaec1465a9ced829351f44b9437010d24d2b3db3c7d6c959e83635206391a7914b2f65a9da2afcabeb9388a25aacd4eaaa62798201ec9e76a6b62df9581
+EBUILD pytzdata-2020.1.ebuild 531 BLAKE2B 96729bc715f02f3efbdedf86950544c41ee8c7262851fc8974ddf59c40de414382ac6cf5080c6a933d954d3c0eff1cbef63a98c2cddb52631db923248ea14fca SHA512 3ef3a8816901ddd622d189562cbe0a785c90bed49307a00ae1ad46fb74f2af8eaf23f75cbada3cbbd7789f953d66fb90531f78f43fcdb135733150d094b2af86
 MISC metadata.xml 515 BLAKE2B 3514d09f0f24cb33bbe944fd19d916d46552b113daf2bfd8314dbb19b549e14f5676c69d67c59252c67a86240b24245cb062866c94190e0404329189462eb967 SHA512 406625b6aeab7f473b4b38e31046040af0bf170e806ffb475728f9124788339e9a0350cd586e2a6ef055e0cdb937289c602ee2935fc1d5c40576270a791a2313
diff --git a/dev-python/pytzdata/pytzdata-2020.1.ebuild b/dev-python/pytzdata/pytzdata-2020.1.ebuild
index 6cca9887a9cd..671a5ac195f8 100644
--- a/dev-python/pytzdata/pytzdata-2020.1.ebuild
+++ b/dev-python/pytzdata/pytzdata-2020.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/sdispater/pytzdata/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 
 RDEPEND="dev-python/cleo[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/repoze-sphinx-autointerface/Manifest b/dev-python/repoze-sphinx-autointerface/Manifest
index 0c23168a581f..a54a1dc0e58c 100644
--- a/dev-python/repoze-sphinx-autointerface/Manifest
+++ b/dev-python/repoze-sphinx-autointerface/Manifest
@@ -1,3 +1,3 @@
 DIST repoze.sphinx.autointerface-0.8.tar.gz 8987 BLAKE2B aeeaf23f18394eae8ff817e7f4838a332d34e3c7717a67bf123c02a6bd7b6122d727a0120922b0471d6d6d7a1b2312058373a2498150b36446edc049a178773d SHA512 40aa3401a5f542329dbce6b8b27fad0b94d3077ac9a0e01cf2f1f43da5bcb9202eb76eaaa8b1b81edf51a391ebe32eefde59afab1673d86b412995185a4866f3
-EBUILD repoze-sphinx-autointerface-0.8.ebuild 931 BLAKE2B afda4e801b7405c56608916070a283a7d753cf5fb31c43700f82cc8beb946d98ade7576d5dd97f1b297aa4a1fecc37d3c3faa5018a23b15a21121e0193affe3c SHA512 e4031bc84704ac988f28221b051b014b80e2b76bd98e62237c10414e3894b643c6eadbf7f730fda6c647a61ff9e271d4a78dd1712cb97c9f99462bb8385c36b6
+EBUILD repoze-sphinx-autointerface-0.8.ebuild 967 BLAKE2B 2b5a24455a20fe7dbf56e585a239bb138c982c972fdcdb244c306cfa1b874e3b22799d257ce3992bffdab5664acabdf26e8daef98c273e59768da99d8d3897fb SHA512 a0b7539da1b251f249613aa28a9bd11cfc0c3c7e0b9c27468d5cbf57245d9260e3ee0dbf2e8f84e4791af3eb8d537c33084c927e0199932adeafc83c8ae0e73d
 MISC metadata.xml 335 BLAKE2B 6935bfb58617ad78e5f0aaf3febaf7a629c0470cc667685662f3434a34c40568f63f89cb49e6802753475a665ab13caa56e6d726fa5a34f070ed409bb403841c SHA512 689a11f848984c58defc523d400a834c228adab649c1f0d197752696bb73a5962053c55b3938bbdaca94da6a063d7dfa853898c0d51222d5cddd3911809bc3cf
diff --git a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild
index 1cb27d2d9c8f..a8135be13fff 100644
--- a/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild
+++ b/dev-python/repoze-sphinx-autointerface/repoze-sphinx-autointerface-0.8.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index 8cb72c538dff..b82c7939aa22 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,5 +1,5 @@
 AUX yaml.patch 10168 BLAKE2B bd9bbcc2d5cb1fbc99ccc6f61e72057efa75882eb18d5bd676c4c2e3a46395d406d212e6526e89f31ed95412f370ef79cc8934671b0496114776ee325b340dbc SHA512 2777345d1008698092a76c8d6783b372627c0e872895c1d4b0536816fbf12fb8719d3f3c48251ede194646076c4cacfb50ded3d73b360ae2b1c7a7f0b09e5905
 DIST rosdistro-0.8.3.tar.gz 61665 BLAKE2B 2d5084409d8222cd277a710a06616fa914a35fb6750e32df7bdee6b7b0285df1b15648b8255cda4aa5867dba3611c5ea294db4711ebf2cc38a11648092623aab SHA512 19e248497b4001c522a84a52d768bc9f20a08020c88574d1a8345cf2173dc2aadd8a1480d4fddf2285ac579ee69dd0b6d4b930333cd6a9cbe32708efed2e5747
-EBUILD rosdistro-0.8.3.ebuild 1217 BLAKE2B fc3320b4324d30b2119a2bb525532d76de82a1754fb83ca5450d5d676c01ee9aa5d5e4eef79fdccb9c6cdf6e8713416feb98e8aaa274c5489683cb8a51a75003 SHA512 0d60fcbe928d054ac6d7f4321f9246f9e8a9a12d456c960ddcedbe7871aa74745b580164c77906ab4855ea6556001a66c347d2f98adc6f5283e5d5af1af21566
-EBUILD rosdistro-9999.ebuild 1217 BLAKE2B fc3320b4324d30b2119a2bb525532d76de82a1754fb83ca5450d5d676c01ee9aa5d5e4eef79fdccb9c6cdf6e8713416feb98e8aaa274c5489683cb8a51a75003 SHA512 0d60fcbe928d054ac6d7f4321f9246f9e8a9a12d456c960ddcedbe7871aa74745b580164c77906ab4855ea6556001a66c347d2f98adc6f5283e5d5af1af21566
+EBUILD rosdistro-0.8.3.ebuild 1204 BLAKE2B cbcce7112510d71d96b98fe1c785b10cf3901ae7c188aae2989f0786b8937e77e7e8f7f913413e260ceb10c023cc363d5facac01557e2afcaadafaa58042e8fa SHA512 ceec0d96013bfc495e388bf454f8f5a73f3a4d406c8c5881e071eb3f75ce95fc180e8608feda24d5b25d4c33969ae97416b06e361296ad62f64c4e1eea0aaee8
+EBUILD rosdistro-9999.ebuild 1204 BLAKE2B cbcce7112510d71d96b98fe1c785b10cf3901ae7c188aae2989f0786b8937e77e7e8f7f913413e260ceb10c023cc363d5facac01557e2afcaadafaa58042e8fa SHA512 ceec0d96013bfc495e388bf454f8f5a73f3a4d406c8c5881e071eb3f75ce95fc180e8608feda24d5b25d4c33969ae97416b06e361296ad62f64c4e1eea0aaee8
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.8.3.ebuild b/dev-python/rosdistro/rosdistro-0.8.3.ebuild
index 8fbad4fa85b4..8bd21ec57713 100644
--- a/dev-python/rosdistro/rosdistro-0.8.3.ebuild
+++ b/dev-python/rosdistro/rosdistro-0.8.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
@@ -17,7 +17,6 @@ DESCRIPTION="Tools to work with catkinized rosdistro files"
 HOMEPAGE="https://wiki.ros.org/rosdistro"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index 8fbad4fa85b4..8bd21ec57713 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.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
@@ -17,7 +17,6 @@ DESCRIPTION="Tools to work with catkinized rosdistro files"
 HOMEPAGE="https://wiki.ros.org/rosdistro"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
diff --git a/dev-python/rospkg/Manifest b/dev-python/rospkg/Manifest
index 14827aeb3473..bf907a9be43b 100644
--- a/dev-python/rospkg/Manifest
+++ b/dev-python/rospkg/Manifest
@@ -1,6 +1,6 @@
 AUX gentoo.patch 662 BLAKE2B 06e1c4af66a5d1ca1e51f8d99a1cf4e62042da3d41f38b34143f7af2ec7ae4bd4516f2b57e863ec6b80d921e2ab6a920ba581dccc6615da480c237e410f4cea2 SHA512 7525f4e8809b6002000b22d6f5def37054a1bceb3d581fe01bcedd7e21dc757dd04d229e9550bfe1d2248c5804856cd9869149bea9a9ec5423e1a596c0f56153
 AUX yaml_load.patch 2300 BLAKE2B 3d24162a4c2501d7ae431b602244d102e0e26894304c868fafee8bf72a7ebea867280f2a5985b5b9139ba6d0b42379fec598212e7db73067a426c28bd9ae3a98 SHA512 60968ec2250ec450b461ef4c196561fdeedfe5fc28d7af6b6a1971b0e5794d3a028c227b8609d3c541902a3fc498194b33ad2f8698115cc1b3eb99c955ca70ff
 DIST rospkg-1.2.8.tar.gz 91042 BLAKE2B 4c4640d45a06214240a80d2ea15a09799eb892755c7c4410761e2a3505115ee1914a542886385bcd6996ead46e46a3e4d22bf79ffc38a0d2d8f2c7ac295eb0bb SHA512 c4f0c1992597aadf395effd4e6db65c20bf19501a19c569de57a2b9977d9ba794c3c68ba16b2b274ec865caffe6ec98b8fc0e88ad13ea3a9bc744e9ab6adb3a6
-EBUILD rospkg-1.2.8-r1.ebuild 1271 BLAKE2B d1f73d4b828be66b551604af896935ead7f1e386418ebbf14fadab57e6630cfe252d3fc3ce4b32ba9f7857785ea08722571ae91e0a65b5c35340680d10122c4e SHA512 ba76e6174a056fc4e2574bc0e79c1c0cdbf614106582a15be69b4d4f4561185cced019d952e1f25d5d5404098ffab742d0cef222da0e1522e128183bcc1271bb
-EBUILD rospkg-9999.ebuild 1271 BLAKE2B d1f73d4b828be66b551604af896935ead7f1e386418ebbf14fadab57e6630cfe252d3fc3ce4b32ba9f7857785ea08722571ae91e0a65b5c35340680d10122c4e SHA512 ba76e6174a056fc4e2574bc0e79c1c0cdbf614106582a15be69b4d4f4561185cced019d952e1f25d5d5404098ffab742d0cef222da0e1522e128183bcc1271bb
+EBUILD rospkg-1.2.8-r1.ebuild 1258 BLAKE2B 6fb0bc582e73293a7b1e54e5babd735ff20f6e6cd88cce1720e9b165c3c676f16e20e8033d46577c8b8117d2c284ef08aa8629c05ff9ba545ae42409bf69dd27 SHA512 4de3342e7ebea7e7210e040763a4c64aa2c241483740f3615de57b81046923b5dd8c86960d10d2e50161e2dd80e817278208297c0f6cb0e79d97d27345d3c0b8
+EBUILD rospkg-9999.ebuild 1258 BLAKE2B 6fb0bc582e73293a7b1e54e5babd735ff20f6e6cd88cce1720e9b165c3c676f16e20e8033d46577c8b8117d2c284ef08aa8629c05ff9ba545ae42409bf69dd27 SHA512 4de3342e7ebea7e7210e040763a4c64aa2c241483740f3615de57b81046923b5dd8c86960d10d2e50161e2dd80e817278208297c0f6cb0e79d97d27345d3c0b8
 MISC metadata.xml 339 BLAKE2B b73b43910983a77b06481850b398f006e6e535382c5fde12e8b86d43151b840e309bb2c6b0cd83899c3a9b8fcfd1c44fe6f1e5c53008e62b5653fda7cbfb12db SHA512 c9e10c6eecb919a284258e818a9830f6ba2afe095a9f4c565bf086855d5bbb26bf6973455c62a38ab4e20eb88da1f3d44b97597b197ca30227a7e7438a84d8a7
diff --git a/dev-python/rospkg/rospkg-1.2.8-r1.ebuild b/dev-python/rospkg/rospkg-1.2.8-r1.ebuild
index 4f6e2b2c3942..9a43e2fb6d1e 100644
--- a/dev-python/rospkg/rospkg-1.2.8-r1.ebuild
+++ b/dev-python/rospkg/rospkg-1.2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,6 @@ DESCRIPTION="Standalone Python library for the ROS package system"
 HOMEPAGE="https://wiki.ros.org/rospkg"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 	# Needed for tests
 	S="${WORKDIR}/${PN}"
 	EGIT_CHECKOUT_DIR="${S}"
diff --git a/dev-python/rospkg/rospkg-9999.ebuild b/dev-python/rospkg/rospkg-9999.ebuild
index 4f6e2b2c3942..9a43e2fb6d1e 100644
--- a/dev-python/rospkg/rospkg-9999.ebuild
+++ b/dev-python/rospkg/rospkg-9999.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
@@ -17,7 +17,6 @@ DESCRIPTION="Standalone Python library for the ROS package system"
 HOMEPAGE="https://wiki.ros.org/rospkg"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 	# Needed for tests
 	S="${WORKDIR}/${PN}"
 	EGIT_CHECKOUT_DIR="${S}"
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index a78f1c921444..90c12c2af627 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,3 +1,5 @@
+DIST python-rsa-version-4.7.1.gh.tar.gz 65085 BLAKE2B e63200a7861f13177d042ae92dbb9f8eb4ba3c30174e21b12cb4d84d9a39d3cbb59d6dacec5d4e3d2375ca100bf48c12dabff3f90011f3a3c795ece9e863893f SHA512 f06eee5d6e72c11cdf68ee756ffef7fd9d002ee93939158593ee6d0b5cf1abbfad31c50f6cfd4676d9f64247faee6019d8b214d22324706c82d07068f55ebd94
 DIST python-rsa-version-4.7.gh.tar.gz 64870 BLAKE2B 1e8c8c1a2c4261fdfacf5c83a76b0828dd2fabd26c0a76c0d39e7043a3005058e74a50c1d8f6ed705f5a47ab5d7c077587061ff097cad87424a2e82a8b478b3f SHA512 a88c8f04860e8babe762eb70e6096c55fbb4bbde43525564ecc719f5e6c56fdb65fa7b82a907c6de529a8effea26b1f6f8ffa3440dab99bff97664f7ce5fe31a
+EBUILD rsa-4.7.1.ebuild 780 BLAKE2B d9c370fb59e4964b639a33d60a4f28e47d3854e74ab202195c8dd1591604a08721e5171dc925cb6cbb3a2c440b08cbfae0a7ba4d5502fa798ac19e5dfe7fc11f SHA512 e0201c9e469df1024c5b4268e93e42e3d04496f0d57831a65810c03304819029114ded6a56310c7427aa6ae01627635002a373654ab2ca9bc7d79b613de5cab9
 EBUILD rsa-4.7.ebuild 774 BLAKE2B a80b2c99b3cd93077b792a7872e459bdef913cd10c2d94634b18a90f6b8ef2311c174fdd632a3e7d19cf62308999c71a3fb5e2c4774b28919e0d0fbeacc56951 SHA512 5942870ffbc0bd0b3c63135c7b1d98e8999bb93f0ba76b6be5eabce4a690494fb0f5535f1043e12a04e28a7f239defdd490335154bbcd5e8dbeb8048580516e0
 MISC metadata.xml 341 BLAKE2B 0175c0ce5e0939f8f3645c278fe6a8b5fc9f31c68e9b2aa312792a411005cbb23e5715c6806be3345731d37c438c5ad44472647616eaaac6ec53eb84aec9f66a SHA512 2100e90d14980a2b492c3e940e2cf2298e5933be99eb2bacae8980862c0a468a006749cd69fa7597c642ee90c091dabae9752b1cea0d46cb554f4e2c6251b91d
diff --git a/dev-python/rsa/rsa-4.7.1.ebuild b/dev-python/rsa/rsa-4.7.1.ebuild
new file mode 100644
index 000000000000..32aff8b85fb7
--- /dev/null
+++ b/dev-python/rsa/rsa-4.7.1.ebuild
@@ -0,0 +1,37 @@
+# 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
+
+MY_P=python-rsa-version-${PV}
+DESCRIPTION="Pure-Python RSA implementation"
+HOMEPAGE="
+	https://stuvel.eu/rsa/
+	https://pypi.org/project/rsa/"
+SRC_URI="
+	https://github.com/sybrenstuvel/python-rsa/archive/version-${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.1.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	rm tests/test_mypy.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index 4c514b203a9f..b32e00c7d567 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,5 +1,7 @@
 DIST sentry-sdk-0.19.5.tar.gz 206164 BLAKE2B 9d7ce2a64fcb511c659188dc18bc4af18052c0f12ff5d31848f341ef20cbc6c9cf1102d17e6e8d8b741eb8000f94978f840f3ec66b43367820e0ccce97b1fd1b SHA512 082ace137656e8cc8317e70cf4fe9823ccf8cc3ed7b54af059990cede72179924a36896a31a806de4adbbf3bd66e54d5385eb630c047b929583e32c39ed69d61
 DIST sentry-sdk-0.20.1.tar.gz 210762 BLAKE2B 64ff322667374c914aa00a80ffa5eca2d92ec0965bc6bf7bdc65cf89e75a3cd5f5db32cd7e442caae515348b1f7948209e9810729f4fbc913730337f06444b73 SHA512 cd7871bd3da31340752477058fcf788401910a4e0b4ac38d53beafbedcdfe62b3216d6d2bcf2d1998e8c3e02886da76f6a8aa2809ba1e473421f96257890e75c
+DIST sentry-sdk-0.20.2.tar.gz 210799 BLAKE2B 7a7b4350b664ee6947fcba64aa07a4e9f8ec274de7433d64acce55d490ea91f97a19ab7116e7af3109f806c91261f50127c72627bca1bbf76c43ad4ac89455e2 SHA512 3fb2d4ae960c86582e778afb0fdf12f3ff9103a83fb12a6c920bd6fe1e210842d29d2cfba12c254199a491a5b42288df0c388b37a8709fdabc9e6e9687b178c1
 EBUILD sentry-sdk-0.19.5.ebuild 2791 BLAKE2B bf6037e1865b83df6d926a799773cbf003e1bec23ff601e7e255d75f62e19f9350f5e066fac70fea809d4dd4aaf8d952532124e6edb028a7ade52831a3de7b34 SHA512 75552b6a55fedf3d05e346345aa153b030fdf13cc6f09c0ad433ddf321a1a0d126735fbbaa2665dc6ea5cb11ac85ef7b083ea9159b3c3bfd782c353bf99be792
 EBUILD sentry-sdk-0.20.1.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
+EBUILD sentry-sdk-0.20.2.ebuild 2133 BLAKE2B 5c2979c4fc18fe1993c9a5e1890830cb86806a313f812791f1f7f63df460346815a06269063afa082bb2f9ae1a9d65e2e7511f64528a36b71c5c5a39691e1106 SHA512 2ae33557eca51f1c8c7afe1e85ddd740c439a8ba760704db2100557c2e0a83e3d90ac9db850b4b4a5c2e5b80104d33c0c0c185248c726a30c37191c9a42bb682
 MISC metadata.xml 446 BLAKE2B d115ce1b9a1d92cfeb93cd220c96247f1d6ae9514b0d598a0abc9fc6b17e45851a33e6f61b364f682f6530e4ac2611fd0a65b2fb5b21d394e78030f6ef34d1fa SHA512 f7167d56812496468a0766bf6e7d29b99e5efcef8cd61723ed7b09188b515b50fa13275d665f7ff8400b5b451e05ddcec403cc4c75e55509b21b849cafde0a3e
diff --git a/dev-python/sentry-sdk/sentry-sdk-0.20.2.ebuild b/dev-python/sentry-sdk/sentry-sdk-0.20.2.ebuild
new file mode 100644
index 000000000000..7b31e702fe53
--- /dev/null
+++ b/dev-python/sentry-sdk/sentry-sdk-0.20.2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python client for Sentry"
+HOMEPAGE="https://sentry.io/ https://pypi.org/project/sentry-sdk/"
+SRC_URI="https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/sentry-python-${PV}"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/asttokens[${PYTHON_USEDEP}]
+		dev-python/django[${PYTHON_USEDEP}]
+		dev-python/executing[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/fakeredis[${PYTHON_USEDEP}]
+		dev-python/flask-login[${PYTHON_USEDEP}]
+		dev-python/gevent[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pyrsistent[${PYTHON_USEDEP}]
+		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
+		dev-python/pytest-django[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# tests require Internet access
+		tests/integrations/stdlib/test_httplib.py
+		tests/integrations/requests/test_requests.py
+		# wtf is it supposed to do?!
+		tests/integrations/gcp/test_gcp.py
+		# hangs
+		'tests/test_transport.py::test_transport_works[eventlet'
+		# TODO
+		'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
+		tests/test_client.py::test_databag_depth_stripping
+		tests/test_client.py::test_databag_string_stripping
+		tests/test_client.py::test_databag_breadth_stripping
+		# test_circular_references: apparently fragile
+		'tests/integrations/threading/test_threading.py::test_circular_references'
+	)
+
+	# Prevent tests/integrations/modules/test_modules.py:test_basic failure
+	# Needs to detect sentry-sdk in the installed modules
+	distutils_install_for_testing
+
+	pytest -vv ${deselect[@]/#/--deselect } || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/setuptools_trial/Manifest b/dev-python/setuptools_trial/Manifest
index fd0c184a5197..2a0ee929f729 100644
--- a/dev-python/setuptools_trial/Manifest
+++ b/dev-python/setuptools_trial/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_trial-0.6.0.tar.gz 6227 BLAKE2B 2df7276197a5630b8140dce17528b75045ea86e15495146aceafc4428f6ab6493fbe8e2edfded30ae644523455df02f3cb85e8bf8879bd4fafc9a332d9f6bc40 SHA512 9104b98627f57ed53c90d22042346875c5324d7b30e1ec9ba1718b5c59a786915a8fe0a53789a5dbd9318a12b27122661234f5be403365261db6a8728ce39827
-EBUILD setuptools_trial-0.6.0-r1.ebuild 1278 BLAKE2B 4cd0c6b9a0e8daf7d7234fdeb8889dc8bc4f5456dd12aa50507c4a1963dbfb77957456644ef060fbc385d66dafb575bece54e209cb10a6e0ad1eef712794d2dc SHA512 8075043dfa5e341526f6971fce6639cb8756a27b8218261e3ba698a193a3dd0c1c55e3fbf66f96498007f6ef84bbc059978e121d0a14f0f7712c4e523cf5e127
+EBUILD setuptools_trial-0.6.0-r1.ebuild 1277 BLAKE2B e89ff61fb4222c2ca9df38dc8f53cf20f7183d5409ad3288bd2aca8d7441a161f36038bd7cae12d9778634652282d3962fa14418b3dd60692dae576cdfd1350f SHA512 231c297974aaf3840f33f5c63881f99729e8a7c56824dbc82f541fda9d3626e91b5fb4f7ab8014673981f9d254dc10148f90cef49ee3550002e760fbe2ef16be
 MISC metadata.xml 844 BLAKE2B aa1bcc13874420abbdec6f9ad64b6b408f30d30b880d9c57dbeda6a3e01d2427aa3fdf0123b4e15dbcbb0f2b974ad7e3cac9158030be1f5837b3327b878404c6 SHA512 85d7004cfbb15d2137bdaefd573f0fcc4e5b08c8e70a5ac3db3bb961842a62ee7451ccfd9615f3eac1fefd4845a25c7fae650b86f52e9bcf6c38054485ebb6fe
diff --git a/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild b/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
index 46665169315d..6c7422a9e713 100644
--- a/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
+++ b/dev-python/setuptools_trial/setuptools_trial-0.6.0-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
 inherit distutils-r1
 
 DESCRIPTION="Setuptools plugin that makes unit tests execute with trial instead of pyunit"
diff --git a/dev-python/simplesoapy/Manifest b/dev-python/simplesoapy/Manifest
index dd4a3914336b..4786b666371b 100644
--- a/dev-python/simplesoapy/Manifest
+++ b/dev-python/simplesoapy/Manifest
@@ -1,4 +1,4 @@
 DIST simplesoapy-1.5.1.tar.gz 6129 BLAKE2B 766369677208a1cd58939e917fa16a30c87340fb6b76c5667913431625b89a8e97684ad4ba0af14fb4043ba42b2cec7f2b84eb968f128c3c3fc0e178c610cda5 SHA512 5ef0a4fcd84e1da9207154d4b8c4679e8aa2c9885ca76eacb17c4fbd39f489be459f52bfd42ee9b369790c33a02ecc5d776735cf1665f3ee034c1e315fdbb818
-EBUILD simplesoapy-1.5.1-r1.ebuild 716 BLAKE2B 6c130b91a4e306b03533ef251335c51e920333a5e5a4641bcadf04f9dec6612237cdc00ea8b54552d0cfe031d3b26a6e19665485b409682d044aaff135fdae2c SHA512 6ce24140f9e987bbaad63b104af70adc11d72d08e9383a0b1d70194337d266e293fe64582a961d8239fdf5abb9fac9b8edcf0b21ca16134224bed3c39f5eebf0
-EBUILD simplesoapy-9999.ebuild 716 BLAKE2B 6c130b91a4e306b03533ef251335c51e920333a5e5a4641bcadf04f9dec6612237cdc00ea8b54552d0cfe031d3b26a6e19665485b409682d044aaff135fdae2c SHA512 6ce24140f9e987bbaad63b104af70adc11d72d08e9383a0b1d70194337d266e293fe64582a961d8239fdf5abb9fac9b8edcf0b21ca16134224bed3c39f5eebf0
+EBUILD simplesoapy-1.5.1-r1.ebuild 703 BLAKE2B d86d6d76eff0e51e644e9d73925d895b30e98eb250960d1f48a995c1898af66e54082186c502a84e9a38fbb29296e12d5203c72823c7d110c97c0f62c280804d SHA512 8c9170615ddaaded78355f344439f211c21fd75ad29aa0a2023eb5358d3a4793ffb8060adb808c6aa2648de2b65f417166f8e4ff0369850d40098ba299e1a2b3
+EBUILD simplesoapy-9999.ebuild 703 BLAKE2B d86d6d76eff0e51e644e9d73925d895b30e98eb250960d1f48a995c1898af66e54082186c502a84e9a38fbb29296e12d5203c72823c7d110c97c0f62c280804d SHA512 8c9170615ddaaded78355f344439f211c21fd75ad29aa0a2023eb5358d3a4793ffb8060adb808c6aa2648de2b65f417166f8e4ff0369850d40098ba299e1a2b3
 MISC metadata.xml 478 BLAKE2B 0cecc26ce8c198fa695000689da1037f0ee4dd88779062516d9ad02ab77c95a3912f917f45b3a8162ee6518acc8f240a7e985a7767a5982d75b5d1063a4a2a0e SHA512 74fda923aa89882cbf136a0ebfb62d7ccba60c5b47eef0fa4bb340b50cc1bc2571975cb6fd6b0378891bb0bea9d54e56393887bebd19090802cc07f845156531
diff --git a/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild b/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
index 1c9f498ceafa..713b5ef9b8ed 100644
--- a/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
+++ b/dev-python/simplesoapy/simplesoapy-1.5.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,6 @@ LICENSE="MIT"
 SLOT="0"
 
 if [ "${PV}" = "9999" ]; then
-	KEYWORDS=""
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/xmikos/simplesoapy.git"
 else
diff --git a/dev-python/simplesoapy/simplesoapy-9999.ebuild b/dev-python/simplesoapy/simplesoapy-9999.ebuild
index 1c9f498ceafa..713b5ef9b8ed 100644
--- a/dev-python/simplesoapy/simplesoapy-9999.ebuild
+++ b/dev-python/simplesoapy/simplesoapy-9999.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
@@ -13,7 +13,6 @@ LICENSE="MIT"
 SLOT="0"
 
 if [ "${PV}" = "9999" ]; then
-	KEYWORDS=""
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/xmikos/simplesoapy.git"
 else
diff --git a/dev-python/simplespectral/Manifest b/dev-python/simplespectral/Manifest
index ce75cc3871e1..73234dc499b5 100644
--- a/dev-python/simplespectral/Manifest
+++ b/dev-python/simplespectral/Manifest
@@ -1,4 +1,4 @@
 DIST simplespectral-1.0.0.tar.gz 5750 BLAKE2B 04ee4c90f9cda35ade1d250162ab1bcc278ae82a4d7f9a22d1aee6a1eceac7819ce6aa19f52e024469c51e08c00dc5f19253ff2b85d9b668dafdcd7a18c78d6f SHA512 16da3cb19cd7c567b64709a26ed5def7eb3047b08e2cb48db6962036a6c3e34c122dadf71821b6a22df55ebcf3c2ff95e3af3898efc8b4a6d5902e48de8e050c
-EBUILD simplespectral-1.0.0.ebuild 781 BLAKE2B 3e73cd2b6a823573fe0a6ce8d1d283ec35f6202628f80384b87bd82d0cf0118947462e3beb5ddb6282b1074cf5cd9f01bb8b6a51e3cbfdb80fb01a2d6cef5970 SHA512 a89307c8832a9b92ce3a01c1bd5d9eb6020c83585f5f82bcddb21e61d01fb403f4640acf99e1aac8a26127d942ce1d91b4a03100f3d0b9b5b841221696a82779
-EBUILD simplespectral-9999.ebuild 781 BLAKE2B 3e73cd2b6a823573fe0a6ce8d1d283ec35f6202628f80384b87bd82d0cf0118947462e3beb5ddb6282b1074cf5cd9f01bb8b6a51e3cbfdb80fb01a2d6cef5970 SHA512 a89307c8832a9b92ce3a01c1bd5d9eb6020c83585f5f82bcddb21e61d01fb403f4640acf99e1aac8a26127d942ce1d91b4a03100f3d0b9b5b841221696a82779
+EBUILD simplespectral-1.0.0.ebuild 768 BLAKE2B 751be141145fba30c1838d25ef5f930a10d7a02793a095952872e067095571d8485134caed2bc306b5d7733973caf0710a6476720b72ac24662700ca80535bde SHA512 40090f8d08634debc3cae5f7ac54dc98434d546a5cb8db3a37f396f04b4eed162d1ce1df4da88718fd29a9be928163938a2d841db02dd79984e95cb127e2decb
+EBUILD simplespectral-9999.ebuild 768 BLAKE2B 751be141145fba30c1838d25ef5f930a10d7a02793a095952872e067095571d8485134caed2bc306b5d7733973caf0710a6476720b72ac24662700ca80535bde SHA512 40090f8d08634debc3cae5f7ac54dc98434d546a5cb8db3a37f396f04b4eed162d1ce1df4da88718fd29a9be928163938a2d841db02dd79984e95cb127e2decb
 MISC metadata.xml 674 BLAKE2B 47d56d60f75a2b3a62ea2e587058b1d2efcc720b80845c043809c6840d462351867e828af1e2b57743df16ed97ea3f09e9a75074d358b5dfa83a524ff65c1ed2 SHA512 571b6a2f40cca481a47e1ef4e2f19f694fcc0a50955a3076d36b35d0817be86a5afad51dc38c2423ea432be630d4bff37cfcdc712a1b75802cf0867f68fd59f1
diff --git a/dev-python/simplespectral/simplespectral-1.0.0.ebuild b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
index c7f4f6415763..91f967c28146 100644
--- a/dev-python/simplespectral/simplespectral-1.0.0.ebuild
+++ b/dev-python/simplespectral/simplespectral-1.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,6 @@ LICENSE="MIT"
 SLOT="0"
 
 if [ "${PV}" = "9999" ]; then
-	KEYWORDS=""
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/xmikos/simplespectral.git"
 else
diff --git a/dev-python/simplespectral/simplespectral-9999.ebuild b/dev-python/simplespectral/simplespectral-9999.ebuild
index c7f4f6415763..91f967c28146 100644
--- a/dev-python/simplespectral/simplespectral-9999.ebuild
+++ b/dev-python/simplespectral/simplespectral-9999.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
@@ -13,7 +13,6 @@ LICENSE="MIT"
 SLOT="0"
 
 if [ "${PV}" = "9999" ]; then
-	KEYWORDS=""
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/xmikos/simplespectral.git"
 else
diff --git a/dev-python/smartypants/Manifest b/dev-python/smartypants/Manifest
index 48fd960d09b6..9b69017d8d9b 100644
--- a/dev-python/smartypants/Manifest
+++ b/dev-python/smartypants/Manifest
@@ -1,4 +1,4 @@
 DIST smartypants-2.0.1.tar.gz 24152 BLAKE2B 258c9692eec675054dc31f760cf3a9fc3995683d7a15fc549fb390611761c0b09f73e077f5917f9f071a8fc1ae3f06e36f745fdc0e2c368f465e29f6ce51457f SHA512 d47a866a5478c3520251f87a93a468a5eea10318b24b2e8d4bc918d533b5a5789aa56d3a8d5fb8ccff9572fb63e5b6f2eafc44f93fb57a19e6621ebef5d64d9d
-EBUILD smartypants-2.0.1.ebuild 714 BLAKE2B e95ea051a890ccb6399c2c17e3d630e18c78016a49191a3fbcda9307b50bf258e4dd6c76b3be29058f68ed0e33bb4c2970b5a8bf8aa40f53e1de5e75b15d3353 SHA512 9e16084c9c78d3bd586bc49847ac4a19b6c5f7cb1735794aed61181a8935f148ab635b70c49e48bdcf349173eb960cf15be6b19b4e0cc7197d2ecd9dcbc949a2
-EBUILD smartypants-9999.ebuild 714 BLAKE2B e95ea051a890ccb6399c2c17e3d630e18c78016a49191a3fbcda9307b50bf258e4dd6c76b3be29058f68ed0e33bb4c2970b5a8bf8aa40f53e1de5e75b15d3353 SHA512 9e16084c9c78d3bd586bc49847ac4a19b6c5f7cb1735794aed61181a8935f148ab635b70c49e48bdcf349173eb960cf15be6b19b4e0cc7197d2ecd9dcbc949a2
+EBUILD smartypants-2.0.1.ebuild 701 BLAKE2B 7419fa0feacf804f1e5059fe0b34bb31539feb05a41a6cc95b80927ce7a92574ecd226cfae98cdaab6e5647feb1b61af296545d0125311d32f26aa1ad451366e SHA512 155996e0e7fbaf62ee3ec861f1834fb8add85a0432eeaafa96ae412e5b224db344c807b8bf8d769c98713888ffc56d3db7d887c3d7cb5e321e65d55f279fcf46
+EBUILD smartypants-9999.ebuild 701 BLAKE2B 7419fa0feacf804f1e5059fe0b34bb31539feb05a41a6cc95b80927ce7a92574ecd226cfae98cdaab6e5647feb1b61af296545d0125311d32f26aa1ad451366e SHA512 155996e0e7fbaf62ee3ec861f1834fb8add85a0432eeaafa96ae412e5b224db344c807b8bf8d769c98713888ffc56d3db7d887c3d7cb5e321e65d55f279fcf46
 MISC metadata.xml 577 BLAKE2B 61e86a5d1ecf56b59ce939d3716ce898e920eaa38a099092e04d69f59e5b10316e2dd4629c5ed976b2bbadb9aefded3df294a02247afe79cf7a062555613da97 SHA512 72792157cc48da82a0f0118c6b9b3d855e2b284b7913162dd0d2f58483471f6042125df8e443a3fea5b7b580be0a9c67c287e68b87b477145db0df2e764d61f6
diff --git a/dev-python/smartypants/smartypants-2.0.1.ebuild b/dev-python/smartypants/smartypants-2.0.1.ebuild
index 4edd324c0a6d..50a025c905af 100644
--- a/dev-python/smartypants/smartypants-2.0.1.ebuild
+++ b/dev-python/smartypants/smartypants-2.0.1.ebuild
@@ -18,7 +18,6 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/leohemsted/smartypants.py.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/leohemsted/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-python/smartypants/smartypants-9999.ebuild b/dev-python/smartypants/smartypants-9999.ebuild
index 4edd324c0a6d..50a025c905af 100644
--- a/dev-python/smartypants/smartypants-9999.ebuild
+++ b/dev-python/smartypants/smartypants-9999.ebuild
@@ -18,7 +18,6 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/leohemsted/smartypants.py.git"
 	EGIT_BRANCH="master"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/leohemsted/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index ea3f37188763..2e8ece7f5820 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -3,5 +3,5 @@ DIST smmap-3.0.5.tar.gz 23228 BLAKE2B ccc36c33e9239f69a41eff291dcde7e455a84d886c
 DIST smmap-4.0.0.tar.gz 22524 BLAKE2B 2edd07925d9511879cb816f1e80d5fe7920ef91635f085b8d0ca81fa8d46bf0a1dfce7eab6f70250b93602a5a10e8170045f0720cf9fe3b26911d4e8b419f4cf SHA512 fae59fd4e8ccc95cbc07be3ece208e862948c2b537850376b169acc15b9f0b1d94d412fde88647c245dda117dbbdab4db6426e1d95f3f9779bdd40c2d9c7d2cd
 EBUILD smmap-3.0.4.ebuild 464 BLAKE2B 1365d2bc343394833ec431b248c7825b35d519897d5421e56d11ddf986168dda0d4831b6ee601cc0319a77a4b78c80b3ef75c0453fcec5be615edab19255f0e3 SHA512 e09050dba6e2ee65ba4648d3e0df886494454f7b9368f98c3fd2176404442bcf2b66579af69a67216b3851eab0fea884c791b5484499330d9b4d0fc891c12fb8
 EBUILD smmap-3.0.5.ebuild 488 BLAKE2B d61c4e81a5b6c62cff35e69d16544d25a52cef44a35219439f9c2a5d86336f45df708da6f417d063092e187e81dd8cf998478456f877361a94baf85dbcd5fd83 SHA512 61b2e8c3d41e42f33bf3d9f9b3a05b886fb19cc2de068c22b6338c2bb494d9360b794c258c60002a3e7e261535044600342280b57d0b6efddce06072fe271fa2
-EBUILD smmap-4.0.0.ebuild 488 BLAKE2B d61c4e81a5b6c62cff35e69d16544d25a52cef44a35219439f9c2a5d86336f45df708da6f417d063092e187e81dd8cf998478456f877361a94baf85dbcd5fd83 SHA512 61b2e8c3d41e42f33bf3d9f9b3a05b886fb19cc2de068c22b6338c2bb494d9360b794c258c60002a3e7e261535044600342280b57d0b6efddce06072fe271fa2
+EBUILD smmap-4.0.0.ebuild 495 BLAKE2B 3df420392b994d505a0c10a5846b811da7c5ec4097e19115c6e88aa64db5a36d043cffd103ee04293f10f140f0e7cd7d7d0ad9df4bbfd6e691a8ff28ac6d396a SHA512 ed220f419964958f2eedc156502d6097d056657816b697f7f0eacc8de1ad302c47912197ecab047cd4c2dd488238129a83e5e79c3dfeb8d10bf49c25136a53b1
 MISC metadata.xml 411 BLAKE2B b6d13ec428eae8529a38571afc5c66e1c02f812667c0f27bc1db2d23a702d7d49ebe877087d2af0136eb4a34d6422c00cb132fe6e526c24646a742e167e16caa SHA512 8020f425757423d6be45a200bdd9ecd261a1f81fa148c16a08c343f8be83f558fb6bcd614d2579f8e82a139efaeecca568d8b65310613707fdfb3ea1367594c8
diff --git a/dev-python/smmap/smmap-4.0.0.ebuild b/dev-python/smmap/smmap-4.0.0.ebuild
index 64612c873ca5..d8eb6b81b2a1 100644
--- a/dev-python/smmap/smmap-4.0.0.ebuild
+++ b/dev-python/smmap/smmap-4.0.0.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 SLOT="0"
 
 distutils_enable_tests unittest
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index b5fca25fd0c9..9fd02d64cf49 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -3,8 +3,12 @@ DIST Sphinx-2.4.4.tar.gz 5966973 BLAKE2B 727a75eb4ec33beadf80b22cdd8dda02a53f4da
 DIST Sphinx-3.3.1.tar.gz 5979919 BLAKE2B 4eb9d8c9dccfd83690252ad6be05a3e69006e1e801bb0b37b77fb6ccf998f3a2fd99a90eba890cfb2baa5545ac0c2734fcd72d602fc2d1091e6754337f241b34 SHA512 bb1fb0780b741c0162ca014cb996dcdaac06985d14b6cc645a835679d7cf2680912784a815a027caf3fe902f721f9707bc9e9daaaf2c2d43051d31fe00584f78
 DIST Sphinx-3.4.2.tar.gz 5996867 BLAKE2B 4ab0989d521702a5e84148d12f57c2332d27519807de1aa33fff3a17813c8be0247e413c768cd3062c4c52372607cc6f5f16ca0a2ff46cbb8e73db4dd7270796 SHA512 7af39a6c40f54018cce59c2407af278bcbfbded305742918d053e75ae7bdc3a1ea8cc615fd554c9f9581c84723cf5f70ebed8916c54215c5024cf63e31dd3a0e
 DIST Sphinx-3.4.3.tar.gz 5997116 BLAKE2B 73a488564d5889bfc6d7f6f797aa3b144b03cf5f086a4543c3f4b2a452b353f4d799b80a14a0d4118e227660b7f9367fe8f3a2e91f6127cdca489cf4fad215f3 SHA512 2e085e00c722f3aaf34552eefc3842daf5443f7b8a11afa850db1e31ad81d5ff7f579622b91f982b21708fa6379907bac4fe72d42dc05859a3f62c75298facaa
+DIST Sphinx-3.5.0.tar.gz 5889244 BLAKE2B 7a6cf06264a62d6adbb79f80120e1182a37a73e3f600f30325a6c32d58423e4f7d02bf9d737c31c5ba7f91e23e6e19a59486c58ec0d4e31636ac39ffce6a46b0 SHA512 d0c146cf698b59b93e4867bb9930b08aa7ed877e892783c66d34362fa8e485cdc403811e5c94ad08c7b574c2b8d8e83df71f9856ef0d2e8057572224b8444ff7
+DIST Sphinx-3.5.1.tar.gz 5905170 BLAKE2B f374a65d66f404b2a7486c58a0e13e228e0de88985fed18cfa74e8219759af6afb1bb05cc10b6a8ed8ad7b413889b7282de7212010fe6d3bd30ce04fe9b59b9a SHA512 31a9253e30d5616c99161455fb61ab3b8298b5364d5eeb5c7b23466182913c99fea4cec14d088b6b64a530cbfb60d691ad093a6f6a0f9060f847f0b73d5e6b3f
 EBUILD sphinx-2.4.4.ebuild 3631 BLAKE2B 1153a2e470c385afbd09d90dafd01bc57c0b1293e51c51d855c67d68d0fcce9585c3d69610cd3976ae690957037989cb86debe98a19053bafded265f09e91c9b SHA512 f84e26e0fe019751e54bccb77e426b48fcd2d04a1e6cc96445f38f46fd626232fc5752640b85be7b1864e8f51fd6efbc6ff2da5d775c4746b66ae18d85d45695
 EBUILD sphinx-3.3.1-r1.ebuild 4856 BLAKE2B 821c677be44b40a5d55511afc8bab2b55375c864f0c9a7ea7cdc8c146bab6a5a12242faf87dd3e10f70bdff5fbb3e55c9a91790d38d1f0dc0e6cfd081008f649 SHA512 ec5c6a94affaa731714069be477e252ea6a463724657a2207c56366a34e231d3959e0d92155fc9729d2f22b89b79f362c0385e766922e8a7858142497fbed62b
 EBUILD sphinx-3.4.2-r1.ebuild 4237 BLAKE2B 6b8cc5723adfe35224d1a90ae8f8820a5713de10540bd1f62738327d2b5828d3870a9844aa22ec6c2ba01ef4d4548a02aae602c316546f497e90213e509e7f01 SHA512 200cdc2ee38b16fd070a349b91497b035c7f4b1d4c44d358a97be63351b1650463e0a221a477621a43b3188078841059cf502577faa48110d116087333a3ff1b
 EBUILD sphinx-3.4.3.ebuild 4237 BLAKE2B 6b8cc5723adfe35224d1a90ae8f8820a5713de10540bd1f62738327d2b5828d3870a9844aa22ec6c2ba01ef4d4548a02aae602c316546f497e90213e509e7f01 SHA512 200cdc2ee38b16fd070a349b91497b035c7f4b1d4c44d358a97be63351b1650463e0a221a477621a43b3188078841059cf502577faa48110d116087333a3ff1b
+EBUILD sphinx-3.5.0.ebuild 4190 BLAKE2B 41227a347dde3aa2d5df18933961aea6db9eb2b70bc2af441d4743fb39472b0b9a40a2c9a89c774da60f54130e0374362fabd6dbb4306fc29e160f111c24073f SHA512 5051c57468f7f180a2513ce7445f61cb3012a239bf3989c5e6323b42f7c2349e5d0029b5c0f36112bbc9632b479be15269d805df10571ff4b8c32be495870e11
+EBUILD sphinx-3.5.1.ebuild 4190 BLAKE2B 41227a347dde3aa2d5df18933961aea6db9eb2b70bc2af441d4743fb39472b0b9a40a2c9a89c774da60f54130e0374362fabd6dbb4306fc29e160f111c24073f SHA512 5051c57468f7f180a2513ce7445f61cb3012a239bf3989c5e6323b42f7c2349e5d0029b5c0f36112bbc9632b479be15269d805df10571ff4b8c32be495870e11
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/sphinx-3.5.0.ebuild b/dev-python/sphinx/sphinx-3.5.0.ebuild
new file mode 100644
index 000000000000..86421550c2b5
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.5.0.ebuild
@@ -0,0 +1,127 @@
+# 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} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		${RDEPEND}
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment_py36
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/sphinx/sphinx-3.5.1.ebuild b/dev-python/sphinx/sphinx-3.5.1.ebuild
new file mode 100644
index 000000000000..86421550c2b5
--- /dev/null
+++ b/dev-python/sphinx/sphinx-3.5.1.ebuild
@@ -0,0 +1,127 @@
+# 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} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="https://www.sphinx-doc.org/
+	https://github.com/sphinx-doc/sphinx"
+SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="doc latex test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/docutils-0.12[${PYTHON_USEDEP}]
+	dev-python/imagesize[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
+	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typed-ast[${PYTHON_USEDEP}]
+	' python3_{6,7})
+	latex? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+BDEPEND="
+	doc? (
+		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
+		media-gfx/graphviz
+	)
+	test? (
+		${RDEPEND}
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		virtual/imagemagick-tools[jpeg,png,svg]
+		dev-texlive/texlive-fontsextra
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-luatex
+		app-text/dvipng
+	)"
+
+S="${WORKDIR}/${P^}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
+)
+
+python_prepare_all() {
+	# disable internet access
+	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
+		doc/conf.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	pushd "${BUILD_DIR}"/lib >/dev/null || die
+	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
+	popd >/dev/null || die
+}
+
+python_compile_all() {
+	if use doc; then
+		esetup.py build_sphinx
+		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
+	fi
+}
+
+python_test() {
+	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
+	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
+
+	local deselect=(
+		# these tests require Internet access
+		tests/test_build_latex.py::test_latex_images
+		tests/test_build_linkcheck.py::test_defaults
+		tests/test_build_linkcheck.py::test_defaults_json
+		tests/test_build_linkcheck.py::test_anchors_ignored
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
+		tests/test_ext_autodoc.py::test_automethod_for_builtin
+		tests/test_ext_autodoc.py::test_partialfunction
+		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
+		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
+		tests/test_ext_autodoc.py::test_cython
+		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
+		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
+		tests/test_ext_autodoc_autofunction.py::test_builtin_function
+		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
+		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
+		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
+		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
+		tests/test_pycode_parser.py::test_annotated_assignment_py36
+	)
+
+	pytest -vv ${deselect[@]/#/--deselect } ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/svg-path/Manifest b/dev-python/svg-path/Manifest
index 3648ecc8df50..bfb0cbf1caa8 100644
--- a/dev-python/svg-path/Manifest
+++ b/dev-python/svg-path/Manifest
@@ -1,3 +1,5 @@
 DIST svg.path-4.0.2.tar.gz 18161 BLAKE2B bd5adbf059808b8197fbff0f12e274d98cc72ef840cd29e504bab1dd5fbcb5240aa3d6beb2cc3f6b91bcbdd9251fa29285de0ecd163c22d6cb8454102b911597 SHA512 0659c3d012b81cca83306c2895480bcc770cf23f4fc98dc4f167b6799a9c5618a90aabd81e2c91e6b7c57998d42f04a47d8f0fa966546111cd165127df239510
+DIST svg.path-4.1.tar.gz 18228 BLAKE2B 3b70a37336078f0c4fb9ae1754cf92df7be957ac632931e4151ea158b05e54a29b68b74b9c69694d3e79986c13095e357fa52a8cecff3d1ad5ab3e2ef7c13015 SHA512 fb302c65f85bd61d98baab9e2a9707bc82f1bf02f3c9a34e5b864dcc7d2e03f85bd26a4fadd91a4249dbc37ae13f57eb5cdfc2805cbcb4f693d6f5c8863a3e92
 EBUILD svg-path-4.0.2.ebuild 542 BLAKE2B 2d61a1161e367c5fd9bf347e83bd26d0664bfb34af2b53d0ecdf2e03f5bdcb03fee5472f6ca55efdf9ea3e18124a04e0ad0af432be59f5a40babf048ce933934 SHA512 f32492194196cf0fb440006de8451c181796a1818cd580d471be29164bee30c91a83ce53070968b8b6ce20eb49ec881ca78c77f939ea56c816a4dd36c01dba3f
-MISC metadata.xml 705 BLAKE2B 64b4d16b6a0c7d85ea872f1e694f59c1193c9f7e1444e7067eacae51c15556dd0e81647598caada0650fb4312c484bc68193bc29cf73d5ecdb599ca91b94a5f7 SHA512 882efd6101e1e25a9a677432795a642be55aa933c1610fcdb1b3d798701026a7948be4948a33192698dcb14b3c5e0df7c9024b1f7666bdc80371947cc5ebd5e4
+EBUILD svg-path-4.1.ebuild 468 BLAKE2B 01a11bf1cf711996d5df8e1e4ce7ada0b61680f72cbc89903ebe852506144a65b5d4c35ed6d7dcbf0098083d378d7b08bec765c897cbcda513dfedaf58eadebc SHA512 b4f03b107909e4b1c3715d674ca0623ed5b271887188e6681efc61074955e7a59f36635e50373c60b8cdbc02372983586d170d2fa9acf8f6d340d4c0bd855712
+MISC metadata.xml 806 BLAKE2B 16a56882cfc16d46821ede4ef988ed486c27ddacca9e9de6b57587e6e0eff073564449f6b33f041277f4191899d32a0bcf54519ebee4987b0871585d0ea5edfe SHA512 244bda2ddaea69616288a8b707d79129f3992e92ab3c7c4f6dd2c9e922ee411dca09b14b7519969bbaec540c83dc9e17617b1848b4f5e4c2f8344d0a3174356e
diff --git a/dev-python/svg-path/metadata.xml b/dev-python/svg-path/metadata.xml
index 5eefd54371dd..6f2217ce87c8 100644
--- a/dev-python/svg-path/metadata.xml
+++ b/dev-python/svg-path/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">
 		The svg.path package provides a collection of Python objects that
 		implement the different path commands in SVG, as well as a parser for
diff --git a/dev-python/svg-path/svg-path-4.1.ebuild b/dev-python/svg-path/svg-path-4.1.ebuild
new file mode 100644
index 000000000000..04e48aed5e83
--- /dev/null
+++ b/dev-python/svg-path/svg-path-4.1.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_{7..9} )
+
+inherit distutils-r1
+
+MY_P="svg.path-${PV}"
+DESCRIPTION="SVG path objects and parser"
+HOMEPAGE="https://github.com/regebro/svg.path"
+SRC_URI="https://github.com/regebro/svg.path/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/text-unidecode/Manifest b/dev-python/text-unidecode/Manifest
index 0701e8c091b1..00e0ed99b9c5 100644
--- a/dev-python/text-unidecode/Manifest
+++ b/dev-python/text-unidecode/Manifest
@@ -1,3 +1,3 @@
 DIST text-unidecode-1.3.tar.gz 76885 BLAKE2B b783963b4fce6588d45d48a498de566c08df83ae62c72caf599648df195eb94b7c02090503590ab8c747af0d210847ddfbf0772289e170361914db20c049828e SHA512 aeaf0e79bd0545ca7a4fe700d5a7dac1d5900841fcfe8a5a568c84ba7d3bee5f75eaac0531f4a01d689a550ac5bc7e1acaeb8132293f220db8387fae2eb6a150
-EBUILD text-unidecode-1.3.ebuild 476 BLAKE2B 644cc1acc8907dd013cfc8578f923cde0b4e791e03c73e81acb356cdf75907c03abf3376b83f06f9c4c200c7fda4be61d8adcf6be71012ede1c0961c38de0b9c SHA512 d21781e8cdfbeeb3d3e7a0cf5be0c3d99eddeae64d8b7725e000e60508650b6f3cadb65eb6730ef43a825019ac90d7494b727599c447c4b8a081006150b55ce0
+EBUILD text-unidecode-1.3.ebuild 487 BLAKE2B 10432ca126e0eb98c6f65528dbcfd11d0795d057bd30a6e208ef0bf1093193834a49d54f41bd82f8a244123d9349f71246992d0463d48d3c3873c2fd3c631103 SHA512 874e874d8d022820770eae723fee613a2bd7ee045c22e781446a3a8704583ea336564525cf77095cf7ec35781039f65b9a9390160703eec5cb8c3e8e39e79354
 MISC metadata.xml 355 BLAKE2B c879c366e644e724fb78b1169a362c2f67cf5c7ac428ee6cfbbf255b6556f153d35eadc3bb6e4554b9dfbb985e85cfa008be359f87d3be5f09b351afc6bdfcc3 SHA512 113a00dfe9647c778d48ca9bcf410a1c5c36becb3cadbe8e3036879def47c219673ca04fb526915d89ee7596dd43739c0b0e9406ac390a75adfe559476582c21
diff --git a/dev-python/text-unidecode/text-unidecode-1.3.ebuild b/dev-python/text-unidecode/text-unidecode-1.3.ebuild
index f3a9ef8cf513..d64baad499b6 100644
--- a/dev-python/text-unidecode/text-unidecode-1.3.ebuild
+++ b/dev-python/text-unidecode/text-unidecode-1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2020-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
-DESCRIPTION="Tthe most basic port of the Text::Unidecode Perl library"
+DESCRIPTION="The most basic port of the Text::Unidecode Perl library"
 HOMEPAGE="
 	https://pypi.org/project/text-unidecode/
 	https://github.com/kmike/text-unidecode/"
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( Artistic GPL-2+ )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/tinycss2/Manifest b/dev-python/tinycss2/Manifest
index 33776e60a97b..3c2d33c4ae68 100644
--- a/dev-python/tinycss2/Manifest
+++ b/dev-python/tinycss2/Manifest
@@ -1,4 +1,4 @@
 DIST css-parsing-tests-c5749e51dda3868b3e8062e65a36584c2fec8059.gh.tar.gz 35758 BLAKE2B d834011c3ac774eb79b35e2e74f3854ddc2bb871531a32194041d6f98bde3dc68db67baea25d5463a03e057197144237be69fee4eacfb8edb73167e6e4faf7be SHA512 ef44eb1144a6484f308fabe4187310b2ef0067f328bf5213969d87c475fccae3d716dc66640a0a554ab2a3d7da0efb3a168a288ac6eef7722f3ae46959943b49
 DIST tinycss2-1.1.0.gh.tar.gz 28205 BLAKE2B 46ba3f705522067e5b7aa5fdbc89f8980598e7e81b39114052b428e8c21b1a90fb3a9082bd51bbc0c6719adf6f0be285683b125886afe1a957013164f3b89428 SHA512 e1ed2679c09a0814d6deca069c68521e6ceef80f4a9cc16ab359dc5ee7ef97d0c7335680702548b023b1a48c5aeb838e29bf1b55f64698913dd16ae33a478a2b
-EBUILD tinycss2-1.1.0.ebuild 1022 BLAKE2B ee9203d7a21dbe70f9e48a4649e40ef67aceac6d5406a5293d71a066fb49b6c050db8211b04ded036de78445b1488d9026eb9aa6d5d3bfce12d840781d17e55b SHA512 43a4e1cabf6975248dced64b82c5632268f948eb4e320228ed6e1e78b517674c13411c4000907eeed9a8fee0adce122c97e8b6b98041e4be7ceaed6dd5e94a57
+EBUILD tinycss2-1.1.0.ebuild 1061 BLAKE2B 99d2f55b1a956cfd345c4fd6a270b33db187cc9e41fff4c3a997651a858782e625b5edceca630e8fa5eca6d1081061236462ccde9d96bf22e0e31ec0fb151c0a SHA512 ac44f7ef17255a84a0df749a6d6198d66c5108ee19e650f08be8963d717438275f967f79ee83cc099b3ef8c713e7af45a37a527dc93ebed70de4380eaf6f42a6
 MISC metadata.xml 522 BLAKE2B 7954745f23764d7736ce267e95b61c55efdad096d4f6cc7f552438edde811bcf2efce828e3710f5dcc580ba225a980cfc951a3bc52788fb518c3e22ae82140f9 SHA512 45dd447790194120cdf6715e569a39834a7839bafb6c9272da5d10243bfdec5cea26b97dd6be139d62a8f03ab035da1b0e2022c8114b6f0a1b9d18c56d0f7b8d
diff --git a/dev-python/tinycss2/tinycss2-1.1.0.ebuild b/dev-python/tinycss2/tinycss2-1.1.0.ebuild
index 645b168f8b72..cd49f3098627 100644
--- a/dev-python/tinycss2/tinycss2-1.1.0.ebuild
+++ b/dev-python/tinycss2/tinycss2-1.1.0.ebuild
@@ -16,8 +16,10 @@ HOMEPAGE="https://github.com/Kozea/tinycss2/
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 SRC_URI="
 	https://github.com/Kozea/tinycss2/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz
-	https://github.com/SimonSapin/css-parsing-tests/archive/${CSS_TEST_COMMIT_ID}.tar.gz
-		-> css-parsing-tests-${CSS_TEST_COMMIT_ID}.gh.tar.gz"
+	test? (
+		https://github.com/SimonSapin/css-parsing-tests/archive/${CSS_TEST_COMMIT_ID}.tar.gz
+			-> css-parsing-tests-${CSS_TEST_COMMIT_ID}.gh.tar.gz
+	)"
 
 LICENSE="BSD"
 SLOT="0"
@@ -29,7 +31,9 @@ distutils_enable_tests pytest
 
 src_prepare() {
 	sed -i -e '/addopts/d' pyproject.toml || die
-	mv "${WORKDIR}/css-parsing-tests-${CSS_TEST_COMMIT_ID}"/* \
-		tests/css-parsing-tests/ || die
+	if use test; then
+		mv "${WORKDIR}/css-parsing-tests-${CSS_TEST_COMMIT_ID}"/* \
+			tests/css-parsing-tests/ || die
+	fi
 	distutils-r1_src_prepare
 }
diff --git a/dev-python/tox/Manifest b/dev-python/tox/Manifest
index 348851f5e818..1fbbb2b26a0d 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -4,10 +4,12 @@ DIST tox-3.21.1.tar.gz 301387 BLAKE2B 3b15a17cfa8f2df1c8c3558cacde81d818cbc72b3d
 DIST tox-3.21.2.tar.gz 301587 BLAKE2B 81d19e45a1d53000a2e9f956ed7b934f0f1926b4270ddced997ddc8b77a1f05388e0907d379dbabaafd5e6fdcd7031d5e87f206fff385759318a89a5f3eebf58 SHA512 beb551f49af1f8661931f241cf73fa77a37a8061ade7d41b415a2fcecd4d5dd1ba7d3e3add248d3bc14627468fa896f3f4f532305bbc36d112d226b1961fd191
 DIST tox-3.21.3.tar.gz 301828 BLAKE2B d777a858c07d94b9239ecf8286bebc5b4efe1a79cd15b37dd2a717df06cb189d4ef3126da0523719289f8fb410965c4f9c06b02c56dfa5af6ad4fb6a60c6514f SHA512 1975efcab6af938058642a85675907dadc17bd14f881c074087b221cd22d42bd1fcd577bcbef134a499c9a5b2ee583af2b557657fbfb7db30261ff9d394cf82b
 DIST tox-3.21.4.tar.gz 301889 BLAKE2B 166864fe9f44fe01d3b36481ba63738d4290bb609c6ea7e3dde3494ab7ba009c31b12c0801f5be9dfca6f56059f94438cfa31bc45dec862afda5bea763e37be0 SHA512 de12e8ba0f3287be2fced61573b3e2dfdf8513a947724982d0e17ff215489994985067692c94c499047a8b0e2dd843e214e958367199bfa6e0adcde4e09b8106
+DIST tox-3.22.0.tar.gz 302088 BLAKE2B f9ef6feb9fa438b668f6a1b6f8846845f1cfcb0826ffacc04c52dfe0a968a7df2542acc8f4a1e69c634a7866672dbb78ab8f04ba7d6e94f88b40f6c3dd042571 SHA512 d96c31c9faa4d76a6181ce332e70ec9ccfb0a6b96feff45793393f3fd2d08668fc6f14da9164947c4b93f371fab3b9d23c87b38dac89ece18e87494ac3a7caac
 EBUILD tox-3.20.1-r1.ebuild 2332 BLAKE2B 048645ff262c44198fde1fe5000619e9ee4f918e0ec5aa143449506dad607de73774ab4ca88c2f67619dfb380d1be5d4afc64103217bb651327487b337c30eff SHA512 9a8f1200fd68f51a90329f3d6128d190ca5dded6d3d67f42a19a4b6436f42f03883a738681bfad8b0a9a51641a64780dd9717107fa966b55dbaf3d2ab6acfcec
 EBUILD tox-3.21.0.ebuild 2115 BLAKE2B fac409f5028d9ad9efdd2ed9da5e4bcc76d6081c9e04f672510962c4ce0cf7ad88eea688b590f4543747f53dec80edb4ca41bcf59ffd84fef16d8131d0fa252c SHA512 3dd6f84f835452f306c942b20f6e65684c161348d0ec648371c574fee8279f9e8e044e1755784b8dea7c05fdf515818bf6888104ba4255de3cef22a54fdb93fc
 EBUILD tox-3.21.1.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
 EBUILD tox-3.21.2.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
 EBUILD tox-3.21.3.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
 EBUILD tox-3.21.4.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
+EBUILD tox-3.22.0.ebuild 2429 BLAKE2B 06ac31886c70251412dddcaf63f5bd9f837681979e3dd9d512b3a55fbefe320f3fda4811c18e9c2a7a2f1c4f52622afeeea1f7d53edad36521ae1e219d312b70 SHA512 1dac1d24d32431046d99e954f9e04b512d4a3332874a1ae6fb875204e85bf72a62cfba3aa267f690ad1e102e488e1d96fe488006583ba2a0399f359018e4f79d
 MISC metadata.xml 381 BLAKE2B b690863c744dafd1aed2f7ef7b648f3abbebba225bfd14b0c977ba3def34f59a23a07d04dab8ae42d494db7ecfd8b89d4b011200e7ba4f36ecc1c81c3ae67e37 SHA512 620820cfdc3328e19da1b0e7b4db2967510de45e1fba55173474d6b0631b785ebf7e8f1441fc8411a101403fbbc0cad1f919e89563de1939cce66436546a9cbf
diff --git a/dev-python/tox/tox-3.22.0.ebuild b/dev-python/tox/tox-3.22.0.ebuild
new file mode 100644
index 000000000000..c21ec8453e95
--- /dev/null
+++ b/dev-python/tox/tox-3.22.0.ebuild
@@ -0,0 +1,76 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="virtualenv-based automation of test activities"
+HOMEPAGE="https://tox.readthedocs.io https://github.com/tox-dev/tox https://pypi.org/project/tox/"
+SRC_URI="https://github.com/tox-dev/tox/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+# doc disabled because of missing deps in tree
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-1.1[${PYTHON_USEDEP}]
+	' python3_{5,6,7} pypy3)
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+	dev-python/py[${PYTHON_USEDEP}]
+	>=dev-python/six-1.14[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/virtualenv-16.0.0[${PYTHON_USEDEP}]"
+# TODO: figure out how to make tests work without the package being
+# installed first.
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		>=dev-python/flaky-3.4.0[${PYTHON_USEDEP}]
+		>=dev-python/freezegun-0.3.11[${PYTHON_USEDEP}]
+		>=dev-python/pytest-4.0.0[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)"
+
+src_configure() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
+
+python_test() {
+	local deselect=(
+		# broken without Internet
+		tests/unit/session/test_provision.py::test_provision_non_canonical_dep
+		tests/integration/test_provision_int.py::test_provision_interrupt_child
+
+		# expects python2 to exist
+		tests/unit/interpreters/test_interpreters.py::test_tox_get_python_executable
+
+		# broken without tox installed first
+		# TODO: figure out how to make importlib_metadata work
+		tests/unit/test_z_cmdline.py::test_tox_console_script
+		tests/unit/test_z_cmdline.py::test_tox_quickstart_script
+	)
+
+	[[ ${EPYTHON} != pypy3 ]] && deselect+=(
+		# TODO?
+		tests/unit/interpreters/test_interpreters.py::test_find_alias_on_path
+
+		# broken without tox installed first
+		# TODO: why it can't import itself?
+		tests/integration/test_parallel_interrupt.py::test_parallel_interrupt
+	)
+
+	distutils_install_for_testing --via-root
+	pytest -vv --no-network ${deselect[@]/#/--deselect } || die "Testsuite failed under ${EPYTHON}"
+}
diff --git a/dev-python/tubes/Manifest b/dev-python/tubes/Manifest
index 5c9eb5cb8ee5..ab961390cf3f 100644
--- a/dev-python/tubes/Manifest
+++ b/dev-python/tubes/Manifest
@@ -1,4 +1,4 @@
 AUX remove-unnecessary-dep.patch 555 BLAKE2B 9e5df1bd6bf31d7081361ca67fcc3a439d2544a6d8bd8371c3f8b040d97579c192624d6599a6ddd4e4fd73e577dd3d29ebb5c6506d02e4b33d9b95ae74c98030 SHA512 d71688663468110b1e7eef0b536e7c4545894992f46963186c98c50ad5a4e305a536eff743ff9b6d17b8aad748ed3154aca200eeed82b53eb29063a37893c073
 DIST tubes-0.2.0.tar.gz 64284 BLAKE2B fb8e196a2e68998e5e63c7c5e001d4b8baffb049bb4bedc8f8eb44117ab6a699e54a0dc96071cea8eec7db7a49316a01f6c259d2e456443a1014d9d4fc25d007 SHA512 6039a3059b61f8a0c84d4e10bb47d9f2bb95505b0353cb0f1eefb6942f0ad0d88c9b02ff0d48ed0300d615d3e3203c5e884990cd6d006c2f1dbd18b88fcb2e9e
-EBUILD tubes-0.2.0-r1.ebuild 664 BLAKE2B 26acdfb0e7b499fd097786606c96932e2f368a8f1163416c5277ee15365413246e7383595d9fb8395dd7da9113155d5b85b52d82facc20636d3e2da32b5241a5 SHA512 d7322784162d92882e44dd2d9a0232eb4201c641b944e6cff47f1e407b6ab74b83da846ea2f034b875508d6ed810816924533e41c095be99e8a95b6dc04968dc
+EBUILD tubes-0.2.0-r1.ebuild 663 BLAKE2B 86dbdc20b88e61ca6989c9349e90619950448f166c688527675184d0d0f38ce0bf7a3c32b5c59b7d6edaf89a98b0920bc6ffa965004605a0d14b887d2186484b SHA512 b9d88c9a9adc8999013bf21ce132b17f52b0af0a4bd8f581eb9c46cac8b1c35d11262938298b77d7296f39d7f5111bbd81d543b5c7875ff10170faf5b13c515b
 MISC metadata.xml 659 BLAKE2B bca50c3e192ef6b48aec039a7cf8b54875818c6f64e74ca99a8fa64d2a2114a7703d890fcbdc83c5ce96e626e07e7db5382fb770f0cc19b9beb81723f8b29248 SHA512 6ab0a92134cc1b9ca24c253c16f642b00bf5db618005760b83dd4b0d033f7e247efad35f00d87adeedede2064fc1425b93c622411a213b531334adf910e96f9c
diff --git a/dev-python/tubes/tubes-0.2.0-r1.ebuild b/dev-python/tubes/tubes-0.2.0-r1.ebuild
index b0b9bb520017..23c220747503 100644
--- a/dev-python/tubes/tubes-0.2.0-r1.ebuild
+++ b/dev-python/tubes/tubes-0.2.0-r1.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 PYTHON_COMPAT=( python3_{7,8} )
 
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS=bdepend
+
 inherit distutils-r1
 
 DESCRIPTION="Flow control and backpressure for event-driven applications"
diff --git a/dev-python/txrequests/Manifest b/dev-python/txrequests/Manifest
index 83bdbb3ded22..22de70ce170f 100644
--- a/dev-python/txrequests/Manifest
+++ b/dev-python/txrequests/Manifest
@@ -1,3 +1,3 @@
 DIST txrequests-0.9.6.tar.gz 5306 BLAKE2B c1b55835c360f27c519371834de6cce0760e201a746d960425d7bef98e10cdb421d4db90b93bccdfa05b1fa2d5d6258fea4cce93fe62c7e9ad75780f1a5a89e6 SHA512 3892e121417b8346a2a2db02f8f4143b8f87c060cb4d48dbd07fa77559cfb0caf5742b257377ec0a746f2b995eba36f419a1a5b19d83a0c343cd39057dd34fb1
-EBUILD txrequests-0.9.6.ebuild 523 BLAKE2B f0cea98a787e4992d2fcbafe4439bf18daea6998256275c3fae46198fd0dd608aa8c41b740fc9db960c4106af4dd74e2f1145b52acfb1cd14d13b8c1ba6a00f5 SHA512 53d96783d22622289efd081bb44324a384c19d8b156f7357ce8c05a267d97f28eb44946bab92cb9b411327b12fdfba6c10f09d26c5690c84f42d1ab5a3abb262
+EBUILD txrequests-0.9.6.ebuild 523 BLAKE2B 07b647a4ab10c0d1923d613bf4c47bc15c8ab315ca2c6eac17db925c3279ef2a83aa88f8223f28fe912ca524bf11bd0949eb0b11b4c9f1cf9b9326c3d5441c03 SHA512 d0124f19bb61cb4754f8c3f7891331532fb33c3961573735f04b7e4bb0d65bc5ad0c4a1a5ef1162c6fb81150b5078a67fa71ac8f8bf04619d4a212b338fe9274
 MISC metadata.xml 716 BLAKE2B 6c7c888fc46e965870217d426859d9ccfc86acbe765b54b1451764bd959d5882b9d7293abd391043e29cb3c55b6774ee2ea745a19bda5390be6a4bdddff79797 SHA512 c4712c102c4fff806db37387de7e272a7feb1b70f99e3080361e5aea38b463184d992fde20a9c46de203255c4e78520323f5a34ce682c559c06188cbb89ab0f3
diff --git a/dev-python/txrequests/txrequests-0.9.6.ebuild b/dev-python/txrequests/txrequests-0.9.6.ebuild
index 6f8648c02c25..18774712d84c 100644
--- a/dev-python/txrequests/txrequests-0.9.6.ebuild
+++ b/dev-python/txrequests/txrequests-0.9.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 PYTHON_COMPAT=( python3_{7,8})
 
-DISTUTILS_USE_SETUPTOOLS="rdepend"
+DISTUTILS_USE_SETUPTOOLS="bdepend"
 
 inherit distutils-r1
 
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 443bf6846c96..8a5c038db7ad 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,6 +1,8 @@
 AUX uvloop-0.14.0-asyncio-test-hang.patch 1175 BLAKE2B e97cef3438a603249e8b1977b2a7f3d3b636d3f38c59c4075c01fc0660b6afd01a64528655bd9bc9c0845fbd88c86f8b0ad5571052a02e511587fe73d87547fe SHA512 e8219cc1c644c220d7626790be5fc701ac27486689b7bc57b70dae818c51be8b3d1e524684cbaf6aaa2de199159b1af9534a913e7d8f1c209b87e3a2208dfb43
 DIST uvloop-0.14.0.tar.gz 2009041 BLAKE2B 4d984f5023e0974ee68795e6cf29585cee32345e8a682611a72dbc36efefdfeeecb3c22aecb581ff7e5ae826345e1de3b0e6c7a6e8319829b0b3cbe5a180ed11 SHA512 8a9a64c91fd34c65a1c40d8d76ad7dbd7e959d45188ef81cdc06995312f52106b2c648a504d51b64b470e54dfc4854dcf9a05cafa3d4a42f1bc1e31766114d61
 DIST uvloop-0.15.0.tar.gz 2086686 BLAKE2B 34bbce58f47a4da1c8fa27011c4a39e864ba1959affe2584eb33425ddb3fbb3a59783e3cf771669cdb1343299bbc7a7a8a14f4bfcbf2b694ac71b9fc055341d1 SHA512 fcb18511a1af89c11cd4022ecb6e8893915a159b34a054bab5e82da3b9127b886ab3e785a98ca39e612cdf2b18abd95bd7fc505808cccf9d4ac281f5a0b6e0d7
+DIST uvloop-0.15.1.tar.gz 2087966 BLAKE2B 31892cfa2cacb02ae8a78ced2066a60012dfdc95ff9b1d68119487ec543e45fe7867c6a4b597b2ee83632c48d6d53216f648005a6202036e99f38b34b8d5e60a SHA512 104153760781b5596b552f00d0c897144fe2fbe208c2216e94daf5eef08ebde2ec45ddeaf6a24d1b28f9351d241832541a754124229af71245695da262458ffc
 EBUILD uvloop-0.14.0.ebuild 1278 BLAKE2B d759bf6d27d570be076ea992a6d93ea5a75cf9e3295b1d13477b8d08116181d28bcb6a09638ef3a0b82269c0b138c72076670d7d173f7ce1fd5a08b595ce5e77 SHA512 7953803d55a77561bb6e8a901125ca9b22cad1d3afeff20e8ec9c9a30e169e2a447639487664e70852ebdaf2c2a0a36e90798d900af2ca63c2b4b8e545845faa
 EBUILD uvloop-0.15.0.ebuild 1157 BLAKE2B 948e1db3e3b64ec8ce9301d0c0b0841595f3b6d7bb5272af8c4a86eb521a1e8cc34c973591fc2613ed8fffd7edde7760ea479cf1c0a013f7e45b6da56a3ccdad SHA512 744ad8ed3417d2ec51ea9ca0cd3fafd00deb46f2f15992d69af9e8824d9b66f83dc4c8526be8ed8f363b6b7187c514f2fe051bc056325d6ca4c273336b80e376
+EBUILD uvloop-0.15.1.ebuild 1157 BLAKE2B 948e1db3e3b64ec8ce9301d0c0b0841595f3b6d7bb5272af8c4a86eb521a1e8cc34c973591fc2613ed8fffd7edde7760ea479cf1c0a013f7e45b6da56a3ccdad SHA512 744ad8ed3417d2ec51ea9ca0cd3fafd00deb46f2f15992d69af9e8824d9b66f83dc4c8526be8ed8f363b6b7187c514f2fe051bc056325d6ca4c273336b80e376
 MISC metadata.xml 526 BLAKE2B 1c5d5ffd994ab70aae22d5a6312708a168f89790a5999d81ccf4eab552e910fd063ace9f1e51d1b477ed96604a23265f586781feb7b692d1f49a0c502d59dd3a SHA512 e38163d8b0b033c5825d4f977cb58bc727195a7e577eb229a70c4b089943ad99f4c8121e0d4e209db51fe2977ffad2f88b8bfae3baedd853eabefabb15578b85
diff --git a/dev-python/uvloop/uvloop-0.15.1.ebuild b/dev-python/uvloop/uvloop-0.15.1.ebuild
new file mode 100644
index 000000000000..1ce46b172f5b
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.15.1.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_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
+HOMEPAGE="https://github.com/magicstack/uvloop"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="doc examples"
+
+RDEPEND=">=dev-libs/libuv-1.11.0:="
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+	)
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests setup.py
+
+python_prepare_all() {
+	cat <<EOF >> setup.cfg || die
+[build_ext]
+use-system-libuv=1
+EOF
+
+	# flake8 only
+	rm tests/test_sourcecode.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	use doc && esetup.py build_ext --inplace build_sphinx
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	use doc && local HTML_DOCS=( "${BUILD_DIR}/sphinx/html/." )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index 5c3e256d6329..1ca3f39cc0e0 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,4 +1,4 @@
 AUX yaml.patch 1063 BLAKE2B 33d954db0dfb7caf5db07bdc287ff8f7fdb74edad7f92ea5ae3ec1076fd02077e3c87f2d12907a6eb9e419b506bafab7ca84dd0c2ca282aa08d24eccd3054ff8 SHA512 c2fa16dd567792cf7b31e1bc3a22d647ac40f4e3302c74e61202b8cc1bdb099031029ed8090ad27d54aed7d93052cc099a6bdc2e8849194ade2db44bea44eb5d
 DIST vcstools-0.1.42.tar.gz 65979 BLAKE2B 2deb29116e891bc93410e4a8f58938009140d01baaa834cccfdba2be3243d98bb11507fd134284bc1dbeca1434ea0eeaf2ed332dcb579bbacf1bc92815f8623d SHA512 1b54270c878684862eb607c2e445fe24d8edfdd8ea2cc75e899044d9e8e89a882fd2dd6fb7825553f83003ae7af08850c18fdeaabaa107a6bfdb2759b32e8fa6
-EBUILD vcstools-0.1.42.ebuild 1466 BLAKE2B bd3b27dd0239bbd26c0a88ca13fe918ae37fa96bcc75d230d9f2d02bac593bb18b06d5763065cc97f99f19ac975366dfe39852d901771e15458769b274675699 SHA512 1e005b11bee4ca9baf1e894d5357d563bb7c6a6b61c1cc16c01373817ff05085b8b7de3fc2761776bfdeba6d86e2adf6a4ec22301fcf87843eac927c8c0b6ec2
+EBUILD vcstools-0.1.42.ebuild 1453 BLAKE2B 57c78b7c380d3d4b3d232a09cc856547fcb3d5fe7c2dc6c103de91ea852c4f639785063be96ed11e967d510981e2bf19981f34d58a4f0695448fb2d8966945fb SHA512 cb794b9e1f28895294f103bc274340d49e8f7f33d8e45d7f8e47fb4757ada8931763d41e429313f13fc71be09c91c616ddef37ecf17c9acde11e645a6b1b89eb
 MISC metadata.xml 377 BLAKE2B 8726677cc61b66d31a97e24d77ce807d02acf7641763749e80f335a9377727af0af53ae5f864d3e8e0fb936378bbef06c179c7d11b36432a208694f45c988575 SHA512 66524b4e99201174e022a8cb170e4d3203dc4349ff70811068d90e65c87ff40f9c064824fe59934086f911deb35dfbe709342d3b79b520ad383206e63e4add8e
diff --git a/dev-python/vcstools/vcstools-0.1.42.ebuild b/dev-python/vcstools/vcstools-0.1.42.ebuild
index d6b34076f051..080412941179 100644
--- a/dev-python/vcstools/vcstools-0.1.42.ebuild
+++ b/dev-python/vcstools/vcstools-0.1.42.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,6 @@ DESCRIPTION="Python library for interacting with various VCS systems"
 HOMEPAGE="https://wiki.ros.org/vcstools"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
-	KEYWORDS=""
 else
 	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
 		https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 8e5eac67cc3f..224dbb75707b 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,3 +1,3 @@
 DIST websockets-8.1-src.tar.gz 156472 BLAKE2B 6cb5eec8276f7ef7172048eba6157560f42cec28acacc1a0a2f426ea1cab9a04029ebb1f8285b1aa2862c30aac8f2af81ef85d4dba8e53e267b665b718e01d5a SHA512 d245702574cf513da54bfc0ca10768558cd4e5017ecf8cb647f4b9176561192a3ace64edfc5c6f735664bf1b6136aa0bb9828114478f92d2c051e3109a218c12
-EBUILD websockets-8.1.ebuild 470 BLAKE2B 7e6266f6c55fa707cde568ae742209b96e84bc2d2b30dadced904d3c95f1eca900ca4c47e93ccc51bda7160e780faddd303d5c1a2da2d3d09f31a9e5884409c7 SHA512 d4790678bcba4bb1c7991ca69c30dd098264001ab46446f057b2d482b0fb68db8f4822c0af8f8671053b79608a72715ffffe65a88c10d9f96cd0819e87d6f8bc
+EBUILD websockets-8.1.ebuild 472 BLAKE2B e105c964cfbf38c61a798c0751c127ba61bc45886a8b6ca0bdcf3e33ea542e9c5cf1eda4751c89a6c7f1a1a2c1286352759ae795e63c80f15fd630d9bccebf65 SHA512 abb091f45597da0211f7f866f75d64c814ca376d87ac1d78bcba406e2260794b3b808691fc0a15362f59a6fe08407b5798a742d353f46f4f20fddef1c158e18b
 MISC metadata.xml 386 BLAKE2B b7595dce278a7ae3d0f491ebef0abd2d9a84827b4ddbef8ab3ed16e21128713408f66295566b8fbae235b5446f5eba6ebc412e39bb37d86e19fc2fd2b2d34bad SHA512 e007ee258a91392d5fa3cec67a0e1efebb4f3a4a9e3a4ee40a0f76dcd8bf3b1b9089f2ddfb52939a76cad42dc63662e2c365406b867641d3503f6437c3213531
diff --git a/dev-python/websockets/websockets-8.1.ebuild b/dev-python/websockets/websockets-8.1.ebuild
index 0b7618fb63dd..0e9ef5a25dea 100644
--- a/dev-python/websockets/websockets-8.1.ebuild
+++ b/dev-python/websockets/websockets-8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit distutils-r1
 distutils_enable_tests unittest
author	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-02-17 10:35:54 +0000
commit	463397cf1e064185110fe57c568d73f99a06f5d1 (patch)
tree	9aa75eefc5154eaf0e3c33658b830fc54dc68052 /dev-python
parent	c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff)