gentoo resync : 24.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 02:11:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-24 02:11:45 +0100
commit: b49088575eb777ced2551f484da86317332d6087 (patch)
tree: bf9a151cf2d61956340d555659ffc098ee1da466 /dev-python
parent: 514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff)
191 files changed, 2559 insertions, 331 deletions
diff --git a/dev-python/GitPython/GitPython-3.1.19.ebuild b/dev-python/GitPython/GitPython-3.1.19.ebuild
new file mode 100644
index 000000000000..87d5f7d31add
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.19.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+TEST_P=GitPython-${PV}
+GITDB_P=gitdb-4.0.7
+SMMAP_P=smmap-4.0.0
+
+DESCRIPTION="Library used to interact with Git repositories"
+HOMEPAGE="https://github.com/gitpython-developers/GitPython https://pypi.org/project/GitPython/"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+	test? (
+		https://dev.gentoo.org/~mgorny/dist/${TEST_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${GITDB_P}.gitbundle
+		https://dev.gentoo.org/~mgorny/dist/${SMMAP_P}.gitbundle
+	)"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-vcs/git
+	>=dev-python/gitdb-4.0.1[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+BDEPEND="
+	test? (
+		>=dev-python/ddt-1.1.1[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "travis@ci.com" || die
+	git config --global user.name "Travis Runner" || die
+
+	git clone "${DISTDIR}/${TEST_P}.gitbundle" "${T}"/test || die
+	git clone "${DISTDIR}/${GITDB_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb || die
+	git clone "${DISTDIR}/${SMMAP_P}.gitbundle" \
+		"${T}"/test/git/ext/gitdb/gitdb/ext/smmap || die
+
+	cd "${T}"/test || die
+	git rev-parse HEAD > .git/refs/remotes/origin/master || die
+	TRAVIS=1 ./init-tests-after-clone.sh || die
+	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
+	sed -i -e '/addopts/d' pyproject.toml || die
+
+	distutils-r1_src_test
+}
+
+python_test() {
+	local deselect=(
+		# performance tests are unreliable by design
+		test/performance
+		# unimpoortant and problematic
+		test/test_installation.py
+		# Internet
+		test/test_repo.py::TestRepo::test_leaking_password_in_clone_logs
+		# TODO
+		test/test_submodule.py::TestSubmodule::test_base_rw
+		test/test_submodule.py::TestSubmodule::test_root_module
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 3563d8cbaee8..5ab639afc44f 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -1,6 +1,9 @@
 DIST GitPython-3.1.18.gitbundle 9129652 BLAKE2B df2ea8fa06d4209c532a239fa5bebde29314b467811526f67629f181a62b2b5ba235a3302b979dfd87993deca238a91820b3caa58fcb7cf3aaffc3bf76b0c731 SHA512 91fd937193db8a948fb575bf24a295c349e69b132128ed3b0c4fc3be89feb76ff47f31afe422c99ccbee4cf908b3040e9dd3f568db74785d12cf6cabbc356daa
 DIST GitPython-3.1.18.tar.gz 181199 BLAKE2B ac50cee78b5980c6d23ec60786e8d279558a2740480e0975c212de8d96abd58da95de8d66bc9c7c3f0c7d1baa1757460f36df53552b06bd6323d3f882d0b90ae SHA512 981b3f4eec71c4e1de6efa2381c3c411aedfc51918f9f58f397926d21dabdfabb54d498ae44a5b6ceca59adf99e866df8d04f97a86df942e81408a5a0e751a15
+DIST GitPython-3.1.19.gitbundle 9507079 BLAKE2B 7f9304c45784ddb779642df6b4412d022dad5ee20f89e998281db426928ee7bfafadb9a849e174c7cf850b049697ac097e1d144ca40f86497c6bab03e32ede8b SHA512 1fa8b01b27a993221ba4771aca416c724c12c208169fe4a6e08666ebf20c8dd870eb01f039d33ed13d664df5c6126cc4477994092ceeea64fc77f28a68cd9279
+DIST GitPython-3.1.19.tar.gz 187639 BLAKE2B 835a43edc7adfbb6253abb904d2f313bb597418c749473e6ce5deef67e546ee5285146a3a8c34d6afc4f56345e3e6a6481899465c8598b5215dbadb59b0bd507 SHA512 019a558fbc60c540872451ae1cd5ab029d5b3c5d5ed4979dadaa0e1829548e04bba62173a85d8fceddab5a19bc83e1750d938f73e984a64747550e6936400c9e
 DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
 DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
 EBUILD GitPython-3.1.18.ebuild 1929 BLAKE2B 3a33df8a43887f52e637aa66dca50cae9920a7e00ea51af8d0980ba79ad67882c8bdf362f4c8824d6a2475388f7d04327d8624b346466cc2a4c4d5c1ace3716e SHA512 34d346d78b2e7e57d108bbc65476975f31effc169fe69b8ad5fc253dbefeeb23db3faf461de46e427733191fa12aa49f49edbbb7e438d7cbd579dfb9d1b81d77
+EBUILD GitPython-3.1.19.ebuild 2032 BLAKE2B 0db75c2c178d93ad3bdc72f94bda51d9768dd7ce94fe5cd8ecdb5aebb3598f3465edaf93527f89dfe35034504054b801705688ae5e0a419fc2eea8d82b805490 SHA512 15855219ad51288f129755a8a7f7a85b2a720731d87cc98273f1309de1a6769d8f2642e71e38a2f9d8541e567934965133191d29cdda2fd1fea782ccabc076ce
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 9b0a11a27cd3..cb8bd94b3636 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyQt5-sip/Manifest b/dev-python/PyQt5-sip/Manifest
index f103231513bb..9ae880bf0774 100644
--- a/dev-python/PyQt5-sip/Manifest
+++ b/dev-python/PyQt5-sip/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5_sip-12.9.0.tar.gz 103007 BLAKE2B 461973ce3563c27ce5a6e3a537cf9a8e53adc8ddde36ec1d2eb7abb986908151ece99ff8756f752d2c6e331a3e9b7b70813d35f8701cedd7f09e6edbcc435121 SHA512 ca6f3b18b64391fded88732a8109a04d85727bbddecdf126679b187c7f0487c3c1f69ada3e8c54051281a43c6f2de70390ac5ff18a1bed79994070ddde730c5f
 DIST sip-4.19.25.tar.gz 1056384 BLAKE2B f92e105e6b30e871aea2883dc9cd459e4032fb139a9eaff153a3412a66b39df4d7ac985711a2693aee83195ff3850ae648bee4102f7fc3cc30d09885799f2b98 SHA512 60fb4133c68869bf0993144978b4847d94a0f9c7b477f64a346ea133cfe35bc11820204ab327dcf9a929b6f65a26d16cc7efbce65e49967c3347b39376e57001
-EBUILD PyQt5-sip-12.9.0.ebuild 626 BLAKE2B 2ab1323935acf4aef2ed8a323ea37d6b1cbabdd6bc51fc4f5cad2463e1fd23d4d52cc7978191d2e7947496b7dc3fc38eb39e08803e5822851c9d079e3073e5bb SHA512 2193afd19e05f57fbeb92d591bd1a8a78391747cea55628e71222d08a9bf17fdc50cc642080c7af8547cc5475a623465baddfd71a5427c1caf3f2772dede6a64
+EBUILD PyQt5-sip-12.9.0.ebuild 624 BLAKE2B 7a98c0d732bc07ae55892090d9c64767e3d7c661cda383ffe6b5730174fbd268fdaee61b811527bf384d5743b1020967ab4e8b77142cd1322f2e7d4847870da2 SHA512 ba14181afd43c520a854d12f347ddafdb1c6ffd05125113f4e7e28201b5bfe0672b17399f5a6adaee3aee96f68230cad4154133750f350fbf0b699a7e4c703a3
 EBUILD PyQt5-sip-4.19.25.ebuild 2048 BLAKE2B 0ea21df4d969c0f922de85e9aebf89d1037301b7b420a742dae29063391be0bbc264e88a2673e2046dced52def880b84c0b7af546f8bef6c2f85f2aca8cba1f3 SHA512 30cd6bbf428e0749b4fb34f7ec33c95d54d305821db022a30a8cfedea49badd83f7c8bb6b3d616ad2b499ff8c3d82728098ddface1d45be8144a75f67b2d4a4d
 MISC metadata.xml 648 BLAKE2B 3e1ad5efbd33a225238ca0b7b3847349dd942b116d3a5ab4dc94826b6745b761cbc791ee314ad0c7867fa8f9cd63b659d4d8fcdcd4a488e58371f2f7f122a2e4 SHA512 e9347175c4203ba811b021ef07919cb911c6969c98886c855af1f74cf3140c57d0ae5d0a4e8b2bca5aac8dceccb774be96264f376ecffc777f53de4ddaf4f8f8
diff --git a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
index 7b6eacca3cc8..8965008f0016 100644
--- a/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
+++ b/dev-python/PyQt5-sip/PyQt5-sip-12.9.0.ebuild
@@ -19,4 +19,4 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="|| ( GPL-2 GPL-3 SIP )"
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
diff --git a/dev-python/PyQt5/Manifest b/dev-python/PyQt5/Manifest
index 77622a6c736d..b80a2cb96775 100644
--- a/dev-python/PyQt5/Manifest
+++ b/dev-python/PyQt5/Manifest
@@ -1,5 +1,5 @@
 DIST PyQt5-5.15.2.tar.gz 3265445 BLAKE2B 7712d68aa54cf9e6836863d7aa645151254d79621e115ed314ba63c371d5e24577a0392311b31a73e45af45baa29eca1d7e9a03874beac1fbf043fa703af69f9 SHA512 6d48d2ed907b436131d46b0513d82e1069c76e873d395e4a6c0832ae3a20621b92d3abece046c5fcd14cb818d50ffb369153fca1ce9341f0db1b8c479b94e621
 DIST PyQt5-5.15.4.tar.gz 3258085 BLAKE2B 96bda4da1321e499707d29d9870693815170ccc32e2e0d7bb3c6977ea2933f9684557124deb92abbf92b923e0071cf47ee4822f6cb5d06fdc61b498efc44db4c SHA512 6d19f549a71eb8df8ba8407398ccd6e3d339436f4f2e7c5dca6885849d6ce510c4f4dea3c97257685aa462bb09a2ead33d80234ccb934f9b1a40285dbec631c7
 EBUILD PyQt5-5.15.2.ebuild 5645 BLAKE2B bcb40684f9eba4b134884b3d73da969e923e7c1fcd788162ebdb2ff2b47633d2ee60cc3571fe673e05c76fb33926d83cbeee66e7d50e8c240cd35bede1b20191 SHA512 24e491d79e9ce3d9fc2190792e2b7c370ec3816f3bf99bf21448123180dfe4747ffa57bb4ad3efbecd1865eb165de47df9744f5d57ba0eb16972d1882df7a09d
-EBUILD PyQt5-5.15.4-r1.ebuild 5436 BLAKE2B 6331b07f0f74fe65e99465518611b1bd0fc5609559511e1e4fdb634dec13ec3cf726d2e1898763a38370a7172ad9e759d7f989d8dd80b09dee920b9a8ffa98c9 SHA512 4ef0c7099c5858eec7159a39f24f9554dc20127a338d54830214cb06efc828e4f0e5b7464cbd8c1da7fe611c8e77fa0919a412c2968d877b1a90bf4a196e7c0d
+EBUILD PyQt5-5.15.4-r1.ebuild 5434 BLAKE2B 025fe217ee4c9bbc7ca527fdb58830bddc04be3854607cf0e9fd7e8e9c3eb1a340209ae47e842613381e12fa7d3c488e41f583c1a8ec2045c0752ce00881652d SHA512 500fb65d0320a04b600e69fac5ebfb7f7dc1a05b93ff07f886d923d3421c6c52ca1cdff60cb42d607bd1c7517b169c83f4ad0b62ac08fed5e3127e53049355e3
 MISC metadata.xml 2432 BLAKE2B 56cd4edfd99449ed4d837edec6952e85d0fa13bdca2189451b7c43645b39a7a7a810f4e206f7aba6690d65529a5f629db532d4ab056374952b34834d2d68fbc3 SHA512 acb9f52dbeed59158c5ef83ffef67e51e4362191210b6addfd5c3e4aa1d17f208ab5ce316d7a8d5116dabe3dba5b58d28ac6f197ebaa832f3b33f4a13a881a62
diff --git a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
index c184e736ff48..3df5fd4ae177 100644
--- a/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
+++ b/dev-python/PyQt5/PyQt5-5.15.4-r1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 # TODO: QtNfc, QtQuick3D, QtRemoteObjects
 IUSE="bluetooth dbus debug declarative designer examples gles2-only gui help location
diff --git a/dev-python/PyQtWebEngine/Manifest b/dev-python/PyQtWebEngine/Manifest
index 1483f1e5920a..bc7a49fea4f7 100644
--- a/dev-python/PyQtWebEngine/Manifest
+++ b/dev-python/PyQtWebEngine/Manifest
@@ -1,5 +1,5 @@
 DIST PyQtWebEngine-5.15.2.tar.gz 48608 BLAKE2B a03f77b0cde0d1031e8f1c4c6b5d13a342c28cf814ebaaf4a2cdb4608ce40cdd8163783932abc76cda583c0fed7191653b537598a9ab65f6509ef88008538e31 SHA512 7e6d95833b1a9e5bb5275eff01e1923419da35d13862fc4cbb231cbf950ed45e628bc7e161b0b6b66c718ee439a1a8e66dd754cee9adcdf69ab1b8ffab58901e
 DIST PyQtWebEngine-5.15.4.tar.gz 49022 BLAKE2B 0ac0b3424f22aabbfd733f2a876e502f133c81f639fbd87a4c7509865635b29d4bd3596ccc151b0919a28eff0015913c4fae1a831dbe774fe2d2aeee732e469b SHA512 25cf8578ffae8adbc1dd8d914921b4edf91f19fcf983c9c83c9c8934b4e918ba27bd34a6b9c8252773ec32e6f1f13a06f22cf7d7326a5aceaa91530ea4ee047e
 EBUILD PyQtWebEngine-5.15.2.ebuild 1665 BLAKE2B 54f976b7e747e2d50aabf99728fc79c1efc49d782d806782677b00c5d32780abc206265760cdb06184ff188c289213c795cb3f65f947f439c69621424192a258 SHA512 3679084254b292ad8b7f51ee80cd9ccbb2e6015965abce43f8c27edcd84ab7e15e83ae40d731404c42805dce598e5dca3a4f665354a3244b86f4e6cd4b573742
-EBUILD PyQtWebEngine-5.15.4.ebuild 1708 BLAKE2B 64d902a7393e50554350bb76281f592e0d4b6cd68131e7bfeb84d610fdf08cf0e85400699ec0f361e302183ab81284fe99be10f5329f4f7e13884703ab5a26ac SHA512 26f41890f33277171b2d473635878be377126d48ad9d8cf82a7a4475bc99b35885389daa9c70254819b2c44935b4ec2de2997644d1df4f8fa92eeea2a274bc3b
+EBUILD PyQtWebEngine-5.15.4.ebuild 1707 BLAKE2B 38c1186a305c4c2e5ecd05a7407a7a535c023a35160853561de4747f1e70406d25f6db94273af8c3817171e7726a200749c57955766c507f477e97a2eecac063 SHA512 b42f7f5dea9802588aba25c7263588afe76127644a0b5d7a5d50d01af5c7019e220c6ecb98ad37ce5402db0bbacb56eb72add4e656da439976fe1b80820e7174
 MISC metadata.xml 958 BLAKE2B 3d360762116d92a71aee391ba8bb5eaeb4f8347f22c0bad7c05211d82cf9bf9ce04e74baa1691c3a48c7be7c3906c180234a7b3c33b76e56c6b94982ad0045f5 SHA512 06ed8222b239484fdb7d1e7ab35b922b9eea81ec144bace571355302d1b01dbd6bd80d2d5c03d1ec7f7edad851050305d2e87232f5580e92276018c7c4e9753f
diff --git a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
index 81bcbeb17ccb..8aca0d1edee6 100644
--- a/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
+++ b/dev-python/PyQtWebEngine/PyQtWebEngine-5.15.4.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="debug"
 
 REQUIRED_USE="
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index d46fe415bec4..1c32afdb5e2f 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,5 +1,5 @@
 AUX QtPy-1.9.0-python3_9.patch 401 BLAKE2B a28d4344fd4dfed3270d4dcfeae7df6a12ed38fcab779dcbf3e43798a0385960b3fa45e5077ef9c7d00cb9fe69e84653668a09c50c5ba9dfb5eb13e7b23cb554 SHA512 c0996c53cd3b7401986c11510cbe9717ec7448c9b4d6acfed43d64c2c4035e6d474c90783f7d26d8eb530c9ad91297e02d4b27c95fc1ed026344273be455404e
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
 EBUILD QtPy-1.9.0-r3.ebuild 1985 BLAKE2B 82aaa05d5afd83b1ecaed22a5f0b69fe03c9520dbdcb847004447361e49cd47e02276a07abd866d4fc601ebca9d93e24f70d73ea4729a7b3eedc5e40f51701d5 SHA512 d4225cdb1b33c28f8c31a6253fdb52d5a55c27a539e1632bf4c375c38357d9000447a549049949e850cc0b1d5b3f9ba9f5c63b4dca35ad8176bc109bc2e029f7
-EBUILD QtPy-1.9.0-r5.ebuild 5743 BLAKE2B 14d6fd460701ecab1524aaccd4edf0a22a6ab39da9c24b47d7177e939d03f5b1b9ca0b0bf3fd960f216d15fbc2e8f86e433dc63ec9ba88851ee3035ab44d7326 SHA512 55cde53b372dbf8bd86b81ce58062253473f7a34552c7236950aa201db19acd16d50009b1dc401a4e566249e88427a056f99cc2caf22e65eaeb6be48474d5c5d
+EBUILD QtPy-1.9.0-r5.ebuild 5741 BLAKE2B 26d4998c307431134d3b4098872b806286f068449f9a9960e49bd403e2bb2370749183318dedf6163710e02132728c17b6821d640b3b58137548e2c2fa35d84e SHA512 490f95492079e166736d78e7a16b651f91f4ab76537e007cdad1b3995840a394d4bdecd8e70533e894da0f55460a14f7e127ae75f33a58e7dbcb00aa61d57542
 MISC metadata.xml 2903 BLAKE2B d3efb9532ee6bf7bb8d995baf356d022be803b0c0649c01558087f62bdb9b7751f4fa1df63d57916faa701cfe1111ab23c31f8f4badad2944a4522eba2d85068 SHA512 8af6cde3b273124f804aa6d91448baa3344982aa6f533ded0492296c27cc630782356397d11bc4b8289d7c081849402e780a79a18b086ab93632c1baf3615025
diff --git a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
index b1afa53aa7d3..c4c03bc5f4cc 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 _IUSE_QT_MODULES="
 	declarative designer gui help location multimedia network opengl
diff --git a/dev-python/adblock/Manifest b/dev-python/adblock/Manifest
index 9306ac7bb915..02bbee3047a3 100644
--- a/dev-python/adblock/Manifest
+++ b/dev-python/adblock/Manifest
@@ -1,8 +1,12 @@
 DIST adblock-0.3.10.crate 7678458 BLAKE2B f15dfe6ecaf1146ab0058afae6bcdc179a9c870c0bb00ea0061ac7726a77c89a44ccabb50eb29a77dcd72eeae6533e505ad34e0d9a75cc4bf9fa3d304e16a1a8 SHA512 fea38d9204d2ac7f8a289d3affad18bf814e9054c2955f8e259454913371d30751c6a090a0a09b844bda46083815c8a9a4326c8f9fa210ce71b5f9adef7b338a
+DIST adblock-0.3.13.crate 7691310 BLAKE2B 0d9958235c123ff09256f6512c04474c4dee10c855b7161e32f3dae517959bb16815adbc22787648a1441e04a0ae94b89369c6bf9e3c61715638a4c452676a1f SHA512 f534c49d60118e170f674415a20075f15a7e45187d9461a0025acaf3fb9a94388ed7f99d15484a0354d8953798dd8ae720ca77f6faa59551e9d99d937a3bdbb4
 DIST adblock-0.4.4.tar.gz 22207 BLAKE2B 8337b41627af07a83586c174c0ac446dc43d8a3031d7cc758dbd987685218983f355155b812c746f3b736a31fd5ab835ab59c37234bf04dad1ab2d3c48b13b2e SHA512 19d24fe79d798825bbe00efc552d7c7357073791e3b4cb591aa040bb44543a9fba3c872cbd5e77e1d7a07e459e2d3c33605cc0fe47466ba210b18dc0aafef395
+DIST adblock-0.5.0.tar.gz 23000 BLAKE2B 4d1e991341e605484df4c96b3ebffdad261a7c90d4aa1e14a8e6258b1a5368fdd3215a9ae3600560a082f91cc34d005b271f5904bb883f938bbe5451d4ad4e64 SHA512 5ae9c979a769fbfc89c26d2c5c40a1712f0573707840b3bf35acf7bd15d2c22f08dfdbd384ab0e886568aee686ef5da3ab5f1cb73bf66491831be24977e6173c
 DIST addr-0.11.8.crate 89500 BLAKE2B 365d96ae27f6e62e09c23362d667d7818b62e2c878ee6e4cde59016e19ee31ba320dca289c02aa0d542e0aab3e828c18d5e78c7f2c9b101ff86a8c370f91e5da SHA512 4ed5cfdd88e9a31b64a950824e2ebcbec8ad33612fbc815e9eb5225af38bd8dd4250b506fd089e8d32cd6e6003b60172b2c06e20228b993d0d11856fa4340fb5
+DIST addr-0.14.0.crate 90210 BLAKE2B a0dcb422d853b76187542aaa2880aafade57716130a38172a91fd4d3d0c51d9e7f2b23eec5af84b188b8b661c48f46fab25797489a3bd5c84e0732b326178877 SHA512 18d6cecbbeb2ea11f2b4f40356d8a2de5aad45e57ac5f13dc9cd98cff4250b7612aadfb73935775c657e728ca10bc8313e601354f239a96e63ef90a8d2f6b870
 DIST adler-1.0.2.crate 12778 BLAKE2B a1dc17786adae945ac09d3525e609ed944e6465690787bbb831a1b9d53793cba1989793d0a5606d5d23ee20d36457923d451b1b3530c9ec7072a487aa3e55bbd SHA512 7ab190d31890fc05b0b55d8e2c6527a505e06793d5496be0b3831e0513412f9ba97f8148f6f68ed0770fa9cd980a5092d885e058becf1d5506b7c74b82674aa1
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
+DIST aho-corasick-0.7.18.crate 112923 BLAKE2B 4f6947d1aacf89ccfab0592cdc55fa61ef09cea38231d3f758765dbce328a810c0b588be4ba96e81d64955379ee005722d22a7aec39caea6e72342245d7ca34f SHA512 7a23b16231a90d23ee60ad4c81bc225410599a4560d33d3a203138fc540c39cf1000100fed3aed40dcc371c3635656a3792545dca5dd1aefbde00d8774eebd00
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
 DIST base64-0.13.0.crate 62070 BLAKE2B b957f65cdb1e28baeca0cefc92fa98be797409b7dabd15e0e88db6cdfb89779b662cba9f2270fbf3b7b66948fdc46c118b8040a78ab72049c48a928fa802bee0 SHA512 991a72999839daa232f508c5b24e7d3225e8a26db8d1d0e747881b115af9e408b92374e163b31e0b0d324c1c2e57e8e38d66861b61eb0a1dba87bb5871940151
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
@@ -25,6 +29,7 @@ DIST libc-0.2.93.crate 510944 BLAKE2B 93ca2d32f5c1a1cb00ac75601dc3550de058e6d66c
 DIST lock_api-0.4.3.crate 20351 BLAKE2B ffec5616daf545ed4d2ed7cd21fa6340b1892b76702a089474b58320b6379767efd249088f8638e087100a09e4610de7652b718b60c992c64a287c2ebc73b3b4 SHA512 4dda8d993138efe0ffc94206c576e52a879a6cc4e90ffc98caabdfe720649a34c0fda206c4a7b6cc3a99140e619de1da05864218cff6f702e5540165d30573c5
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
+DIST memchr-2.4.0.crate 63392 BLAKE2B a3f30546c3b58ff4eba534bd7046446e96ad793718edfd3379bd125c47eb270728c4aed4aed1c6afa27032f74078b2b2ddddd5cc6044e117e2b956bb13f902a6 SHA512 b142e308a5aef8e45910411789031e194349ee540c4ced0e2384d864dc1913299fb63a161ceb5228256e97d0949661b7f83a169ef9d4b78afbd9004cb7b8a2fb
 DIST miniz_oxide-0.4.4.crate 49938 BLAKE2B 3403416bf9d10b67ef976eb23be64216027c67c56225efd08c87f8269017cb5174ae64f35d18acb66c7a1b831347791cee5af565f3ddfb31ae4210221604b0c4 SHA512 2c6e484a8a53c6b1fb84e2bf9518919e6e5ba84e7716c0bb8e33b53dc0d3432c35f28f19c18368e27c94f6df66b7674f514ef889cf1b19f546bedfb6e6ebaf6f
 DIST num-traits-0.2.14.crate 45476 BLAKE2B ae310d9d5640acc3e45e1e5d1d2f519539795922c0058ee940c94c94b6654b39358b7c18dd23a276f2c1b16a30dd4de4cbc8575bcda6a5c11e70665d670e6439 SHA512 c3028eca9f7b718de0db3a36cf3e462bdba43562d52c9b809ed4cc0aa6af403aea542d6d4da743cd1dd541397815a3c5a84cef4d6e40122994e4be6a62319b2e
 DIST once_cell-1.7.2.crate 28250 BLAKE2B a30a55f6d6e820c691928173a9ce70a60486b28e3e79e8a01a08d87ca0bfb1725b967cc9e070cf53e71b924f73fc2eec2cf67190fc743361b60d82290762725d SHA512 30cf51249bb73e9881cfbc6a54ead7a3db709d560da8d420fd85cf248e66c727b92e8351b7c0c682913cff12b3f984684a272a69c965c56f8343948eb5a194d6
@@ -43,7 +48,9 @@ DIST pyo3-macros-backend-0.13.2.crate 33106 BLAKE2B df7d9cbb06932c7d01f809bb5cc9
 DIST quote-1.0.9.crate 25042 BLAKE2B 26ef31e89fd2f0cc21ff65f8072f30c7977ac634d2536cf9845a0894d6659f62a96cd0a6ee48f7706036c2c1b898ef8c9167bd62714ad0c9cba4fb02f30922af SHA512 dd6cdaea183b85400531ef01e56657edbec0d8f7c27898c1e591b72dff755fa5875b33ca320bd65be0e9aecfc6a61ec119a4bd1291e9f2057fca642ab5b198c8
 DIST redox_syscall-0.2.5.crate 23449 BLAKE2B 2d676dfe40f62285463a25f90ecf24ddb8548f91db1dffd779aaf9c1210bf1eb9c7c535b0d04ac7a483e0724d24ac1d1ed6c78884ad2631a53a870488b7578bc SHA512 f1625eaba110129942893e4cae548d22b6892d275124d29540c947d958e5bb7231309fe052cf15bddb23e0e8f0cdaadd002db5bdc3be578e843c46c175526adc
 DIST regex-1.4.5.crate 241716 BLAKE2B 6e818193ae1bc8edb2415d82946227ac24b5ef9fc99097d4bff1574a5b1accfd33ea04e38be4f3321c0a498888b2feb99c5ae4611974c79cf4a44d5d38c7fc3d SHA512 9ddcbc7a69df47ef1321c45b681ac2e08c693a7ab0de9b877dbb6eb6a5b07788bfb8444f3e644460bb2a7ad9a768567e0366aa34df2b9453036385dbfd39b85a
+DIST regex-1.5.4.crate 236581 BLAKE2B 6efaf69d1a99dc3a2e04b2d1a96b036f631e9a0ad0d3aa57263febd47f7ec12765526f06f9c52a5497bf0d9b455f1d1b39e011adc4c28530c44b65c8a453efc0 SHA512 1a9208358c4ab87c19ec91bcf5c1e35dede46f3a0c0097061b7b53fa77a1e5ad38090d243aab274956f09c491e5fbe3b3b35a91db079b82a2dde2fd9fbad4c19
 DIST regex-syntax-0.6.23.crate 293195 BLAKE2B cc7c951f252fbc814d12e4276728ee0fb9fc381e5c6b3f9ed2204904ce36ec29d95278db00ebed7268ff65165c19b30b0d959e7e5bb26c96538bb3aa7288d724 SHA512 d4f41e40c1460ee95fd96514a3accb4eaa6c125b47abf66ea7b0b60267c0ab112c51c1877d71bf1cfe4f9277f95617f5047058b2a3da91dc24aa5c1cf2781f34
+DIST regex-syntax-0.6.25.crate 293293 BLAKE2B d5ca0dbc26b03c6a1818026f9a69cd226ec934e7c64094d0ebe843052b648617ffae7aa3a074f8da46d03c46996d8b547d8916576342000bd9711089b3e57d73 SHA512 a3d31f82aadc6be1796f76c03152ff24f37fe42d6ce27fb98e2f55ab102f86502bc37ccd563f6e0eba61aab20d002184c618517b678b3b93cb8f0497cc046ca5
 DIST rmp-0.8.10.crate 23541 BLAKE2B f51f12ac191a8cbb4377956bb15d774e464b94fde7abc3f008fd2b6be10ad027ef3a95e854c6461e393b3e1b4c42e43b3a594e9d05283782af8e0893c1d4d629 SHA512 54739648c57e5fd917c60e1f692f5a0e357a95e9b7b1cab08af99f5ac1000b53427a646b6ef019f1e3cbb3861218acf0e8e300133ede4426107045a0abacd87a
 DIST rmp-serde-0.13.7.crate 16676 BLAKE2B d30ee72fa0a1b897c4866ab53e39d673bed1828ca6b09ac9511b8cb34a1092ffcb8b5c34f2e97cbf3ef44b5ccf99a2b68c4e8a202066380fcbe114fc8286df25 SHA512 e2659afd22446e26190008bca8cbf147e09eaeacd0518d81fd26c12e26d9fc06b48844719827cc392a882bb927d62e1d7d946a0426f81eac36cc882d8b0c2d28
 DIST scopeguard-1.1.0.crate 11470 BLAKE2B f774eb90b7d3ffb2efba47518e9d1dead4017ab4b38a4bd74914daa84a5af4bf9eb63da0496e3924499d79cd0439c37447aeda4a21226f95645bddcd6becfabe SHA512 368fa5726df8f42b599993681579a9ffd0196480ee3cd0f9f671e8493f3bedd1e1779bdf2beb329e77e0005fa09b816e3385f309490c0f2781568db275d4d17d
@@ -65,4 +72,5 @@ DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9d
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD adblock-0.4.4.ebuild 2226 BLAKE2B 6a2acd3a1a33c0ddee363d982d4b99566e555d6f699c573d52feab38f681f48e04c4065f48638c90c5ce15da629cec77a5c4284e939db25e91416d526f61250a SHA512 c95ef87d201e3cf5649dbac9ee55616bdfa6c3cf41811c9b0a0d75e5e1f58971a05ff97fd494a8778f774521ac1e983cc34119f9af4f41d124eed636a820b4cd
+EBUILD adblock-0.5.0.ebuild 2294 BLAKE2B 3272ad30dafb7e7226378de6966b979f14479381515fe672d73f728ff338bd48b9e99ed4b7dde419b9b2676cb1a6a5e95f4c793819495d958c8ce15874c432d3 SHA512 8738a2bf2fd43c0230fab3316a43cb7c9512ddae5bd75d9c8f6bb4fa0ee58bb3e546505774887307082cd47b134967059508992ba2184777683eadad6f825732
 MISC metadata.xml 247 BLAKE2B 25c731c759786cef3c3ffdb2513becb723ad51c2e3902853311cf3845ab1e9c193672430b2ba6510df55ff43039f593a6f73bc8e057ac6237462b814beb69d37 SHA512 4926bbe8526eca3acea716f8f865c02398b29f7b0481eb07cc9c92f17974a44b038db4489bdd5ea9fc8b73e6e7212bd6dd0948727f8290b5002014291e748de8
diff --git a/dev-python/adblock/adblock-0.5.0.ebuild b/dev-python/adblock/adblock-0.5.0.ebuild
new file mode 100644
index 000000000000..5ef500a3655d
--- /dev/null
+++ b/dev-python/adblock/adblock-0.5.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adblock-0.3.13
+addr-0.14.0
+adler-1.0.2
+aho-corasick-0.7.18
+autocfg-1.0.1
+base64-0.13.0
+bitflags-1.2.1
+byteorder-1.4.3
+cfg-if-1.0.0
+crc32fast-1.2.1
+ctor-0.1.20
+either-1.6.1
+flate2-1.0.20
+form_urlencoded-1.0.1
+ghost-0.1.2
+idna-0.2.2
+indoc-0.3.6
+indoc-impl-0.3.6
+instant-0.1.9
+inventory-0.1.10
+inventory-impl-0.1.10
+itertools-0.9.0
+libc-0.2.93
+lock_api-0.4.3
+matches-0.1.8
+memchr-2.4.0
+miniz_oxide-0.4.4
+num-traits-0.2.14
+once_cell-1.7.2
+parking_lot-0.11.1
+parking_lot_core-0.8.3
+paste-0.1.18
+paste-impl-0.1.18
+percent-encoding-2.1.0
+proc-macro-hack-0.5.19
+proc-macro2-1.0.26
+psl-2.0.18
+psl-types-2.0.7
+pyo3-0.13.2
+pyo3-macros-0.13.2
+pyo3-macros-backend-0.13.2
+quote-1.0.9
+redox_syscall-0.2.5
+regex-1.5.4
+regex-syntax-0.6.25
+rmp-0.8.10
+rmp-serde-0.13.7
+scopeguard-1.1.0
+seahash-3.0.7
+serde-1.0.125
+serde_derive-1.0.125
+smallvec-1.6.1
+syn-1.0.69
+tinyvec-1.2.0
+tinyvec_macros-0.1.0
+twoway-0.2.1
+unchecked-index-0.2.2
+unicode-bidi-0.3.5
+unicode-normalization-0.1.17
+unicode-xid-0.2.1
+unindent-0.1.7
+url-2.2.1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+PYTHON_COMPAT=( python3_{8,9} )
+
+inherit cargo python-r1
+
+DESCRIPTION="Python wrapper for Brave's adblocking library, which is written in Rust"
+HOMEPAGE="https://github.com/ArniDagur/python-adblock"
+SRC_URI="https://github.com/ArniDagur/python-adblock/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/python-${P}"
+
+LICENSE="|| ( Apache-2.0 MIT )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+	dev-util/maturin
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+
+QA_FLAGS_IGNORED="usr/lib.*/libadblock.so
+	usr/lib/python3.*/site-packages/adblock/adblock.abi3.so"
+QA_SONAME="${QA_FLAGS_IGNORED}"
+
+src_compile() {
+	maturin build $(usex debug "" --release) --no-sdist || die
+	unzip "target/wheels/${P}-*.whl" adblock/adblock.abi3.so || die
+}
+
+src_install() {
+	python_foreach_impl python_domodule adblock
+	dolib.so target/release/libadblock.so
+	dodoc CHANGELOG.md README.md
+}
+
+src_test() {
+	python_foreach_impl epytest
+}
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index a8ec88a083be..4493e8cfd042 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -2,8 +2,10 @@ DIST aesara-rel-2.0.10.tar.gz 8038338 BLAKE2B 411623fe6299c9f037a733ff44324c747a
 DIST aesara-rel-2.0.12.tar.gz 8154749 BLAKE2B 0e39102e985e9f9ed49f65c76389d76702b5d8fbe8c3e1130c61dce7c43eb70f5c73fd3557ff9aeaa1d186b33bb5803a04a4a5b0ce41076af7e923d05ce3353d SHA512 e68f5ce0c64a678219421a0bfc957d1594dc34c887af6f6373c00888387e5da83dec44b68b9309146ae2fd60c0677039980a87ee87ecc0ad3db2fbc80213cc34
 DIST aesara-rel-2.1.0.tar.gz 8161534 BLAKE2B e17b70f7422f0f252cd6d248c16ebe2d609b77724d08251fed39d5f90de9dd36ca4006d767f3be8b0d0058f77f2d670033d058a24a5fa2df2c24ff5193e69c7d SHA512 d5e766eff03858fbf851e1baa0877b1cbc328408b3d2e760c2827ee662a0188e3b6dc5ceecb1c09d1f727171cf4c98c89b618f66695942558f44734a7405a88c
 DIST aesara-rel-2.1.1.tar.gz 8163328 BLAKE2B 5f2d05560f0c3cad0b58017f152011c9f10ebc8360ff925b90f6863fd2c683614cb42e86a69c53f0b168012fa1771ba37924afdf4f9600befad7d5af5a56f7ba SHA512 6a823201a7c4ca00a375dd7e1fcb38f31762e1eebe1079a1859b6ee709eb030c2d884364576b7925f5790c394f979bd5a738925c69c44c8e529757f435fb1a1e
+DIST aesara-rel-2.1.2.tar.gz 8167162 BLAKE2B 727bdf6fb9765c8b60da585595ed7203071490c1dfc0895428ae3efe4a1e74a14bbdf2a76128a6840dedeabdfc997fd297dec23ff517247452433cbdc9449b9a SHA512 22ebd1290a0727f2cf1e106770c872d5f1d785c6946b8e4debcc29a34fddceccb11f0ec81850fd93dbff556aa300bf2ec1bd6eef1297d93e194ff832b442c453
 EBUILD aesara-2.0.10.ebuild 1882 BLAKE2B 07942938c2bfcc6928cfea848b7c6cac65030068f2dc66003b16d832d8402e71c881f01aa3351f1f3dd648254d892a0a1088daa342f57aa5faf3012a651ea30a SHA512 88345779c53f58f8b5adeea79e8d49b865e9a7f374de940fb2785265aa7ce0e3625e369925791559030287052fe19b0d12272794ec1c381558824d7a6d57c3bb
 EBUILD aesara-2.0.12.ebuild 2103 BLAKE2B 4ca1ff4315ed988653a3d84372bcc510a4028fd409598be93d47da36702e1662b9784dcc9c8c526aaba5838ea76f3d8e41a39052f031746f1c7b9f67a58ad7a4 SHA512 4eed528151518ab260d595fa386cda1f209a4d3b299d8c80ebadebe916b9575c3c26442e21bfc870003464f2237b1b9621aa684b84c7f306669af523393eb6aa
 EBUILD aesara-2.1.0.ebuild 2112 BLAKE2B f359e7a97045e2d08e7e1110382c90132453b3c982a51ab2bac581a3455f37b4d49842d294c9ee1855f95fb23c46c8c82aa50574359f40e555c82c48fdf80f1d SHA512 b54b0895caa476d4bc3bbc9cf4b21456e0982ac89dd21587c4e040a1bcb33cfa958593fe60c59c11aa5e8622e0439478cff303efd5f5b921a295f9e6747ef906
 EBUILD aesara-2.1.1.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
+EBUILD aesara-2.1.2.ebuild 2113 BLAKE2B 280d980e33e61684f389e943c945877d440b23718da623db4b4ddba48232e41e1e8ba06501fa0d4ca8325fa261fb80a0976f775c363f9754c0ae6e85fc6de2b9 SHA512 231cee60373079e993267910bfdd210da6db3c3b45f0367aa6ff1d5c4f248f6631d9e8122b6d86e9e44672b33356c0a01eff219dcd5d08c4d622618a5e7e27ea
 MISC metadata.xml 404 BLAKE2B 5f15a3e7f8771f0d8b95097374c87fb6793089f1a0e000c433a8f644be3cb7d945128d0b164b608405070b976c932c77738ed930bf4734129ba37f4feda667b3 SHA512 f7afb5e2c8053cbf8ace61197d234869ed86a06bf066652eac3ad800c7251d18113dfd2e3115281c10f016c56e845d9d34915e2eddbeac4e3a2f414a8e858148
diff --git a/dev-python/aesara/aesara-2.1.2.ebuild b/dev-python/aesara/aesara-2.1.2.ebuild
new file mode 100644
index 000000000000..efa88e842a94
--- /dev/null
+++ b/dev-python/aesara/aesara-2.1.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/aesara-devs/aesara"
+SRC_URI="https://github.com/aesara-devs/aesara/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/filelock[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.17.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc 'dev-python/sphinx_rtd_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	sed -i -e "s/tests.\*/tests\*/" setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local exclude=(
+		# speed tests are unreliable
+		tests/scan/test_basic.py::test_speed
+		tests/scan/test_basic.py::test_speed_rnn
+		tests/scan/test_basic.py::test_speed_batchrnn
+		tests/link/test_vm.py::test_speed
+		tests/link/test_vm.py::test_speed_lazy
+		tests/tensor/test_gc.py::test_merge_opt_runtime
+
+		# rounding problem?
+		# https://github.com/aesara-devs/aesara/issues/477
+		tests/tensor/test_math_scipy.py::TestGammaUBroadcast::test_good
+		tests/tensor/test_math_scipy.py::TestGammaUInplaceBroadcast::test_good
+	)
+
+	distutils_install_for_testing
+	# we do not package numba
+	epytest ${exclude[@]/#/--deselect } \
+		--ignore tests/link/test_numba.py \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+# https://dev.gentoo.org/~mgorny/python-guide/concept.html#packaging-pkgutil-style-namespaces-in-gentoo
+python_install() {
+	rm "${BUILD_DIR}"/lib/bin/__init__.py || die
+	distutils-r1_python_install
+}
+
+pkg_postinst() {
+	optfeature "GPU code generation/execution on NVIDIA gpus" dev-util/nvidia-cuda-toolkit dev-util/nvidia-cuda-sdk
+	optfeature "GPU/CPU code generation on CUDA and OpenCL devices" dev-libs/libgpuarray dev-python/pycuda
+}
diff --git a/dev-python/amodem/Manifest b/dev-python/amodem/Manifest
index 50e788dbbd48..234aa4db430e 100644
--- a/dev-python/amodem/Manifest
+++ b/dev-python/amodem/Manifest
@@ -1,5 +1,7 @@
 DIST amodem-1.15.1.tar.gz 30482 BLAKE2B 964cb6b6e674044650898d1f9ae67b3b181f836a4c52caad08046841ea222a0b8e7aab23789ca440b5ae98c1b5f20ce6a7f31707032471fe3543397f2818d731 SHA512 16d1ab37146181432da5388f5a387e477979578a656c73efca18d721ba90dc47ced28ef054c589ea693dcf1bf2744317ddc22110cc61b9330ff8665b9f209240
 DIST amodem-1.15.2.tar.gz 30438 BLAKE2B ca8e4d0a1aad5a3c9b10568e7613cba95a7bb356b5ac46cbfb383ce057012ed385abcc7b348ef18090b49fe00f402f79b6ebf719e0b938c960f38593c0acd3e7 SHA512 3d0a366c19fbdaccfb990e875e49935fdb2b6d2a3bac69182ec2c7e51e67901429c968f41edcc2dd98dc74e90958a58a09b24d0d4d36ea7256a4b945881483b6
+DIST amodem-1.15.3.tar.gz 30297 BLAKE2B 7ab9bce50eee0fbd788fc42ca668a187ac14e5c8e9c6d2a8c4fcddf24ec77a5e40c37edf21222d49f984d343adf46ad710973dc689e18e9065b470b4d1e3a5b6 SHA512 72e574bc4ddfbe949763427587ed2afe8baf153188cb2c6abda1c9f0e9e8f483bdda1edff9278519130b1b5d5487527d83cc9307e6f47a7a86404757199e0712
 EBUILD amodem-1.15.1-r1.ebuild 592 BLAKE2B 19bedecc070ca6472177add7cda6ca1c6a166c7dce2f9910e41c837f115a6d4b8d887b9ea50808f34aa97517c15dca6bfb76203c8106e156980a8a80ff00ed00 SHA512 6cb8c9dab01249327c1cdb80fa6b21e7b4a9dc1eca682d6f6bd31c4c98cc497946a88d5576afcfa30a880153f7654d1896e5c68761c5cc1e0b8df250579da115
 EBUILD amodem-1.15.2.ebuild 559 BLAKE2B fce820f054e8fb30172eea22a4d0dce73f38a259cc523ae15f0aa277ef66051ac0984687a8733ba8ee6725653fbce9915b0aa5087328c760c8953acb36dc929f SHA512 da49d508be223cd057eb0767f26fbe5993b9e87c758b8bb41c557d717ae5676d86dc59bcaacebfacb22493173a52a14dc2089997f1b761c477024d51f6a33f0c
+EBUILD amodem-1.15.3.ebuild 525 BLAKE2B 4b3d4534a4ab01b983faaaefce4ee1ff01ed26e5f7a5aae802d44d88ef0f9f075e0af585708331425f16590833ae083d31cac55f06d482a6d1f2d0045d6a8998 SHA512 f722ee4da7f297c5cbe0215aa3ecfa6eec38fd3f33ff31772fe2e56b814cd74c8f24c0aaab9acb94e6d48bccf3af54c4ef7d5f3c909a994cfba0c9b60def4dea
 MISC metadata.xml 569 BLAKE2B 676247b7bc7d89b0f6fa2d591be617e02493c5c4cb7b2cc5879cf395136d5466093d2da0d08314e95c03ab1b12c00dc014ff717b7cf5018b71a08793c553dd26 SHA512 50d0c0ae9e5ab4155906706df3db3741db9c938a0d8800639c30c22052f0012dda8a78ad1a8608af01f823e93fe88f762c0c3d5e1fda5754d2fe133b36a40890
diff --git a/dev-python/amodem/amodem-1.15.3.ebuild b/dev-python/amodem/amodem-1.15.3.ebuild
new file mode 100644
index 000000000000..f26ce2b39b7f
--- /dev/null
+++ b/dev-python/amodem/amodem-1.15.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Transmit data between two computers using audio"
+HOMEPAGE="https://github.com/romanz/amodem"
+SRC_URI="https://github.com/romanz/amodem/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/astroid/Manifest b/dev-python/astroid/Manifest
index 5ff008e07b80..3953256e0210 100644
--- a/dev-python/astroid/Manifest
+++ b/dev-python/astroid/Manifest
@@ -1,5 +1,9 @@
 DIST astroid-2.5.8.tar.gz 354281 BLAKE2B 70ee47c26b765ba9f9bd40cf120a9ce13709043738e20a08d201cdb899789c6c6bdc604aaab49c78b2888503b46321a1728cce656f39d70ce6877ac088cb9567 SHA512 ab2f413e399810e98bd61c837ac90674e7c6d8e2f4d32f3141b21bf1360c785831fc4afd347e755c97627a04cb482aa4e455897e1c02eec8c5fcd28c54c1e9fc
 DIST astroid-2.6.2.tar.gz 360787 BLAKE2B a2744b9ada601b731989f17ec75aa94d88825693a4ccf349374b8795b0db3879aa5bffe838df68759ff3296cd8af9cd45524e7d894a363f54055f3f1fa01e92e SHA512 776f8f9a12d425b7f048318b632dedb8894b6a3051a0607d1079437084aab4e9593e39cf9c7e01c2dd722364d2396cf13d7d26cc2acf33482d75584c458d4b89
+DIST astroid-2.6.4.tar.gz 364123 BLAKE2B 742d2bbe4a4056406b14a61d6aecb37d7add577b6f97b0649f22f7133a5ec0af30b0a7e195817681d014ae25fb69684d776a45948709cb6c2e349352da8960d4 SHA512 d81aee724804438565ab8d49b5df132e528989a3f746f9855ac841c98f06a85c72a7749492ed2856657895e948548f7f9293e4347f4247219065592d2eebf642
+DIST astroid-2.6.5.tar.gz 364383 BLAKE2B 22da12e30bbb27ad93516ef18ebe64839fc1f7057a46fe82444c189bada942b32e00c314fe47eaecaf7cb2e7e047206152e1df98b4f46a40010bef9392721b9c SHA512 28c6fe2953f10f99c31af611644137d566489188459c9249e5621c4dc1c5fecb59c1ba3cc0bbab95c2609203388d1df299f0cb87a1fc3b3bb8b4ad3ad6b010a4
 EBUILD astroid-2.5.8.ebuild 1189 BLAKE2B f519059d0c45508e587e62b79df37ce94385e97bd71c4e91d2e4b3845c55104b21ca3a689873782a0e1ced58d3c2d67df31cdfc9e4294d81e91023c264e0f461 SHA512 f63e523a3f82497443b1a7e72da6298ef8284d72074b7f87209497334795a47ec2a9cc09c7b960d77754f99adad94e36d80dc62fb25518d90e42f0f0e5c63424
 EBUILD astroid-2.6.2.ebuild 1203 BLAKE2B 76c0402208fe16f0efb7083e0dddbba8a45ada958eee01b9386f202e98596e14a3c85bd7d9543b54dc7fe15fcb3a4f7719145f0676e1157154b134bf32651b22 SHA512 e56dba9ea2058590585d088140ef844f65ad450fb1dedbcaf56eb82f2e4b1756bd34ed6e4c5749f1f61476ea89dc28d46b1b7e91b38e8a82406e39a5fa7d5f48
+EBUILD astroid-2.6.4.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
+EBUILD astroid-2.6.5.ebuild 1237 BLAKE2B 59458a61c8528210da912421237f19d0b6462829c19d5da3002cb9e1a713dc2aa1c855f0f2e494931faaeccc4e36b4a0589352e8f9d8e0b49621f02722ee8e27 SHA512 b0ebbef5b7f14f289cbb8bdfb9e068e529ca070b7fcd22b56b1e9c5131eba1a4fcb4d1a78c29c0a0a5abd3d39a545e11ed28e720013e08199071f05a98201055
 MISC metadata.xml 1142 BLAKE2B a10eadb6bc619901a39f827ac6a4bafaa9e17ff1a521b73d3687c38cd8d39fe9b13d3d817db89e50dadaeb19f0953b48bdcc8170e9b844869d1ee71a792b8164 SHA512 ab6d5f84c85e94c0e5543b8cd9072b6ce4b32cc1ef454ab7cb836e94b82ac85ecaf70685c30398e8710fda68a1f65417b135a296287f7c2a388e59ff4703ea35
diff --git a/dev-python/astroid/astroid-2.6.4.ebuild b/dev-python/astroid/astroid-2.6.4.ebuild
new file mode 100644
index 000000000000..cda705df7b1d
--- /dev/null
+++ b/dev-python/astroid/astroid-2.6.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/astroid/astroid-2.6.5.ebuild b/dev-python/astroid/astroid-2.6.5.ebuild
new file mode 100644
index 000000000000..cda705df7b1d
--- /dev/null
+++ b/dev-python/astroid/astroid-2.6.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Abstract Syntax Tree for logilab packages"
+HOMEPAGE="
+	https://github.com/PyCQA/astroid/
+	https://pypi.org/project/astroid/"
+SRC_URI="
+	https://github.com/PyCQA/astroid/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# Version specified in __pkginfo__.py.
+RDEPEND="
+	>=dev-python/lazy-object-proxy-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/wrapt-1.11.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/python-dateutil[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+python_test() {
+	local deselect=(
+		# no clue why it's broken
+		tests/unittest_modutils.py::GetModulePartTest::test_known_values_get_builtin_module_part
+	)
+
+	# Faker causes sys.path_importer_cache keys to be overwritten
+	# with PosixPaths
+	epytest -p no:faker ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index f12c5ef53c07..1e354c3db1c7 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,5 +1,7 @@
 DIST aws-sam-translator-1.36.0.tar.gz 878204 BLAKE2B 027837687709d2bbe166d4c40599156c8075b1902fe9f75aa5f29bc1f725e2cb97a1f7020cba2f75d5a7180e658e1d47cf4ff03ff3336b0ac21458426f6241fa SHA512 8af9e54d9a02ac3a315b1274d71a5e7413b5a39c6913036f0cc57cf1cd94d6d079f78e4810d5b501003bf5b06a4f25c2481c8abce0836c01da6f962dc0163651
 DIST aws-sam-translator-1.37.0.tar.gz 880633 BLAKE2B b3913b12fff38657662a16c13ae6ea3b836faa94eae986e7364543e7ece6cd53afbc9bc80380ce5c4500be57d1b588f617f3ec7e6104cf83357ffe733f4e50e2 SHA512 aeaf194d7c8338802762a667ac05e57a8fbffbae7d1a707a708392b1d103d4e30f42e683e077b5cbfc540bd38debac95c578dc2c02f2c3f7ed531ece64bb7200
+DIST aws-sam-translator-1.38.0.tar.gz 895012 BLAKE2B e3beae1af8b9fa510f3f21f4f637b0816084c206d49009106097c3b58ef8755b51041b6908fcd04c28b18e512b782570f84f5acfc7de5c6cab239a70e5bd114e SHA512 d76ef3e95bf5e4db1cfbfd1df9928d8f62dd1245f6629ab5078c4f3761e1d5e4ac372d698aa8fba1f4f77a38826c2e9c9f4899518dccacf56ffba2f89ddea801
 EBUILD aws-sam-translator-1.36.0.ebuild 1214 BLAKE2B bd359042998104aaf99fa92928a96080e3e87d2238cdf7aebc18fc5fdfcb42a12650488f259a051630e6a71ddccdb8097b78affb7f81e0f925535e4bf9f403b8 SHA512 52aa296ee137cdfecc6906e82b226b030af0beb1bfa67b90d17c26e44c40a58283d55760e82161ef7f8be0062fcdf03a14fd62a047532e1abd8ba33a9fea11ec
 EBUILD aws-sam-translator-1.37.0.ebuild 1216 BLAKE2B fe9784c4435b5c56390bfce87058de70b98af7620ffc6f58e3381ac0249a9d8e01d1a25f7b8538c33f02eff149628a620301dc88143f5a68b8ca714efc5f9c89 SHA512 4b82a3f9f589eabc4197187e1e87ff2ffa4e52643ce33f84796001fdd924528e6dc108c7f784d606d91f17cf7ae9182dd6c3bf336099de0a3909641219158326
+EBUILD aws-sam-translator-1.38.0.ebuild 1216 BLAKE2B fe9784c4435b5c56390bfce87058de70b98af7620ffc6f58e3381ac0249a9d8e01d1a25f7b8538c33f02eff149628a620301dc88143f5a68b8ca714efc5f9c89 SHA512 4b82a3f9f589eabc4197187e1e87ff2ffa4e52643ce33f84796001fdd924528e6dc108c7f784d606d91f17cf7ae9182dd6c3bf336099de0a3909641219158326
 MISC metadata.xml 602 BLAKE2B ce51fd399f69177920ab2a99807491640ee4fc4193c46279a05f442b608b420122ba8b7302b3fab1724ba2b3bad5519b51d86ff050713ad5bf9953acd843dba0 SHA512 829df35f0b222b1a3c2c17e813bcd2c8d8311e694ce0244877a9e492a91edb9597be906e7a449d7ac641787643fd355a0014e3e9ef113023066c9ccf52f32e65
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.38.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.38.0.ebuild
new file mode 100644
index 000000000000..9b41296baaac
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.38.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="https://github.com/aws/serverless-application-model
+	https://pypi.org/project/aws-sam-translator/"
+SRC_URI="https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/boto3-1.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-2.6[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -r -e 's:--cov(-[[:graph:]]+|)[[:space:]]+[[:graph:]]+::g' \
+		-i pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 95096270a01c..417971e3f198 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,7 +1,9 @@
 DIST bitarray-2.1.3.tar.gz 72556 BLAKE2B 737ba1e1586269d279198bd966c84abc95b74179e361f1e08644d3c4557085bdd99931ce9cec633e39d4fd454fa36d0170c5057a8931cbd8ca2fb8f3bdf71dc1 SHA512 de84b8b1c84be32f946a5f12e8a6ce84f9aecba6e5dc28c0cb0e1fa59434cc5b0757cd5e0b616163b134d460edaf4d53edd53da86ea517a97c818ee83855b174
 DIST bitarray-2.2.1.tar.gz 77371 BLAKE2B f6f699594a28fa680eaaa2ad260da00f9827090e770b22226e7a4bfd72c54759a80370f6842cb473dade6761b744175e4630af5e7b3fdd09768b7199e1a08e74 SHA512 7eb25359d405e0be63ca7faab50fd7ab652d8f838f09587b4faa94adc78952582e7c7c0b605820e5feafd18d35edf050f70f65bce1123b883ad47bd1e54244d3
 DIST bitarray-2.2.2.tar.gz 78273 BLAKE2B 1c9b9c4011b1b11481209aba6958aa3c58dc2c1f5188a97f8b6c15a8a77ed0338bfc64bfcf6da3667c317631e5d271408f443a33e214c8f123f2c764cc93d6b0 SHA512 98b02ecc39befa619c816117fdfc3d69efb931203bb509e92bdf800f5c64e8633a986751d1650cb33dd0c6c0df0653f70c97fe73d4334198b81f39aafec4e019
+DIST bitarray-2.2.3.tar.gz 79709 BLAKE2B 75bb085914fa5f7b926ede947d69f7a8de1dcd8e61917d1e154049102c539e78a7d0a4bab181a8bf8a19338d0d73124d9aec5f746f25d12a8f5a0c188f309009 SHA512 ed8641bd12a87e440642535baab62b132ce4499b8525a699eb82926b098d7f9ce6f66ea07846bfacabcf45cdc1d30c12c104a0b1af638efa8ad809329914a186
 EBUILD bitarray-2.1.3.ebuild 555 BLAKE2B 2b3a6ec7d61f8aab17773e44b70fa98a2ecc24384b22561fd83396bfc350ff7d9addf3228ae1580d0d9dc2dd6a2a6d094232b2e52568e06f6eb77540567bbdf6 SHA512 b7c65e4bffe459f8fef3c3af19be16f4fa1c948121ae044a8abcbf6f65ce7400d50641b3c794d698286b89b46b42479decdf8211c44aafc36c9c38acb619b2d5
 EBUILD bitarray-2.2.1.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 EBUILD bitarray-2.2.2.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
+EBUILD bitarray-2.2.3.ebuild 556 BLAKE2B 317ac7e7b56b293c16de25f29c17870ad833d12c26c3f8c6414f4e17c80e7fd2cf742b18d02afd972226316fb5316efe6f826ff69920209736c2b84399771577 SHA512 7e56ec7dce7cdd7c082fb225b1ac609960f0348c94e4a9b2e0e9610cf93e20c4ec2661f0758271130e7cbda6fbf339900e12adab17ae74328a19e7a36de82198
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-2.2.3.ebuild b/dev-python/bitarray/bitarray-2.2.3.ebuild
new file mode 100644
index 000000000000..2db993517908
--- /dev/null
+++ b/dev-python/bitarray/bitarray-2.2.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=no
+inherit distutils-r1
+
+DESCRIPTION="Efficient arrays of booleans -- C extension"
+HOMEPAGE="https://github.com/ilanschnell/bitarray https://pypi.org/project/bitarray/"
+SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+python_test() {
+	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 67571011d038..f1dc66c6eb06 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,3 +1,5 @@
 DIST bitstring-3.1.7.tar.gz 407574 BLAKE2B aef290b174ca4cfb756778683e956ba083a8a51cc77d6232477318f91d6d1aee495967722e97a090353032ab99db97f72f3e4d5835e6a841c5076f788ffff456 SHA512 57a48cf279f1e0e2ea8e1ce436cd8c256325f6f9e9ad340b8c28c2954712faf8473e5779aeff4d66b4c596dbeb4cb39ea3328d5c22dcb4d8b0ee0a7098023561
+DIST bitstring-3.1.9.tar.gz 408443 BLAKE2B 747ce06fc33681cbe63d706c2dace5ebce314aea1ba45f8a5a9d65f849bcf253fa9354e39fd80731af4845993e418f27232ede47c940367b8cb425867ffee8c9 SHA512 6dc9c8d683e4415dfd685153b350bd5462117c49c7d8fcd9b2a066f927d82bb2bfae1cc5df543dd38c5e65b93d453ad13d2937f9523b77b007b1234b24ba7be1
 EBUILD bitstring-3.1.7.ebuild 609 BLAKE2B 0df85b6d07998bda4615101776e33312bcc85da3fae9ea4cd1358cdec33405ade6f7999c050d8d7ecfc95e62e02117427e43305a01897f631730ee8b9fc88f8c SHA512 f6506e19231a6ad124693af8baacbb0251573e431ff83a5e7d34306355393ececb3d7166d640fba61545eeaba118ff26ea5f889e231c99de06ecf27f89708987
+EBUILD bitstring-3.1.9.ebuild 582 BLAKE2B 6d7a214ead7da14de4205d73290d07e435d64125f5fd93efb71b243d07747d40ddf7bf218d17f45564009ad5f3720f2a3b6e22d005690df45001f5dcc6811d02 SHA512 2b82f633c2ac0053796b7095931a8ada6f409878cebf3bd2005b5d1ac097928a1165faeb8ed1172005c272c44ae0477bbebd8e900aa900f091120f3becf65059
 MISC metadata.xml 732 BLAKE2B a9b70595fe02e148ffca9507d10b32167a12f8c96d10e5c37a33be5c469d450ace9f58e0c2002334c2519c2927b2f074f0b38ba46fe8404353737ea65e09993c SHA512 c192d76abacb6e82cc65877ed9cf211e79e944aed79242c0a01808dbef8c2ec2dd5d254c0022cb17d5acae33fc8065362f0c4d512f3f440b64e9247daa52d557
diff --git a/dev-python/bitstring/bitstring-3.1.9.ebuild b/dev-python/bitstring/bitstring-3.1.9.ebuild
new file mode 100644
index 000000000000..6e59803ccaf9
--- /dev/null
+++ b/dev-python/bitstring/bitstring-3.1.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A pure Python module for creation and analysis of binary data"
+HOMEPAGE="https://github.com/scott-griffiths/bitstring"
+SRC_URI="https://github.com/scott-griffiths/${PN}/archive/${P}.tar.gz"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+distutils_enable_tests unittest
+
+DOCS=( README.rst release_notes.txt )
+
+src_test() {
+	cd test || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/black/Manifest b/dev-python/black/Manifest
index 0cd71334b087..206dcfb56794 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -4,5 +4,5 @@ DIST black-21.6b0.tar.gz 1149421 BLAKE2B a9935d9ef3c9530d127cc2d06e2d64b48e6f2a5
 DIST black-21.7b0.tar.gz 1148431 BLAKE2B 34dcd2fd45b914433d6290c10bb07b44277cb490ef884c44ec00cb5495fadd2e649099dd356c4063d0fff5a6477609b11db73e1dc94d88106c56a3ca9b087c90 SHA512 7e6ee4e185080802c9dfc6eeb73b52b2489283c4bcbc086366f50ffb8ea3e0f4bdfedac9a5906be6ec119e65050741c71591c394f0c361a1d75b3ff4061945c1
 EBUILD black-20.8_beta1.ebuild 2242 BLAKE2B cdcf87b20f7d169425bf851b68dc8f393a7fa60837cce59f2ef9445189609291f5e53561c6411587e0b1343075e5bdf84fdda3771db629f856ce94a15adbafc0 SHA512 4a9fd8f011f4d10ef2dd21cb142065d568fd5d3486a00d4932c1f270aec46fe6f9e097667db0356d5c791dc7fad1ff9d88792292d281da69db3ec68dd5b1f14c
 EBUILD black-21.6_beta0.ebuild 1536 BLAKE2B 980dc773be1b94a4d1daf50f9a9432b734e166dd0dae79b239ecb720999dd06a1313ada814bc986878e6f433c2965fedd47c437e9fcd64bdc8bd59fb3fbbce45 SHA512 f4f1d020609bf8171e770a2c7f6a41f7ba5047facef5010d229c1881f86ff1bb635341cdff63148b5da0c5b1aac103fb67450ca35d929a7413faba706084094e
-EBUILD black-21.7_beta0.ebuild 1334 BLAKE2B 437d2ec4445a6653d4415e3f307fe84468eb99f0422bc1a0919f71773de361224ac57e52e932c595d77f4865c4726f5c1a64a4f740e25dbe9d3485398af946f2 SHA512 7450a4f89eb092402f7b662588fadeac5a2febd13f6320f303678c4871882a6fff9672cc11c771bbb2a96e0a10baba7d1b0bf9ab63f86dc67fb59193dabd4a65
+EBUILD black-21.7_beta0.ebuild 1348 BLAKE2B 4b42e640783f97530531950439c5c23757dd8a0129c01b53a1535a8564b4ff4e29ebf12012445067dc4a87cfca242644466ca96f67622c00ada098cd6d35a5dc SHA512 8ecd1609e65d6e6d3b46ea16d465f474905d4be7cdc27c867e59733d902c345630ce450ba130de08fdf2212b63aa7bce2cd42c0e88cc8897d9567ffc35c79281
 MISC metadata.xml 396 BLAKE2B d65402ff00389ead3359ab2afe53d33e88a5c0a6aedfd83f6a3fe946f4005e1edbd77683b2fc1097a7963383da492bad8889c2f30dd0408a4c8fb9fea6d508f3 SHA512 33aeaaa8cbcfbd0323075ebc06e4ff2dae2988ac88fe067a3fd51eae6b5ebb6ebaf9bc874d7275acc0ab6d36ac5b6ed9cb32d8e10e3e0bc3aaf75c70a5041c8d
diff --git a/dev-python/black/black-21.7_beta0.ebuild b/dev-python/black/black-21.7_beta0.ebuild
index 38f9c3e07d94..6c1c2cf07008 100644
--- a/dev-python/black/black-21.7_beta0.ebuild
+++ b/dev-python/black/black-21.7_beta0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	dev-python/appdirs[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index bf03e9c4823d..bb21828e53dc 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -2,9 +2,17 @@ DIST boto3-1.17.104.tar.gz 387800 BLAKE2B 928824ab0a0c091fec430c5d86b0c5663f2a98
 DIST boto3-1.17.112.tar.gz 391748 BLAKE2B 071eddfe134face48b86985ccd0171e0d8994fc65cd75e26945dfcab29566f42aa965c82b736cc7dd821a920e6903e4c45917af1759214606c2448b46c528cff SHA512 dcee3f4e2dfaf8feeeecc82ca938a72d654ced7a44f32e3dab43a225d8dcf0b3d20f0699770cfcd8ede840f792d37e124597d096322b88ce54c2e27e109da6e7
 DIST boto3-1.18.0.tar.gz 392345 BLAKE2B 8d464e038892cd77d7b171c27f41eee31c630ebcadce6677f76ccc270f3f8471d7a8443d174ce1b6ea5cdcfe98973faa42ddda4123ec21d225464515bdcd862d SHA512 ba5af17ae6705bfdea4a9d6bccb18d3f1593980d594be4dbb3049123089ba7d8ecaaed685d8a3181ae50e95b537e7a50fed3be694b4f61d3ba250693ae249f4d
 DIST boto3-1.18.1.tar.gz 392759 BLAKE2B bfa0bcfba9a413fbb13b2698f3ef2461cac99a9fddea0fe16d790a0ddab60fcd46b13ac4026536b9f89fb65ff703d61a4f01499423aa54289f17fc0f035ea2d6 SHA512 1aca424ff105fe2049c94aeaff306a683dd4eb9ac9b88303ff4857f53ddb4d3f267ef69119f8cbdb8463ab12331b2d89149fd0b10ccd23c4fde9485e63ba0005
+DIST boto3-1.18.2.tar.gz 393528 BLAKE2B 20424f9a8ff013d1d9724f741ad6754747de504fb961688f433eba74ce1d6df7e95d68c45be1e87df1532f99b2fa4d7e8b00671a8ae9a378a4df74764924cdaa SHA512 287a1f24f62fa83fd944632799540257b2f8d6cf3b5d6add57be60e4f49dafd685bb4fcceef37fe907edba00a7f2285d92bd8d381b03e45ac794b22fdcfe8783
+DIST boto3-1.18.3.tar.gz 393645 BLAKE2B 4967ac751e9ff5a86f6f571961df31d82f6012ade28aa19a038399077bf5a1b968dfa1172995423890b79a2ede54e2c6f6c1937e8ccf21010f17a4d96928df62 SHA512 f9c42257f0925fffaeb1a36e4731dc54fee1836c249617444292991d043dbb9b58472f73a806981c9763b569cc7402b378f6e1e0102fe0f995a7754807f19b38
+DIST boto3-1.18.4.tar.gz 394442 BLAKE2B e82726143b353b843e915ea78ea2e033077ee495b1d416866f5c231f8bd864372496736d266b2b848ed8afd3134bd865c507291fd2fbdd5cae00a92ce3c5e76d SHA512 b3ba1328476a1c642c6b813afc3879e904bc14da69e062156df0405b3da6d2a15a4a40602f24d0a067a83cc441ce5a5e353dacb84869b0fe24e9984c0dec719f
+DIST boto3-1.18.5.tar.gz 394930 BLAKE2B a7f58699a4a27c85f00f47eb34d861509446d159434db8d492edb8d93f3d872757dde5adb358b89af80d9fb3f489fb424a4de6f8c62ac14220b22588bfb1ff0e SHA512 9292241055684dfdda22ec2243b0d64b00b3fa3ec73b3209db8eb8d90c14aa5aa2d7a77cdd0670350227ed6b923b9142842ed5bc8a4fecbaa4705a90af546022
 EBUILD boto3-1.17.104.ebuild 1336 BLAKE2B cd492f68d066b954200ac23e330958382b0ed6d5dd6389b24824282197579442a7ea9b70db065259f436aebabb898fe9e9556f5be525fb7bf47960fd61903782 SHA512 32ecfbc280efd39c19295d6d38f3df12ef199263e741b13c35a0a927a609d90b250ba2a5a1324f045c493db7249d5889627d772767cf5de74946a35e5d17e9bc
 EBUILD boto3-1.17.112.ebuild 1343 BLAKE2B b99b79dbe8c1d31ec1f50bcb5ef0670b315b8ae9a32e018b0b407e1b8b7a6aa3e2b19937859b434051b97d7349a01a490830905e0c4910a1e035bf6c44f8996f SHA512 5076bac9855c01ae71d3b61366127aa62ad373f59385a695d375fc1dca91c40c1018914bf53a2b112e03fcb7861295a7334fa024e562e1f8d0ddb2d2acbe1ca2
 EBUILD boto3-1.18.0.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-1.18.1.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.2.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.3.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.4.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
+EBUILD boto3-1.18.5.ebuild 1345 BLAKE2B 7fcca55ab872238ac219842aa92b00c47e9844f062fc394777d4baba80e8c61303dabe77856a62a70cb52056c06157188edfee68ac1e14d9f46775108b178176 SHA512 4dd0c4e13e8b5437ad51cae5da3c4a8cc4b31a1f0bffc679915fabf144250d074fd3640d54fd398feaf11e859354496daf1627daa8be2f5f8d7bfb2d32683d69
 EBUILD boto3-9999.ebuild 1343 BLAKE2B b2887132265c9ba8dc7ee25f402103f3384553d7cf921f2f0280ad04c508adeb21a27baa344a0a7bdfbe38bc5c822e93b2d7a04ff2dfb57e988f234eaf0fe642 SHA512 766f1cdc7617ae2cc9cceccc7ff8dbfddc200d84fef7edc6c9b5a7b42fd599715ab221054854b3f5a4f050f4f4a27d7a8f5216e063b340ef75aa82b2d2d2da8d
 MISC metadata.xml 605 BLAKE2B cb7041ecfae68d44cc4c533600c9527f901b3b57b4ac6b7877b489f849e1257f3ea157c901bb67dd44ef06296f02564b6b9e341bfd1d102b68512f7a40b48ede SHA512 2f9630e0d4396ae6f3a7a0aa328440fba250d330d4cb5e4a9cc68caaf0ffc133960294ca4fdd0bae150a212555ebdff07208e909c6f7207857a3b7774178dfc8
diff --git a/dev-python/boto3/boto3-1.18.2.ebuild b/dev-python/boto3/boto3-1.18.2.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.3.ebuild b/dev-python/boto3/boto3-1.18.3.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.4.ebuild b/dev-python/boto3/boto3-1.18.4.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.18.5.ebuild b/dev-python/boto3/boto3-1.18.5.ebuild
new file mode 100644
index 000000000000..819e73691110
--- /dev/null
+++ b/dev-python/boto3/boto3-1.18.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ ||
+		die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 26cb3e2ecd71..c0dd5fb67e98 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -3,9 +3,17 @@ DIST botocore-1.20.104.tar.gz 7883624 BLAKE2B 4fb4c6abff5a2c3d3e19b11576e723f15a
 DIST botocore-1.20.112.tar.gz 7917776 BLAKE2B 6a5ebf3d32c505ec2c1fc4cd3d97aa94c76b6206dda6ba28a946dfdc9973073019389c05d1cf09a0eced701fe86a9b8a292835415c0b1ceea75959a3186f65c6 SHA512 4b36367ffdd011aeb7654fd5c52c38e95bae4c55e5af85e38b0764140539ad1f8b9d75b0c7fd1009fda8d005ef4b17673b06f85a76b52fcebf05925297b6bbbf
 DIST botocore-1.21.0.tar.gz 7955550 BLAKE2B 7e68375d07d858dc2071538c2382d8693df23fea5326938491c492abe55c060d0cdf98698cef9b06dac996a59c907ed780e5baadabbb7c10d5e41efa84c4750c SHA512 e56eea7f3c4f39f51ef1d53dfb42fd5d601167cca7c868b1cf2f291732a8cf90aaa874760f262085439df5726c6b610369a325e863533b593aa708fd901398a1
 DIST botocore-1.21.1.tar.gz 7954248 BLAKE2B d6e7a71d6dd90ed0fcf0dbab3182dcdfa4072e65a1f344d44ac30abc829ac6c546a0ebcdee51f61ae65008550acf65052b49530ae3b3a62d81af222e6e8a0929 SHA512 86d4b4159a96426e7ab853b06564604fd9729011199ba691f6204a7e5f52d9927b93511b73cfc03b65bce706563c6d50b577d85d0de0e50fb5d877472d8326dc
+DIST botocore-1.21.2.tar.gz 7960118 BLAKE2B 11d2845e1846c03591625a95b21ff6fe1acb1448414a5f09de1d427614e927d974fafe5dd5d4f195aeb2f3b86d60822a8c73f1bc532bb45c85be8421f92eedc3 SHA512 501f059518026bef10fe933d20a3348b4140cff9ef1af38e17552aea8698179135f5271604e988f53c215e3a13158d7784a49a6b56c0d4db591f99dac9c57ca8
+DIST botocore-1.21.3.tar.gz 7959023 BLAKE2B aab15319b9f36c25ee88f2bf0b2efcb6bbffeac1b4e38dcbdfde3a947f702016e77b66c4b125ca2b63614223109fd793da68f9ce1b1d14476cdd6a3fcb10dfce SHA512 5a8ce8f612fd0e1c68a75223dda95673f72159b02a040d1a71920b7e75b3aa9d14589c33a52970182970a353308954e8cd6d5f97d374e0e2ee2cd40e0dce786e
+DIST botocore-1.21.4.tar.gz 7964960 BLAKE2B 71d55b47633aa658a9dc921375c77230a6ebb89460d9de5a9982d730e03247972476400dbcf292da0a885789860117c1abc9bf803c79547049b242feb8755d15 SHA512 4a36e5870d9996973e2258f2e6afeb7381ac94d14075eaa9885f6f89afb87fa5b4461b02ab234b4ecc8e24630434dbb839e8ad30f622de6ffa5402f872f84a97
+DIST botocore-1.21.5.tar.gz 7968981 BLAKE2B cea2c648e5f8d6f99bd1f11f430511abdc413bb3a2e36b2ca149f4edb0b8b750cba1149474351ab52a04e08018de81fab93607eb65e19b452a80a249cefb5871 SHA512 ad84b3f75883279452ba9922492e1a63b9f951ed54767feb573000d077335eb50685727ae1924d02f23d5342bcd8f96d2a56b06efedcded4b718e8ec68f6d636
 EBUILD botocore-1.20.104.ebuild 1509 BLAKE2B 216976965e11900e4463d04fee34937d1da17543d2d8e8c79bd929fb96b81fd4e9ffcad094b5a7f3ce2c6e3924a26979247a20e9d5e5b7ff87b4dcb22290d4a9 SHA512 9f67abdc284f20ffaee6d7552b71da64b5e0dd3237fb52e938f99e9e248351f78affd8ebeee2798663965d25bf34adb444790903f04131fa46285f51aafc5acb
 EBUILD botocore-1.20.112.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.0.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-1.21.1.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.2.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.3.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.4.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
+EBUILD botocore-1.21.5.ebuild 1516 BLAKE2B af82b8fbd781de63b2d44cc058542ef0ff9a83445cf356f6711d956f6d81450b49483940362b56752d80a467874d8a6e39009b865c7821a57fd603f839884ba6 SHA512 1a37e399c5582b618d386d338af3d3de4b966d2cd1c8cfca07b724cda6229ab6680aeac024cbb979be05e4776692c746e7277b22e9ef0c52a23c70b25f8833e5
 EBUILD botocore-9999.ebuild 1516 BLAKE2B f3230c2b788a1d153349f9143151277bf5faccc3db9334858f977417b69040a8d15daa24f3bc2ca49b2fd9189c52826dd08848092fe60e383b553b7c5c2773a3 SHA512 3abb78579283afbaf01e60b77812b4db1db05b6bd747691f91174c27cf381c9d0e6033dcdd9c43d7a83690632339033a5fa001cb14ce4925a77954c8135fa103
 MISC metadata.xml 611 BLAKE2B 03764517dd63550373d7be154fef3a5e3a7e55abebc6ad58011b707d1e331c362dc6e13f6f1a6831827f8bf68dae027870abea885d8c5b3d8a64fcca4ae61fd0 SHA512 3532135859fe085e3fec2c04e0f5ab0eacb40345730178729736553f025037ffe77033d63407b4097f65cb31d1f300dd56b777d139630abe2f2f8f9991e0bd76
diff --git a/dev-python/botocore/botocore-1.21.2.ebuild b/dev-python/botocore/botocore-1.21.2.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.3.ebuild b/dev-python/botocore/botocore-1.21.3.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.4.ebuild b/dev-python/botocore/botocore-1.21.4.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.4.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.21.5.ebuild b/dev-python/botocore/botocore-1.21.5.ebuild
new file mode 100644
index 000000000000..30e0988848ad
--- /dev/null
+++ b/dev-python/botocore/botocore-1.21.5.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/bottleneck/Manifest b/dev-python/bottleneck/Manifest
index 3f4819cef066..c77ac3384bb2 100644
--- a/dev-python/bottleneck/Manifest
+++ b/dev-python/bottleneck/Manifest
@@ -1,3 +1,3 @@
 DIST bottleneck-1.3.2.tar.gz 102565 BLAKE2B 4d903bd8ff918a54cdee5b6c6815e8d404c6d3cd1a73e02f81888aab077970a113fcd24acef9da8a35138aa808c211883bf9bd952f83f17df4f94a6172fbe140 SHA512 9b6f812a625c9bb39501e8834ce41ae34ce57038d3ec9528aa8aa80910663c4e3b420d535f0ec8fa9e506faecabaf0151950afcebdc919479ed04787f26dc3ee
-EBUILD bottleneck-1.3.2.ebuild 684 BLAKE2B 7b191a2ec704b43b9a804449e505895e549dfc59411549b15a5f12d2c56e713bb133be5cea3e2a6cc4e2e8e1b26d5cc996d90e6119f20c34dcbf53af25c86fda SHA512 6670647c1b69301bc1168b1a6462d4754a5c1c29ed4148b5cf2a2539dab29dbcc6f45f5238f4b5b849f415780143811ccee20c3b5935395939ccc02154168fbf
+EBUILD bottleneck-1.3.2.ebuild 691 BLAKE2B bb72a9571480e7aa2e448aa594de34833a66d68ea7421e35cad7b7905138436dce7112bf49e643db62e241317b88a97ad02ec61ea2994680b614c9e155afae58 SHA512 c3b1fc381b7e15c572c613de75064a7e61487dbf7a2f4b0eb1ac904c8bda91ab67f2451f31fdedd72bb72a7100b6eacfd431afc98d1d007b8873e4708f62e7c7
 MISC metadata.xml 352 BLAKE2B 3ead01da9109e52e74befde776364c4d88aebb02d1d6857654d3ceb3f9c8bc6710de6d89dba16151497055e1a18bb6c6ba012242c1ce7a9f4b3d1f5f943992d0 SHA512 7bfd46f9995d2c167dd572f409900241f09beede06bfd79c4ddf8733e0e762fc2ee86379be9cb0dc57f7b56643ac6be36172dc0966cad2a6736924766bcc5415
diff --git a/dev-python/bottleneck/bottleneck-1.3.2.ebuild b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
index ed1fd761efa2..2bb815468f3f 100644
--- a/dev-python/bottleneck/bottleneck-1.3.2.ebuild
+++ b/dev-python/bottleneck/bottleneck-1.3.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/kwgoodman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-python/numpy-1.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/charset_normalizer/Manifest b/dev-python/charset_normalizer/Manifest
index 0645e12bc912..79b3fb1fbdae 100644
--- a/dev-python/charset_normalizer/Manifest
+++ b/dev-python/charset_normalizer/Manifest
@@ -1,3 +1,3 @@
 DIST charset_normalizer-2.0.3.gh.tar.gz 363159 BLAKE2B f09cd3c9da04123fc7104cfac6829ea23a82173c04469c4d98acf9311f1006f4ecb152992a397a97838f9312ad0fc8bfeea03960650873a9aaa753315245dcc3 SHA512 4fa5507c4c0c61b3722d7423f4b597514a30ad0fea176a77a1e926328003ba6c0f49c95b4f4a64b8dbb32985373706d895bae1c6e3fe1fe224851b8383576923
-EBUILD charset_normalizer-2.0.3.ebuild 593 BLAKE2B ac1dbcf2b540243c357ea586a5a5d2e34865b4b9064eaab1cbaa1b57a7bc8b1aaa2715f01aa744f9b4627a53689a8ea12a0cc5adfc236f58f4d914d15be3f633 SHA512 fda4a6cad5a571c4552ae02d7afcd4906f44616c38d57c339496632045857e6cb3c726f31b051db9593a1182a2b4371197e093496a239fc3590c1e16633e28b1
+EBUILD charset_normalizer-2.0.3.ebuild 607 BLAKE2B 4c9807834a2137fc10d5aff25a7e611b7e3611072d0d4af55eb51578acfa2a3bca7241d768809c4a02596402780f2c321436f37aa01509679a88e1e3c2128809 SHA512 a4a05ddb41008aa5f8835362a2e4568d5e4c747c3d40f453d18574ae5ebe467bdc8c0548e5df524b61e56e6586ede56445d3f50a75e945b3bd62cd9bae51a233
 MISC metadata.xml 364 BLAKE2B be46c29b2fa986a53e4abf38f4f68a9882e3a01c0d3c524a0935a51a04d3e71d98548401ae96e84155c943dc2baf127f28e0f24d764d9e4cea466e2ba010f432 SHA512 bca4661b93af7b085ba8c71ba91188a984336c30467d4e38a7856c2522f83ae6dee122e3061a9b434a218bcb11e18583fc02b85c7629dca5cfbeb6aecc63bfeb
diff --git a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
index c31319b41abb..8083f63539bf 100644
--- a/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
+++ b/dev-python/charset_normalizer/charset_normalizer-2.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/dictdiffer/Manifest b/dev-python/dictdiffer/Manifest
index 629fa1097f3d..dd7dee6604db 100644
--- a/dev-python/dictdiffer/Manifest
+++ b/dev-python/dictdiffer/Manifest
@@ -1,3 +1,5 @@
 DIST dictdiffer-0.8.1.tar.gz 28555 BLAKE2B 0a6d330134c368e11e07b23d7fe592e72b64b02ede99eb2d52c2d7452b4d2505e7e3afa75ba76c30cbbd663d9cc4c073d8f236200fdfa2866c8beadd097d63b7 SHA512 e221bb0e25a35380519bf775a63fc0d692112dab15a46c8878ef2c9a6780932c8550a4486c4eab7803619a79c2f794a590a5c9ae0fbbccac04b5b11feaf38bbb
+DIST dictdiffer-0.9.0.tar.gz 31513 BLAKE2B 7f1a980b71978b49c6e41eb4b806aef8aa12e858889622d6b55741e7793e2e812a91ce6089156a080d198a9f9c8e9369e55b6e712fd5476864b2876094ea0d4f SHA512 7985b4d69d3cb08b7cf0fc8f878ac594b72c1f1e3482157c204027fff90afd9b19041e85fced12a47d5624e0b8cc1b2d6643a88295a6d212aeead76c09c24f86
 EBUILD dictdiffer-0.8.1.ebuild 1022 BLAKE2B 0c7acf3350dcebf73b7a79393f48cde94784a996a1d79431589308fc309f52d62d20153e4b1722b0a45983cdeda91f20cdc470b0884ac636b07e3102787a82c7 SHA512 53fcbba5ce9807030b85c3dfcede681c6da5623516031b0b118e7aaa9e77c16adb2deb8eb6ae6f280ce5d2d2b22867fac7ce8ab51cb419ad09c972e9a002bcb8
-MISC metadata.xml 422 BLAKE2B f926b468982f49d593d7752f56f8cd984dbeb0ddcbbf853612a56ffc63d3a2fda04c2780cb81139eac4801b1a0ae494dcbb9777850757a9e256136660dbe8f69 SHA512 e823a29e9d83a8b011c66085debed2ae9f48ed3208ce7f79e1f51854c9ca7231993e7a426da6273ea82e0c30f1ad6fccb0c9564290026f187fa94dd6e7c7e098
+EBUILD dictdiffer-0.9.0.ebuild 937 BLAKE2B 83616c1c9a1d17648e0f9a052db24a65d9d7fb6992653f23cd2ec256ed77e3e6101f5eae930f48c7cf561240e8ca67925d65d4c6597500e38532319219bfab95 SHA512 05d938a4a2270eb81d4344fa29737eaca826bb6932bfb86dc3758ffc7fbd2f6901229697af1f5ff985b85fc31071269bfeb44254d369ec25b2415e9bfbc75e63
+MISC metadata.xml 523 BLAKE2B bf1e9589b48905feb3403b44d6b3f71e1bbf47c881d4fa095d29a3f63f08942eada116427be49ca4504703156e938136881556a4a082cace3e3371edfd35b361 SHA512 e3e91226e18302414a97ceb9160a36ab0f4e3b1dc8537936e0fcd31371e1d6ae75a4a471ff97cae3366af4b92596a25fde266f9233304052c61efb945044d292
diff --git a/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
new file mode 100644
index 000000000000..7cee88a5c46d
--- /dev/null
+++ b/dev-python/dictdiffer/dictdiffer-0.9.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Dictdiffer is a library that helps you to diff and patch dictionaries"
+HOMEPAGE="
+	https://github.com/inveniosoftware/dictdiffer/
+	https://pypi.org/project/dictdiffer/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc"
+SLOT="0"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+# Requires self to be already installed
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
+
+python_prepare_all() {
+	# remove dep on pytest-runner
+	sed -i -e '/pytest-runner/d' setup.py || die
+
+	# remove dep on pytest-pep8 and pytest-cov
+	sed -i -e '/addopts/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/dictdiffer/metadata.xml b/dev-python/dictdiffer/metadata.xml
index 86e09fd12fa0..385cb0b46c44 100644
--- a/dev-python/dictdiffer/metadata.xml
+++ b/dev-python/dictdiffer/metadata.xml
@@ -6,6 +6,10 @@
 		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">inveniosoftware/dictdiffer</remote-id>
 		<remote-id type="pypi">dictdiffer</remote-id>
diff --git a/dev-python/django-auth-ldap/Manifest b/dev-python/django-auth-ldap/Manifest
index ea0e1c064081..8799fc2e818c 100644
--- a/dev-python/django-auth-ldap/Manifest
+++ b/dev-python/django-auth-ldap/Manifest
@@ -1,3 +1,5 @@
 DIST django-auth-ldap-2.4.0.tar.gz 53523 BLAKE2B a8c49b4a4ecaaf31b3b9e7caca228041e110b5b418bef0a16c0fac423d929b0bc416cb83d8dd54f0f4567503ce9d09f686c936cc9d7e170d2cf93d8c124bb3d8 SHA512 acf85846ebf6bc354f6bf00f14f3436e1701f1d7a7746cc3572310f92ae93fb75ee6eff38558548d270f2e22d64aa7c0108f4cb91457a783aae76adc714b61d1
+DIST django-auth-ldap-3.0.0.tar.gz 52381 BLAKE2B 6964b36d72b365899d4dd3dc96f16b9c1f12c06ad95c7d387ec27ac6dbc38807e16fdb953e172fcde1a0d4042f318d276b780e474d9b810325e97cd601d070b7 SHA512 105885e62fd22aace2cbe291a107046109a91507ba77257b9b428e6d49fb74b6f47116f1d8325c3fc186590b00fb2b46507dc5b73333707e56d84e9a7b926d9e
 EBUILD django-auth-ldap-2.4.0.ebuild 888 BLAKE2B 63e2603e90f39e3a98dfce26142f83a5cfb689ae108e55259b3c3858a271845d2de128d95aba8e0201a94d0c3b13342f4422b52fdf00a1507172d18fdf813a84 SHA512 5e3dff77fa73754acd3d33cca398dd6c35ef7fb871264201bbf2acc9014021d3d504af2af7c0ca04dfd32f4dea2a697c1612f0e3a08032698e039bab2fb849bc
+EBUILD django-auth-ldap-3.0.0.ebuild 886 BLAKE2B 06c81941e067e5f682bbc6487fc20b2c9f18a2dc3d619f6dfdf0a2701ae4aeac80c3e9aa2b09f700728c7e1ad8b15b8354bced9b9c102486c763b7c45a630fe2 SHA512 4e2d74840920b1080027a11fb0dfaba9299e8ab53ead0f5e5b682b8168319d95becf057bf6e52ef7994d9a5366802b1e5c11f28cbf079eb8ac4ea50681bfdf16
 MISC metadata.xml 404 BLAKE2B 5f203773409d544e168b6be9303ff7ad455977584df34b302fec6c84993362bb3b5058984e3e7b4c413081c47f2b0ba7301e1e866fc88297f524e3920afef353 SHA512 dee72beea7aeec5097d015e83ba95cd256005545294312d9dfa80ebe52489d6d5a1ef132177d6dbcfe77ef4fa306b532c86a5de86cbb84c8f1e0a02c86617c6e
diff --git a/dev-python/django-auth-ldap/django-auth-ldap-3.0.0.ebuild b/dev-python/django-auth-ldap/django-auth-ldap-3.0.0.ebuild
new file mode 100644
index 000000000000..afb03025412d
--- /dev/null
+++ b/dev-python/django-auth-ldap/django-auth-ldap-3.0.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="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/dnspython/Manifest b/dev-python/dnspython/Manifest
index c19ea97178cb..5b96917ff350 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -2,5 +2,5 @@ AUX dnspython-1.16.0-py310.patch 408 BLAKE2B 7379d0ea280c9ca07e1d3d47dbb21cf1f1a
 DIST dnspython-1.16.0.tar.gz 167172 BLAKE2B a246684aae8651d94b4312a4b4cce2236a0c4f2289a8fe8a2bb8e81c6beddf6e81a7d54928bc50f950fde862b27e589e83fa9f7aaff7d263a6442f47fe9bb3bb SHA512 825a1815855e036ea1dfece6ec0d42242f83163960439ecba3da58d9adb85b65dda7e628cf38c386807a6c0c36aa026d5e95f7a1bdc2927aa2f6f042f873c14c
 DIST dnspython-2.1.0.tar.gz 279625 BLAKE2B ac90f1c9b50a00924326437e08513df04f3cf6dddee8b5ce58e628beab625d00c2dcdcc89e4b4da2c0366e650a5d8e87eb010942303215d3095e35f2010d4928 SHA512 eb3ab812eb8769b4780055b801e4f89beb1cb3d3e5a4855e583dca83b794eb7fca8fc3ef401eea7c16c34452e801dec5a2c59304f4041a68c7214dea6076435a
 EBUILD dnspython-1.16.0-r2.ebuild 1341 BLAKE2B 96974c67109cf7b06cd9266886d12aafc4f2fd562d66de61b7e9eb7500dfea21cbea6d07ada8823eb71e3b916d82bccfe9264891c10153486f0aff48cf63434e SHA512 250253fd84576d2ee6b2d65166e6daec2322867d607336c663d56b474d6657a449718534b8e3916bb5367ddb3c3addbd7c0c2e510810091d43e0736894e4eece
-EBUILD dnspython-2.1.0.ebuild 963 BLAKE2B 9d39e73249547eb03aa08f0780f8dd88547b82450b99b7f474f9e139487c09bc979c72798bd65833a78ac945f6cc08e6f1c0dc43d9445cf4fc3a7cd38550162c SHA512 b82878a0aa58ffcbfce91dbf5f69cd8f7694d14b4542d1c26002050d867252e0f95a7234150d76e36acdac57541c820c79029eb310a61ccb22236649cf742707
+EBUILD dnspython-2.1.0.ebuild 970 BLAKE2B e1bc4aadafbb4514e8606f6ffa551d5e8a852f0c9229cd34d3f76baa014ebac3678f807b92b04de2a5f7816cf8306d75bfa80b3e7cae8b66b9706e9bf29a9fda SHA512 ecdc6674de2f6cb29ddd16a5aa23e74f3593d63ab47457f824ecb50eab7ba68f330715788d1529be4c29977f6fedda0f7b19f2a91424eaf6adad6d2b1435f10c
 MISC metadata.xml 1482 BLAKE2B 52c201915b77d6d2f4379b74b67c8197dcfdc692aa9040a20a1ea4cfdedbb6e953d5764f8b3ef154cc1e899f644fd4e6fc3c8aa1ea5fd6f5d93c334d15f954bd SHA512 01bb39db4729b424742d567550ec05c3093158f12f3b5901029b2b4728220f703b0164d3e8f3469a0fdfd0b9492e85c4ca23a024a85bef37d738c439870ac1b3
diff --git a/dev-python/dnspython/dnspython-2.1.0.ebuild b/dev-python/dnspython/dnspython-2.1.0.ebuild
index f195de7c5e2e..9cd1b227440f 100644
--- a/dev-python/dnspython/dnspython-2.1.0.ebuild
+++ b/dev-python/dnspython/dnspython-2.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/rthalley/dnspython/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="examples"
 
 RDEPEND="
diff --git a/dev-python/doctest-ignore-unicode/Manifest b/dev-python/doctest-ignore-unicode/Manifest
index 21c31218f7fc..c51692ab42da 100644
--- a/dev-python/doctest-ignore-unicode/Manifest
+++ b/dev-python/doctest-ignore-unicode/Manifest
@@ -1,3 +1,3 @@
 DIST doctest-ignore-unicode-0.1.2.tar.gz 2270 BLAKE2B a114a1724445ed2c5c41f46098d5930da8b255e82256ef686fa8567dc305608363895655ede36f70b87896f0ed22f1c8e1047632cff5719ef7417159b0a691e6 SHA512 ac88d1cc90b1db21b21b121cddde246314d8a3e399ea0e96f1cd4f7812949cebdd0850566a90d47da01ea159bb8d69c8a73ee05c62cc40d0839d4701f2f330d3
-EBUILD doctest-ignore-unicode-0.1.2.ebuild 537 BLAKE2B 392cf463652bd4df175139f74b3c184bf84edef00dbe4be512f01d83377ce4bf6bf4f1f2d1aca60eb491f8a9bd6cf80296418abd4848c128b825224135792e96 SHA512 576672555c9a7ab3732fd227e928c28923500162a953f69111c4d924157a87249d0f529963b428a928b2c7b2e77b8e611494804c726138fb2a7c6959f0ec2bec
+EBUILD doctest-ignore-unicode-0.1.2.ebuild 544 BLAKE2B 0262a6888d7a9aaae35e84c4feee841cb36a8a846e363698ab12c2753f9840dab5519b18b91e549b3661e7f691ce83a0ee2849c5cf0e8742395d3b3a10a37664 SHA512 cf0ebd14eccb6f9de33eb104622d6fa903ef24171ee58d6ede4d83ed2cc38550bc342a5fba7d855b6a18c20d51ecf798658b2dea7c4fd6655026109916a9403b
 MISC metadata.xml 396 BLAKE2B 0d99d9adf86b3df99ecd9caadaa9591c2273a48e6e6bcfb9f27ba779b725fe7eb074db30ab856add3755d38df90ac9215f0326c457dfe834e94ce185e59b8295 SHA512 80229a027a295b73d98c58cd8f00b731324b6ed7b3c6f4c55169f0c5d3eb89521a2ad45611206ec9b972edd9223e7a3c1aa4f601932c1e37b5183106317ffc2c
diff --git a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
index cd4a04ef0710..c2c645d1154b 100644
--- a/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
+++ b/dev-python/doctest-ignore-unicode/doctest-ignore-unicode-0.1.2.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests nose
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index 934aa97623a3..b0dbf932dd5a 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,3 +1,3 @@
 DIST Flask-Migrate-3.0.1.tar.gz 12154 BLAKE2B a6902b3ff1a369fa507d01c9c9bed13b0d93d167fa511a3b54f707e27cb48f40e30957414ae5c1443796c635894cf6ed17f72b9d3e3b0e1e7bdabfe4d5157d56 SHA512 cefad924e471730778dfca16da665b499733ff236ad2d499e27094b1caf73da5d6c8d667fe51bb5fc353ec9954e6952a22bb85c223ce9a4009d5a6e831284421
-EBUILD flask-migrate-3.0.1-r1.ebuild 654 BLAKE2B 26b23baef434a602182fc1a1f627df0768f801e39b7364cd3062f62b5565c480cb5fd115d84616e9fc54301dee71725c82c8c563802c58f7bc84d7579045e274 SHA512 49a3000dc724c3097fe1afdc191e2b9683996b87fefd18c6923d0b0f91222848107efa373a3b0676e805d15575f533a38bfffd7046cbe1b1052fae27d3293012
+EBUILD flask-migrate-3.0.1-r2.ebuild 657 BLAKE2B 1167a915ce904d3e95a25fa5e93df907e08bc1f6125df14679fa2125f61dea0014a4eda96fde2c1abb894ac62fbff7034459e6cc727296cd0d3c359d41957922 SHA512 9b97500eccd64da049a69b46dc904ef6831b37c583ae3e671b3e128ca479a4acd34d334f55e39840186b198737cc7ec372707011a470a6087ae8298a040413dc
 MISC metadata.xml 340 BLAKE2B eceae6698b65718607ddd4d7e50807ffb6ad3731c778ebb13cb8bb936b9a79f29efe1b633687b981ba1e2905cade1f88667329db975b495c2f576e95d57e8fb2 SHA512 cc5d07905739843c9ecb867388f9be5b459306665e6fccdb236b715bedd0c59b2f89969a7437b8c72a5963254d55000de57284de2ec9bde75b3c46b07c575225
diff --git a/dev-python/flask-migrate/flask-migrate-3.0.1-r1.ebuild b/dev-python/flask-migrate/flask-migrate-3.0.1-r2.ebuild
index ab97cc945587..4e81f2756a02 100644
--- a/dev-python/flask-migrate/flask-migrate-3.0.1-r1.ebuild
+++ b/dev-python/flask-migrate/flask-migrate-3.0.1-r2.ebuild
@@ -20,7 +20,7 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
-	<dev-python/flask-2[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
 	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
 "
 
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 5b1288363c1c..39bd14ee435f 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,9 +1,11 @@
 DIST google-api-python-client-2.11.0.tar.gz 25408815 BLAKE2B 9bc7d0163961f5b6341fcb43f41a91dfe12702254047ac2b418ce89dad4f8f40400a7df1fff5ce9d73a05c5249b7242a4d642b866b97a34140826901f74f9d6e SHA512 6d31e0ed926f87f12400b1ec244f8e193d6559c58d6775c34ef5747af3ba633e76e8a883983438e84c6d31fe81ea57ac522f924270b80993cc6396cb6f3ae60e
 DIST google-api-python-client-2.12.0.tar.gz 25476570 BLAKE2B 7d5f53c19f00878ef717515f406a56d22ce520a0de4f8c5b4142de56263a5bdef76aaa64b3b87301f8c704ad279554f66425c746c8bb869ef735c061fc5d1b6a SHA512 47bfebe8649a4dbf2f8570f71ec4a0c4ececccf6734138e3c84e0501328f949485b5476227c123493b5874e43cc0ab72622ce9fb44484502e21e364f6c8cea54
 DIST google-api-python-client-2.13.0.tar.gz 25562934 BLAKE2B 6ce955995c0f2fa5d09e1c90e65d38a7f321421199f53957fb58934c1f067de03a48f47f1d161c9ad2cb852663316c5d0f873a32b9eedd7fffaa2b067d84ae05 SHA512 d2b0cf3c250a500e774970790390025119102e24eaf8c7a0c170139cf322c37f4c8cd3f406a41d18deb2597dfeb21e6304e173cfaafb4d6faeff23b2215d4072
+DIST google-api-python-client-2.14.0.tar.gz 25412673 BLAKE2B e8c14c069f2900d560ab2ed70855cd0ebcf1191f0932cefa385858466a482f92934df97cb994801a0d85514bcc33d918ce50ee2e980f1957f11c1cb8cfbb34dd SHA512 4c644d7acb5eb9853672a17fb3cb08796c3afa172b3b1c56027b8ef20734cdc2995d972006a6803ed806171f88a0652910a0fd1682f3427c546312cf1a719e42
 DIST google-api-python-client-2.8.0.tar.gz 25286774 BLAKE2B b21aebda062984b9eb8f2f5c563016f0f8f663883dc8ddb913053ff3df32c652c6a83f924f3e19136e5edec085e12c43cc584bc9898630122c77a219810033bc SHA512 cc3c55438b2f5835b52d17d04a749919c4865991ff78cf95920d0941a55e1493eae502a13f6565cfe1db799ce9950659e8baaa690bada058d711309861c8d07e
 EBUILD google-api-python-client-2.11.0.ebuild 1597 BLAKE2B 609d0be968a25f6a9c25ece4a5818f7a59c2613b0d69d5d06f5e9e7fcaef14aa0232b625065d239a8d942e6d6282a7a5241ee15eae00967e554f4b55565e5532 SHA512 3f7d210a01f471f95f6ca27d787bc6b63c45703210ef0d4d6ddf6809ff403ff8e61a3c27a8b0ae2fd52f1678454ff6f93d9a50a0a34eb1667e991906a6f8e83d
 EBUILD google-api-python-client-2.12.0.ebuild 1596 BLAKE2B 71224bf042ad3587892f68bdbc391941c3f172b3f1e748afc9b6c3a6e6065c2178d49598375a57e5ee3dc8c63c7d20ecb2d6cb9d41483a152abd7dfca014f7e0 SHA512 d39560f9b75602c06c531b0862d6e3bd40a7e81d6ce9b3bc698f847d5d6df9b95183aa24d31971a7a0a60f8a3a3acb9216c337021f6d7e30fc217f69b2859100
 EBUILD google-api-python-client-2.13.0.ebuild 1596 BLAKE2B 71224bf042ad3587892f68bdbc391941c3f172b3f1e748afc9b6c3a6e6065c2178d49598375a57e5ee3dc8c63c7d20ecb2d6cb9d41483a152abd7dfca014f7e0 SHA512 d39560f9b75602c06c531b0862d6e3bd40a7e81d6ce9b3bc698f847d5d6df9b95183aa24d31971a7a0a60f8a3a3acb9216c337021f6d7e30fc217f69b2859100
+EBUILD google-api-python-client-2.14.0.ebuild 1602 BLAKE2B d1807524be9fd7c9bd6e5defd06589431c622bdd988846d81c11e64274978e7e2565576e19e357fb1f27f988e743a33d4ecde9a92534c183885d7bc7dd9ab725 SHA512 e334d83ad75593788df24a3d4887a34f1a1ddb28f844ed18c97bd5e44bc54ec5d2d9f65abd82b0f7ae67992602ec21eae09dd3824c81a86a7c838a9b9c87bf4b
 EBUILD google-api-python-client-2.8.0.ebuild 1595 BLAKE2B a8b4a982d508bce1149197b8cdf1f692c9977d62ff9d49b70ea00d155d5f5aaa5deb3122c5c51fda73e465f86149282f233b5b9a8fbaa6795f8f46e2ff19e324 SHA512 a3d4b8ff6e569483d08b1eeedf1c6636a65d218f7967e8e2c89fc261ce5d70b0ce8a5f81064145ec9c3992615e0c114831081e558c4d2ee32bfc6aa0d6259524
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.14.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.14.0.ebuild
new file mode 100644
index 000000000000..950b595b313b
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.14.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="https://github.com/googleapis/google-api-python-client"
+SRC_URI="https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	dev-python/google-api-core[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.16.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.13.0[${PYTHON_USEDEP}]
+	<dev-python/six-2[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+src_prepare() {
+	find tests -name '*.py' -exec \
+		sed -i -e 's:unittest2 as ::' {} + || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local deselect=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	distutils_install_for_testing
+	epytest tests ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 4f7e8bddb751..1b885060b7c2 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,7 +1,9 @@
 DIST google-auth-1.30.2.tar.gz 169368 BLAKE2B c01191313b4bd7ffdc62fbca20aeadcb01fcb1f26e4c11504f88c2582b9a3dca10046edd5d2fe88c98980fb09e4d68da99bf0b8b5692abcf5271994515f91765 SHA512 f133ef403f8a3c92437055f2fd0e5f607199a0bfd9a76a44075a9be8ec16c4d4822d58d85fa52ade4c448e11cb6822f7e8da03ab72f3dddfb811c8d7a846f841
 DIST google-auth-1.32.1.tar.gz 171621 BLAKE2B e82f4666a38d3dbaa4aa4a4d5192afb711471432c0dcca44b1a1c52fa2171f1de0d7ffd8a7a6d5dc6dbc3a1dec16becabb26306a9ba3b3fd0998584dd1194cc6 SHA512 968c16c7fc5c8c589a94e24139c319ec7f2791b021d6240156d398d4795e6afee8e46591c4aa44457de6f98ca14e8edcb055fb3a02914b43ba5fab74a03d9fc6
 DIST google-auth-1.33.0.tar.gz 178385 BLAKE2B 7d98afcd3a1dfc12a2af48297188c10f9618483ebdeeb8f7e02fca59d6255210a64b4917507a4525a3d6838198035fd827a1276da2a1f06169e83d1ca75fb485 SHA512 19da14b89cac28cf824f258d3dc662cbf40f4227e840594148c7ea3a6640dc00f06653c1b29846a9569d938a0fa307aff1c8425c015ab46d276485210eeb1227
+DIST google-auth-1.33.1.tar.gz 178615 BLAKE2B 1600ca8861a7e75decfda5605414ff45d8f6d7ece40e0bb7a5892fe2289f1adc5bba313eab10c4d0e1f6e7a38634861e28518c2f02522ec924d6ed53805c4207 SHA512 c54356b21af5ddeda88023b886631050e8e4306ed444093ed6589d13d95af402f03928dc5b5f44f9b4c038128ed254aa14de6d852108f44949c42e2d05304062
 EBUILD google-auth-1.30.2.ebuild 1444 BLAKE2B 860c43a699cc5f7e52abf7f37cebae31c74cef8c7ac585c09250d9771481916a516ce09f34af774431f0c050b4c266a9617959d48dc183a5d76ba85370381be8 SHA512 c3185dde8203aeb1f1d1b2f82b43cd81d3bbb9a6feaf30343078d893dcdd5dcc3d2be87e2331e095daad0ba4d774f1297bd5c923027016d0f6fddbb4d37c3d4a
 EBUILD google-auth-1.32.1.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
 EBUILD google-auth-1.33.0.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
+EBUILD google-auth-1.33.1.ebuild 1446 BLAKE2B 4668ddc6f62d28628b5feadbc31e4bd11b0b231f264cafaef704bce3ebdd4815ef8deb1b6c716e563ab9314f6eb1dd84196e537f2b197e188351c99d1cebed76 SHA512 c6a6406afb3b69fb74529b62444c58afe9337f35e25149fa9433df086e73c11c3a2f982999c7074a776215ad449cf4e619c814ca100c95877de3fb08f878c3b0
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.33.1.ebuild b/dev-python/google-auth/google-auth-1.33.1.ebuild
new file mode 100644
index 000000000000..2bb9e016a997
--- /dev/null
+++ b/dev-python/google-auth/google-auth-1.33.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/cachetools-2.0.0[${PYTHON_USEDEP}]
+	"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${ED}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index a438368121f3..e4451de0a5d2 100644
--- a/dev-python/h11/Manifest
+++ b/dev-python/h11/Manifest
@@ -1,3 +1,3 @@
 DIST h11-0.12.0.tar.gz 98121 BLAKE2B 8e510461e0256a49166ad3b11394d715634d036642629b216f0c94785245909fc3d9ab89ba3048b857f1ae030cae7ed0b3195745739d80c74028a85848a762db SHA512 ba2a2c185af270185ba5e1fd80ec9308e35afcd60a125a77cbeae2669f462983d063339371312f154a7c80c154ac97796ab36782b36549235435dcfd81b93421
-EBUILD h11-0.12.0.ebuild 481 BLAKE2B 2f378c3365977c1c9be04d45e087b7b5d92fba0665cc55906970d1a8eb62cc617b22c12bef885c400198849d3a9a9b43b7f5367732858e845f77a699b43a225d SHA512 b26ed5c592d8cceb5bf3969eaa2a4418f1760f6ce4824c290e82f280b400911fa35212d4292c1caadff5269d491e28b2bc5e806f4ec42c5314d8c6cd8db7b501
+EBUILD h11-0.12.0.ebuild 480 BLAKE2B fc1d19a44fe2de2c6340068f6c2d04d40d733230e5ca30ca5b2db7d6d8f3ee17acf172a6cfa3dd0475e29a7e0af8bd5e783fac16ded56e5ba0fd7be4a05483a5 SHA512 0b43d882a7b87ff76ee732b3bfe14eaa15a3928fda19f40aa26391795be995629c3d308affe855ef8340c2c90ac1ca971be44cf50008ab3fd4f04939357289c9
 MISC metadata.xml 362 BLAKE2B c2f92baeb3b7796d39c6001c0df00a04378e3a9c3037e1f547fd8991e6b71fecbd158c88263b26399edd7cbd4645af3dd7207295c1a6d554839e8c983da9c489 SHA512 29c2a05396fab9a3699538cde0f7842823e68ab6d5b19bb6c7cf7c47b7fc3617044562965ff7f706f1a9043d1c7169cb8f69b1828606fa2d42a9d0582faa0633
diff --git a/dev-python/h11/h11-0.12.0.ebuild b/dev-python/h11/h11-0.12.0.ebuild
index 4ba4f935f5d5..692c8f38381e 100644
--- a/dev-python/h11/h11-0.12.0.ebuild
+++ b/dev-python/h11/h11-0.12.0.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 9789f4f463c5..0cc933dc544f 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -8,6 +8,6 @@ EBUILD httpcore-0.12.3.ebuild 2176 BLAKE2B 919e436b249c0f06db0be31c034f416fe5b45
 EBUILD httpcore-0.13.0.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.1.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
 EBUILD httpcore-0.13.2.ebuild 2132 BLAKE2B e598e1cad25c700b9bfbf7f74c3af6832be9271e2fe44cefbd818808f93275378f3768f5bb3019e193ade7b3a0dcd489d9c682d4c9d65d127f4f2fafbc68a336 SHA512 87e7ab3276d7a43be8c3fddd688fb1db4f51b42971446612d7d5463c89d5d7b7dc211f46c8dc0f7aa5a46a069ed4f4adc46087c66d1edfd0d3f4f7250806ca3b
-EBUILD httpcore-0.13.3.ebuild 2204 BLAKE2B d03b92df7e8b0127162e2c6125f0e88184a82e151254241e6c3b1c080551d159d5bf34dc0ed81669a1d6ad7d92b060100f732178fd8f66068d794c900aaa667c SHA512 cc7c7f37bd4abc92d431c7b0169832736e4e38493ea0e4722e5a4021aa5204c23ee1774c66a4a16509deb1ae0f41f0a041ad279c9c1e311f9b01a5c3b2daa934
+EBUILD httpcore-0.13.3.ebuild 2203 BLAKE2B 3c4bbe16a90244ef5a340dd1c22692167cb9365d8fcc25bc5ccee78c60b6b365daa984f96229381b402c7b6bf8ad8bd47fab5da932e7b3da6ec7bea199ab39ea SHA512 a1db99e35da81f34e78806b1cc9226408736f09bce1321febed43bd3904013abff5f3978fa326d652d4f6fbc5199a1af045f90712531318055f31df65b9c7b97
 EBUILD httpcore-0.13.6.ebuild 2302 BLAKE2B 500632e564d8dea5633644e0fdb4686d298053694347367aec4f4c8ca44d7a311036f43183ec5252ae8a39ff54883deeef5b6fdbd22211a9bd803d1a71f2b19f SHA512 189e5ffafe30e95f82ffcf02dbb6033895c6d0b91caa7f9b619dfff1e28db1a68f9b3bc5dcc56dea7a0e41691c889bc8ecf783d918d68c85fd1b74ab3fdbfce0
 MISC metadata.xml 453 BLAKE2B 9ecaf4c2d0b1da4ef7272fb7fd65dd2ea9bcf0ac036420317c838ed2cdf16119270d1a7ce1673057f6bb2c81b0e0776ac6291eab9830b30ba2954ba0d373ea61 SHA512 c885cf0a5bd4c74962160739702d07c34c834b252d050fbfca9f6fdbf469defba4a27c615c312bead882a4e126eb244982e3fdec6428626c51c6935ca8c004e3
diff --git a/dev-python/httpcore/httpcore-0.13.3.ebuild b/dev-python/httpcore/httpcore-0.13.3.ebuild
index e43157c8ec6f..16d4d2c1c957 100644
--- a/dev-python/httpcore/httpcore-0.13.3.ebuild
+++ b/dev-python/httpcore/httpcore-0.13.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND="
 	<dev-python/h11-0.13[${PYTHON_USEDEP}]
diff --git a/dev-python/httpretty/Manifest b/dev-python/httpretty/Manifest
index 6afc5f8ccebc..0b022df6c5b8 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -7,5 +7,5 @@ EBUILD httpretty-1.0.5.ebuild 1335 BLAKE2B f8c14b37da5c0e0045a7e921b0e7b6865e691
 EBUILD httpretty-1.1.0.ebuild 1198 BLAKE2B 8f6feb8bb19893c4c74b9653ec90414d5131197cd36b5bc4d1dccffa5a49dd6155e2045bbed9d60995853560708c1a767b013246627a666f24edada682b25bc1 SHA512 891e9a72f471f5529f2a5d3c10c04ab55cd38d7eb97c8b17633fb6c6e521d7ff81b0353ddc70e649e1dae7cc9471f9e37d8f1cdee2cdcb967344ea0be44e0402
 EBUILD httpretty-1.1.1.ebuild 1291 BLAKE2B 8e312ccbf0070c4af60df4a98aea0db7f5acdbd4fcda701369bdd644342f8bd88fe793224f748e1904b464d76ab488d499735ce7b5c27e4d60e5dc50676f6932 SHA512 4e8691c96e9da6da9881a232b860f56bf24048f4c030de3c0427e4b2ba058dfb6d695851462f2e52d9efb0c0343797a537c5ec9af2bcb5d4b614315dd73cd2f1
 EBUILD httpretty-1.1.2.ebuild 1292 BLAKE2B bd6d87a0272c166674446c84e2fc144039335196611a18a4e507111bf0ed71d6dfb9493d66f9ec4f2221383e7bd8705d1cedbe8d04d3659004d38558b6a57b2c SHA512 a27041caf6cfe7367b93ff5c574ef567a170c8d272e3064f9e23baa5ab74d2d7af00453ae27a02e88d7729d89cdff5e728a1afaf2fd472f39e832a1ee7e7ae31
-EBUILD httpretty-1.1.3.ebuild 1290 BLAKE2B 9a5f8d0cd03ec6bc20e799012d4f15fd815bd4223a70f1434198366c5dbedf0ee358c3728e51cb4e694c718275f1189c7b45be5733ad6f8feda9ca3a1520a10b SHA512 0eab5a37e9c9ef42a360f957c84644df06dc4e0d493d0755c1f3810458f06841df3fda91d5e97ae1f17e309abafa2883bb02ab3da37b500d996baef12531f5ab
+EBUILD httpretty-1.1.3.ebuild 1289 BLAKE2B 97f5e5ca195652b2cf5f504470f81db41e166e0b3a6d3552f71b19201fec716a268c3176db4c8c4909a64f8dcbd251070f307ca958f06a4c73b8a62c33a88eed SHA512 93785980e8c9ef12679767006bf50c2a0a55158d866a659322a0c1a2254400fcfbb5802baf487c1b07c7c28d797173573aab42ee52db69afca6ef15a6c8dc28b
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-1.1.3.ebuild b/dev-python/httpretty/httpretty-1.1.3.ebuild
index cb404053d78a..6fb4f3d7e8ae 100644
--- a/dev-python/httpretty/httpretty-1.1.3.ebuild
+++ b/dev-python/httpretty/httpretty-1.1.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]"
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index f5ee35ec7fc4..9a2c5732f223 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -1,5 +1,5 @@
 DIST httpx-0.18.1.tar.gz 1663996 BLAKE2B dcbfcb4a452b47b643d5114a535005f7f92170392202dedc6c152546430231d20fd8b94b7ecc1d2abacbc9d76acb14cbfdc268109b171cc40812504e696dcaab SHA512 954b020d117dd1064262f3ac2d3137d01bba344b1a061e5713c3889283334d9ca92d9ed3d23f6ce79d684e31bae2d83fca6993178ef55e5a91353b812ad489e3
 DIST httpx-0.18.2.tar.gz 1666756 BLAKE2B 3d1e25d503ae5306150c157bc83afdac9a475110d042e041b58de448a0dcfd75de3f4c15836b838dc799cd5f8b7e0d646e43bbe107ffad87d51ff016afe585cd SHA512 727974e5d5924fdd653987dd4f528d27bb2653085b01ef5efcdac39dc92ef2ed586f872c202349aa31105ad970cff914de4315c2d79338a6aa18bebb8126f392
-EBUILD httpx-0.18.1.ebuild 1311 BLAKE2B aabdabc7a3d4c38f89a5db92265aa76b1329dbe2c731159f08f55378a5ef78d0b49f29d742dc5895b20938d338ce3e0a9b63354cadf43a01475eac99c11ddc6c SHA512 2623ce502c30cb40e4e8f629248781f368a8944da809110ee259cd6cdb8108ad74fcd1940ab9b1d29fcbdabe52f3bbe6f6094a1e5e8f6809921281ebb3b288f5
+EBUILD httpx-0.18.1.ebuild 1310 BLAKE2B cd916f7b1a450de2a2091ea53cac84b8fceaa9efca9a6a3dcdeb4bed6a98bbd2306eb3e2147756ee5bb0c307f698acc300f41e3a3932a8b9193e1278d19f6778 SHA512 0015042ad3ed2fe9ebf2ebdc1221231f4b49ec31f3dd9d69e645d737778612f7d51bbd061258e0e014974230cd0b5481f58a485151d6bd44f91f1a17813abd57
 EBUILD httpx-0.18.2.ebuild 1547 BLAKE2B 7f267cb8f047aa1cf6c6ba635151d482730628c57fb080bb18c277b0b2e963c728074d537b2025e992b2351d3c0ee14169f0dda386bff5c710f9560075aeada4 SHA512 df6af32a04c4d9716f55261311101c62f6f5787aa28cc138933a16c7626e1dbb922a32957623a92a11d9c158e16027e3c86c31e4849b15518312255dab7df660
 MISC metadata.xml 444 BLAKE2B 62369fdf937f8caf46980620f2da0b16512ef94cbea9fecf0c336029a709e0975332d0d4e53ff4f3eeddeb9d231a5003dff9bbdf999846152bf578772b47d9a9 SHA512 bbbc7e622f0aae3b63e19765626ee13adf027d5ed98ca97fe04592b1f0a8da0cd0302b31f9cda90eaacf2bf5dad9c6472ddd795db75f0992ba4f084e4135ea3d
diff --git a/dev-python/httpx/httpx-0.18.1.ebuild b/dev-python/httpx/httpx-0.18.1.ebuild
index 2a51074bafbf..2cfb607a045d 100644
--- a/dev-python/httpx/httpx-0.18.1.ebuild
+++ b/dev-python/httpx/httpx-0.18.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index a56e394f19f9..ea549f4c4e3a 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,5 +1,7 @@
 DIST hypothesis-python-6.14.0.tar.gz 9135056 BLAKE2B 47d1efcee5e1c4037f1a20f08e3bc873fc143a2182bbde07e897812622c4d68923f78ac356bd97ef541566a27a874705eb2438747daaebe84f95fc2a2262bac1 SHA512 f7821449d3bf7f3656b52dad09027e40ea4af1779fcc7c0b995dac55843953fdab3f2ba69eb1b8de8258616f49cf8e5098c6a222d01071916c6f0c9fe184c80b
 DIST hypothesis-python-6.14.2.tar.gz 9135496 BLAKE2B f77f0668c4d0c2f5a952e06a40ae7898631804d3406c9711eb30a4e5a11e73ba2772be3cb437aacea2a75cd65f688a2485b98885c19cf743020900b0cf70f08c SHA512 e495e1c471fd4b185e23326700e85bf90635fcc8bf316c758c3285803ff0f7ad0269351b3a7631033495bb6498a8f19cb8661c55248ec5e14ff2a09e0c3af3c1
+DIST hypothesis-python-6.14.3.tar.gz 9135537 BLAKE2B 2effb0c68cf3a7a2f7d56c0c46c2ba36cbed4fed35b8a617ec68a721990247370772b986f0492aab112f7420c07409f8d738485ca28f42e7aea919af52611b10 SHA512 1722c5dcf1eb7375fd09d4208851826582808449fcaaa0345f1461d9a531961500a9c888bec5a457efbbb34f8178464b3358a3187b94bb5c783af42b4e7287ce
 EBUILD hypothesis-6.14.0-r1.ebuild 1753 BLAKE2B 91d322af6a74614d3675c680d21ec4c89297f2717c016f32d4fb5d98243bd4786de42639bae152fb14a8502cbfaac41134e4d4010639b7152559e32157e92b4e SHA512 a864d799d54784324267fbe6c7006288b227f7c8de1162b3d2b5a5cc37ae0e745b4a8f67efc6dae43b56f9755dca232afcf355829fe7f1c7ff5de9176f43fe46
 EBUILD hypothesis-6.14.2.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
+EBUILD hypothesis-6.14.3.ebuild 1761 BLAKE2B 177223cf49ceef902b9ac33296a2d2ecc0228f457f91f686010da2cf11c38b3bda34bcc83d83031b4c49b9241cfe147177ece32fd94dce9af528f4d73b11322a SHA512 24554123c1cee2225cb033bd8a02be43736f58ff67ffce3835a2955e01fb3085c68ebf1d04f1a405e502de33c4a0d91dd9b664d91386343d29ed704d7e7e1034
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-6.14.3.ebuild b/dev-python/hypothesis/hypothesis-6.14.3.ebuild
new file mode 100644
index 000000000000..536affb7ae13
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.14.3.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_{8..10} pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="https://github.com/HypothesisWorks/hypothesis https://pypi.org/project/hypothesis/"
+SRC_URI="https://github.com/HypothesisWorks/${PN}/archive/${PN}-python-${PV}.tar.gz"
+S="${WORKDIR}/${PN}-${PN}-python-${PV}/${PN}-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' python3_{7..9})
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!dev-python/pytest-describe
+		!!<dev-python/typing-3.7.4.1
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare() {
+	if ! use cli || ! has "${EPYTHON}" python3.{7..9}; then
+		sed -i -e '/console_scripts/d' setup.py || die
+	fi
+}
+
+python_test() {
+	distutils_install_for_testing
+	epytest tests/cover tests/pytest tests/quality \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/imread/Manifest b/dev-python/imread/Manifest
index 25f04f0276ad..de36add530c8 100644
--- a/dev-python/imread/Manifest
+++ b/dev-python/imread/Manifest
@@ -1,3 +1,3 @@
 DIST imread-0.7.3.tar.gz 131492 BLAKE2B 060bcd8312f24f2966f840a6403486a9a9a2f6b9d033e92f0268594711f4fa06530c2a825103683b1041570c43c3af584faf10acf45a95e693dc83c81da4190d SHA512 401ec64fd4a65fac1cf2e1bd929cad00a8d704c6c03b8a10256d1e9c27cbc83b47a11567731a42c731aca3df9a5101b7ff90bb51f869695b1405c642e16486e7
 EBUILD imread-0.7.3-r1.ebuild 718 BLAKE2B 7ae44cde8cc03dfb1f137d816e7ebed7985b9122f21015acb5bb1d58fe38d4c58e84c34b044376605cf9f29542233d218174316239a06b8cf34017f4d5e67f03 SHA512 0b71af04b9b02cac10c8b5feec03bca939cc17056d5f98aafa05ea3736fe7015ae91d6803739824bee668a355e9471a9ed8afdcbd426da5c053a017b006fd980
-MISC metadata.xml 630 BLAKE2B 93a4fb70862764f6de127fab8f761d04f568d755d224dc0196b285c13966fbdbb7670ab96c8f8a01b279f63d319b2c4ee254b184a7fa532596dfe33e595c0d2c SHA512 0f156f922d31d45abc2b390e2a2bda8abb3a8b84ef9cb1ef48d2ed8917574b9bf4f4606d3b40b3cd6bf5dc41fe721eab734707388e6fd1040b2593580df95cf0
+MISC metadata.xml 537 BLAKE2B 07dc7fe0d46b65809671206361c7be792ccc34807876f4874385695744f14f8aa26d3f77ab7cb941e8120cc6ff4520bf1cb4c0221a28f2607a0655093a667215 SHA512 45013e91173ea577891f59e08f2909cb0747a8ba39c8fc42440d9d5e8fec9d11a2b15e7ae7d05c3801a24538e723321c1c2d29805d20136962925adbe3d2a25c
diff --git a/dev-python/imread/metadata.xml b/dev-python/imread/metadata.xml
index 0fd0da447123..6a251bb2bee0 100644
--- a/dev-python/imread/metadata.xml
+++ b/dev-python/imread/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>3dprint@gentoo.org</email>
-		<name>Gentoo 3D Printer Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		IO with images and numpy arrays.
 		Mahotas-imread is a simple module with a small number of functions.
diff --git a/dev-python/isodate/Manifest b/dev-python/isodate/Manifest
index ffd0ffe3744b..c9d218000ebc 100644
--- a/dev-python/isodate/Manifest
+++ b/dev-python/isodate/Manifest
@@ -1,3 +1,4 @@
+AUX isodate-0.6.0-py310.patch 3387 BLAKE2B 669a1eb70890aa2be676be24489f4434dcf9b8f56cda20bef91913e8d648ede59b78b5e6697cf5d56461db43e9a0df14d76c2210ee0f434d0e7303a9a7eeee18 SHA512 a9c9662f95c60895eef90278d8f628cc06f56d6ed24780e03b7e45d13acf677dce4114e450876bc47fd47c637c933f48a47eb4bbb2b628ec1da7e4063059b694
 DIST isodate-0.6.0.tar.gz 28480 BLAKE2B a7499c736b67193ac73026df7a7c9d9bd5b743a5d556fe5e8ba0a62e8a5238d64afb88547a27e4bcbe706483e3e1e97eecd437e4e1c730c20652cff5926502fc SHA512 e977748e13ee2c94ab47bfc47113d152280e9acff6f70e773de73717392148dd2c111a7db2d9fa3679d37936c6ed9a23dc526cb00bd601df45459b6a244f9f7d
-EBUILD isodate-0.6.0-r1.ebuild 694 BLAKE2B 28636c22c1802f5bb69d6e1b8eb52bffc71375d427dbabb72d487208fc01f0112e032e93c4052ffad83330eb1f0b000054671c0878c5726c271f3ac3e5956750 SHA512 dd01c3955893ba0b4e6d84754401b69243bdf7e44b641b9d4b23d6e5664968fd9d0810f56cc07feaaa009e1df06f2de820a291ce672cb6375e11ff692e35e7ce
+EBUILD isodate-0.6.0-r2.ebuild 629 BLAKE2B 74460c2091f1e6634461cae46cbbf576680a6d9d0d172fe67cfdaf7721641b7d6cd306d10d274f6d810a8e8b3092aed7d019e0f4f591b884baf60174da295c47 SHA512 894784c520c8c23b6b524feb89938800b2b6459fd5a752c85dd6339edd9902462d9f7a2189b12cefaf1b66ca2b31fbe09bf3b5a8b70a80d98c6b457671b5e2c4
 MISC metadata.xml 1120 BLAKE2B 9889dda56ccb8afebcf88184839aef3527090675f9a51444185c2d22f2eb89eae009b3138edb3a03c3d024b7a6d0ec586bad08480f869a030303a736c3a00dab SHA512 c9213c9a90a27f29d51584edc4537055a82962f9153cbd68fcf8868409be2af625f754c1b8c9e1f5d00ddf6696809a118fa33a742f5e241ba6a4141937f60dce
diff --git a/dev-python/isodate/files/isodate-0.6.0-py310.patch b/dev-python/isodate/files/isodate-0.6.0-py310.patch
new file mode 100644
index 000000000000..81b38b48a2a9
--- /dev/null
+++ b/dev-python/isodate/files/isodate-0.6.0-py310.patch
@@ -0,0 +1,95 @@
+From 40358ac82b948ea8377d5ca32b576def31b39a84 Mon Sep 17 00:00:00 2001
+From: Jose Eduardo <jose.eduardo.gd@gmail.com>
+Date: Fri, 19 Jul 2019 16:21:56 +0100
+Subject: [PATCH 1/8] Avoid unclosed file warning
+
+---
+ setup.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/setup.py b/setup.py
+index e39446f..9634625 100644
+--- a/setup.py
++++ b/setup.py
+@@ -30,7 +30,8 @@
+ 
+ 
+ def read(*rnames):
+-    return open(os.path.join(os.path.dirname(__file__), *rnames)).read()
++    with open(os.path.join(os.path.dirname(__file__), *rnames)) as read_file:
++        return read_file.read()
+ 
+ 
+ setup(name='isodate',
+
+From 91bf24dd1610d5f6ac5d4867457f0703046017d2 Mon Sep 17 00:00:00 2001
+From: Jose Eduardo <jose.eduardo.gd@gmail.com>
+Date: Fri, 19 Jul 2019 16:22:22 +0100
+Subject: [PATCH 2/8] Raise warnings produced by isodate as errors during tests
+
+---
+ src/isodate/tests/__init__.py | 3 +++
+ tox.ini                       | 2 ++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/src/isodate/tests/__init__.py b/src/isodate/tests/__init__.py
+index b1d46bd..7208cbd 100644
+--- a/src/isodate/tests/__init__.py
++++ b/src/isodate/tests/__init__.py
+@@ -29,6 +29,7 @@
+ '''
+ 
+ import unittest
++import warnings
+ from isodate.tests import (test_date, test_time, test_datetime, test_duration,
+                            test_strf, test_pickle)
+ 
+@@ -37,6 +38,8 @@ def test_suite():
+     '''
+     Return a new TestSuite instance consisting of all available TestSuites.
+     '''
++    warnings.filterwarnings("error", module=r"isodate(\..)*")
++
+     return unittest.TestSuite([
+         test_date.test_suite(),
+         test_time.test_suite(),
+
+From fc0fb3278da5f463ca5b2f0a3acafbbf2869bd7a Mon Sep 17 00:00:00 2001
+From: Jose Eduardo <jose.eduardo.gd@gmail.com>
+Date: Fri, 19 Jul 2019 16:29:43 +0100
+Subject: [PATCH 4/8] Fix Python 3.8 DeprecationWarning
+
+Ref: https://docs.python.org/3.8/whatsnew/3.8.html
+
+> Many builtin and extension functions that take integer arguments will
+> now emit a deprecation warning for Decimals, Fractions and any other
+> objects that can be converted to integers only with a loss (e.g. that
+> have the `__int__()` method but do not have the `__index__()` method).
+> In future version they will be errors. (Contributed by Serhiy
+> Storchaka in bpo-36048.)
+---
+ src/isodate/duration.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/isodate/duration.py b/src/isodate/duration.py
+index 6d1848c..d923cee 100644
+--- a/src/isodate/duration.py
++++ b/src/isodate/duration.py
+@@ -180,7 +180,7 @@ def __add__(self, other):
+                 newday = maxdays
+             else:
+                 newday = other.day
+-            newdt = other.replace(year=newyear, month=newmonth, day=newday)
++            newdt = other.replace(year=int(newyear), month=int(newmonth), day=newday)
+             # does a timedelta + date/datetime
+             return self.tdelta + newdt
+         except AttributeError:
+@@ -264,7 +264,7 @@ def __rsub__(self, other):
+                 newday = maxdays
+             else:
+                 newday = other.day
+-            newdt = other.replace(year=newyear, month=newmonth, day=newday)
++            newdt = other.replace(year=int(newyear), month=int(newmonth), day=newday)
+             return newdt - self.tdelta
+         except AttributeError:
+             # other probably was not compatible with data/datetime
diff --git a/dev-python/isodate/isodate-0.6.0-r1.ebuild b/dev-python/isodate/isodate-0.6.0-r2.ebuild
index cbd14a1fcff7..4b9e27d5136c 100644
--- a/dev-python/isodate/isodate-0.6.0-r1.ebuild
+++ b/dev-python/isodate/isodate-0.6.0-r2.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+EAPI=8
 
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="ISO 8601 date/time/duration parser and formatter"
@@ -14,14 +13,15 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )"
+
+distutils_enable_tests unittest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py310.patch
+)
 
 python_test() {
-	"${EPYTHON}" -m unittest discover -v -s "${BUILD_DIR}/lib" \
-		|| die "Testing failed with ${EPYTHON}"
+	eunittest -s "${BUILD_DIR}/lib"
 }
diff --git a/dev-python/libarchive-c/Manifest b/dev-python/libarchive-c/Manifest
index 3725c7c40c11..a7c93b7413d4 100644
--- a/dev-python/libarchive-c/Manifest
+++ b/dev-python/libarchive-c/Manifest
@@ -1,3 +1,3 @@
 DIST libarchive-c-2.9.tar.gz 46408 BLAKE2B e24d9ce56919b6c6217da7629ac3c87023f44d2f1470f6632b3e3b478d29e76edb8fed5e4f8d7a75ab5efd160588dba82d23960d0224ce571ea01af9fd7efaec SHA512 b154cfe39247050c156d57f657b9668f3b1add879b7fb5b32cbc127becee63d1898fb1c4bd60e7fe72e814f544ddefa6680d582fec28b0feed90940fae8cc238
-EBUILD libarchive-c-2.9.ebuild 541 BLAKE2B 7d61c267e689f3185bbd040faa25aa330cce37ba071ec1656af63107c1e7212246ab7f25e8cd9d1331028153e07eb278be18d7cbfb6178d3634274586dd438be SHA512 11edbab9d4c5b0ffd79b13d2e5f770e7c3c33c670a9bbe122df057154c01a60842dc955bb20f6a724b3717d95273782adb5fbc9f133e6e67c1fde214b8168444
+EBUILD libarchive-c-2.9.ebuild 539 BLAKE2B a9b31b42c38345635b35317029948bdbc8db8b0a379c4ce937d17cb7e1f3a2761dec995a9fd7db831560928853fbe4d49143117cce3829ab2e931b57da650f61 SHA512 0eb0633128d218ffc5c420cdf91b11e20e7704aad6fb8029846c2be2e2c290647bcd2025b23185bf06147b3f2ba4ea6a35852a9b565d2f60c1deb4079b7c76bb
 MISC metadata.xml 561 BLAKE2B b7ed2b26ca60804ca1e6ed5c0d10d8ff4d673c1912cf9f6a7bfa2c02bfe004a9ca2a19d6f165add2d43cfb8e77007480ca168c22036013284d6e3f44f999a118 SHA512 3945224587cefaceaa0959d6b296c680d1a022f23ea07f6c62944aeba9a6fced9ac25738c3067b32f38e759ccfb3bf197d12a73761f9a13da3f57782c1c0d0e0
diff --git a/dev-python/libarchive-c/libarchive-c-2.9.ebuild b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
index be0363504712..102eaee9ad83 100644
--- a/dev-python/libarchive-c/libarchive-c-2.9.ebuild
+++ b/dev-python/libarchive-c/libarchive-c-2.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="CC0-1.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND="app-arch/libarchive"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
diff --git a/dev-python/markuppy/Manifest b/dev-python/markuppy/Manifest
index 5bf28684d301..2625bbc7695f 100644
--- a/dev-python/markuppy/Manifest
+++ b/dev-python/markuppy/Manifest
@@ -1,3 +1,3 @@
 DIST MarkupPy-1.14.tar.gz 6815 BLAKE2B 219a220c3aefd2870a6cfa6e4d460989cfdecf65a9e760a222f70d202ee4d6d4ce287f08a7e881218360d662c5281f140c9a4a176182fce19d548707a998ec63 SHA512 dbc0abaaa0b9ffd95d2aebe62e5f718a44a0e614eeded5f3624df190778f11a10aa98e34c444e38295ac05de38c4ddad57fe885446ebe7c4b9fd1d64b312f168
 EBUILD markuppy-1.14.ebuild 527 BLAKE2B 4d580910238f9e10351888083c4bb89592e5244a2cead79808ca3af816cdea918198bee6a666576d4eecade4bf1f66e0806185389aed298d64e5981e541a45a3 SHA512 dcfaf45e9f3b5c78c8bf92900f3447581cb84460e41256b3568f05fc7a68b5275ef5283e968f0473443665779d8e0b6cabea7471d25c681f3377406a61c23542
-MISC metadata.xml 567 BLAKE2B f53618b9cc6ea30c99c658c3c8e064abb2671a34fe6aa17ae6dacb3981b8fb4c2fb096729c89e7480045bec1a502f3c75163ed30d4b9d462a2409f6fcd6e7126 SHA512 0f5e1b610e926db85551740ba936ec856f64c29c92d0faf59d4014614bea5f438ebe74669d1a0917f34f8205a797300079bfa1f95a668f478c787a21793107a8
+MISC metadata.xml 311 BLAKE2B 73c12de3db1c524bb5405f26ba3c09f0ec36b3a5fc3369019f5fb970210c4a0abccb9b7c90d090bf8e220d89ed19f4992b9b746920132335b880879d1ea2eea4 SHA512 0766b0c2cbad73dab165f9db2b98bd479e6a8121dc616104f8d192caa4a48cfba01beca9236c7dfd3cf92e8b1571978fefffceac9ec3ea56555a9f47c7b27247
diff --git a/dev-python/markuppy/metadata.xml b/dev-python/markuppy/metadata.xml
index 478828b0eeba..4ba0f85b0295 100644
--- a/dev-python/markuppy/metadata.xml
+++ b/dev-python/markuppy/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/markups/Manifest b/dev-python/markups/Manifest
index 765ea625fa70..0edddb00e232 100644
--- a/dev-python/markups/Manifest
+++ b/dev-python/markups/Manifest
@@ -1,3 +1,3 @@
 DIST Markups-3.1.1.tar.gz 20482 BLAKE2B 26fb19e11aaede8eeadc5a3022785dd3663e7002c5fc4b17c3718d68bda55a9cba07fc1c83a78ca4dee06b4e911b74701fe11865e8933a9d385d032fac00eb0d SHA512 9e8e7b3cc86127fed0367faf257d761e0eae4ca5e11a9ddc8e99b2fc88c76ddb218ee371added56e2c19f5772754adc4c01a09503c308220f6a9d35e736220d7
 EBUILD markups-3.1.1.ebuild 978 BLAKE2B 5b00c69a8ff4438686d1ae12874b9c1e8628f369b5eb80a7eb10fa336e4308220aeb333144c77b090d2ad14fadd26882269e5735e546e0572b3f81cc18016962 SHA512 370eceb9be0241f38e677dd5b4ae35c9876f54dbad0d36476e136230302cac60079bd70752d92382a321fc72bd73b2559e02702d977c5cf9536a563cbc21380d
-MISC metadata.xml 680 BLAKE2B 863bfbb8aeee26e72ad3c6e9cae490e82b67ed54fabf3adc11e98f8894d181e02cb0d174babf003cbdfec1f8a4dcc6e07df47f952683a46e7a4f1c6e3bb2e8d0 SHA512 8e71b06846e8ec4ce1cb2a4cc9aa4e172912ed9a77f76d6a7e9b475432e65d39fbb130a375f35ac429c398ff4d2b32e5ce99386668a88a8cf715660339a961f4
+MISC metadata.xml 411 BLAKE2B b8ccce5d1d56ac92ff97a282910ad2796447dc6f0a7b99d2642af966625476b73968736eb538cf816d0bfd07d475347e79cfc3425a69ab24d47d0ba97260d202 SHA512 b5d0c8e389d14577ec801b90359f3623c89796534ee4430764bc07de9cc11e5cfe9fca45c1c95fbc3ae217c60623e911aba2197e022750d7a61fc77e2e945c19
diff --git a/dev-python/markups/metadata.xml b/dev-python/markups/metadata.xml
index fbb42d8965dd..a3a4dbb46b31 100644
--- a/dev-python/markups/metadata.xml
+++ b/dev-python/markups/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>holgersson@posteo.de</email>
-    <name>Nils Freydank</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <maintainer type="project">
     <email>python@gentoo.org</email>
     <name>Python</name>
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index ed255b213398..f86f7593a078 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -2,8 +2,10 @@ DIST marshmallow-3.11.1.tar.gz 173844 BLAKE2B edd816ccd254dc52e01a2e067ff3037fa5
 DIST marshmallow-3.12.0.tar.gz 174790 BLAKE2B 07539540f361137dd2fa2d5c884e279137a82f69e8a9e294d6abe4c566c98f74a1836018618682ac0a08f1e0d1510dbffa6d9c030a98e2cba48230697742b7e3 SHA512 7b91ec42dffbb979bede21fbab17cfb081068eea54d02aaef991b58e884cc5675fb17d5f56278794e5c33960bf29951ba74533abb9a025228a524a4e413bd312
 DIST marshmallow-3.12.1.tar.gz 174784 BLAKE2B d3540ba833950d730db719c8ac7e8d66a54a4b06d0decc161d9b1f82d2012db2df7cc376bf3fb322e8d07e60057409f2e6ab761561e822c942d189418c70b9fa SHA512 aadbf9c3b45a5b435ce7fd7f60a4318f393221f23687be7b48af43deee111f48806489169815122f297539614a81700a435cc579cf5b7d0fffea2a2809368db9
 DIST marshmallow-3.12.2.tar.gz 174529 BLAKE2B 67c8431c1b013f40c3ebbb23631be3060e978a4cb71f3802b810d943bb69fd32bea59b3b7c92df5ea3cbcef28ef7b64f32c9fb1a6a3d5d42e4eabd6ce4b7958e SHA512 d1f5e695564d0df10ec3f74b336b6ade7b247b722beea61a8cf10e30653745d187d26dcda3a2f2d38c04423315d20a67bc883c9e7b0d4686a759e379644cd457
+DIST marshmallow-3.13.0.tar.gz 175134 BLAKE2B fc8ffb87ba31d5bd56c7ebf655824f59c78cea257a1b59de8a97be9f380367d4db428b6f4f93f81140cccd8274fee7946e466f87f7c31b6b9d39d5bb9fba3104 SHA512 e4425bfa26609c80bc581b60be5554effe4a57eafc36338dc672cb0b42fc14d788a1ef3b4506b6429bf8d235e6edb10925173c8414b2abca12a4c7bb5496ed53
 EBUILD marshmallow-3.11.1.ebuild 605 BLAKE2B cc40d04c193df3034b46236a582b51dbe2bd353b7ed73504df7219a548b79311d81f1493c65e047f280a9bde9b491b12fbd8be7e0761e9abfe65f608c51f410d SHA512 759a286be5216563de547e9d2d28b6cc6ea926d6467f5caff41e54f7d1470d56052c9f8848e454a841685c2411cade2b78c0f96a35a9cb0ac75f0dfb5ebb2faa
 EBUILD marshmallow-3.12.0.ebuild 605 BLAKE2B cc40d04c193df3034b46236a582b51dbe2bd353b7ed73504df7219a548b79311d81f1493c65e047f280a9bde9b491b12fbd8be7e0761e9abfe65f608c51f410d SHA512 759a286be5216563de547e9d2d28b6cc6ea926d6467f5caff41e54f7d1470d56052c9f8848e454a841685c2411cade2b78c0f96a35a9cb0ac75f0dfb5ebb2faa
 EBUILD marshmallow-3.12.1.ebuild 606 BLAKE2B 0ab0d2ac445f20b651e9101ea0f4377d4ad568ceb1fe481b7b827d031f834fcc6d08bae97898f0a2a8f00b5c3a9b145f4315d7ce82d2575dd76221bce73f4bd5 SHA512 ea76fea9a0f0b477ddbb2769cce7469f2f484d67d1a4c0c220ebd7e4455d72f80d4f281eb6631a6eed0407f32735b29bb85146601e52756a5dea14c33465c445
 EBUILD marshmallow-3.12.2.ebuild 606 BLAKE2B fd3580272c99e15dbeb8d9531bfb7d49cab2435b77144b5374eac157f03f0ebd6e12012af809239b7fdaac47cd051735d5be42ba65c9cdf0d32833871a7f2aa5 SHA512 85b4867b9bd6900e0515d89700897a7e265c4ed7d9430dc5b36ab0b9f09e05510df8a265302dd4a425bced95392930dcbb542e829148b294dc9b9413c55bd0ed
+EBUILD marshmallow-3.13.0.ebuild 606 BLAKE2B fd3580272c99e15dbeb8d9531bfb7d49cab2435b77144b5374eac157f03f0ebd6e12012af809239b7fdaac47cd051735d5be42ba65c9cdf0d32833871a7f2aa5 SHA512 85b4867b9bd6900e0515d89700897a7e265c4ed7d9430dc5b36ab0b9f09e05510df8a265302dd4a425bced95392930dcbb542e829148b294dc9b9413c55bd0ed
 MISC metadata.xml 461 BLAKE2B d1723db313f210e554d88a75276965f8f1a385ba8f879d2c43d8875a774240e7db4df6e2cf2a73138069b67a65760b2170bac2ceca8d5cf8681242b01f68d974 SHA512 257a5648aa10d9f8ec87a62e1e090374595256a4cf66f32775be135772114396610ad57e7ddf5274b6ef4755c563bdd3bc364df2751e61b10593d10e12bcb654
diff --git a/dev-python/marshmallow/marshmallow-3.13.0.ebuild b/dev-python/marshmallow/marshmallow-3.13.0.ebuild
new file mode 100644
index 000000000000..7d3435061f3f
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.13.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A library for converting to and from native Python datatypes"
+HOMEPAGE="https://github.com/marshmallow-code/marshmallow/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 5659de671f59..c91fdba72a8e 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,5 +1,7 @@
 DIST mkdocs-1.1.2.tar.gz 6987352 BLAKE2B 98bf604aa15eac693368e77e6658c3906909a0cdc323772550a65c35cc301929cdc136919a612438563cefd74c9076b2e273cb89e3ffbe04bff2a419e6e36513 SHA512 bf0e5ba8a15524ebe433fce9f2d16404922850ca562339d60e7860e243f9523321cbab5dca1f276a71d3158c7b1bfadfa25b134da50ef1cedc0b1a9658b6f10c
 DIST mkdocs-1.2.1.tar.gz 6918891 BLAKE2B a17fc551735de28391809971fdf8973c5adf23e512286041eab73bde02ae9ae597e357f4dcbb3fa9ea90a4b47e12a8390c3626641e89da45770b4df6f9d66029 SHA512 c1f9c3a46fd2c5d6819ea069bd48a82cbf5816bc1586a88e9eb776b2376106d9d5f8a0d9a70a9f9f56e39e9f29eaa3cbfa26a8c588acf568bde86f4028af9796
+DIST mkdocs-1.2.2.tar.gz 6919165 BLAKE2B eba8d585c3653640bd3babbba3a1fab6aa9dc3ee365536ee7b0956e38250611bab3180c6a7f08eefb1e1a3637d07a0f366179570a9bb69df4f02a605610a770f SHA512 6cb111fcb3167a39e1d282d24b5e67d806c3e7506f55ef11a227b37ceeaea950142db2bc1db3709caaa2813c62ef8c4ef74aeb26e62f4f10aeee528e0532eccd
 EBUILD mkdocs-1.1.2-r2.ebuild 1864 BLAKE2B 4139562e8eaa9e525cab3da9bf98e8d026eb56ad4586a1fe9779fd4cc22a2637064b7449a33480f804b8fabab6cf94302a0407f23384e568b080f6cff2bc60b9 SHA512 7c0b734b407cd72f928527af9bd3bed6babf7f18d5c1dda43c7271c76496a2aa7fe34c62ef1e5cb03cc776a72bd47695f5bd180cc024ab1671fc4a98bc2e2427
 EBUILD mkdocs-1.2.1.ebuild 2117 BLAKE2B 781052ab12bd9605e4b6ce320c8db679db1e84c301c5566f55396dcc4c7c8e67f8fbcef4f5e6e39f91db5196dc6609d0f6a9e94c0cee4bd443102c8567dbd318 SHA512 425390d7bedab31ce6fef549c7eae9f9104ec2b4708303b600b84ef0af408c6377770f61df47296b18fe45697248ee6bff814d3c3b22e01878e092ab2f390968
+EBUILD mkdocs-1.2.2.ebuild 2119 BLAKE2B 241a1a7cb0b35db402c8d3447cfa505aa5560e7fa11f52812e472a1ae7b28a80e64a75fd315ee0c8eb2d22660600e0fdeb63830e39b8ad88b72f894d07a3af59 SHA512 63efb54b90930e66e44093ad8a454f703282c12beaf2d6fa2643e25065487cca90eb461dadb63bc8a20975020d82fd02bb7129353b3e777b63300b80bcebfe6b
 MISC metadata.xml 404 BLAKE2B 69b46289dc5228603da7575ea456d95e456c969bb5821820d91fa85599960ff9442bd1d7af810f936fbe94e9fcbc3ccace1156572d52f5445322a22c163bd2c1 SHA512 27dac2bb6455dcf92d9d86e3e1d9e29c87d5fafdc6d3e1f8afa059e562cfe9b233a29ed890cc7c3dff1e948d243b007f08b5decc4915deda6a0357d496a7be3f
diff --git a/dev-python/mkdocs/mkdocs-1.2.2.ebuild b/dev-python/mkdocs/mkdocs-1.2.2.ebuild
new file mode 100644
index 000000000000..842e38bc6ad1
--- /dev/null
+++ b/dev-python/mkdocs/mkdocs-1.2.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Project documentation with Markdown"
+HOMEPAGE="https://www.mkdocs.org https://github.com/mkdocs/mkdocs"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="doc"
+
+BDEPEND="
+	doc? (
+		$(python_gen_any_dep '
+			dev-python/mdx_gh_links[${PYTHON_USEDEP}]
+			dev-python/mkdocs-redirects[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+RDEPEND="
+	>=dev-python/Babel-2.9.0[${PYTHON_USEDEP}]
+	>=dev-python/click-3.3[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+	>=dev-python/watchdog-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ghp-import-1.0[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml_env_tag-0.1[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.10[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.5[${PYTHON_USEDEP}]
+	>=dev-python/mergedeep-1.3.4[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install nose
+
+python_prepare_all() {
+	# Tests fails if additional themes are installed
+	sed -i -e 's:test_get_themes:_&:' \
+		mkdocs/tests/utils/utils_tests.py || die
+
+	# Skip this network test, "does not appear to be an IPv4 or IPv6 address"
+	sed -i -e 's/test_IP_normalization/_&/' \
+		mkdocs/tests/config/config_options_tests.py || die
+
+	# livereload has been dropped in this release, this test is a remnant
+	rm mkdocs/tests/livereload_tests.py || die
+
+	# fix apparent typo in test (importing wrong thing)
+	sed -i -e 's/from localization import/from mkdocs.localization import/g' \
+		mkdocs/tests/theme_tests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	default
+	if use doc; then
+		# cannot just do mkdocs build, because that fails if
+		# the package isn't already installed
+		python -m mkdocs build || die "Failed to make docs"
+		# Colliding files found by ecompress:
+		rm site/sitemap.xml.gz || die
+		HTML_DOCS=( "site/." )
+	fi
+}
diff --git a/dev-python/nautilus-python/Manifest b/dev-python/nautilus-python/Manifest
index 9d62d0efc19e..def3f3c52c10 100644
--- a/dev-python/nautilus-python/Manifest
+++ b/dev-python/nautilus-python/Manifest
@@ -1,4 +1,4 @@
 AUX nautilus-python-1.2.3-gcc10-fnocommon.patch 6095 BLAKE2B ca0f7c2f46d3fc265cf2649c3f9f58d8bcf88212cd62065cb6f30adf2094e206eafb48354bc25bcc1afb887703b8d05d2a83020ff6382021edef130d5509ef38 SHA512 267171aadd5fcc825ca42e91f94dba72260017cc0aa4bc12874fef4773d46c6b47c1fc093e5043b3c77161cf2a51b78e6882ac8cc60c800c870d325108ce15c4
 DIST nautilus-python-1.2.3.tar.xz 269320 BLAKE2B 3d355bb8c0e67c488bb818d55c2bc97d8d4bfa14aeed8d6cb80d999a4b91ef5dc2f576d3dcca0e44ac004830ae326a93110aeb0cbe1987f100475cbee1b59ba2 SHA512 9c6a1a4bbf74a8c9c7d94a74c6994f0b1fc9de522c9f05d0ccbcdf3d60b1073dcf8058739ac0ee16f54b2632f2b9dd994bbe2bcd98cc165db543567bb1545443
-EBUILD nautilus-python-1.2.3-r1.ebuild 1066 BLAKE2B a1ee20e2f5ebe1cbc6b8736cea8089e60be0a68049b2f52715f44a6bea3f71680dc0c56a561b40a0d14e8c899ec086d29a3daa30554f7f63f68952cf22cc3f9f SHA512 1dcaee2ab0a1fe8f9ff1fccf0a7d75801863e9bd40d2ecce1748c6485839d5d62be1f518c03c89992043ab63db973b90d533b9d7b070b393dd579e6967194d14
+EBUILD nautilus-python-1.2.3-r1.ebuild 1060 BLAKE2B c288d0262a9d4e21d948822d07f0a164f1e88b02999e35e7402f9770b2679efd4786bef844cefec40e9937583928339b4a77f4d97e37b7a1f64c1a33602658a9 SHA512 8072b6a870b56f2e650387cb427f4d2d144019bfe6d778a55b3013ea7f3b7f43fdfb72ca20d381ecb3c2dc618f5ff84b46c3998eb9af54bf2f3cf54fe5664483
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild b/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
index 3fa650508cbf..e51196b9f0b9 100644
--- a/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
+++ b/dev-python/nautilus-python/nautilus-python-1.2.3-r1.ebuild
@@ -21,7 +21,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 # requires pygobject:3 or :2 and >=nautilus-2.32
 RDEPEND="
 	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
 	')
 	>=gnome-base/nautilus-3[introspection]
 	${PYTHON_DEPS}
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index f016236fe3c4..d2078eb143a3 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,3 +1,3 @@
 DIST nbsphinx-0.8.6.tar.gz 146019 BLAKE2B 106c121e9306c1b79771d49697f125b7c9272bddd9859b308d272e69cccf38fa306330bac01e8744f1a5a1e6831f63b73b43b0a2260eacceee4d2ff6c4ae61ef SHA512 11ff82be0633b3a2af2238d9dfe4406900804caf494885a5b3ff22f651c8c43000dadf83546ffaa85873901ef9625c2e786e53e866c27141fd9e9d58927ebf14
-EBUILD nbsphinx-0.8.6.ebuild 623 BLAKE2B 7664e14a7a77f0546c6ec7d30ff5cedae91071ca491ca531c83f1d9a707ec809f6b031e951e8f24f5e865bba8ca7d82d2df5936debc3ef9cdd2e04036e2cf8d0 SHA512 a76285e720a1847ada1ca241fd9999681ba2f70337b3704a1a4f5d2e792aa9504204079c07d75920a9b1f991297c9e8d2fe90dacafd621e28edd1fc5656ae82d
+EBUILD nbsphinx-0.8.6.ebuild 624 BLAKE2B 0c6cc84c3b436f373f82c9dee376901e32b7aac3a1c0a84854d7959b94771163805d45013fdf54422a1a0275e0f7420429e0b98dfc25b6a3b771a367379bbf2f SHA512 f6794fe9a29d963e87e9d20d31a5e97de90c72cfc67a6eed813f96431e4aca07bf2d20f1679bea66544b2e19e822c67358a3711f03c08a37b7236b527fbc007a
 MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
index 6d626dc40a76..cb2a5a717366 100644
--- a/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.8.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/networkx/Manifest b/dev-python/networkx/Manifest
index 9304792308a2..79ac9302b042 100644
--- a/dev-python/networkx/Manifest
+++ b/dev-python/networkx/Manifest
@@ -1,5 +1,5 @@
 DIST networkx-2.5.tar.gz 1542085 BLAKE2B a4d1d1f65a09f8e7cd830a9e670cf540c19b800dffb90aa1cc6ebda8b6116b6181969382f90339254746a3f277d786020506a3c8f10c90ff48999d3b2c3c433e SHA512 ab51198072d20bdba7c9ceb6856631a20a7e9527a7cadb41271a999f57bf60da5488269c6e4e1f3f4f33420ec6493af665386842c216ea1cfadd1792ccb6444e
 DIST networkx-2.6.1.tar.gz 1842369 BLAKE2B bac0106758fa7d33000d970873ee221ee9b367ad895f2f8fbfdfb29908851c69f632214dac06c48ab433e3b6251a439199fe3675517252c959ba2a29076cc866 SHA512 132f34eb8790fb366263cfbb501ec5ca0f9c9082562215a06a114b2ec80baf72f5489f27e7fe1cbea49749eab48116e8772ff953339de0caabf37096ce097500
 EBUILD networkx-2.5.ebuild 1504 BLAKE2B c281bc937ee2e4b13a57e6e861e4dcf881498e8b645230038d53fa6b10b800a15a999297c85503491c54a091f170604a91004a4d8c7387a67b4b36d4ea724730 SHA512 1c3d8159f280fb08aaea8dba9224db19ce801f73a991e4ec5f654ada7e9d28518eb366b05242a483ecfd812cc8380fec08770e56b61bee5c17e5f36dfec0df5d
-EBUILD networkx-2.6.1.ebuild 1225 BLAKE2B 024dd63def6aea8de3cd565f345181dbb3f457680c857b696ffa6c70df61c7f5daf7ba0c5b1d6cdcc46c1fd37699f967b65f2d55bf7b93303e58f0ea2cb264e3 SHA512 bace4d4ca169b2b8819ea80a3803799ecec5ee5464869a1b935004697365e4ca05fbe22dad911ecc907f9d7df184fc7c1a68a166488e43955a7e8a624f577cc5
+EBUILD networkx-2.6.1.ebuild 1232 BLAKE2B bb1fa41ae7cbcf4d5a4840fb969b2a2a2fe32b93877d0a5f6bf19346c243a65a020843d224daaaf665b61513b9d80b640e6a8c134d90c8c7649507ad78943afd SHA512 d3c13b48a8c5cfe3431ea7aae0363f7f54fe5900f943d4dc0e970f6ac64336d20e0f16ddac21318ecefa23f7b7ebd9da25b5d5209e9c49f89f5e7f9ce2ecbfde
 MISC metadata.xml 1460 BLAKE2B 2b3d94eb6c3b4827ff154dc73ecb99a46e8e194150cb508928b88366cfb6842f8b535c738fafb33fe0c4de70829b9a211cc64108621213fefd2305a725d8945f SHA512 3beefd0d791e9799438f097cc78e38aadec92100e013d5a477851f6a8db7a9fde606c3f1d5c2c0f4e75f4c8b3190b5daecf3b7c03b5f06a6f7866d46eecb1095
diff --git a/dev-python/networkx/networkx-2.6.1.ebuild b/dev-python/networkx/networkx-2.6.1.ebuild
index f11427eeb08d..51a49fc1b85c 100644
--- a/dev-python/networkx/networkx-2.6.1.ebuild
+++ b/dev-python/networkx/networkx-2.6.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples extras xml yaml"
 
 RDEPEND="
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index cfb0da80d123..a684b419d5d5 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,3 @@
 DIST numexpr-2.7.3.tar.gz 114113 BLAKE2B 95dca4fbd3148bbf198f82827a63fac3e9de29f677457f2ad45040e24a38bb05e4e09738efa0cac793970e18bdcd252e2744da96062217fd35b4054b10112989 SHA512 8234a65ce96ea0a2f20cce7dce3de652362a9edc86af2e7a333cdd8ecd87866f75970859ff39b04d529acc062b806cc8c64f262c318edd2897200d7e54b429e7
-EBUILD numexpr-2.7.3.ebuild 1215 BLAKE2B 6d2490c16549f2c7033375b9c137fe0a59354c2a36a36d1ee900a49cbc6936a7b50824078a371ecff28b8a51473f17c993d154bbe36c4061bea7c834c8ab8907 SHA512 eaba741b531bcda54da607ab0e37d3ce9fa12fd25f8e109e81644363b8e4f7b0577fb83e755f0bc04a5943063c5ddb35585643c14ae3957382bedf25ca0d0f00
+EBUILD numexpr-2.7.3.ebuild 1222 BLAKE2B 58f76b44daf9078b0423700621ca00dbb71541b146d9b49ef8026ab953517b0f54c8489317ff601d3f4df062f420d7d65bbda3f543a3abfa4f4d691e8470ac83 SHA512 86cb336d75545cc5ce02f30fe2709e8920c899a35e635192634f61d1e45d252a593264b806db3c9a799ffc41436efbc3238b779f9871a649846ffe0fe9674dea
 MISC metadata.xml 1086 BLAKE2B 5ead7194bab4b637946cc095ba6ae07eb461a20d4f8621f8be75c916e8d414a309b1679b928389e9e61f2ff4795a8f149b9a402f12bc21965d25df1251f6c4e3 SHA512 9867fb98eae499a7c149e61f37a08a27167d076cec8c85392c4a6db4bb8c44314f28771db8c35d1dc1f9ac1c8af21841503e12b0f0c3c39ae6be336a72096824
diff --git a/dev-python/numexpr/numexpr-2.7.3.ebuild b/dev-python/numexpr/numexpr-2.7.3.ebuild
index 37cf6ffd3eb7..75e1887417af 100644
--- a/dev-python/numexpr/numexpr-2.7.3.ebuild
+++ b/dev-python/numexpr/numexpr-2.7.3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 IUSE="mkl"
 
 RDEPEND="
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index b6f171f76b1d..f111be60a1a2 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -6,16 +6,21 @@ AUX numpy-1.21.0-no-hardcode-blasv2.patch 2671 BLAKE2B 78d7072241148874d746546ce
 DIST numpy-1.20.2.zip 7756879 BLAKE2B 8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e SHA512 337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c
 DIST numpy-1.20.3.zip 7761912 BLAKE2B a4da49f7c1aadca299acb1b6d92deb4f50b1881c4b131cd389524a88ffc70179b2acdc88235dccd1ffd09879893db45b16bf2f54ced9b9639b806e85f7346285 SHA512 897be1cd6f3880711149dcedd838357e2d937a3c5f36b2a0db6ceed341654acf96b8b775610e1b43bdb6eacb987bbc51aaa8906244ca02cc8c2eae359ccef405
 DIST numpy-1.21.0.zip 10252686 BLAKE2B 98f69855fae35f53a3bd467ca9bc0c06438519e6dc84808de829a4b1e41402b764c35ac4f94edba72496693241f85f488d6f91c81e7e5c3e33fdac264ce9ba56 SHA512 b4653ed78030d3c411fcafc08c6656072480704379810b7e3a4d907b55c255c27dcef6d519cdc0bb2dc79324c475baf0263248fb456be18a9ce80e3a2c5c7120
+DIST numpy-1.21.1.zip 10259878 BLAKE2B ba5d8eb2d294e199c86d8e96026d148098f5716398e730e0fdfee3b710fd01cb6e877973471d7751a2e558c2eaeb626fe9ce5ea4b03a7e4f8e5dc42b852d5b7c SHA512 694100915f4e2917d70a83e7fcdad30c85ffad8f5ad8d164c89287846c1b746c2b577233bacf53e8d8ca5147391f46065a2cabf100957bb8841dee4a042bc1f5
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
 DIST numpy-html-1.20.3.zip 22936526 BLAKE2B 9c0bf4edea0c34640a2f2d84f117aa383f8690f5c99eb9c504aa27c07195c1e5a4219efc798398d8de709803b67d4a41a2739b1319b6dd7aeba3e70e817c2488 SHA512 181ff49fcde40f2d260e480d4a90bd8b439aecafef4ea581749b5a432c7e8c163b1714a97fd447c512b550d5bf3d9b104c575b4939eb5c8b7b70bbce1153982a
 DIST numpy-html-1.21.0.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
+DIST numpy-html-1.21.1.zip 24270531 BLAKE2B 8a7a531afa559aebeb7a7b7ef94b2248df60a60fdfc190ca002dda625003df8b432fed393d6dd0c0c00fafbeb5064a61e3d99bba1a6c41e1e6e34ce091a43c89 SHA512 a165b95729a13806a03464cf39c20a0e18cfcf7701f05cd7777cd115bfaf0972f7155d201c7bd8d4177c5761f8800c982b3e3c29729a5e9ed356059842a44dcc
 DIST numpy-ref-1.16.4.pdf 5176571 BLAKE2B 9a875ebd1473b241d463d810a6d191581aef961158f2f82959671b554ace3ad482795e4f3e1cb7dd4632cff926c1e864c675a7624fb0f4e4f297948bf50f0564 SHA512 983ba0f34a70c011886bdbc9fd8f3f75a3a967ca29217acc76fa46e7da391296a5628c9a557ac76efb393271abfb8ee4f376d401c1cc1e5c30622e54b9325d09
 DIST numpy-ref-1.20.3.pdf 7362241 BLAKE2B bf17564d7aea0db25ca9ef6b24dbbd25093c09e2a93bb60b69220d4e666024c50f3373fdb65aac510c06420dc415102d552fb0435e1986330ffdc41e9e356098 SHA512 316e645402125ca41d1e8b4da33374703f4379c31cf572c8ad429e0e89b6968776f480f9159bce53b9fdec918f03b82e5bb6446f127f43f138d6c0990191af5a
 DIST numpy-ref-1.21.0.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
+DIST numpy-ref-1.21.1.pdf 7326979 BLAKE2B 3c1130a576c46e0705ca1f12e7a3345beb1acdd23de2a81448e4e9755636dec313e277a0d3167dc3b211332b3fc415ac0d96e7c99e859b51a16a589426814182 SHA512 5dd37ca03f1f098fffce80aa6a1a6eb8ec66df4322da1c620bd1f507e89ee2ceb222de32c9b7974f085ddf146f0a789ea8eb27d792a13c1aa8a893c00f94f75f
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 DIST numpy-user-1.20.3.pdf 4977046 BLAKE2B 3548463cc878645bb169255d3332681685d0f05e02abf4cfcdd03773826d34f5a25c020240652839867a76258b25ca601ed292462f80bdf18b92ecfb46710487 SHA512 f6c37152228eac1fb69ddfc3a37454066ed678d57f12a587e0edcfe0adb390cc0b470384c2751033f7407bac44df9f69b0da4f3da1c300e6fc02231035ff634c
 DIST numpy-user-1.21.0.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
+DIST numpy-user-1.21.1.pdf 5142404 BLAKE2B d670f1eb0f060599a640c52bdeba53b1758007fc2090a5b8fb6e135e71114149a0085811e4bc21396eabb1123ffb9edd39f8192d0165ab42dd066a9747eb3a3f SHA512 dde264abff1787efd50e913b6facf83522b3344ed88fd15d6fe73ecd44c6a3db1e4ce4251c9674bbcb122f72ab86c64142b2f4f992a6449405041f8e1f5f1ace
 EBUILD numpy-1.20.2-r1.ebuild 3789 BLAKE2B 04b13cd33ea2805716faf5c2d286e3f0928eeda592c0c6217501a1adbea30e614d940732041cb4236a89966db1cebae33b437ab55a309ff6be62e81bb6be5010 SHA512 9a2bb8e998e317e540b7a0fa70979a872db8b0a99cc1e6f72d1fa0ab1c11f26551be22eff1a84b2c25e9d39934246b955ea54fc72c25b2d89badc430bf048f38
 EBUILD numpy-1.20.3-r1.ebuild 3724 BLAKE2B 3d3c2ade82decb593116388cbd00e6c688e0b308b2a4bccb122fa716e7e8826f83f0d9f2fb6edeb43578325007b97c228899be055c5ae90b2740bc5a5dcfc7c4 SHA512 496058416f50bcc39632458bac10017071df0231bb564be2b496c65f693f0bb12c6a01a50df72f70a7f98f872f8258c8030db766fbde2f89a5c8327b1a786dca
 EBUILD numpy-1.21.0.ebuild 3567 BLAKE2B 8bfccf3046fa52a171d97bfe22385688d37a383a772310833fd59ead145d8ef7e1c45567ab664f3462e99595bac7411faddba01863143d553db30017f88f1225 SHA512 77e8d721c372f06aaab330c69d21eaf699cd0b04f91a1466878f9e2e89169a14979f7ec834c906ca0905ce909215f74c0b9c77f0e08b39dbbe34d07f275a83e9
+EBUILD numpy-1.21.1.ebuild 3684 BLAKE2B bec6b2a8cab14cd5348563c635f20918b43fd26e079b10e5bb42bcf0e360b1600111793f64695c0317b06d2bda5efc2a6fa131782b1cd65819598d995551bddf SHA512 06adc056c295c6113f7d69a1cd31330c7dae9460e59e7e7f53dd153392940d6549f5dc3d173a539cee26ae9c7738cde34a9d9e5e96e62992fa4550cf6604fe8a
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/numpy-1.21.1.ebuild b/dev-python/numpy/numpy-1.21.1.ebuild
new file mode 100644
index 000000000000..32f6ce2b232c
--- /dev/null
+++ b/dev-python/numpy/numpy-1.21.1.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+FORTRAN_NEEDED=lapack
+
+inherit distutils-r1 flag-o-matic fortran-2 multiprocessing toolchain-funcs
+
+DOC_PV=${PV}
+DESCRIPTION="Fast array and numerical python library"
+HOMEPAGE="https://numpy.org/"
+SRC_URI="
+	mirror://pypi/${PN:0:1}/${PN}/${P}.zip
+	doc? (
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-html.zip -> numpy-html-${DOC_PV}.zip
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-ref.pdf -> numpy-ref-${DOC_PV}.pdf
+		https://numpy.org/doc/$(ver_cut 1-2 ${DOC_PV})/numpy-user.pdf -> numpy-user-${DOC_PV}.pdf
+	)"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc lapack"
+
+RDEPEND="
+	lapack? (
+		>=virtual/cblas-3.8
+		>=virtual/lapack-3.8
+	)
+"
+BDEPEND="
+	${RDEPEND}
+	app-arch/unzip
+	>=dev-python/cython-0.29.21[${PYTHON_USEDEP}]
+	lapack? ( virtual/pkgconfig )
+	test? (
+		>=dev-python/hypothesis-5.8.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2019.3[${PYTHON_USEDEP}]
+		>=dev-python/cffi-1.14.0[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/numpy-1.21.0-no-hardcode-blasv2.patch
+)
+
+distutils_enable_tests pytest
+
+src_unpack() {
+	default
+	if use doc; then
+		unzip -qo "${DISTDIR}"/numpy-html-${DOC_PV}.zip -d html || die
+	fi
+}
+
+python_prepare_all() {
+	if use lapack; then
+		local incdir="${EPREFIX}"/usr/include
+		local libdir="${EPREFIX}"/usr/$(get_libdir)
+		cat >> site.cfg <<-EOF || die
+			[blas]
+			include_dirs = ${incdir}
+			library_dirs = ${libdir}
+			blas_libs = cblas,blas
+			[lapack]
+			library_dirs = ${libdir}
+			lapack_libs = lapack
+		EOF
+	else
+		export {ATLAS,PTATLAS,BLAS,LAPACK,MKL}=None
+	fi
+
+	export CC="$(tc-getCC) ${CFLAGS}"
+
+	append-flags -fno-strict-aliasing
+
+	# See progress in http://projects.scipy.org/scipy/numpy/ticket/573
+	# with the subtle difference that we don't want to break Darwin where
+	# -shared is not a valid linker argument
+	if [[ ${CHOST} != *-darwin* ]]; then
+		append-ldflags -shared
+	fi
+
+	# only one fortran to link with:
+	# linking with cblas and lapack library will force
+	# autodetecting and linking to all available fortran compilers
+	append-fflags -fPIC
+	if use lapack; then
+		NUMPY_FCONFIG="config_fc --noopt --noarch"
+		# workaround bug 335908
+		[[ $(tc-getFC) == *gfortran* ]] && NUMPY_FCONFIG+=" --fcompiler=gnu95"
+	fi
+
+	# don't version f2py, we will handle it.
+	sed -i -e '/f2py_exe/s: + os\.path.*$::' numpy/f2py/setup.py || die
+
+	# disable fuzzed tests
+	find numpy/*/tests -name '*.py' -exec sed -i \
+		-e 's:def \(.*_fuzz\):def _\1:' {} + || die
+	# very memory- and disk-hungry
+	sed -i -e 's:test_large_zip:_&:' numpy/lib/tests/test_io.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	export MAKEOPTS=-j1 #660754
+
+	distutils-r1_python_compile ${NUMPY_FCONFIG}
+}
+
+python_test() {
+	local deselect=(
+		numpy/typing/tests/test_typing.py::test_reveal[arrayterator.py]
+	)
+
+	distutils_install_for_testing --single-version-externally-managed \
+		--record "${TMPDIR}/record.txt" ${NUMPY_FCONFIG}
+
+	cd "${TEST_DIR}/lib" || die
+	epytest ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	# https://github.com/numpy/numpy/issues/16005
+	local mydistutilsargs=( build_src )
+	distutils-r1_python_install ${NUMPY_FCONFIG}
+	python_optimize
+}
+
+python_install_all() {
+	local DOCS=( LICENSE.txt README.md THANKS.txt )
+
+	if use doc; then
+		local HTML_DOCS=( "${WORKDIR}"/html/. )
+		DOCS+=( "${DISTDIR}"/${PN}-{user,ref}-${DOC_PV}.pdf )
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/osrf_pycommon/Manifest b/dev-python/osrf_pycommon/Manifest
index ad272c3b0a9f..2bf280cfffb2 100644
--- a/dev-python/osrf_pycommon/Manifest
+++ b/dev-python/osrf_pycommon/Manifest
@@ -1,4 +1,6 @@
 AUX str.patch 1041 BLAKE2B 35abd358988af1cf45975094758d56648d56cdc302dc507a3e5077e90142d31076d89592a06d1d9eae1dcfdfbc434efbb176990af955c06ce414603cdf7efa62 SHA512 94a8f4d42c3929ca7aa077142c4e5ec91ef2848b6f402b0a9a7beedd96865178ccf431aa8a68cf332927e783e56fdcdf4b8321679c0bdcea4e76564dc7f72d7b
 DIST osrf_pycommon-0.1.10.tar.gz 46303 BLAKE2B 3f18b8683a6363e1f15addfe75b8dee31f64fff7c286379d18355dc1f3467063c2cf1a9eb7978c5f9de5d64cb23d18a3922a416fe24fafa618f50f0ba89cddfe SHA512 5d53ea0c3c410a99964330dc22dcbcb3cd8892a359fee2061acc15ddb46e334ff757e8aa5b776fef381246c58e9834003ac818624da4b8e95552f214f3d9e6bb
+DIST osrf_pycommon-0.2.1.tar.gz 46633 BLAKE2B ba89f8d783446d52a328d126bcdfac721dba0a811007a55e48ebd3626e58b732d4f03cc2a042d517698d6708bc72e0ffede99ba82604d1f4204ef3c1da36601a SHA512 d05e6bcbb8e7b5506ea953d37c895dbca59765e9a26081aff2c4d213c02365a4254580843dd7624fe4a046afdb2d5b8935c1fcd4d60b6b1d71c4d22789d26371
 EBUILD osrf_pycommon-0.1.10-r1.ebuild 707 BLAKE2B 97b2fd2436b770dbc707b49e7fd1912d0144a9924c69ae5e97d8cf240bba8bcae3efc6692746200185edaa069a435c3af35bba898ccee46f955c68f387dbd57d SHA512 567c9814646ea221b6792ee4887bb6f3339dafed17984542c7c16bbf2e2575ffefe4cc7a285857a55721a133e252e8a11b3083c829c7c9279fa61fbd78fb70a8
-MISC metadata.xml 383 BLAKE2B b1a438df1b9875183113757feb0d88423209f774e28d840056ba11c11ff1dd8590f0e86308e4181d8c433be35124857189c1351d1191f1b4ae042aad95565d69 SHA512 aad17247919afc3b5878b929814921bf3954288d33b8e729d67af134449f52ee6050ba1e9054454e8a29bd92a1fb08a0263096e8ac4e448e70edfffb5e1285de
+EBUILD osrf_pycommon-0.2.1.ebuild 730 BLAKE2B aa06c126d0c6371aae091c8f8c8650be796714b6e1b1f8a9d758924787467e0b838e1e47b848f5eae8f151d422a92edff80f12ab1ffe39ef9fbdfb083801fad6 SHA512 691ce22cf7a777a07369890de6a255ff57eb66938ce422be5917b482defdafd0d7945d5e0e3b951f1c4c1227278d0af9fc8cfb6fcf1f50950b91d1e88af63a8d
+MISC metadata.xml 484 BLAKE2B 27b6c586f3d70f474606704d9bfcbd85b0e1bffa67401763948e4cd2b4b4712daf44eeeac8942b3f9705a00a0ec7b43a5674b36a8ebbe32823a626e2f145b199 SHA512 153575d6dba847d766ec346e71b57acd4f7b6355f6207ec71dcd7047736848d9d10ff6b3e2f23f935bf092cca72033aa5e0f428ac6c21a347477df88f12c66f0
diff --git a/dev-python/osrf_pycommon/metadata.xml b/dev-python/osrf_pycommon/metadata.xml
index e726c5a74008..71a1c07bfebc 100644
--- a/dev-python/osrf_pycommon/metadata.xml
+++ b/dev-python/osrf_pycommon/metadata.xml
@@ -5,6 +5,10 @@
 		<email>ros@gentoo.org</email>
 		<name>Gentoo ROS Project</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">osrf/osrf_pycommon</remote-id>
 		<remote-id type="pypi">osrf-pycommon</remote-id>
diff --git a/dev-python/osrf_pycommon/osrf_pycommon-0.2.1.ebuild b/dev-python/osrf_pycommon/osrf_pycommon-0.2.1.ebuild
new file mode 100644
index 000000000000..76c71e1f7c8c
--- /dev/null
+++ b/dev-python/osrf_pycommon/osrf_pycommon-0.2.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Commonly needed Python modules used by Python software developed at OSRF"
+HOMEPAGE="https://github.com/osrf/osrf_pycommon"
+SRC_URI="https://github.com/osrf/osrf_pycommon/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# linting is something upstreams do
+	# for us, it either means unneeded deps or breakage due to changes
+	epytest --ignore tests/test_code_format.py
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index d6be82f18473..ade178c7ca66 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -5,5 +5,5 @@ DIST pandas-1.3.0.tar.gz 4721119 BLAKE2B f09eedd848686597a755da929683e841be61cce
 EBUILD pandas-1.2.3-r1.ebuild 6196 BLAKE2B 3770a8646d55a10945a4845e61c125a1b211415ad73579378cf93835826112620790acf0a146b552c16a35a6f5294440f4ff1c7fa90bb91c131132c75dfea5d2 SHA512 00d90cda83aed40cd09245183fe8bc76b222f8817f0f4c2381ac115e9e68e1147afc6df748bebd8d5ca97574d1445f678c854b976e80aeff5d70d37279c1efff
 EBUILD pandas-1.2.4.ebuild 6153 BLAKE2B 3fb940dffdc0c19cddd05f31d7f065a5c5c873fde0e888b7a6a356b759dbfa2ae4729697c9240ac71b39957b9367bbeb70731ebaeddb46c778dba8e7eacbcb17 SHA512 44f78998f669a2df55b2b31c762c2e28c4e6064b3dd63f465e16a09a4843487e684142244348ee3f17a973ca98eb6645a73450444aa9a1fb984ef174f6a7e0c6
 EBUILD pandas-1.2.5.ebuild 6179 BLAKE2B 1830c307da0c8a1566ab2a47d7c93f2b591e4ad0f31274f133dbc374f12c6a206b7d8d94974c2063a44018f8197c78790f108988e353b84366e7e5b661a59e65 SHA512 00a11c97733b1ff262efd76f599ffcac0b46119508f5a444e386ba3c4d9f0cb36bb9d55afc397a6a3fabe7fb3a52ebedfed153e8f0ee59cd0355704c6e3afc33
-EBUILD pandas-1.3.0.ebuild 6403 BLAKE2B 54a0111d124c7280e6c3d36b4d4ccaec9b0be63b9e6d2aa4440f46f852cba42674534d2b6bbc6919b25878c8b0c25ac40c6e101e7572f587f0a32260fe8a4052 SHA512 3fc220025e0b6418cd363da9bd29c60b286f215eb1e729acc02c7d5dcd9699009c04d870651ae7b460c3a1d51c6c88d2df27ccec482501c879b9fadf56b0d452
+EBUILD pandas-1.3.0.ebuild 6410 BLAKE2B fa9b743b1cddd91d835cb6941e16118a8ca9b118119a0806ccc8d723df417d75a0fbe218b44d62c10983f25a7d1424a8e06798475ee879acb1aca71e018026d6 SHA512 cf2e4eff5dbde9ecf45578660b4fbead2299b419a104b01759c19cae21b6be89e7776ed514445527f338ca88186596c45907c73150e31ab10fe7f619a1f68dee
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.3.0.ebuild b/dev-python/pandas/pandas-1.3.0.ebuild
index fa4aad168863..cf0c8aa8a43d 100644
--- a/dev-python/pandas/pandas-1.3.0.ebuild
+++ b/dev-python/pandas/pandas-1.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 010f0b094c32..af8363de1923 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,3 +1,5 @@
 DIST pathspec-0.8.1.tar.gz 26644 BLAKE2B 3591aabbd62a0fa1908cef5478d74a6d3ba64333a540c124aa6e7d25fbc45d44faa83e0822fa776ccf787d72ec9c2a977daddefa07d5d6fea2c8c6345836350c SHA512 f793ecf9bfb6511420a37fefa5a9dbd79d8e7329c305d6f1ecb4ea90e322825471983b56722c680e418e0bab41204996075c83cfc8ba7c6a0e5e09b1d8fd1d2e
+DIST pathspec-0.9.0.tar.gz 29483 BLAKE2B 00b48f6987a074e23ac6f344a44ac8f265463bdd87907cb8a602c690a739d1a9a673182fc4d61a6e2ffc02acb6632591b873e435f9fc3893e1cc48015e120a16 SHA512 660f13525325c27b598048a3576fd704c3843e0b07770187d005f0e93996a90cee44e9a0725b6bf775982f586ed3b4ba7cccee966d7149e71e2b95d48030b2f2
 EBUILD pathspec-0.8.1.ebuild 558 BLAKE2B 422f6c5a2833410f01ed8089ab31e330e0c5dd5c9b35e2ecf6188050e6b7711dabc8d17b35506d2a78a1fb3085122ae8a0854e449e713cf6cd2f906f0804185b SHA512 799dc93a8f47780441bafbcdb1664c7697b81fa7b2efd97b647dd8055b07b0331a65d90d05956741855ba38293ebb91633c8b047e9173dd620c15cbc27a5e10b
+EBUILD pathspec-0.9.0.ebuild 566 BLAKE2B ca545c920f8bfaee3b1cd1cc0f5202e8e5329e4d4513e9ecd76f823040af79f75793b06826e2e2f1ca2aefface0a147314a7144f5d003fa56fbedee1d077e303 SHA512 930b8914b47aa107adaade00274d99d8b4a9ea92bd169d79b3fe1002929237583bf215fbe54b9f7bb40a11e3c54df007d556f52a7c148916442ae4fe8fadbc72
 MISC metadata.xml 421 BLAKE2B 388eb128b62746868b4ceabca9cc533b64ce5d5cfcf5fd70b235b2e3f569148b8de15443dd9f7406ac7a050dcda0e73999f3451ea51f8a7b7ccf979115ddcd32 SHA512 fd54f8bd2c7ef1515c4f4dc936b7de16c8efaa5c81e0ce313c719172d61874455c342b6c4103b5528cc423624d04cd236aa795d5adecdaa106f7f42277e5ccf8
diff --git a/dev-python/pathspec/pathspec-0.9.0.ebuild b/dev-python/pathspec/pathspec-0.9.0.ebuild
new file mode 100644
index 000000000000..71f4b7ecb793
--- /dev/null
+++ b/dev-python/pathspec/pathspec-0.9.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Utility library for gitignore style pattern matching of file paths."
+HOMEPAGE="https://github.com/cpburnz/python-path-specification https://pypi.org/project/pathspec/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests unittest
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 906c0a11be16..db48dab94270 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -2,8 +2,10 @@ DIST phonenumbers-8.12.24.tar.gz 2257982 BLAKE2B b7fa2a29c1c9a4a1029013d7de3eed9
 DIST phonenumbers-8.12.25.tar.gz 2257994 BLAKE2B 4bcd5e21819c1f42281fc684c97d41824a0dca1fc296b1968094e3a88ff235823d76cdd3b31da68bec677aea15021689ea40906b2c50363b999958029a05fcdf SHA512 24e6f1fb903d07214eed80eefd8f67e73dd4d66f0bb66308867453d05ea1b6272a8338e11bdb45395a37eb2ce8d6c3b80d90491763f843b3da4c131b43f5db73
 DIST phonenumbers-8.12.26.tar.gz 2257950 BLAKE2B 67d146b4c82691d2d4c481dd52ae23c8ec075af0b20e64947bc203aad538e5f45f63b0827458b8504679a8f5b84782793c3c11636b344c8cb4d21b418a7444b3 SHA512 12d5daaa9f82b0646bf22ece9d617971b21bfa5ac3a9731a2917bc33e6f790a7ff1423f49da14895a8de3004babf3a83b490397b0b7551c144f4f14776d1ab62
 DIST phonenumbers-8.12.27.tar.gz 2258133 BLAKE2B 73a295a464a0e4e7d32f3633a0a149504aed376a255453d3edb49137e979144645780777d988b1fbf5d7380b468ba9dd905f34e42f658f6ff8d0e0047d45ee35 SHA512 d177606bed9ca6f4e7f91ab695d9ae6ddfb2401f36c458907b2b6fe14e85a2ed188967da14971c15ec745b87fe794fc8ecca86679f01d3c8fb649224c2f75139
+DIST phonenumbers-8.12.28.tar.gz 2258298 BLAKE2B 02713540accf8c77c37acd7f69ffe3d1fe972124e4c8e82aa56f390d9906b10771c5a1a845c9b1adab602b041c38f4eeac6ee76d0e3382d542d64bcff5788fcc SHA512 49678b2b44038938733413d9bdd56904bb1a55bff9e1fa9a2636ceca18233c2ecdcc0fba8da5d1eb09e28c3c5d0eed61dcfcec1da729b7e599fcbc895ee47ead
 EBUILD phonenumbers-8.12.24.ebuild 434 BLAKE2B ca7366984b77d662a0d9239e2587005262270921ea388226c39aa9e8639a92957b3bb831b99df059a0dfc4ca68772ecc5f38a38f2953ca784eac1ae4c4e3c936 SHA512 269022a5fd237ec45e78bb73ac97dc90d7ae7b507225b8d7721d1aedc77344dff47adc5bc093a07b2fe7aa5e5e2e0a626b3477cb91a23e52d3d5c8f0b95615d5
 EBUILD phonenumbers-8.12.25.ebuild 436 BLAKE2B faa8e8bdcf8872a1ba317599365f4119cc3f5ee4dd499f39f368cb1cf3b65d8b326096cad692d4f5b9ff09b01b0482468c576989a867be35487f40625cf447ee SHA512 17b68175c9bc3356db3b33b34fa39a3db46a1415808fde79a23abf107b413856cdb889a8883dd7dfacaa1947e7e1992d2aa0c79d821bd9df34c6ddda73a48737
 EBUILD phonenumbers-8.12.26.ebuild 436 BLAKE2B faa8e8bdcf8872a1ba317599365f4119cc3f5ee4dd499f39f368cb1cf3b65d8b326096cad692d4f5b9ff09b01b0482468c576989a867be35487f40625cf447ee SHA512 17b68175c9bc3356db3b33b34fa39a3db46a1415808fde79a23abf107b413856cdb889a8883dd7dfacaa1947e7e1992d2aa0c79d821bd9df34c6ddda73a48737
 EBUILD phonenumbers-8.12.27.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
+EBUILD phonenumbers-8.12.28.ebuild 435 BLAKE2B ecadf7cc72b5bfd0ee74a21ddb278e396003026d9e1be3c69aec57b2abe1289221bfc87e5f5f51ff1bc5ba96e37a0afa8425e3406e9a2e9b07209df6d2d9af9c SHA512 eda6647deff5b367bd653821fd84ba5decd1daeaceca7b9ba02d12c77e2b8fac42c110f75b5516eb20290e2f2972a33e2cddbf846b175264be2ecdbecb62e4d5
 MISC metadata.xml 412 BLAKE2B 3244f00cf537fc9f8129cb4c499963a121ce2b33ea1edf0c1cc3833afbfe22c9afd5442e532b7324ccdb13cbd6a25e64e312715b13fe31ec16cf8d12a4e218f4 SHA512 a527e1c4d9bf2446bb5ef628d22731a2647bd937260f015a7cdb02c42fe3ce8a9c3d6a27660f3ab2521bf0a1400575063682dfc3faed2187edfe3f531e8427ed
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.28.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.28.ebuild
new file mode 100644
index 000000000000..4df0c54c7011
--- /dev/null
+++ b/dev-python/phonenumbers/phonenumbers-8.12.28.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python port of Google's libphonenumber"
+HOMEPAGE="https://github.com/daviddrysdale/python-phonenumbers"
+SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=(README.md)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 702340202673..8668020537f7 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -3,9 +3,11 @@ DIST pikepdf-2.13.0.tar.gz 2302937 BLAKE2B 1a46cdf25badcc1d00dde22fba7dea837dde9
 DIST pikepdf-2.14.0.tar.gz 2309588 BLAKE2B ca0af8ada258742571afa1133ba5ea282ac7a44dd34b5ebc24091dcd36629ac97b1c7b0e7e65cf86f0933a13423b9b5011d53ec75cd7b0bd614917443e72b793 SHA512 3b6c61f14581934aca2293b1d42be1303234209bd5fdd24216db57df765470591d5252b912de9b797f885cbd52ad610666d86ddfd1c279b97b1058cea36eb378
 DIST pikepdf-2.14.2.tar.gz 2310009 BLAKE2B 1afddc090e8e92c57843fc25cd7a6c8ef75e4f9c46144b10e91a96747b0a800a38715ace4d9eb5a65944b4495531417e8a34d7c34e1136f04df6c2c359ac2771 SHA512 cad165078bb634d6e5202ff71ab8d11f89a47974a3dd33c237b804f2784582b739bebfc6ed99664c98cf274c16dadb718a81d95710827be711e7d7d4c9ce5f77
 DIST pikepdf-2.15.0.tar.gz 2310862 BLAKE2B b511f9e721174c28898ccf0a00c84162b850b911a08815f400ba7269a9860dfc4b77b311139cad30fd6817a09938d360f8348d9d42a5bf2cc72e630523835644 SHA512 d43cd5759d053416ed4ac84150a979175ade970ad7f3128641549690a47113656739694af0589ba9f7202410be08698e048a38525d9ce108090283d9f1546ff3
+DIST pikepdf-2.15.1.tar.gz 2311058 BLAKE2B 47c7600ed8c27970b2a45dd5cd557ec6f18782f826a6f31247885d34564935bae2d92f6702fdd635d38730bf6a01e9c4b41251a8a94b73c1828677590bdf84ca SHA512 d71931539f87c64319e45710f31d01ec1cddc5c6bbf15948161336344857a9497ce61140ce4631af3e7708fa13e6e909eaf4bfb146c68f7a8b2ce1f03e206cd7
 EBUILD pikepdf-2.12.2.ebuild 1539 BLAKE2B 512ea496ba803b837f7ba7b9f717d3c7a4ae73c964d75048b5a6acb45b84a164a9dbb6479bfebdf4af82228ea9c3f70796678fe225822c053f36fb14c29ff17f SHA512 cc27ecd60eb8f31510ede37812de3d7fc041b9eb949cf4fcb3aa30cc486622d246b95129ee61d4cf6f8161ca06af501c5bf1b3b20530b712eea94cb191c3b08e
 EBUILD pikepdf-2.13.0.ebuild 1540 BLAKE2B 1e014c04828884ca9a5ab88c5a3fd1d1ea659c2a19662bd004a113846dbbea53f9fdb3661ce0c466c8b5b1470ff986bd1b63b1532571fb9ab485dd56b8c40fcc SHA512 1e2e6a64cce57d741d512f44cf2b325444d261c337b986fd1ef1eaac8cdc79f3a6d2a496b83a2a60f75ee242cd34ebcb7c02dc5601eaab3d663095fd3c00e0b3
 EBUILD pikepdf-2.14.0.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
 EBUILD pikepdf-2.14.2.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
 EBUILD pikepdf-2.15.0.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
+EBUILD pikepdf-2.15.1.ebuild 1541 BLAKE2B d4a9c95bbc168cd0af8e95bd780c3a7dfe13734eddf28f7697854ae47c162eaedc700eaa72e4423f502246abe1401c1ba4f756514238ec92a26ed7ad504e2640 SHA512 c961b9b0f3bf39620ee9ff22650eca48fd78b649952611b5c230f62545b41cfeb03fda85eea11f39a42d7c4fdbc03963373cec1a8aa9ca96763f57c0c0f07fa1
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.15.1.ebuild b/dev-python/pikepdf/pikepdf-2.15.1.ebuild
new file mode 100644
index 000000000000..2e4514c389e8
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-2.15.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/_p/.post}
+DESCRIPTION="Python library to work with pdf files based on qpdf"
+HOMEPAGE="https://pypi.org/project/pikepdf/ https://github.com/pikepdf/pikepdf"
+SRC_URI="
+	https://github.com/${PN}/${PN}/archive/v${PV/_p/.post}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-text/qpdf:0="
+RDEPEND="${DEPEND}
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pybind11[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/pybind11-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-4.1[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)"
+
+#distutils_enable_sphinx docs \
+#	dev-python/ipython \
+#	dev-python/matplotlib \
+#	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/wheel/d' setup.py || die
+	sed -i -e '/-n auto/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pillow/Manifest b/dev-python/pillow/Manifest
index 54389bda0426..41d0a5283591 100644
--- a/dev-python/pillow/Manifest
+++ b/dev-python/pillow/Manifest
@@ -2,6 +2,6 @@ DIST pillow-8.2.0.tar.gz 47898485 BLAKE2B bd8421a101e0be080f2fab238c3c26a4e1e722
 DIST pillow-8.3.0.tar.gz 48543291 BLAKE2B f74f2576e3f906db3c96f0854dcc3d7d5d0248b1e35d32da5f88e41751068012e64fed134f34263e2b244263f655fb2602d00d8d191c04573a93164a2fcc7c22 SHA512 ad0f9c50d1dbaaef56fdc43d6b4fa0960453bb0bf60bcafcc33bdbd8e5b4d698e4690baf1ec6be56651153fdbf5af520e9bbd8367a75fe36a995baac47069b4d
 DIST pillow-8.3.1.tar.gz 48722889 BLAKE2B 4483c3cebda33e57f665a7a73b5898b4f0fb5be895ec05feeb266a99f33c78fd1b550d82225c201ea015d267206f5b47909b4963da9f17d51d0e5bd897332a77 SHA512 22a85a5510c8ec13928af571ec7f329f4728c46ebaadfe338d837f6d3718eedb57b7548fd9a3260a3bb0c0f97b3f3c911e730af01f90ca70c967d44b1e5d3606
 EBUILD pillow-8.2.0.ebuild 2623 BLAKE2B 6307e4b40a8df642422c2d10cd4bc7cfa2235e5991e157497a170a1fd2743abc8229ea50d028de3d3e7580610b0242116735854d52bee7548d928f9e924c9ed1 SHA512 d5dd4f530275e37804cc072a1f2de58277cd10a9ae5a5abf4bd59ea560af846cd9b072e1f5fdbc6735ed86e55ce1ac776e5e0ec5c6371ee7099d7477dc342b14
-EBUILD pillow-8.3.0.ebuild 2630 BLAKE2B 87d4905ebd656722a446359b7f7c670abd5cec7f7ffc122b05018664e28071abc33fc83b732adaf1f926fb1a3093894e7593256d3a338e93ce55b2443fa6fabc SHA512 3edb9b9acd5232045fb0ef05a8aba2fdf68539e0aa29b748fc211c9434d3a2adcbbcebc26774f54e266e4c5b2284c1ba48a96be99bc0d9f63a9d91250bb298f5
+EBUILD pillow-8.3.0.ebuild 2627 BLAKE2B fccc81f2b2258a42dd70a7aabc1eb66a494f0f6f5dfcca0bcccb4a6d0cea5a81d43a1e15728301158f58d7c726a67cef1b123b7753f7592e420ab1a1cd3b3ab5 SHA512 eee259b4c67547014c84af2d4d034395efacec8f5119735530c51a6d9424fc71d759678b68c9872a9c393b863e6a46df2f9a1a165959c22e45384a99a96835f9
 EBUILD pillow-8.3.1.ebuild 2630 BLAKE2B 87d4905ebd656722a446359b7f7c670abd5cec7f7ffc122b05018664e28071abc33fc83b732adaf1f926fb1a3093894e7593256d3a338e93ce55b2443fa6fabc SHA512 3edb9b9acd5232045fb0ef05a8aba2fdf68539e0aa29b748fc211c9434d3a2adcbbcebc26774f54e266e4c5b2284c1ba48a96be99bc0d9f63a9d91250bb298f5
 MISC metadata.xml 479 BLAKE2B 8573c3f71b8e0d548f50dcb630a7c36d773ca8bb80f210bec320dc85bf12b70e9f30068dea615925c401726f0a5430827baa0104300abfd85060b522065c8d37 SHA512 473a9aea70516087faba8abddcd02bb76cb62711a5446fc5c58cedc0f0beb70cdef32e928ec293698b524d2e49440be2328567f84efeea4333477b7b9bd7a7d2
diff --git a/dev-python/pillow/pillow-8.3.0.ebuild b/dev-python/pillow/pillow-8.3.0.ebuild
index 2943f29c9d65..fc76b7c92491 100644
--- a/dev-python/pillow/pillow-8.3.0.ebuild
+++ b/dev-python/pillow/pillow-8.3.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="examples imagequant +jpeg jpeg2k lcms test tiff tk truetype webp xcb zlib"
 REQUIRED_USE="test? ( jpeg jpeg2k tiff )"
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest
index cd0b7fb88946..149cec3ff0e4 100644
--- a/dev-python/pip/Manifest
+++ b/dev-python/pip/Manifest
@@ -4,8 +4,10 @@ AUX virtualenv-16.7.10-py310.patch 2829 BLAKE2B 3fe4387bd4a9bb4182e002643339692e
 DIST pip-21.1.2.tar.gz 8772481 BLAKE2B 23dbcc5dd7e7f66934282b9c93958267eb367d418b6c814032b7b89e0d94c73c143626781b8df081394019d2e575030b7a2fd61bb5221992ce2060cf069e8b04 SHA512 54a2b6074fcb2640868dedcabb5087b79a53a8ad57ec4ab5acf2862b8037403d8f156c2853ab60c2f10c6af999a0a90774f0bc3eca2978a82590935d37af167f
 DIST pip-21.1.3.tar.gz 8772944 BLAKE2B 4c50fcb7c05e05d11b137d08547d9d55f19687442b8d44caf05d19917b200bcf860032cb28745e41d51afda80a7ac09d60afb8d619ade5b965ed87bac1133006 SHA512 21bdc78f24751981ae49c9fda0430fc92b8d33eb7a546bc344e8cea4aa85dcd42191ef8eb3fdfb4f3d1cb5921698f819d73e6e190d8745cf7ddfa52732d95999
 DIST setuptools-56.0.0-py3-none-any.whl 784941 BLAKE2B 136352bcaeeb803f94983db2e0f9ec79dacc23a6742a2f6f1b4bdd2b29a104f4965d78f9b4adf1a501c7bf39d4ed85a6786b03489f90872661afbf5e674fd3f9 SHA512 32405236e9c2936cde137bc4d4d07b548391336ce0511cd5677dcd1f85c7a142b0947e03cdceaeb37067874f5aa71daacaa1a6af95ae9fe3ad8af264f61e10f4
+DIST setuptools-57.4.0-py3-none-any.whl 819017 BLAKE2B afba86cf9aeea58ee869fdc11bbb192abbf2f89710e468b90dc291fec228ca16202483e36195a5ad4e2b8d210326bc83e2be6ec696ab413d94ffaeb05bb9c030 SHA512 9bf230f4e0e72acab07ab372a6ca05adb3d175a8079d2f73d327c632f3d27b8ee10442d3e60f4c94a6e61d5ba2212fc78187ca6e1717e15bb570bdce4263fd0b
 DIST virtualenv-16.7.10.tar.gz 5116776 BLAKE2B 42f0a4b4330850b504f8febd991ef6ecdcbb0821efdd94ca324a8cc34a68a760a8a98de97f0cb2384d8e6cbb0ce8f261995c6433886444e29b75ba0ce09ca12c SHA512 f06d7c354ce1910f04dbcbe1a77e60392653bbe4f638bafbe9284454db2c0e5d63cf9159201d0916fc01aaba91d45fb733b63096c38517fcd83fd00ed8b26d28
+DIST virtualenv-16.7.11.tar.gz 8134533 BLAKE2B ea81e11c210d911bf9576edf7b1754721b270adcc5d9633415d33b8f659149d64932fe2d366200121ec00c266c25dae380e248add438fc357477114eba4dfb4e SHA512 82d0d2a964508511e8e1686703581ff543f65791dc2449d9741d46ea57c4c89673947d2477ba374176f05fcea2a5ca572aa650c61c4f3271c4d73d1ff9d9ff42
 DIST wheel-0.36.2-py2.py3-none-any.whl 35046 BLAKE2B bc4e8dab7c74eea34d3b4a813b7eaf6295a99a396a861b6cdd76f743043e89140bad132bdd13e385e8945ce02e0798e1d3ac73fc1b23bde5b2a83e4bb4dd5cdc SHA512 6bb5119b4d3704fe1e3c1eaaa3124edab13f61b46f8a0a8e75974fac4e5b25d8b53606071a03a8d8990ad1cfe2ab247ddea260098df2c0c35ae965be47080284
 EBUILD pip-21.1.2-r1.ebuild 4397 BLAKE2B d428deb02df63f482f4951bde9d121217177fa7d4e7372ba78f328e4bf6acd32d54ec9fd9128a81856d093ec1a56c99ea390e6ff5d05f4ad82331babf1fcb301 SHA512 45b0da89df88d7801ed0700ed52d69e1782997e55aa30968e7985a786d8c6077b4e61fab4db96425749be338049f03b437dcc979dc8b3be507298087d9b1bb82
-EBUILD pip-21.1.3.ebuild 4405 BLAKE2B 5c61b37de4c8be7f2bffaf54d6168f79d65ae088d9c9fc1f8f0a0f60b11fafbdee889037bbe47354b74a5d14d449870ffc8e2666695903dd159d7d7047427321 SHA512 424fdab07a6e752b2d577928399fd5fb150f214b9689a41bec6422c005638d4948d0ecf4d40ccf19e10893f08c3775a5d2f756c001f3b5d0317c87bf777af082
+EBUILD pip-21.1.3.ebuild 4261 BLAKE2B ad1a47d683701fac59513dd59960694087ba9a76d387b5c43f42af95ffacc8a294b6e05c8d5207bc23751cd590ed3ac7f267f1489c0810c78c3c05b690ab8ce6 SHA512 4830c646aa22920250d6be4cdfb99cee15c833a6838655e83ec48d1d39198c47b304097d0458c5481c5ae400a58fa72c98257c5dc97784cfaea32aabbb8079fd
 MISC metadata.xml 391 BLAKE2B d8537d1b2f8886d7c30dad3975568e0198a04f16a7ced44f3682f1b865e25f0b7552a640955dd915b2f059eec78eb3f920a0bea0f5f1503f366731a5d20a96c2 SHA512 27ee4b430cd0175c9eecc279765fd617ce5ab55d36932879a0710c2eb66ac2de449de303b1b70fc0ce925666c87008814d64e62d904fc3b9f800380c53478e69
diff --git a/dev-python/pip/pip-21.1.3.ebuild b/dev-python/pip/pip-21.1.3.ebuild
index 6dddd21d4f6a..dfecccec8ab1 100644
--- a/dev-python/pip/pip-21.1.3.ebuild
+++ b/dev-python/pip/pip-21.1.3.ebuild
@@ -10,11 +10,11 @@ inherit bash-completion-r1 distutils-r1
 
 # setuptools & wheel .whl files are required for testing,
 # the exact version is not very important.
-SETUPTOOLS_WHL="setuptools-56.0.0-py3-none-any.whl"
+SETUPTOOLS_WHL="setuptools-57.4.0-py3-none-any.whl"
 WHEEL_WHL="wheel-0.36.2-py2.py3-none-any.whl"
 # upstream still requires virtualenv-16 for testing, we are now fetching
 # it directly to avoid blockers with virtualenv-20
-VENV_PV=16.7.10
+VENV_PV=16.7.11
 
 DESCRIPTION="Installs python packages -- replacement for easy_install"
 HOMEPAGE="
@@ -67,10 +67,6 @@ python_prepare_all() {
 		mkdir tests/data/common_wheels/ || die
 		cp "${DISTDIR}"/{${SETUPTOOLS_WHL},${WHEEL_WHL}} \
 			tests/data/common_wheels/ || die
-
-		pushd "${WORKDIR}/virtualenv-${VENV_PV}" >/dev/null || die
-		eapply "${FILESDIR}/virtualenv-${VENV_PV}-py310.patch"
-		popd >/dev/null || die
 	fi
 }
 
diff --git a/dev-python/pkgconfig/Manifest b/dev-python/pkgconfig/Manifest
index 678fcb87debc..71014d691c5e 100644
--- a/dev-python/pkgconfig/Manifest
+++ b/dev-python/pkgconfig/Manifest
@@ -1,4 +1,6 @@
 AUX pkgconfig-1.5.4-brittle-tests.patch 546 BLAKE2B d80db0a12eee8f2007075015a46038beb3674fd89cb57105f7a0c2d8164572a3aa45377bc52a3937ed25b4eebcbcfe7bb347ca56bdc0db5d2f01901454fb4dc1 SHA512 f45782fb5330cf218b9550375f2b8f35ec82ca6bfc8a3963736a7cfbdac06a8d1fbe979fccbc78caecb7f5765f46e07f28cb3333f32f806825de2bd2e4365684
 DIST pkgconfig-1.5.4.tar.gz 7323 BLAKE2B 3edc17a5491d788e23de875fabf01482e88d289b2376b4594c0a62fac5b761974c1b6b563f12862d202aeb9e63badb1cb105aebc9ac22b813f36d46952459c0e SHA512 c50593427122b24d3328fcbdf0d13eb9ce3ede068a23cd7c43d19a518386bf06ba42ac07d647d69bfda056baf8b6549955f9dfef78d785e64596833c4af5b831
+DIST pkgconfig-1.5.5.tar.gz 7331 BLAKE2B ef93a712198c1da5a38aec59f52d325b3d7cb25deef799bb006ba1f1d16b673b21d8c837475839e659f62eea9571a50476e38d3c8f95551fb5512a61a155334d SHA512 dfdd0a6ba0d9f37b6d504dc9bea8b19b18a3431ae54bb5fe061911bd1c6a20452f30ea66f67acc6c13c06123247036de7442bba3a7b0eb1af4ebb62d84df64f5
 EBUILD pkgconfig-1.5.4.ebuild 624 BLAKE2B d76cf08bf29092890e079aae24a2897015108ecf1618dde8b5f1d0da98242cebea18b33e8f8cb5ae52aeb714915029be9b712818c5375ed4e4a71fdb64cf81ff SHA512 206832f16380b46d2df65b429eb6214ac4f09d14f4fff9c3de435d5337dbdecc92fb2bc8019115c8216cf204921e358b6bb8d2ccee0057d352ef0256dd1e0023
+EBUILD pkgconfig-1.5.5.ebuild 576 BLAKE2B 589efa8c3882e87c8b0c4903f9697e34c55d749fa15b60218160f58bbc20a7e886f5a02af566182c778ffa2234cafee3e495884a56d5462288ddf32fdd36390f SHA512 094413f31e1fa1a029e9bd449bac4e2345b8dd48fcf9dde87be8c61f2b247c127bcb900e9a28412b4bf8c17ed55b50ca602f65680ed902a2d33b353dc68870e0
 MISC metadata.xml 404 BLAKE2B 4bc0c1973b01332976f22eac000dcfaf395345073577b6e4237bf80bd7311b5612b33b6fa4a64dbf8723c853a6944d3c936a7dbcc4c3a77d2390620ff33850c1 SHA512 a89d3d1e412813a81ba120acbe38262ae38a25d73cda8dfde458299f2bc8685c67f0e7ca2c4e5fe1ebf4b5fabe05ac491aeb153280bf73294a48ee10afb290b8
diff --git a/dev-python/pkgconfig/pkgconfig-1.5.5.ebuild b/dev-python/pkgconfig/pkgconfig-1.5.5.ebuild
new file mode 100644
index 000000000000..dfe66aa5f29d
--- /dev/null
+++ b/dev-python/pkgconfig/pkgconfig-1.5.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1
+
+DESCRIPTION="Interface Python with pkg-config"
+HOMEPAGE="https://pypi.org/project/pkgconfig/ https://github.com/matze/pkgconfig"
+SRC_URI="https://github.com/matze/pkgconfig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="virtual/pkgconfig"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pooch/Manifest b/dev-python/pooch/Manifest
index 2ae0ec4878cd..7c7ea45ea73e 100644
--- a/dev-python/pooch/Manifest
+++ b/dev-python/pooch/Manifest
@@ -1,3 +1,3 @@
-DIST pooch-1.2.0.tar.gz 212831 BLAKE2B 73db6d6ef432960704103cee92c72d80243c9f73c3896458b20a734fc577f4982c0ecd0c72d512f8d355f28f48ca084755816196431aa7f27eab9c467e4e0654 SHA512 dfb7d890d3211f8f737dc79fa81cc895c166dc96b05d86ad2df9b33f1da950a05bce8e6a80abdb467edef2157bd13a8209771ced91a17023903c5541a1b998d3
-EBUILD pooch-1.2.0.ebuild 605 BLAKE2B 07a796f87177f96822e1596efdb351a11b31d91bccfa0607cee779c7c1296be90b3f581d6c0f7e62e4311ad536aed21c78c9ad642212c3ebe85fc8d6811692a3 SHA512 e21a097fe683c871c926a36c945df2626b8fb45f62de3d33a832fa6ef461c86b2a52ade0262795b61d5c5f5ebedd3559cfac6882f0e19d945a0548a9d28196ca
+DIST pooch-1.4.0.tar.gz 57097 BLAKE2B c891387011c99edbb78d84a8301e18fbfce36ecf6e87372ab384921d7e608abc2db2d3b3b37229ba193f3dcebb03f8df546c266075a0a35f18856ff38b3f94e2 SHA512 f883ecbb8831a179338ad497376ced25afa812ba3fdce7db4eb85aca00368aaf7c9c9f4dd58348b24f182b59e5de52bf490f03b6d4b6a807c4dcc182ac89627b
+EBUILD pooch-1.4.0.ebuild 870 BLAKE2B 0b76b07ec095ba22810c8e2ef3313413366a9a539609a309ca3c0a482cdf3382829fdb2ebb706d415a5ab53b98ca9d563ce183e186c8a66ec882eb680df9a8d2 SHA512 9d029105eed7472bec52f3c0c0de98568c6f621811dd5ca71d547f2ce5b8f28b0990828d5bd2abfe3e2027157db77a483619e2fb9f8838a5e142bdfb05d32a79
 MISC metadata.xml 769 BLAKE2B 51633e3219b1a01a53469e0c395441473b8473f5fbaadbd4e5c5031de19237462d5297e12c970e018ef65ece2a56cd94ca3609a833da70ba61224c0f94607b99 SHA512 c2a24da1cf1241cd04424b37688db5a5241cbf425a9d1e29a4b7cb032847b55a5e8174bc7bff29836305e4273800693addb018e02353d081bac963f500dcccba
diff --git a/dev-python/pooch/pooch-1.2.0.ebuild b/dev-python/pooch/pooch-1.2.0.ebuild
deleted file mode 100644
index 217adcfac24a..000000000000
--- a/dev-python/pooch/pooch-1.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=(python3_{7..8})
-
-inherit distutils-r1
-
-DESCRIPTION="manages your Python library's sample data files"
-HOMEPAGE="https://github.com/fatiando/pooch"
-SRC_URI="https://github.com/fatiando/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/appdirs[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}"
-
-distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
diff --git a/dev-python/pooch/pooch-1.4.0.ebuild b/dev-python/pooch/pooch-1.4.0.ebuild
new file mode 100644
index 000000000000..9108a6a076af
--- /dev/null
+++ b/dev-python/pooch/pooch-1.4.0.ebuild
@@ -0,0 +1,35 @@
+# 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})
+
+inherit distutils-r1
+
+DESCRIPTION="manages your Python library's sample data files"
+HOMEPAGE="https://github.com/fatiando/pooch"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/appdirs[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]"
+
+BDEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pytest-localftpserver[${PYTHON_USEDEP}]
+		dev-python/tqdm[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx doc dev-python/sphinx_rtd_theme
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/pygraphviz/Manifest b/dev-python/pygraphviz/Manifest
index 133decdfc9ca..2dd09996783a 100644
--- a/dev-python/pygraphviz/Manifest
+++ b/dev-python/pygraphviz/Manifest
@@ -2,5 +2,5 @@ AUX pygraphviz-1.5-docs.patch 929 BLAKE2B 5186201bcbba3485c97c249bf9f4d6b04f641a
 DIST pygraphviz-1.6.zip 117043 BLAKE2B a6c4f28d67ff67bf3fb69869adaad23855c6d702663cfea648b2072b8a5095caaa3d9cfcc864354a362cc6c4c2c6e4a15d5977c58c6af5e22b02f8cea8f7e877 SHA512 6dd389b3fd8c46fd5c8a5a450623f2fe080f720bcf0812618549d092cf917b56ef515f4235fdb89123ece422c6e295705bb08076a3d3e9b193955fcda624acb3
 DIST pygraphviz-1.7.zip 118754 BLAKE2B 36507fc862bec45a33bee3f89e7593a15639e7d98067e1c4ddf917558b7bc037b9d7607f7f017ad5980ba0e6805e63f05464efe8fd416ef70cb95709151714e3 SHA512 09438931d1930a70f7da94b0a12b449c0836ad707c6c8abed49bae0db162c136002d170398ed02dc56a5029269490ce3156d2d4b0f30602a11165bc0038998ea
 EBUILD pygraphviz-1.6.ebuild 1042 BLAKE2B 392fc308251b392de90723a947174600ed1f2fd9122ae80614f3c6bada46ec56bc57b912d621d520212c9da4527ad0eb5af73ba07cb8683d9df3ecb1c65bb257 SHA512 a31cb0070dd46767a8703b9c721577e351df72a2e8d1e50f19451528dc997116a4cbff57e859227b2ce9ba4cefbbc47556b2335044bf02aa8b1da3b87a4a3bf5
-EBUILD pygraphviz-1.7.ebuild 1011 BLAKE2B 8cf68c203fc8e94b006dfd8b9b86252238be27496a680ec007b100222e7d685346ed978b7a95c2fadc6e76f1ba7a5b2bf697e0825b69b696f2a4cdbe4f7e56f2 SHA512 d2dd34d45fabf37ff25bca88e2370961bbd1690fc80aa3b5ee7ba5e5bfcb6fb4ededfa12a5fed6390137a4d1843e1d39597804c5757de6bad760d252697d9c08
+EBUILD pygraphviz-1.7.ebuild 1018 BLAKE2B d1edadfe4416cdccda0b11ebb35d0d325778d95dbe977584eda487885691e0a8b36f8580afc35591e14eb6c8acc7f4c40ddb3e293c504523d951893a6688a1da SHA512 4cdd8c2d0367866208e6e25be46f1fed36d0271baba8345bb93afcba523e3f36d7cfc3a4bf67d5aca6ccb5345e4d0d5565cc4e98d4776b08abc29c0a0fbd8aa8
 MISC metadata.xml 616 BLAKE2B 927c4645cd5247ac976860193a6f8024ff122891699c4831a48944cfec51cc5adc55ea0f3eebb873517492146188f6f3eca702f299dcdecfb88f46c0dbf83d8a SHA512 fd9922ce1c9f9d5381c5ed4f4679b45b5bfbb21c452a1ba4064e26fd33e59f648593d7322d1ee68bb4d3e2268a5a8dd2e7f676679d57147929cdb0493835d34d
diff --git a/dev-python/pygraphviz/pygraphviz-1.7.ebuild b/dev-python/pygraphviz/pygraphviz-1.7.ebuild
index de88e7c96feb..2cf250594688 100644
--- a/dev-python/pygraphviz/pygraphviz-1.7.ebuild
+++ b/dev-python/pygraphviz/pygraphviz-1.7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~x86-linux ~ppc-macos ~x64-macos"
 
 # Note: only C API of graphviz is used, PYTHON_USEDEP unnecessary.
 RDEPEND="media-gfx/graphviz"
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index 7dc51aa8e63a..74f5f2049270 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,5 +1,3 @@
-DIST pyicu-v2.7.3.tar.bz2 239703 BLAKE2B ce575c313d0e24838f87d270afce70e8b702753ec41d188bcdd60492f97ea276bca194c1bfd6224de17eaf84455509079e007b81e58c09ad0f48340b231e8671 SHA512 ff3bfdc5f24f259dc470f44c65707f7c29bff5c56dc85be7d4551269e5b6cc6e8f3a6953c5faae63aa9eb62e55f6ac75b32a1524f80ce2a7661de56ee1a5bf99
 DIST pyicu-v2.7.4.tar.bz2 241794 BLAKE2B b76455809704b417a42a60f002b1bfcc0fdf03dd4934b514464b06c4c53d1afa2f99645d9b69a131c3c9218f36a18a4412a6742a912450ce47f856dfc088e568 SHA512 bc68d94d2bd070cd1b7a2f214f998831d2f75a3f4528ad5b1d3394b343d357c24daa6b29443d35a7c984ab0bbafd3b45949d1ccbf89b061423329efa08181fc0
-EBUILD pyicu-2.7.3.ebuild 575 BLAKE2B feef69daec52c720ffd9f57d7f29c932f232eb3cfa71086cf3f3563859a7df6b7209ccb98f17d8f710bc40ba39f6d51b4848aa5f1308b9f3885579cbe4c8a7c3 SHA512 c0d3c1d6097facdf29fd11833672d9d3a8b7b94923ece6f168e27ff42e1b211567ae509c68e07bd6ff285a4ad8e1eff6be842d05e6f5004340b00d459ec7fa71
-EBUILD pyicu-2.7.4.ebuild 577 BLAKE2B 37a973d7dc44a7b31803ca252c236bff9733c057a16982d0833349640298db714246981bba993d774892e94191b26d12c49858a151097d0e265368f22836f069 SHA512 5ca8f712774af506a832ed19382f62e3459daffa68f7e21e216fb3d68b3dc816eb9917de9e60efdebfeb07d7e14a9857f2edc56e17e54f3085b306ead38943c1
+EBUILD pyicu-2.7.4.ebuild 629 BLAKE2B 644be8ae4aae181ea2be74b2031536f80fd986521d7468dc6bb843acd75328e25c4100c0f3015ffb5fde3e811dae101bd1ed11fbf70f4775babb95b6adc0e921 SHA512 830eae0bfd9d3c0d55a447e1a8d13c8256fd009338932fc4497a4bb4ce0034b4a76030e4ca773754bed99ff9c031f30a2a6bab6fc6f8a6c0fb454e68de34b147
 MISC metadata.xml 414 BLAKE2B c5d5e032b7e62372f92e6312f926171dc1ebf9d382dc2ed0f45994cf0a9768b7d467d6ea1ad47be7e9f0edcb58967632bf1b0973fea745c4ce4ce2294ae349d5 SHA512 4e094880c6bdb97f02812d29d95db1ef73b0f08ac6d7538d10cc989e695fc6df5b931be03748ebcd61f07e3078a4f1d969cd58b81b886003ade233c24f932364
diff --git a/dev-python/pyicu/pyicu-2.7.3.ebuild b/dev-python/pyicu/pyicu-2.7.3.ebuild
deleted file mode 100644
index c8c40052fa1d..000000000000
--- a/dev-python/pyicu/pyicu-2.7.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit distutils-r1
-
-MY_P=${P/-/-v}
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="
-	https://gitlab.pyicu.org/main/pyicu/
-	https://pypi.org/project/PyICU/"
-SRC_URI="
-	https://gitlab.pyicu.org/main/pyicu/-/archive/v${PV}/${MY_P}.tar.bz2"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-libs/icu:="
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES CREDITS README.md )
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyicu/pyicu-2.7.4.ebuild b/dev-python/pyicu/pyicu-2.7.4.ebuild
index 30d316501fad..7052eddb95db 100644
--- a/dev-python/pyicu/pyicu-2.7.4.ebuild
+++ b/dev-python/pyicu/pyicu-2.7.4.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-
 inherit distutils-r1
 
 MY_P=${P/-/-v}
@@ -18,10 +17,12 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/icu:="
 DEPEND="${RDEPEND}"
+BDEPEND="
+	test? ( dev-python/six[${PYTHON_USEDEP}] )"
 
 DOCS=( CHANGES CREDITS README.md )
 
diff --git a/dev-python/pyilmbase/Manifest b/dev-python/pyilmbase/Manifest
index 6d4235662cbb..e9cbdb0f452a 100644
--- a/dev-python/pyilmbase/Manifest
+++ b/dev-python/pyilmbase/Manifest
@@ -3,6 +3,6 @@ AUX pyilmbase-2.5.7-0002-install-imathnumpy.so.patch 643 BLAKE2B c46db3334236826
 AUX pyilmbase-2.5.7-0003-fix-pkgconfig-file.patch 1214 BLAKE2B 45b03a70c2a24889bf1614d5a86aeaff1edf41f508b9622497603cff81fa7f04bc29037763568dfc569bd26c079ca75e3b6ebcec9cebe9e184fe650a9007f013 SHA512 6df211523617ff9e9561c9de7c853b11082a5633a4fda63fc59c2d03d251881aa8dfb9cf6bf0bba67b8c9d584a8d3512509bc2c0f5c3af2a79a70948552f6918
 DIST pyilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
 DIST pyilmbase-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
-EBUILD pyilmbase-2.5.6.ebuild 1530 BLAKE2B 2d3dd8edc3b264abb8980320c2e785b3e2ffda1eaf1342ef226bc8a43856780fd557ea8729361594df31a624641ca2a9a12cdd75d74a9d8e50f5b04a5b4992d8 SHA512 8ef19f6c05652f73d734cdf6d04dbedb90a0e6e202a118b4e867ee35fc7d01f994c2abb3a6c3555b7cd25da11a6f0a17b4fad6f6c13a6c578c9cd7e03435ade2
-EBUILD pyilmbase-2.5.7.ebuild 1398 BLAKE2B 9fc95e65a2391a2a78710f9284f740c40057e11f1aa77b3b51428a3db076139f3adbb6810231763df563c559e11602f2079491c23116ae9a95de1dcb57487f43 SHA512 59c1b31b2ca9db64324bfd6829e5ff54882a41697309c36927b64f36953e626a75824fc586723580c6d9370ab19f24b7be3bc6936a4d6d0cacbcf4a64e48a692
+EBUILD pyilmbase-2.5.6.ebuild 1518 BLAKE2B 984aef1e772200117345cb174c1f46f24c3bb3414d863a86d89d5968f586d3528a5097f9e49583dd982657edd3e8b7259c5a69bbb044da1d436224890e2548e1 SHA512 fb4afe446f8ec3a0de3579ea0a776d70a3b4562046a025d849eb93cf6df33a4a7675dfa63bf28b33ece467dc1cee8dbabfba1d924e521ba638e0e1a68d5f4915
+EBUILD pyilmbase-2.5.7.ebuild 1386 BLAKE2B 3ed4549ec313be8031285379f41f93eba037c3e6bbbd9cd173fe083a4ae7ec37b865cc4da47b289d8c7bb11c4fdd8d4cbbaf0da0c288454fc9fecd719e68f128 SHA512 4a62d97e0de989561e4ca3206e2e6d49c95253d032851a742e972846e0fec1b18baaea525d87dbb49e97430d9f8a812e0d4a3fcf58b0263d80805c5c5f7530c7
 MISC metadata.xml 690 BLAKE2B 857ad16bdb3ab2ac35ca5d8e41a5e2302aa7e130c0dac5125135ba92569959b91278cfb3da987e4647aba4dab3898d7de9c6e340e20551379592a1c90d236882 SHA512 357ac1026fdacfdac7ced27c40fcf936a14dac7a044e8b168de7ac126811df67fb9e9ba01f8ee0fcf40ef86906abf37880fba6a782f27f832ca889de04ea4e58
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild
index 76a74d8d9078..b479afdf553a 100644
--- a/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.5.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit cmake python-single-r1
 
 DESCRIPTION="IlmBase Python bindings"
@@ -23,8 +23,8 @@ RDEPEND="
 	~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}] )
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_USEDEP}]
+		numpy? ( >=dev-python/numpy-1.10.4[${PYTHON_USEDEP}] )
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
index 5578bb6f7f68..b7e9e391a71e 100644
--- a/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
+++ b/dev-python/pyilmbase/pyilmbase-2.5.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 inherit cmake python-single-r1
 
 DESCRIPTION="IlmBase Python bindings"
@@ -23,8 +23,8 @@ RDEPEND="
 	~media-libs/openexr-${PV}:=
 	sys-libs/zlib
 	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_MULTI_USEDEP}]
-		>=dev-python/numpy-1.10.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-libs/boost-1.62.0-r1:=[python,${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.10.4[${PYTHON_USEDEP}]
 	')
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pylint/Manifest b/dev-python/pylint/Manifest
index 20bf7920c5b1..566a83fed958 100644
--- a/dev-python/pylint/Manifest
+++ b/dev-python/pylint/Manifest
@@ -3,8 +3,12 @@ DIST pylint-2.8.2.gh.tar.gz 734667 BLAKE2B 1525273298f39163de4db7946a749768cb9bc
 DIST pylint-2.9.0.gh.tar.gz 768301 BLAKE2B a86ccb83d3155acee0165dc7b0095f5b7741c62e7b1f127349eef643cd1d0513ed2f5aaa89d78728806f03b08645ed1579aafb073d649e928d4c415e50dc8a49 SHA512 b524a3d3241702c1fc34ca9ee38815d02e7f4572d8ff3c132141ac7d9c7ff59f88995b92ccfcf18fd57e04be8f24571ef0ab99e6b4ce615f0f6957022d1d1467
 DIST pylint-2.9.1.gh.tar.gz 769124 BLAKE2B feabb520c22722df73471e87e05f22f0fb937113c9d02e39bf4e2554479c58a5044afe565c107e9478d868284b8875fec65b976633dddb4bc9d7748b35640218 SHA512 7aea388c6e62fd53e6775a4732da87269f3df22f995241621eb9b8d72c8573b6a4fa9545b1553db91f09eee013bd695e075d69c35436b05623576f13f1317cb6
 DIST pylint-2.9.3.gh.tar.gz 770364 BLAKE2B 3892286ffbd79b417c6decba44bce97f45192299ac8e2ec0e24770b2dd6cf1c28bac790626a478d47a6124ec0470ea9fc0d4230c5a1e807532852844445bb95a SHA512 45c037b970b66254b54a4810a5609dc098b5493d409826333e6a75f9ff0fc02921162711d88c45fd2f437e6521f639c33b25b714830a977c501612ee497501bb
+DIST pylint-2.9.4.gh.tar.gz 777252 BLAKE2B 84bc535b3c471be5d01a02ee67494d993cc257f0938e1bb0e35b1d64415d256c4f0dabd45cdc3319716c67e5e71ea935b63633f56b97013bd8616296343709d5 SHA512 9b5db20cf2d858e662c309b11cf28bf247b7c5f90de4f747733a0288ff4acced02e0e6b83145e7d940772eb9debf297b9ee6976e0f3ffbd73aaacaa3f4cb51e6
+DIST pylint-2.9.5.gh.tar.gz 778090 BLAKE2B cbcf5427665f56cc37afd08fb537fcc3f17697ca7cdbd7da97bad4093f344c9b961a156f5d141e070fa84c7e07293175a70585a8c996c9cffb7cef80717752af SHA512 84695bae88704391752f4b0944e39f5b44933fee8d88a8839729845b93bbe59876da08ab98645217c4ff2a98fd793a92063123b25a595fb332ce0a3943bcf7e7
 EBUILD pylint-2.8.2.ebuild 1747 BLAKE2B a3bb2622c8b0c0efc01f6a768b1810f4c2e5abced9f64d74bfde68262ec499bb2b27f92ca54d53e90c56ddb285e1aa557cde18a1aeece020d6635a601847dfe8 SHA512 7dcc3c7ee9bbfef1251fd49e94e8ec4298c000fa3765fd63ed8737acaf33a59ea36ea655367685c2031eb2ac39e1a604db3d865ec5a2aa54a2b8f368a5e458b0
 EBUILD pylint-2.9.0.ebuild 1614 BLAKE2B e80781de4e7f7659a3ed4eb7b97babc20016788f817f8f46ccada5fc51125523b025b86328b3dae86db97bca1f04ea571318deb691db8ff9740608ce5413c7b8 SHA512 d268f97c235d15eb981eb9c68d3f21837ff3df5b87f7f9a1a7febffda82d1bc99c6a3a9e8fdd470ae523ece06ca351ec232eecd3adac8db3ba098fb320f490c3
 EBUILD pylint-2.9.1.ebuild 1417 BLAKE2B 5bc256a51f5f1789798601c125f28ca97f91de685cc955d687ebfecbb4acd3034f23c722356d2f8e8ba0e5b1aa1c2f7c396a06c5f9458d2ebfc2217cc870b406 SHA512 8508781be857a114574609adf5cf483e199ba21d5fb95a1e553ebf3c9a2a84d683852646498bf9d794d5a0e719206f5dc854e72cbebf402e41f4bb90ec28f367
 EBUILD pylint-2.9.3.ebuild 1424 BLAKE2B 52fa7d9843bba9a2a65c6fff4c724be00f92971707aee9ce9ce601bc8b4beb8ef29366b3be202e773b4f8fcfde58f14afb36061d6a8c7a6d41ebd9cdbfbc725d SHA512 d9721d86a998d9c5f0942a005718d5f71178747916d96b8fc8d170d52fd39b41f7dc6032751d901cdf9f737a41b3c8d4781b9481eb24438aa3543b270c1e2613
+EBUILD pylint-2.9.4.ebuild 1424 BLAKE2B b2275bca805d7f1228f2efa04885e523340ff1977617657e6f69612d532aaa93536d06bef8b920fd31f695698877797596d24fbe11997df3900b6edca10cccaf SHA512 283cd629c2075238db8e2de55308b980d5c8325fc2ebe8e4e0b8996a5990ce7567a99b792e9fed855f10f587d54badc99beb9555385be78a9695b04c97cbe3c3
+EBUILD pylint-2.9.5.ebuild 1424 BLAKE2B a8e024e6460e91525470f51b6010e436384a0a8b44c86af88553aa2a60d7b36c16851566f1a90d6c7cbafed48fd839c6def04e871790c525e672caf6bebff244 SHA512 901678329e3c7a09be3d0d359d3b692ba5663d6f361a84db07c583a3f58525a73d43f044f12f675f937b06b00ce443125f1f26500f51b9af06625b975daf30f7
 MISC metadata.xml 1099 BLAKE2B 11aa1f9ede89bc8c27e520c8fe9a8219aeff70c1f456dedcc816217fcff1ec67ecc41a528c93365cef316ec863466b706d4709dcc1237a3aae4edb792e2be7b5 SHA512 d2b4e51b129d7c83727310da44ca9385e81fdaeb350f63560a6a328308bcdcb939ec4e570b02e255fe6c8f68cabeb0d651994058b385598380edb42932785ad5
diff --git a/dev-python/pylint/pylint-2.9.4.ebuild b/dev-python/pylint/pylint-2.9.4.ebuild
new file mode 100644
index 000000000000..5c1fdf9d9f08
--- /dev/null
+++ b/dev-python/pylint/pylint-2.9.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.6.4[${PYTHON_USEDEP}]
+	>=dev-python/isort-4.2.5[${PYTHON_USEDEP}]
+	<dev-python/isort-6[${PYTHON_USEDEP}]
+	>=dev-python/mccabe-0.6[${PYTHON_USEDEP}]
+	<dev-python/mccabe-0.7[${PYTHON_USEDEP}]
+	>=dev-python/toml-0.7.1[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests ${skipped_tests[@]/#/--deselect }
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pylint/pylint-2.9.5.ebuild b/dev-python/pylint/pylint-2.9.5.ebuild
new file mode 100644
index 000000000000..75d26e73965e
--- /dev/null
+++ b/dev-python/pylint/pylint-2.9.5.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Python code static checker"
+HOMEPAGE="https://www.logilab.org/project/pylint
+	https://pypi.org/project/pylint/
+	https://github.com/pycqa/pylint/"
+SRC_URI="
+	https://github.com/pycqa/pylint/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="examples"
+
+RDEPEND="
+	<dev-python/astroid-2.7[${PYTHON_USEDEP}]
+	>=dev-python/astroid-2.6.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}]
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.4.4-sphinx-theme.patch"
+)
+
+distutils_enable_sphinx doc --no-autodoc
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# No need to run the benchmarks
+		tests/benchmark/test_baseline_benchmarks.py
+	)
+	# Specify the test directory explicitly to avoid import file mismatches
+	epytest tests ${skipped_tests[@]/#/--deselect }
+}
+
+python_install_all() {
+	if use examples ; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
index 43e3f8ad421f..2ad9b48bdc38 100644
--- a/dev-python/pyls-spyder/Manifest
+++ b/dev-python/pyls-spyder/Manifest
@@ -1,3 +1,3 @@
 DIST pyls-spyder-0.4.0-gh.tar.gz 8854 BLAKE2B d14a78be98c1db0a37a2fffe2e6bd8955687a95af8524c852d434e57cdd157dda8f5ecceb19ad34527dedede4497c59fb7949a709d266803c2d8cd67c60380ce SHA512 5a9d6667cb85434ec41a176e097d20c78751d5f3879d4d361e097da214b54b37fbef97d95a763a58d7f5e3c148215672e769091814f06a34139c6625cdae3f9f
-EBUILD pyls-spyder-0.4.0.ebuild 598 BLAKE2B dd765621565d4fff92ec8c68688586c38fcf8e5bb3d9445ffc672a1a99af84e69b1faf86e99b39c9ee489eff5c7fb9fe6f47f80b7aeb75ac1d37274eaf55ed34 SHA512 8df8b8a30a17aaca1889e698be51cb712c7251cd04b55d35799a1a106cd64ec01d90d74e07346134a01488dca0e32b2adc58779df7b61ba03461f28d899555e8
+EBUILD pyls-spyder-0.4.0-r1.ebuild 610 BLAKE2B b9a4f733b49107c1410fa899d63e45c529b296fc3aa3b2e229f1091ffa1d7d207421c46bef286858c93b51e379203daafde2273fed8d6fa9bd07d7ad169cdfb3 SHA512 1533be89ba5de97250d043d52588ada706146663b9e5dc2ed7cb64986eb9d7ba5216438cc5c8a9365f1730b9db5624d13904ae49ec030e14ec7f4701454e327e
 MISC metadata.xml 519 BLAKE2B 56a611a4a62e08659e92f60d8262aaef2b81c60036517b7b6cc47c1d9af998e6d18ca08844ddd1ecb6c6853db778a9f79edc34e4618d363f7e6fe93ddaa60a11 SHA512 9ed90f62c0ec5fb27f5d18b78df942b9bfc15fbd39d39ef21eb050d011a880514a4f1361c84e72f026195bf9e8630d65f21136170c90c7929f83bc69c74fa0cb
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.4.0.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
index d30877c10e7e..407619370167 100644
--- a/dev-python/pyls-spyder/pyls-spyder-0.4.0.ebuild
+++ b/dev-python/pyls-spyder/pyls-spyder-0.4.0-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-RDEPEND="dev-python/python-lsp-server[${PYTHON_USEDEP}]"
+RDEPEND="dev-python/python-lsp-server[all-plugins,${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pynest2d/Manifest b/dev-python/pynest2d/Manifest
index a42ecbb2ef38..39e339fcb9bf 100644
--- a/dev-python/pynest2d/Manifest
+++ b/dev-python/pynest2d/Manifest
@@ -1,5 +1,5 @@
 AUX pynest2d-4.8.0-fix-cpp-version.patch 516 BLAKE2B f10567673b4347a45446de9f97561faff615685df9027cea0f2c3625ed8ecd4df1ae80981da0295ef0795529795295ebb37e285f6926e3d1c69fe70081aa4b03 SHA512 0d01349a110bc2cde6b7279ba8b8d60cd71c599fe10054e4082aac86bf4e30184959dcfcc795a63ae7517845c014b14db029a6070833696191d874dbfa24ed30
 AUX pynest2d-4.8.0-required-flags-from-Libnest2D-target.patch 1422 BLAKE2B b42ac90f1182e38d31e9dac877d8e94baa01db734dc31381d674f000a9982ed65f316c4613f0cfcc1910ec086c3e3bf51cb08d4d72624fc684ec658a8260f8f4 SHA512 2957da641a52a457254bf53a83a7f83085306f2158ca814feeeee6a230c4d6b9bafb29dd0aeb7244857a4152fdb927fa02085d2a19b77b8f990128491a051ce6
 DIST pynest2d-4.9.1.tar.gz 18252 BLAKE2B ea98af68e7b60d615eaf6e90a68b37f8e26aa181fafecc2470b5d93d1d20a9667f5a8c903be87d419cedf47befd4e9ce757a90880c0ef19e7bb920147b2443b2 SHA512 f208e13cace4345fe691beebfe61895cbf81b7f90c19adf6a63b592928abd8591fed5c10e5b12d60c375684398856ea8d569fe8d1893a049e45d89b0ffcfc51d
-EBUILD pynest2d-4.9.1.ebuild 718 BLAKE2B 7f9b2cb7f27eab7bff6cf3686ad30a10057415ccdb5ad77a047faf4bcb95ff5b0f4422dea0a90cd07384c1f6de74e42b6d9300ed26bf1314cffd9dcd0dd11aab SHA512 c76ad4206a424f275f9451c3e2e0fde2b34d147abfe78614ebfde92200644b1fd97ed15f0eafa7fe82f57ef697033c2a8df435a4d5cb8c391cddbb7a81146f7b
+EBUILD pynest2d-4.9.1.ebuild 712 BLAKE2B 88abe1ebacd98b606b5f63693037914521673c20fb05102d0049ed7c7e56740cf14bdc048cdd3b69d0e7244b8484370c20ec6ab66c8365ef25c92fafe47aaef3 SHA512 8caee389b39633a187486b9260cb2e859efb10d14ec44190f6e560fc50e843720ed4c1a3a1fbfec3e73cc4ec05333ad5d366ef46512c8437cc36b51e0fe03759
 MISC metadata.xml 409 BLAKE2B d2b4665c2ecc55b12a8058ea9875761523b925461731bc3e9cdfc87b946b950dce07511c3404047dfe283edf761a3b69e71af29618fd39040a04bc3500413a5e SHA512 4e95045f37666488ae3b2dc2277e97bd3e5f832da3d23a20f601d71ede313d51ffe3407ab23536827d9b449a4cf5b38b49b410997e0f3a9bb90ad02ab8e4cbbf
diff --git a/dev-python/pynest2d/pynest2d-4.9.1.ebuild b/dev-python/pynest2d/pynest2d-4.9.1.ebuild
index 44552bf132f5..e6226da74083 100644
--- a/dev-python/pynest2d/pynest2d-4.9.1.ebuild
+++ b/dev-python/pynest2d/pynest2d-4.9.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit cmake python-single-r1
 
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/libnest2d
-	$(python_gen_cond_dep '<dev-python/sip-5[${PYTHON_MULTI_USEDEP}]')
+	$(python_gen_cond_dep '<dev-python/sip-5[${PYTHON_USEDEP}]')
 	"
 
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pypam/Manifest b/dev-python/pypam/Manifest
index 0db8c34fe787..7b0738f56995 100644
--- a/dev-python/pypam/Manifest
+++ b/dev-python/pypam/Manifest
@@ -5,5 +5,5 @@ AUX PyPAM-0.5.0-return-value.patch 1728 BLAKE2B f8f08fb3e254c2f706fb0dc17874bae0
 AUX PyPAM-python3-support.patch 5759 BLAKE2B 4aabd07b022f1c9db01b462438a2908cc248a1751e86230cbeacb8ecf11af5f7696a41387acfed6d6fd7231b053cd736a02fb597b401bdcd8515f11e1e5628ff SHA512 f2fa907fa2f4459894a14f801b65d7459c82ee202a39e6f18f77aa98192543326372a55217615da8b82c34891892d61f8290c3d6e8989ac577083429dd071abd
 AUX pypam-0.5.0-stricter.patch 287 BLAKE2B d3c70bc1db78da2f8434cc076b2a2044dc0d23683cafbd520d98aef089da4d1fe7c0344e72f838a894423d9b8f53e566b10c3cb6b6e267fcc67de14d69601ab6 SHA512 2ea057cce5e8b7810c879554cb9793b3869342a95c5ffa5239012157a3d09c8ab8cbca1f18424b147e83d6ffd770c417cdd39b7521780e611f8c69991c91d9eb
 DIST PyPAM-0.5.0.tar.gz 105206 BLAKE2B 7778275cae11606ca8e522d2f99fb0558c55545cdaedb3ff7c55b4bb693ed3429e22566912f53c7795f73316bc45f1bfbdf5a53daec234dba87e1c141e2410f2 SHA512 9e0e919e34930d2283307cd6665c5287c664a76a5de56367bd975867ac26b376ae03d30cb3bc4a16390c977ca2690cfd2e90ac73dcc7886b8c999444da4a07e0
-EBUILD pypam-0.5.0-r6.ebuild 1034 BLAKE2B 3b0bd955c209a66c439dbecd494141757a4293b6c73275ae857ed969402488afdc39456a29a9c2416afed75b3d022cc9a4487d79732e13972c53efc89eabf062 SHA512 57a309c9456a771fe2c8d6cd0e04872406873c90fe6bb944aebf1998a7b3bba974c03910d99f6392ac29dd5fdafdc8fa16b6c82f78b0e046a467c44368446148
+EBUILD pypam-0.5.0-r6.ebuild 1096 BLAKE2B 0f24537349176ffcc264473866d463e8b9922232805f4e4c87eff562f872386fc68719034818e3d69b6b29ea1108d970bf1d2589853e8729d2df425f21597890 SHA512 41a3e1127fa1a5f6b42f48e188e8fa90361e390cd43a553795a5d0612757e9cf81c4159f3af9c9a3bc4cb1d3e03b67b311a4c1814b6d81872efe974b028caa20
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/dev-python/pypam/pypam-0.5.0-r6.ebuild b/dev-python/pypam/pypam-0.5.0-r6.ebuild
index af7d95bbd828..ca6df1352e51 100644
--- a/dev-python/pypam/pypam-0.5.0-r6.ebuild
+++ b/dev-python/pypam/pypam-0.5.0-r6.ebuild
@@ -10,7 +10,8 @@ inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python Bindings for PAM (Pluggable Authentication Modules)"
 HOMEPAGE="http://www.pangalactic.org/PyPAM"
-SRC_URI="http://www.pangalactic.org/PyPAM/${MY_P}.tar.gz"
+SRC_URI="http://www.pangalactic.org/PyPAM/${MY_P}.tar.gz
+	https://distfiles.gentoo.org/distfiles/ad/PyPAM-0.5.0.tar.gz"
 S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-python/pyside2-tools/Manifest b/dev-python/pyside2-tools/Manifest
index 99443628d8f1..d95082d97af8 100644
--- a/dev-python/pyside2-tools/Manifest
+++ b/dev-python/pyside2-tools/Manifest
@@ -2,5 +2,5 @@ AUX pyside2-tools-5.15.1-dont-install-tools.patch 1782 BLAKE2B a9a1c3cb8d1e6feab
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
 EBUILD pyside2-tools-5.15.1-r1.ebuild 1664 BLAKE2B df506bbd3f320d949eaebaeeafd9baf5e92d1b5bd5087a1bdc5dcf938ae46ced2f8ac5bf7831ee527a06229455dfe0d8140f4304e2f2a66683a33583c3b128f9 SHA512 e945c2577d455e12154e10cbb32ffbd27e0305565770f735a7c5a5d6c0c5444698a56ee738f3daf47cb1f890cc5ef0f9e96d5da675ec915fa1b003803ee1a889
-EBUILD pyside2-tools-5.15.2.ebuild 1656 BLAKE2B 68cf0a7a467452a7ffb62d64739d6f83ac878f492b58685c77825ad59bc82a60c385c334a7d6c7bc62e5a7b88ae951c918371e5fc6ebe733fb4f2ce4285e6c61 SHA512 2409aa14f7b05ac02d74c0a57efa94b356179a79888c8db2bdc29212aa5229e631bca576a6f860f9ff05b64ff19d6a94bf34b30398726a93512d9b68e72a3350
+EBUILD pyside2-tools-5.15.2.ebuild 1654 BLAKE2B 9bb7c7ffdf6690414328df5a6a2e1ceaa2cf9e23df0cd88616f09339a42d574f6c84deb1fd5d76ce70efe8ba9d87e2636e8855213f4c34685a3e522f61ce6a9a SHA512 2a11a7e368a50961aa792a0a65377ce430f186e54e6221d1d8cbf149f34fb9c12d92f0b60d289a1c6fc684e9efe4f4bf839bc0f3d1c34203d92a808e6583c2dc
 MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25
diff --git a/dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild b/dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild
index a5390b2c4fbe..26e9befee28d 100644
--- a/dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild
+++ b/dev-python/pyside2-tools/pyside2-tools-5.15.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}/sources/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 2e8eb969744f..0051a3d4053f 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,5 +1,5 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
 EBUILD pyside2-5.15.1.ebuild 8507 BLAKE2B 0bbe7b1019a4bd79d1dc055367b076cb5001bacf5382913f2886a436f3ed272fb59e0335e9b6d6f578f0da168e31f175d3313502748c44aa85f9a50ed6ed0fa0 SHA512 798f62f0fba6183da092ea879beeba2b80bdfc6bcb87f49e1a09a90af96416dcd855126dc39f5c13b2e65ec43c15762edcc172fc9ed0180cee779b4737e9c920
-EBUILD pyside2-5.15.2.ebuild 8509 BLAKE2B 313c974b96c0afbb614a568cfdc73c934e7d779edda10389f2f73af19524aad20f9bb365de79c24a54ab47615786290a64e1b60ab984548da3f1169a68966e0a SHA512 b192190a03b7674b13b76b6b48645615f1cdefba6cb5d7d471253f4e753e4e1f59a844a2e335e1130a6442880304b316b3ca87f0f1d987dfc7ac9c98ae4bfbc4
+EBUILD pyside2-5.15.2.ebuild 8507 BLAKE2B bfd3ba37c28cb9a9c9882fb30409b59cf27c71140652d724db1f697aa2b7dd0835ba867e22d44af1a4dedf80b318056b82f7b1b24a89adb5c07957c7b003b6a3 SHA512 18334bc86d0b277505e10ed6948233bcdc96e4cea001d72bd24bf209feb540444da6a13b90a699c47c69eef3272d253c16debf904820d73839647d1615db21dd
 MISC metadata.xml 2100 BLAKE2B 5edbc13cb5654c4ebe787ab45bb87bccf87eda50d608560cb63e639c2ee997be8320b8c7b0f48403d86508cbf1eeb960c666978de1a6918571d0929bef640b62 SHA512 64da8de5b7b294e877d20927bbf11430b9705c0fcaa2445cfabc3f0a0b1fc4e586299b065868f09c688573c754604373cafdf1d2ba8c3d4c30ba66032b83f9e4
diff --git a/dev-python/pyside2/pyside2-5.15.2.ebuild b/dev-python/pyside2/pyside2-5.15.2.ebuild
index c2dd67aed989..1846c6047bf0 100644
--- a/dev-python/pyside2/pyside2-5.15.2.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.2.ebuild
@@ -34,7 +34,7 @@ S="${WORKDIR}/${MY_P}/sources/pyside2"
 # See "sources/pyside2/PySide2/licensecomment.txt" for licensing details.
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="
 	3d charts concurrent datavis designer gles2-only +gui help location
 	multimedia +network positioning printsupport qml quick script scripttools
diff --git a/dev-python/pytest-localftpserver/Manifest b/dev-python/pytest-localftpserver/Manifest
new file mode 100644
index 000000000000..ed0cab164f1f
--- /dev/null
+++ b/dev-python/pytest-localftpserver/Manifest
@@ -0,0 +1,3 @@
+DIST pytest_localftpserver-1.1.2.tar.gz 41275 BLAKE2B ddab430541208ea7e30b7091f0e5ed1ff347c4f289c79e1bf93e7fc56ac3d9076065afefb383e8e394cf702ce906747c7450acc0423df73cba5762cac01efec2 SHA512 44dfb4e680f82d6156212a06e320d437c5aa947b149177bb05a612473f882e0d2e8ff02751d0f79d56596cada82a299c9266b5849220687cea1028df7ca1bb00
+EBUILD pytest-localftpserver-1.1.2.ebuild 622 BLAKE2B ba6c3e8a0cb91820caa2fbf4f67813526c4169d0e1e60c3de39170702978fe27261f819db005dbf9609ee185191b85a914e49523613a3e61ee901b50265fea22 SHA512 90113f93c94de2ac8661059b07445fab8d9195ef6210438ea38dfa24d703fcfaf9365d67340d4b39086d87aa591560fd248c98a4bef44e0c6f768b32d40f08d7
+MISC metadata.xml 568 BLAKE2B 8217eb6510f2a94664066eab9396d2eac4b1905611e92db73478f3cc14bd973d3b63d46385a1f7869f81491f727a5826fca03ad982a558acfd2a6f4b27d80c1a SHA512 2d6d549b5f1852308e43a827f5023222aca9d20f70a7139d08d1c20009fb21347854efacbbfe5b9c19d29e2448e675d527fb2a58de701f0f73372f8ce9a3f69c
diff --git a/dev-python/pytest-localftpserver/metadata.xml b/dev-python/pytest-localftpserver/metadata.xml
new file mode 100644
index 000000000000..62e1789c4b28
--- /dev/null
+++ b/dev-python/pytest-localftpserver/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>3dprint@gentoo.org</email>
+		<name>Gentoo 3D Printer Project</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<bugs-to>https://github.com/oz123/pytest-localftpserver/issues</bugs-to>
+		<doc>https://pytest-localftpserver.readthedocs.io</doc>
+		<remote-id type="pypi">pytest-localftpserver</remote-id>
+		<remote-id type="github">oz123/pytest-localftpserver</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.2.ebuild b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.2.ebuild
new file mode 100644
index 000000000000..4706d32e6255
--- /dev/null
+++ b/dev-python/pytest-localftpserver/pytest-localftpserver-1.1.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+MY_PN="${PN/-/_}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A PyTest plugin which provides an FTP fixture for your tests"
+HOMEPAGE="https://pypi.org/project/pytest-localserver/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# Tests require python wget module, but not in Portage
+RESTRICT="test"
+
+RDEPEND="dev-python/pyftpdlib[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 5903836a50a9..dfdcc5517136 100644
--- a/dev-python/pytest-regressions/Manifest
+++ b/dev-python/pytest-regressions/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-regressions-2.2.0.tar.gz 98162 BLAKE2B d87b331a35a988e8da6a6c827b594eea6ac64adb17a5b4a054ff0e9526d8d0153d84e0f59ffc805f76a96c1b100961ae12d05849fe2dd35ff4c18f42e235b3b0 SHA512 a4c91590f6e3825eef97da4fb21c1b852b68b60d6dc61ca9e1581737c0cb02831b091ae215aa16a5c50d06d413dabf243de4e98ebd01ce2af7fd2ddbaedec3fb
-EBUILD pytest-regressions-2.2.0.ebuild 1066 BLAKE2B 18e7110806bd68e26943690c24fb757a96f5a9c04a27a87fc0ee9aedfff1f5c9be83e256e308943d9f96d652e9b2a355fc9743c9bc3eb59bc09f0b680fe8b263 SHA512 f6949629a4bcb9c286365dea82674a8fa37940829adf7e11541d1cb282f290059c1be370eaef3060ae70f5204f45088f6d288eebe2f28ff77293ca7f0a0d00f7
+EBUILD pytest-regressions-2.2.0.ebuild 1067 BLAKE2B 7c71b39503281a8b6be61b5ef690f52c4c877883ad726d9699782359f5f5a66f1127be9dcbc447c32faa810fc7a108170cd6c31c1ec3c875608cef7c831723e9 SHA512 8b324aabeef709b3320115b890b3c57e1d31697e525a8f712de48e24ff42d6dfe4893bce16e6d3abf4f80e0fbb87412e5f6f9fae35b475820f4e80cbb64f9f1a
 MISC metadata.xml 464 BLAKE2B df781a65e58ca817930a547d83f754cd1b3ba652ad8aab397bb9a0954b5ec124fa99a9d0c804ec02de1d2ed8f9d67bab2e7655c219b8504a9a1aa0e50de5bf57 SHA512 3156101dfe3b4029b2fef4823563e267139010b0d5273a41b7ce86f739a040a2f31b60afd7d8636dacb3e20391ebbad1195d9c08209d96e0e959f7abab4549f8
diff --git a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
index 07c233bce68c..fa7829c72396 100644
--- a/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
+++ b/dev-python/pytest-regressions/pytest-regressions-2.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/python-caja/Manifest b/dev-python/python-caja/Manifest
index 415f9d6c6760..bb6661a90b2c 100644
--- a/dev-python/python-caja/Manifest
+++ b/dev-python/python-caja/Manifest
@@ -1,3 +1,3 @@
 DIST python-caja-1.24.0.tar.xz 312340 BLAKE2B a860cb1cc983221710d93943ac39b9b77761997fa6a52b32dceeeec381ee86d976c56266013d0370a28e7cb26de3601fec42234b4f91c78e5ac54992035e17ee SHA512 9febf7cae1736e30c80218dcfd3cc05b948823b99945ed67c1839ab5149aa3fe05b090d46c598810f0cde8ba66b83426c4642f6ebdbef6067f6b2fbc0798e816
-EBUILD python-caja-1.24.0-r2.ebuild 1230 BLAKE2B 66e1184bcdf2b626ab35b4c763b6d970f0bc779a72effa037aae1d42bb7fd4462f789e7dcb5358c3189af022a9a190d2019da9a4116ab2460bdcafa561e5bc60 SHA512 8b4f01abd21bbc1cc5fa41b67368fd74f9909430bdc796470984a6291502240775b1d02a276d1d0f94a0dc5f6f7ab63c434cc824f59af5a6656750b32f8144d1
+EBUILD python-caja-1.24.0-r2.ebuild 1218 BLAKE2B f1398f1578bd7246c4878d588ed03569d0f4e1eac555100cb819431fa1f31d546bb75d954ff9ec31ff25bf3cc274d8439081c918df357bf9dd6469349d90870f SHA512 233bff12b4e70fc76758d613391ae7d1e0fa35c62fb95df9040d810e08871380c1e528af48a607bf23b443543ea0ccb2ce05a60fe73bb72a002cde15d65dd1a1
 MISC metadata.xml 340 BLAKE2B 38e2ec7c21175122fe4d2439ef5b70277caef629d7275055ae44146db7d9def0c2af3f4d190a7a4ac426ff6fe19f9cf5a707abf71dd1fab85ec79e5d81e1f075 SHA512 5892ee1cdadbfd6a93d5bea5a6232ce8351373df7a6037ed605a8d66c3367fb7afb39e1b4b31052a599cb1e7ea155ae818e9f8225c7992a21443131e98621b33
diff --git a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild b/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
index 4e4c9419cc77..2d0ab57971d0 100644
--- a/dev-python/python-caja/python-caja-1.24.0-r2.ebuild
+++ b/dev-python/python-caja/python-caja-1.24.0-r2.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
 
 MATE_LA_PUNT="yes"
-PYTHON_COMPAT=( python{3_7,3_8} )
+PYTHON_COMPAT=( python3_8 )
 
 inherit mate python-single-r1
 
@@ -20,7 +20,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
 COMMON_DEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.50:2
-	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' )
+	$( python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' )
 	>=mate-base/caja-1.17.1[introspection]
 	>=x11-libs/gtk+-3.22:3
 "
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
index 365e02d1d123..2fd5ced8d80f 100644
--- a/dev-python/python-lsp-server/Manifest
+++ b/dev-python/python-lsp-server/Manifest
@@ -1,6 +1,6 @@
 AUX pyls-fix-test-with-pylint28.patch 9964 BLAKE2B 8f8f4a2a874f0f4a3b146463301b997b82a0b05d662451faf77994ede1057f7be71e2916d74944e0b30fb6d6c0d7b7a9bf5eb651085033b2279974d2005191a2 SHA512 248bfc639c6e534ddaa7775ec09e8c108e1ab8b071b99e2b9fb855c22b9427112a6e46e6f9261150700ecc752206c36a99398973bc8a10b48587f12bc42bed7d
 DIST python-lsp-server-1.0.1.tar.gz 56835 BLAKE2B 430e215b7d65bff2008136783539c262ee201d651bf83750333d41353483882fe7a603208c2725c89530a34cef22e73fe1ef26ec80fe7fb42d2df79eae511528 SHA512 bf116d92bdebea41e4f6647673d390887d84be70d612b92b8c3973aa55db4b151c1188b06fb8e3b6dccb814fd22f938572e998f0b1329bf0b69d0e4750b8f5f6
 DIST python-lsp-server-1.1.0.tar.gz 58194 BLAKE2B bc1d542e90a1295e7bddf68d366a738b371895a453e8fb7de5b0d688c49b45b9c3441d479c1f760291e32eedc6fd42cb5ee0966ed32a10ee7f883dee3559932f SHA512 fd9f1985bd55f93740671e83696b02567b12b9b77db14c495482494d23f0a73b2048d99fce9c1be0b7d7c847f213a681d379c342d128a95cf40bd3ffeca9766f
-EBUILD python-lsp-server-1.0.1.ebuild 2286 BLAKE2B 13a703acc5377bf150118ca12f626bb8bf4025df6499f0dd1bf9ba0d8f504cb0cc1505355f94262a4336f3328b778682a0144bec6f022161eb6c9f3a034c07ee SHA512 0dd9e1d7e0dd54da5f9a2986eb7dd72308cd053d10dd563dc7efe99c2e7ed7287d7c15a3e83a6b34bf51f2d5be73cd6905e2307ca24bb26f24003b1e9cdb5c74
-EBUILD python-lsp-server-1.1.0.ebuild 2333 BLAKE2B c4cc7c4391c57be88ff269d5ca84af0b9257d2ecc8d599bdd4041c3860beb9bdeb2aa675d8ff64bc1f59ef77cfc0de2417cf855dc57c4657dc54b7a2add517e4 SHA512 1378780230a14f885b4575b9082af179840c961a87f6e90df60a548769866a17bd229ffdda337e5ab7f147aa45dfca388734ad20e51e0295228799838d08b800
-MISC metadata.xml 463 BLAKE2B 4b7c9f0dd4bf6631ed4da34e4c048a5ce16b676b6c56a7f7598074db744e1ccff4c977b5dfcf46d77221d9b1821e56df1722a626f02a6fb7f7c6ba303308c514 SHA512 f868ad2bb319f1ababb0d9a70cb368dec36935822678a6bc365eb2569cab661d300d4d347cd207f6b2f537b5ffebb84dd804fc2faa35cf85f17d437edb177eb7
+EBUILD python-lsp-server-1.0.1-r1.ebuild 2785 BLAKE2B fb1f120ef5169cb5dce27b66b8b82581159fc7bd00d2a8154d96052ef92d92027a7cab629c3956d3531da3094daa638bf38c6ddacd98b852d03c0834bd59ffca SHA512 91fa8f63c97b151189e40680996d8e1a1f8e2db9221eae9c9b235a6dcb7734d6f5528f261f15dcaa062fbdcc6a9b4dbbf3f5f30f9a838f404f7bf7c3b7000db9
+EBUILD python-lsp-server-1.1.0-r1.ebuild 2832 BLAKE2B 00d5fb78a80f07885f952864cc14c8e9126de6011f879c4e8caa72c35ffb3075df242c6f4c9f156931f98d41bdde204ad578bb68bf4ef2d56c40a1c853249e83 SHA512 fd81294a4a46fc6a20047b8532cd0ecc538bc0d19ff1ff7fdf989f8016d107d7a2e6719f3b49c87cdd11effc726b5420615be03698502c80c6c85388813a140d
+MISC metadata.xml 541 BLAKE2B 1c86ef694fd93a9fc531d0f76f919e7cea42cf21a5012dbcfdcb543254541bd66a4deac7593441f5efdf0bca3fbc4f51953303e1391f6f812813b6ab9cf69869 SHA512 9dd78ed4f786f574e9fe607a87134af82fd59934ef35a23183444e3309b27e3341a9288819558de194db037bb0fd02effe1411bf9d93d748b546eb07c038395f
diff --git a/dev-python/python-lsp-server/metadata.xml b/dev-python/python-lsp-server/metadata.xml
index d18c2963a96b..bad826ef127c 100644
--- a/dev-python/python-lsp-server/metadata.xml
+++ b/dev-python/python-lsp-server/metadata.xml
@@ -13,4 +13,7 @@
 	<upstream>
 		<remote-id type="pypi">python-lsp-server</remote-id>
 	</upstream>
+	<use>
+		<flag name="all-plugins">Pull in all optional plugins</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild
index 6acffdf397b9..664b3167fc9e 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.0.1-r1.ebuild
@@ -16,6 +16,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 x86"
 
+IUSE="all-plugins"
+
 BDEPEND="
 	test? (
 		dev-python/autopep8[${PYTHON_USEDEP}]
@@ -41,7 +43,19 @@ RDEPEND="
 	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
 	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
 	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/ujson-3[${PYTHON_USEDEP}]
+	all-plugins? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)
 "
 
 PATCHES=(
diff --git a/dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
index 7bfbc16308b2..a81825d5a49e 100644
--- a/dev-python/python-lsp-server/python-lsp-server-1.1.0.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.1.0-r1.ebuild
@@ -16,6 +16,8 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
 
+IUSE="all-plugins"
+
 BDEPEND="
 	test? (
 		dev-python/autopep8[${PYTHON_USEDEP}]
@@ -41,7 +43,19 @@ RDEPEND="
 	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
 	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
 	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/ujson-3[${PYTHON_USEDEP}]
+	all-plugins? (
+		dev-python/autopep8[${PYTHON_USEDEP}]
+		>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
+		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
+		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
+		dev-python/yapf[${PYTHON_USEDEP}]
+	)
 "
 
 distutils_enable_tests pytest
diff --git a/dev-python/qrcode/Manifest b/dev-python/qrcode/Manifest
index d081a15f9eb0..a2e781c99f2d 100644
--- a/dev-python/qrcode/Manifest
+++ b/dev-python/qrcode/Manifest
@@ -1,7 +1,9 @@
 DIST qrcode-6.1.tar.gz 29363 BLAKE2B 5f31035b6c548c710d0d8198428612fc52417be7af5b5f412a42d264cb6a3ba96de65651049390107cc77e886df2b139942266aba579896f05692177b394ea11 SHA512 4831553932442f5535cba15d5958a656b399112f0f379c28ad9b610c33d88ec6d0613dc7047a2315606e49f027bfd13a15a332ce86b80040d56e1114a0f62251
 DIST qrcode-7.0.tar.gz 34548 BLAKE2B 0a5f06b73f55ecc713aa34249acf5d58f71b29c90e5433411a9208124931bfcf101f016a6f1fbcbab0eddd3ffdef763cdc92fdf09565addaa86120a80d4d0c1f SHA512 2b96528582c1d80ba1bd27b5bb769d52e238bf5a3eda2fa23c4bef90778fa2d478c50a8f2b581d5b83373d778f346c410ae3475250029b878ff527edeae0f323
 DIST qrcode-7.1.tar.gz 36068 BLAKE2B 93f09da56b6e0cf6875250e46ec6b3cd5fc631c5775093317fcfbca72990ce8e4c2d50336e0a1dd67cbd69b787652de7c75d5108430871e0dfdd3cf17e9a1eec SHA512 838496be964ace361cd1b28b3203afafc2f262d1e929fcdcf54e0a632bd85518cd60b2955ed22c003c27cbe5527f89a9298ff912f6b02a75b14f9e5410fbaba6
+DIST qrcode-7.2.tar.gz 43032 BLAKE2B dc1ff428dd86485d2e2fe08b0efb367eb925551fbc31b4ab4f7f22a132ccc3fa0f7625a1e54f16df57f69fce3753883be0e46de6df84b13170d82d10c268866e SHA512 2ce72b2f6893168b96e1f6dae03b3250b8a0654afc9c0194075493d8ed93616acec7b61b9b95573f92c853cf227fff467edae7255aed10a9f7730e9ec5215133
 EBUILD qrcode-6.1.ebuild 650 BLAKE2B 6bb326e7847e7706bfdf3392f78c8d1e882c82625822316d9325e60cf187dfb3a7d4b704d4ed60d56b60519a4690b66d88a9a0bb4b60e724b51c28f3cd61601e SHA512 8dd6811383a8c27cfff84c1436928dd94887d1f37d403c2a2659bb998c12bc30ad556a10cb36b65e986c4568a94beae94c85ed4c029c78663c4fbe919b20a185
 EBUILD qrcode-7.0.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
 EBUILD qrcode-7.1.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
+EBUILD qrcode-7.2.ebuild 619 BLAKE2B 074ef233f0bbbe4df9ffe6286c2204e31f97512133faf63a6000efbf678360f5bfe0a7d5cfdebc2f924cbb384e66dbe126d9aca6402a3b3da8433baa4aea73bc SHA512 24f6a06811fa989110986820defc69d0f52694ba4c6840ec76894c1fe527c91c9dc18a47bf7c004fdc98f6c430bebbc16d2207fbc6bf32a28882ff0267baecd6
 MISC metadata.xml 309 BLAKE2B 1ddae27e1f2ec0dc7c656238d9895afa6034ef205f42bea031b29cc69191b074e29f4049ec8103701cd916e17dae25e26d25d4e61f123d53fc0b0f6321c8d857 SHA512 65fa150581939d81a62bcd84b25e733b5cbf394ee6b201aaf7f64b22eeb75a3466ae0a6e1e230a8bb8f08b678544660e4382eb85fe55754bd64014a3c7b35aec
diff --git a/dev-python/qrcode/qrcode-7.2.ebuild b/dev-python/qrcode/qrcode-7.2.ebuild
new file mode 100644
index 000000000000..0185db078736
--- /dev/null
+++ b/dev-python/qrcode/qrcode-7.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="QR Code generator on top of PIL"
+HOMEPAGE="https://pypi.org/project/qrcode/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+# optional deps:
+# - pillow and lxml for svg backend, set as hard deps
+RDEPEND="
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/qr.1
+}
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index b9ba9531846b..7c2b4f5120f6 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -1,5 +1,7 @@
 DIST requests-cache-0.6.4.gh.tar.gz 50322 BLAKE2B c9a6cae957604bdfa6057621e028fad83476e5d918bbf9c58e73f09f8615398946f3cf6e3737c9ff916cba68d82ed66a674557fb733c74b874b0f68e2430d9a0 SHA512 31e2217e54892d8ec5fc9fcf60f650960621b1f97029c90deca925b9a1be9eb5a3ddb6ae68e581c805f20136f93eefa70d51e7e9f086ecbae76f8e550bbe3f1a
 DIST requests-cache-0.7.1.gh.tar.gz 959455 BLAKE2B ce41514f21dc0708e437f70b92eb9d84f47433d04a11476cd5afefd050089e2d138213fa0b2f6bac200bd6d59db996187481ef3544d289a5117f3fe7160027b5 SHA512 cd83134ce9500c20c63fa92546cca41772ba3582a669914cd0885ec5aadf6ae4a6c4fc6a83dce73d2d5b24a80db2fde65cdb0a89b4b5703ddeac1d710404a05d
+DIST requests-cache-0.7.2.gh.tar.gz 962215 BLAKE2B 0f66548b4c37c14347021a4675d0165b9f9648dc9842f1d94c9507c096f6ef359f7109f88ac369de2de263673542f42d6e4a7402449354aee900970331f87cea SHA512 1712f3568ec4c8c41988c9d2ca07e72b1a66efceb596d814219b5eb9bb0c05448ee33b4634ec39fb03634032a6bfaaf877b297be7f92f540788dba40b4c202df
 EBUILD requests-cache-0.6.4.ebuild 1141 BLAKE2B 5d2037be26cba0679666805ce783f1d9aa8452b1d8da78e443e47d3990fb212dde552d44e228ab21834fac51cf0f39e6db8dca1c2f075ce809614e4b91fdf0db SHA512 3fd54f8b358d1cdf7f5f2a4d46baa4432111b2c8f641b91b77fc141c300d3bd0467ec0600a85be138c0bbec55a4e33b891f5d8acbb9ab5fc5ca6a2b28d76c4a4
 EBUILD requests-cache-0.7.1.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
+EBUILD requests-cache-0.7.2.ebuild 1306 BLAKE2B faa714931e3f76561f06cc4d96389357cb2443f14ef22fafeb18f1705d2abdf4b855f3d728dc16b265a2e19a36b17746e16d5cc28e777649ff7c15dc5f2ffc44 SHA512 aa000ced99bda3ca2c0bb57da746ed6ab82a599f5add0a3f241153225cc0451539a77d21c8240ad760409212924d2afa457c7027302362eaceedd291c8d20c2a
 MISC metadata.xml 469 BLAKE2B 7a0fbb271ec0f40665d6fbce539cb49a818f5f3876642c7d9d721566fac8fa81b0f39f4a2ce6b2b0884b6c2ea79a1bbf8c95d2f86c75372725dbc53757f0154b SHA512 6485eecd67956b0ad5eaaad22c5e68e9bc9acaf0330aca6c3c0a378b5153ecc7a086fac08e9932d03ea4ff6448c63958fc8faeabefd4c68140f44b0fda0f31f5
diff --git a/dev-python/requests-cache/requests-cache-0.7.2.ebuild b/dev-python/requests-cache/requests-cache-0.7.2.ebuild
new file mode 100644
index 000000000000..32b48e1d7368
--- /dev/null
+++ b/dev-python/requests-cache/requests-cache-0.7.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_REQ_USE="sqlite"
+
+inherit distutils-r1
+
+HOMEPAGE="
+	https://pypi.org/project/requests-cache/
+	https://github.com/reclosedev/requests-cache/"
+DESCRIPTION="Persistent cache for requests library"
+SRC_URI="
+	https://github.com/reclosedev/requests-cache/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/cattrs[${PYTHON_USEDEP}]
+	dev-python/itsdangerous[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/url-normalize-1.4[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local skipped_tests=(
+		# These require extra servers running
+		tests/integration/test_dynamodb.py
+		tests/integration/test_gridfs.py
+		tests/integration/test_mongodb.py
+		tests/integration/test_redis.py
+		# Requires Internet access
+		tests/integration/test_compat.py::test_version_upgrade
+	)
+
+	local -x USE_PYTEST_HTTPBIN=true
+	epytest ${skipped_tests[@]/#/--deselect }
+}
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 1fefc53938ab..c78ee9eea028 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,5 +1,5 @@
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
 DIST requests-2.26.0.tar.gz 104433 BLAKE2B 49872a0602ab0e6b3838c4ff84d6611c5265dd584a1902b51d5903a2fc566b97f7a70973a9244adf190e9249bc6d1fa448a2164a31d125ab6b3dac172ae62e1c SHA512 c3397d77f0d2f1afb05661c4b98adad6c1ddaf360906254150b33ab0d9479fd306905bd6d61b8cf8becd9a40bdcf9b03542e8267c644ef19f03f44bfca0bc461
 EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
-EBUILD requests-2.26.0.ebuild 1393 BLAKE2B b4ff97cefcfd30b21832983eec288313728875fbfcecb6e426c3fc1cec09174bf381451d1dbf1fa358a450600971f3bc0666eb96122697debccfed33957010f8 SHA512 9b4497c62a0514ba9ad0035a58b391c5925733f3e1d40896f2373b6485f33b883145714017ab73917177695b986e187f41f7395ce9272432953d49194e7fcdc3
+EBUILD requests-2.26.0.ebuild 1446 BLAKE2B 1b3c5fcc7ed94944772eaebd2f3b6441e0287a5b5216056209f7a584a38028423441ace3bd0b33afcbc3fd0f07ea4b7ebcabb2d2d911d2afe1b98de4130fb1a0 SHA512 e694429e3b585d35189324fce551fa4ed1ff1863b897ff759a95eaa6743b663c659ceb401fd35dab173160ea7f9c6d7317e24cd60df23e0ca6bd91e72ca12077
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.26.0.ebuild b/dev-python/requests/requests-2.26.0.ebuild
index 2d726cc23334..9f732a314f7b 100644
--- a/dev-python/requests/requests-2.26.0.ebuild
+++ b/dev-python/requests/requests-2.26.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~sparc ~x86"
 IUSE="socks5"
 
 RDEPEND="
@@ -29,6 +29,7 @@ BDEPEND="
 	test? (
 		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/trustme[${PYTHON_USEDEP}]
 		>=dev-python/PySocks-1.5.6[${PYTHON_USEDEP}]
 	)
 "
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index e4414d238bd7..c6a3a912580b 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,5 +1,7 @@
 DIST setuptools-57.0.0.tar.gz 2144749 BLAKE2B e1fc99503ee5de425b70bf2733b1c489693e38cd256bf95cb321671bdaf87745eaaf40c43bcd03756a4cefa408dd1414f8c30af274963e3a0ae57f7b95d3f9c0 SHA512 5277d8630367d6b16a49e36ed84d8cc6abfaedf87dac3f795b204626a8f15ca9fd80d158a465d8bcabe9c074c76b87c3378d82a4ba5feee1ac6a5f2c91db061e
 DIST setuptools-57.1.0.tar.gz 2144012 BLAKE2B 148eb7b5e432461f692faeb3fd4eaafb99bb9fcd2c430cbde40fb16b365ed011ce49966a8923337a860b63cdc6d8f3a26efdd138cf4c40c99e72f7d714fce57c SHA512 dfcf75584b3d7ae07e0f58ce8f596d7e9cbe3a0c178411053b066fb4362226bcf6467a79aed0853acd0b9f6a3371c47ddb07d77cbd780fe9782b8c19bce2e5fb
+DIST setuptools-57.4.0.tar.gz 2141309 BLAKE2B 89b386b6d5bbac61df400f60c91a0a9b9ee381aec7d2f65a856c317c7b0b5512c5e9aa8844c0e64f1840a8e954ae22ed542ad97a104d5416b1df2ac02351809b SHA512 7fcc297ea3e6310f2ec8ba5bf0d509e3f4acbce6bde7e5f0fe1b022c147cf88a047471bd4aa278724e86ebc6be800015fb935c7a31dbb6a0801a2d380ddd89f2
 EBUILD setuptools-57.0.0.ebuild 2319 BLAKE2B bde0c2b2c28dca1d79a688e838340404c1c21f4433f1ee104d2fb4df05ee39ff74403cc56bae332c4ccdf1faca4b6d05a58526c6b858e7c7fea04642ecf5c52a SHA512 aa0bbb2debf43915d698a6a94ec8b71441b4aed0cd0b991dd39dc61409ca8edf3245486fc5b5bba4566512181eb193d1811bf34f394592fedc0361dcc3ffe8f8
 EBUILD setuptools-57.1.0.ebuild 2328 BLAKE2B 87a70ef14e6c01d7d28c69eb6bee16a57ee6d228bf002d2614fc67a8e4a7479ac21fcc2234869bada3ed4224f3a22ce2a45bcd3625ddc122f60ddf96ce28e92f SHA512 a1fb816d0e6fe413f6f96129821625a7b8556cdb59ca3d84509e9cf1792e599e7567ac22f62b815dca978644bba1fda0ad10d991cd7bbb113b94b6b7aa1a9e44
+EBUILD setuptools-57.4.0.ebuild 2328 BLAKE2B a099a65fb32d0c0d8484fb50248bf699b0e4563a882e2282318bab53739f4969c3853f7570275251a5568950662650ffcbebccbb8ad528e9337e2412ce2f45cd SHA512 123817b89c66f61ee6f3ca70185038ac835672e724d8a500707e5ed90f83a8e1624a511e824dc74d87af243954d6feccd80765519388b5efef805c08703b2e26
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-57.4.0.ebuild b/dev-python/setuptools/setuptools-57.4.0.ebuild
new file mode 100644
index 000000000000..771a2d22c1b6
--- /dev/null
+++ b/dev-python/setuptools/setuptools-57.4.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set to 'manual' to avoid triggering install QA check
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Collection of extensions to Distutils"
+HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/jaraco-envs[${PYTHON_USEDEP}]
+			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			dev-python/pip[${PYTHON_USEDEP}]
+			dev-python/sphinx[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
+			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
+			dev-python/wheel[${PYTHON_USEDEP}]
+		' python3_{8..10} pypy3)
+	)
+"
+PDEPEND="
+	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
+
+# Force in-source build because build system modifies sources.
+DISTUTILS_IN_SOURCE_BUILD=1
+
+DOCS=( {CHANGES,README}.rst )
+
+python_test() {
+	# keep in sync with python_gen_cond_dep above!
+	has "${EPYTHON}" python3.{8..10} pypy3 || continue
+
+	distutils_install_for_testing
+	local deselect=(
+		# network
+		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
+		setuptools/tests/test_distutils_adoption.py
+		# TODO
+		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
+	)
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode
+	)
+
+	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
+	# It tries to sandbox the test in a tempdir
+	HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		setuptools
+}
+
+python_install() {
+	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
+	distutils-r1_python_install
+}
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index ef4227ee8285..a4091b849411 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,5 +1,5 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
 DIST pyside-setup-opensource-src-5.15.2.tar.xz 3472624 BLAKE2B 099abeaf25059a88f299f90b18cf79aa45acd86580c0873767b09f76268d6746cc3576743a19493a605de59b520471ddee6bba0e5340801ef44a21f2a9d41507 SHA512 5043c1c9db4ba0133baaabb4d4943182e9741b1007bedd992394758707a37bba0688dc6413ea46620e7c2fb09daa3c74e6a7bb2c302b9d08e5f3bb7575d02b62
-EBUILD shiboken2-5.15.1.ebuild 6588 BLAKE2B e62c3cbf2d3c7050012de985c7cac72cd379ee7551f5c2317bb6218a038ca5581477b4267ce5e81b22b2b9637c329db9605f6c23e3b33c72a2f3775ca1599504 SHA512 24fa578ba0163f72ab58f335b11649de6fdddc327581f8f7941d05945335a080f644640fb80aefe1bbccf7a6ba5d948161b62dfa04c803b2bb80b313f4efa45c
-EBUILD shiboken2-5.15.2.ebuild 6437 BLAKE2B 0e6d4b56332293168a6b55701fcd3aaf21326cd1de5c06a985616ee9ff5e57744e0279d7c89801171fd9694c59bf9452499599b0a1cef05d1ebefd6a846d7732 SHA512 79e49f5668a8c272155ff2b2584a0000d17114dc03f562f4283d271534234abddc0356324587c3e5e42da44d3e0c2078ba6dfd28a32a54fee2a1f7bc98629a8d
+EBUILD shiboken2-5.15.1-r1.ebuild 6611 BLAKE2B ade01e37bc0c199ed35eeeb176c87f76e9f1add46d9512f692947cc3b220da32a0e143881bd9fc2059dde0ffbaeacb70c0faacf7c75b80d3b0f7904710f96a68 SHA512 25fbcdc1e64ce80a0bae5fbe3eb44943e06289602a4d3032440cc62f5f6562eb622fcc8dd29f146094ab9fa8ff59e31952981d35998057be75de2860cbcdea04
+EBUILD shiboken2-5.15.2-r1.ebuild 6458 BLAKE2B 68ed4512b78e719122febd9e33e927b529fb2c355a65f99ae869453bf45b5721329ce808db9c04e7503de18b6e0737ecb56dbaaa224aa33776a50d50f8a14a0f SHA512 b2e0a97104763152d0b1000fdf95495786e1d9c321b5e606be247dd48ed0fc3f2a50939ad42915bcaabeb9d0467c0bced0bf69076a7e23a1d0ffc66fcc74bec9
 MISC metadata.xml 575 BLAKE2B 706ac0dfd0d543c69a81168707011c5778867c7fe3b3efbf8dfadb8c94304b29124df25a54eef273a862df171e721e5f642ab069d29a3278399b284365546b40 SHA512 4113c586b64a0c11806bd5dc86bd5f47e9b896df5c8a257ad02c83341e7d583f54c730fb73d22a428225c3849ae93f68f498d804c86eaed757825a088b0b3c64
diff --git a/dev-python/shiboken2/shiboken2-5.15.1.ebuild b/dev-python/shiboken2/shiboken2-5.15.1-r1.ebuild
index 7acae0aa868b..de2845464e89 100644
--- a/dev-python/shiboken2/shiboken2-5.15.1.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.1-r1.ebuild
@@ -41,7 +41,8 @@ QT_PV="$(ver_cut 1-2):5"
 # Since Clang is required at both build- and runtime, BDEPEND is omitted here.
 RDEPEND="${PYTHON_DEPS}
 	>=dev-qt/qtcore-${QT_PV}
-	>=sys-devel/clang-6:=
+	sys-devel/clang:=
+	sys-devel/clang-runtime:=
 	docstrings? (
 		>=dev-libs/libxml2-2.6.32
 		>=dev-libs/libxslt-1.1.19
diff --git a/dev-python/shiboken2/shiboken2-5.15.2.ebuild b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
index 0f97bbc648a2..18e1815df1da 100644
--- a/dev-python/shiboken2/shiboken2-5.15.2.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.2-r1.ebuild
@@ -31,7 +31,7 @@ S="${WORKDIR}/${MY_P}/sources/shiboken2"
 # arbitrarily relicensed. (TODO)
 LICENSE="|| ( GPL-2 GPL-3+ LGPL-3 ) GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+docstrings numpy test vulkan"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -44,7 +44,8 @@ QT_PV="$(ver_cut 1-2):5"
 # Since Clang is required at both build- and runtime, BDEPEND is omitted here.
 RDEPEND="${PYTHON_DEPS}
 	>=dev-qt/qtcore-${QT_PV}
-	>=sys-devel/clang-6:=
+	sys-devel/clang:=
+	sys-devel/clang-runtime:=
 	docstrings? (
 		>=dev-libs/libxml2-2.6.32
 		>=dev-libs/libxslt-1.1.19
diff --git a/dev-python/simplebayes/Manifest b/dev-python/simplebayes/Manifest
index 709ec6a3180e..d888a6d8707e 100644
--- a/dev-python/simplebayes/Manifest
+++ b/dev-python/simplebayes/Manifest
@@ -1,5 +1,3 @@
-DIST simplebayes-1.5.7.tar.gz 19260 BLAKE2B 373820a19c1a3188f0dfb57cbe6ac8e27fc6a96e9d1686d698a1f109122afd5240715678d965d843482de3c12b8b806157acef17008d4c6fac0103b343dd44d7 SHA512 417af72db13418e5a9df2fdb642fc63ed3eb4fbbf88cc7252a9e3603d31e35ccb68ae5838d8bb7d77554c1820a9db8aa944c639af4eb6418babb9d360ef3ddbc
 DIST simplebayes-1.5.8.tar.gz 5972 BLAKE2B f942ccde5f449d0ef8ef56fb83a07a8ab0421f43e5af40a3be30822a5d7299b9a0cb1d46397a55bcf7fecc92e40f49404f5bf29467acf7957fbce8619625b58b SHA512 0e39110432db561208cf147bccbdb66f64176a78c0e9ce8495a423ed0d6a027b45deb111d3c872faa10e158fcdaa5380f03a5e0602fecea1a0f00e528e19cfe1
-EBUILD simplebayes-1.5.7.ebuild 698 BLAKE2B db1b9e262a9edba57cd535237e0959afa8c908bac422a7a5db682aa54a4759d8293b828c86a1fe968fe38fe51b42c346162c95fba001af90e6cb1fdae4a57f79 SHA512 c41085f3f0da352a32f8a88d0f608b55360e213e3b1a4ce40a9a8644a1cc8c7a1976e15e91ac40614e04233c571f9eda696019bb17cac42c4ff18984e0c89941
-EBUILD simplebayes-1.5.8.ebuild 671 BLAKE2B d53de19a55b87753225a8fbc6ef73483271e6c867610a40064c5ae2c1d36c49d29dfb61ba376613788ad5345b92b027c4086520240fa03f384553c16c81c4f6f SHA512 d7489effe2f731654d9b7a74e267c967d70a0ff2e03e4573c59bdcb4f6c2d2fb9686fc64d7cb16e4a7c6637686a5ce230405f4163581cf622635598776b6d81a
+EBUILD simplebayes-1.5.8.ebuild 473 BLAKE2B 119d403d1c8ddf4a35b728b490063997bad1ebaf5433962f17fe63f107c353843afb5284b3dfb58ee3f2f2a8f90ee853d159722d296c695d152da9ff3df0b44e SHA512 34d72b4f174cbecac73f7d3e3746f30621896c4f4ad6d58abfd0feb7e1030e1e8396c88eed46fe2e3a2800a2ddbb9fe100dee027b5cc60a46aaa7414bd5ff641
 MISC metadata.xml 662 BLAKE2B 2bcf3d9bee30b2cab1146844b57345a35432288de430253a9d56a631e6d8d57c101ccd8b9d4a70e5af68643823ef410fb29a9461b1c3573cbe841bccf595f530 SHA512 43dce6ba6ef084891d6ac7ce8c24dcd44d73f8879f6269ccbbd3683b276ebe93d18088944107e809798eb10bda7f8231c1a98fba292de6ca29fbc1b52b97b2a4
diff --git a/dev-python/simplebayes/simplebayes-1.5.7.ebuild b/dev-python/simplebayes/simplebayes-1.5.7.ebuild
deleted file mode 100644
index 0c8758512f65..000000000000
--- a/dev-python/simplebayes/simplebayes-1.5.7.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="memory-based, optional-persistence naive bayesian text classifier"
-HOMEPAGE="https://github.com/hickeroar/simplebayes"
-SRC_URI="https://github.com/hickeroar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
diff --git a/dev-python/simplebayes/simplebayes-1.5.8.ebuild b/dev-python/simplebayes/simplebayes-1.5.8.ebuild
index cebf2f7c2a69..d91e3839c3e9 100644
--- a/dev-python/simplebayes/simplebayes-1.5.8.ebuild
+++ b/dev-python/simplebayes/simplebayes-1.5.8.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,17 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	nosetests tests/ || die "test failed under ${EPYTHON}"
-}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/sniffio/Manifest b/dev-python/sniffio/Manifest
index c3d23d1a2c9f..270085a69ea3 100644
--- a/dev-python/sniffio/Manifest
+++ b/dev-python/sniffio/Manifest
@@ -1,3 +1,3 @@
 DIST sniffio-1.2.0.gh.tar.gz 17335 BLAKE2B 0d67baa18702ac38932680bdc741c87ee0a31342cc752c1463a7f90720ea0ebf6d62ef682a042c58e8fe96456e1461638e0f02c6f60da5f5e0d07464be27a4a3 SHA512 8e1dd2bb6fc22ee5824adfffe688ff0621b8c1ef5daea594dedce13d5e04a498e05816bb32e9bbed206a653a330ff710df57c888ddcff00a6254eafddc538273
-EBUILD sniffio-1.2.0.ebuild 690 BLAKE2B d2223e5c286f3786d7f423ba546257c30d8405f4f853956d6422b13e901ef21544b620f80a8a2d502c4872fac30ac5d4d84200b9737d51ce22f5e9c7816ade80 SHA512 7623d40343fd6881d6df72a5c2bd2f84653ef9c39bb86de1eb84abffcd0b516a97cc616479e9ece7e83bc4eaa03635dd8bd66e50af1d4588079c453d0660fa81
+EBUILD sniffio-1.2.0.ebuild 689 BLAKE2B d3223d90e39f8470592076c8a03c3f36e06fe146528d513a1a4096c21cd25af2c8450ddc3083cb5d8270c8954bcce9423ec8350b169485a9708898f672e77f19 SHA512 286453fbaf083ed514c4d98014dcba0de4fbffaceed4e8d9d2f79ffa6d20f440185617fdec5d0ff6680c6b6bb34aeeeb321481452789296ef3c0195bc6a32e48
 MISC metadata.xml 393 BLAKE2B 1e85a6ae107eb5dbdbaebf54211bca24f605c8b40d8dc9f941a485a5dd6714c9e6b69646e627d6fdfed874f5ecbc4217b158c6be66b392e583f4aab24fb4c609 SHA512 ed60062a1393a7a3bc73388ada684e70a51fead79e3bd5e4cf3fc14aea6ff133121f2fcdc68ae0277c0bf2290d3a0f18959d00eb835534e16abb58b19c7b0f9e
diff --git a/dev-python/sniffio/sniffio-1.2.0.ebuild b/dev-python/sniffio/sniffio-1.2.0.ebuild
index d05a53d6dd3a..d7d201ae88cd 100644
--- a/dev-python/sniffio/sniffio-1.2.0.ebuild
+++ b/dev-python/sniffio/sniffio-1.2.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="|| ( Apache-2.0 MIT )"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/sphinx-epytext/Manifest b/dev-python/sphinx-epytext/Manifest
index 06aff8757f6b..326791f291d1 100644
--- a/dev-python/sphinx-epytext/Manifest
+++ b/dev-python/sphinx-epytext/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-epytext-0.0.4.tar.gz 3590 BLAKE2B 28e0243a65c3c6e31e5cd3ddb3fce22c2930f8cde564713585e097f55e30a96ab5a16970f57bed6df5cef6f5d12957b7162d036968a467e0aa658a8c5de1a5e8 SHA512 ba56bfcc7d299c6b5498b0823bedab75875b750a596f69a17d4ee278b33f4b51716dd2ba9c5766903af99d9701ba37069b3748fb57ec0697c6871138a7f57638
-EBUILD sphinx-epytext-0.0.4.ebuild 571 BLAKE2B af135714db1918e5b5115b13d0e30dceaf0617358cd9d2321896b3cf5f1db5798c8ff13a7611cb08c888dcdf8ac111a77c9aa7c80910a007e56f747c383325b1 SHA512 c964d854672d670e0bd90295a28cad814e0e9b1fb23111695d65234dc9d6ab7613a1edfb23e450579f3d3e8e2f9c996f9d70c1db9bcb169e876bdfafaee7a40d
+EBUILD sphinx-epytext-0.0.4.ebuild 578 BLAKE2B 314de4eb6cfd4298462a586bbdb4273d356fc7c1ed48a0acc974e5fd73a18c62c5ee75be4dcf280fc629e12fb12bdd6104febed0e3bc66a570381b6d2bfd28ab SHA512 1e3113082ed33b57753db837dda44153040032df29dddef1607adb2ab8a44f65a35c9bdc49248bb981f1c52185b60983e60bba6e3466bb9aaf27cad127e5420c
 MISC metadata.xml 356 BLAKE2B 4ce928f87d2f4d479a2e942bd4b3c9b9a57d3ec2560335680345447406352d6ca27e56a3b5ef93329b7a07baa560747d86bcdb1fecee4f2a8a0ec61aba5c5490 SHA512 138f3bf854d2d4883dd4f5f2d1beed68c7822d30db5a79b899addb874555104cb875c980020f9bf924127fc10ac512c00ca5f9b62b04031790dea66174146038
diff --git a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
index 173b41169dcb..50e42d406ca6 100644
--- a/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
+++ b/dev-python/sphinx-epytext/sphinx-epytext-0.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/sphinx-1.7.5[${PYTHON_USEDEP}]"
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 356c20e891e1..39a3ada1af39 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -4,8 +4,8 @@ AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7
 AUX spyder-5.0.1-doc-theme-renamed.patch 346 BLAKE2B d0f894f5f736a32e78aaaac6c9c8f051dfdf5f12b09038c047be8885d05ca149830fbebc0bcc2764bbb24033817874be0e1b2609e2a6cae591254bb139488954 SHA512 0a2e0eaee4386ab85881ff67669a4820c26a17993c85b33a6df3576a07aba1c331eef5853db1ef8a760e95c315036411f6f13880510efda20933ee3cc0600741
 DIST spyder-4.2.5.tar.gz 11539071 BLAKE2B 9d7a98da018aae934803d640995fe2dfa6bbb20bfc7140bd00f5e7a00a09c47922fefd8df84f4b217a50176ee190515da6f4cbf498a03cae68e2ac4f5ec70664 SHA512 081b047a45b7522a69b1b21a221ab5cdef47f87f36ed4423ff63297d205f924c1627517c50622acb2d10efa094bc506fed4ec88f861775d3f58e81ac6ef017ac
 DIST spyder-5.0.5.tar.gz 20606379 BLAKE2B 52f05ffcf0b6aabdac23a055af1c674c6aa80a7d4f3608779df1d46e0e51de63a71b4e97db286dc92e071cbb44a0dc827aa750d8ca538e6764b5e780f493d615 SHA512 17654ee76eb51c5f5b9f494d009af3d7813f869f27f22ceb8ad8ca96dcedcbcd6b86c7a3895bb63eba3cc60e4a57ab94128abb8d21f05c4672b8bb8d545fe1ff
-DIST spyder-docs-6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67.tar.gz 78446300 BLAKE2B 4225589581ef47237d7025f506812840c959e589cddfe47d2c4d3a74d7fc876f67eda291ad07e82b054ff2666bed34fa0edca1e1c0e1ff5574efb2db1028a42a SHA512 4d0bd348ec3335e022456c19dc319295948061cea45b0f1e5a05c2640943776b5c3bdc2581fdc0571bd98fe8834af035134084394ce6711d5a69598515bd0e9b
+DIST spyder-docs-5eb83118155a3765de4a0f863b936bcbe73bb7aa.tar.gz 85362596 BLAKE2B 7294dcd0f169958da132b141379b9b1cf497095981a86416fb98d98f98e30a425fe2e628a523785f932bbc06a2ba1ecddb45bae0df009887db928f879e08cdef SHA512 45f45546b83afb3036348e89ee3eded4d8ecee36ce58fe697da14677fbff8fa2dfe170be7385ecf10e1989817780c07b5676d545ee34e87a8f252929ad72882e
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
-EBUILD spyder-4.2.5-r1.ebuild 10176 BLAKE2B a80d3e881f43d2300d4607fff4151118d747402de298f8e3c3dd5b7aecd5987c850e60cf4c1ef5346eab40163e4117abad0a3056744c0aca777f0b5fa6f7a6fc SHA512 cf8b9310b1e7af89b78257389f6b7934c51a5f5585fa69931f2b81536f1e4089844b9a24c606d9119a66c99ca3648a3f160bedf21ce3b98714b3af7474a1d2e4
-EBUILD spyder-5.0.5.ebuild 8065 BLAKE2B f844924aa8896b66229e842ded6e2d3904e81415e18ca0aba398575702da35242f57e8a26a690e0091fe8f5ebfad7e9fd067334881e6c0ab1432cc680e8c228a SHA512 11b32aa695f0df8caaa98a304c547ea300eafbc14e61b1149099a266dd2198ab44b0c0041be1927db972da3ae9a441df5d66274bef471856fb207f9c9d8c8afc
+EBUILD spyder-4.2.5-r2.ebuild 9965 BLAKE2B f94f8de5c81eac740cb34912fd7aedf6f9768fa63c564c5869ab025068d558de4052c9990a95682a8045a5b5e7dbc7c705f4d8d992f978e0f9706888339e0277 SHA512 0e4c1d37d26ff4b02148b28254750cdf5e36f5440e575ae097deabb8606ae32c681e6666a47753c71f411a626d24f5333ab8b8d0c270a447a0723ae93b03d9da
+EBUILD spyder-5.0.5-r1.ebuild 7943 BLAKE2B 8564bf7aae20878fa68a6fa1d9b0abb71c76bd8c87364525808641b97d8da88f86c362cd3b1bae32f3875bf691c5b15ee8043537ddbf5ecd738750d58e69ec8a SHA512 9c206b76177eb1e76757d0586056f2201ae17f9760cfecf7458c0ca1029967b094270ee4302dc94eee09245b33d445f46128dbd3e20e1df9906da59d3964ae64
 MISC metadata.xml 1315 BLAKE2B d6969e1a2167c283ef39b5041f58307ce0eda6a70ec0efa6aad7f0871dd9202f857af5d5a676bcc45af9f31743b856ac6c7e90e3767f82810f2c27a2b266d76a SHA512 eb59a948abca8c2920705647d09d339d09e10d27b08ed3e4ff6acdfb2cf0662fc60c3983d6bf44cfe68b11023f7c71b642b0453d0e11c1c701f281a1dfb3be08
diff --git a/dev-python/spyder/spyder-4.2.5-r1.ebuild b/dev-python/spyder/spyder-4.2.5-r2.ebuild
index cb91fff8bf7a..04d05d40e107 100644
--- a/dev-python/spyder/spyder-4.2.5-r1.ebuild
+++ b/dev-python/spyder/spyder-4.2.5-r2.ebuild
@@ -26,21 +26,13 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-# The test suite often hangs or does not work.
-# Technically spyder requires pyqt5<13, which
-# we do not have in ::gentoo any more. Likely
-# this is the reason many of the tests fail
-# or hang. RESTRICTing because IMO it is
-# not worth the several hours I spend every
-# single version bump checking which tests
-# do and do not work. Spyder itself works
-# fine with pyqt5>13.
+# The test suite often hangs or does not work. Technically spyder requires
+# pyqt5<13, which we do not have in ::gentoo any more. Likely this is the reason
+# many of the tests fail or hang. RESTRICTing because IMO it is not worth the
+# several hours I spend every single version bump checking which tests do and
+# do not work. Spyder itself works fine with pyqt5>13.
 RESTRICT="test"
 
-# White space separated deps are expansion of python-language-server[all] dep
-# As the pyls ebuild does not add flags for optional runtime dependencies
-# we have to manually specify these desp instead of just depending on the [all]
-# flag. The indentation allows us to distinguish them from spyders direct deps.
 RDEPEND="
 	>=dev-python/atomicwrites-1.2.0[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.0.0[${PYTHON_USEDEP}]
@@ -48,31 +40,15 @@ RDEPEND="
 	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
 	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
-	~dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
 	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	~dev-python/parso-0.7.0[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-server-1.0.1[${PYTHON_USEDEP}]
-
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-
 	>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
@@ -145,24 +121,38 @@ python_prepare_all() {
 	# in making the switch. Because we are running into issues with outdated deps
 	# and a whole dependency mess as a result, we can no longer wait for upstream.
 	find . -name "*.py" -exec sed -i \
-		-e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
-		-e 's/python-language-server/python-lsp-server/g' \
-		-e 's/python_language_server/python_lsp_server/g' \
-		-e 's/python-jsonrpc-server/python-lsp-jsonrpc/g' \
-		-e 's/python_jsonrpc_server/python_lsp_jsonrpc/g' \
 		-e 's/pyls/pylsp/g' \
 		-e 's/pylsp-spyder/pyls-spyder/g' \
 		-e 's/pylsp_spyder/pyls_spyder/g' \
-		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
 		-e 's/pylsp-black/python-lsp-black/g' \
+		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
 		-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
-		-e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
 		{} + || die
 
-	# do not depend on pyqt5<13
-	sed -i -e '/pyqt5/d' \
+	# Do not depend on pyqt5<5.13, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.13, this dependency is carried by QtPy[webengine]
+	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+	# The explicit version requirements only make things more complicated, if e.g.
+	# pyls-spyder gains compatibility with a newer version of python-lsp-server
+	# in a new release it will take time for this information to propagate into
+	# the next spyder release. So just remove the dependency and let the other
+	# ebuilds handle the version requirements to speed things up and prevent
+	# issues such as Bug 803269.
+	sed -i \
+		-e '/pyqt5/d' \
 		-e '/pyqtwebengine/d' \
-			setup.py || die
+		-e '/python-language-server/d' \
+		-e '/python-lsp-server/d' \
+		-e '/parso/d' \
+		-e '/jedi/d' \
+			{setup.py,requirements/conda.txt} || die
+	sed -i \
+		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+			spyder/dependencies.py || die
 
 	# do not check deps, fails because we removed pyqt5 dependency above
 	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
diff --git a/dev-python/spyder/spyder-5.0.5.ebuild b/dev-python/spyder/spyder-5.0.5-r1.ebuild
index 27d30b0d5a4c..75ea2dbe52d6 100644
--- a/dev-python/spyder/spyder-5.0.5.ebuild
+++ b/dev-python/spyder/spyder-5.0.5-r1.ebuild
@@ -9,7 +9,7 @@ DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit optfeature xdg distutils-r1
 
 # Commit of documentation to fetch
-DOCS_PV="6ebb1ace2d7ce94e45e8b2c1b7ddb53395f86e67"
+DOCS_PV="5eb83118155a3765de4a0f863b936bcbe73bb7aa"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
@@ -41,13 +41,10 @@ RDEPEND="
 	>=dev-python/diff-match-patch-20181111[${PYTHON_USEDEP}]
 	>=dev-python/intervaltree-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
-	~dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
 	>=dev-python/jsonschema-3.2.0[${PYTHON_USEDEP}]
 	>=dev-python/keyring-17.0.0[${PYTHON_USEDEP}]
 	>=dev-python/nbconvert-4.0[${PYTHON_USEDEP}]
 	>=dev-python/numpydoc-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/parso-0.7.0[${PYTHON_USEDEP}]
-	<dev-python/parso-0.8.0[${PYTHON_USEDEP}]
 	>=dev-python/pexpect-4.4.0[${PYTHON_USEDEP}]
 	>=dev-python/pickleshare-0.4[${PYTHON_USEDEP}]
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
@@ -55,7 +52,6 @@ RDEPEND="
 	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
 	>=dev-python/python-lsp-black-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/python-lsp-server-1.0.1[${PYTHON_USEDEP}]
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
@@ -72,21 +68,6 @@ RDEPEND="
 	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
 "
 
-# python-lsp-server[all] deps
-RDEPEND+="
-	dev-python/autopep8[${PYTHON_USEDEP}]
-	>=dev-python/flake8-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-"
-
 BDEPEND="
 	test? (
 		dev-python/cython[${PYTHON_USEDEP}]
@@ -146,28 +127,39 @@ python_prepare_all() {
 	# The original hasn't been update in over 6 months, and spyder upstream is slow
 	# in making the switch. Because we are running into issues with outdated deps
 	# and a whole dependency mess as a result, we can no longer wait for upstream.
-	# Also relax the parso dependency to allow parso 0.7.1
 	find . -name "*.py" -exec sed -i \
-		-e 's/python-language-server\[all\]>=0.36.2,<1.0.0/python-lsp-server\[all\]>=1.0.0/g' \
-		-e 's/python-language-server/python-lsp-server/g' \
-		-e 's/python_language_server/python_lsp_server/g' \
-		-e 's/python-jsonrpc-server/python-lsp-jsonrpc/g' \
-		-e 's/python_jsonrpc_server/python_lsp_jsonrpc/g' \
 		-e 's/pyls/pylsp/g' \
 		-e 's/pylsp-spyder/pyls-spyder/g' \
 		-e 's/pylsp_spyder/pyls_spyder/g' \
-		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
 		-e 's/pylsp-black/python-lsp-black/g' \
+		-e 's/pyls-spyder>=0.3.2,<0.4.0/pyls-spyder>=0.4.0/g' \
 		-e 's/>=0.3.2;<0.4.0/>=0.4.0/g' \
-		-e 's/>=0.36.2;<1.0.0/>=1.0.0/g' \
-		-e "s/'parso==0.7.0'/'parso>=0.7.0,<0.8.0'/g" \
-		-e "s/'=0.7.0'/'>=0.7.0;<0.8.0'/g" \
 		{} + || die
 
-	# do not depend on pyqt5<13
-	sed -i -e '/pyqt5/d' \
+	# Do not depend on pyqt5<5.13, this dependency is carried by QtPy[pyqt5]
+	# Do not depend on pyqtwebengine<5.13, this dependency is carried by QtPy[webengine]
+	# Do not depend on parso and jedi, this is dependency is carried in python-lsp-server
+	# Do not depend on python-lsp-server, this dependency is carried in pyls-spyder
+	# The explicit version requirements only make things more complicated, if e.g.
+	# pyls-spyder gains compatibility with a newer version of python-lsp-server
+	# in a new release it will take time for this information to propagate into
+	# the next spyder release. So just remove the dependency and let the other
+	# ebuilds handle the version requirements to speed things up and prevent
+	# issues such as Bug 803269.
+	sed -i \
+		-e '/pyqt5/d' \
 		-e '/pyqtwebengine/d' \
-			setup.py || die
+		-e '/python-language-server/d' \
+		-e '/python-lsp-server/d' \
+		-e '/parso/d' \
+		-e '/jedi/d' \
+			{setup.py,requirements/conda.txt} || die
+	sed -i \
+		-e "/^PYLS_REQVER/c\PYLS_REQVER = '>=0.0.1'" \
+		-e "/^PYLSP_REQVER/c\PYLSP_REQVER = '>=0.0.1'" \
+		-e "/^PARSO_REQVER/c\PARSO_REQVER = '>=0.0.1'" \
+		-e "/^JEDI_REQVER/c\JEDI_REQVER = '>=0.0.1'" \
+			spyder/dependencies.py || die
 
 	# do not check deps, fails because we removed pyqt5 dependency above
 	sed -i -e 's:test_dependencies_for_spyder_setup_install_requires_in_sync:_&:' \
diff --git a/dev-python/sqlalchemy/Manifest b/dev-python/sqlalchemy/Manifest
index 75a893f38314..49f6c5e0ba80 100644
--- a/dev-python/sqlalchemy/Manifest
+++ b/dev-python/sqlalchemy/Manifest
@@ -5,10 +5,12 @@ DIST SQLAlchemy-1.4.18.tar.gz 7643090 BLAKE2B 8046bb9f9aa459eec95af57e597540552f
 DIST SQLAlchemy-1.4.19.tar.gz 7675110 BLAKE2B 61afe9e8937cc1eca9a6c10eef03959422a6dc73e562b47c820b01fbeb61099113d1d30e4de0448ae07abc064db190a9a0b9550d4f8c324a73d277c2c9e7958b SHA512 656e5fd2c1e5c5f9979ad3e38b0f927e8756423d5c988ccb5247cde2f8d354b4623cb57af24c7226758878e429514ae828047fad623ee332ae524b714ab3f18f
 DIST SQLAlchemy-1.4.20.tar.gz 7682074 BLAKE2B 7921bbab0c7fcaccb232121625dcd9acc162cb21e747b889fa032863435b6a922b9ad21c7ba136b94617710d3aa6ec331941b11b0fd87a8d543b633d3d605c36 SHA512 cb9ec5c74b27c93824b7d46844d2a122c719e358d917563039f3dd96a44d057d4daa239b2820893db42348f46546efc469a202999be2c722027abbb6eed50063
 DIST SQLAlchemy-1.4.21.tar.gz 7701480 BLAKE2B fd7898844241e381df1356b33f42c99f1d91e50cdf702d3d04302225b64ba7e5bd4ed0d140b1ef2c6a3c4480c282ef3aa6f1301083de68c63d4b86448a9420d2 SHA512 90e3e63f339d784bf46928031c24804bfc2221044e08061f3da7db9c905013fbf4f0cada3b870a1662234b0169a51a678ff6bd837610ba18ab7cd1eea048a028
+DIST SQLAlchemy-1.4.22.tar.gz 7709437 BLAKE2B cc4ab689c8f53601ba76632ad32ed2ae23f9ac46fe23f40cc7657b66f48cccc6a7801f9bea64dcebbe1c39786d7ff0708fad8e8d05534a5ab4ef691e6da8d85c SHA512 92a36a77d104db23577dda9add6dca86c1e1c416d3dc552c4dc6049522683da2857c1071c81d216d41a723c11de081af92800acb5d44d69fb0e36ee6756839ce
 EBUILD sqlalchemy-1.3.24.ebuild 1817 BLAKE2B 7cf908d3be350140f1f1744ed3361bd2fa12f1cdd3d5cd08b2abb5d408c796a0837d3a585c8b299065f4da4f231dd83fdb6e9a3982aed6ef8465e7e1edd9d6f2 SHA512 3ff6fa141d32dbe4c96715eaaf88e3aa616eb98f19ca9913eee74f573b05bf91f57430d1c3b30060b28e1846b2a613f6ede62224f9163b28818e5b306a6b7125
 EBUILD sqlalchemy-1.4.15.ebuild 1699 BLAKE2B 5d6c0890d1352b0a96b01005a9bc8623956c5cfd5df44b1956200e9bb4b786c0121443d90997260b6b543456c3cb166704d60f37b8212e2b30b3e3ea37436710 SHA512 259402945476720ebe4aa1ea860ae8f43095b6916d1112fc4bc8616838a8efecddab01dca1937c800fa32bc8df8d15de67bc5eccc5330371a250473b4a8fea61
 EBUILD sqlalchemy-1.4.18.ebuild 1690 BLAKE2B 4a31c38037057fb338e12175331a2ed3347612c9df5c3817c0717d165d9544a204e55514130fd4d8ce3ab533138c2e9ef9f070d09815dbc2d21af82f76921ae1 SHA512 23f80e868cb99d48aa52da3881e210bb86e9576f339a5376c2922bb6b5b3f4f4a37c45f70ff8700557d157b19261937e45eab5b9f696671ae76c9e0579e9640c
 EBUILD sqlalchemy-1.4.19.ebuild 1704 BLAKE2B c6e674ffe8efcfcaab23945ff90090411622da56f9d65414a0c849b2f01bab12904c4a79c71383b4fac21aad265e6dc83a4543adb532fd44ae84aa7079185981 SHA512 1e6cc2c24dcc02930e1687d9c0424b3a98baa6e4be7182e65beea5c836dd0b6396d47abd84c0927d497a34b8cfa39b1dd84449753a471dfd99e65dcbd21c64d9
 EBUILD sqlalchemy-1.4.20.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
 EBUILD sqlalchemy-1.4.21.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
+EBUILD sqlalchemy-1.4.22.ebuild 1697 BLAKE2B 21b1ffbca760c9c8c23360d16836d6a7e5c336ba270db83fef0a76081ec43daacce50d61355eb4411d6da147be771ca148c2432689afb28434c80dec6ea4a262 SHA512 64338210216de0f7c26587174ef94f67a2919fe6918a2e9da46e12d7110921d2f183efbbde05ea1e352cc2808e161f58f97eb83a9707950947c382ab1348c03d
 MISC metadata.xml 443 BLAKE2B 44c09d8332158ed09ece04188ca9b41a68b7e8a0a2b6d8d44cef44d7be396a08cab3432c05b3bcdbe706a470662d313548e80e202c8ea0e02aec6035daacb3ef SHA512 c262e5b27bbb02b6e64a1fa8a240cf14fe572dc0d41901dfc65ca979f7f89b3e0885b71a6f5c39b33e1534e13366873144693eed44bf43712d3c924a504dc6c8
diff --git a/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild b/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild
new file mode 100644
index 000000000000..144d57d9ca1b
--- /dev/null
+++ b/dev-python/sqlalchemy/sqlalchemy-1.4.22.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+PYTHON_REQ_USE="sqlite?"
+
+inherit distutils-r1 multiprocessing optfeature
+
+MY_PN="SQLAlchemy"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python SQL toolkit and Object Relational Mapper"
+HOMEPAGE="https://www.sqlalchemy.org/ https://pypi.org/project/SQLAlchemy/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="examples +sqlite test"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' pypy3)
+"
+# Use pytest-xdist to speed up tests
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove optional/partial dep on greenlet, greenlet is not very portable
+	sed -i -e '/greenlet/d' setup.cfg || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# Disable tests hardcoding function call counts specific to Python versions.
+	epytest --ignore test/aaa_profiling \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")"
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "MySQL support" dev-python/mysqlclient dev-python/pymysql \
+		dev-python/mysql-connector-python
+	optfeature "mssql support" dev-python/pymssql
+	optfeature "postgresql support" dev-python/psycopg:2
+}
diff --git a/dev-python/subunit/Manifest b/dev-python/subunit/Manifest
index 55223005e1de..248d61247d19 100644
--- a/dev-python/subunit/Manifest
+++ b/dev-python/subunit/Manifest
@@ -1,4 +1,4 @@
 AUX subunit-1.4.0-werror.patch 1307 BLAKE2B e714e82827c0c30b514ea9f43dfcff1702bd93b9e4f1e5c44029a84deb3de8c84a351baec097b545dc00ac7f0d56f85b917a53c23d501a8b93c35632d43c14d1 SHA512 444b4d2755b395f904dd341992cd2d7df60924b4111e552b6a61b6c6113397b3b6e4dd12b2bab7d408a306b3037e361217c7cda5473d94ca746ceab4e1136cbd
 DIST subunit-1.4.0.tar.gz 488022 BLAKE2B 4c3a714d02eeed9420074c4e032778a69b716a5cad0079193533e9bc8c0f4576d70b165eb413203ce8a916ac28466e9f5a113d4a7746019d7d09409df9860bae SHA512 5d2e3cb96c09067ef4595c86648f13330c810b19e39c0b35bc9546c57bee957ddcf5cad7b8e3f92bda9b54dcdbf175863e2f6ba94020f880230459be7afdbbcf
-EBUILD subunit-1.4.0.ebuild 2582 BLAKE2B c9b7618e182ed1259979e8d00b74637b9defc0ee565039e56f7b78ee61cf9c1059f140f0487c6e7e7199e63fa488e21438a1e22cfa4da02582195b98a46bd383 SHA512 47d61c6885a804955a4792e68841863abe959f0e0f959e15aa8539e5ce9762eae3f1f64fd824decc19fcded16dc181adfed6b80f6cae4f7ce06f2fe84d48118f
+EBUILD subunit-1.4.0.ebuild 2589 BLAKE2B 6910487596f619830a195e448eda159753c2a6c776c1ec128086f5fe5f859e028088f16b889559b7256e63668ed86d0fa92d34597442ffee44bc348f699f2a10 SHA512 6ec43969be84272430101edc9e645a182c02951cb5ca6df1dbfcd8b3b82ea262548979cc1a770a3d49ea3838a497e8456d3c82bf41e3bab5e8a21d8f81b996e1
 MISC metadata.xml 474 BLAKE2B c6e5e74bfae996deae0adce7fbdd4262c55c67389b62e549cccca2d42a464bed2dd9d711585ca391cd30ef1f76da30beafa5a8d54ad8f79b539106265757c039 SHA512 d2041aecf3846526bdad951d31ca5d9014efb7cc711f5cb974cbaee3f87e9c705ff8ac6bf02433685d19a57ad7930ee1a25267fffe8db54341e0ca8812fc7008
diff --git a/dev-python/subunit/subunit-1.4.0.ebuild b/dev-python/subunit/subunit-1.4.0.ebuild
index 284468711361..f95225ac17d0 100644
--- a/dev-python/subunit/subunit-1.4.0.ebuild
+++ b/dev-python/subunit/subunit-1.4.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/tablib/Manifest b/dev-python/tablib/Manifest
index bc9215c5a702..6d9a94e6b670 100644
--- a/dev-python/tablib/Manifest
+++ b/dev-python/tablib/Manifest
@@ -1,3 +1,3 @@
 DIST tablib-3.0.0.tar.gz 95049 BLAKE2B 6c7c39f4ba6d8ad08264d3ed6c848ca37d8e2c834aea863a1f79fdcac783ef5fe25779f7d83d38b07c4e2fa47184964e732bb35a8094a98e1350812c2f6bbc6f SHA512 32deac7a05663da9d96f4ef7dc5c4b5e3b8fc4b7a0477c1a807ae83322035e8a99d4f709dfa11ec19af69ac75d7044a469c1b360cdcde3311cdf97d0f584b0e6
 EBUILD tablib-3.0.0.ebuild 999 BLAKE2B 22d35ea9f59c14890f9819d9d30b55dc7f65084a3283fd249afbfd1128eb247cfe82b6a62ef76b7ef83a0df4e885246e887bd584e5666309b46c41313ada44eb SHA512 a6b9abb2b6e1c0d27cc54732b47b2d7683e9c029b9b1f092145e21761c5f60b5fc24d619deb15f6a2adfa67019b92ff03d9bdd02a3d5244f2ae6439fc268fe39
-MISC metadata.xml 565 BLAKE2B c6e792a6ac13ad9d1c75f1da4dbb2bb96a623b9ef8c2aeb97e2aeb13dd68fc1a61039142cca84d42bce8e0975f796c103c36643e2c5705a48c4bb4b1476676c4 SHA512 59a57cd0a1db682043bc4e6ca07c0daee75c0083ab161dc9ee07e46bc3e5c64ffc6e9d6d16f0e3a7d06c2fcaee15ed53a12d07dd4d1b0cadd0db587a77a4e0c1
+MISC metadata.xml 309 BLAKE2B 8e0b88ea2dde7eae92968c2bd92adec98f24d8bc86a55c1b07efbe24db835aeca9cc3babc84ce29552a3f4f27888e52b75f795eb34a82e801365c504d92ffc90 SHA512 27639a075257d7dd9482c3890045d20ce907af90aee977491e410555e5d5d283c57ce8dd6e93a61c25ab7f0021c302171e1be5d374a8b59f76f432905895b3f1
diff --git a/dev-python/tablib/metadata.xml b/dev-python/tablib/metadata.xml
index 42b7a01d6459..ba56e670af44 100644
--- a/dev-python/tablib/metadata.xml
+++ b/dev-python/tablib/metadata.xml
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>python@gentoo.org</email>
 		<name>Python</name>
diff --git a/dev-python/thunarx-python/Manifest b/dev-python/thunarx-python/Manifest
index 4ce703c521cc..adf3e2f8642f 100644
--- a/dev-python/thunarx-python/Manifest
+++ b/dev-python/thunarx-python/Manifest
@@ -1,3 +1,3 @@
 DIST thunarx-python-0.5.2.tar.bz2 348120 BLAKE2B ddb098857a7411c1ce4dedf8b406cf6583e78f2ca4b012a9e0346c5a7132c40fd9cf279dc5d054ec827028cdc67321a65fab5e9d3912287ea9ed1f0cf4e72248 SHA512 49d009c84d69f0a1938ed6cb46fe04326c7323edecd79f6d9978ce2306fb95f20c901174f1cea31d5e436c85537efcb79c8613be857a3e4143f7b55b895616b6
-EBUILD thunarx-python-0.5.2.ebuild 761 BLAKE2B b274b577081b19404256ca7fed4ad80b7fef58b4fc04c28480a8cf5404ec2acf5da672b5265facbbc57a47c01c4d1a25e70da97da11719a5f0b4adae1c406019 SHA512 df4e390d49a21afa5884c4f8be449d7055d4772cc4a120ccd26de463711dbe04a6d876b2593cb785b8a111ba2f666836068da06538b1dd351202a6d2a7a09ca7
+EBUILD thunarx-python-0.5.2.ebuild 755 BLAKE2B 4ba369507cbaa93f0f5189ffb74f0cddaf4501ae847822ff7d04dbdf503bc2e3c5c36ba0c65709d9ba0300c1962fa689c7f6d3ba8636164161bf910e5b4ad2c9 SHA512 ff0ccb01a740845aa2fcf816e287f2e90b5c95ea17ed42ce69ad3a2b4092a3bd69e2f8c5d005fa79b5b10aa590a0800d953e19e06c814c38fef7f32ea56f28a0
 MISC metadata.xml 249 BLAKE2B cfb34e0ab5b7155d26bee3e5cc55d570e05151273d6793455b82980b3e3411983eaee6a6ea94f896b18df24efdc964f180bb00b3852a98a2cc5571f1d22f6d84 SHA512 ec9e5427d44f20c2c0166fe103e6e8b8384a300685f7c9774f9177a1533d7057f332af1ba1046462f75bb3f2812e075d01b5eaeb625340c911d2bc6d2f9acf7c
diff --git a/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild b/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
index 289fceec2de2..e6c360683a7f 100644
--- a/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
+++ b/dev-python/thunarx-python/thunarx-python-0.5.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit python-single-r1
 
@@ -19,7 +19,7 @@ RDEPEND="${PYTHON_DEPS}
 	>=x11-libs/gtk+-3.20:3
 	>=xfce-base/thunar-1.7.0
 	$(python_gen_cond_dep '
-		>=dev-python/pygobject-3.20:3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygobject-3.20:3[${PYTHON_USEDEP}]
 	')"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
diff --git a/dev-python/tomli/Manifest b/dev-python/tomli/Manifest
index b399d4d800de..2511b6a0a13d 100644
--- a/dev-python/tomli/Manifest
+++ b/dev-python/tomli/Manifest
@@ -1,3 +1,3 @@
 DIST tomli-1.0.4.gh.tar.gz 120508 BLAKE2B bd75568315b405598578b395ec0e20b7f37e9ceee58f145cda8adaf58a3fa549cd35902650f5b2aa84b764ab32eac8a21d3ffd94c0c4c43eab3c3a0b49203a71 SHA512 e30e06ea805c94359596c3d6db82464ccafcdde0172cae12d62c889c70986159b3198cf465183854bef1b048c21e487c2b0dad2825e2477d363885e749b238ee
-EBUILD tomli-1.0.4.ebuild 553 BLAKE2B 734bb35956cf2734f19d45411f29fda96f0d8a4dee404ed6e0b72ea95ec3e878cb6104e3ea82d85f6db744b92a4e540a9649bc5eda4d8d441bdbd8cf6bfcbf0f SHA512 2e2f5ef55cde44761eb4a879004faa4c03c23820702f1e2659860f8a2429fafd1a1ffbbf274123a8dd6247fb553b18c7ddb713da63d33a1743a18f477181e7c6
+EBUILD tomli-1.0.4.ebuild 580 BLAKE2B e9e88f57f31e27a96b8b6f18a9ddff898864b04c472fca85af88294b7af6a722027e461b6506bf12328546c201b51b030e4088159e0652b5bd5d2b38801af8d6 SHA512 8c829eeffcf790b37f5fb84a3e79e2fb437608488faa223ff5826d6e88f636bca348f89d781a84c06096ac9d3d5449a096322f7d11075fa001bf0cc85fc3b71f
 MISC metadata.xml 338 BLAKE2B 9a121aa354145d8764982615b75e0d7bbafd9fd9f62d8aec58f75b07ee4c86a2e31d56d4f9e15025eafd639fb8bc378e2e7524d8d5310aadc98d06cd374644b7 SHA512 4be4620f741c382a83c748af54f8f9744703d0eef7302bff78d3d85da6b9c2628ad0bdda54b8bd75399f9e89ecf5eb80a961029574d85aaefbdd95cbf35b6099
diff --git a/dev-python/tomli/tomli-1.0.4.ebuild b/dev-python/tomli/tomli-1.0.4.ebuild
index 770d80a88e1f..ec5349db21ec 100644
--- a/dev-python/tomli/tomli-1.0.4.ebuild
+++ b/dev-python/tomli/tomli-1.0.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
 
 BDEPEND="
 	test? ( dev-python/python-dateutil[${PYTHON_USEDEP}] )"
diff --git a/dev-python/twine/Manifest b/dev-python/twine/Manifest
index 3d5f8b50f69b..23f3948fed89 100644
--- a/dev-python/twine/Manifest
+++ b/dev-python/twine/Manifest
@@ -1,3 +1,5 @@
 DIST twine-3.4.1.tar.gz 211775 BLAKE2B 0fdc6a8f5a37ee9695c8db2080987b631dfe6f8ed718e3912c94d77b46d35682d27bef07715c1fe7c0d8b6ab1449a771e18d8ffa5c6044dde1536b56b3e7885e SHA512 eca2a7b6b1386868f67dec1182599a8331981585e1cc0b7eef762aa0e99b87b0c6725a2c776330a8b392254501880a68e01ed8569a169857e8079abb8da43b79
+DIST twine-3.4.2.tar.gz 212266 BLAKE2B 602bb72f4be1c0d28341fb3378a5d55737c14555495640ae3414a1c8e7ca0c06b2c2ce3c358130251c02f0a51b61eb362a1e999c3945d4d1d7afd7bcd4d17807 SHA512 3f6d8992294a35e2a26be64f56c88d31af63b05f3f477d545bc82d928ca1b9939d23fa489eca5232502a49def77d489eaf6a29663d150f78b5cdb99749ff9b50
 EBUILD twine-3.4.1.ebuild 1726 BLAKE2B 5d2749084f74af80645d6232369ecb693a89a8b309b7618f2de647e13ab1df8e791eae950dfe551c23e0efecd7f311bd76cd10bf51a2c423eb6e30008a82e304 SHA512 72e689f1436fa6ba57035074c4c60bc43ba61cb6ecc03db4b45b4c0539b41fd735e4e183aedb28ae146a7f7067e7761f181ecbb7e952538d7bbd1e9cd0d2e6a0
+EBUILD twine-3.4.2.ebuild 1774 BLAKE2B f21412daf87832f0a107b99438928a94abe1c06011c57ad0350d18b1d9d20b8ade9f1d03e8878e01f1e7db3761ceb9ef66b73a6bb63d2c5d25afc6a46fd61f8c SHA512 c172f89b737e69f0ac75ac055127b65c378971182b13e0aa01bab89244948e9ae138e6c983d1e3f1932e2099a63a73ccd2e3e40310b04f6c7b7740be7c113f3a
 MISC metadata.xml 382 BLAKE2B 7b1f58005d26a36c877707986c59a6ae3549b9e8118f01fc87aa05a1f7dfa4271ea2100663d49b7b5b8f278409e96b2dabcdb0d9a74809bba75d440fd42d88bd SHA512 c4ce9e0c6029c9efb8be9b36720281ed4ebf0d829e3d936d0a7a864d8f42b1f7c71dc8b605717547ac004bd94c7baebd5b2d2a224899fad0efa0747124ba5bfb
diff --git a/dev-python/twine/twine-3.4.2.ebuild b/dev-python/twine/twine-3.4.2.ebuild
new file mode 100644
index 000000000000..72a1dedc5390
--- /dev/null
+++ b/dev-python/twine/twine-3.4.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Collection of utilities for publishing packages on PyPI"
+HOMEPAGE="https://twine.readthedocs.io/ https://github.com/pypa/twine https://pypi.org/project/twine/"
+SRC_URI="https://github.com/pypa/twine/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/colorama-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	>=dev-python/keyring-15.1[${PYTHON_USEDEP}]
+	>=dev-python/pkginfo-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/readme_renderer-21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.20.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-toolbelt-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rfc3986-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/tqdm-4.14[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/jaraco-envs[${PYTHON_USEDEP}]
+		dev-python/jaraco-functools[${PYTHON_USEDEP}]
+		dev-python/munch[${PYTHON_USEDEP}]
+		dev-python/portend[${PYTHON_USEDEP}]
+		dev-python/pretend[${PYTHON_USEDEP}]
+		dev-python/pypiserver[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# requires internet
+	rm -f tests/test_integration.py || die
+	# pytest-socket dep relevant only to test_integration, and upstream
+	# disables it anyway
+	sed -i -e '/--disable-socket/d' pytest.ini || die
+	sed -i -e '/--cov/d' pytest.ini || die
+
+	distutils-r1_python_prepare_all
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+}
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index ae1c33d9215b..53c723a28aeb 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -3,5 +3,5 @@ DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977b
 DIST uvicorn-0.14.0.tar.gz 511593 BLAKE2B 9f7aee0001874c128e44d31945aaa0ca92237e594debb6fea3c6c6d0f283c96cfad5248578b0e1c170fe2fde96a6b17c56ecf2436783fcae135b8eab1997b701 SHA512 f41a7f01ac6893ceaf4d1f06a4bccd7355e319eee11d6aa290b0d316fb356eb807c926941157ec64f1fc6b7c4601930cfbe271075d6c4cf684bd7e175617390f
 EBUILD uvicorn-0.13.4.ebuild 1297 BLAKE2B e2e429e266084c92acf6965e86220494101135001bf656ce9ed1ee08b8ea07b61a8cb844bd416ddfa77ae9c8dd0d3618a8438b3dd1b08d12857efce9e6fbcbbc SHA512 3fd28de46cea2f2b8a2a7aa688155127d1a6d8e7f79137443606019e05825a1f4ab1c1ecd1dd8f4a04c8dc8e6851b59136fdcc68d5d4344be98fe70f97714dc0
 EBUILD uvicorn-0.14.0-r1.ebuild 1281 BLAKE2B 822eb226ea59ca2daf2ed0fa81f97c30a1dc678d07684ee10bfe604cbd30d2bb0cd70c5b4bbb64c180bba9f605570546bfa81f457b40371edf672eb10f4689ca SHA512 c7e2629d574374a45973ec87a8e19d2157c449b727948116aee9e35d288bb5eb4c65fce223ac72693fe6dd84f7f505b8114504984ea89a3ea25f5e29495294b8
-EBUILD uvicorn-0.14.0.ebuild 1431 BLAKE2B 612bf782686c9814f0a497ca129148c91c4eab5c5078c57d330036e6d99c07bf7a0e442a7f7d722fc4db941a808551c525464e7282ab0cbbac454ecb30e706bf SHA512 5ab7ae041de478d207f5d9423f4da448d7f8c9465e25303823de9b27541d34ef8eb1255dd65640bd7e58f1a1ba02c97e1aabb118fe433e86df4622bc4a11bdab
+EBUILD uvicorn-0.14.0.ebuild 1430 BLAKE2B af1e1fd35aa98b57159d045233bbaaedc13e69a21b95271f2445f44b439d9d316e8601f19da048364a099130f6762d41209375efabb7303706e87f42df6a9d8f SHA512 bbaf9a47ee11762690a74fbf20031a8f0643479b1fa92ec8b0477c01007a0d4cf9c36e55b56c077639428a274c586de3917762b1d9b5bd827daa73421e86de34
 MISC metadata.xml 450 BLAKE2B e6413874e7247880323b72113f002ade2edff362d7464ebbd5890ec95946b97bc37d74c2d6e9ff7a6a416a45f32bbab1b6eca70db8964adc6be287793c0fb4b4 SHA512 a1138016ec2d87c77f82333a0d41a68113d87c74d50e1bd6ccef0e0300f53663ecb907959be2547b42cc5cd007f47626e98b8c8cdc7e3557d2dfd0a369447268
diff --git a/dev-python/uvicorn/uvicorn-0.14.0.ebuild b/dev-python/uvicorn/uvicorn-0.14.0.ebuild
index a58ea4472de1..494ab6b4faeb 100644
--- a/dev-python/uvicorn/uvicorn-0.14.0.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.14.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
diff --git a/dev-python/virtualenv-clone/Manifest b/dev-python/virtualenv-clone/Manifest
index acbc20687273..4a1dce161658 100644
--- a/dev-python/virtualenv-clone/Manifest
+++ b/dev-python/virtualenv-clone/Manifest
@@ -1,3 +1,5 @@
 DIST virtualenv-clone-0.5.3.tar.gz 6226 BLAKE2B 8d86b9c44fc2db49d609045342352c2d06a6b3008c44a891b9d1e1a7225d77c69708999ab1b1097df1f76bd858ca5cefec8693e4a9ccf74589bd159de37c442f SHA512 1ba34830d21e8d4ea2f448defbf769afb3a63049c31fab46cfd184f4e5a8745d58984392add327fd5139e5e05a61c172266e2102439577c0b3702152f87fef0d
+DIST virtualenv-clone-0.5.5.gh.tar.gz 8679 BLAKE2B 4283de1e7b53083357d68ea556ad68144fff104d531fcc741b2194e7b501de52ade791612a538d87585af75ecf187e0bee2d13a76cc55c0516f8f145a11b58e7 SHA512 b4bcbfbba9d6616d00ecbd574651dc93cdc71ac85e610c924681692665478975f2381e04afb0b9e8b59c76484085ab3519aa4a58b1dfe057a0be0ea83263e93e
 EBUILD virtualenv-clone-0.5.3.ebuild 505 BLAKE2B 26fc9fb7c371e458990d62086417d8f2ffbb18c28d3f019323974cafa80275d1de52baafe787ea362df1f8992b2099be86ea4c7800566b579bbbfa8298517649 SHA512 03120fc0e981b8198b78b6acf86c58a316069d834423dea69d8710b29afd662c5874f2b9279395f242c9f22337500e48807b183341fd8aaecfc19c6d2b78e02a
+EBUILD virtualenv-clone-0.5.5.ebuild 537 BLAKE2B 8e8ee82260203e3c16853f624176da7465be75ad8327f9b58935efecdb1fac7164b4dd591ce364e03b46ff084dfe88f8625e3a05fb70daebfe6d6f5ec87e53d7 SHA512 871a3867eefb7ea48debf44aad2ab26191de7edca37d1c7e0ad3391996632831d22b23cb38626a0fc9c4ef6a1f392cbc142ed7eed61cb2f2e6f88851be5e69c0
 MISC metadata.xml 400 BLAKE2B c54a71099c147d9ec3dd825265a76a5434b385ceea45cee95501f27bf409678680d64e8ccb537344cfa4a0e302262d4ebe6b825f80196506e3231997f0d8f320 SHA512 da2e494e64d7692828f26fb9162641fd112e6e56b5e00facad571c5ded25157741bb9e27fc3296f2ce8b7f0c2c12de144b7d5240bf301713b346131fd7b47573
diff --git a/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild b/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild
new file mode 100644
index 000000000000..ffb83dc6e391
--- /dev/null
+++ b/dev-python/virtualenv-clone/virtualenv-clone-0.5.5.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="A script for cloning a non-relocatable virtualenv"
+HOMEPAGE="https://github.com/edwardgeorge/virtualenv-clone/"
+SRC_URI="
+	https://github.com/edwardgeorge/virtualenv-clone/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? ( dev-python/virtualenv[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/vncdotool/Manifest b/dev-python/vncdotool/Manifest
index 9d6cf93125d3..44633f94e67b 100644
--- a/dev-python/vncdotool/Manifest
+++ b/dev-python/vncdotool/Manifest
@@ -1,5 +1,5 @@
 DIST vncdotool-0.13.0.tar.gz 72780 BLAKE2B 6a27565c5410148f569bd5a8e212327d734f9fd044549683bafcbbaed0df56e0a4853b4750eadc74e2186463313cd510c5290a8c4de69eba5ecbc42ea5d94c32 SHA512 65e275c53dbc805114801b149bff86743cdcb2b8d69b038425fd7dd6f911b113e332246178080c71314d58624137152205057c00b451a3ec6b46541f1b294b98
 DIST vncdotool-1.0.0.tar.gz 62580 BLAKE2B d09b26e81496055f17e96fa5b60ea006ddd210fa8b0044785c107582af18a61fb5beec83f577222b32cc8f446694235cd3ab468cfa917ec3ef4b00b6fbc1a8bc SHA512 45fba9ba3549ad575923bcfb3ab62c53b3c2d85882c87ca2b656795314b9c32aa989a1fdae280f904cb4d79f509622810ffd4d1e2977beac917f0289d6ff24a4
 EBUILD vncdotool-0.13.0.ebuild 1063 BLAKE2B c01fd13ab2e61f03301f3b967f85a5d7520a8003e3cfcbb55543f940a28c31ddb2b60e4a40f9049b042b5849b5cb7d7f90df3e50e9f5d9f9ed4bf70c39956e84 SHA512 d1486e69c12a7e720e2c41089fc3b107d3c85b719df9ba80635848d6b739bb0ebe896745b5712cc01fa8dd5e7a9b7cb14f83654c327dad38f1d7267da7b96408
-EBUILD vncdotool-1.0.0.ebuild 1063 BLAKE2B c01fd13ab2e61f03301f3b967f85a5d7520a8003e3cfcbb55543f940a28c31ddb2b60e4a40f9049b042b5849b5cb7d7f90df3e50e9f5d9f9ed4bf70c39956e84 SHA512 d1486e69c12a7e720e2c41089fc3b107d3c85b719df9ba80635848d6b739bb0ebe896745b5712cc01fa8dd5e7a9b7cb14f83654c327dad38f1d7267da7b96408
+EBUILD vncdotool-1.0.0.ebuild 1063 BLAKE2B 1cbcfc22c23c5aaebd11edeb7498a94675bb6afff6bb3965629d3600822167e865c26f23856373d9a18f430b79a15ba421228899a11e35ede3bdd6b6d5fab45c SHA512 173836dbe2a94f473dfcd7064c7e90c23f5418a6bbb9ccc439403133f9b116e363ba7a71c4ef81731ebcee7740ed70fa0a694681ceb6b9c8207eabc1c80fdf00
 MISC metadata.xml 354 BLAKE2B 1fc59ea9b7a2940509e9a396bba1612ff4dfe96107cb1c62393eb82911bd11a0f23a796b79087c843dc5b8f17d6e3d0a002a3a4258c1a4f13cc6548356cd59a7 SHA512 f2055d919bdffd5c458676de58cbfe8406e897e26452312b0f7402b5bea17a137d340bc5aed5bfeb0121f178df5c7c5f048c0b6461eab210b1127651c2a35a25
diff --git a/dev-python/vncdotool/vncdotool-1.0.0.ebuild b/dev-python/vncdotool/vncdotool-1.0.0.ebuild
index 5a1b894b8cc8..de7a237c2740 100644
--- a/dev-python/vncdotool/vncdotool-1.0.0.ebuild
+++ b/dev-python/vncdotool/vncdotool-1.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/websockify/Manifest b/dev-python/websockify/Manifest
index d6efd59188eb..e38e28d3fa6e 100644
--- a/dev-python/websockify/Manifest
+++ b/dev-python/websockify/Manifest
@@ -1,4 +1,6 @@
 AUX websockify-0.9.0-mock-tests.patch 18675 BLAKE2B e7dbb0d77bf264bdeef98a3aadc071c3612bd7cad5f6f72c2a748d75e7197ca59a328e7476e19970fa89a17fa9cdc869493dea7505b708cec4e3a020e1a8c545 SHA512 e14011a7b1aa4992f21e5f4293e04424faab2a740ed362bfd1c65daa16cc2cf0d7329df0511239b104a6a4618fbeadf39344227cc7cdc5f48a6b3cfeebf7e748
+DIST websockify-0.10.0.gh.tar.gz 53402 BLAKE2B e909dc316d6dd0ee03ee23b07ca2d78cc60994a8f361b3968759c382c704637357848e903fb12af002b5d5b2bec957f9a4c2b0ddb0e6d008ff9b4a462f3e8871 SHA512 262071f4858e5e3b6471c6f3731d8715c5c13fcc5f43738a330323958a8f0cbe7797847bdc676f1c6c34055c6f8afb949d005a5607d6b220b893910ff973ddc5
 DIST websockify-0.9.0.tar.gz 58493 BLAKE2B 622a36979ec083dd3ea747b43cd8fec0916f9eb6f1a2b8f9b7acabd38f41aec839b2101c5261fdf2474bc40ebbbef61c9ba51d2e57f749f1e1a1c46879fb5d65 SHA512 d2251f653a40dc6dca0e5541845565d968c60be96a20a9b70b0305c4b7578f7fe205d4b98a94bb77d7c9383a396833af90fe92a6ade7e1a6f2d9bf8513d372c8
+EBUILD websockify-0.10.0.ebuild 862 BLAKE2B 3c24a2475a86246095229c6593749a9bf4255976ad479a17283e3c9c3312b98bb8bcdba3d71486b6d5821bb54f4b12e04476458e14a5856cc7b00a9a97a03891 SHA512 54581f42f9066d514af9efece8df6d9296da674bca00b59dc12860eb42e89af73a8a3de88c9245788c07b44203aac706bdebd6e06a57c4bee022139c88e4edae
 EBUILD websockify-0.9.0-r1.ebuild 772 BLAKE2B 164a5f4e6511a4ccdf068371a366c2c35b652a576ffb723013c76352aa046707f543d782b7cedf38c93ef8a08a055ac5b0b0ea9d4c6cb605e27d31fcd57223db SHA512 9efe158b128ae165c550a0180db533f681e85bf0b59901bb9d041f1370ee4dbcf4b5e82661d5d39d1a14f056753d86ba461092251df3e44f27843a254858b098
 MISC metadata.xml 484 BLAKE2B 27feb7f45e7ff325c6f8a774f75d861bbc96dd26b89bfa24eb7bbbeee78aae7dd6c8c8b03ce24323712e906ec064cb1e486bb0564747b36e76b3209c37ebb969 SHA512 9010dc54f71cfa3aa9a7670ce24e2404d8f615f0dbfc98a8b88cc0d248a8716a384f09eb80132cc3a9b9595b4f52fd5b4cfc20041a3d2b7cba0bdfab38355fd4
diff --git a/dev-python/websockify/websockify-0.10.0.ebuild b/dev-python/websockify/websockify-0.10.0.ebuild
new file mode 100644
index 000000000000..274232de46f3
--- /dev/null
+++ b/dev-python/websockify/websockify-0.10.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="WebSockets support for any application/server"
+HOMEPAGE="https://github.com/novnc/websockify"
+SRC_URI="
+	https://github.com/novnc/websockify/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/jwcrypto[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO: incompatible with current jwcrypto? (not a regression)
+		tests/test_token_plugins.py::JWSTokenTestCase::test_asymmetric_jwe_token_plugin
+	)
+	epytest ${deselect[@]/#/--deselect }
+}
+
+python_install_all() {
+	doman docs/${PN}.1
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index c1ec50d5f5dd..b545959aa840 100644
--- a/dev-python/wsproto/Manifest
+++ b/dev-python/wsproto/Manifest
@@ -1,5 +1,5 @@
 DIST wsproto-0.15.0.tar.gz 51765 BLAKE2B 6eae2d2ceeb2d1e870c1ca70db22708fc2e5d10aac6b1d1a44ab00f4b31e18f21fd324c7e8c95e28769f4642601b775dc687eb28b419c5698ed68e617d054599 SHA512 c9666ec65374181da762f460f0c394a5bb599f8a0666989fb2d53e5e8822f5ebdd28eae3098e115d5bbacf6d6e1dd33a9cfeb808d569e1a01025eefaff18c531
 DIST wsproto-1.0.0.tar.gz 53423 BLAKE2B b4cc8c1ef0ccf324821b893b57fc86ab744c639dd07604618485004ef56ca105b5515e1f34a08ccc93de941b1a93eb76ef0d1946f11e05f80d40b98bfe7e4c56 SHA512 36f8c4eebf84bfe869f7124330898d22416b423f47396f2e3f72069e14f1763514e1df700c3e8ee81467cf973197e10143e088978d0688930fa98518af8773fb
 EBUILD wsproto-0.15.0.ebuild 507 BLAKE2B a010d403ef7e818dc7577d45898ed3ccba0879182f935c1cab9f55549ad9721413c7828f769562bb0f52dbe5c74a6822980b3b5d329acf5e9859f8046f75d6f3 SHA512 5b57c2fe1a79e68e245e58415071cc73cad18a8124b72d58af71307d3633d7aa1fc90f7f0e0eb6076fc97307ee2b5e4f5e0c3a1b36d5b0a7d56fe5f5d8c871d9
-EBUILD wsproto-1.0.0.ebuild 535 BLAKE2B f7eaf6a387aff4e1fb7b7d2356f4d884c095f6f62387b10d61b918b4fb3a84baeb74833a2e91e18446b8850c36cca220e103b9a265c9b97f5d6f1e7b01d27cdb SHA512 85b7ac12cd58fef469490bb6cdeb32cd27e1d4808a0c7a78429788ebf93049c5a67f33be0b005465e80028fde3c177a95059316b482269cc62f7bfb1d47674b2
+EBUILD wsproto-1.0.0.ebuild 534 BLAKE2B e2f88d4f19f0ad67a46535b0401f81aeb46d918cceb53e8ac953d4f780610c2d2b9a50c3adaf28d0620cb4d90a54ef38dfd1f3a7df40b7ac0f25529cfdfda2d4 SHA512 1d1b677e34bfa746efd7eb18de8700662c8b43a18eafa380fb107e1cab81c517f8862b242906017a949e7e4f6de5d6c50d7f8110c7f1060a92326f0e3d616b50
 MISC metadata.xml 493 BLAKE2B 82485e0fa56d1f0e3e1bd3d6f54c929cacd58055d0993520134ed7bb74bfc34a990e65303b33ad2ec74c625f8c4d14f9f4e65a1c14e063995ce20a7bc6ae82b6 SHA512 83ef31eda65a98f50ee0e800cbb358b49f579ed893cd5cdcfb38a0da79b62a1359453127140dfce971b9dcbfc7da9efa83fc1426cfe40167f0ee987d0b9f9c56
diff --git a/dev-python/wsproto/wsproto-1.0.0.ebuild b/dev-python/wsproto/wsproto-1.0.0.ebuild
index d900b8df44b7..3de2d072536e 100644
--- a/dev-python/wsproto/wsproto-1.0.0.ebuild
+++ b/dev-python/wsproto/wsproto-1.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 sparc x86"
 
 RDEPEND=">=dev-python/h11-0.9[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/wurlitzer/Manifest b/dev-python/wurlitzer/Manifest
index a1010c7445a2..dcef709ac2a1 100644
--- a/dev-python/wurlitzer/Manifest
+++ b/dev-python/wurlitzer/Manifest
@@ -1,3 +1,5 @@
 DIST wurlitzer-2.1.0.tar.gz 8788 BLAKE2B 9a9e9696446fe31f0ff392eee011f341ee24c102e4e6bac195586b764386d1a835567560306cd3cb6e942b539a57ffa15aa9b3a20fac9224311ed7301130c84d SHA512 cc7291786b0505627129619094218f51c0679c0c3550645af3b94bdd3f10afd5fc8402d89dcb599d874a5c9e4f4966dc49a6f98a1ab0e2bb9adbc3f95d4fcc6a
+DIST wurlitzer-2.1.1.tar.gz 8674 BLAKE2B 08cad7fc0ba0852a5d54b9141b419ed822330b763bc6a906be0be0f7f6e4e0f8d6c83e62fc8a63f5179babbaa6fcd4d8fb1e4a876631e324bd53d21f4f116f68 SHA512 776dfbdbfbe6c87818ce527519730a20dbb43f140751195c67e73eb3fa5a9a9181b8b475336ee43a184dc5b712ddaccbfc74bb0279b47f2d3b3e4d7db4a471ea
 EBUILD wurlitzer-2.1.0.ebuild 611 BLAKE2B 99e65a65cde9d9f26afdaa36690dcf7895ded9391b962c9c03a78c0ac19417816cc40a28de31ed83ab6efbf4edbba77389dbdae43b76eb6227c3b9dd575941d4 SHA512 8af6ed6f1b10126e9b0fc851c452aa1dccd34d343017885405b65c0413b95598ec1978c93b90d3a32db11c78f7c690dd41e22986de70c61893142bfd293c4ffe
+EBUILD wurlitzer-2.1.1.ebuild 475 BLAKE2B 8aa6064965e52171223e2248a54081c39b84525b1f0a078be87cfb4932371dfb798e12e028b9b460c6c71a5756b78e0cc8d397e39b3115c974565a0b459d7372 SHA512 4ca1602d0618afb9087992b91b44ed0c4a5b019b8f10c84c71efc881c9df02a161854faa89c99ddfb2aa43b974d638a098a94e35c4037c1e3c55453c2831d1c3
 MISC metadata.xml 409 BLAKE2B f8a031f6909bc9a775230c8d4680f97d340eb8826b0076cd0e0b2045e14f48b0f0bce1d6404f98c591ac3a74bfc8bf50385ab9f6bb09ecdc79a37a61a097df3c SHA512 281d6539c4fb171a63d7ac0f815aed31212c66d14a1d29abeb08bb64a804a72bb7b27dfce608fcd5ec664772cc169dee61b79f26e1081c58a36ccbe5e7818ffe
diff --git a/dev-python/wurlitzer/wurlitzer-2.1.1.ebuild b/dev-python/wurlitzer/wurlitzer-2.1.1.ebuild
new file mode 100644
index 000000000000..7a64cf34ebad
--- /dev/null
+++ b/dev-python/wurlitzer/wurlitzer-2.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Capture C-level stdout/stderr in Python"
+HOMEPAGE="
+	https://github.com/minrk/wurlitzer/
+	https://pypi.org/project/wurlitzer/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest test.py
+}
diff --git a/dev-python/zeroconf/Manifest b/dev-python/zeroconf/Manifest
index f5639247be64..12569f0fa213 100644
--- a/dev-python/zeroconf/Manifest
+++ b/dev-python/zeroconf/Manifest
@@ -1,7 +1,9 @@
 DIST python-zeroconf-0.30.0.gh.tar.gz 64301 BLAKE2B ea0d5e36f3f012f217cbd4eeff0a9cd366496e2f64b06112ee3629ad016c8e28877f62358d5b5fd27387cfe474e488e99a9ad8ca1802f6d23612f99310243c57 SHA512 1f3165500a07525ef182bb60c1804fe2002a33a9f800470bdb32bdfd44a1b8f466a818a4390537674952159e5c0e257cf9e4ca570b1a9936e1cf8be294be6311
 DIST python-zeroconf-0.32.0.gh.tar.gz 115276 BLAKE2B 7084c02f989ebc6db6686b82ce3212158595b87e00567e4857e84790a30a2fa6f688288769d1eb118da485a6755da1ef404765070d26905d10ab45b1d95ca849 SHA512 6a612b39be85e673cffc560ea5bcc16facc5a16a370ff6edb1d4f7ff978a01d6ba249a9b313caca3b3ed0c6463a4914a98063eb89f28268cec1c9a2faa4db611
 DIST python-zeroconf-0.32.1.gh.tar.gz 116507 BLAKE2B 03de415620745b75cd43be74b724faf909aad9628175f18cf4b2c04245d02adbca984eaa861e807729f36caa3feecab913f2e4aafcdd9aac1af02de6eeefbb3d SHA512 cefcd1abdc3ca2b5ed796aee09e6826c0d0f54343bdefbf45c425d6e033542dc061c84fb4438ba53774d87c6516801c6e2196c1e6cfdd9dbf9187f5d8d4b1b11
+DIST python-zeroconf-0.33.0.gh.tar.gz 118002 BLAKE2B e5bdf8011777f46207c7f0aafbf4bfc34e704b59e01fcecd93e2ca05154f836bbe206688242eb37578a0e3b6d462de86944bdc81b96b0f3613eed21e9d0b6be0 SHA512 214fc1b25e1b900b6745f808144c0a1d94102dbc30f1e6ae49dfbfe2e75e9611e33d1341d192641be363662a0259aa340f52fe20fcf2bd5cf1611e823754186d
 EBUILD zeroconf-0.30.0.ebuild 1089 BLAKE2B c5aebaa0b0bc8ecf9a809bd2964da3c822c87e5ff35ade028ed69894a277a0cac2f20438a616695275f94c3e32d9ae20ed53451f76ae490588f9d41309d37860 SHA512 986a489207ea2c47bfd3cc02ff53a48e3f3925f6326f1c9911d2da4adc3619c53e671f25ad024168b048b93cef39b43d7f155c1baa379d791e1f06abb97c0aa0
 EBUILD zeroconf-0.32.0.ebuild 1165 BLAKE2B 310bf2df5ace5e3ece81e42e764d7cca4f3124608287e674a308acef4060592f93c2c871c8140aafbe52e4b79d6340053b704c91c5fe227b7cf204cf3e4ae2a2 SHA512 fd1e8e11d8381cdcb38bde8d0da2b6971c3812ec90c389750ec7d23166fbbc8a379f3739c0bc60ac3b810b64e97eab0da41080ed2bb5e27b892fe003c3cb5231
 EBUILD zeroconf-0.32.1.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
+EBUILD zeroconf-0.33.0.ebuild 1165 BLAKE2B 91a1aff140a3f8210fb902e61b5489312696a786b4b5995cb6c35e9fe2209a6f1128662967bf5da2fa6489cea7bba82f57e0412f6e22e5b70024c0440f63537f SHA512 b1b1908a3fc8b4279cd410f44c26075f80ec7953bc02d6dd4cd4e59c73d8ab00ca042012d08c3ff5a009ed27f6b2c0359acbbc9c525dbcda7744e478f4c89e9e
 MISC metadata.xml 412 BLAKE2B 70dd13f9065885850c7c24da7e1a0825a1537e452213847e00d8af9977818d6bfcfda9c8f9e0d0b2241550a95d186432e0072762a1b77e65b66441812b29651a SHA512 28bafc2919fa66c0f1e532798ac40c537a53c18e781590881116440886d09f5511425f2cddee912e3fc63ef92ee1a9c4da0f7f79cb44dab6e5f51d62202de844
diff --git a/dev-python/zeroconf/zeroconf-0.33.0.ebuild b/dev-python/zeroconf/zeroconf-0.33.0.ebuild
new file mode 100644
index 000000000000..0e1b2943b16e
--- /dev/null
+++ b/dev-python/zeroconf/zeroconf-0.33.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=python-zeroconf-${PV}
+DESCRIPTION="Pure Python Multicast DNS Service Discovery Library (Bonjour/Avahi compatible)"
+HOMEPAGE="
+	https://github.com/jstasiak/python-zeroconf/
+	https://pypi.org/project/zeroconf/"
+SRC_URI="
+	https://github.com/jstasiak/python-zeroconf/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND=">=dev-python/ifaddr-0.1.7[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local excludes=(
+		# network
+		tests/test_core.py::Framework::test_close_multiple_times
+		tests/test_core.py::Framework::test_launch_and_close
+		tests/test_core.py::Framework::test_launch_and_close_context_manager
+		tests/test_core.py::Framework::test_launch_and_close_v4_v6
+		tests/test_core.py::Framework::test_launch_and_close_v6_only
+		tests/services/test_types.py::ServiceTypesQuery::test_integration_with_listener_ipv6
+	)
+
+	epytest ${excludes[@]/#/--deselect }
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 02:11:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-24 02:11:45 +0100
commit	b49088575eb777ced2551f484da86317332d6087 (patch)
tree	bf9a151cf2d61956340d555659ffc098ee1da466 /dev-python
parent	514d1bbe260df2521fe60f1a3ec87cfcfde1a829 (diff)