gentoo resync : 22.05.2021

918 files changed, 8633 insertions, 6281 deletions

diff --git a/dev-python/Babel/Babel-2.9.1.ebuild b/dev-python/Babel/Babel-2.9.1.ebuild
index 7dd2c3755132..f970cd76b892 100644
--- a/dev-python/Babel/Babel-2.9.1.ebuild
+++ b/dev-python/Babel/Babel-2.9.1.ebuild
@@ -3,9 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/dev-python/Babel/Manifest b/dev-python/Babel/Manifest
index cc7fb647bef8..734addbb3551 100644
--- a/dev-python/Babel/Manifest
+++ b/dev-python/Babel/Manifest
@@ -1,3 +1,3 @@
 DIST Babel-2.9.1.tar.gz 8683505 BLAKE2B e4c6fe7284f03cd9e3e712156d87a520a437316955679f765aa68ca941bf668c544c96598486f3dad1bbb1f1d9a0719ccd527f23a2b1fb0274e453bdba557bd7 SHA512 89a2ce18301b522907bb66ec5453cbcd4c6b2d494d6928c9c62dc07bd8b6983982db571a85e251a1ea413b6f76fbd515f65c67c9bccf5441c62d351a57f2f4d0
-EBUILD Babel-2.9.1.ebuild 1043 BLAKE2B b781e3c932b3121e68021087f77f984867f0284999c05f19cee7779bfe4ff2a0b322b0697e696b68d7fcef61cab666e0b6e8ab73fddc6ce467b530d757775c6e SHA512 5630aa39aa17bbe79d63a5eaf2535f6caa6cbb095b232e7833a7dba97e30589d9f06bcd40034974ecaa5acdbdaeb21eb22baa9c6fa12747b07527b843f425755
+EBUILD Babel-2.9.1.ebuild 1011 BLAKE2B ed713601810f9ff6c5dad9578cded1185667fbb1afe4f8cffb1a2a9486a0f876b4b0589cea3a054f693da76d7380a2f245fd4180ee9f49fb23d361dd4c3851c1 SHA512 bca79e19871901ef9d595e101de8cc6419e2b94f8b3e2369aa9821cee8ab7cd3cd9a12d478b4412e777705c4eec41f679de08140b3994df03282a2ea43071b20
 MISC metadata.xml 839 BLAKE2B d9916ce88ce8436bb28d15300e78013e1c9e0f88f385a369c0ad6840f0fe81ad136052a3c257cef50a2fd86500bcde2b652ad0ed664f95d6affa4ccc8770445b SHA512 3688c1488c552b84c685d0aeb6251aea4f9d41be3db3aeb226291655107e1332df13445545b3742587e133de7468a40f22ca53fa67fd8d2e0db570069498654f
diff --git a/dev-python/Faker/Faker-8.1.4.ebuild b/dev-python/Faker/Faker-8.1.4.ebuild
new file mode 100644
index 000000000000..0b94b1e3251f
--- /dev/null
+++ b/dev-python/Faker/Faker-8.1.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Faker-8.2.0.ebuild b/dev-python/Faker/Faker-8.2.0.ebuild
new file mode 100644
index 000000000000..0b94b1e3251f
--- /dev/null
+++ b/dev-python/Faker/Faker-8.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="A Python package that generates fake data for you"
+HOMEPAGE="https://github.com/joke2k/faker"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
+	>=dev-python/text-unidecode-1.3[${PYTHON_USEDEP}]
+	!dev-ruby/faker"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/random2[${PYTHON_USEDEP}]
+		dev-python/validators[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index fb5307ec7082..dc394c1a75d3 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -4,10 +4,14 @@ DIST Faker-8.1.0.tar.gz 1143544 BLAKE2B aadb12b681f335ff850c20fd9f3202520f265aba
 DIST Faker-8.1.1.tar.gz 1143636 BLAKE2B 458bd0bc94dbf9dc60f5f1a74824390a3166dab7328274b087f299dfe637cc0ed728485ebc9418c2877bab7c05718ca1d9a592ed66a6bd4385585aabaeced8ea SHA512 705c890bea67176627eccc5a526cf20530485f1503813f09616d33a5407eefdea0416a6813b9efab719728b89d8be77cfef39d7297731ce3324852a9305717bb
 DIST Faker-8.1.2.tar.gz 1143566 BLAKE2B bfef745578e2f33aef4ae925f53867e0c6335d03e8d2950d035a17a4e2efde959f841f62097708173ef1acc22511fcb6e2f81666aa8ba6e27aa0e5f1f63714e1 SHA512 da989478b122a6e583fdc1de2481d9c81b5f8c5a9c7274fd49dd057e8f2e417f91f5dbc160b0fd5a4b9ec749d3605e54dc20fb603ff36ae75a9d4fad827e46f7
 DIST Faker-8.1.3.tar.gz 1137819 BLAKE2B 12ff3c4d19df2138c7089d70b311a0191345c09c66ec01fdc961af6d0af069509bee41908eab0ad7af7aefa08e6706f651ff537abc3378c1afa007120bade3db SHA512 bad2d477b4e5225d8e1d1436157cf951f259bbb6ac09d99ddcf38ab953862fdfe953742dbcca0bbb40376f386be41f3a788dd85d57b66f1e19c626e699d23620
+DIST Faker-8.1.4.tar.gz 1143731 BLAKE2B d87a0aed1393d3e837a8b434d126581be39f456f052a01b1e158355643c7ecb2de084da7f9589a5e7e5b07aacd0da8fa844295d1075c7a18e195a4436b04c689 SHA512 e04c4bd9c2692957922f6c5282ac158babd4bdfba2afd79fbd2e26349b401fb13754643e283ced4f9fc235c6255e73c73a8705b7b419f8dddc253b63a8f8f727
+DIST Faker-8.2.0.tar.gz 1144105 BLAKE2B cac0e083fb91c4eff99b4a1af0c4acf665d2c7dd45acb21926341deb5ac27c6837ed59f9f157f1c4f26810d9844f432dc857887c6d1dcb44b67cc7713fb4ed41 SHA512 4d7d98c2f12f60ea2c690cf4647968181efad4f9940c63ae11dee66e3f4fa45f893711ec6c832b55be9aeac618984206af1ac56daf9af3f2cf5f84ebe4271c2e
 EBUILD Faker-7.0.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-8.0.0.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-8.1.0.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-8.1.1.ebuild 710 BLAKE2B c91b7a47573bb0d362fa570c1b4242c8e31f19364ec453d4513dec64ed9258e1cfe0c96d9c875d91eaf559c6b6bbf4ac5c843bc914a531e42387511d5a05729a SHA512 b6b1e1196bc8457165d7612a8e8f67f881eebb24bf646cbfeb4bcce4bcb6e730bc8d0dfaa8f758812238bd7a7f92dbd1534f23d9bfa6a56203fa685a77f59608
 EBUILD Faker-8.1.2.ebuild 677 BLAKE2B 3083e57a83ba9f71bf5182aa05b74f5319a89506c0045f3a873d4e85a2cc0581abf7db8a0340746a78a1beafba8741bfbee402683dd16970f22bb474e516e198 SHA512 0cc1bb44b29ace95e929dc634280ffd95d4adae63094c920c1784f8637b464e02ceece2a9ebfef7e3dc0df2cbbb3d2bae006812ea56d60144efc45515856afb5
 EBUILD Faker-8.1.3.ebuild 677 BLAKE2B 3083e57a83ba9f71bf5182aa05b74f5319a89506c0045f3a873d4e85a2cc0581abf7db8a0340746a78a1beafba8741bfbee402683dd16970f22bb474e516e198 SHA512 0cc1bb44b29ace95e929dc634280ffd95d4adae63094c920c1784f8637b464e02ceece2a9ebfef7e3dc0df2cbbb3d2bae006812ea56d60144efc45515856afb5
+EBUILD Faker-8.1.4.ebuild 678 BLAKE2B 6316592c9dd59223e7b8057b468c285c1e28633d933b075d315bd10a19c2473bc82cdc71127d51e79a1187f4ab977e6b627c18ebf0d2cbdbf3b607f850b803e5 SHA512 cf2249a1a1db1396723a359ed6e72b5945cd88c3ed3fbe90a2ba5486fc1d608381a6a7c8cb5a77afd6bc4fe567f87d921c983579c43d96557aaab21ec5fa83d4
+EBUILD Faker-8.2.0.ebuild 678 BLAKE2B 6316592c9dd59223e7b8057b468c285c1e28633d933b075d315bd10a19c2473bc82cdc71127d51e79a1187f4ab977e6b627c18ebf0d2cbdbf3b607f850b803e5 SHA512 cf2249a1a1db1396723a359ed6e72b5945cd88c3ed3fbe90a2ba5486fc1d608381a6a7c8cb5a77afd6bc4fe567f87d921c983579c43d96557aaab21ec5fa83d4
 MISC metadata.xml 473 BLAKE2B 339c0263dce223547f0a5267983079a02f885abc66023578dd24a602c11dfda07faffb43b78f7805fcf31804de10568baeabff695bfbd64d85863a392056436a SHA512 414f9ce994c58c60b8f58e0531208d189698c932d18b25dae03dfb0eef181452532ff57ff9b40707acc896184742a36dc3793a92217257969bb92bb886e8b67d
diff --git a/dev-python/GitPython/GitPython-3.1.16.ebuild b/dev-python/GitPython/GitPython-3.1.16.ebuild
new file mode 100644
index 000000000000..5330b5031497
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.16.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+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 unittest
+
+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
+	TRAVIS=1 ./init-tests-after-clone.sh || die
+	cat test/fixtures/.gitconfig >> ~/.gitconfig || die
+	rm -r test/performance || die
+	# tests requiring network access
+	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
+	sed -i -e 's:test_leaking_password_in_clone_logs:_&:' test/test_repo.py || die
+	# TODO
+	sed -e 's:test_root_module:_&:' \
+		-e 's:test_base_rw:_&:' \
+		-i test/test_submodule.py || die
+	rm test/test_installation.py || die
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/GitPython/GitPython-3.1.17.ebuild b/dev-python/GitPython/GitPython-3.1.17.ebuild
new file mode 100644
index 000000000000..159956c1f92f
--- /dev/null
+++ b/dev-python/GitPython/GitPython-3.1.17.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+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 unittest
+
+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
+	rm -r test/performance || die
+	# tests requiring network access
+	sed -i -e 's:test_fetch_error:_&:' test/test_remote.py || die
+	sed -i -e 's:test_leaking_password_in_clone_logs:_&:' test/test_repo.py || die
+	# TODO
+	sed -e 's:test_root_module:_&:' \
+		-e 's:test_base_rw:_&:' \
+		-i test/test_submodule.py || die
+	rm test/test_installation.py || die
+
+	distutils-r1_src_test
+}
diff --git a/dev-python/GitPython/Manifest b/dev-python/GitPython/Manifest
index 1329b19048e1..7fdae5782556 100644
--- a/dev-python/GitPython/Manifest
+++ b/dev-python/GitPython/Manifest
@@ -2,8 +2,16 @@ DIST GitPython-3.1.14.gitbundle 4446003 BLAKE2B db7844045aed7c40a3f341706e017e87
 DIST GitPython-3.1.14.tar.gz 171534 BLAKE2B bcb2b7a497f6eabebe3187ad5104bede01c1a53aa52d15bdc7112198224c566cefc1ecae448dc47f6610e05cf871620a862ca6a3cca17bd8812720e64a9a1d86 SHA512 ee9015d82a53aba18dde8cede276d1d4410c7d9791c5b224c772114801c1e6dc4210c02399dc1248593a4e52d5f5e549cdbf927d6a7c7f9a5a9b0801f5d79675
 DIST GitPython-3.1.15.gitbundle 4811422 BLAKE2B 16399b302f7f3f36b315bcaa1535992a43b02fd888586d135824f8f4dc5ba611875d68e6d3102d71edc93848a91d3b244176d6b735ef30d65fdf64c28d325ef9 SHA512 13064036f20aaa58cf7784a3a61ed9c9e08414e9126332fc629e976889c87a2a70b1c9270774df676dcc08ded0ee3629112c60b88025536a9d13a04491b7b1e2
 DIST GitPython-3.1.15.tar.gz 175132 BLAKE2B 5a0cc8176257a5fec9afbf81351da191fc70ad5678d3ee89d36807cdf01a7f69216916723ac551bcc29fbc07a88a9a0357d12d41b4f43888917bd45dd766328e SHA512 bee1e12625995a0264694796ec6f346a5258ec13c24517939e65eaf9b679d82afb7848c02e6222389609bdf3a0dccbce4af1bd59a5d12f2851da47878a21b210
+DIST GitPython-3.1.16.gitbundle 4864707 BLAKE2B 9ff8a9b86da47c03de100a12c93cf97dfc0a30a8cd50231ec8f8f1363b5b38d945821ad099d89d1f39a6cc5b4af92069b20f448e9a3c81d203aa37b60907959a SHA512 69f1e7b413992161a90e5d34a877b5e942f85463f5bce453762f88fe96ffaa67ade418e43286b5aa6b1a0a8c009da49c5130b147eeba69063fb46f6a1783ce49
+DIST GitPython-3.1.16.tar.gz 178271 BLAKE2B 1093497756ccd4a6e5329ef8858a23ead6c7ad335e316ab6aef59ddefd226021d8001646d560158c9013abe954869c521270f753a7b2af3a1833dcc6bc40a8c4 SHA512 34e43d1b26721256c46d5c02f9c1b135180ac068c141b095bdb2b24828c8e1cf875216908bb3d4a2d1439c589825adebcba9cbabf8718e0e61625fc7f91727b6
+DIST GitPython-3.1.17.gitbundle 9249795 BLAKE2B 2c647de0e335d58d85eb5444e52f93adb13c5e2cf9a6272fa26a7fd68bc1f467ab2134ee88a4386af03b9816cd568b7366a202480ab0fd7540202b5757a7caf3 SHA512 576082e3f6f741183392e3fa51c3ed0f3c6de668562f07ead14500644afe01ea5d667a1c30f3a111326b3bcb320b42eadfeefb9eeccb699cb19661b330321a6b
+DIST GitPython-3.1.17.tar.gz 178303 BLAKE2B cc4a89c6d5ab8ae59439286ed4159aa4e6cc936e5ef011eecae2ba79010eb13a2e7e79635e1f89bfbc32dc58e4a6f11c9bb13f164d8111178b3302a2780d599c SHA512 c87d9de510f245a64d9df68f0e5c07744eef21669ef3beb81f2d0aefe4299f1cb4cfd2d37b87120b21781aea06fa9f8b2ccbfda1f2648c92cd9c73506b953ed4
 DIST gitdb-4.0.5-r1.gitbundle 1499071 BLAKE2B e429014def18d645b7117b27f592ead9c518076eeee2f6cc42c4a231f9a4f61c8275ccb1def5d042d44f34863528570163e9e154bb1536a0917b10f135e2462c SHA512 6fcf345af9f72afa39f4ba931bf474b2596678f1b790e3d4e1e3f7420baafbad04689bcdee9e99407f7c2b1c6f0d36fcf524b408ceb37b95dc4980e9423b1ad7
+DIST gitdb-4.0.7.gitbundle 1498536 BLAKE2B 1e0aff67259c04d2932dbdefb0ae07bd9fb51c5dcb99ee8431e78bf428095250ed45f5e12e2484b407bb4257050b0864e67096b3501d4829491cb7714a7b5ddf SHA512 f8b1b3de00f0597d65f528dd30495fd3dd9e1e4d494987899ef2064d23947ede799db391a59688dfa27e4fcdc9379b5352a378b39e6fb2421e6c850f81157bec
 DIST smmap-3.0.4.gitbundle 276552 BLAKE2B 2d17b927b2c644d2f1984168ee99fe5a9a58392401ac0b2894a1d5e5f9c292f32311a7a5d7669bd93c642ff791f4801d61ef3236c1dafa1434e99a17fd8751f6 SHA512 6deb282c6ece3b556c59c458b5242ff362b903441db63c005a0ab1ac055b3f974f9b34f30e0a4a41ef9246696e08b191254f72db61a8f24d4eb2f0e48a08937b
+DIST smmap-4.0.0.gitbundle 322820 BLAKE2B 20ac688cafa9ad036f3e21ac1bb9323ae55e618eb0806634fe4c885d2b12fe802779adcffb0fea3da9707e94109a168738d63abe990d1ce9b141c779aa6798d6 SHA512 03296099303eb38ac9ca46733255024355aed2e64a2f9409552ae34af76beb9685a6dd2458df986593fe426e428bc184617abe22c8b92ee01c8c7e1d98de8592
 EBUILD GitPython-3.1.14.ebuild 1690 BLAKE2B b7cb06228a18a6458c280ace5d2ccb81970600d4bc4dabf8729d83968d2a85adaa95e2b4a46c116299fd3f8a12d0aed34e465a5a86995a4e8101861390ac0abe SHA512 955e3ac9e207b59d86155794ea933c81bee0271e2a0e73b053b48be8b084d01a8dbb3cd00770507165d1ab66a01535d0dd5e05029f9fe3e047eff0e663f86a54
 EBUILD GitPython-3.1.15.ebuild 1727 BLAKE2B 48cdb88d4e5a285bec76d4351b65e68ac5705de3ee7d04c86bc75916f8e608dba680a82183cc95d14445104d14e5ee1dad590d3755efc45c0f6299e36a119408 SHA512 948297e14a8137b4522f07e2e638230c8a204695bf9ea9d41ee96a2180403c6cdf12fe9977ce2e71e2300a1b5fc48d0bd968bbe69af487c9da1ae6f5380cc6df
+EBUILD GitPython-3.1.16.ebuild 1870 BLAKE2B 24db0858a000d6350f80245d1bfdf300bc69222514e7e9afde142c347c9638531e56a5a81749d7e2fe1836123363f5dee31d479ac0f633bac474ad7fda56f986 SHA512 64e3e85937260345768f234a8f6ee8ddbf7236133e39d524afd6f17af802bccf2b9affb3709d7cb3f2c6c5060c5a29accfe3c29976ceb15d7673004028667938
+EBUILD GitPython-3.1.17.ebuild 1931 BLAKE2B 181671fc07f158ae02d7079ff0d738b3923e087e555c087faca0190c90af1bd393d73723138833a72af65db0472e607ed7b17f34b7371fde6958e637c52bab34 SHA512 c135f30c675d31ea2f3b0008d2a6606373f203e60e908cafc61ddadf36ed39ae0264ca2665e37c0f86251218e382d50d8c83d650f8014df9ec31e4ed5482048c
 MISC metadata.xml 406 BLAKE2B ae639878f2162f9c2e313d10ba8122ede602251b28c0e82f36f73c92822d2626601bc6ce575cbd4bd5087acaea1a048079901ef67d787849c2061c68b2ad77a9 SHA512 2942febc2c1edbd075b64bdb5b6cffc2ecfa07231e8d210de4dbbaef3dd64a4df876dfddd8f1227ff2b1b9264d8746d951dc9e08db64bebddf0b0e1dea2a641a
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 6ce17042c253..ea6021198e08 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/PyRSS2Gen/Manifest b/dev-python/PyRSS2Gen/Manifest
index 06e90184d186..19d61fb67bb9 100644
--- a/dev-python/PyRSS2Gen/Manifest
+++ b/dev-python/PyRSS2Gen/Manifest
@@ -1,3 +1,3 @@
 DIST PyRSS2Gen-1.1.tar.gz 9149 BLAKE2B 1f388e8616c79d8b5436f69191d479c529e1348308d69782a833bec714da6289fc459ea2b554a1e660027a25d0581c441a0e75a623add3c42c8c33c5cc8518e1 SHA512 2240686914c87984626eb739676927fcd53488158bdebf589e07e8a778e6d24305964e032581c61836f0fabc1264e42d05c88eac8f4c5f6536c31c775434ce02
-EBUILD PyRSS2Gen-1.1-r1.ebuild 452 BLAKE2B bd513c074b941a5c137086ac4fa70be29725429a432ab8ef754fa944749a5f2cf614a2c33c5a5ca320f1736a9697c08f73ec5ac913fb21601f6301c07ccecf12 SHA512 133666c120e3d8ad09d34ade05cfb67cc9ab429fa114ef58d066a18db2493026c947dc45601bd3ecbc9a5b4ed052c25340d9c1bf6e68cf3ae5aff576b8e80f8e
+EBUILD PyRSS2Gen-1.1-r1.ebuild 454 BLAKE2B 2b23a771d137360e1df8f286a220e9679d0bc1910a55d4ae553654b8212c235db3c05c33c8e717ee2e0dc8c395717d52724771fb4181636c7dbf7b7e50a42506 SHA512 cfe41ef785937178b86c1100879dba65f39b57cf37a99a94094bd6df157ac0ef04cef96899d5ae3c4cb52f9a23298db3efea5c373af8ec7a47e8c6b34b4d2988
 MISC metadata.xml 323 BLAKE2B e5ff81e2850b8a51924efc6704f4524cf1ba823d7f022e07f6e1c2a4300479549b61c16ff402e1e396810c3ecda5218e76115f48afc545b076d9a22b08dcca56 SHA512 bc5754e1bb54ab3adc6b0b474eda4d45dd36d35ec7d30278d665c178cfe3436918cf21f39056e5770a9ca56f0aa62930c3ed5211c583ebae8fabe20de64bea33
diff --git a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
index d8ace641b9e6..8651b7347166 100644
--- a/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
+++ b/dev-python/PyRSS2Gen/PyRSS2Gen-1.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 DISTUTILS_USE_SETUPTOOLS=no
 
diff --git a/dev-python/PySocks/Manifest b/dev-python/PySocks/Manifest
index fe6ec54aa4bf..d4e4ffd092c7 100644
--- a/dev-python/PySocks/Manifest
+++ b/dev-python/PySocks/Manifest
@@ -1,4 +1,4 @@
 AUX PySocks-1.7.1-test_server.patch 1382 BLAKE2B 82bbc57a47b4cc0c6ee3177d997a25ba905b0c43eb5cc9b444d31080d20a365a85f1ab1c954d3edf0b9ef54a70985eb3956dd1533c09b46766d407edce085c07 SHA512 810bcbffd4d61db66459a04f422e6789a89f46d1026afd55c2bb06b13302e087613fc643b2f53df5f17992432df82707e776c60d8d0d69a6eebab862351d9ece
 DIST PySocks-1.7.1.tar.gz 284429 BLAKE2B 8015e8a0a7ebfbb09ec542393aeb633a769701445c07f24bb9e62b07803d7bb605f22e79ad9ec83e47aa7fe843a1a057073d97e25482e742f42e18b2c7a2f1b3 SHA512 cef4a5ce8c67fb485644696a23bf68a721db47f3211212de2d4431eaf9ebd26077dd5a06f6dfa7fde2dcb9d7c1ed551facd014e999929cb4d7b504972c464016
-EBUILD PySocks-1.7.1-r1.ebuild 1252 BLAKE2B 9af27e5811315dab11892bb2dfbaf82243481e3276bb85f89b10a00b10c807b8982d3130d0cbd070b11d0281927e5aade8f76f752887882eb3d84d5fa2dcb9eb SHA512 a5cb1399aa172c777744733d63de9372eb0aa27437cd1ab55078b3f53d81a57a2b68df8bcde18c9f28c4142ad487009f6d3c762dc47e1da6e1f066cad06dcd7a
+EBUILD PySocks-1.7.1-r1.ebuild 1252 BLAKE2B 59697c187c92fc719bfba02259b1ce9ba6b6e413e2a076ab75bd34abfdc5756843a2bacc3022594a29fd0d1deff681d3f1adcd5d10b9e7aa165a8675b1e3f618 SHA512 8557070f8a71b56cd159b5fb19de16e51b100e342ddcf33f53734c5ed6dc2fa6d0f518166a8e970f5ab418f6a419a347bf723a8bfe4c2be226faf69403da2a64
 MISC metadata.xml 524 BLAKE2B 10bf143a946a442804d9c53707b5f38e541f3ee95c21647df87d1c492ef230a455a6b895ee1fdc57cf2e7e3fa59c0dcdab55ed9d4583935def2aedb95cb0c80f SHA512 d1132eca2cb2856c99e00e5de8aea5fd554419499c2c867df513b832ed4d2326762ec460ea648a7a1fc8196f38d1c85a18a0eac2d1bed2b4a6e5c9e007268d6b
diff --git a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
index c60ca7082284..a3486b012e0d 100644
--- a/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
+++ b/dev-python/PySocks/PySocks-1.7.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/QtPy/Manifest b/dev-python/QtPy/Manifest
index 9b836307e16c..2dbd1edd9b11 100644
--- a/dev-python/QtPy/Manifest
+++ b/dev-python/QtPy/Manifest
@@ -1,4 +1,4 @@
 DIST QtPy-1.9.0.tar.gz 35522 BLAKE2B 05b700c1f804cc535c3065c8f819d1d7fb0e02d43f199082d2e0d2c575ff8dbfdbf0053ddb3b155108cf55350ff4daf75166ab39a60374a35a86a1707724a4a1 SHA512 2492c531f0df3afc9e0f8875a2b2e39cc8b09542fb9f251900b8596c0db7767390bb85365cc39efd6cd37ae852a00655354e6f9f3d795023e4fd86dbf8bd5fa7
-EBUILD QtPy-1.9.0-r2.ebuild 956 BLAKE2B 3a5efbef2e6ec3f5c2c175940f9f4825d578c57a7fa701db6ea9e8ca0441fd3e460f258e585b1b96ef28a482dfa25c31d6c9d13dfccda5c381743fb3f34d244c SHA512 b190a298d525dd9d02a3f110ef62bc40369e5d23a5c58facab74140da08ab1651f0a74a7c9e183550dba049df051aa4e70da6f049a1a1533b30bb2f06e13a02f
-EBUILD QtPy-1.9.0-r3.ebuild 4249 BLAKE2B 8d9f5f2649006c32b94f06dba70da730cf134e9a0f6ba7c69c41c86878159b60f88a5fd5c8f4b70db92215a2285ca74cd4758c2efa6c22e2bce27bc60156704f SHA512 6e4e0940b2033d8f7ce61ed34977cb5519e035d6643a86d7dae43e684503a840f6e9055d8c3151c4574d4de142b679a6a71522ff7df2e1091fc9f848ab30cb59
-MISC metadata.xml 2880 BLAKE2B 450b5c73c1124218ba688cc9a010657d03fe32398150334884574404c1a5767223f7a9481ee42e545e032d7ad2dec8a0537b7bf3251e0e14a6696f1d0c73e0d1 SHA512 175e7a513706bf9c50f04b8795f19df660ef0e228a6d65e7c4c998c07ac181da204aedbc9905deb63d74a65742cc80d7935bcc0d694fa8bff5e386b79bb5ea26
+EBUILD QtPy-1.9.0-r2.ebuild 1843 BLAKE2B 59c654a4b01a6ac224f52dfbaf76b9e8fd4d700f86cf19e9e550fbbbe9d902eab2df7c635c14ba9ba4dca765f8f5eca2ca1b484795357df063484decb8c65f6b SHA512 c07139bee6407ca790c96e75eef4697e4e4463f32627438b8c4027274eefcf9dc7718ab03725184885d9ec020db966ce253a4733f7009e79947dff725643f04b
+EBUILD QtPy-1.9.0-r4.ebuild 4991 BLAKE2B 4ba264b82b412c0e6d8be3695beb0289cc459ce090cbe14dc8a512deba70bed9a740e9536ce92378c7bc3b82f3396cf1fdcd3b3518801d901ec616b064771e75 SHA512 9d6e0404eee155d8dc0f955a3f0a3db83bc550f67492c273241dfaf76ff6b055a926edbea8adfa5db20f9c8438d6f20a3317252f106ad0ca7fa3193d64fc4027
+MISC metadata.xml 2803 BLAKE2B 98036d01bac06a15e8b4cfec09151f687cc1c9579b29171bca1645dc18e1c4bc3ffb012899e2b3aad859332d39758232beb705e9949f9680157960d32828658d SHA512 0faeb7d93657eacaaf24b0575770cf409531e914b8355fc0d6dbba0d968905f78146ca0695d9a17651f4c9d2ae98d183c29c8eb9ee1ee7bdf9e100bd29d5fb9a
diff --git a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
index 32222ef6ef48..8e1f50a8e472 100644
--- a/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
+++ b/dev-python/QtPy/QtPy-1.9.0-r2.ebuild
@@ -1,13 +1,13 @@
-# 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} )
 
-inherit distutils-r1
+inherit distutils-r1 virtualx
 
-DESCRIPTION="Abstraction layer for PyQt5/PySide"
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
 HOMEPAGE="https://github.com/spyder-ide/qtpy"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
@@ -16,11 +16,25 @@ SLOT="0"
 KEYWORDS="amd64 arm64 x86"
 IUSE="designer gui opengl printsupport svg testlib webengine"
 
+# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
+# to work.  The package only checks whether PyQt5/pyside2 is installed, it does
+# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
 RDEPEND="
 	dev-python/PyQt5[${PYTHON_USEDEP},designer?,opengl?,printsupport?,svg?]
 	gui? ( dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets] )
 	testlib? ( dev-python/PyQt5[${PYTHON_USEDEP},testlib] )
 	webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )"
+# The QtPy testsuite skips tests for bindings that are
+# not installed, so here we ensure that everything
+# is available and all tests are run.
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP},bluetooth,dbus,declarative,designer,gui,help,location,multimedia,network,networkauth,opengl,positioning,printsupport,sensors,serialport,sql,ssl,svg,testlib,webchannel,webkit,websockets,widgets,x11extras,xml(+),xmlpatterns]
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
 
 src_prepare() {
 	default
@@ -29,3 +43,8 @@ src_prepare() {
 	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
 	sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
 }
+
+python_test() {
+	local -x QT_API="pyqt5"
+	virtx pytest -vv
+}
diff --git a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild b/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
deleted file mode 100644
index e707c30eebb6..000000000000
--- a/dev-python/QtPy/QtPy-1.9.0-r3.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
-HOMEPAGE="https://github.com/spyder-ide/qtpy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-IUSE="
-	declarative designer gui help location multimedia network
-	opengl positioning printsupport qml quick sensors serialport
-	sql svg test testlib webchannel webengine websockets
-	widgets x11extras xml xmlpatterns
-"
-
-# Webengine is a special case, because PyQt5 provides this in a
-# separate package , while PySide2 ships it in the same package
-#
-# declarative/qml/quick is a special case, because PyQt5 bundles
-# the bindings for qml and quick in one flag: declarative,
-# PySide2 does not.
-#
-# The PyQt5 ebuild currently enables xml support unconditionally,
-# the flag is added anyway with a (+) to make it future proof
-# if the ebuild were to change this behaviour in the future.
-#
-# The PySide2 ebuild currently enables opengl and serialport
-# support unconditionally, the flag is added anyway with a (+)
-# to make it future proof if the ebuild were to change this
-# behaviour in the future.
-#
-RDEPEND="
-	app-eselect/eselect-QtPy
-	|| (
-		dev-python/PyQt5[${PYTHON_USEDEP},designer?,gui?,help?,location?,multimedia?,network?,opengl?,positioning?,printsupport?,sensors?,serialport?,sql?,svg?,testlib?,webchannel?,websockets?,widgets?,x11extras?,xml(+)?,xmlpatterns?]
-		dev-python/pyside2[${PYTHON_USEDEP},designer?,gui?,help?,location?,multimedia?,network?,opengl(+)?,positioning?,printsupport?,sensors?,serialport(+)?,sql?,svg?,testlib?,webchannel?,websockets?,widgets?,x11extras?,xml?,xmlpatterns?]
-	)
-
-	webengine? ( || (
-		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-		dev-python/pyside2[${PYTHON_USEDEP},webengine]
-	) )
-
-	qml? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
-		dev-python/pyside2[${PYTHON_USEDEP},qml]
-	) )
-
-	quick? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
-		dev-python/pyside2[${PYTHON_USEDEP},quick]
-	) )
-
-	declarative? ( || (
-		dev-python/PyQt5[${PYTHON_USEDEP},declarative]
-		dev-python/pyside2[${PYTHON_USEDEP},qml,quick]
-	) )
-"
-
-# These bindings are currently only provided by PyQt5 or PySide2
-# but not by both. Just DEPEND on these directly if they are
-# required.
-# Please check periodically if this list is still up to date
-#
-# 	bluetooth? ( dev-python/PyQt5[${PYTHON_USEDEP},bluetooth] )
-# 	dbus? ( dev-python/PyQt5[${PYTHON_USEDEP},dbus] )
-# 	examples? ( dev-python/PyQt5[${PYTHON_USEDEP},examples] )
-# 	networkauth? ( dev-python/PyQt5[${PYTHON_USEDEP},networkauth] )
-# 	ssl? ( dev-python/PyQt5[${PYTHON_USEDEP},ssl] )
-# 	webkit? ( dev-python/PyQt5[${PYTHON_USEDEP},webkit] )
-#
-# 	3d? ( dev-python/pyside2[${PYTHON_USEDEP},3d] )
-# 	charts? ( dev-python/pyside2[${PYTHON_USEDEP},charts] )
-# 	concurrent? ( dev-python/pyside2[${PYTHON_USEDEP},concurrent] )
-# 	datavis? ( dev-python/pyside2[${PYTHON_USEDEP},datavis] )
-# 	scxml? ( dev-python/pyside2[${PYTHON_USEDEP},scxml] )
-# 	script? ( dev-python/pyside2[${PYTHON_USEDEP},script] )
-# 	scripttools? ( dev-python/pyside2[${PYTHON_USEDEP},scripttools] )
-# 	speech? ( dev-python/pyside2[${PYTHON_USEDEP},speech] )
-
-# The QtPy testsuite skips tests for bindings that are
-# not installed, so here we ensure that everything
-# is available and all tests are run.
-BDEPEND="test? (
-	dev-python/PyQt5[${PYTHON_USEDEP},bluetooth,dbus,declarative,designer,gui,help,location,multimedia,network,networkauth,opengl,positioning,printsupport,sensors,serialport,sql,ssl,svg,testlib,webchannel,webkit,websockets,widgets,x11extras,xml(+),xmlpatterns]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-	dev-python/pyside2[${PYTHON_USEDEP},3d,charts,concurrent,datavis,designer,gui,help,location,multimedia,network,opengl(+),positioning,printsupport,qml,quick,script,scripttools,scxml,sensors,serialport(+),speech,sql,svg,testlib,webchannel,webengine,websockets,widgets,x11extras,xml,xmlpatterns]
-)"
-
-distutils_enable_tests pytest
-
-python_test() {
-	export QT_API="pyqt5"
-	virtx pytest -vv
-	export QT_API="pyside2"
-	virtx pytest -vv
-	unset QT_API
-}
diff --git a/dev-python/QtPy/QtPy-1.9.0-r4.ebuild b/dev-python/QtPy/QtPy-1.9.0-r4.ebuild
new file mode 100644
index 000000000000..0aa58b9aaab0
--- /dev/null
+++ b/dev-python/QtPy/QtPy-1.9.0-r4.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..8} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Abstraction layer on top of PyQt5 and PySide2 and additional custom QWidgets"
+HOMEPAGE="https://github.com/spyder-ide/qtpy/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+_IUSE_QT_MODULES="
+	declarative designer gui help location multimedia network opengl
+	positioning printsupport sensors serialport sql svg testlib webchannel
+	webengine websockets widgets x11extras xml xmlpatterns
+"
+IUSE="+pyqt5 pyside2 ${_IUSE_QT_MODULES}"
+unset _IUSE_QT_MODULES
+
+REQUIRED_USE="
+	|| ( pyqt5 pyside2 )
+	test? ( pyqt5 pyside2 )
+"
+
+# These flags are currently *not* common to both the PySide2 and PyQt5 ebuild
+# Disable them for now, please check periodically if this is still up to date.
+# 	bluetooth? ( pyqt5 )
+# 	dbus? ( pyqt5 )
+# 	networkauth? ( pyqt5 )
+# 	webkit? ( pyqt5 )
+#
+# 	3d? ( pyside2 )
+# 	charts? ( pyside2 )
+# 	concurrent? ( pyside2 )
+# 	datavis? ( pyside2 )
+# 	scxml? ( pyside2 )
+# 	script? ( pyside2 )
+# 	scripttools? ( pyside2 )
+# 	speech? ( pyside2 )
+
+# WARNING: the obvious solution of using || for PyQt5/pyside2 is not going
+# to work.  The package only checks whether PyQt5/pyside2 is installed, it does
+# not verify whether they have the necessary modules (i.e. satisfy the USE dep).
+#
+# Webengine is a special case, because PyQt5 provides this in a separate package
+# while PySide2 ships it in the same package.
+#
+# declarative/qml/quick is a special case, because PyQt5 bundles the bindings
+# for qml and quick in one flag: declarative PySide2 does not.
+#
+# The PyQt5 ebuild currently enables xml support unconditionally, the flag is
+# added anyway with a (+) to make it future proof if the ebuild were to change
+# this behaviour in the future.
+#
+# The PySide2 ebuild currently enables opengl and serialport support
+# unconditionally, the flag is added anyway with a (+) to make it future proof
+# if the ebuild were to change this behaviour in the future.
+RDEPEND="
+	pyqt5? (
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[declarative?,designer?,gui?,help?,location?]
+		dev-python/PyQt5[multimedia?,network?,opengl?,positioning?]
+		dev-python/PyQt5[printsupport?,sensors?,serialport?,sql?,svg?]
+		dev-python/PyQt5[testlib?,webchannel?,websockets?,widgets?]
+		dev-python/PyQt5[x11extras?,xml(+)?,xmlpatterns?]
+		webengine? ( dev-python/PyQtWebEngine[${PYTHON_USEDEP}] )
+	)
+	pyside2? (
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/pyside2[designer?,gui?,help?,location?,multimedia?]
+		dev-python/pyside2[network?,opengl(+)?,positioning?,printsupport?]
+		dev-python/pyside2[sensors?,serialport(+)?,sql?,svg?,testlib?]
+		dev-python/pyside2[webchannel?,webengine?,websockets?,widgets?]
+		dev-python/pyside2[x11extras?,xml?,xmlpatterns?]
+		declarative? ( dev-python/pyside2[qml,quick] )
+	)
+"
+
+# The QtPy testsuite skips tests for bindings that are not installed, so here we
+# ensure that everything is available and all tests are run. Note that not
+# all flags are available in PyQt5/PySide2, so some tests are still skipped.
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/PyQt5[${PYTHON_USEDEP}]
+		dev-python/PyQt5[bluetooth,dbus,declarative,designer,gui,help,location]
+		dev-python/PyQt5[multimedia,network,networkauth,opengl,positioning]
+		dev-python/PyQt5[printsupport,sensors,serialport,sql,svg,testlib]
+		dev-python/PyQt5[webchannel,websockets,widgets,x11extras,xml(+)]
+		dev-python/PyQt5[xmlpatterns]
+		dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+		dev-python/pyside2[${PYTHON_USEDEP}]
+		dev-python/pyside2[3d,charts,concurrent,datavis,designer,gui,help]
+		dev-python/pyside2[location,multimedia,network,opengl(+),positioning]
+		dev-python/pyside2[printsupport,qml,quick,script,scripttools,scxml]
+		dev-python/pyside2[sensors,serialport(+),speech,sql,svg,testlib]
+		dev-python/pyside2[webchannel,webengine,websockets,widgets,x11extras]
+		dev-python/pyside2[xml,xmlpatterns]
+)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	default
+	if ! use pyqt5; then
+		sed -i -e "s/from PyQt5.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+	if ! use pyside2; then
+		sed -i -e "s/from PySide2 import/raise ImportError #/" qtpy/__init__.py || die
+	fi
+
+	# Disable outdated PyQt4 and PySide
+	sed -i -e "s/from PyQt4.Qt import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PyQt4.QtCore import/raise ImportError #/" qtpy/__init__.py || die
+	sed -i -e "s/from PySide import/raise ImportError #/" qtpy/__init__.py || die
+}
+
+src_test() {
+	virtx python_foreach_impl python_test
+}
+
+python_test() {
+	local -x QT_API
+	for QT_API in pyqt5 pyside2; do
+		epytest
+	done
+}
+
+pkg_postinst() {
+	if use pyqt5 && use pyside2; then
+		ewarn "You have enabled both PyQt5 and PySide2, note that QtPy will default"
+		ewarn "to PyQt5 unless the QT_API environment variable overrides this."
+	fi
+}
diff --git a/dev-python/QtPy/metadata.xml b/dev-python/QtPy/metadata.xml
index 582ff9f96b87..605a0838da71 100644
--- a/dev-python/QtPy/metadata.xml
+++ b/dev-python/QtPy/metadata.xml
@@ -5,20 +5,18 @@
 		<email>python@gentoo.org</email>
 		<name>Gentoo Python Project</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		QtPy is a small abstraction layer that lets you write applications using a single API call to either PyQt or PySide.
 		It provides support for PyQt5, PyQt4, PySide2 and PySide using the Qt5 layout (where the QtGui module has been split into QtGui and QtWidgets).
 		Basically, you can write your code as if you were using PySide2 but import Qt modules from qtpy instead of PySide2 (or PyQt5)
 	</longdescription>
 	<use>
+		<flag name="pyqt5">Use <pkg>dev-python/PyQt5</pkg> as Qt for Python implementation</flag>
+		<flag name="pyside2">Use <pkg>dev-python/pyside2</pkg> as Qt for Python implementation</flag>
 		<flag name="declarative">Pull in bindings for the QtQml/QtQuick modules and enable the qmlscene plugin</flag>
 		<flag name="designer">Pull in bindings for the QtDesigner module and enable the designer plugin</flag>
 		<flag name="gui">Pull in bindings for the QtGui module</flag>
@@ -29,8 +27,6 @@
 		<flag name="opengl">Pull in bindings for the QtOpenGL module</flag>
 		<flag name="positioning">Pull in bindings for the QtPositioning module</flag>
 		<flag name="printsupport">Pull in bindings for the QtPrintSupport module</flag>
-		<flag name="qml">Pull in QtQml module</flag>
-		<flag name="quick">Pull in QtQuick and QtQuickWidgets modules</flag>
 		<flag name="sensors">Pull in bindings for the QtSensors module</flag>
 		<flag name="serialport">Pull in bindings for the QtSerialPort module</flag>
 		<flag name="sql">Pull in bindings for the QtSql module</flag>
diff --git a/dev-python/abydos/Manifest b/dev-python/abydos/Manifest
index bcb94e240fab..d7bc1d4be5e9 100644
--- a/dev-python/abydos/Manifest
+++ b/dev-python/abydos/Manifest
@@ -1,4 +1,4 @@
 DIST abydos-0.5.0.tar.gz 21321759 BLAKE2B 1f14675f42e849e5e1563dd858bfb2bf040e25b0f90cb3da9986492378892bedd0f23eea990cd65d804aececb350b0e90fb27921382a8df8b91e55d7f820c27e SHA512 28aeea4ba16ea88b077e8b9902f5d8b3a650eeced489687daf9af0e4aa437eaee6c8eeb0747dd5a8f95291594064a1221cc1da2dfa989978bcc870045fee3531
 EBUILD abydos-0.5.0-r1.ebuild 899 BLAKE2B 494aec3bb5100a1a9d678e09058dc657598ddd2bfd3240480abfef27b18103ac21bc075f327e55fff9a0b4411aa659519508c729f6b225a1baade8b7a5420007 SHA512 c44d3433e892d0a97bd2c2989f046685fffa43e8bd66df567ec2274bfbc70c31efca7ff386165afbe68f5a0d5553700e00e7bc4e9e805b9a9a68887a0b233611
 EBUILD abydos-0.5.0.ebuild 895 BLAKE2B d91244a3a70f5027f1b7e0baa782a56224c4a64292154ba9befd496b20bce21c2a12dcf326cc162ec6c88231f3046effc0cb493bc2ca2377b81c0934ffa0d739 SHA512 295255138b85134d2c3fc7f1ca35f4031e6b2919e05331a13a36f35502cb97bf8d0e47f7a478996cd0ef080ad21c7f9410563b63f4c2756234c06fcc66a55aef
-MISC metadata.xml 553 BLAKE2B 93221d7e9495adb27d2632793d456d5e6617ef1d58b50f94d67d9d6f6634a267c43759e3f5dcb796546521d351a2c5d00a4eb7cb89eff83a1069e84119866bba SHA512 ef17084694a95103545be71478cb523cfe23afc03ed4dff9b5c01de49bfdbc9828a18f81a58980671c3bd016944b65781b15dc7e2d0edf6549261bc56d1770c4
+MISC metadata.xml 406 BLAKE2B 4e8c6843dd9cc2c15bf0d33244ee57240db247ecdf6b38e33d621598b64eb59c6a69e7150b3c91ed77bda70b48e6e745dbb137cdac38c468f76b82fe881b4f8e SHA512 026a691d5843d311f39be399b6729c097862a1714ac551cc1d8b4102011a6cc15001a4aa3f58905dced7783d27479ee1012231bafa3342ea6d051454608388c1
diff --git a/dev-python/abydos/metadata.xml b/dev-python/abydos/metadata.xml
index eadfd95b06c5..289752035b81 100644
--- a/dev-python/abydos/metadata.xml
+++ b/dev-python/abydos/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">abydos</remote-id>
diff --git a/dev-python/aesara/Manifest b/dev-python/aesara/Manifest
index 23aac872abee..a1c7b30d363f 100644
--- a/dev-python/aesara/Manifest
+++ b/dev-python/aesara/Manifest
@@ -1,5 +1,7 @@
 DIST aesara-rel-2.0.6.tar.gz 8020607 BLAKE2B 0a51936fe089061038e9dd60e210d7a0820438a03508fb1aa7f843c9c3dbba86295a7e0471f97084e7ba87e2a771bb640a6f87ce974b219767d2344e2a94b190 SHA512 1370cb4408b694d5b97610229951cfa9e74f42c10347eff375d5aba0aaa60a7c88f5db2a7c101ec6916a40d6cf12b5646e7422dd5e9617f414619d79c55f02fb
 DIST aesara-rel-2.0.7.tar.gz 8020485 BLAKE2B 91c02c5d6826694b08bf3276f9c08e98f5a68a34b7d4a4f4813b44794f625cb0b67677fc8eff8496f19f84b462b30d740645b19b3031640a550b8b07288980ef SHA512 63f636d7293127b21196072fd05edf25f2d03702d5568308ddb35c2d425100aa4087eb282f30a123124e43bedbc82d84209293c2d2de6f598c7b3b6704fc38aa
+DIST aesara-rel-2.0.8.tar.gz 8043104 BLAKE2B ceb4f34b2017516d8d75855eb17fbce8a28ef35d2dfa22c2221f95e910b69126f6d2070654377bebaa8c149bcb13ed1e37c0fd145cad96ddf6875642a6882b2f SHA512 1bcc149e3c55eeaa4522afd48df63602b32b1702402cd269b30c85ec6abf0d4b446a3593b8247c393c2ad9f74176ebe94e7c86a94ee58b91fbdbef69dbc9acd6
 EBUILD aesara-2.0.6.ebuild 1904 BLAKE2B 5826aa94aa158fde2fa8690f9a28ae1f676fc081d92bcf4134e566678292eddc6d40fa6694cff63be219dc7476be67b20cf42d2f483e561b5ca39b8342de7067 SHA512 9885c85d1756870c19c22e88ff0c1628c7e6773561bedeef2aa2fcce42055e7d5a8031bb7b2fd455fdc4352a6d1663526caab324f63a3a7b9d505790b60c0971
 EBUILD aesara-2.0.7.ebuild 1861 BLAKE2B 5ed93e3b26eedd7756e2003f58269272e8a27856b0e15da6559fe9691ae91032bb6b83236d826180423ef2a3608781c83b490109cf0a06e450a62460be353501 SHA512 6af662894aa6a79a5a553e0b28cd43aa6c6f64fac89f88d87e15a3f9e3db6fcf7d6dffd729616e89b26183198b2d29bcb6df0b17181617119991d67661100abe
+EBUILD aesara-2.0.8.ebuild 1884 BLAKE2B 7c686fdcf57e7a261037c52acf864b43f5fac125a508f338cd7a2f8fbc58023219951391259b347ae842b6f9091da8e5279975f1ee2008fc5004bbb7030fc687 SHA512 70ac7c0eb1daec9dcc02c679e33ab9bac92d7a65750f6996f4357a6553f853898ead2fc7b2e6923fccdf61c6e377e163f8c4fc808f909bf513666ee80dbfcb83
 MISC metadata.xml 402 BLAKE2B a82c76dff3cfcbf83936f2815e15d051d4ab26a739a970848573f5856610e763d9f346e2d265b2d38e53460df6bcba879ce50d6e60bffea77af6052d03d8dc5d SHA512 f3c86b74cbaaadb63bb98ffc2a3e6e1d121c141b33edd574cfdee3652a43e9f8b05e3276050bd407f00ddbec1d6fb6eda87983520075ad368ab8792e0ae17143
diff --git a/dev-python/aesara/aesara-2.0.8.ebuild b/dev-python/aesara/aesara-2.0.8.ebuild
new file mode 100644
index 000000000000..a930578b0362
--- /dev/null
+++ b/dev-python/aesara/aesara-2.0.8.ebuild
@@ -0,0 +1,65 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1 optfeature
+
+MY_P=aesara-rel-${PV}
+DESCRIPTION="Library for operating on mathematical expressions with multi-dimensional arrays"
+HOMEPAGE="https://github.com/pymc-devs/aesara"
+SRC_URI="https://github.com/pymc-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[${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
+	)
+
+	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/aiodns/Manifest b/dev-python/aiodns/Manifest
index bd55864bd561..4548d6fa86a3 100644
--- a/dev-python/aiodns/Manifest
+++ b/dev-python/aiodns/Manifest
@@ -1,3 +1,5 @@
 DIST aiodns-2.0.0.tar.gz 5948 BLAKE2B 70944ffbfa3fa1c591c5aab6ce2c4c59564a7665fd2eda1b544616a4481e58464f918081dfb21f74db08ebe4c7e43eebd17e0dc314cf79423835a182a257cd11 SHA512 d80b8f7641234c4d367e4554b10c5a66265e75ee82c58adf2a36f9e369bb1dbf4341dd6459f10540b771de3f102454511ca81eddf3082733e88c09bbdf125fe0
+DIST aiodns-3.0.0.tar.gz 6743 BLAKE2B 2a3c61156069fa598df58191b35383da3e054396cdeb1bc8916cc0414bb6efc89d45789883a5b4f33e3a08a6ee544356b02d6c697c096deae3398f0ff4d3c316 SHA512 8c1016f3b0cb461e70e9a55034f9ad3b3db705a845bf20bb6503c7a5d592b4c5d2e8ddc60b375c5fafdc559dc4566736f4c93f26710be2dcbd181284ef039825
 EBUILD aiodns-2.0.0-r1.ebuild 831 BLAKE2B 6b7422cd8ee8dcc3df52174ac4f52e063555532f0ffeff3d80f0a839b7889100d4bd2f03cc9efd8b23148e8d7bb6a5ebc5c8939528e2a88e0171d69e15600381 SHA512 bfcacc10463026e52465f78689049d78699697cdd8f4738109f2a096a62b89313c6fdb3fb7e992603522679f33c738e704813cd99ea69e4c1ba9afc1dc7b8df5
+EBUILD aiodns-3.0.0.ebuild 611 BLAKE2B 25a4eda7ae668df1222686959583a252eb879837de0b59d0d6cb2cd275ffda6ae49c8f21e1c4f693e53d8610984a687b9e59f1cbfab1422a2475484e4e13e472 SHA512 3e11226b09fc6e6008f8e38956b8c774cb57359f5d927e3bd5dbb6f09bf497f761af0632c2b46325fa71d29dff1243f8f1a37a29eaedd665e5670ac5a047d523
 MISC metadata.xml 340 BLAKE2B e607777274ea754605542b7ade5ba3d118ff366ae3bc57f586031450dd54e43189e0e1b3fd8305e351380bda96289e0cd95e074fdebaa7816da757329203775f SHA512 b77ba4eb56072b4801832400361bcc80e73c2f0f1507e9abfd8c9beaa255594554b4a2555e3304307af6c515bea097311c70f515f875a7a98cc197e5cf538ce3
diff --git a/dev-python/aiodns/aiodns-3.0.0.ebuild b/dev-python/aiodns/aiodns-3.0.0.ebuild
new file mode 100644
index 000000000000..efbb87aaa6a7
--- /dev/null
+++ b/dev-python/aiodns/aiodns-3.0.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple DNS resolver for asyncio"
+HOMEPAGE="https://github.com/saghul/aiodns/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+PROPERTIES="test_network"
+RESTRICT="test"
+
+RDEPEND=">=dev-python/pycares-3[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+python_test() {
+	"${EPYTHON}" tests.py -v || die
+}
diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
index 16efe713e23f..7a041e5d04a2 100644
--- a/dev-python/aiofiles/Manifest
+++ b/dev-python/aiofiles/Manifest
@@ -1,5 +1,7 @@
 DIST aiofiles-0.5.0.tar.gz 13332 BLAKE2B ccd044ce9fcd74b2a6419b4f0e9e3977086c9685741dbb734a7f9222ab96dca58b5330ad0d0cd9f10fce03ee123add7101825f047451344fc451c40a4352674e SHA512 89eb1af506bdf5f3f2e9c3afe90f17d521ada1cdeb449dcdc800d4faa4edc1c9ca93811915aa059d8c5a1b0a3aaa40231a46b3d041ca745e071628293bddf1b7
 DIST aiofiles-0.6.0.tar.gz 13585 BLAKE2B 4b81e8369f91b0406c9bd5025c4b5da91418dc810065f1979ec862299fd16976105b89282b22a3ae2e0151cc550c927524795d3c5d69c82809faeb4e16179b8d SHA512 2cf9e340eccfef3934bbd86338a235368b99a10e34526e8267232cef14b12e3d79d40350d82874841d5bf7fd0acf779b663288c57d150096f1275586d51583c4
+DIST aiofiles-0.7.0.tar.gz 23245 BLAKE2B 5dcb743912555de9a4c58a37925ca08c4be7065ea78924854d548b32f31f93bdf1b231db840aa9ac822d467ffd8c7f57c506c5f6d550c662013008899da8b716 SHA512 75287266cd86c572db0795074d625dac8b3476c4d8ef9a193ce01ce80a423a4aa39f6e5ec5005fb441375ccb2a2ec84913634919ee5000bfb7623ac77a030b92
 EBUILD aiofiles-0.5.0.ebuild 558 BLAKE2B 887803d5fc7848bd9dedf53d1023a184823ec5e4b70ec2f47b75f39cd86a20d5f3c2843fd3ed5d985c092f4ea94eb29a09f90c68aa22738041141acc8825c56b SHA512 092fabb0391bb5d1f4dafd0e3a73092a2add492de61a6ce8a60dcc8f2e33ca0704982db72db83cf56d5717b9e73a7dbd7e34f5202d4672c407b56b09bc4ffa59
 EBUILD aiofiles-0.6.0.ebuild 490 BLAKE2B bb2a36efd687f42e147783b49d1c5c1dea02541eddbe8c267eb3a98add168a37e1eaf2693be26602a80cd797a17bbe1ee727029b36285b1150d5e4b70ffa661a SHA512 a8e39c7aada13241ac7d2a033015a27add05cff3fbd70f74170e267e0f3ff2343b54f2400e2f5f678fde68aedcc5ec581548418f890163ad182c6552f564a466
+EBUILD aiofiles-0.7.0.ebuild 529 BLAKE2B df1e2fcc1c3de684c565698019e03e0744e2e0e1778ea8b2ed846c1f08d8cfe1c635c38bb143a6b476f62e39efc213c2f51101e2c5b5a9b0b9add0eb09d969be SHA512 52a816667e47e21ae4a7e3937aeeb2b27404d675e8ea3a83363e82a72aa4c2280961a0c35f5e202f7c6477059fc4067d4ebb0256a2ebf98545566a1c457bb908
 MISC metadata.xml 610 BLAKE2B 8d1109f3a6895e60aee18ed8a4a8118cc932f98594ca66e2442fa68f95f6998548512b3b78b74d0dcb0ef24d0b47ce2d568e97b0e554c0010a4b8f9f2ec44b4e SHA512 18fe02ca00665f20134ca3cda280705aa489b929e79a4fbee72345d994b741ea6ea27e6b9f2ac5f494672d7f85796e908357e51146126a729bdcccc46d094afe
diff --git a/dev-python/aiofiles/aiofiles-0.7.0.ebuild b/dev-python/aiofiles/aiofiles-0.7.0.ebuild
new file mode 100644
index 000000000000..9c3987ed4e4e
--- /dev/null
+++ b/dev-python/aiofiles/aiofiles-0.7.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="File support for asyncio"
+HOMEPAGE="https://github.com/Tinche/aiofiles"
+SRC_URI="https://github.com/Tinche/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/alabaster/Manifest b/dev-python/alabaster/Manifest
index e4a83a3da74c..941057b302b0 100644
--- a/dev-python/alabaster/Manifest
+++ b/dev-python/alabaster/Manifest
@@ -1,3 +1,3 @@
 DIST alabaster-0.7.12.tar.gz 11242 BLAKE2B 5690d9c0b8aabfc2c95c4279183d174d6a5768f89732028f7ec6eb790531499a2017b9f3b9896442e298f3189f79070178b3e281b6d0bcfad3741625caa99c48 SHA512 e3bfd0c92ce01f08d5e6d9dc1ef0967ca1f54827e08756f4a0ba7be8d3b8bec7f2e53a169b831ff5ce2d2548f7f52c6e518bcc513e49bb3e4c38274293aebbac
-EBUILD alabaster-0.7.12.ebuild 496 BLAKE2B 1b49d4775576b2ea2a23cfeeddc7ccc8e54ff20d71b79c37804071af8f2911e77951c0b97152d9fdd999881e0e785beb375559e95cd0be976c78af6a5be3f36b SHA512 cc3f5853b729d33a99cdea752c7227b359e6916dd2c8bbc90d38b0212e69b3d9193fb80a4e808caef2935b21a0a05d7f4c0350fc80b5c993c05df458ed586db0
+EBUILD alabaster-0.7.12.ebuild 464 BLAKE2B 6ac2eeae3fe51aef3690e69b46ae5fbc4769f7366ad3b9cb295b06c4ccf2183bb19000bef31641d0ef377f594019dd2409071f6cad82abf63838a60039d88c4a SHA512 723e8791c11f318c3ef818739922b6f3a7b05613a9bd20109b8bd0a141d98699ea37c0740c18c6c357e11c842a709a95af3a37ff559a82e4f01cb93a16841a14
 MISC metadata.xml 409 BLAKE2B ba8f679d608b3fea7dc109f7699830f487ec02644cec6af7dedd8fbd5246062f85b92a94646d30470e7b502eae997a0abf0f92c6427b1b9ffd264e83035b1217 SHA512 0dfaf8004d8f6f8b61e8bf94e12bb083ce4b7e3f850ecbacc6d82a411e840389317337eb7442c6f5848d2b928aef59c6e56b916b44dcb8e3ef6945cd7695f3b5
diff --git a/dev-python/alabaster/alabaster-0.7.12.ebuild b/dev-python/alabaster/alabaster-0.7.12.ebuild
index 5444d8f8791a..a2441890d0df 100644
--- a/dev-python/alabaster/alabaster-0.7.12.ebuild
+++ b/dev-python/alabaster/alabaster-0.7.12.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -13,5 +12,5 @@ HOMEPAGE="https://github.com/bitprophet/alabaster"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
 SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-solaris"
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index 92b3774f9b32..b10053df514b 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,3 +1,3 @@
 DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-EBUILD argh-0.26.2-r2.ebuild 497 BLAKE2B 07f1fd92b1d231a3c292af028ef9c107fe618f9a30e49626208454dd4e6c109305a0c97507bab0543132afc1bafca50597acf63d7f9313684f9b5794708231cd SHA512 96b7188873c93fdf3d529a285e2da218ffe6987ef591cd2f343c91b90085dbccae647d250e7fa85609c09e05f9cfb89135b93b7e38d5c83e01d7c2768ec18d9c
+EBUILD argh-0.26.2-r2.ebuild 524 BLAKE2B 221f4cd254717f66dfcc90e25abad6e8c841af854f48948e6a0ff283186ff5e5b099ef81d2945fe9ed0ab3eedd05a0bbd8b4e81b71ab980f0b39a85878f99686 SHA512 a4c76c62bb13483c985d524887b8ac89ed620a16d514e1aa6378f2b289365d322b99a5c23761b99b089aaf558c03623a7da4a0c282dbe4160731d869206bc218
 MISC metadata.xml 331 BLAKE2B 44a5708cae63fc94540b35012ece30776bc5bbcb99848eb2c4d5e0e86238fc4ececabc011f1a40c78942b91409a7b31580f311cdab02b450804461f620f74768 SHA512 21243b065ecfd9b4a9350b474f66cd50462e35d83e1130f7a1a1a6033430f085c79b763157cfffe2e7133a4e8e2da7a274659f24fefd742a1898884f56c464e3
diff --git a/dev-python/argh/argh-0.26.2-r2.ebuild b/dev-python/argh/argh-0.26.2-r2.ebuild
index 5b288461e853..d88ea1110581 100644
--- a/dev-python/argh/argh-0.26.2-r2.ebuild
+++ b/dev-python/argh/argh-0.26.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://pythonhosted.org/argh/"
 SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 LICENSE="LGPL-3"
 
 BDEPEND="
diff --git a/dev-python/asgiref/Manifest b/dev-python/asgiref/Manifest
index bbc25ec78c1e..78f8b22f046d 100644
--- a/dev-python/asgiref/Manifest
+++ b/dev-python/asgiref/Manifest
@@ -1,3 +1,4 @@
+AUX asgiref-3.3.4-py310-warnings.patch 8869 BLAKE2B 9690124277e49c87fe5d72965407f50b3826d5e26e9f81c4a5f25b88872f2d133f656d5e63dbe7b6503e9242912d7d0ed1d19d9b38640dcced8b709edadd5309 SHA512 53de4ba34d212ff4e750764a790d8e5ed9fae5fb78f4e278820680bc8fa7028e6f2658d16cf9826790b49d185ffbf360f8fe539f3ed5d03907eab114cc258174
 DIST asgiref-3.3.4.tar.gz 30780 BLAKE2B f14a5ae3cc3d0c67a827b4b8d002c9d92388285f7388b7ac439b11fbe2e72b6dee5a9c38637e6b5189e3a3625d24a806b5aeff1ffc41861fd4947d7b7c4621ba SHA512 e224ce82f9156e3efde316f3e209a9fbb9494cb9347d6652e19ed130921143de8d3e2a45f50352bf13fcdf229c291e68a0348fff31de144e58cd1a53b4eb0c31
-EBUILD asgiref-3.3.4.ebuild 662 BLAKE2B bec2fd45bd415793f14954d5dd3ad7a18d1e0da173bca18ddf06b891b92764415c9cd8ad19629475a2383d464e156df77cb0d5b7eb7fbb6a0cc0e80c6be1b8dc SHA512 30e842b5705f6d00491b40b869eaa03f782a4a5d27af6ba2cd9d6a67debd9f96fefd8ee81a08ac419a22b2b145154a07edbf37d15c89572df1094f99214fcaac
+EBUILD asgiref-3.3.4.ebuild 809 BLAKE2B b8b594dbff94989ada293172d5c8f371f75b7cc95ea8294fcd52852932b3a6c44f632f4e63f4be46bcaef1429965c4aa3315077acd1323a191469b9a75df22be SHA512 98685c74c7743800929839e58a231bbc90dbb66492cf785c62ae78ab81f4cfc793edd2eebf37e79555c8d5d32f9b442b98944e4a7fabe049e7fb81cdb5424bb7
 MISC metadata.xml 388 BLAKE2B eb8c329aa8d5220d66dd380ad7c4bb4fe539b3fb5b854e9a6b4912d2212b6ffa74d7f9331c5ec575bfd53407d016b464efb06c3f94c4088dd729f646b5d528ab SHA512 45d74c331619ea754ed36e7a2e9eee1687be49cf698ed7d9e89c8cb006b40001be93a8fc753830dbbba12a5ca61d3407aaa364aff3354708ae79cbb72cba6a20
diff --git a/dev-python/asgiref/asgiref-3.3.4.ebuild b/dev-python/asgiref/asgiref-3.3.4.ebuild
index edb57ed26ea5..709bb95bb8f6 100644
--- a/dev-python/asgiref/asgiref-3.3.4.ebuild
+++ b/dev-python/asgiref/asgiref-3.3.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="ASGI utilities (successor to WSGI)"
@@ -15,13 +15,18 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/typing-extensions[${PYTHON_USEDEP}]
-	' python3_7)"
+	' python3_7 pypy3)"
 BDEPEND="
 	test? ( dev-python/pytest-asyncio[${PYTHON_USEDEP}] )"
 
+PATCHES=(
+	# Provided to upstream: https://github.com/django/asgiref/pull/262
+	"${FILESDIR}/${P}-py310-warnings.patch"
+)
+
 distutils_enable_tests pytest
diff --git a/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch b/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch
new file mode 100644
index 000000000000..1cd017ddfbde
--- /dev/null
+++ b/dev-python/asgiref/files/asgiref-3.3.4-py310-warnings.patch
@@ -0,0 +1,235 @@
+From 0c9e989f18b99ea24a1fb3ea2c8a66fd295c2178 Mon Sep 17 00:00:00 2001
+From: Ekaterina Vaartis <vaartis@kotobank.ch>
+Date: Thu, 20 May 2021 19:44:15 +0300
+Subject: [PATCH] Fix deprecation warnings for python 3.10
+
+asyncio.get_event_loop was marked as deprecated, the documnetation
+now refers to asyncio.get_running_loop([1])
+
+asyncio.ensure_future issues a deprecation warning if there is no
+running event loop([2]), so use asyncio.run which creates and destroys the
+loop itself
+
+asyncio.gather issues a warning if run outside of event
+loop (i.e. there is no running event loop)([3]), so wrap it into an
+async def
+
+explicit passing of coroutine objects to asyncio.wait is deprecated
+since 3.8([4]), so wrap them in asyncio.create_task
+
+plus, add 3.10 to tox.ini
+
+[1]: https://docs.python.org/3.10/library/asyncio-eventloop.html#asyncio.get_event_loop
+[2]: https://docs.python.org/3.10/library/asyncio-future.html#asyncio.ensure_future
+[3]: https://docs.python.org/3.10/library/asyncio-task.html#asyncio.gather
+[4]: https://docs.python.org/3.10/library/asyncio-task.html#asyncio.wait
+---
+ asgiref/compatibility.py       | 14 ++++++++++++++
+ asgiref/server.py              |  8 ++++----
+ asgiref/sync.py                | 15 ++++++++++-----
+ tests/test_sync.py             | 19 ++++++++++++++-----
+ tests/test_sync_contextvars.py |  3 ++-
+ tox.ini                        |  2 +-
+ 6 files changed, 45 insertions(+), 16 deletions(-)
+
+diff --git a/asgiref/compatibility.py b/asgiref/compatibility.py
+index eccaee0..614b2e6 100644
+--- a/asgiref/compatibility.py
++++ b/asgiref/compatibility.py
+@@ -1,5 +1,6 @@
+ import asyncio
+ import inspect
++import sys
+ 
+ 
+ def is_double_callable(application):
+@@ -45,3 +46,16 @@ def guarantee_single_callable(application):
+     if is_double_callable(application):
+         application = double_to_single_callable(application)
+     return application
++
++
++if sys.version_info >= (3, 7):
++    # these were introduced in 3.7
++    get_running_loop = asyncio.get_running_loop
++    run_future = asyncio.run
++    create_task = asyncio.create_task
++else:
++    # marked as deprecated in 3.10, did not exist before 3.7
++    get_running_loop = asyncio.get_event_loop
++    run_future = asyncio.ensure_future
++    # does nothing, this is fine for <3.7
++    create_task = lambda task: task
+diff --git a/asgiref/server.py b/asgiref/server.py
+index f975f78..fb1c394 100644
+--- a/asgiref/server.py
++++ b/asgiref/server.py
+@@ -3,7 +3,7 @@ import logging
+ import time
+ import traceback
+ 
+-from .compatibility import guarantee_single_callable
++from .compatibility import get_running_loop, guarantee_single_callable, run_future
+ 
+ logger = logging.getLogger(__name__)
+ 
+@@ -56,7 +56,7 @@ class StatelessServer:
+         """
+         Runs the asyncio event loop with our handler loop.
+         """
+-        event_loop = asyncio.get_event_loop()
++        event_loop = get_running_loop()
+         asyncio.ensure_future(self.application_checker())
+         try:
+             event_loop.run_until_complete(self.handle())
+@@ -88,12 +88,12 @@ class StatelessServer:
+         input_queue = asyncio.Queue()
+         application_instance = guarantee_single_callable(self.application)
+         # Run it, and stash the future for later checking
+-        future = asyncio.ensure_future(
++        future = run_future(
+             application_instance(
+                 scope=scope,
+                 receive=input_queue.get,
+                 send=lambda message: self.application_send(scope, message),
+-            )
++            ),
+         )
+         self.application_instances[scope_id] = {
+             "input_queue": input_queue,
+diff --git a/asgiref/sync.py b/asgiref/sync.py
+index 6b87c7e..9476e66 100644
+--- a/asgiref/sync.py
++++ b/asgiref/sync.py
+@@ -9,6 +9,7 @@ import weakref
+ from concurrent.futures import Future, ThreadPoolExecutor
+ from typing import Any, Callable, Dict, Optional, Union
+ 
++from .compatibility import get_running_loop
+ from .current_thread_executor import CurrentThreadExecutor
+ from .local import Local
+ 
+@@ -132,7 +133,7 @@ class AsyncToSync:
+             self.main_event_loop = None
+         else:
+             try:
+-                self.main_event_loop = asyncio.get_event_loop()
++                self.main_event_loop = get_running_loop()
+             except RuntimeError:
+                 # There's no event loop in this thread. Look for the threadlocal if
+                 # we're inside SyncToAsync
+@@ -151,7 +152,7 @@ class AsyncToSync:
+     def __call__(self, *args, **kwargs):
+         # You can't call AsyncToSync from a thread with a running event loop
+         try:
+-            event_loop = asyncio.get_event_loop()
++            event_loop = get_running_loop()
+         except RuntimeError:
+             pass
+         else:
+@@ -238,7 +239,11 @@ class AsyncToSync:
+                     tasks = asyncio.Task.all_tasks(loop)
+                 for task in tasks:
+                     task.cancel()
+-                loop.run_until_complete(asyncio.gather(*tasks, return_exceptions=True))
++
++                async def gather():
++                    await asyncio.gather(*tasks, return_exceptions=True)
++
++                loop.run_until_complete(gather())
+                 for task in tasks:
+                     if task.cancelled():
+                         continue
+@@ -320,7 +325,7 @@ class SyncToAsync:
+ 
+     # If they've set ASGI_THREADS, update the default asyncio executor for now
+     if "ASGI_THREADS" in os.environ:
+-        loop = asyncio.get_event_loop()
++        loop = get_running_loop()
+         loop.set_default_executor(
+             ThreadPoolExecutor(max_workers=int(os.environ["ASGI_THREADS"]))
+         )
+@@ -370,7 +375,7 @@ class SyncToAsync:
+             pass
+ 
+     async def __call__(self, *args, **kwargs):
+-        loop = asyncio.get_event_loop()
++        loop = get_running_loop()
+ 
+         # Work out what thread to run the code in
+         if self._thread_sensitive:
+diff --git a/tests/test_sync.py b/tests/test_sync.py
+index cf0e0c5..8ed76a7 100644
+--- a/tests/test_sync.py
++++ b/tests/test_sync.py
+@@ -9,6 +9,7 @@ from unittest import TestCase
+ 
+ import pytest
+ 
++from asgiref.compatibility import create_task, get_running_loop
+ from asgiref.sync import ThreadSensitiveContext, async_to_sync, sync_to_async
+ 
+ 
+@@ -33,12 +34,17 @@ async def test_sync_to_async():
+     assert result == 42
+     assert end - start >= 1
+     # Set workers to 1, call it twice and make sure that works right
+-    loop = asyncio.get_event_loop()
+-    old_executor = loop._default_executor
++    loop = get_running_loop()
++    old_executor = loop._default_executor or ThreadPoolExecutor()
+     loop.set_default_executor(ThreadPoolExecutor(max_workers=1))
+     try:
+         start = time.monotonic()
+-        await asyncio.wait([async_function(), async_function()])
++        await asyncio.wait(
++            [
++                create_task(async_function()),
++                create_task(async_function()),
++            ]
++        )
+         end = time.monotonic()
+         # It should take at least 2 seconds as there's only one worker.
+         assert end - start >= 2
+@@ -428,7 +434,7 @@ async def test_thread_sensitive_outside_async():
+         result["thread"] = threading.current_thread()
+ 
+     # Run it (in supposed parallel!)
+-    await asyncio.wait([outer(result_1), inner(result_2)])
++    await asyncio.wait([create_task(outer(result_1)), create_task(inner(result_2))])
+ 
+     # They should not have run in the main thread, but in the same thread
+     assert result_1["thread"] != threading.current_thread()
+@@ -449,7 +455,10 @@ async def test_thread_sensitive_with_context_matches():
+         async with ThreadSensitiveContext():
+             # Run it (in supposed parallel!)
+             await asyncio.wait(
+-                [store_thread_async(result_1), store_thread_async(result_2)]
++                [
++                    create_task(store_thread_async(result_1)),
++                    create_task(store_thread_async(result_2)),
++                ]
+             )
+ 
+     await fn()
+diff --git a/tests/test_sync_contextvars.py b/tests/test_sync_contextvars.py
+index b1027aa..9665bf9 100644
+--- a/tests/test_sync_contextvars.py
++++ b/tests/test_sync_contextvars.py
+@@ -4,6 +4,7 @@ import time
+ 
+ import pytest
+ 
++from asgiref.compatibility import create_task
+ from asgiref.sync import ThreadSensitiveContext, async_to_sync, sync_to_async
+ 
+ contextvars = pytest.importorskip("contextvars")
+@@ -25,7 +26,7 @@ async def test_thread_sensitive_with_context_different():
+             await store_thread(result)
+ 
+     # Run it (in true parallel!)
+-    await asyncio.wait([fn(result_1), fn(result_2)])
++    await asyncio.wait([create_task(fn(result_1)), create_task(fn(result_2))])
+ 
+     # They should not have run in the main thread, and on different threads
+     assert result_1["thread"] != threading.current_thread()
diff --git a/dev-python/asyncstdlib/Manifest b/dev-python/asyncstdlib/Manifest
index b3fab0e9d906..fc66da61d9b5 100644
--- a/dev-python/asyncstdlib/Manifest
+++ b/dev-python/asyncstdlib/Manifest
@@ -1,3 +1,5 @@
 DIST asyncstdlib-3.9.1.gh.tar.gz 40224 BLAKE2B 8d1e564c9f5ac10c7f05dfa3933f695ae458685550fb67401f3bd0d1294ef0b170f5b385cdcf63c0096854538219a0dea77d4d80bd801f1a9b15f5ad3f2c562a SHA512 de7860d84cee7bfdc974a0677cc231323c86238bcb0bfd2f32a62b7356042aad647ee8d627393be35c5a134855d5f76967143ad8347df9d6258f46bc2b43a62a
+DIST asyncstdlib-3.9.2.gh.tar.gz 41963 BLAKE2B da40c23bacc58c1347aca94107e3026829d9b27645eddc47fc46a96cab4be7baa9ed3c31f6f0045b884130d4316394d6a0b6b44818b42b6e6c512c641847d556 SHA512 f5268451325b48b967747b5e1ffe4e773a5aae82c6d481781e6c95f483d972da2b3806c1117067256d22efaba1238787898667a6a50ac4b2512dac4b5343d2a2
 EBUILD asyncstdlib-3.9.1.ebuild 578 BLAKE2B e5da90e813acc96177c6f5b28bcf0d55e3a292f37360d2272ea28c2adb2b9d45b00f5180c826c46d98aebc7821569e830d3b51be7b84855694ca7f89333d2e78 SHA512 4caa12219bf40a7e7d8f6fe9df5b1dd7d8b5b20bc2478e7aed0a7ba5583f7546e27b77aa55062d6491a5cb40fcdbb9019afe4f393d5b8bb801f58546c5b2a2b3
+EBUILD asyncstdlib-3.9.2.ebuild 621 BLAKE2B 646eb2d54be9c4db90eead4fced2cfb2317b0208cf749f8dd0c2b07b731e2863cf4d135af0e669c9f5014500d5c31003ef5e38628f85bd0396aa0989c3375422 SHA512 1da4c0217dbdf12b080748dc15e491c690fdfb9344353069d8e75e79354eddbe12ae892d3e2e6b38ef213dc781d93d1d4842f2fb2266576e078847c74e40f6a4
 MISC metadata.xml 358 BLAKE2B dafa64f8dbe8441d1c638cd591ed583cb739c6babd39695876c1f02ce501bb9db0307a5d9a80a58926011103c20557510ce7490187e1b6963fa9d7a3064b8886 SHA512 5d125f57f631e616bca75af464b046b16713f791cd202bb8e812e8a0912854bb5c15b441b0a7d4ae13b6eba58204277ac52985c6f36c0cc8aff4d7bcfe184a8f
diff --git a/dev-python/asyncstdlib/asyncstdlib-3.9.2.ebuild b/dev-python/asyncstdlib/asyncstdlib-3.9.2.ebuild
new file mode 100644
index 000000000000..65cb15dce8e5
--- /dev/null
+++ b/dev-python/asyncstdlib/asyncstdlib-3.9.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="The missing async toolbox"
+HOMEPAGE="
+	https://github.com/maxfischer2781/asyncstdlib/
+	https://pypi.org/project/asyncstdlib/"
+SRC_URI="
+	https://github.com/maxfischer2781/asyncstdlib/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/autobahn/Manifest b/dev-python/autobahn/Manifest
index b3d7909264d4..6906602ca0dd 100644
--- a/dev-python/autobahn/Manifest
+++ b/dev-python/autobahn/Manifest
@@ -1,15 +1,3 @@
-DIST autobahn-20.12.2.tar.gz 1269167 BLAKE2B f6ea51682c13690002796f2a45bd11fc2f8497eeee25a1786e942111f43f9dc1f7f806281e4dc37d1ed0aa302fc5c5e47a55d876e010580d7a08eb5ac7534ed0 SHA512 aa6d5e77ba6129931a07cad13f839d5c76267b8126a05ade4ed1c7183ce019faf6656105a853515b543e5ac34ab20d02821b29aa68eb51c385880ad3919d1dcc
-DIST autobahn-20.12.3.tar.gz 1268873 BLAKE2B 44dcaf9d19af89382dfdef9f40a0177486298d451697b973c7a65b44c71c764295afd01ac6333b7a8c5be0348713f38c36884564e148b2941bb42372f07d0e89 SHA512 ad77e476e2eab0039c0a2c98d5851d6237fa7f6a5dfd6b79bd88668dc498bf1b47bb1bcc26ff16e4087cc82aefb0082c8a74afc68b01be48c6140f3aa4ded5b3
-DIST autobahn-20.7.1.tar.gz 1260579 BLAKE2B 925d148836348c068d179d4871267bf79c8c42d27cacc6be09cca11396dbd213a5b86344142df886d4ff69d1214a86b49900ca3552bcdb640377cb0d6af7d0f0 SHA512 e2c241194da90ada86a2804683cb063320f75a69b76ddc016349c11614e7f298619c2eeba4fcccb8f8d65d84375681fb339d9f92f94f45f1015f4f12fa0c39b0
-DIST autobahn-21.1.1.tar.gz 1269122 BLAKE2B 6eb8eb22d0f09a4e8d409220ee2dff60a42a4e81acee789e8f9d98649ada24174295b98936f5e0a0a211fddd6d124975aef152679fcfde7b3dca7f18dcba5b62 SHA512 8e56e8a9213e356ea4288c6ed6ba4d6e8a26f5e1f670cfc067d1e11ef4d989b4e3d33a5cac49a635e18f9d45da1d42cb1300de96afdf77898441330e3f489194
-DIST autobahn-21.2.1.tar.gz 343966 BLAKE2B 8ee40610599aad6b0e6832beb867ff7515192e9a896d4f1e1b2c731fb81c899bf530f24d28e52faa91779affb1ed93b9b79b606b1ac7d3ed26a272dfcf6a0afc SHA512 21760aeac80c1e958a338da31d405af2f37c803944032270329dde4b59e6a9f914e9a7e4ae0ae6ae5b699ddc61f0c2f6b89cb0d6d4fdc3b1b58f204d4e94a980
-DIST autobahn-21.2.2.tar.gz 350799 BLAKE2B 06c5f7517083853bcf2e4c982151caadae2c5c0c547f543f310497addda14ff6262adaf876dcd5ce25ab48fd8b9b9c816ff74f518f3aedc65627ee3390db514b SHA512 6dbad05437c92622709c140fd949706c8fbff62477cf9fa5a8bbcb8c5410661b660d548902ebec55b5a8d744cce12c9a229bceeb3d5e7e5dc4e50cb09f7e7ab7
 DIST autobahn-21.3.1.tar.gz 351296 BLAKE2B d018c8820a1accc779decdb8d392d3ff6225f80674b468145a8f29b275d6f0b1021a226dc8bc72915a792591e6d4ae8d6a33a96cf705241990ac401c8342e2c5 SHA512 dd6bf6eba6f2880860c6fa42e3925bb15d36bfb9d2354ddeb0165972848e81a308723b7f9dcd6ec3426b6286f71cb2da453590810e5d891523d92acf9fd64c52
-EBUILD autobahn-20.12.2.ebuild 3038 BLAKE2B 063b7a3996d586d09fc14f110f50e6d239c8d6cee97928742c29afb5d961f9dec9e4ad283e314a13e208c0c4b335b8716128a2d81bd81613b7c567ab7cca651b SHA512 26848497db0ea8ec1ce565f66645c82f3660209fe74299dde2c07730a53ae77ad36fd54e66c2da1c88462db0613eeffdff665705c1c6d73810de6e48d3c43e6d
-EBUILD autobahn-20.12.3.ebuild 3093 BLAKE2B dfb19c13637c5c73d246879c142d6a81952c3f1ec10d2e555f28c12077de57c3102470374ae1aec2ad0edd5204cf16a14ef3953a9230def42fdfee5408d4ebfd SHA512 1650aa25ba466074ea5c783d84e6795ae065d57f2b1b35cb46584bf09d46d951f51b187369ea40222718c237f9d894319cee9e8a19b3d364560a57dc589435e8
-EBUILD autobahn-20.7.1.ebuild 2995 BLAKE2B b1a4536d3153fb71bf0c83d89bdab51beff8cafd9a3686791c8697d8d249505843fb9ea7059ebc5e0d299884731b472d9e6255b2c8e800378c0a12336151361c SHA512 b64c89beb8c60179b8fef2dd9fdfb69b32a1bab0adf5e39fa3982bffba9cb55d2cc046216ee29f1a2248b1b15002a6e1f5e1e48f19507385dbde7235427d5157
-EBUILD autobahn-21.1.1.ebuild 3144 BLAKE2B 2e5fde2e2aa2dc0405b4e52648c964b34ffbcb6435f8d48c0380dd7a2d7544a4bb1a8b2b5f72e00f1ad6b8b6639ff42238dd47213af7b81c6d6cf2c2736ef663 SHA512 4701d657a96a30ce3abdac31c6969331153780b751235fc704087d1f882cf88c71ba71b2e7332bb49ffe5594a77f10673e8cd3d25c9fe70eb77f8501eb23c678
-EBUILD autobahn-21.2.1.ebuild 3108 BLAKE2B ca119cad37f38de68e006a7e7947ee27e7fc2e7460a1e5f1cc292772ab93b3055e6915f6413f98f52d9d814bcab946f59f48085da833717572b17da17d052a41 SHA512 9a755eecb6e8c856f95f5867cb3144470352515a1641eb473ec9532b945c2bdb8d75fd6278bed8ca71551153518b5753d6cd0cb6cde9c14f07e5a131653db4d1
-EBUILD autobahn-21.2.2.ebuild 3252 BLAKE2B cc7b5a8c3007877e53b98d81833b1d08847483cbaea6772b9529da3ccb07095437e8f8a31f52aee4bdd6db31a2918af972a7499478dbbecb18c661d0280ce717 SHA512 8510e3da99f86d9119124001b3da4ae29aacc979342407a41e3c9090ca71b8c85e301c3ece1069cf6e5475a16b79e27bf086ce0dff5ac3d56c13e07a5ef91620
-EBUILD autobahn-21.3.1.ebuild 3250 BLAKE2B ae7f5d937f65345f0ab8c5d8da19609141e647e8ee969b372380d94d9569d231cc0f356c91350a96e3d718e2805e91132839d9ed7195aba19e65a5b10ea26960 SHA512 ce5ff852047ae49242d57ad172e6d6a1b5636e059d135be398955dfca7d0c0b4db652f9d84e8cf3cb163cc7cb16d37b30702447ffc5de776fad5baea5399d2ac
+EBUILD autobahn-21.3.1.ebuild 3248 BLAKE2B 8a5968c9e2106742cf03e6f38d3f5aa374558695424dc029269969689e5311493e64a6a88e5f75ff8cb614dabd44c3ce444f5397b60fe3199d60ab308ebab86b SHA512 6a146a8d6285057e1816691e62cdfe2e4f065b9a643f762a1b5c7c1cc9b15bb1028f20cc1b5cfc733dd8e1efbbbfa6a621d00c123400dfa7b587bed1d41b96cc
 MISC metadata.xml 665 BLAKE2B 11ce0fe43744ff03c46a4e4b6b06733807a4674956dc885a3185bd353f0617841a6f6d1afbbc02c02b7e6718b5c0ccce69907920322e2966c8f7e9d1f63d6485 SHA512 9e154ce907c9868b86a70c4c2f6173e4fa8cc6e1f63380978d4a9c706f00316a9eda488fc39c32c5ea70f31a1a12187629665b590e79f64906ab982bf1401fbb
diff --git a/dev-python/autobahn/autobahn-20.12.2.ebuild b/dev-python/autobahn/autobahn-20.12.2.ebuild
deleted file mode 100644
index edab71d83741..000000000000
--- a/dev-python/autobahn/autobahn-20.12.2.ebuild
+++ /dev/null
@@ -1,104 +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} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="crypt scram test xbr"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.9.2[${PYTHON_USEDEP}]
-	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-20.4.1[${PYTHON_USEDEP}]
-	>=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-	)
-	scram? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/argon2-cffi[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	if use xbr ; then
-		eerror "***************"
-		eerror "Required xbr dependencies are incomplete in Gentoo."
-		eerror "So this functionality will not yet work"
-		eerror "Please file a bug if this feature is needed"
-		eerror "***************"
-	else
-		# remove xbr components
-		export AUTOBAHN_STRIP_XBR="True"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	echo "Testing all, cryptosign using twisted"
-	export USE_TWISTED=true
-	cd "${BUILD_DIR}"/lib || die
-	"${EPYTHON}" -m twisted.trial autobahn || die
-	unset USE_TWISTED
-	echo "RE-testing cryptosign and component_aio using asyncio"
-	export USE_ASYNCIO=true
-	py.test -v autobahn/wamp/test/test_cryptosign.py || die
-	py.test -v autobahn/wamp/test/test_component_aio.py || die
-	unset USE_ASYNCIO
-	rm -r .pytest_cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# delete the dropin.cache so we don't have collisions if it exists
-	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
-}
-
-pkg_postinst() {
-	python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/autobahn/autobahn-20.12.3.ebuild b/dev-python/autobahn/autobahn-20.12.3.ebuild
deleted file mode 100644
index 38a4898fe58d..000000000000
--- a/dev-python/autobahn/autobahn-20.12.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="crypt scram test xbr"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.9.2[${PYTHON_USEDEP}]
-	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-20.4.1[${PYTHON_USEDEP}]
-	>=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-	)
-	scram? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/argon2-cffi[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	if use xbr ; then
-		eerror "***************"
-		eerror "Required xbr dependencies are incomplete in Gentoo."
-		eerror "So this functionality will not yet work"
-		eerror "Please file a bug if this feature is needed"
-		eerror "***************"
-	else
-		# remove xbr components
-		export AUTOBAHN_STRIP_XBR="True"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	echo "Testing all, cryptosign using twisted"
-	export USE_TWISTED=true
-	cd "${BUILD_DIR}"/lib || die
-	"${EPYTHON}" -m twisted.trial autobahn || die
-	unset USE_TWISTED
-	echo "RE-testing cryptosign and component_aio using asyncio"
-	export USE_ASYNCIO=true
-	py.test -v autobahn/wamp/test/test_wamp_cryptosign.py || die
-	py.test -v autobahn/wamp/test/test_wamp_component_aio.py || die
-	unset USE_ASYNCIO
-	rm -r .pytest_cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# delete the dropin.cache so we don't have collisions if it exists
-	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
-}
-
-pkg_postinst() {
-	python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/autobahn/autobahn-20.7.1.ebuild b/dev-python/autobahn/autobahn-20.7.1.ebuild
deleted file mode 100644
index 7341c0daf07a..000000000000
--- a/dev-python/autobahn/autobahn-20.7.1.ebuild
+++ /dev/null
@@ -1,104 +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} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="crypt scram test xbr"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-20.3.1[${PYTHON_USEDEP}]
-	>=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-	)
-	scram? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/argon2-cffi[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)
-	"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-S="${WORKDIR}"/${MY_P}
-
-python_prepare_all() {
-	if use xbr ; then
-		eerror "***************"
-		eerror "Required xbr dependencies are incomplete in Gentoo."
-		eerror "So this functionality will not yet work"
-		eerror "Please file a bug if this feature is needed"
-		eerror "***************"
-	else
-		# remove xbr components
-		export AUTOBAHN_STRIP_XBR="True"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	echo "Testing all, cryptosign using twisted"
-	export USE_TWISTED=true
-	cd "${BUILD_DIR}"/lib || die
-	"${EPYTHON}" -m twisted.trial autobahn || die
-	unset USE_TWISTED
-	echo "RE-testing cryptosign and component_aio using asyncio"
-	export USE_ASYNCIO=true
-	py.test -v autobahn/wamp/test/test_cryptosign.py || die
-	py.test -v autobahn/wamp/test/test_component_aio.py || die
-	unset USE_ASYNCIO
-	rm -r .pytest_cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# delete the dropin.cache so we don't have collisions if it exists
-	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
-}
-
-pkg_postinst() {
-	python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/autobahn/autobahn-21.1.1.ebuild b/dev-python/autobahn/autobahn-21.1.1.ebuild
deleted file mode 100644
index 41c2ad9c99f3..000000000000
--- a/dev-python/autobahn/autobahn-21.1.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="crypt scram test xbr"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.9.2[${PYTHON_USEDEP}]
-	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.11.2[${PYTHON_USEDEP}]
-	>=dev-python/lz4-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-20.4.1[${PYTHON_USEDEP}]
-	>=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-	)
-	scram? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/argon2-cffi[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	if use xbr ; then
-		eerror "***************"
-		eerror "Required xbr dependencies are incomplete in Gentoo."
-		eerror "So this functionality will not yet work"
-		eerror "Please file a bug if this feature is needed"
-		eerror "***************"
-	else
-		# remove xbr components
-		export AUTOBAHN_STRIP_XBR="True"
-	fi
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	einfo "Testing all, cryptosign using twisted"
-	local -x USE_TWISTED=true
-	cd "${BUILD_DIR}"/lib || die
-	"${EPYTHON}" -m twisted.trial autobahn || die
-	unset USE_TWISTED
-	einfo "RE-testing cryptosign and component_aio using asyncio"
-	local -x USE_ASYNCIO=true
-	pytest -vv autobahn/wamp/test/test_wamp_cryptosign.py || die
-	pytest -vv autobahn/wamp/test/test_wamp_component_aio.py || die
-	unset USE_ASYNCIO
-	rm -r .pytest_cache || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	# delete the dropin.cache so we don't have collisions if it exists
-	rm "${D}"/usr/lib*/python*/site-packages/twisted/plugins//dropin.cache > /dev/null
-}
-
-pkg_postinst() {
-	python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/autobahn/autobahn-21.2.1.ebuild b/dev-python/autobahn/autobahn-21.2.1.ebuild
deleted file mode 100644
index 78281c5cf7a4..000000000000
--- a/dev-python/autobahn/autobahn-21.2.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="crypt scram test xbr"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor2-5.1.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.9.2[${PYTHON_USEDEP}]
-	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-20.0.1[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-20.4.1[${PYTHON_USEDEP}]
-	>=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-	)
-	scram? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/argon2-cffi[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	if use xbr ; then
-		eerror "***************"
-		eerror "Required xbr dependencies are incomplete in Gentoo."
-		eerror "So this functionality will not yet work"
-		eerror "Please file a bug if this feature is needed"
-		eerror "***************"
-	else
-		# remove xbr components
-		export AUTOBAHN_STRIP_XBR="True"
-	fi
-	# remove twisted plugin cache regen in setup.py
-	# to fix tinderbox sandbox issue
-	sed -e 's/# regenerate Twisted plugin cache/# DO NOT regenerate Twisted plugin cache in Gentoo\nexit()/' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	einfo "Testing all, cryptosign using twisted"
-	local -x USE_TWISTED=true
-	cd "${BUILD_DIR}"/lib || die
-	"${EPYTHON}" -m twisted.trial autobahn || die
-	unset USE_TWISTED
-	einfo "RE-testing cryptosign and component_aio using asyncio"
-	local -x USE_ASYNCIO=true
-	pytest -vv autobahn/wamp/test/test_wamp_cryptosign.py || die
-	pytest -vv autobahn/wamp/test/test_wamp_component_aio.py || die
-	unset USE_ASYNCIO
-	rm -r .pytest_cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/autobahn/autobahn-21.2.2.ebuild b/dev-python/autobahn/autobahn-21.2.2.ebuild
deleted file mode 100644
index 4c94153771d8..000000000000
--- a/dev-python/autobahn/autobahn-21.2.2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-MY_P=${PN}-$(ver_rs 3 -)
-
-DESCRIPTION="WebSocket and WAMP for Twisted and Asyncio"
-HOMEPAGE="https://pypi.org/project/autobahn/
-	https://crossbar.io/autobahn/
-	https://github.com/crossbario/autobahn-python"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="crypt scram test xbr"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/cbor2-5.2.0[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/flatbuffers-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/hyperlink-21.0.0[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.6.1[${PYTHON_USEDEP}]
-	>=dev-python/py-ubjson-0.8.4[${PYTHON_USEDEP}]
-	>=dev-python/snappy-0.5[${PYTHON_USEDEP}]
-	>=dev-python/twisted-20.3.0[${PYTHON_USEDEP}]
-	>=dev-python/txaio-21.2.1[${PYTHON_USEDEP}]
-	>=dev-python/ujson-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/wsaccel-0.6.2[${PYTHON_USEDEP}]
-	>=dev-python/zope-interface-3.6[${PYTHON_USEDEP}]
-	crypt? (
-		>=dev-python/pyopenssl-16.2.0[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-		>=dev-python/service_identity-18.1.0[${PYTHON_USEDEP}]
-	)
-	scram? (
-		dev-python/cffi[${PYTHON_USEDEP}]
-		dev-python/argon2-cffi[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-	)
-	"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
-		>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/pytrie-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pyqrcode-1.1.0[${PYTHON_USEDEP}]
-	)"
-
-python_prepare_all() {
-	if use xbr ; then
-		eerror "***************"
-		eerror "Required xbr dependencies are incomplete in Gentoo."
-		eerror "So this functionality will not yet work"
-		eerror "Please file a bug if this feature is needed"
-		eerror "***************"
-	else
-		# remove xbr components
-		export AUTOBAHN_STRIP_XBR="True"
-	fi
-
-	# avoid useless rust dependency
-	sed -i -e '/cryptography/s:>=3.4.6::' setup.py || die
-
-	# remove twisted plugin cache regen in setup.py
-	# to fix tinderbox sandbox issue
-	sed -e 's/# regenerate Twisted plugin cache/# DO NOT regenerate Twisted plugin cache in Gentoo\nexit()/' \
-		-i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	einfo "Testing all, cryptosign using twisted"
-	local -x USE_TWISTED=true
-	cd "${BUILD_DIR}"/lib || die
-	"${EPYTHON}" -m twisted.trial autobahn || die
-	unset USE_TWISTED
-	einfo "RE-testing cryptosign and component_aio using asyncio"
-	local -x USE_ASYNCIO=true
-	pytest -vv autobahn/wamp/test/test_wamp_cryptosign.py || die
-	pytest -vv autobahn/wamp/test/test_wamp_component_aio.py || die
-	unset USE_ASYNCIO
-	rm -r .pytest_cache || die
-	rm -f "${BUILD_DIR}"/lib/twisted/plugins/dropin.cache || die
-}
-
-pkg_postinst() {
-	python_foreach_impl twisted-regen-cache || die
-}
-
-pkg_postrm() {
-	python_foreach_impl twisted-regen-cache || die
-}
diff --git a/dev-python/autobahn/autobahn-21.3.1.ebuild b/dev-python/autobahn/autobahn-21.3.1.ebuild
index 731e4a1838db..9d630f8a3d56 100644
--- a/dev-python/autobahn/autobahn-21.3.1.ebuild
+++ b/dev-python/autobahn/autobahn-21.3.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 IUSE="crypt scram test xbr"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/automat/Manifest b/dev-python/automat/Manifest
index 1145b6137e9f..257c72c1a838 100644
--- a/dev-python/automat/Manifest
+++ b/dev-python/automat/Manifest
@@ -1,5 +1,5 @@
 AUX automat-0.8.0-no-setup-py-m2r-import.patch 826 BLAKE2B 835956b8e3ab657d09d683a173c43626f0af59056ccd25e3a7bc9167da4d5d081e095e91e96ee943e7329d28c3a70b9e001e8977d64bb85581ef19f73a9ecf93 SHA512 b89fd865e8b95283efdc96614b1230d3e8e6d70cdb0ba07842cdf07e1a546a5a89b7c88a0cd774ec47148579981d41cd7261cdd7069e2736807b64422b3ca56f
 AUX test_visualize-twisted-import-errors.patch 1999 BLAKE2B e551520aeb24b3df293eeda358fa3b9b3e33934af54ff6a7a205a0e1b5b7e916e34f8c81c103fa0fee93a22e7d0bc6ca3f7b8a17dedadeaccb02131ac23f94e4 SHA512 67f14d0b64333b872c0057eba32f77132a4bbf61c8867ec475c87552b3b553162c3e2a668ffeda0c75d85906273d50e4d80231213a3f46d1855316bb229fb6cb
 DIST Automat-20.2.0.tar.gz 61679 BLAKE2B 9dfb93a0bf0a348d8f7de0796b3e5715947eb84cc0aa507a453f438d2027ae877280ed6d7896192cee46f31c7d1c0eb6cb3dee36e1f13a315071513920c5b6d0 SHA512 715cb5dc087288492e6465a29e7d8502a84fadf451bc3d29da86335ea1c20f8efd9549f0c1eaac8800559dd8001dd73736c3bfacdc6321c83a35d2288d69632c
-EBUILD automat-20.2.0.ebuild 1628 BLAKE2B a9316edbe49518134f686c2c4bd037717a1d427017cf691d7f9add6489b3768e63e10e6e59bb436a84669c661df3f70386fcdf39d10f2389b5d7a78d5aa64ce5 SHA512 86f2884eccd66cd458e1f5e7d9f01996d2a2ea940cfa62fcaebcd7925f1cbae7491be02f54be73480dc425b22eac3380ec7324991cf2dcbd863434afcda64f44
+EBUILD automat-20.2.0.ebuild 1583 BLAKE2B 7a91142404239c5edd96021fab61e18e3879accf03f809614dd62c19e38a14b43a67ab773b8c3785e0b9b85ae1415e0002bf0b67f5887c2d110278e7e5c8b156 SHA512 da4e3df6f8e82feef6c2e58e0ccb1785679da72235f91a5e86e94e43fb99bb62f76cb98c7f2e2ccf66dd4073628b2a16eb5b9da424b0ac5803d640f552e6532d
 MISC metadata.xml 669 BLAKE2B 22b4ba427dc89c8f651aa4f5d31dbde255937d32f3c3f15e1b5a44f13e574822523d6051b087066f18f22f15001629d6a012961be2603b16f561a567826c453c SHA512 a3683067d91582e4b0262a8d66fbb86d15fdff9093916d4298c9ca8f94a81db4357338be8a4f18513b0670e1f209f138bc28b8bf5df5e0b5ed4b0978dcaf6083
diff --git a/dev-python/automat/automat-20.2.0.ebuild b/dev-python/automat/automat-20.2.0.ebuild
index feef8214377f..c7b05ca97c1a 100644
--- a/dev-python/automat/automat-20.2.0.ebuild
+++ b/dev-python/automat/automat-20.2.0.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 MY_PN="A${PN:1}"
@@ -13,6 +12,7 @@ MY_P="${MY_PN}-${PV}"
 DESCRIPTION="Self-service finite-state machines for the programmer on the go"
 HOMEPAGE="https://github.com/glyph/automat https://pypi.org/project/Automat/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
@@ -24,12 +24,9 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	${RDEPEND}
 	dev-python/m2r[${PYTHON_USEDEP}]
 "
 
-S="${WORKDIR}/${MY_P}"
-
 PATCHES=(
 	"${FILESDIR}/automat-0.8.0-no-setup-py-m2r-import.patch"
 	"${FILESDIR}/test_visualize-twisted-import-errors.patch"
diff --git a/dev-python/awscli/Manifest b/dev-python/awscli/Manifest
index d53a8e8b0163..bd2376dab7c6 100644
--- a/dev-python/awscli/Manifest
+++ b/dev-python/awscli/Manifest
@@ -1,5 +1,3 @@
-DIST awscli-1.19.3.tar.gz 1950305 BLAKE2B de9e11c2de811dea812e77a18dc9306044840ea586094cf57602cf4255723a7d94a20de414f8674d1ed6af2eed523024f61719299a3efcc492380d5d80c75575 SHA512 1034b82a9f1f0e92ae65bd28918f6f4422b0347435b4d2567b5004c370cbe1517d7fe275b672afd850ef6b99bee6f0b821097640a482626c800d19d095f42072
 DIST awscli-1.19.47.tar.gz 1990843 BLAKE2B c894aaf84d5fe7cb8998fcd682783a1f2e75dd9273a2aa22babe4d57175a1716aefccda50edb96a1203f010dbb2af29cd47d43b5d5f94adfdee1730ab98345af SHA512 7d51022e13609f5f5ab3155e3ac09670c7e49508d67eca8cb477e556e4b06b7643e86bdfe5fa8db59360f6d73e5774b433cb7093c25d6b688f98847b502872b7
-EBUILD awscli-1.19.3.ebuild 1277 BLAKE2B f16525afa2a61d9b2baf0e41852e93cf3838f02629b92a56dcc1b43375807437eae186278b84c044c005506c07ab80f3d2c17a7d3468698bbcb0bf234a554e16 SHA512 c8c9ac76a97acec8143315e98b78b6926c192abb44b24227a9792bab151d9a6ea9091a01844c57de9844307b4b2bee530a99a698d281555856b007196d79ee54
-EBUILD awscli-1.19.47.ebuild 1279 BLAKE2B 124baefbddb2578f28c2a2908c1c19d36c573bd23376766502a8e9629bbb473b1ae4df2eb7af5e03b8b0e5c06cdd7f261651d63896f2ce1a8f027aec68de0f08 SHA512 127b1a10ba17d1f73948cf5d63320e606840c147cd25ab017641e6182390d0570fd2da19a1178eecfd69aef759f2025633fb12f5993801a94c65fd7c7d1dab7f
+EBUILD awscli-1.19.47.ebuild 1277 BLAKE2B f16525afa2a61d9b2baf0e41852e93cf3838f02629b92a56dcc1b43375807437eae186278b84c044c005506c07ab80f3d2c17a7d3468698bbcb0bf234a554e16 SHA512 c8c9ac76a97acec8143315e98b78b6926c192abb44b24227a9792bab151d9a6ea9091a01844c57de9844307b4b2bee530a99a698d281555856b007196d79ee54
 MISC metadata.xml 453 BLAKE2B d45517c2fabee8961b00d53a0118966ec7f50b965ca2c42e02b41201baada3ad18d66f1bebc134fa64a524ab9a12302feebe922833d04ac571068b10dd9e9052 SHA512 eed3ecdf6fa24c738554a6f95659835a1d1ab9fb017272226cc54194ee2f35d1ca6adaa52bac44cf4e740c42636f842782e708f38f24b51b7341e47e10ccfeca
diff --git a/dev-python/awscli/awscli-1.19.3.ebuild b/dev-python/awscli/awscli-1.19.3.ebuild
deleted file mode 100644
index 73e39dc7c9d6..000000000000
--- a/dev-python/awscli/awscli-1.19.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="https://pypi.org/project/awscli/"
-#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="test"
-
-# requires network access
-RESTRICT="test"
-
-RDEPEND="
-	=dev-python/botocore-1.20*[${PYTHON_USEDEP}]
-	dev-python/colorama[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/rsa[${PYTHON_USEDEP}]
-	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-S="${WORKDIR}/aws-cli-${PV}"
-
-python_test() {
-	nosetests -vv || die
-}
-
-python_install_all() {
-	newbashcomp bin/aws_bash_completer aws
-
-	insinto /usr/share/zsh/site-functions
-	newins bin/aws_zsh_completer.sh _aws
-
-	distutils-r1_python_install_all
-
-	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
-}
diff --git a/dev-python/awscli/awscli-1.19.47.ebuild b/dev-python/awscli/awscli-1.19.47.ebuild
index 4036d6987c7a..73e39dc7c9d6 100644
--- a/dev-python/awscli/awscli-1.19.47.ebuild
+++ b/dev-python/awscli/awscli-1.19.47.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="test"
 
 # requires network access
diff --git a/dev-python/backrefs/Manifest b/dev-python/backrefs/Manifest
index 60bc33f7c6da..18586e345924 100644
--- a/dev-python/backrefs/Manifest
+++ b/dev-python/backrefs/Manifest
@@ -1,3 +1,3 @@
 DIST backrefs-5.0.1.tar.gz 4120179 BLAKE2B 2cd8fb84c7e416be330cb9afdb894f6f8574b66698acc1d63abae8ff5bfcccd4bf29b724dcf2a25a637ea0fde46865b18a5ff1bfbff955a01798037752dc3d97 SHA512 e2212bd7dce017308fa558ccfe7faf617ed6107523db8b2e4a3ad7b60aa1d7aabdaea2632abd6a3f1f022eac949d7036a7afe522b5f086ef1888a0e67e834894
 EBUILD backrefs-5.0.1.ebuild 1163 BLAKE2B 7b43e53ace42297cde8a502dc7fe582ec60418a22dc41880c1e4a872967cd20981d28b8f1c3c6232cdf57765b942a69effdc4889c284d33169e5715f09fd6bbc SHA512 e99c18cd90188d422902b184d8084cfcf407df87a3c9de527c96eee66e62c2421b49096c8e06d4bc3075d68766116deb96337ea2f4341360ccd80a9bb33cf3bb
-MISC metadata.xml 1117 BLAKE2B 9d9fa36a86847c15e217f83ad293e3d0c62d85cb0dbe72b553b6bcee1872d24f0b19d68c379be2883cb7986c047f07e95e30cf5a9310a73e9db6310d867bbea5 SHA512 49784dc3c57a1e87ced2a2928d98bc957fee456cbca1f3d18f1fe9fabf8b1b48cd43372b9086acc195f8283cdb18f04e69d372e4fec949ca4d61213e0bb60f6f
+MISC metadata.xml 1103 BLAKE2B 6f0961c2729e7e51ffc3667f539625d942ba0b3f529c97bbccc41cd57c3c2f326ee66f334f62e25cf20b955c8411aa12a59015db0817b793e6c4409e7d0ed75c SHA512 a2631c7bf292497853892a9cb8caecd95a8e179508849e1ad8e4949052fa0a06c82a0febb8a446cdb462418b7dcb79bb62410951d6229eb196eaee4edf2c65a4
diff --git a/dev-python/backrefs/metadata.xml b/dev-python/backrefs/metadata.xml
index cb009855b9a4..0c26badc91b1 100644
--- a/dev-python/backrefs/metadata.xml
+++ b/dev-python/backrefs/metadata.xml
@@ -5,8 +5,8 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
diff --git a/dev-python/bandit/Manifest b/dev-python/bandit/Manifest
index a1fcd395fef2..13f42025b4e5 100644
--- a/dev-python/bandit/Manifest
+++ b/dev-python/bandit/Manifest
@@ -2,6 +2,6 @@ DIST bandit-1.6.2.tar.gz 498567 BLAKE2B ab7885df634ff8258fc7620523b56995cb2f262f
 DIST bandit-1.6.2_py38-1.patch 3892 BLAKE2B 750160be3d234b0d638307e74fd130921f43f460edca8d0ef0f9a98f34db709e0649b1e481668abd094942fa05ee710b82b3161fd82bc56bb0f5e73d90a6e70f SHA512 dc1e55bdcbf180e70757dd92aa590fe1348d84a2143af73e48c35c62864cf0720f6b055482eb274a4261adff37c84f998c75916b8ab70d99264bd88d09611e06
 DIST bandit-1.6.2_py38-2.patch 3724 BLAKE2B 8ce857419d99b059ce1b28aba7c04218397cad82f0fdb6e7eb3e57f698d6360de7b0f4402c40540e41d510db1aa0b75e006e0e15a20a8c5534b7e5a3cf78a0e8 SHA512 25f73b087b296867556d9b9bb7f789a4df64bd2930509086bc24312c43a3a98209d63a5b00009e31fd2653e89c85e62849c7af6ba044abc10c5789a6e3d9a968
 DIST bandit-1.7.0.tar.gz 506225 BLAKE2B 6e2383576b2091ab98757381bfd5915331fc7b08a251e817a6964d963de60b070f7c4dc7958dd366cf95333f4abc157e80433490ab8b923580cb45d855c13092 SHA512 c51af7ab4c667c376a11f142fa35881a776d420bd3ef41421bd29a713e0b56bbf1622e24cd878e24f57594f03d06b7c2b8258fcf34f57e3a68df4200a34becdc
-EBUILD bandit-1.6.2-r1.ebuild 1782 BLAKE2B 385685b5308aa5062b74b5de06091341f4ccf51d0a133ffccab976d1075919bd0a97ffd8bbc4ccfba01166522f1261ca33507d14e2808e2d2092ee18eb7f6a26 SHA512 0fb2564cae7b078e7fe4de11e99183a20b8ebbf97553823607856f4aabb9d6162bd0492775dc769f3a3c5ce2ca1b813d6542ad2bf60ef023db07531b53fd0d3f
+EBUILD bandit-1.6.2-r1.ebuild 1781 BLAKE2B c01c43243b15804e2cb84b5916977cb1f88e9cc5652e468d598dd69e0ad404272d4eb3997451266edb0da5092cb2c6dc9abcd61fdcb8fae84ce080a61f041868 SHA512 dec8e88dbafb6c08e2b7de7c9a202ad861c8c3cc13e25936bd9dc269294780a5d56e63b2c6831aecf749c11c33a0b969e36178d2fad3475a0d8ce372cbe68609
 EBUILD bandit-1.7.0.ebuild 1400 BLAKE2B edfeac24cab126e7c6d017ca33fa1d1bcd93897d6c1fa95bb0bd45122c81055713760556ace6a9fdbedeb3492d277b2c20787d44be4a2cdc917c414d3e8ddc59 SHA512 8170fc4d58890699fbfe3018e74592f6471a3ffb6839b37fee35fd04964ce6abe4b9565f54d378a0ccc0bdfee86d3e489ff9d6c6ba38ca82306ee190f76a3428
 MISC metadata.xml 684 BLAKE2B 7018c2b15088d3fa89c56a9b8ab316342cdc5e6b4a1437a22dc07ad1a5026623da288630cfb583a2b149ca1cb35a83353345652cd06dc206e5dcfbab7cc28465 SHA512 4c877fa708ef556c2435606b4f8aff213fcbd6a43d867c9c408c2bcf634ece14f36dbe45aebc7e9307cd87a624c83f5d1f6a944c0ce52f87d39f996ce1a11028
diff --git a/dev-python/bandit/bandit-1.6.2-r1.ebuild b/dev-python/bandit/bandit-1.6.2-r1.ebuild
index 820ce0be4c06..e455e7f97a6a 100644
--- a/dev-python/bandit/bandit-1.6.2-r1.ebuild
+++ b/dev-python/bandit/bandit-1.6.2-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~s390 x86"
+KEYWORDS="amd64 ~arm arm64 ~s390 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index 51478ac981f5..382e05400756 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,11 +1,5 @@
-DIST bitarray-1.7.1.tar.gz 58441 BLAKE2B f09fa3ffe2cc6534984e9da05ddff767dcca59075f5f08977237eab592a8e3e28ebec2d2bde89a21bba14f4c59a5e0411be50abfe562ebfbaaeca01339786dec SHA512 f45461699f5e48b97001c64c514cdafe208fe31f7cf6c211aa0fb2f32d46028717fcbeb38b812bc8f349226537a3ec6dfec97bc7ecf7253d484332307504abd0
-DIST bitarray-1.9.2.tar.gz 69814 BLAKE2B 7fbe6acf844c35101881216a771729a232ba022fbc0c82c3445c21de2bdba3fa62693109b45b928abbf81ab14442e329ae016cfc703cdeb9d868b5b6146447e1 SHA512 25c0135c166f5d5b8de8448f95b12ae56a10ed5154c6e06bafdc47523cf382da30797c12797692e61b27b1a26104dfac58b08ccf5a1917bf26c7dc4a32da795c
-DIST bitarray-2.0.0.tar.gz 70098 BLAKE2B 3189ca9bc7bb5c765994d85c827e30019d33ecf062fa0aae0158487c61c1bd4316e094ca35276b4f59a55049035bec68b37ca349bed18e27dbd666b7816fdb1a SHA512 564b80b2e22cc04df0b6a2a48a594d0891aecd77cc6644c10bfea9db241cb6f8c92f87be98d1055ba2a71749721f1de6c591794623a5201aed0bded6909dff41
 DIST bitarray-2.0.1.tar.gz 69368 BLAKE2B 4acc490998e058e3882db2d58ad80b8c275999f49a7a76604091beae8015e7290691f6b34947c3376795b9dc5643592ab7fd09ef5a482a29e4e154616926e444 SHA512 091a0e7b1ddbdb804241eb4f51c9167dcfefb55d5bcef1eaa617ac77593a58113b47f57be83ceed47a91bc5d8d15a8a2e6053a10243323b9f7c0908444ab03af
 DIST bitarray-2.1.0.tar.gz 71169 BLAKE2B 8d82d49ac309605d989d29d492dbb94dd59c633f0987220ed28bbca7d2c3b0c4566ce147d0f65893c5dfaf1c2f702870d95181dfaa969050e13bcd4a9664ef51 SHA512 e91200b8829b63f297a1882fab293ac007991740a739587ba473abce183aa79a85e08db8a0fca5729b6e1d3e130965b2f14dc40acccf12d3231852498e2fb141
-EBUILD bitarray-1.7.1.ebuild 554 BLAKE2B 51800881a48929c4ed60f5db5a6ab4c4ee05eee904db2833f344f6a22b7a201e695b57d80f6aee9dcad937c58dca4c4277905634be9d62acd661d6138b7236ff SHA512 bda6a3406692187c4cf0882c7d3437f922df41726163cc5306ccb1c445079a0dbfd86382e6c576743ee56cf588833bf5fd4b58c4c56e90879bff83c9cb9e3c7a
-EBUILD bitarray-1.9.2.ebuild 556 BLAKE2B e3fc5afb6879f4e5ad0ec8ea3b9d0359a18c33fc875bddc243785f0b046b912b36e23a09479643c6ef635fc59acca4230ec1be77b37639d9a56200885ed41aad SHA512 6dbf3348a9dbc7f46c9ece4feff8197b2e9eb38fb74802cbad3b80df41702237183a341c27605f92b992df15d022b559c3152a55a742e808c58da7592b6009f8
-EBUILD bitarray-2.0.0.ebuild 556 BLAKE2B e3fc5afb6879f4e5ad0ec8ea3b9d0359a18c33fc875bddc243785f0b046b912b36e23a09479643c6ef635fc59acca4230ec1be77b37639d9a56200885ed41aad SHA512 6dbf3348a9dbc7f46c9ece4feff8197b2e9eb38fb74802cbad3b80df41702237183a341c27605f92b992df15d022b559c3152a55a742e808c58da7592b6009f8
-EBUILD bitarray-2.0.1.ebuild 557 BLAKE2B 8f81af04ad46b51cf1bfc379351aa819db64227ca7be4f102dc2b7f8c23a85be90870a1bbaaf70b7520ff919799cfec246687752aff39809fc7dc937c04e8c6a SHA512 71f2b2048733258c572def3cd92a47cbd45305de8fe3a2c13076ac97ffeb8e248b8d1fbdc1bb8f9fc5a82c64d669b5bcd68cc49992d32af205a878081f443d28
+EBUILD bitarray-2.0.1.ebuild 555 BLAKE2B 4f7e2046976d57a5add057dbc5fbff927a02ec2047d981db903eadd48eb1f0d24eb7e6392df94f1a4c1d5c117e628f34300649ca6d52c2b2f0fb707dbc5ccb33 SHA512 dbadef341d58ca5ba03615f7c775c4be0215c31c88ba6bee3ebc8295436b2719d71ff01ac41015f7d5d7b3b657134fcc5a6d73635dc8976b4a9e55a0a416dfc4
 EBUILD bitarray-2.1.0.ebuild 557 BLAKE2B 8f81af04ad46b51cf1bfc379351aa819db64227ca7be4f102dc2b7f8c23a85be90870a1bbaaf70b7520ff919799cfec246687752aff39809fc7dc937c04e8c6a SHA512 71f2b2048733258c572def3cd92a47cbd45305de8fe3a2c13076ac97ffeb8e248b8d1fbdc1bb8f9fc5a82c64d669b5bcd68cc49992d32af205a878081f443d28
 MISC metadata.xml 1194 BLAKE2B 2d94554cb381fb5e6f7879f55d282e3fb8f6868218390082cae0da4e10cca819ceea30ab180b143ec04d3cdc7d34a506095cd0bd8c521e32228bc6f3b177a12c SHA512 4a7db25dff2f2a47f76e52cbedb983b1b4514a8779a61c0ce9bd63955d67ca20ce4ea4c20cc4a71c5b0fbbbc0d98a65f8394479dc0a26bc843f3d0d830958d7d
diff --git a/dev-python/bitarray/bitarray-1.7.1.ebuild b/dev-python/bitarray/bitarray-1.7.1.ebuild
deleted file mode 100644
index dd4b3a7c672b..000000000000
--- a/dev-python/bitarray/bitarray-1.7.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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/bitarray/bitarray-1.9.2.ebuild b/dev-python/bitarray/bitarray-1.9.2.ebuild
deleted file mode 100644
index c91313e20b97..000000000000
--- a/dev-python/bitarray/bitarray-1.9.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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/bitarray/bitarray-2.0.0.ebuild b/dev-python/bitarray/bitarray-2.0.0.ebuild
deleted file mode 100644
index c91313e20b97..000000000000
--- a/dev-python/bitarray/bitarray-2.0.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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/bitarray/bitarray-2.0.1.ebuild b/dev-python/bitarray/bitarray-2.0.1.ebuild
index d45cb4b43340..eadde2209108 100644
--- a/dev-python/bitarray/bitarray-2.0.1.ebuild
+++ b/dev-python/bitarray/bitarray-2.0.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/b/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+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/boto3/Manifest b/dev-python/boto3/Manifest
index 10f01049dea2..e9831eddffc8 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -6,6 +6,13 @@ DIST boto3-1.17.67.tar.gz 368242 BLAKE2B 72e612816c45d49c74430d82f4ede59f6b6e7c1
 DIST boto3-1.17.68.tar.gz 368708 BLAKE2B 4ed78bae6e8c9ee6e8f1a5a4009f89b1c5efac1ddfa8189a6ec76f1ba47b8113dd479ed935e1d6f4631fcd1e40659398a5189bab77b15e1efe5acf706871b90f SHA512 c8a4a78da518530b3e47c1f3e37f51a61070f9b626b29ee4b1a990bfb2dfce49332add6674a0ec8b156c50e922736a500f2b265cf9ba286000aca55a272a7257
 DIST boto3-1.17.69.tar.gz 369006 BLAKE2B 6ad2e9ccb71872c5936f63b786b4b7addd5ff6ff9ccc9b8a65361006ae77861175692fd8a7d4075cf170f92aac4c0f3072a598a99191356909cd95122c34d3ba SHA512 7dfe8ceb621a63ac3e2c2d0852d8ba380200cd91f9f548109c8c5f6b0704a5c56acb645cdec6b7974bb30402a5832d001f5cc9e8d30f940560a06f88407c5385
 DIST boto3-1.17.70.tar.gz 369851 BLAKE2B 31416aed68f340842962dca12f77e169f87f2f2a63fa5189c298678d0672f1edf349e0884856624faa971dd2e1c248e320c92dc8189fc63612cce24680971e5c SHA512 fa0bbcdc9027f09007780f75d3a41aef7656c934bc10f710f5787fd7cd7a7124475437e62e7d507e24f773668102a75c4b3b5cfffa5d2834f75fa930894ce227
+DIST boto3-1.17.71.tar.gz 370105 BLAKE2B d0ea164459e7f79f5d9124af1917eb1a6ef9743792cd13daf58f8c70c852e537392ae8e3fb7ddaf5cea75e914ebb44c205f865f1b896827322b0be8500dc4a4f SHA512 b934ee87fbbced5a6c180517eb2b304b0d097dabc7f9831ebd4945d1b69919e3701955d92b4cfa5cd00da42f32fce731b70dfb3f69b5583eba0a032b4ef3505d
+DIST boto3-1.17.72.tar.gz 370275 BLAKE2B 2a6923fb9ca0a67e9096844cf66a3dbf74e77eb1b4ade6f17fc248dff5249b467bf07bfe51779a65dcc9d41f20597419418cb7aca04cf03b3ab7c6556772b685 SHA512 c185c05c590d6e7d61db6ea88082a1520229fb9384eb04e0d0c19108cb3cbab53714dcc46b0de064e11e8989036e782f21d687dc12312a019717dbf082febe35
+DIST boto3-1.17.73.tar.gz 371093 BLAKE2B 1259a4c8ad0c87cae66c6f30c70ea785927669f82ba3fe196db30e7dd8c92f940928a25c4cb263d3b9f0c9944a4dbf8d0cd4dc52770d60286a50ca4830d3129a SHA512 582ced34557e3ce20628a5093c80f7a9231e010da4a9c4f7669b7c04f1eae8c4edf050b75fc00675f03d4e9fbb3dbd97441cd9a99c7e050a3914f072810a8aeb
+DIST boto3-1.17.74.tar.gz 371719 BLAKE2B f6d44206a14cdf395c8963be048e81391ecbf6817b1c00e1cd081abf111df8bd85c05fa1c04b013de7e6d916835e4876cc961891c8d52d8a32e41713080ed96e SHA512 a79012072238286561ab43ca7bb9f24236e858e0bf550be9a074517145445d0d520cc207683d99f6f704416f617b5f89468c87357223db9564e4310a2a2676f1
+DIST boto3-1.17.75.tar.gz 372223 BLAKE2B 5502d43dd76206a57793593c85b5c84a126c8bd4b8e1ac6c72b65a70a1f5494a46db2a0f97cd7218f02fa4ffa53094202823a50b652650f21672be990242b25b SHA512 b7c6aeec402b0dcff2681f66714b5de77206873f4b554ab5a9436de473ce52c20c84107d18e0cb53badd7d6a68a5be53e0967a1d18f92935f6c27b3c2c154eaf
+DIST boto3-1.17.76.tar.gz 373664 BLAKE2B 2c38008fbe459ba0382d48f1e1bcf896fb1f341cba27f1ee9b7a2e186f71ba38a36edd1b123fca8ea66abddf81491005fa17847a447f300647f13b66bd4c1525 SHA512 3e3bf35bac59d62a23aa26db5d328e6ed07aebe87449037f11f2561514fbb877bb268942504c2f204a27eb19be6e076f36f59b635ca77e83c4c40b9371e76e92
+DIST boto3-1.17.77.tar.gz 374165 BLAKE2B 2c7c041787da521d89d18248be2f92c29f989949c6a9c19f12cd59098db0392f47d5c4e66a172adea0190a126bc2487669a1f4a14024378194bd1e9ae5bdf4c3 SHA512 a6140ed800ad84abe77d78ce1df874ef5c89a822af75b50459f220db4544dee5078e5c7f517fe5cad83d9f4c3fbb0d5c6095c136603c677f4c019109097411e1
 EBUILD boto3-1.17.54.ebuild 1353 BLAKE2B 66c5372ceee1dbf124e71a2a2e6c5b885571f36e0ad9f409865ea83916dc2ed0d8826a01f1bdcace97a63d47253a059461e9d994c9e28f507489667c5ee796ac SHA512 7d57c590630a3b5a8ef86e66de7365c9c77c3bbd4dbbac9d376cec3cbace41e9f75dadbe5a7402f2fbe3a7a586391955d1aaa81269c5bb9bcf4f49ae54f54787
 EBUILD boto3-1.17.62.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.64.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
@@ -14,5 +21,12 @@ EBUILD boto3-1.17.67.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2
 EBUILD boto3-1.17.68.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.69.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
 EBUILD boto3-1.17.70.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.71.ebuild 1355 BLAKE2B e54b5b065e8d06942f0670579e3c0fce789aba2c27b485f9dc87888ead8bbcea0d519c2968a100e1bf309a14127c409396fd3387cb201395cc7544959705d801 SHA512 d82769ad3ccd34a04ece5b63866451d593fe6166d44a50b019ed952dc5e7c0ad7bd2c25513fc7a7b8149ac5c537cf7cac9728bff5504793cad0b8c64bef8ae6d
+EBUILD boto3-1.17.72.ebuild 1362 BLAKE2B d21a975d4661dd88ab66d3dcf1eb6c9bbc17dd2ed5e3f6e1c6b78a71b56a535de1245b68cb70d711064f17dcda1d7d83175283362e8bd8a523d564b977c3ca8d SHA512 5d6e5f2f42a13ceaf4a684708b5e37f3d372595cfe34c1cbd027731b8120e983faf86726eaf2ca5fcd9389a56215f0be5954b3dac7c3705b9dd371db160fbcf8
+EBUILD boto3-1.17.73.ebuild 1367 BLAKE2B f6429973eed8ec0c70e99cc1c6bf3f3e572d9f75351d64e15517107877ebb8df86bc096f3c44f9b2c1c1557848e664b1d6df6619e9abd1a1f92374e6ae31cf7a SHA512 3bf84ec1bf6ec8b3e34cd1b39408f1f5a8c275a0a28c13b92638bfc5494f69b56bf2494580e7b1cfb47ef5c335bc0278077a629da83c1043c2abc37e99bc93c8
+EBUILD boto3-1.17.74.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
+EBUILD boto3-1.17.75.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
+EBUILD boto3-1.17.76.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
+EBUILD boto3-1.17.77.ebuild 1374 BLAKE2B 1f5a0ef15ad6fe9bbe8b9a1171f89188fb7695613e1d67873f4a146a861cbd33ca7eef9c64b99bbe2d9d0620b53d90acc9ce7c0002b7b53ef16921160a3b9c56 SHA512 091c37b9b48b4c8896e15842164f52d14862d1686bf29351f25ac7233d6ce1b1af23fcbe4cf279b59ab3da17f41aaeb517bd2c4086ad07e710fa58feb36aa228
 EBUILD boto3-9999.ebuild 1350 BLAKE2B 93fe4639ced27cf1ba9a359e276c7fa8f88642fc5e1c086712a4b167cce520ef5cb0a499303ca0c544924b22d37b8928edbc9989605e792bd0d8354d772349c6 SHA512 8140e73da7a57210df954e46c9cbb4f0a76beb2817ce4f1799bd58da71eef1a032cc80dec8c25de2e47f827fe0b015bab0fe237a30ba0cc8bb360de3a60f19ee
 MISC metadata.xml 711 BLAKE2B da283ea39f4540ad2445b1b88a12509a384e2f2a2ce0ffbc3845a475015c108de69b9e9868a0e43c0fb8c8b71a6ce498ece9676b0f623ed41b89efd92790be80 SHA512 80202cdc324464906b9ae7eae889d7d00c7c773aa5c49d22d8faab7deb621bbfe31cd4e66b289eadc7065e091b8615b284760736d915aa16ee15cf1c7f9e6b5d
diff --git a/dev-python/boto3/boto3-1.17.71.ebuild b/dev-python/boto3/boto3-1.17.71.ebuild
new file mode 100644
index 000000000000..74b9170a9119
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.71.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.72.ebuild b/dev-python/boto3/boto3-1.17.72.ebuild
new file mode 100644
index 000000000000..ac3419c36218
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.72.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.73.ebuild b/dev-python/boto3/boto3-1.17.73.ebuild
new file mode 100644
index 000000000000..359c82c2155b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.73.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.74.ebuild b/dev-python/boto3/boto3-1.17.74.ebuild
new file mode 100644
index 000000000000..5577742efeb7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.74.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.75.ebuild b/dev-python/boto3/boto3-1.17.75.ebuild
new file mode 100644
index 000000000000..5577742efeb7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.75.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.76.ebuild b/dev-python/boto3/boto3-1.17.76.ebuild
new file mode 100644
index 000000000000..5577742efeb7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.76.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.3.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# prevent an infinite loop
+	rm tests/functional/docs/test_smoke.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -v tests/unit/ tests/functional/ || die "test failed under ${EPYTHON}"
+}
diff --git a/dev-python/boto3/boto3-1.17.77.ebuild b/dev-python/boto3/boto3-1.17.77.ebuild
new file mode 100644
index 000000000000..5577742efeb7
--- /dev/null
+++ b/dev-python/boto3/boto3-1.17.77.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=bdepend
+inherit distutils-r1
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="https://github.com/boto/boto3"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="https://github.com/boto/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~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 d706542f3020..1551fdd0dfb3 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -9,6 +9,13 @@ DIST botocore-1.20.67.tar.gz 7691087 BLAKE2B b56cb7e80179b7c5c2b4daa27907870c075
 DIST botocore-1.20.68.tar.gz 7692876 BLAKE2B a5de44db992688a7ceff14e2663e21f370811871d87286215d04db9d0ba9649c67c047b6ec290967eddcdc8cc6fd12bbe9c99589fea183ec2b2036dc69f4d7e6 SHA512 f3de8f5cb621174dc0ed1b8c8d4cbbc3cee56f0b0f4363767cfc68a879fc6e837225e82538640736687efa4340d62ff3d1923abc315f914b0a9189f775c65b6b
 DIST botocore-1.20.69.tar.gz 7695769 BLAKE2B 994e5415c278a0c021deb1749c59ee5c654c7212cc2a1961fb2c528b7f5aea0a4d3f70c88a72489410cda935c8498cb3c4b1ec4830b3150ee043eb3429174781 SHA512 dbb0e77484a545489b54a1f71c78d2cf7d95b7f3a4f4ec54a9c07d7af354e9037d6eaa3100cf6a8e89d778bb0ed19f9475d68dceee98666bd69a4b05662c5939
 DIST botocore-1.20.70.tar.gz 7700136 BLAKE2B ab7ea88763dd4637754a5d9eb955e0947efd9c5fa87856276056d6eaac341f57d5edd43ca830dd35c1283c6f41de43be2f9b06e8f328a8900cde41ec5953bf9d SHA512 d992b88df31a77b153fd3110119d1523587e98d56e4b80ac14d0c5351d76b3e4c188295fbbeafcd8efd3f414a1c0af0d78f21555b2d3285d6f8e88eefab282dc
+DIST botocore-1.20.71.tar.gz 7720081 BLAKE2B 4f5d4f237222a034d2102cb637722c7d63ac34549ca582fce8d7b02a93345cc48067b195f339010a0dd47fa04a53ee4dde5f98eb58a1db3b0d4c958066717063 SHA512 7a9154efeeedc90dd9089641798494095cca9f1967e3615131af154e718081e2ce85e37fea1a729e7d7cd42d2fd6a9f79cae9409ff32aa18674a40a0e2fd0fe1
+DIST botocore-1.20.72.tar.gz 7719833 BLAKE2B 23bdce05a95ebcc162e26e91923999ba50910f2fd1d78830c64ee4cb685b2f58e0f14b71c22d34973e2588590fa8af35868f696bbe7719f710baad49d7d1753d SHA512 d46cf353c1df60e24e8e3def8ccf4821bbc36366d25c073330133e4d6ebf83491c5d82dd708c14df65ebbcc08c7705fd3d1d37339742719bdaf58678e04d7824
+DIST botocore-1.20.73.tar.gz 7725102 BLAKE2B ccb41513630d8016718cba5e7cc172efb985688f8537dd7f434707f05f9222f486a42c3c84cf25edb437836f04d5ae024292a15a2e784c600bbdebf7dc34d9e3 SHA512 7b1fadcc4e337f0c7498b46cbc0779f20ceb864e2b3974c15a947f18925691ecaaf455bfd7de153d26632a2035a1f922c64320887d06203285947b4310f07e10
+DIST botocore-1.20.74.tar.gz 7729804 BLAKE2B 0693da2be219ee140c5c00a540756d31651d3e4c78976a7f766705123e9fba23e98d73e551b86a6b661530c20abb560b0e36fea8e1c13600303894b3163d2274 SHA512 51bcf78c6804b4a8cddd57eeff96d7ecb65731dfbd87eb665de1356c1daedb4317323b3a0d905e3d459800d800ce6d6ffd8fd1239b26ecf56884bee37159f2b7
+DIST botocore-1.20.75.tar.gz 7750681 BLAKE2B 4cf5700ccdd43a7d963fc60c7e0db5204947e6d3c63747882fa01856ab4e97bba5f4174a8f4252e3389d6aa6436473f9124f445a53b2cc4233b8d7ed22cb5fef SHA512 736f9d8e4875fd273e73e25ba791117c146c0facdd68970f8d2127245805383119178faa4c91d9dc43ec045e59bf39dbece40d6946013ce9c8ac3c5d1ef9bd84
+DIST botocore-1.20.76.tar.gz 7755457 BLAKE2B 26246a4118ce32098676b4933548792a7a5290866c53876053c6f509d1695b467bd7a63d994020ab4b8c85b7beefd9e7b06fa6509787d954c2e0e1d16783b7f3 SHA512 43a74493ce3a69d621c8adef18bb39aece146a83a75745ba79216ab839161095c05ed53c1a00edcfba291e7321d28db107c3baee81ae970d5768c2f6dec79c5b
+DIST botocore-1.20.77.tar.gz 7758363 BLAKE2B a441fc84ce0095cbad1df59c26c533c38068574d1a5b3ac68091575d607d0ab5954852a1c82eee1bb394ed8e6789076d9a8ca2afdb02c6e492dbb2f22c8c3e6e SHA512 840b5cd6356ce3d716d8f04ed7a04e5169336444b4f3ad114e1d8122ce999f26ecb57f51c7afec33856ae0f6d68d9a5966a5ee14f1341a144586f0fa2ebfba64
 EBUILD botocore-1.20.54.ebuild 1494 BLAKE2B a255e29174ab1e24312ca7e0ac20a84809bcec4671fc7d885f50426bbb7f6fcc01cf5ac1ac28eb212c755db83c67cc4407d06044d1e1af9f0edc57bfe889d140 SHA512 74ca6dc19bec8ec8fe9b9721a859de82e974bdd6a8da2f7d9f757c56f4df040927b99f5406aaf91ef84c3daf8c600debf697edaf38972c508c316ae4d279a075
 EBUILD botocore-1.20.62.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.64.ebuild 1543 BLAKE2B 4dbb00c06e0ee48235874643d8313bbe9febd72688c640a1927b6087dc76668c5847c6045228542bd307636502c7129d032f7d3729198880af42b987f1434ffa SHA512 3960600a101561e65dd0c209b716c8db550d0ecc953d32647bfe24cd5d5477a06db96d09cb00d0b9d6ecb57c3a2243e542adcd53f12f9a2a70a7c6ae66931e59
@@ -17,5 +24,12 @@ EBUILD botocore-1.20.67.ebuild 1543 BLAKE2B 4dbb00c06e0ee48235874643d8313bbe9feb
 EBUILD botocore-1.20.68.ebuild 1543 BLAKE2B 4dbb00c06e0ee48235874643d8313bbe9febd72688c640a1927b6087dc76668c5847c6045228542bd307636502c7129d032f7d3729198880af42b987f1434ffa SHA512 3960600a101561e65dd0c209b716c8db550d0ecc953d32647bfe24cd5d5477a06db96d09cb00d0b9d6ecb57c3a2243e542adcd53f12f9a2a70a7c6ae66931e59
 EBUILD botocore-1.20.69.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
 EBUILD botocore-1.20.70.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.71.ebuild 1496 BLAKE2B 3b9c7b12c0a7037482b3e60ef95ba87c8659a9d5fb52b562e0a2ad02ce44e84db9b3aca408ede04198c0c58edd4e4e91b8f1b21642493ffbe3b8b6d1d76e1ef2 SHA512 c0a226f08044b1a2c7f69becac5de9b3ad942ce3cefef699f09f176d797bb24f7dc76d3b5795eddff97f0ca52459c3d876a3a67328b74670185e12b80652ae55
+EBUILD botocore-1.20.72.ebuild 1503 BLAKE2B 2f456cdece7e542d46b34789e230f2f30ccd8579178ed9d640ea803c96f0c7de7c2cb52867969ec3e7007724ced5727410ec3a60f3249540d594606db11cd528 SHA512 1469588294ee1f8c4bbffd3879797e8865e56cc8d2dc750669be7993e34ed488677474ea654f4ddfc449b0aaed0e733fbec043fe87d4341c726ed2131bf21b7c
+EBUILD botocore-1.20.73.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+EBUILD botocore-1.20.74.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+EBUILD botocore-1.20.75.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+EBUILD botocore-1.20.76.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
+EBUILD botocore-1.20.77.ebuild 1515 BLAKE2B b4fe201cb962e32aaa0607eb933944c8c502d5b0ddfdbd62d81bced2afbe1f2ac8debdd96c847c65e381a9dfa0991a40f0e896dbb020c1d1208612efe70d1386 SHA512 a87e218981e67e7fefc78d5a2bfab4f7be7f659d44c07875138408ae26dab48b35aba71ca9ab2f83efdb30aff8a63e0df7e05844c0dcca7cea9a830db880bbbe
 EBUILD botocore-9999.ebuild 1606 BLAKE2B dd2cf59015a5d45b8b0d6bf20e711d982d5314d7aacd20ed74f4c93f6d77a2fd753cf97214b7b308ba5a32afeaa32e170195db7269509fc019a0861cd3d5879e SHA512 1363331284892dd6675d5f5a5ad484572ffbc25f262f37eb14688302120a37e41b87ab35954253eca6aaad6c73f7b5221c1cd25a91baee4cb9daf53f0c48cf4a
 MISC metadata.xml 717 BLAKE2B 6b5923518aebfebb4ac5de56ccc51b6d665b81870d4cdd915265ddef063db42dc9b0a4814c8cec71b44cb1aec7050797f6e2ec8f2a499b6c2e16d9cf312f7fb2 SHA512 fef7663fe63c373d775e419b5b5cfc63a896adf32a177e856c42ebf1c7574b3956fa989c30428d9ce69b19ecf68e553f19885fef46cbcaf7b434e27b15022b54
diff --git a/dev-python/botocore/botocore-1.20.71.ebuild b/dev-python/botocore/botocore-1.20.71.ebuild
new file mode 100644
index 000000000000..4e5d698e619b
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.71.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.72.ebuild b/dev-python/botocore/botocore-1.20.72.ebuild
new file mode 100644
index 000000000000..27be94b24acf
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.72.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.73.ebuild b/dev-python/botocore/botocore-1.20.73.ebuild
new file mode 100644
index 000000000000..afca295f8bed
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.73.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.74.ebuild b/dev-python/botocore/botocore-1.20.74.ebuild
new file mode 100644
index 000000000000..afca295f8bed
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.74.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.75.ebuild b/dev-python/botocore/botocore-1.20.75.ebuild
new file mode 100644
index 000000000000..afca295f8bed
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.75.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.76.ebuild b/dev-python/botocore/botocore-1.20.76.ebuild
new file mode 100644
index 000000000000..afca295f8bed
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.76.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/jmespath[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/1.8.6-tests-pass-all-env-vars-to-cmd-runner.patch"
+)
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests nose
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+	# very unstable
+	sed -i -e 's:test_stress_test_token_bucket:_&:' \
+		tests/functional/retries/test_bucket.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	# note: suites need to be run separately as one of the unit tests
+	# seems to be leaking mocks and breaking a few functional tests
+	nosetests -v tests/unit ||
+		die "unit tests failed under ${EPYTHON}"
+	nosetests -v tests/functional ||
+		die "functional tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/botocore/botocore-1.20.77.ebuild b/dev-python/botocore/botocore-1.20.77.ebuild
new file mode 100644
index 000000000000..afca295f8bed
--- /dev/null
+++ b/dev-python/botocore/botocore-1.20.77.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="https://github.com/boto/botocore"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~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/bracex/Manifest b/dev-python/bracex/Manifest
index 1374d3f86e3f..38d4ca61ef63 100644
--- a/dev-python/bracex/Manifest
+++ b/dev-python/bracex/Manifest
@@ -1,3 +1,3 @@
 DIST bracex-2.1.1.tar.gz 26078 BLAKE2B 7313aac70d2bdb8473396a651a5d62a399084a0277e8c4665ef79fbe00347b86fc9793066584275f2a77c6c4cc217e6235f2f06ef4977f733039984c562ec529 SHA512 922f627a001c239cf5ace47fb2f295e04200116add01ff969f8de49067098dea43286c3c739d51286b283d354cb6e411b7e2e6cb1c4863ba78edccc7bd461c86
 EBUILD bracex-2.1.1.ebuild 1046 BLAKE2B 844c5efb128639e7422ed28f57a20779eed057177541d298747e43c1215507bade7abc92d0ed6e6c61a4375d1fdf787224eafa5bbd4a2ada28792f3ca96912fd SHA512 7f2e985f5e91c3b12a638cbe56a935002e1bd5d2f07dcb8943bff239c8cef708995cae19636ed492b8fbf74384303a241f8c953db9a56895bc6275d831b9aa6a
-MISC metadata.xml 1241 BLAKE2B f021bf4d5dace81e1793b1c406b340fda40879d43b45c5671da8b559f06669057e24be540d3fa8f81ebbbcc967e9c12dad360678b1495bcd3b4f9d18387cf101 SHA512 2d9f779d3e054ef89557b7528df5e9a3b9a10f8f2f04db629c1c47007314faa8d83496518477be79a9959cf702a25e4f213935c937dda2411e81d308123c8f99
+MISC metadata.xml 1227 BLAKE2B 13111faa6d25ce2370abe62b735b3686372e66e545542c94cd53622f4cd6fd2b1c9ebaf1f521e4fa6aa9564c4a5f84ea7221beed7abab8455b9bc7571c29b22b SHA512 3476ee8191e6b0d1e4ab7b7b9765852573182f5e2476f24e209c0aabe21d82e66ff180298602efc75de9083fc3504981097b56197c7045e00eaef132c762ef49
diff --git a/dev-python/bracex/metadata.xml b/dev-python/bracex/metadata.xml
index 59ce61ec8aef..8badec61ee20 100644
--- a/dev-python/bracex/metadata.xml
+++ b/dev-python/bracex/metadata.xml
@@ -5,8 +5,8 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
diff --git a/dev-python/brython/Manifest b/dev-python/brython/Manifest
index 88fce6cc4604..f34bc228c496 100644
--- a/dev-python/brython/Manifest
+++ b/dev-python/brython/Manifest
@@ -1,5 +1,3 @@
-DIST brython-3.7.3.tar.gz 10403156 BLAKE2B a30c957925149f1b7eb736c1fcacd171dffb5846f6a343227596e759820c794c265befbb04137e797c1eabe8d9f0a3faa93fe425e4b0c13fda4c78b4c4bb1ecd SHA512 f234c7bc67d935e5bd5bfa8e473bccf90245ab4dabccd363bc5e9e01e1c9ea9d95989c5f8b323c158e286ac4a66106eb07722d1fcc82353ad036e35b4fda5669
-DIST brython-3.7.4.tar.gz 10473351 BLAKE2B c457498d7f9b61ef416d6ec0ccbf86e3fdc7cc55f90fd8a853005285cab814d054319a5437cc24d22d6088af6f5b58da5311c6f68721d7b243fe31ef450c38a1 SHA512 70959debdd0a3e7f7e533f17aa2149802454bee23598d844156756ee6aab697b75337a26a341e6408966036f419696d0f8b073cb5383f32a9f6de65cde2fa40a
-EBUILD brython-3.7.3.ebuild 761 BLAKE2B 35236dc8fac0d6f47e8cd45855538098cd50bc2de66467c552c55885237264913dab68a18671b0a83973c9716e5155fee029f7201863178a56ce889713fcec8a SHA512 ff84dbf08200f19b806d9e109772d7318dfb32fba4e1643023621af992f798e3eafcb1f6a676e5a2b982efe82630bfac73b3406ec051d5c365c96182100a3049
-EBUILD brython-3.7.4.ebuild 761 BLAKE2B 35236dc8fac0d6f47e8cd45855538098cd50bc2de66467c552c55885237264913dab68a18671b0a83973c9716e5155fee029f7201863178a56ce889713fcec8a SHA512 ff84dbf08200f19b806d9e109772d7318dfb32fba4e1643023621af992f798e3eafcb1f6a676e5a2b982efe82630bfac73b3406ec051d5c365c96182100a3049
+DIST brython-3.9.0.tar.gz 10232037 BLAKE2B 4dc70efa14174f90cddd72ba9c07afd7be4fc81cde3f9ace7b5f015acd4cc18e9ab222aded496523f7298cb7ecb93c1d691fda818ef9fe15fabbb876143af487 SHA512 fcacc6f5e959afd2c84980eb0a650028ad018f4ebda05c53ef0a73ef5a8e1b4a28b2940c08f6b5e82bb52975b671610ad47e42de0d6d3030a6b9f5af02784c20
+EBUILD brython-3.9.0.ebuild 761 BLAKE2B 8994e3c54de9d6855e703ad61b38cba69cfc68f34a2699be873e5f3d61650ab5bc749a9a3a9a2ab44eed93746ca4e5902c0f382894f7a8390dfabbafd56d5900 SHA512 e08e84a14f0b1f1e76b3328f4ee198bdeb981b626d88474321510bc961680fb7c2ee8722f45d842b820c60b7a1f98e4e349a7f33d2e711c143072f82d470d85c
 MISC metadata.xml 380 BLAKE2B f28f70695ea35121b72cddd060fad924b95f33449c0c41b01ad55ae7dc2f15c28c6e49c2c3fe49a59e89f533a05db40de9a88d976b213751b2af7a53dd031642 SHA512 ab2ca2fdef7aaf2893c3b2bec50cabb69f907edf3a543c4d0156d2ca9488c2d6642c8c6dd6e0a7c6d88cf9b2bdd4c745b2d7b1a96aaa471c7269f53502c70203
diff --git a/dev-python/brython/brython-3.7.4.ebuild b/dev-python/brython/brython-3.7.4.ebuild
deleted file mode 100644
index ce838901b946..000000000000
--- a/dev-python/brython/brython-3.7.4.ebuild
+++ /dev/null
@@ -1,38 +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 webapp python-single-r1
-
-DESCRIPTION="A Python 3 implementation for client-side web programming"
-HOMEPAGE="http://www.brython.info"
-SRC_URI="https://github.com/${PN}-dev/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}"
-
-need_httpd_cgi
-
-pkg_setup() {
-	webapp_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	dodoc LICENCE.txt README.md
-	rm -v LICENCE.txt README.md bower.json .{git*,tra*} server.py || die
-
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
diff --git a/dev-python/brython/brython-3.7.3.ebuild b/dev-python/brython/brython-3.9.0.ebuild
index ce838901b946..864d481de5dd 100644
--- a/dev-python/brython/brython-3.7.3.ebuild
+++ b/dev-python/brython/brython-3.9.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=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{8,9} )
 
 inherit webapp python-single-r1
 
diff --git a/dev-python/cbor2/Manifest b/dev-python/cbor2/Manifest
index 004e1dda2eac..9d7c7a72cf4c 100644
--- a/dev-python/cbor2/Manifest
+++ b/dev-python/cbor2/Manifest
@@ -1,5 +1,5 @@
-DIST cbor2-5.1.2.tar.gz 73247 BLAKE2B de033651c0483aee4bb3bb31f9a997bdd6329c2941dbde65acabe7f7a3bfde37ab0322085a3107fb581e36cb6792cfb4fcf07cdbedfcec4a18a907582081d141 SHA512 81e4c3e8c727fea6db8bbed657806ace8777d8ad157395de3db7f0dab369abcd7f173f0cfad538c325a49bf90b450eab16ad2f4aa4f69c324dd0807ae0ab556f
 DIST cbor2-5.2.0.tar.gz 81467 BLAKE2B ac35cf682f15eba2c2bff81f562fe2f22906ab8da39c04cbf65f403eeacb5e640e200b15a8cca0d7eede1d0106cd8674640b3093d166a4414a2d42452a374322 SHA512 101aed37c3921ace2f4a5fbb9964ddd2ec2ffcd23fb1a9f838b2f8925f17ffaf5eb39a40b5426e176f0c97a2ba1d3a045e96ceb53312b283101900eddacc6af4
-EBUILD cbor2-5.1.2.ebuild 791 BLAKE2B 4857cc41aea07863c682974d6fa84cfdaa2924f7bdbb434682fbcfd681ef142debb90ba4eb8a8bf21a80be3479aa0fe11b35bd942b2304a60cde081267637c01 SHA512 faf1ae283ce86f9d59849e32e618c5380491511d8f9daa45b3fb64278e214448ca9032064ff632dda825e4f5245b8b4336ad9c6140cfea2cd8bb428b683c0033
-EBUILD cbor2-5.2.0.ebuild 895 BLAKE2B eacb6ba237f46e6cfd783633c75331fb6792143759eeddde8b434904dda8e390bb5a5102e03f2598b1082e37cfc91148c97f3080ef64bda8b49922f5bbc42311 SHA512 bd9482420502781d41425399238c8410219eb28711f4f321d37c83111125de5e5073db5ce713a5ba6f3b6be80fbcf56eaac9f7ee520b0884dd1c0b3d9863a44a
-MISC metadata.xml 893 BLAKE2B a56c40664c6526d741a1f4e6be15cb582e0a0402182545262e3f1f489441e94a2c17072c01797e95cbea02d40b2d6addc14027596e4cd2fa49ccb4cb0feadd09 SHA512 1695d3be04f9cb86ea83f3676f5e8628b196b7044bee019ba8ce234500ee1501d013144155fe86ca8f21a10abb35074cd98fbec7da9db7f33c1046229fca9f5e
+DIST cbor2-5.3.0.tar.gz 81162 BLAKE2B 41bb0f74998260e2612dbd1990970554b906eaca40e52c21fd90d026ce0aad706830b98f10a226bdc23b819d3f1c52f93f25892a1de04f2a673b4d150a5c47fa SHA512 05eacace46c4b2f7025f12613ae6a755aa7fab14f15d0131d4d856ec5c37bea547d3c4a8afdde28c8653139be741f47351de5460df7dd3ec662325c8d1e2f3fd
+EBUILD cbor2-5.2.0.ebuild 894 BLAKE2B 36b608216833f231b1474c89d4eb003114e1b1de750ff2044aab51af212c48010275d67ba2849063bed943b423d6cede889cac39bd0f0b215dddd71e213a138f SHA512 32d3439ee5126da0d3574f81683c1b776a8814e7c7fe084f12f54dafaec703c6da3cd10e365ff371bed5a24e5da954399724cf6384417cf69e384fd85a12700f
+EBUILD cbor2-5.3.0.ebuild 899 BLAKE2B 891ce27fc81db3a0919f1d07ff263ff8ce877167cc67a239665d624fffef815aa6b7ce8dbb2b71a7652ad284cd174dd868e93ad252ccba029f424284bdb42939 SHA512 ac98609861521912d390393af8faebbad69c8c53849ed86c2ec4a7aa4ce72671c0932a93db44fe384425b1398e4ccb887d49d6156f6dd66e07b2f01fb6f97f21
+MISC metadata.xml 994 BLAKE2B 1cbdb43b43bbbdc4eb6e316cca38500fcb11bcb2f4114ed4febda09976b992c5e033b42a8d2669c785a54d310c0513fa665b77f40784a91244942556c8dc0a61 SHA512 977635a48f9e914c7c6d9cdb7acdc4db5eef968214a3e814bd448fda55f418402672f58405278e3594b43cd72825e053cff0a3a38f31d556fb898a190755a4b2
diff --git a/dev-python/cbor2/cbor2-5.2.0.ebuild b/dev-python/cbor2/cbor2-5.2.0.ebuild
index bd8736fafac9..ee466b902b56 100644
--- a/dev-python/cbor2/cbor2-5.2.0.ebuild
+++ b/dev-python/cbor2/cbor2-5.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 arm arm64 x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/cbor2/cbor2-5.1.2.ebuild b/dev-python/cbor2/cbor2-5.3.0.ebuild
index c07d3571b952..36bd7a9475e0 100644
--- a/dev-python/cbor2/cbor2-5.1.2.ebuild
+++ b/dev-python/cbor2/cbor2-5.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -10,26 +10,13 @@ DESCRIPTION="Pure Python CBOR (de)serializer with extensive tag support"
 HOMEPAGE="https://github.com/agronholm/cbor2 https://pypi.org/project/cbor2/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
-IUSE="test"
-RESTRICT="!test? ( test )"
-
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-
-DEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
-RDEPEND="${DEPEND}"
+distutils_enable_tests pytest
 
 python_prepare_all() {
-
 	# remove pytest-cov dep
 	sed -e "s/pytest-cov//" \
 		-e "s/--cov //" \
@@ -38,4 +25,16 @@ python_prepare_all() {
 	distutils-r1_python_prepare_all
 }
 
-distutils_enable_tests pytest
+python_test() {
+	local deselect=()
+
+	if use arm || use x86; then
+		# https://github.com/agronholm/cbor2/issues/99
+		deselect+=(
+			tests/test_decoder.py::test_huge_truncated_bytes
+			tests/test_decoder.py::test_huge_truncated_string
+		)
+	fi
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/cbor2/metadata.xml b/dev-python/cbor2/metadata.xml
index b7664ff5cbae..1c59c72b4f93 100644
--- a/dev-python/cbor2/metadata.xml
+++ b/dev-python/cbor2/metadata.xml
@@ -5,6 +5,10 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<maintainer>
 			<email>bolson@bolson.org</email>
diff --git a/dev-python/cfgv/Manifest b/dev-python/cfgv/Manifest
index 6012df941a35..54cc779d7f08 100644
--- a/dev-python/cfgv/Manifest
+++ b/dev-python/cfgv/Manifest
@@ -1,3 +1,5 @@
 DIST cfgv-3.2.0.tar.gz 10268 BLAKE2B 26cd22c1ed7b0de48638d2bb0e30a4ac0c3060d5020d04c29ca5c41c1337531d16a1c7de6e66044e90c3b0dbd5f4b15ba6c3dda2ae73953b8d6be3f74825b813 SHA512 6f1a54b505d298a9806a739edffc79feea41638f766ddc25f0712001e5bceb206153e3a957dcf4909fbe125b6e9bd077aba6317d00e632a06ed24f1dfd06c555
-EBUILD cfgv-3.2.0.ebuild 456 BLAKE2B 31422d254b3af7c9437a652383ef39766c83ff289fb413b756a12ac23083a2fba0a38f434c381df13afd37360cfba751bc6040d351c2ec77bf73f512d0099e6f SHA512 d79a92d2a110413a89ff87a5c2f54db84437c739c695a06242752828900a261056b778489f72386d5f6ae49cd64e343a6a3a7c4d0dbd29ada6cf736c379fbe76
-MISC metadata.xml 365 BLAKE2B 9c752d069c760f7d8894c399615101672a9e500765473424b73d990a915c3786626d6027ce8a1a5f09d1f9cf076d65632110c2a7497700b04baba088b04d4137 SHA512 cd6472525b579d55529e0084cb0b1cabe0f798172fcad01c77aed79c054859dacea8357e646ed47ceac06fc56010c4d7282a6751eff931930379ba54e252127d
+DIST cfgv-3.3.0.tar.gz 10393 BLAKE2B d4cf565884aaab6a81716382ba8e3244e36a3381b771f7e206053fa80500205bd3b70b62b611ce4a7f0cb143a763d51eb10b1e29333b7f06e29cb406f9f7f6b8 SHA512 23a238c76635404b150bbc3bb1eafd8eb521171e69bb3f3fee55a0a24c12d2ee152cc7453a41952d2f41a6cb72575dacf4b990dbd443f69026a770c87a1e081f
+EBUILD cfgv-3.2.0.ebuild 457 BLAKE2B d5cb4e59f393930f8082a948aaeecf92245e0a670ddaa664ef77f49613265fbd5df3a00728a939802f1792ff4fc1150a4cdc3187e4309978ecbc9b5948ebdaad SHA512 8df2ae37ab96880cf0e66f16409f3c87b317b7bc3004d2f552bfb343c3a1af4e051f1183e4f5653a9f23220394583e3a96f30f480fee7ad2df8d5770b393dbbf
+EBUILD cfgv-3.3.0.ebuild 457 BLAKE2B d5cb4e59f393930f8082a948aaeecf92245e0a670ddaa664ef77f49613265fbd5df3a00728a939802f1792ff4fc1150a4cdc3187e4309978ecbc9b5948ebdaad SHA512 8df2ae37ab96880cf0e66f16409f3c87b317b7bc3004d2f552bfb343c3a1af4e051f1183e4f5653a9f23220394583e3a96f30f480fee7ad2df8d5770b393dbbf
+MISC metadata.xml 490 BLAKE2B 095a603aa93c514e7d04381159b3ab9442c329dc4270b065bb347671bc00497d7d8094499f45a9b0785f75c6f06a97669f3c1ada39d582065743697726cac1da SHA512 bf284020d3c30c217ffae1d1d114eb3e93d114a6bed44c6dad87abbe11903204cbf300453b7a46d86d2f9575428e8f6c10ea1f7e3c53974704b34f4aa9d3878b
diff --git a/dev-python/cfgv/cfgv-3.2.0.ebuild b/dev-python/cfgv/cfgv-3.2.0.ebuild
index 84c01def37c1..f99bdc112346 100644
--- a/dev-python/cfgv/cfgv-3.2.0.ebuild
+++ b/dev-python/cfgv/cfgv-3.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/cfgv/cfgv-3.3.0.ebuild b/dev-python/cfgv/cfgv-3.3.0.ebuild
new file mode 100644
index 000000000000..f99bdc112346
--- /dev/null
+++ b/dev-python/cfgv/cfgv-3.3.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Validate configuration and produce human-readable error messages"
+HOMEPAGE="https://github.com/asottile/cfgv"
+SRC_URI="https://github.com/asottile/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+distutils_enable_tests pytest
diff --git a/dev-python/cfgv/metadata.xml b/dev-python/cfgv/metadata.xml
index 36ce4383b7ec..95670a0ca366 100644
--- a/dev-python/cfgv/metadata.xml
+++ b/dev-python/cfgv/metadata.xml
@@ -5,6 +5,11 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">asottile/cfgv</remote-id>
 		<remote-id type="pypi">cfgv</remote-id>
diff --git a/dev-python/cfn-python-lint/Manifest b/dev-python/cfn-python-lint/Manifest
index 8938e7117c6b..17de08045510 100644
--- a/dev-python/cfn-python-lint/Manifest
+++ b/dev-python/cfn-python-lint/Manifest
@@ -1,8 +1,10 @@
 AUX cfn-python-lint-0.30.1-tests.patch 621 BLAKE2B 7b4d457c56f32799c0da0e1e1f6551b57b89b08d7916a5a4b5c8c59605bb7dbb2393d566afc0da606103c09226b61d8a85734e124027ed81d46d405d18079778 SHA512 bffe6e2668dfb16f09ce20b784fb33a4a19cfbee832e6107601bd0bbd60c3f4e3b7debb3c3c320b87223dc584f054b6bfd1c19251ce17bf0b978d0b3e0b28088
+DIST cfn-lint-0.49.2.tar.gz 7012647 BLAKE2B 1508c7c2c400ea4fdd878961a00d79b6c464de70f6ff5269069c73d4c524317e37e9431fba0a686da16958b7c575d4d3629a83c31c3f89d81a68f5c320355b14 SHA512 7e7b97d727b06649b2a56b67f1251c24df2646c9759821a7525842796a81e834f560fe5a09431220ead9fd68ad0fa9978a65bb1d9bdeab907aba0a76095fd712
 DIST cfn-python-lint-0.48.3.tar.gz 6758651 BLAKE2B a8aeaffb0791789b25c94c630532ced223432f9902cf60664e4b111d162b4379d6307eda5c8f8074f7d2917ff25f44657016894b2140c8ea1dbf3259b24dde38 SHA512 ab1555719edb9b3541bfe60ce2701cca9e2ab9f4627c1b46ab8f4920477531f56f14f393b3575525da81b6aefd087b6c3cac516bdd6eb1db0f31304d7c63e1cb
 DIST cfn-python-lint-0.49.0.tar.gz 6797106 BLAKE2B aa60c3e5eb246c45997af57f934d2710b56c4966babb61f56cc538c49606e3befd130f6a4298b124d38401927ae40127e699fba6a1f69ee177c07c9bf5d880e4 SHA512 4b656cda70de686aa3bb404908eac6ff66cabc0ebb064d5ccbe554a10551e8a5a7a308e3480826ec52b87549a8626f2a9cbbf51bd44613d94344db8dcd4443a7
 DIST cfn-python-lint-0.49.1.tar.gz 6906770 BLAKE2B 3115e610a73f072f56f0ed45ab8c88f7a906115437081d8974a135b3a9fbfcec4f677bdc108fa0ed37814caa6f0cc1e22fa7892d715c658e9ef05c8299f377a6 SHA512 4ceda24495aa43ad84ca7e63aa566521aab339f01308f5754372289a7f595d6805d6b1ac9bf637ba20a05bf17b93f8a06d5d1fd4dca3b8955094f54a62e28313
 EBUILD cfn-python-lint-0.48.3.ebuild 1483 BLAKE2B 2de36bdb65abdf149877d30946aa66f0efb98dbdc5565c92057cf4816927f41c9c25ef1cb90897addfd2abf4a848894d66fe4dbede79a5ba5189b22057cfc212 SHA512 586341992bede7e42382291461e209770a7bc68973e77690d1e04b8e31979851dfc9d01a7e70a45e1b745822c859fba77b762df4a394b50ba9e99b97dea24140
 EBUILD cfn-python-lint-0.49.0.ebuild 1491 BLAKE2B bbb73fd49da8e4b39f1f8c45e74b5d6409bb9dda232507e791c7a71c9685dc115738acbaa3691a911d5cddfa208bd5bafaee9bba32fbf7c84b9d3ce020ec453d SHA512 9a388963a5515ef9eabf73e658cd7211ba39ada1dcf5af2cabad4e12f5c4d131899ffd8ac5af0e1981f15de81b20e8a4907ab4a28faef029a97ac0828e36b35a
 EBUILD cfn-python-lint-0.49.1.ebuild 1459 BLAKE2B 62ab02c3802e40e0d73a24515ec6aa2bd26c8847b92929245749dcd5bde5fb0e9ee2e875c5dd93889b780ab569dc7d966252bdfdf2a46770424624a363dd74ee SHA512 7678d1535878a883d8f82d90a1eb8aebacf0206faaafe227000bc00d6b34a0adada5e309100603c0e51c8bb61396ced987473f28b78c7b65916011179cd33c6b
+EBUILD cfn-python-lint-0.49.2.ebuild 1530 BLAKE2B 5a1525088ade4585c5f63f1f8f9e8d14d7bbb0ba9a94453a068f0a575edc82070ed3949f4dc02cd77a75e4e5559b989d592ea26d0b4341e81fe8f36dcfb2c103 SHA512 6ea6d582eac21fb08199dcb3589d704b7b81c0836d88cf648df6e28616d5348644f3bf74cb780189e99351e833d9c768f9290520380f7fd6f53aec9a1682288e
 MISC metadata.xml 596 BLAKE2B c9937cb001e177c18c65bff8b70940d241e54f58aae3818071510f1c73540fcac6c532c8700b4904d4e2c9382f8a5288a2cb8745e174b8ac0a4edfe114d78ff5 SHA512 40c20431d8132ee97311a23bba87d6b408297410573c191f8fc43282bd156884adc25b6ceb6f2168d3456d535c4d82fb3473dd9025bda276f6aad829f68a8e37
diff --git a/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.ebuild b/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.ebuild
new file mode 100644
index 000000000000..8515392b1031
--- /dev/null
+++ b/dev-python/cfn-python-lint/cfn-python-lint-0.49.2.ebuild
@@ -0,0 +1,57 @@
+# 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
+
+# TODO: pkgmove to cfn-lint
+MY_P=${P/-python}
+DESCRIPTION="CloudFormation Linter"
+HOMEPAGE="https://pypi.org/project/cfn-lint/ https://github.com/aws-cloudformation/cfn-lint/"
+SRC_URI="
+	https://github.com/aws-cloudformation/cfn-lint/archive/v${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-sam-translator-1.35.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' python3_6)
+	dev-python/jsonpatch[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]
+	dev-python/junit-xml[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.15.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.11[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install unittest
+
+PATCHES=(
+	"${FILESDIR}/cfn-python-lint-0.30.1-tests.patch"
+)
+
+src_prepare() {
+	# unpin the deps
+	sed -e 's:~=[0-9.]*::' -i setup.py || die
+	# requires git checkout
+	sed -e 's:test_update_docs:_&:' \
+		-i test/unit/module/maintenance/test_update_documentation.py || die
+	# requires Internet
+	sed -e 's:test_update_resource_specs_python:_&:' \
+		-i test/unit/module/maintenance/test_update_resource_specs.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/cftime/Manifest b/dev-python/cftime/Manifest
index 28ed11bfeb2b..7f40857dbced 100644
--- a/dev-python/cftime/Manifest
+++ b/dev-python/cftime/Manifest
@@ -1,3 +1,5 @@
 DIST cftime-1.4.1.tar.gz 46721 BLAKE2B 903f8c042b6f4738893ee54c9d1b862f6f29b42c67b45800d21e1215979c95d985d56eb234dd52493da331c30b2b55c5c1590b51822bb87eaada7dd2879c57b1 SHA512 2d07b8f423e9945b1ced2e89f03965df5c3b25f932b0e7ce893a6cbd4568c93f0abb1d8e6efebe2cafca2ee19259f3c0878fec4fb91f68bf5dde1ccb67bcdef9
+DIST cftime-1.5.0.tar.gz 44972 BLAKE2B 515b5025987373499af4ce7f7e1b3001112c5ce1810a7a4a7825f57163815f7784682e3cfdb97a23507848e64689d2e6433be406ca217beda513050bbc66ea8c SHA512 8607d12ac1333e47de1976b0efc96f0f2a141cff19291974300c23b35ea9e389e698de0dc8fe5303b2686c77750e8d4017670c697de16d989c689391109ec510
 EBUILD cftime-1.4.1.ebuild 640 BLAKE2B 210f22b81888505c817c4ce42144fffc9525f63be92b298b7c2a4df85068a8963cbad77eb9535446e0ec0061d1d75559577d09d9b905c3180ae7203e68f701b9 SHA512 a9e5653b73c8d4c931cd7d5909b41f0c6c04252e26ccffbe703a18541f5c38347ad002015ea67cbf71234e3bc9b8b7ea2df6cc895b15aee4792bce9884067d6c
+EBUILD cftime-1.5.0.ebuild 641 BLAKE2B bc5965355fee55317d94ebeac822eeb51bc222519537526a0db300b3258a8799cb97e9c9cc03e0aa63e0b336cbaeadfd84041f2111cd5fabbf1030e3e10044ea SHA512 b39c513482f910d1b57443ec09143a8120b4c5b5eeb7e603f9a7d4eec42502eb06081144c671cfac64f24a8f13dfe329dd09536b564835d0d049e6df713ca5e7
 MISC metadata.xml 477 BLAKE2B 2a58e3eed817ebe59f85ab9a43d5c4d89cc46e492808baeeb52b5f35d2b1002cd9b219730be561b79aeda8f13432027784e3eb6f0731db2a755c749ded6ca919 SHA512 5a7cedba92edbfd654eddb4b76177913a8dfe88fb634b184c773460d549822488d832946af3247c5d11fe14626400e81d804cd106b92566cbf6fe6601deaab69
diff --git a/dev-python/cftime/cftime-1.5.0.ebuild b/dev-python/cftime/cftime-1.5.0.ebuild
new file mode 100644
index 000000000000..f192f36b4209
--- /dev/null
+++ b/dev-python/cftime/cftime-1.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="Time-handling functionality from netcdf4-python"
+HOMEPAGE="https://pypi.org/project/cftime/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# remove pytest-cov dep
+	sed -i -e "/--cov/d" setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/chai/Manifest b/dev-python/chai/Manifest
index 76f1711d976d..b93bba2a696a 100644
--- a/dev-python/chai/Manifest
+++ b/dev-python/chai/Manifest
@@ -1,4 +1,4 @@
 AUX chai-1.1.2-drop-Python2.patch 915 BLAKE2B df25014f5b067205d3506d420c0dc4925e17ca893212f46f29278738f5d008b9ec34eaa07090af33f22255538d50de49fabf4803edd7b6827b26a6cdd07f44ed SHA512 8278c76ad76c68c7a5cfab6bcbcf7a9b690c736d8377a05c9764f368f32b4804e980700cc7299cd758439168e222b0971f97a02bb99d936d511f648f3400fd30
 DIST chai-1.1.2.tar.gz 107807 BLAKE2B 6cedd108f7275c3dd03167c7ad49695d95c27e1b0c752247e170996f001c7690cede7c7ac8de8e374077ea9802534b8386b0bd2da7197f0a47085ad9f9e470fc SHA512 81191b11a8c5c6bd1fbb0c43fe7855d6e6d9be54b4d0ddc42582a23b9df03249a91ba8ca50b5b74e76aab73a101377624e041b6c47ea6cba5267d4b58eaf77e5
-EBUILD chai-1.1.2.ebuild 462 BLAKE2B c8b6f14753c48788cfe2cd1ccf711239de3464da12282a798b1d57a7d8f460043ee652de75504c679fd280de052417a23fc23a444230a28af9c195b953acbb07 SHA512 e2539ee8aed386fdc825a516218acf88fabe8e3559ce3a9ceb3313081add61c30d5e87081879184320a714dcb1147a09b39e55f75aa8ffb854184091b7627dd3
+EBUILD chai-1.1.2.ebuild 464 BLAKE2B dfb7c043c116cf8c6d1a10d12445f04458b11df734a6cd9fb11de30cf54953d32123729a5d10c1bbddd79b5c75c89154cf27a43de1ee351b6553168cc4c4244f SHA512 4bbc86b1ca85cafa3c6fcac29be7a60194f95b8551d7654bb531660a58af8094156b7875ebc389adf2e25bfbd3f0ab6a239977c12e61a1c9cfbd7c6d19ae3dde
 MISC metadata.xml 362 BLAKE2B a057b85c0d2fe96df8ce55659ea49afeb05138143fd5e8a981f1c8b7c1397e90de017c268a1106ba4ac9a060ed9dadee54dfbe65e048d0979bf7d5a2c426665e SHA512 3526122d7650db77057caa9715a75b2e19b848349bcb2c446795c33b08afb91c23200a7ab509e23c6458f60473880792a7022d766a06229be43f29d2f67596d6
diff --git a/dev-python/chai/chai-1.1.2.ebuild b/dev-python/chai/chai-1.1.2.ebuild
index 1ef68cb1819a..7358d7bf3d5a 100644
--- a/dev-python/chai/chai-1.1.2.ebuild
+++ b/dev-python/chai/chai-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Easy to use mocking, stubbing and spying framework"
diff --git a/dev-python/chameleon/Manifest b/dev-python/chameleon/Manifest
index f7438167ed2f..9dbfb169e834 100644
--- a/dev-python/chameleon/Manifest
+++ b/dev-python/chameleon/Manifest
@@ -1,3 +1,5 @@
 DIST chameleon-3.9.0.gh.tar.gz 136548 BLAKE2B bdea62d4eb13dc6e830fccf72c7798c97f1f3a72c8f749ce43ce53ea0a3f8521f52f86591796d2850d84d8ee53a22a976e45f9a8b51f6ea2377dce10b8e2c226 SHA512 72cbd21f083d14b056539c515e43daaca01d923e065b6eca511f4e09486eb8e3fa61d6823dc78cca75f71926050aa04e0f961c9ddd728e15f55408e405f3c7aa
+DIST chameleon-3.9.1.gh.tar.gz 136555 BLAKE2B 277df179cd26f1edc6513bc6a80d6f7a7f9f95b1562efa23f454d7055ffbeaf59d7a726bfe8969505b0839138c7f97fdb810754bb0342060a79b23abecb3ad36 SHA512 53b0aeeef89df7cacc299dad20e05023c638e708604876ce5269f22bab00e5001b640123920aef0ef9a0f554bbd37d151bedfdfe55ec161defe6b6f3781d841e
 EBUILD chameleon-3.9.0.ebuild 540 BLAKE2B 5bc333a3b82ea39f9485cb01f705f3017a3835bfba135be883bb4728c6691848399752d6c88b1afdf51c717d5dd78280fd9689ec7118364cc29d31138f09dc10 SHA512 9824db5f77fcf3e76c9b8cefc1cb34cf9e7cfe7e7dae55ab8e08126610790693ea1efa308942eeda86f78f8064986691dbc4ed3c726b4bf59d1732b7559b2ad2
+EBUILD chameleon-3.9.1.ebuild 544 BLAKE2B bbfb016f22dea3c6fffc13d6db59db67345e174d1580b70f18df36ae3a9dda15a58816aac9ea0a73cdc0f8d6ddbe758323fbc1d5c7c0c3af39149db6221a0f70 SHA512 d787ae92bf985d9ab24c0c4293f298d0ece9df6a67dae5c479d1076c5f466cc749e897422669cf54a709fc3c18453ec8c53b6736113d5d60089c8254ca93b31e
 MISC metadata.xml 392 BLAKE2B bc9c178a8aa25e5dda53e20ec371ee84bbe8f75e17d426b5c9739a8d438aedbe7329d085c311ce2e5e5ff6d54b4ac676654608baf7ffed39be033382c1c075c2 SHA512 d9bac397232f6ad4c24b72c75dd97f57fad3072f0ba4c898ad75137d6c88e5ad1b71b5b89b251f1cc5d2e18e189f7a41e9cd7a6e369e5992b88594ad8f6a2e33
diff --git a/dev-python/chameleon/chameleon-3.9.1.ebuild b/dev-python/chameleon/chameleon-3.9.1.ebuild
new file mode 100644
index 000000000000..3b8882cd9add
--- /dev/null
+++ b/dev-python/chameleon/chameleon-3.9.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Fast HTML/XML template compiler for Python"
+HOMEPAGE="https://github.com/malthe/chameleon/
+	https://pypi.org/project/Chameleon/"
+SRC_URI="
+	https://github.com/malthe/chameleon/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="repoze"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
+
+src_test() {
+	cd src || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/chardet/Manifest b/dev-python/chardet/Manifest
index 552017b9a2e6..260e0a5de443 100644
--- a/dev-python/chardet/Manifest
+++ b/dev-python/chardet/Manifest
@@ -1,6 +1,6 @@
 AUX chardet-3.0.4-pytest-4.patch 802 BLAKE2B 64992866c2f101b41f525a0f8cf642774850211f434b471dcfa5aaadcabd5ceb573d5b902f6cdecc2f651a71dc8955204f13beb8a5261d4d0ff3aa6703a4266d SHA512 ca99abb30e8e221b43b7467cfa385c0abb16addd4befd149e35208278a25faf07dd99edd20595be4d0d0d0afdf81602b47e0110f4e9335ef90f5b4c41b54b0ab
 DIST chardet-3.0.4.tar.gz 1872214 BLAKE2B b93e2d3e0b5a5c35affa5e3ee661323029f79837a1222d8f69db72911301d9490c9788d2effc577eeeb2a50334cc855afc4bdf4b8dbafb143fcc411d93b824a9 SHA512 b433ea0e15e200df968e6d61c671c42fbd77e519eb033035c4a5c241e1f98e1dfaea6747af632788507583b3ef85b00d510b3f6ef5cf58589ceca1b3a088b357
 DIST chardet-4.0.0.tar.gz 1923933 BLAKE2B 10dce34cbe6f01536a526931510ed625bc5062335e9419e24c9e48d5697ebbe70dcc54ffaa976ec153340cc74c3086627a3b1dd9e34be32c89a9a81e83fd70d0 SHA512 cb0e052fdd9fec251ebc6eb3f31ca95ece017f2bfa99122997f989286988058ed9688e49d00631c63d8e4e52da1050e23f02b28d0e739aee7302b24c8808370e
-EBUILD chardet-3.0.4-r1.ebuild 866 BLAKE2B c48af839038c382b73e7ead83a1d91ddbfdf052b9715e23cbbe91ad4fcb9adce90c868d79625bd02e1cf37bcd48c92c96e03660370cdf7189c7a3f912286d22e SHA512 fd32a47854d78bbec4ecfe08c1a8e063322e32413951e3561c538b812af4f0de13f72918cdfcabb00652ae038b65009fb5c59082b7cc6bad90c2dfd4ea8021dc
-EBUILD chardet-4.0.0.ebuild 686 BLAKE2B f3117937bb8e03cb131691fb7984cb08f0cd90171b4f1735a418113311182533a3979f614ae1cf1935bc4101d660fc0f14fbbcab5b085bdffdc30575532bb9bc SHA512 7a273769a1fd36de9c2f54ca0682b031783c3807cd220e6d65b98616e8f3be2178b9d291bfa9cfd676012e4108ad0ef925645252dfd21142a64decb8a556bbc5
+EBUILD chardet-3.0.4-r1.ebuild 832 BLAKE2B 7ef13790b3126a4089ff258df0d227f3d10e7bb1f719467876391a90914cf362acb9c317d77de286f2262b0d662d62894e405ac23cda04251c9aeb550764c1e1 SHA512 42931d0e260af8f161d28feb684534adfa5474594377686fe563e306234e8cb619714bc45ac853b8cd9d8b9925453bf34fa49ea70e686fd9e143afb9e12c96d2
+EBUILD chardet-4.0.0.ebuild 652 BLAKE2B 8c753c3694a2c5124427df5bf58fe9dd0fdd033eced871625cd8e1953b347ae2695dce0ebe672c3540f0e46c2ed3c6e34b07e5db1cabeab1411aeef328093b0d SHA512 34b526d8d2fdd272986f0e2af2fbeb8a09eea4805ba1a68ab11dec0f911d401afdcf2adb26f5d31c488ad3c9b384e9bf68692952206dddd456d943d539bfabe3
 MISC metadata.xml 402 BLAKE2B b94ab4e878e2f8884e66e3b5c2518433bcf8ba1cb97eca2d846f933ed421eb73d696b3fd9c657e2c8220c423f64093e939dbdedf4110ea1aaf4f074b064d63fd SHA512 85a298436cd67da0ba9e85df4c0d95acfea601e4758f90da4dd8725797fbe5d31c658e95b432ff8f987d6bb6d4191f3ea1ff07aa200f5e361b774d5923558d3b
diff --git a/dev-python/chardet/chardet-3.0.4-r1.ebuild b/dev-python/chardet/chardet-3.0.4-r1.ebuild
index 642dd0038b64..747b00b7e042 100644
--- a/dev-python/chardet/chardet-3.0.4-r1.ebuild
+++ b/dev-python/chardet/chardet-3.0.4-r1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=6
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Universal encoding detector"
diff --git a/dev-python/chardet/chardet-4.0.0.ebuild b/dev-python/chardet/chardet-4.0.0.ebuild
index 6c3731959e0f..f8886d76e437 100644
--- a/dev-python/chardet/chardet-4.0.0.ebuild
+++ b/dev-python/chardet/chardet-4.0.0.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Universal encoding detector"
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index f2c87dc11bdd..908b901e488d 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -1,11 +1,7 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 EBUILD clang-python-10.0.1.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
-EBUILD clang-python-11.0.0.ebuild 923 BLAKE2B 6a6b3667dc21ef2b35e45e4f57db9d854e40b0ea7e49c4cb92ff1979987afb31c33d5d8b57730683b6acb682702c4dca69aa200fc162c60586a9d880b3c290b2 SHA512 d6b0916aa0bd83c3529b9c106ac8ad75c4930aa620cdccd4b1e3e0d7a54fdec0f8d5cd430cddd64a0a7389b1ca6f3a5b142d433691eab4356f72d52c40010e44
-EBUILD clang-python-11.0.1.ebuild 924 BLAKE2B 78a1cdf53d24ec466a677857d438f341595bb8f9b9cfcb7d8102bed1131068d5140f3dced794e52de9d6f6d3e273e60482554894ffd9326dad976d6bcc7ac72c SHA512 16ef8f0862afdc31cacf3d3c5e23f3af94d9f4178656b2cf65bcb65c9f3969fa86fab5d43b9ece4cb237842fb650e0756d59078bd8390466289c02d074ec4c16
 EBUILD clang-python-11.1.0.ebuild 925 BLAKE2B db1ed6c8b6f6f156350e4b29ac9292b3a941abaec52a4a41b41f7e3a641cfa2ae9085f356000bfa361fab697299509193b3d20c1300f0514ee72b368daacb382 SHA512 ca8e1aff2ba826ee9c1e7d5cd9d851bf3fa935e429b078a379083be4ef21de0aac62d2efcee9487a4283dd8a81bcfed05ca55116c2b89e8febe45a4af9a30425
 EBUILD clang-python-12.0.0.9999.ebuild 904 BLAKE2B 22ef0cb9f276007d069b46abebbfbe6b31558f0588280ab48bf693a3d23cf233f6d2f562131f43eb77776445deb5dc25084980c775fa0185cd93d776773ffaf0 SHA512 7f09a06f1c45ac93506aa40ee060104d8df1acbbef4e0852f277d6687cb4c8f9541e6438c6e769c730062570dec51c179539e41a9cdc2d3b492cdd6147733ed3
 EBUILD clang-python-12.0.0.ebuild 927 BLAKE2B 1e0d88215cd7bd7a7968fb00e5c91e10b894750a4ec77a4413d5af19bb93e422b59204e2f62b90ceb628846fede7ed534424640974fe9a3e2d881aec0ccca02e SHA512 11d64eab9433584271e4c97f7af0a9e2762126c3eefffe0f19e74ffdfadef6852aea59337c2fb604daad3c8b3495a3ee2e1a015c20e14eef673e2dacc8304fdf
diff --git a/dev-python/clang-python/clang-python-11.0.0.ebuild b/dev-python/clang-python/clang-python-11.0.0.ebuild
deleted file mode 100644
index 482c6e5d02e3..000000000000
--- a/dev-python/clang-python/clang-python-11.0.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/clang-python/clang-python-11.0.1.ebuild b/dev-python/clang-python/clang-python-11.0.1.ebuild
deleted file mode 100644
index 9bd56b2f3b04..000000000000
--- a/dev-python/clang-python/clang-python-11.0.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~x86"
-IUSE="test"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-RDEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/click/Manifest b/dev-python/click/Manifest
index b9216ac37d59..712605a9df1e 100644
--- a/dev-python/click/Manifest
+++ b/dev-python/click/Manifest
@@ -1,3 +1,7 @@
 DIST click-7.1.2.tar.gz 295757 BLAKE2B aea76d5378cfa49fe58a83132737d609d48b3d3a71ec65c0a8a144c7a0e244b5bdf0196ffe2150889b82edda20c3f1faa3c84a227fc9ef459a5a9646cff86129 SHA512 d0caf2fb0a258774a18a7b8f83bdfa73abeb70196a70b45a6cc35befaeb862d068d2f2cce4e27201ab2e3adcd02e7e2f099d6c37c497a507010eefa10ad16eba
+DIST click-8.0.0.tar.gz 329520 BLAKE2B a3a5e299390c8223794c31fd0278367ed941923f81e73e2b4ac878ef670b156de9de4b8d539e1d0a968b8ff99764086b34ebf50d3afe3afa7060aeafc7ed8831 SHA512 656509d4eb49ce46738d09499a924a6064857d13995c0ec289b9a731c05165582c30fd4a8a09d0531ace77c217a9d4ba3f305ba2843c7879d90c84a78072046d
+DIST click-8.0.1.tar.gz 330890 BLAKE2B ae0a29bf1848e92c21ade72fb8ce08991c9edf6d5afb6d70a0dd85cdbfacffeac69a675dc0842566ae23ed8c666deac97879ad4611e8294ee1c6896ea2ddca8a SHA512 d93ec1d070dfa306733ee79893c64de9afcb0c7bf03d3f543dd697ef195f3a750828f77842a22886960a938740b92f0122962076ea52b911b87f7f75941a9032
 EBUILD click-7.1.2-r1.ebuild 764 BLAKE2B d1d38b50a150be24f89380cf98233f141ca96c91e6dbc64153c8cfd6326b98098a174fb7ee58fb120957509b85262a056d7837a9e9f61639abb10d6707f6845a SHA512 ac8ba661a0f1664960eaf8748cfa1118e851ee5b2a4cd924b37742d6d09009dc7e4eaef10b08f1d796d47cdce0ba3483fc2809eefe0717111339327b14585c22
+EBUILD click-8.0.0.ebuild 772 BLAKE2B 788941e23f84686f11226b6a572f6307165d1411c0a5c92ce90e8ce3cf1bf3be7d6aec8b170b20fc11088f4bd3e69e57dd5c6d57827687978d60df9e08fca8be SHA512 23f560eca1f6ba2193aafbc62f291d06cd6f92d97a8cc0431d13866ad602bdfb28c16588f191111d8a262949db7d4b3ad09480d00ddc9f819b294be18d8f488b
+EBUILD click-8.0.1.ebuild 879 BLAKE2B 0337123dc9b645d023e8bca2b65f6d67f006b3f446294023ca43a602f5549858a26435aad908c82adcf6bbb3e65f201e210d92d53a530f8d73a37e74952bcce9 SHA512 9cca790a0526473695224d231ecc55c85c9a912a780bab2d585592aaeda61664d88802b062e8dfe449cc7cf0cb9827513347ef00a17d387828ca14f18b2ae6cf
 MISC metadata.xml 332 BLAKE2B a41bc7699360c666ce286a0d9a44779fab5afa6e6ce99efec2ee65a5d8d534bf3ccd65d4b23a2f5d40fc3b1c04c3c7e078a8889a3030909e7cc3992eabecfcb3 SHA512 de78734678a4bafe5175228f6df58210c65eaf016efec93e65441109b280725c4994406d0f21f2ee22ca0f9e1e27e27f76b3a1db724dbbd5b958fc8d8410126f
diff --git a/dev-python/click/click-8.0.0.ebuild b/dev-python/click/click-8.0.0.ebuild
new file mode 100644
index 000000000000..6d9663b156cc
--- /dev/null
+++ b/dev-python/click/click-8.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="examples"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/docutils-0.14' \
+	dev-python/pallets-sphinx-themes
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/click/click-8.0.1.ebuild b/dev-python/click/click-8.0.1.ebuild
new file mode 100644
index 000000000000..20a203289158
--- /dev/null
+++ b/dev-python/click/click-8.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python package for creating beautiful command line interfaces"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://palletsprojects.com/p/click/ https://pypi.org/project/click/"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+IUSE="examples"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7 pypy3)"
+
+distutils_enable_sphinx docs \
+	'>=dev-python/docutils-0.14' \
+	dev-python/pallets-sphinx-themes
+distutils_enable_tests pytest
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/coreapi/Manifest b/dev-python/coreapi/Manifest
index 056deea24dc5..3cd7d247b2cf 100644
--- a/dev-python/coreapi/Manifest
+++ b/dev-python/coreapi/Manifest
@@ -1,3 +1,3 @@
 DIST coreapi-2.3.3.tar.gz 18788 BLAKE2B f7837d6a0430e6617a2589aa84a209b3c544a913773bc4388c3bdef7348c83577e1b216e83c14736b15174ede840ae297b050eba551b4fe22d784e4d51677956 SHA512 5a66cf9613a9e11046577684b837f48e17db2285d14a51a77aa47eb945eef72a9ee0525b7b1b1c57fddec102c144ce56430ed5a95717e77d906d0b617dce708d
 EBUILD coreapi-2.3.3-r1.ebuild 594 BLAKE2B a70d3dea9a532bb0db1da3a06e9ab0b69fa9a5ac8011bc3d5f054d0ca8209fcf1376db30e95707604d67939546aaa128a79e7e23ea0ac721c6f30815c70444f5 SHA512 b4532d544c90408a3c56acd617bf4b53bc58f5d67e79a823e6329b97ad212b5c2694b288abf8ad56c0a93534f0ef20868fde4674fa1c1d7660999d183df9ca55
-MISC metadata.xml 318 BLAKE2B 20a9a2b6d5d8999992260fe1fede9c0c764981692b123d35292b0bfdad2fc5574684dacea613abf3608da24360fda08a95d9a6cd891409528970e4db8802b190 SHA512 280feaca87f7aab6b051c19b2a5bf882108272a31f8f5ee3143f8cb9c3ba52fd24a1d115dc0966b6f41a13d5c620b57455c2cc5897cf1e1892ad61c57fce1a34
+MISC metadata.xml 237 BLAKE2B 33b0d02148a9240a005eafced88dcc3a436edb18b24a5163ac89e5ad455fa5d37c5598106496c887fd0baf951766a02dca04b2c2dd66491e4e0de2b78dc185ed SHA512 e7c3d7f0a7f8d01e134a243d640ced825877ff5341c61b9f4be6406c4353528524b111b56bce8ea311fffe3bb2782b282ba86b929a17ea8f16d34581b02e7425
diff --git a/dev-python/coreapi/metadata.xml b/dev-python/coreapi/metadata.xml
index dcf00dccb5e5..b99b0e0b1b49 100644
--- a/dev-python/coreapi/metadata.xml
+++ b/dev-python/coreapi/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">coreapi</remote-id>
 	</upstream>
diff --git a/dev-python/coreschema/Manifest b/dev-python/coreschema/Manifest
index 952bd0c046da..6c0d975d662f 100644
--- a/dev-python/coreschema/Manifest
+++ b/dev-python/coreschema/Manifest
@@ -1,3 +1,3 @@
 DIST coreschema-0.0.4.tar.gz 10974 BLAKE2B 8bddafea9eb82140cdf2b2cd40ffc31dd4a0457f8ca216986807657a5021f7a4319f1e3db27caf7d471f8617f6f0c3a6d79ebfe7e0285bc9a6627f93d6efa760 SHA512 21a35b29cd0bb96dacaeeb0bd0faaaa4ee8875bf9639b431b59f17c41ee4829173932a6b35760caa3b46a0ec39ca173fe896b26b740fe97df36943270bc2bd3d
 EBUILD coreschema-0.0.4.ebuild 453 BLAKE2B 5ae30ad10a930c2df442ea0e71f8286a47029eb557960a1100e26d9483d6c1a65ec98b030460d7ec5a45a35c3e57b88c8e86f4646bd1e3f654353b61e914e23a SHA512 ee59307fbf36fc6e5eb5984b24574b1ffa117e1bc77687d616a5638a0c10b71a93d108a5166846cf5faa51ddd712338cd3ef32aa94e843429b6fb06564c5779f
-MISC metadata.xml 321 BLAKE2B 0d945d507cdca835659c7952bc4531cc4761bb72101e6dc1d1f770cf48848ff9b8bc3ed9ca08d9b819e5ca706b19d19c44c55adccaf88e2d5386c0d32bbceb10 SHA512 41665a189bf9b4b255809327884274b8f7f450520bbbb73aad03c3e812398ad601c4fe3d25d9748879cd9b5e82437dd5dd63381911e162493cbeb897390095a3
+MISC metadata.xml 240 BLAKE2B a2806f88669f4b5790c0e506e7058c07c9f37f009398eb9361868a3e001b7b2b4972f49b4b602469ce05d36e325b0248ebec5151edaf7c39e76bb4ee94f2bce4 SHA512 cf78189db887ce6ac5c7ba16299153ac9368dff4206421313c49bb97c833b7e93467e587e322b5c2bc524648c5c0e9864f32c508ace711bc64bf1c637c62fe8d
diff --git a/dev-python/coreschema/metadata.xml b/dev-python/coreschema/metadata.xml
index 187eee7c7894..d45b55897acd 100644
--- a/dev-python/coreschema/metadata.xml
+++ b/dev-python/coreschema/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">coreschema</remote-id>
 	</upstream>
diff --git a/dev-python/cryptography/Manifest b/dev-python/cryptography/Manifest
index 89255e81fada..cd9da2a21abd 100644
--- a/dev-python/cryptography/Manifest
+++ b/dev-python/cryptography/Manifest
@@ -1,7 +1,5 @@
-DIST cryptography-3.3.2.tar.gz 539883 BLAKE2B e35de90362b24170c4025f67914e60c16fbf37fce6bcd5d6f3fe32e5a9bb60de8edbebcb1ff0450fabc9c244d4b1a4618c720b630f28c747fea17e9bf008f01f SHA512 55f6ee13342b3209b1fcb310f4c4d33d22856ee785cb2347e6ad36c34e9b42f6e0d5bece8e458b09663a5b78e34c4567fe7a211b51ca71f55ccc93e3f62dc5e4
+AUX cryptography-3.4.7-py310.patch 8611 BLAKE2B 6cabc8056658f6a0c895a75b287ebfaa3d25c4ba9f95e28bf63c34bb87ccccdb4b04e42c5d72fdb4d889560e1ca13c602755fa05b9bab3b1fe05788abe110964 SHA512 d1c89a6c50fd4032d6aedcf026592b52b1e38922ecc2a83e8defcee5b7b4845a66de45de897fd3c2022c6118591811b9fc25df7fdd33d219647e0923cd906a66
 DIST cryptography-3.4.7.tar.gz 546893 BLAKE2B 49bc1e098ed1ba0181059b645f6668cda6332d196eaca55270ebce6e07e5bb6ab6724c5050fde20e89b7025773960d74ec782bb875badbbd5dc9a04db0a536f1 SHA512 3c4cf64bc0b067ccdbb71efe04c32ac9d673faea6cc4ccd13d6b1b61920be4785806d19359b7657d032a2ff1c011a8b4f16ec4924d9df8a59d1a875a7f844473
-DIST cryptography_vectors-3.3.2.tar.gz 35168168 BLAKE2B 3991a16556ae5be0d153cfe302dd9a860918a80bd0bdef7104f3c170ba63941c4b1ff74750bc12329422a6061161cb6452bea60e191d85c0d79e0852566c6c0b SHA512 18590adb96a6f04b8a41d4346b126b8adfc854cbcec85f8c1c0a23b1b363f215b37da60ea94a481b8fd7752f07fba515b08fc18faf2e29fb858e133129971f7c
 DIST cryptography_vectors-3.4.7.tar.gz 35168102 BLAKE2B fbefd3ff96548dde012fd290aba1c99d57db376023d486910e486cc9c143461ef1ae9b77824cc03307723d35142f0360bc961b548a4edc02357d3f1a0e7e4e9f SHA512 269b50fa4c5300da6758006d12be42f998630d23053ef9af0eb588fc9e6994b044d8822cff105e338f4d0d746ed0e204a4a9c42f54667e355e1ce86e6754bbe9
-EBUILD cryptography-3.3.2.ebuild 1872 BLAKE2B a31b6dfac777d7f2f5231ace6f6756db1346828ca9a133983f5dc8b53da962094f8f21c6d3ac7fd022887e349482a3b880ba2ff3596dbdcd21917cb86a843185 SHA512 58d9903f52d9e7fef3f5199f458d78a6a3ba4d0c0739ad9c84e961d73d58677d1912a965bbc40d3cb8096e7444efef6b673efd713253370410f812cdf90ecde5
-EBUILD cryptography-3.4.7.ebuild 1871 BLAKE2B 5519a7695f3dab9518287891ee4d90f931f350645a5a435f86a1cba42717eb7583bcc204040b3449af0a9ba4a8226db0b6dd40e92581f4539b07f2d914006564 SHA512 4a570f33b371e44d1a4d6ffbfbb1f073ab6b7a3a8d29efa4f0433e9f8b34921c0677284bfad2341efe312386fdce21075e1487bff17aceb3c884418db02e1750
-MISC metadata.xml 499 BLAKE2B 2e4c37917ebb1604f399b0db4abe27b02b133a2cc8fb69fbbf52b6fdc0aee079dde61be188bfa5bca043a1804a670ffb53f6ab1e79147230166f696741fadad8 SHA512 26eda8b0a2ac91dce2946e18e941e2e75df15e4583e4ddb1f1329403eaae30db9976017f92981c462bfb8c8a559de2a2ea9531f4ac5ccb2d57cadb00e68e05ec
+EBUILD cryptography-3.4.7-r1.ebuild 1924 BLAKE2B 118c9da25288dd0ea6d0c263cab76effd59a21e445d295686c0a68b19581df9d0cf16ce72568bc03433cf2ff6c52d0f445823d35c239cf88afb3409d88bf9066 SHA512 b64add0ac3073045a970932e4f0486e32a18932d401b5c892e1f1922eddb895419d24b027ca033e7fa425447cfea2e5d8b3961108cdf2deb64bffcfaa18a52f0
+MISC metadata.xml 384 BLAKE2B 6dbfdd39bb24b2df61454716e308605ae1d35c3babd01f16556bbbab240e425434315cb2b80a2c3e8e9b18b237899b5fb96566a7ffefde2af3af1dcc2e08362b SHA512 c2806f846608bdd0720b589494e13f57ab2d64026747f2b13f412c9a0e9d2bef6b16fc357e4d16b74ad7a2a2af8daa5e28d0b6bfe4d2141ce68881c724fd24c7
diff --git a/dev-python/cryptography/cryptography-3.3.2.ebuild b/dev-python/cryptography/cryptography-3.3.2.ebuild
deleted file mode 100644
index fd7468560e2d..000000000000
--- a/dev-python/cryptography/cryptography-3.3.2.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 multiprocessing
-
-VEC_P=cryptography_vectors-${PV}
-DESCRIPTION="Library providing cryptographic recipes and primitives"
-HOMEPAGE="https://github.com/pyca/cryptography/ https://pypi.org/project/cryptography/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-	test? ( mirror://pypi/c/cryptography_vectors/${VEC_P}.tar.gz )"
-
-LICENSE="|| ( Apache-2.0 BSD )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="idna"
-
-RDEPEND="
-	>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
-	idna? ( >=dev-python/idna-2.1[${PYTHON_USEDEP}] )
-	$(python_gen_cond_dep '
-		>=dev-python/cffi-1.8:=[${PYTHON_USEDEP}]
-	' 'python*')
-	"
-BDEPEND="
-	test? (
-		>=dev-python/hypothesis-1.11.4[${PYTHON_USEDEP}]
-		dev-python/iso8601[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		dev-python/pyasn1-modules[${PYTHON_USEDEP}]
-		dev-python/pytz[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-DEPEND="
-	>=dev-libs/openssl-1.0.2o-r6:0=
-	"
-RDEPEND+=${DEPEND}
-
-DOCS=( AUTHORS.rst CONTRIBUTING.rst README.rst )
-
-src_prepare() {
-	default
-
-	# work around availability macros not supported in GCC (yet)
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local darwinok=0
-		if [[ ${CHOST##*-darwin} -ge 16 ]] ; then
-			darwinok=1
-		fi
-		sed -i -e 's/__builtin_available(macOS 10\.12, \*)/'"${darwinok}"'/' \
-			src/_cffi_src/openssl/src/osrandom_engine.c || die
-	fi
-}
-
-python_test() {
-	local -x PYTHONPATH=${PYTHONPATH}:${WORKDIR}/${VEC_P}
-	pytest -vv -n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/cryptography/cryptography-3.4.7.ebuild b/dev-python/cryptography/cryptography-3.4.7-r1.ebuild
index 59b98063ce3e..97946e3dd07f 100644
--- a/dev-python/cryptography/cryptography-3.4.7.ebuild
+++ b/dev-python/cryptography/cryptography-3.4.7-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 multiprocessing
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
 
 LICENSE="|| ( Apache-2.0 BSD )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	$(python_gen_cond_dep '
@@ -41,6 +41,10 @@ DEPEND="
 	"
 RDEPEND+=${DEPEND}
 
+PATCHES=(
+	"${FILESDIR}/${P}-py310.patch"
+)
+
 src_prepare() {
 	default
 
diff --git a/dev-python/cryptography/files/cryptography-3.4.7-py310.patch b/dev-python/cryptography/files/cryptography-3.4.7-py310.patch
new file mode 100644
index 000000000000..d961af82b774
--- /dev/null
+++ b/dev-python/cryptography/files/cryptography-3.4.7-py310.patch
@@ -0,0 +1,301 @@
+diff --git a/src/cryptography/exceptions.py b/src/cryptography/exceptions.py
+index f5860590..3bd98d82 100644
+--- a/src/cryptography/exceptions.py
++++ b/src/cryptography/exceptions.py
+@@ -3,10 +3,10 @@
+ # for complete details.
+ 
+ 
+-from enum import Enum
++from cryptography import utils
+ 
+ 
+-class _Reasons(Enum):
++class _Reasons(utils.Enum):
+     BACKEND_MISSING_INTERFACE = 0
+     UNSUPPORTED_HASH = 1
+     UNSUPPORTED_CIPHER = 2
+diff --git a/src/cryptography/hazmat/primitives/_serialization.py b/src/cryptography/hazmat/primitives/_serialization.py
+index 96a5ed9b..160a6b89 100644
+--- a/src/cryptography/hazmat/primitives/_serialization.py
++++ b/src/cryptography/hazmat/primitives/_serialization.py
+@@ -3,13 +3,14 @@
+ # for complete details.
+ 
+ import abc
+-from enum import Enum
++
++from cryptography import utils
+ 
+ # This exists to break an import cycle. These classes are normally accessible
+ # from the serialization module.
+ 
+ 
+-class Encoding(Enum):
++class Encoding(utils.Enum):
+     PEM = "PEM"
+     DER = "DER"
+     OpenSSH = "OpenSSH"
+@@ -18,14 +19,14 @@ class Encoding(Enum):
+     SMIME = "S/MIME"
+ 
+ 
+-class PrivateFormat(Enum):
++class PrivateFormat(utils.Enum):
+     PKCS8 = "PKCS8"
+     TraditionalOpenSSL = "TraditionalOpenSSL"
+     Raw = "Raw"
+     OpenSSH = "OpenSSH"
+ 
+ 
+-class PublicFormat(Enum):
++class PublicFormat(utils.Enum):
+     SubjectPublicKeyInfo = "X.509 subjectPublicKeyInfo with PKCS#1"
+     PKCS1 = "Raw PKCS#1"
+     OpenSSH = "OpenSSH"
+@@ -34,7 +35,7 @@ class PublicFormat(Enum):
+     UncompressedPoint = "X9.62 Uncompressed Point"
+ 
+ 
+-class ParameterFormat(Enum):
++class ParameterFormat(utils.Enum):
+     PKCS3 = "PKCS3"
+ 
+ 
+diff --git a/src/cryptography/hazmat/primitives/kdf/kbkdf.py b/src/cryptography/hazmat/primitives/kdf/kbkdf.py
+index ac36474f..75fe7d51 100644
+--- a/src/cryptography/hazmat/primitives/kdf/kbkdf.py
++++ b/src/cryptography/hazmat/primitives/kdf/kbkdf.py
+@@ -4,7 +4,6 @@
+ 
+ 
+ import typing
+-from enum import Enum
+ 
+ from cryptography import utils
+ from cryptography.exceptions import (
+@@ -19,11 +18,11 @@ from cryptography.hazmat.primitives import constant_time, hashes, hmac
+ from cryptography.hazmat.primitives.kdf import KeyDerivationFunction
+ 
+ 
+-class Mode(Enum):
++class Mode(utils.Enum):
+     CounterMode = "ctr"
+ 
+ 
+-class CounterLocation(Enum):
++class CounterLocation(utils.Enum):
+     BeforeFixed = "before_fixed"
+     AfterFixed = "after_fixed"
+ 
+diff --git a/src/cryptography/hazmat/primitives/serialization/pkcs7.py b/src/cryptography/hazmat/primitives/serialization/pkcs7.py
+index bcd9e330..57aac7e3 100644
+--- a/src/cryptography/hazmat/primitives/serialization/pkcs7.py
++++ b/src/cryptography/hazmat/primitives/serialization/pkcs7.py
+@@ -3,8 +3,8 @@
+ # for complete details.
+ 
+ import typing
+-from enum import Enum
+ 
++from cryptography import utils
+ from cryptography import x509
+ from cryptography.hazmat.backends import _get_backend
+ from cryptography.hazmat.primitives import hashes, serialization
+@@ -35,7 +35,7 @@ _ALLOWED_PRIVATE_KEY_TYPES = typing.Union[
+ ]
+ 
+ 
+-class PKCS7Options(Enum):
++class PKCS7Options(utils.Enum):
+     Text = "Add text/plain MIME type"
+     Binary = "Don't translate input data into canonical MIME format"
+     DetachedSignature = "Don't embed data in the PKCS7 structure"
+diff --git a/src/cryptography/utils.py b/src/cryptography/utils.py
+index ef0fc443..9e571cfd 100644
+--- a/src/cryptography/utils.py
++++ b/src/cryptography/utils.py
+@@ -4,6 +4,7 @@
+ 
+ 
+ import abc
++import enum
+ import inspect
+ import sys
+ import typing
+@@ -162,3 +163,13 @@ int_from_bytes = deprecated(
+     "int_from_bytes is deprecated, use int.from_bytes instead",
+     DeprecatedIn34,
+ )
++
++
++# Python 3.10 changed representation of enums. We use well-defined object
++# representation and string representation from Python 3.9.
++class Enum(enum.Enum):
++    def __repr__(self):
++        return f"<{self.__class__.__name__}.{self._name_}: {self._value_!r}>"
++
++    def __str__(self):
++        return f"{self.__class__.__name__}.{self._name_}"
+diff --git a/src/cryptography/x509/base.py b/src/cryptography/x509/base.py
+index 5505fa3b..e3846c33 100644
+--- a/src/cryptography/x509/base.py
++++ b/src/cryptography/x509/base.py
+@@ -7,9 +7,9 @@ import abc
+ import datetime
+ import os
+ import typing
+-from enum import Enum
+ 
+ from cryptography.hazmat._types import _PRIVATE_KEY_TYPES, _PUBLIC_KEY_TYPES
++from cryptography import utils
+ from cryptography.hazmat.backends import _get_backend
+ from cryptography.hazmat.primitives import hashes, serialization
+ from cryptography.hazmat.primitives.asymmetric import (
+@@ -66,7 +66,7 @@ def _convert_to_naive_utc_time(time: datetime.datetime) -> datetime.datetime:
+         return time
+ 
+ 
+-class Version(Enum):
++class Version(utils.Enum):
+     v1 = 0
+     v3 = 2
+ 
+diff --git a/src/cryptography/x509/certificate_transparency.py b/src/cryptography/x509/certificate_transparency.py
+index d51bee92..d80f051a 100644
+--- a/src/cryptography/x509/certificate_transparency.py
++++ b/src/cryptography/x509/certificate_transparency.py
+@@ -5,15 +5,16 @@
+ 
+ import abc
+ import datetime
+-from enum import Enum
+ 
++from cryptography import utils
+ 
+-class LogEntryType(Enum):
++
++class LogEntryType(utils.Enum):
+     X509_CERTIFICATE = 0
+     PRE_CERTIFICATE = 1
+ 
+ 
+-class Version(Enum):
++class Version(utils.Enum):
+     v1 = 0
+ 
+ 
+diff --git a/src/cryptography/x509/extensions.py b/src/cryptography/x509/extensions.py
+index 6cae016a..742f1fa2 100644
+--- a/src/cryptography/x509/extensions.py
++++ b/src/cryptography/x509/extensions.py
+@@ -8,7 +8,6 @@ import datetime
+ import hashlib
+ import ipaddress
+ import typing
+-from enum import Enum
+ 
+ from cryptography import utils
+ from cryptography.hazmat._der import (
+@@ -634,7 +633,7 @@ class DistributionPoint(object):
+     crl_issuer = utils.read_only_property("_crl_issuer")
+ 
+ 
+-class ReasonFlags(Enum):
++class ReasonFlags(utils.Enum):
+     unspecified = "unspecified"
+     key_compromise = "keyCompromise"
+     ca_compromise = "cACompromise"
+@@ -978,7 +977,7 @@ class TLSFeature(ExtensionType):
+         return hash(tuple(self._features))
+ 
+ 
+-class TLSFeatureType(Enum):
++class TLSFeatureType(utils.Enum):
+     # status_request is defined in RFC 6066 and is used for what is commonly
+     # called OCSP Must-Staple when present in the TLS Feature extension in an
+     # X.509 certificate.
+diff --git a/src/cryptography/x509/name.py b/src/cryptography/x509/name.py
+index a579aa21..9069a9f4 100644
+--- a/src/cryptography/x509/name.py
++++ b/src/cryptography/x509/name.py
+@@ -3,14 +3,13 @@
+ # for complete details.
+ 
+ import typing
+-from enum import Enum
+ 
+ from cryptography import utils
+ from cryptography.hazmat.backends import _get_backend
+ from cryptography.x509.oid import NameOID, ObjectIdentifier
+ 
+ 
+-class _ASN1Type(Enum):
++class _ASN1Type(utils.Enum):
+     UTF8String = 12
+     NumericString = 18
+     PrintableString = 19
+diff --git a/src/cryptography/x509/ocsp.py b/src/cryptography/x509/ocsp.py
+index 1c5de73e..bcf210c1 100644
+--- a/src/cryptography/x509/ocsp.py
++++ b/src/cryptography/x509/ocsp.py
+@@ -6,8 +6,8 @@
+ import abc
+ import datetime
+ import typing
+-from enum import Enum
+ 
++from cryptography import utils
+ from cryptography import x509
+ from cryptography.hazmat.primitives import hashes, serialization
+ from cryptography.x509.base import (
+@@ -27,12 +27,12 @@ _OIDS_TO_HASH = {
+ }
+ 
+ 
+-class OCSPResponderEncoding(Enum):
++class OCSPResponderEncoding(utils.Enum):
+     HASH = "By Hash"
+     NAME = "By Name"
+ 
+ 
+-class OCSPResponseStatus(Enum):
++class OCSPResponseStatus(utils.Enum):
+     SUCCESSFUL = 0
+     MALFORMED_REQUEST = 1
+     INTERNAL_ERROR = 2
+@@ -58,7 +58,7 @@ def _verify_algorithm(algorithm):
+         )
+ 
+ 
+-class OCSPCertStatus(Enum):
++class OCSPCertStatus(utils.Enum):
+     GOOD = 0
+     REVOKED = 1
+     UNKNOWN = 2
+diff --git a/tests/test_cryptography_utils.py b/tests/test_cryptography_utils.py
+index 6b795e0c..803997ac 100644
+--- a/tests/test_cryptography_utils.py
++++ b/tests/test_cryptography_utils.py
+@@ -2,6 +2,7 @@
+ # 2.0, and the BSD License. See the LICENSE file in the root of this repository
+ # for complete details.
+ 
++import enum
+ import typing
+ 
+ import pytest
+@@ -51,3 +52,13 @@ class TestCachedProperty(object):
+         assert len(accesses) == 1
+         assert t.t == 14
+         assert len(accesses) == 1
++
++
++def test_enum():
++    class TestEnum(utils.Enum):
++        value = "something"
++
++    assert issubclass(TestEnum, enum.Enum)
++    assert isinstance(TestEnum.value, enum.Enum)
++    assert repr(TestEnum.value) == "<TestEnum.value: 'something'>"
++    assert str(TestEnum.value) == "TestEnum.value"
diff --git a/dev-python/cryptography/metadata.xml b/dev-python/cryptography/metadata.xml
index ff02c2b32ae2..2dfa57bc0fb6 100644
--- a/dev-python/cryptography/metadata.xml
+++ b/dev-python/cryptography/metadata.xml
@@ -5,9 +5,6 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <use>
-    <flag name="idna">enable support for the old, deprecated IDNA specification (RFC 3490)</flag>
-  </use>
   <upstream>
     <remote-id type="pypi">cryptography</remote-id>
     <remote-id type="github">pyca/cryptography</remote-id>
diff --git a/dev-python/css-parser/Manifest b/dev-python/css-parser/Manifest
index d1e94a7e1428..224f6d438dbd 100644
--- a/dev-python/css-parser/Manifest
+++ b/dev-python/css-parser/Manifest
@@ -1,3 +1,6 @@
+AUX css-parser-1.0.6-fix-py3.10-test.patch 5335 BLAKE2B c99d96c6fde03b0676521f1586ad60ad8c32f82b27c7fb99054edcff7f61b5450f12600d383c2d5d808643853ba8cfaf9a10eb54677de682d93273f6970eb557 SHA512 6d33f69edd1ef2c8b694e9b8bc34b1dc61be242eb32bbb15006529c6ec7ee9ee8e15566f002ef405d872174df65256dd609d2dbb63f7fbf7d9651fc32c559e11
 DIST css-parser-1.0.4.tar.gz 143977 BLAKE2B 94a42d751a90d306b0dd2d503d8d9c326509b438d1f52b5567e6f6db7d80e7a6d2c37cbfa0db79225cc4d0fd5df612b3e430fa1c62604a2f8990d20678019af0 SHA512 3781128e55c1e72aa00369873e214f683e3f42944ae83d399697adb7d2966f68fb500c39982845ce9cd06078e4021838d82b06f99d90938069371da8a89a0857
+DIST css-parser-1.0.6.tar.gz 336932 BLAKE2B 00cfc4597137c0aa6af3cc8a72fa3e59a1d7b83210668c8421c0703a4a38d05d73f691ff00ffac14025f021a10f85c1d3697778794d23f75db381f5e63e24b7d SHA512 4c623541e1145c91458e7e2028f6a0de652ae2189dc99672fc72f098799d6349edb051bafc0901258481fa3422346303d2ef634392889ee83a29814609cdbd43
 EBUILD css-parser-1.0.4-r1.ebuild 524 BLAKE2B 0871f3d91c624396f30c2521f1ebf02b38fdd9cfab111fad7a876203dbb2f653a9a978f895db359638c7c876e54b8cf70ca62b9d3e34bd186473d2d56b307915 SHA512 ebfb09a3e2d1a4ee2ab8c8c89d2748ad2cd6cb0420c66ddd9e52498781dedf04a5fb61e50e61fff4870d526abaf3009a8130a1f8b1844127e73abeba911c3212
+EBUILD css-parser-1.0.6.ebuild 583 BLAKE2B 5bf9a2760eb1908c469e334cd01586cfc504dbaf7ac89411e45027f424fee7792c04a44ccfe81a6881273af05f3b01fe7f1d24b7a1ad0562c3eff08e8a40cb66 SHA512 9ab4e3b112c4d36b59ecb5bc818a1552362e3df6c580d3d5a3ce9e9d7fbdfddc0c8b2ca2fa0487bb63baeb9320d0c2d1f36782b38845fcf8a98419fa8d6f00ca
 MISC metadata.xml 353 BLAKE2B 80a5c57121e677736428a469c564718517f745cf24b00d8493a0035d125038cc9286ff3b2b826e941098ba3d5f1713d32f33e699c78f4387c0b995e566a545e8 SHA512 2916ec27cb3c474df265a5f937d1d6555fd6abb8e97f94301a383afd924edb61eeeee3c9dfc220c4ae3322555077f499f384f4b33ba5416b72c2054382cdcbca
diff --git a/dev-python/css-parser/css-parser-1.0.6.ebuild b/dev-python/css-parser/css-parser-1.0.6.ebuild
new file mode 100644
index 000000000000..ccc51564195c
--- /dev/null
+++ b/dev-python/css-parser/css-parser-1.0.6.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="A CSS Cascading Style Sheets library (fork of cssutils)"
+HOMEPAGE="https://pypi.org/project/css-parser/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-python/chardet[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-py3.10-test.patch"
+)
+
+distutils_enable_tests setup.py
diff --git a/dev-python/css-parser/files/css-parser-1.0.6-fix-py3.10-test.patch b/dev-python/css-parser/files/css-parser-1.0.6-fix-py3.10-test.patch
new file mode 100644
index 000000000000..9107adefed56
--- /dev/null
+++ b/dev-python/css-parser/files/css-parser-1.0.6-fix-py3.10-test.patch
@@ -0,0 +1,141 @@
+diff --git a/css_parser_tests/basetest.py b/css_parser_tests/basetest.py
+index 2b26906..115053f 100644
+--- a/css_parser_tests/basetest.py
++++ b/css_parser_tests/basetest.py
+@@ -149,21 +149,7 @@ class BaseTestCase(unittest.TestCase):
+         else:
+             self.fail("%s did not raise %s" % (callsig, exception))
+ 
+-    def assertRaisesMsg(self, excClass, msg, callableObj, *args, **kwargs):
+-        """
+-        Just like unittest.TestCase.assertRaises,
+-        but checks that the message is right too.
+-
+-        Usage::
+-
+-            self.assertRaisesMsg(
+-                MyException, "Exception message",
+-                my_function, (arg1, arg2)
+-                )
+-
+-        from
+-        http://www.nedbatchelder.com/blog/200609.html#e20060905T064418
+-        """
++    def _assertRaisesMsgSubstring(self, excClass, msg, substring_match, callableObj, *args, **kwargs):
+         try:
+             callableObj(*args, **kwargs)
+         except excClass as exc:
+@@ -171,7 +157,7 @@ class BaseTestCase(unittest.TestCase):
+             if not msg:
+                 # No message provided: any message is fine.
+                 return
+-            elif excMsg == msg:
++            elif (msg in excMsg if substring_match else msg == excMsg):
+                 # Message provided, and we got the right message: passes.
+                 return
+             else:
+@@ -189,6 +175,29 @@ class BaseTestCase(unittest.TestCase):
+                 excName
+             )
+ 
++    def assertRaisesMsg(self, excClass, msg, callableObj, *args, **kwargs):
++        """
++        Just like unittest.TestCase.assertRaises,
++        but checks that the message is right too.
++
++        Usage::
++
++            self.assertRaisesMsg(
++                MyException, "Exception message",
++                my_function, arg1, arg2,
++                kwarg1=val, kwarg2=val)
++
++        from
++        http://www.nedbatchelder.com/blog/200609.html#e20060905T064418
++        """
++        return self._assertRaisesMsgSubstring(excClass, msg, False, callableObj, *args, **kwargs)
++
++    def assertRaisesMsgSubstring(self, excClass, msg, callableObj, *args, **kwargs):
++        """
++        Just like assertRaisesMsg, but looks for substring in the message.
++        """
++        return self._assertRaisesMsgSubstring(excClass, msg, True, callableObj, *args, **kwargs)
++
+     def do_equal_p(self, tests, att='cssText', debug=False, raising=True):
+         """
+         if raising self.p is used for parsing, else self.pf
+diff --git a/css_parser_tests/test_property.py b/css_parser_tests/test_property.py
+index ae6ab2a..561a5eb 100644
+--- a/css_parser_tests/test_property.py
++++ b/css_parser_tests/test_property.py
+@@ -162,8 +162,8 @@ class PropertyTestCase(basetest.BaseTestCase):
+         "Property.literalname"
+         p = css_parser.css.property.Property(r'c\olor', 'red')
+         self.assertEqual(r'c\olor', p.literalname)
+-        self.assertRaisesMsg(AttributeError, "can't set attribute", p.__setattr__,
+-                             'literalname', 'color')
++        self.assertRaisesMsgSubstring(AttributeError, "can't set attribute", p.__setattr__,
++                                      'literalname', 'color')
+ 
+     def test_validate(self):
+         "Property.valid"
+diff --git a/css_parser_tests/test_selector.py b/css_parser_tests/test_selector.py
+index c0c769e..f2746d8 100644
+--- a/css_parser_tests/test_selector.py
++++ b/css_parser_tests/test_selector.py
+@@ -412,7 +412,7 @@ class SelectorTestCase(basetest.BaseTestCase):
+ 
+         # readonly
+         def _set(): selector.specificity = 1
+-        self.assertRaisesMsg(AttributeError, "can't set attribute", _set)
++        self.assertRaisesMsgSubstring(AttributeError, "can't set attribute", _set)
+ 
+         tests = {
+             '*': (0, 0, 0, 0),
+diff --git a/css_parser_tests/test_selectorlist.py b/css_parser_tests/test_selectorlist.py
+index 7028fe7..54c945a 100644
+--- a/css_parser_tests/test_selectorlist.py
++++ b/css_parser_tests/test_selectorlist.py
+@@ -11,6 +11,7 @@ from css_parser.css.selectorlist import SelectorList
+ class SelectorListTestCase(basetest.BaseTestCase):
+ 
+     def setUp(self):
++        basetest.BaseTestCase.setUp(self)
+         self.r = SelectorList()
+ 
+     def test_init(self):
+diff --git a/run_tests.py b/run_tests.py
+index 554c752..6507434 100755
+--- a/run_tests.py
++++ b/run_tests.py
+@@ -1,10 +1,12 @@
+ #!/usr/bin/env python
+ # vim:fileencoding=utf-8
+-# License: Apache 2.0 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
++# License: LGPLv3 Copyright: 2017, Kovid Goyal <kovid at kovidgoyal.net>
+ 
+-from __future__ import absolute_import, division, print_function, unicode_literals
++from __future__ import (absolute_import, division, print_function,
++                        unicode_literals)
+ 
+ import importlib
++import logging
+ import os
+ import sys
+ import unittest
+@@ -72,6 +74,7 @@ def find_tests():
+ 
+ def run_tests(test_names=()):
+     sys.path = [base, os.path.join(base, 'src')] + sys.path
++    import css_parser
+     tests = find_tests()
+     suites = []
+     for name in test_names:
+@@ -85,6 +88,7 @@ def run_tests(test_names=()):
+     tests = unittest.TestSuite(suites) if suites else tests
+ 
+     r = unittest.TextTestRunner
++    css_parser.log.setLevel(logging.CRITICAL)
+     result = r().run(tests)
+ 
+     if not result.wasSuccessful():
diff --git a/dev-python/cssselect/Manifest b/dev-python/cssselect/Manifest
index 35037917efe1..d6deb083cf6a 100644
--- a/dev-python/cssselect/Manifest
+++ b/dev-python/cssselect/Manifest
@@ -1,3 +1,3 @@
 DIST cssselect-1.1.0.tar.gz 35516 BLAKE2B b4480ad4335ba15ae8a2ae758ff942865a5b61de68b3b00fb59d517b1dacfce1cd817280e4aac562dbf829f90601a56220f01d99aecbc502420b9102e50c46ca SHA512 b33bca6a026f4de37b75606fd238dbd170b57d06288fbff3ea97ce79685a99af275fb8522b04ea9d6693aba5a18541d70b657191fdad881be79718bcf2e7655c
-EBUILD cssselect-1.1.0-r1.ebuild 767 BLAKE2B baf663998141e489596322962d4f0c6c137c644eb327d8283576e54ce391d90b52cbd58eb380118c5526419dad1fba1d26e66feeda114a85627db647d59d686a SHA512 543a7599823da9df648efbc4fae21d3f030a58b0b182482577a6d6a7ee05f6e4778cf7476227724a3c4e8c3d5e60b4e0cc28c622c497f5d95101a6c353d891fc
+EBUILD cssselect-1.1.0-r1.ebuild 688 BLAKE2B cc48cbdafdc5715645e26cd256a7b910ee695c90a750d8ad98e64778185a3e8943465691c6aaad1e12b1ef3dc08a1ffcaf0daefa16541483abf3ce3aeee97eee SHA512 05fd6bff9348c32d2d0875662a1ac20e59ed855becdc7d43945426393c47cc2b4bd1cff753f4385b94cefad31c384955c31f389b96a6cfdbbf3f657a8b28962e
 MISC metadata.xml 392 BLAKE2B 303b60a36eb7f9c18b3f6a9a7fc164ce8e0896165200bd418718a47d77e8a9d970ce0eb274702b7bf24cc3bdd0b385036bcd5d01cf40fb724587369001223693 SHA512 03d9bc1936c4b6567027916468d2e12f29be783763d1a19719de78e59a142e247d51844b4ae9d12aa533b195473b2057ce6d5e08ef9d548358fadc7f4eaf558c
diff --git a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
index 608b70918f69..12fd4132064e 100644
--- a/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
+++ b/dev-python/cssselect/cssselect-1.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -16,11 +16,8 @@ SRC_URI="https://github.com/scrapy/cssselect/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( dev-python/lxml[${PYTHON_USEDEP}] )"
 
 distutils_enable_sphinx docs
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index 5e5a8b6322e4..0a21f9595d56 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,7 +1,4 @@
-AUX cx_Freeze-6.5.3-buildsystem.patch 430 BLAKE2B 23dee2067c28e9e5ef610b6f76e2a25709d021dd2f2bc2da830f589f06e5487b0f4c87230e6bba62441fc17b1133e352a0731934d4e524bc941de14d4acc397c SHA512 8d87172b1ef949c029d619096fd7123ebcb0ebdf14b029e783ffb0c751e068cd215d8996c628b7bc328bdbb82a129e94e3c582930d7f0da1201ac646e8287464
 AUX cx_Freeze-6.6-buildsystem.patch 502 BLAKE2B 83626d25800fbfbfedde676ed9889cdf3a4cb8ce6e6a4a11b88a645efd06609f2a2ef50d55c5502676631a57ad876f04b647023056e57574af28ba5d006f1d07 SHA512 e4cb8a9982c928982b3595491825ec5b97fc48b132efa5a0581647de86344d65b154f643a057554013b777fa3352c90be33f731b37fe511c127144c2d7cbf29f
-DIST cx_Freeze-6.5.3.tar.gz 112334 BLAKE2B 77558e35ca13bc598a810ea70acfe59901c036daf37b2f9582c4f2761680d54d5be559e9abbf16bd995d7f4a4e7bd5d8793e0b53c24111767d54a69c633c9b46 SHA512 37ba5c920306ff62a21ab46c1b9fd6b1780864095d00223776c308fa28e60a5473c74e7da4e7478725de14b7f5628d8d8445f42c0671bc502e5e2d8ecb5ffae5
 DIST cx_Freeze-6.6.tar.gz 120239 BLAKE2B f4ba5de3f4233ee5417d1e1dfb8ad23180d59bf7b2b2da4918c390d69e6f73cb814a1063951b2564bd4f8eabe8aff5faf9f731fe500bf90b4a5ef8cd081632a4 SHA512 24305f19c10d13ea58d995d80dc43c884898ae1e29a470d2885b6d7448806103bc7771874cc6dd064114c6e5e59f351dfec71c37ef3dddc0a136bb5a166cdb3a
-EBUILD cx_Freeze-6.5.3.ebuild 578 BLAKE2B 57c046d336219336af8c90653fea755221c2b716a9c7ccbc4e0b73958b40c566308b6f77830b7eb835a5bf096a168a8172c983d8691741da0a3e3597db85291b SHA512 c3140c3b08d3b709df6275882e59e58491c4e1034f3168d77790e675e64fce1cd608c28d58fd0cc8d49ebbad585e383381551143d4916991bead1b9518f5ea1b
-EBUILD cx_Freeze-6.6.ebuild 600 BLAKE2B 8330c656d35fcaee6e6d5b03ad26039e81f02ed1c805326337871d6e7418d588280ee2340cabdbbea54911135bc05fbb1b558a65a35ad497d34fd0045ea1a033 SHA512 52a7d31abfd5427d9c558dbc5fe1c30567577db5887eddf5c1d1d6b2693c6c932fdb9b31cd424b12de9c1b75bd4a00f3d56a4b3a197aa2b53079e36b4ce7515b
+EBUILD cx_Freeze-6.6.ebuild 598 BLAKE2B 82fe7ba43035a21e8adfde530b765032a0ea3924f64e421f6e5b27c86eed8e6fdaef328f504d2e744552de4fa643c2ef3f82761f84c88ca29ebba7d2bf156416 SHA512 c8336666d108850cc92ac51491c8461bdb81c8522e91f3a9d54fd95ce551c9d4f5cf991b20705d887045783acd9a873d47640ab299e519c16fecaa28f7024320
 MISC metadata.xml 383 BLAKE2B cc6ea0876b2be777bb2d986b6e20f2dcb8fde13c24f006b0d183a5617d1e97814d4d208269efae00a50cc122d2fb6ab1033971bc266ddb5a449ec758c748c301 SHA512 6fe30a7f6e40c62d0f4e83a204371530a2b11f83b1cfbddc56652574d6335fdbc8dfada889721f6a41c507aaf38a2885833fbb4f67c4c901d8ad230ee0ec7f16
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.5.3.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.5.3.ebuild
deleted file mode 100644
index e862f45307ed..000000000000
--- a/dev-python/cx_Freeze/cx_Freeze-6.5.3.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-inherit distutils-r1
-
-DESCRIPTION="Create standalone executables from Python scripts"
-HOMEPAGE="https://cx-freeze.readthedocs.io/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="PYTHON"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="dev-python/importlib_metadata[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# bug #491602
-	"${FILESDIR}/${PN}-6.5.3-buildsystem.patch"
-)
-
-# bug #765385
-RESTRICT="test"
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.6.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.6.ebuild
index 15f968f597c9..bc5007f34197 100644
--- a/dev-python/cx_Freeze/cx_Freeze-6.6.ebuild
+++ b/dev-python/cx_Freeze/cx_Freeze-6.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="PYTHON"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/importlib_metadata[${PYTHON_USEDEP}]
diff --git a/dev-python/cx_Freeze/files/cx_Freeze-6.5.3-buildsystem.patch b/dev-python/cx_Freeze/files/cx_Freeze-6.5.3-buildsystem.patch
deleted file mode 100644
index c280767a442d..000000000000
--- a/dev-python/cx_Freeze/files/cx_Freeze-6.5.3-buildsystem.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py	2021-01-25 13:34:17.219027624 +0300
-+++ b/setup.py	2021-01-25 13:34:26.107026971 +0300
-@@ -67,8 +67,6 @@
-             if "--with-lto" in get_config_var("CONFIG_ARGS"):
-                 extra_args.append("-flto")
-                 extra_args.append("-Wl,-export_dynamic")
--            else:
--                extra_args.append("-s")
-         self.compiler.link_executable(
-             objects,
-             fullname,
diff --git a/dev-python/cython-test-exception-raiser/Manifest b/dev-python/cython-test-exception-raiser/Manifest
index 5dc96784dc42..050f806be91c 100644
--- a/dev-python/cython-test-exception-raiser/Manifest
+++ b/dev-python/cython-test-exception-raiser/Manifest
@@ -1,3 +1,3 @@
 DIST cython-test-exception-raiser-1.0.0.gh.tar.gz 4273 BLAKE2B 028c3ded07b137a186055b4fa8f9d7306585942ad7ee022a37b3df065dae5d2110d6ddcd874f3dc2c687f10da1122329194b817b1a78a76ff8de557997ca2a19 SHA512 4e1c5dd65a7c493cf43213badfcaaeb0df9c4774cc6f90cfd437612126893e7831d218c707599adb97dbee7ebaaa2372c796c634d75738bd06328735eb8f1189
-EBUILD cython-test-exception-raiser-1.0.0.ebuild 613 BLAKE2B 24b932c592a909dc1b182dcdea487ee0b5019718914a4bd3b13920805eedfcbf815332b0f8ab6bebec9d8139e03585d1c2567318e1c67fbbf99d169bfcf193cf SHA512 34e3c0643871e73aab17fad96142e059f11fe6c44f0468b292a590f57a862b71ea7e5d386fe10036ac8ce12129069558fad050145209ad9a423f57a4f27de307
+EBUILD cython-test-exception-raiser-1.0.0.ebuild 614 BLAKE2B e23dccf752ef5dd98aabecbd82c2ef96424534d8ab6ed4a9c4d4cbcacd9a066972f24c923991ce8c943bf2b048adc2d02a9b68feccbd85d0b4e8dd7bbedb6b79 SHA512 6be3f3e2b05ef61d6bd4a91d60e9e090c856325eb44b2b409dc91e71ff1146126c6b6d1553b6e71ecdffcb98b14de02fc42a976d033d235d06887e15b2390a0b
 MISC metadata.xml 385 BLAKE2B a99aacc4e3a21f41dd413b185fec8ac393e1c1c2f3897fd7173d717a72b056acb8362a0b5c9b6028021365678f828549fc0b711e9697620f50f9d66ff83952d9 SHA512 1b978c0d50c3b60bdcba9bf93d6da041d83cc9614d4fc6b9837ce9797b0c251d2ed08777f7bc0877d98a9c76b8f8ec744f7f171cbb663aa36e55e2e6a7429fd2
diff --git a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
index a7688e4507d7..133546052a73 100644
--- a/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
+++ b/dev-python/cython-test-exception-raiser/cython-test-exception-raiser-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="A trivial extension that just raises an exception (for testing)"
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index d5826230c769..77a51ddcec5c 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -2,11 +2,13 @@ AUX 50cython-gentoo.el 388 BLAKE2B 5bc38190b467efa9e7be1a5831022534dbfdc02206fca
 AUX cython-0.29.14-sphinx-update.patch 377 BLAKE2B 32ba9ccc6c093fb9e575686c9a3b707a10a2488979d0a1dcc0863022d48255455216d11c1968bc5d49a8b583a340113c090ec103ae233dcac2164beb1765f9cc SHA512 3714019a1659b69243bf5f76d1557e3e4e507fa6b15bf4259001f961d1127e18e01e3d17fe04706c882e264651ea5699c6295f33c66af7577ab6e0906c0d3273
 AUX cython-0.29.21-spawn-multiprocessing.patch 1096 BLAKE2B f31e9e8bdc86ab1098bfa115e60470410f41fdf4be558c6a11d0c3ea61b8a8009f6242a96e2574f525e53b6125de78c5f8dbd8f7499d8debd368e80a6d383e47 SHA512 71f2349dfee2504bffe2ce378a00b2033ad229f99c597382eafa54107fbdc56fc177e4412e6314794b5ce22d9713e535467b0ed3e36ae657a5deb9c3325eb242
 AUX cython-0.29.22-spawn-multiprocessing.patch 963 BLAKE2B ebbc3f6f4fa88e7e082326bccbad328724a4ff5645f0b2aa28f21419044b17bed8495618bb980b23a99310c2b6ef275331e1b9aa6d734017eb33646c92a07a73 SHA512 3f5c6b4108b87cf3014416386095c07ac91762152bbd87e8bd589177d40b933c11e19610bea06720c5c70f76b5b9b70d27e5c3cfa20eed30deaaf7d122910bd3
+AUX cython-0.29.23-test_exceptions-py310.patch 656 BLAKE2B 6c650c85d01b8bf367528d144cd967fa9def94634e35763e2e7a1c3e5afa2b01d0c84694024dde6e45577eee223f6464b5f88ab971d207d35892edf347a0c08f SHA512 d8f7f770a0b3303552deec0e7d3f9258de1edcd384f4b2c3881634fd21ce847a3d974e9142d1ed2fbe3a549e65292c6690be3a36ab4de52d0593d9831dc2f7ce
+AUX cython-0.29.23-tracing-py310.patch 13401 BLAKE2B e2359644ef2dd2c2f9eadc41eac6634d8bcde77edc4f7c11b8c6c3ae2f037965291c3cf9907ac5e07f3f97505adf9c2040f30e7830c9216bd7d51aeca68b5286 SHA512 e0fbd24224da1e848fc37dc8652738086c43297432627599ec8d43cf75c6f7a9cd1ff360d156f778e13749f339767608e631336f988f6f17d6f3f40b654275f8
 DIST cython-0.29.21.gh.tar.gz 2088511 BLAKE2B 7a4ddabb65a519d3c71454ac8417438a3a9c46b47489c18e7c7e82ffcb5d5f2f0c5246d0b364f8317d374c53f0c83844c73c7d2ef6b9f75f10707aaf2931ce41 SHA512 2c0c3e3fff07106eb98862f71cd5dec9ff29460cf9b9e4de74537ca5e033f7523989beb5fbdc14723beaf94a535976f75c803e791b87e017961d9694b8c37679
 DIST cython-0.29.22.gh.tar.gz 2091955 BLAKE2B 8225fa6073d43de1e44e8cd22d52f9bde5d3b6e6e766c74d5ef18d77b57c0e1b22a21cae5b133b0b22f7207aa51dc0e76f1073db977190d42c2b55cc2d7e148e SHA512 b7f22112678f159bf1d0ad5fe4f7c103e96f240bab4d9dc07edd7c2f66a9887b9af72b32f1d5886361b48d428bc2b9499d3c5b59ce5af1068f20a26549783dd6
 DIST cython-0.29.23.gh.tar.gz 2093463 BLAKE2B c710b9bc9e05e0030dff3098857b349564fd167f7d9c47e2ef4e8897e072f67497b8ed3994f45135c21f8b2bf3a2cff016fec9a808b2bbe9712174dd0a6b1a3e SHA512 093b7a1d5c68f6e2d2b9b8adb9ac99e8967ddd0a66c0513a78e88bd55d96533dd8352b2478554fb53bf32a72d730967fb08ccb2eaa462da68f86891dceb4925a
 EBUILD cython-0.29.21-r1.ebuild 1792 BLAKE2B 03fbab5e328ff2dba249e6a5bf17abdb4fe69217f3527a89c4920d78129bc4a40b267ac58f8eb70deddd432ea34538a44254e1a71931f7263fae8d3761b9c1a2 SHA512 7b0240e6ff14f2cf12e54deaf025cbb4c72984a351541b646234091159c0a4e2305339cd6a58f64b756a9f99aa39fee3e9b326127e5bcf98ccca5de26d9bdf3a
 EBUILD cython-0.29.21.ebuild 1987 BLAKE2B 1df83b6ef7f839622cd73c07384ccf0a6e722fe5ae9f42374ff9df2995e5b624e78a534c078534c341d034f984f73fc5c3abe954166ba8ef0f3fcc6aff2fbf06 SHA512 aa85e5d5ea9a1413686d8903af4c2c310f504ba0fc1ca469253010dae7a2abbb434b5d2e59f18b1a22f1149cfaade4b942466973e9559b913146abdf3b191155
 EBUILD cython-0.29.22.ebuild 1845 BLAKE2B fcace04a858c1fbbb291c7ac9c961c8fa2cfd9b222298082bb183cd0608015965110d0c809daf6cfc206c0f9db709d5689ac71711f8bf5c06cad0d974c09ce60 SHA512 c93468b1e423be8ddbc42bb507070d33a88454b85ddeae6eafbcaf3d50f6658f1732bb8f45381b714af3d141fb05ae76d294a8149a2cbb3cd7cf53893e1edab7
-EBUILD cython-0.29.23.ebuild 1852 BLAKE2B 343b0e6d7115144ff2bf5491d07b38e1a829c04831b890725edb611dfdbf00c3a001285970fe3a3dea4961efc6e878dee6ec28ab6726df78a25b2f772fe05eac SHA512 7570f675c7de77c7c1189e327851b8896ddcf475278edb14ba86dfdcb6cd641ce50b0dbd9624de653d2395f7da4c894aa8238a05174b7149441205a86a6a2170
+EBUILD cython-0.29.23.ebuild 1953 BLAKE2B b7a6d286d13161035966badbfe62af11b8a9abb5df9b67516740b9c6295118032b3e6be38167f816cb30dd1938391eaddd40064fd2252b99896b89234e4824a8 SHA512 dc00e398f42d8604a980d2344532f0741f8c446a5d28b3fa6f641874e0a0e961bdb6aaa255a3b6076f361282246dbd5e71ad3956e154e9d43d27606a89557d1a
 MISC metadata.xml 605 BLAKE2B 900f2ffaa501d7ce5bef46115f7fdbda0966bf4ae048b4c27ac4be06e1b23de17c674e27f97627aed8d1d65b52bea01532d8a698bdbcd20b7c9fab4bad278b16 SHA512 66176bb6e00f70b610a41bfbc973bae2b4b8b9aeeeb6bdc9e14c2832d513d5452aec6509f8225daffb7e169d93311a4ccb026c935ead80ffeb35d91f1ae558fe
diff --git a/dev-python/cython/cython-0.29.23.ebuild b/dev-python/cython/cython-0.29.23.ebuild
index d2fe1b9af4ef..c202aeb4126f 100644
--- a/dev-python/cython/cython-0.29.23.ebuild
+++ b/dev-python/cython/cython-0.29.23.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 toolchain-funcs elisp-common
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/cython/cython/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="emacs test"
 RESTRICT="!test? ( test )"
 
@@ -32,6 +32,8 @@ BDEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/${PN}-0.29.14-sphinx-update.patch"
 	"${FILESDIR}/${PN}-0.29.22-spawn-multiprocessing.patch"
+	"${FILESDIR}/${PN}-0.29.23-test_exceptions-py310.patch"
+	"${FILESDIR}/${PN}-0.29.23-tracing-py310.patch"
 )
 
 SITEFILE=50cython-gentoo.el
diff --git a/dev-python/cython/files/cython-0.29.23-test_exceptions-py310.patch b/dev-python/cython/files/cython-0.29.23-test_exceptions-py310.patch
new file mode 100644
index 000000000000..0c9fb2c9ea56
--- /dev/null
+++ b/dev-python/cython/files/cython-0.29.23-test_exceptions-py310.patch
@@ -0,0 +1,14 @@
+--- a/tests/run/test_exceptions.pyx
++++ b/tests/run/test_exceptions.pyx
+@@ -188,7 +188,10 @@
+ 
+         # should not apply to subclasses, see issue #31161
+         s = '''if True:\nprint "No indent"'''
+-        ckmsg(s, "expected an indented block", IndentationError)
++        if sys.version_info >= (3, 10):
++            ckmsg(s, "expected an indented block after 'if' statement on line 1", IndentationError)
++        else:
++            ckmsg(s, "expected an indented block", IndentationError)
+ 
+         s = '''if True:\n        print()\n\texec "mixed tabs and spaces"'''
+         ckmsg(s, "inconsistent use of tabs and spaces in indentation", TabError)
diff --git a/dev-python/cython/files/cython-0.29.23-tracing-py310.patch b/dev-python/cython/files/cython-0.29.23-tracing-py310.patch
new file mode 100644
index 000000000000..ff0e45a646dc
--- /dev/null
+++ b/dev-python/cython/files/cython-0.29.23-tracing-py310.patch
@@ -0,0 +1,213 @@
+From c9cccfeaf3f0e20c2bb14fc234e86f4fc8e4fe81 Mon Sep 17 00:00:00 2001
+From: Stefan Behnel <stefan_ml@behnel.de>
+Date: Fri, 14 May 2021 19:39:58 +0200
+Subject: [PATCH] Adapt tracing code to Py3.10 beta 1.
+
+---
+ Cython/Utility/Profile.c | 79 +++++++++++++++++++++++++---------------
+ 1 file changed, 49 insertions(+), 30 deletions(-)
+
+diff --git a/Cython/Utility/Profile.c b/Cython/Utility/Profile.c
+index 15ceb41cc2..2cd9af9da7 100644
+--- a/Cython/Utility/Profile.c
++++ b/Cython/Utility/Profile.c
+@@ -47,13 +47,32 @@
+     #define CYTHON_FRAME_DEL(frame) Py_CLEAR(frame)
+   #endif
+ 
+-  #define __Pyx_TraceDeclarations                                     \
+-  static PyCodeObject *$frame_code_cname = NULL;                      \
+-  CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL;           \
+-  int __Pyx_use_tracing = 0;
++  #define __Pyx_TraceDeclarations                                         \
++      static PyCodeObject *$frame_code_cname = NULL;                      \
++      CYTHON_FRAME_MODIFIER PyFrameObject *$frame_cname = NULL;           \
++      int __Pyx_use_tracing = 0;
+ 
+-  #define __Pyx_TraceFrameInit(codeobj)                               \
+-  if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj;
++  #define __Pyx_TraceFrameInit(codeobj)                                   \
++      if (codeobj) $frame_code_cname = (PyCodeObject*) codeobj;
++
++#if PY_VERSION_HEX >= 0x030a00b1
++  #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \
++     (unlikely(tstate->cframe->use_tracing) && \
++         (!(check_tracing) || !tstate->tracing) && \
++         (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc)))
++
++  #define __Pyx_SetTracing(tstate, enable) \
++      (tstate)->cframe->use_tracing = (enable)
++
++#else
++  #define __Pyx_IsTracing(tstate, check_tracing, check_funcs) \
++     (unlikely(tstate->use_tracing) && \
++         (!(check_tracing) || !tstate->tracing) && \
++         (!(check_funcs) || tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc)))
++
++  #define __Pyx_SetTracing(tstate, enable) \
++      (tstate)->use_tracing = (enable)
++#endif
+ 
+   #ifdef WITH_THREAD
+   #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error)             \
+@@ -62,8 +81,7 @@
+           PyThreadState *tstate;                                                         \
+           PyGILState_STATE state = PyGILState_Ensure();                                  \
+           tstate = __Pyx_PyThreadState_Current;                                          \
+-          if (unlikely(tstate->use_tracing) && !tstate->tracing &&                       \
+-                  (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {    \
++          if (__Pyx_IsTracing(tstate, 1, 1)) {                                           \
+               __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno);  \
+           }                                                                              \
+           PyGILState_Release(state);                                                     \
+@@ -71,8 +89,7 @@
+       }                                                                                  \
+   } else {                                                                               \
+       PyThreadState* tstate = PyThreadState_GET();                                       \
+-      if (unlikely(tstate->use_tracing) && !tstate->tracing &&                           \
+-              (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {        \
++      if (__Pyx_IsTracing(tstate, 1, 1)) {                                               \
+           __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno);  \
+           if (unlikely(__Pyx_use_tracing < 0)) goto_error;                               \
+       }                                                                                  \
+@@ -80,8 +97,7 @@
+   #else
+   #define __Pyx_TraceCall(funcname, srcfile, firstlineno, nogil, goto_error)             \
+   {   PyThreadState* tstate = PyThreadState_GET();                                       \
+-      if (unlikely(tstate->use_tracing) && !tstate->tracing &&                           \
+-              (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {        \
++      if (__Pyx_IsTracing(tstate, 1, 1)) {                                               \
+           __Pyx_use_tracing = __Pyx_TraceSetupAndCall(&$frame_code_cname, &$frame_cname, tstate, funcname, srcfile, firstlineno);  \
+           if (unlikely(__Pyx_use_tracing < 0)) goto_error;                               \
+       }                                                                                  \
+@@ -91,10 +107,9 @@
+   #define __Pyx_TraceException()                                                           \
+   if (likely(!__Pyx_use_tracing)); else {                                                  \
+       PyThreadState* tstate = __Pyx_PyThreadState_Current;                                 \
+-      if (tstate->use_tracing &&                                                           \
+-              (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc))) {          \
++      if (__Pyx_IsTracing(tstate, 0, 1)) {                                                 \
+           tstate->tracing++;                                                               \
+-          tstate->use_tracing = 0;                                                         \
++          __Pyx_SetTracing(tstate, 0);                                                     \
+           PyObject *exc_info = __Pyx_GetExceptionTuple(tstate);                            \
+           if (exc_info) {                                                                  \
+               if (CYTHON_TRACE && tstate->c_tracefunc)                                     \
+@@ -104,7 +119,7 @@
+                   tstate->c_profileobj, $frame_cname, PyTrace_EXCEPTION, exc_info);        \
+               Py_DECREF(exc_info);                                                         \
+           }                                                                                \
+-          tstate->use_tracing = 1;                                                         \
++          __Pyx_SetTracing(tstate, 1);                                                     \
+           tstate->tracing--;                                                               \
+       }                                                                                    \
+   }
+@@ -113,13 +128,13 @@
+       PyObject *type, *value, *traceback;
+       __Pyx_ErrFetchInState(tstate, &type, &value, &traceback);
+       tstate->tracing++;
+-      tstate->use_tracing = 0;
++      __Pyx_SetTracing(tstate, 0);
+       if (CYTHON_TRACE && tstate->c_tracefunc)
+           tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_RETURN, result);
+       if (tstate->c_profilefunc)
+           tstate->c_profilefunc(tstate->c_profileobj, frame, PyTrace_RETURN, result);
+       CYTHON_FRAME_DEL(frame);
+-      tstate->use_tracing = 1;
++      __Pyx_SetTracing(tstate, 1);
+       tstate->tracing--;
+       __Pyx_ErrRestoreInState(tstate, type, value, traceback);
+   }
+@@ -132,14 +147,14 @@
+               PyThreadState *tstate;                                                      \
+               PyGILState_STATE state = PyGILState_Ensure();                               \
+               tstate = __Pyx_PyThreadState_Current;                                       \
+-              if (tstate->use_tracing) {                                                  \
++              if (__Pyx_IsTracing(tstate, 0, 0)) {                                        \
+                   __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result);  \
+               }                                                                           \
+               PyGILState_Release(state);                                                  \
+           }                                                                               \
+       } else {                                                                            \
+           PyThreadState* tstate = __Pyx_PyThreadState_Current;                            \
+-          if (tstate->use_tracing) {                                                      \
++          if (__Pyx_IsTracing(tstate, 0, 0)) {                                            \
+               __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result);      \
+           }                                                                               \
+       }                                                                                   \
+@@ -148,7 +163,7 @@
+   #define __Pyx_TraceReturn(result, nogil)                                                \
+   if (likely(!__Pyx_use_tracing)); else {                                                 \
+       PyThreadState* tstate = __Pyx_PyThreadState_Current;                                \
+-      if (tstate->use_tracing) {                                                          \
++      if (__Pyx_IsTracing(tstate, 0, 0)) {                                                \
+           __Pyx_call_return_trace_func(tstate, $frame_cname, (PyObject*)result);          \
+       }                                                                                   \
+   }
+@@ -176,9 +191,11 @@
+       __Pyx_ErrFetchInState(tstate, &type, &value, &traceback);
+       __Pyx_PyFrame_SetLineNumber(frame, lineno);
+       tstate->tracing++;
+-      tstate->use_tracing = 0;
++      __Pyx_SetTracing(tstate, 0);
++
+       ret = tstate->c_tracefunc(tstate->c_traceobj, frame, PyTrace_LINE, NULL);
+-      tstate->use_tracing = 1;
++
++      __Pyx_SetTracing(tstate, 1);
+       tstate->tracing--;
+       if (likely(!ret)) {
+           __Pyx_ErrRestoreInState(tstate, type, value, traceback);
+@@ -199,7 +216,7 @@
+               PyThreadState *tstate;                                                       \
+               PyGILState_STATE state = __Pyx_PyGILState_Ensure();                          \
+               tstate = __Pyx_PyThreadState_Current;                                        \
+-              if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \
++              if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \
+                   ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno);          \
+               }                                                                            \
+               __Pyx_PyGILState_Release(state);                                             \
+@@ -207,7 +224,7 @@
+           }                                                                                \
+       } else {                                                                             \
+           PyThreadState* tstate = __Pyx_PyThreadState_Current;                             \
+-          if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \
++          if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \
+               int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno);          \
+               if (unlikely(ret)) goto_error;                                               \
+           }                                                                                \
+@@ -217,7 +234,7 @@
+   #define __Pyx_TraceLine(lineno, nogil, goto_error)                                       \
+   if (likely(!__Pyx_use_tracing)); else {                                                  \
+       PyThreadState* tstate = __Pyx_PyThreadState_Current;                                 \
+-      if (unlikely(tstate->use_tracing && tstate->c_tracefunc && $frame_cname->f_trace)) { \
++      if (__Pyx_IsTracing(tstate, 0, 0) && tstate->c_tracefunc && $frame_cname->f_trace) { \
+           int ret = __Pyx_call_line_trace_func(tstate, $frame_cname, lineno);              \
+           if (unlikely(ret)) goto_error;                                                   \
+       }                                                                                    \
+@@ -263,19 +280,21 @@ static int __Pyx_TraceSetupAndCall(PyCodeObject** code,
+         (*frame)->f_tstate = tstate;
+ #endif
+     }
+-      __Pyx_PyFrame_SetLineNumber(*frame, firstlineno);
++    __Pyx_PyFrame_SetLineNumber(*frame, firstlineno);
++
+     retval = 1;
+     tstate->tracing++;
+-    tstate->use_tracing = 0;
++    __Pyx_SetTracing(tstate, 0);
+     __Pyx_ErrFetchInState(tstate, &type, &value, &traceback);
++
+     #if CYTHON_TRACE
+     if (tstate->c_tracefunc)
+         retval = tstate->c_tracefunc(tstate->c_traceobj, *frame, PyTrace_CALL, NULL) == 0;
+     if (retval && tstate->c_profilefunc)
+     #endif
+         retval = tstate->c_profilefunc(tstate->c_profileobj, *frame, PyTrace_CALL, NULL) == 0;
+-    tstate->use_tracing = (tstate->c_profilefunc ||
+-                           (CYTHON_TRACE && tstate->c_tracefunc));
++
++    __Pyx_SetTracing(tstate, (tstate->c_profilefunc || (CYTHON_TRACE && tstate->c_tracefunc)));
+     tstate->tracing--;
+     if (retval) {
+         __Pyx_ErrRestoreInState(tstate, type, value, traceback);
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 0c1311581b45..6db5c79bf865 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,5 +1,7 @@
 DIST dask-2021.3.0.tar.gz 3672035 BLAKE2B 17b3e808603b8524e96273ad33b69689605707a1c187b32c8ed67f054e7f242525365956800017ad5685e0c306dcd21bcfb3dbb3f9920446f03553ceb0fdd9a8 SHA512 ba5b62dd51dad29a106a4fe38a5015f7e1d7ad11eaa21a524b7c8b7d916873b9e447d065c9009e8100662aa3b1f64718b164369f173fc84f5f085a1e369e091a
 DIST dask-2021.4.1.tar.gz 3702584 BLAKE2B d6c630349f26378c1c6d15de38c112ef330bec6422664b6e5737b7a023800f1705be163cefd79cf76c1213ca6b773ee19e2dc7e3f22eb60edc23e6fd4c153e16 SHA512 55d8d3a1a3eb76ac68eed5092075301ca88ff311f6729952928fde49f90a1b9a825dc085fb38b07a0138b87a109a5913f26d683c5fd22476539f3a8f36397c32
+DIST dask-2021.5.0.tar.gz 3710206 BLAKE2B d02bd280a704cf03fb403c58567be33c414171ef3ee1eed2f788cf2b3026c2aa3806c19a8e9f239c93a0eb8ab2474f14fa80b8e1057ae0db1c0ce4a68f0cedad SHA512 bfc2c870df02f1879907621cb9abdce8bf03d07fea2823acea68b220ed414ee146036b73eb50c92608140ed18566e7a53807dcc1fdf534876920467979908592
 EBUILD dask-2021.3.0.ebuild 1124 BLAKE2B 438fd46d7d69e191f04e66c7b1b6d61188a133e6b0c44885f7f2833f297d4fd4d37f03bb4747772935481f802b684e403322e552a311788cdf2e3657c80505ef SHA512 0cd9b1e7e22f1d90f9baf0c0546681bb6709b829b69e96876ee7e0fb1adbf7a1458e521914f86d80c6906e6594410db3c78a841ae08d3c599366731e9566a7d3
 EBUILD dask-2021.4.1.ebuild 1083 BLAKE2B 230b277e98b67bc39e995ce24417dead6e9837cd59a54ebaae2d90dbe1a9ba16bd3d8df479a724e87fe6c9b91559b57d5440b7f0cee4961614c2b5fe017634e0 SHA512 d93483a2ac23c86f2f2c613c0760434c0867138cca2bd2967462ac55707c22702ba1fb4f8003fef48f2f7059aeafd2a15ff8929c5cb0d1fab89863d0e96060c0
+EBUILD dask-2021.5.0.ebuild 1130 BLAKE2B 638753f70cb901a39c94aa977b951e59aa05b79de97a1e96848f761018faa0b09dc26953e0fa81887434e5520b290e043ba7a8cf3a238bcb5fe9da9f08a88937 SHA512 27e4853bb68686b4b576e32be05ede702751d5f8807ea2b82b9959f49b1a00c11b76f7c16c6b01e366fcd0975f34e6a14a3646c51824ae8739099367f3e2ce14
 MISC metadata.xml 670 BLAKE2B 1a15001a3836bd70c8d539b34283c9e3b19e3a37031de32f82e8b44a09de2031e572104b1dcc5a690c80c55981f0c510325ba700e4e859a15dcd0a3b06a6abd1 SHA512 41e31ef86be6c90bf9846bb9a753d6f6ed3119d0bca3f0b205c9f814045fccf99702ff901b7e5fb1d785fb5cdd5230ba7520dd6e6ae604761af1442e8ec81538
diff --git a/dev-python/dask/dask-2021.5.0.ebuild b/dev-python/dask/dask-2021.5.0.ebuild
new file mode 100644
index 000000000000..9f9b2cef940c
--- /dev/null
+++ b/dev-python/dask/dask-2021.5.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="https://dask.org/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		<dev-python/sqlalchemy-1.4[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/ddt/Manifest b/dev-python/ddt/Manifest
index 13069bf64419..6b7add3f0f77 100644
--- a/dev-python/ddt/Manifest
+++ b/dev-python/ddt/Manifest
@@ -1,3 +1,3 @@
 DIST ddt-1.4.2.tar.gz 17802 BLAKE2B c6ee061c48f5954f22bce20c255fa4c52aed9b756a22ec3678108abd78e66294c3f1e0316c4fcf2cc4fd6337915efbadf7bd123a2144ea38151079b85f2905a5 SHA512 f494c266af0f018d0c354309674cbf8c98bd8ba31ceb1820243ec1d92449ce712a21d22340fbfb4b1d850f4496a4cfcb4c24b346e88587c3dc025e2ef9496ad2
-EBUILD ddt-1.4.2.ebuild 617 BLAKE2B 20535dee346c1cb2e5dec3a2b620273fb81c0f7c1c86cc04521eb8eaa0a75d612d899faeb4186856f4cc5aa1b1974e38bf2fbfbbc2595cbd682dc2541c61317a SHA512 bd5ceaeaa6631ea5041b3b5e4d5f741eed1b74312e17120fb52550cf2cb976d3dd9e4751f7894c2973cadcc30417a9bdb9f5bdb08f2730d9b84a901eddfa8827
+EBUILD ddt-1.4.2.ebuild 606 BLAKE2B bdfe561d18805d9a826386eb1c789fb07dd17878a90f2423678da319898478c42f87ff87a7927a5296caf30b2a48bee2759b4eb944c4efcf497980ac869fdb5c SHA512 bd03c3667c6c155a307ba0ddc867ab1358c720c5636c5cc0ad6e1ce22481b2348a79e7b6815aa04b3c9f6ba2f475998cb45c43a437888e9f692cdbd7a69be4dc
 MISC metadata.xml 636 BLAKE2B 073d2c7d879b92927f8fa037b79eb9a947b3acc9decd241e8c1ba50352af45f27480c02061d264ae3eb5187061b2f2df1465ec6540590edeb871d29eacfbb7e2 SHA512 9dc659009767cafa7509e00533ffa037fad5152cc2e35b1631e764d0120e9dac532718859dec4fe6368fb6f44adaee307eb264820ec8d2e8d8cf515e7dc4e563
diff --git a/dev-python/ddt/ddt-1.4.2.ebuild b/dev-python/ddt/ddt-1.4.2.ebuild
index f0ae4519e0f0..ea0f9dd6a241 100644
--- a/dev-python/ddt/ddt-1.4.2.ebuild
+++ b/dev-python/ddt/ddt-1.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -18,7 +18,6 @@ SRC_URI="
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~sparc x86"
-IUSE="test"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/debtcollector/Manifest b/dev-python/debtcollector/Manifest
index 3fc5e44a7e92..0c2f66ca0ac4 100644
--- a/dev-python/debtcollector/Manifest
+++ b/dev-python/debtcollector/Manifest
@@ -1,3 +1,3 @@
 DIST debtcollector-2.2.0.tar.gz 28833 BLAKE2B 33361daaba12c52a1cc0bac168199ef3dbb959279def29ef782fa421f0aa106038de02217f6321c64e02845abd0573e69f5638b384411e7fbfd194dd3f6b3356 SHA512 6e5fdf38a25406a7a56d18e9b900471e3e4ce513ef62619c9eafa153ea08ff6b4b9bd90c524cfa16e04ff0c9c324e90d4fdd75212fced0b202245cdddae02137
-EBUILD debtcollector-2.2.0.ebuild 607 BLAKE2B d6b7b3887670837660c448bdd903f0161a0a195293867bec7aac403e8b6cf3de6151f7206db08c401d459de792a69030f3a29efb13a1c385e99bbe585049ce25 SHA512 67180d41f3804c85bf342c6632ddbe0fdceee2ae363da8091a59acf82f95a4dc2d920a5246201b64d7aed690e1799bce45d0f4f11e3958699e23f92ba1bf77a8
+EBUILD debtcollector-2.2.0.ebuild 606 BLAKE2B aa4f1af4a65de10cf4e9c7da5f56381a3204fa7f5fd2808806cae1255558c3854c3be63dfabfd8a3be45cea10a23568b19b4d25803eef0c99f2979dccc8bf024 SHA512 3e260e296d0ecbcdab668e769a3feb5303ad6cd5da9e90ed73ad186561429884ed38b61f6bbba5501b00c4241ac785b4b4a8e67e104928acf29cd8e8dcee35d9
 MISC metadata.xml 354 BLAKE2B c2e198a4a48d28c75193c8e6eb766b198823632b51a52a15e3a996c75a6aab8f92a68dd4283354fb487cd9b17ec29f6e089df04889e2add49157c69c18156b52 SHA512 8978fb3df25c4060dfe995f7d298fd5b5b79eb513b2ae8d10954264ea6ae5adc2c8a023073337e0f2bfa2ea28e6b45be9b6388d05cde7af19dc4209acf2ce84e
diff --git a/dev-python/debtcollector/debtcollector-2.2.0.ebuild b/dev-python/debtcollector/debtcollector-2.2.0.ebuild
index f2d8758c6da0..8241170b3288 100644
--- a/dev-python/debtcollector/debtcollector-2.2.0.ebuild
+++ b/dev-python/debtcollector/debtcollector-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 DEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/decorator/Manifest b/dev-python/decorator/Manifest
index 75a7d7e0143a..09de15f1c894 100644
--- a/dev-python/decorator/Manifest
+++ b/dev-python/decorator/Manifest
@@ -1,5 +1,7 @@
 DIST decorator-4.4.2.tar.gz 33629 BLAKE2B 5b2c6a1b6aba293d4b93444d4613e3c9af16bd9d6d80ae9eb21112a4a16397ff67e1f648e8118beeb7d17755a2f1bd37b867f73129c42ef7f8654d1c1f609e5f SHA512 c068efd4e70764ac447b772c9c29625c2180dad256b2b4e46a50a8479fc1d7de09b114c2ba11bb37dd58774ed9460d2e0ea9fa76061833a2d3c2676ac91a0db1
 DIST decorator-5.0.7.tar.gz 34292 BLAKE2B 93f69256e21fd9867faf8c80c6a62834e5206aeb552efb757badeb0f0ec0085699a520542feac2bfa1a0165c0a40f86ecf70e5717c10801bed28d1acd7397216 SHA512 78ae542b2f20d3d1714cf13120b14db308d73b866591c8ae42d69103a11e8d05a553438619bb68730310857587746e9d211ec4cf4b3fb5fbbcef030183b65294
+DIST decorator-5.0.9.tar.gz 34544 BLAKE2B c7dfafd9d7354d075a154ba9bd3aa2bed52454e3412ce22ed2cd47f4c1ec94f601c754bd270c1a2d9447a087ce114579d3b2b2340721dfd4aaac1e2d1f801b93 SHA512 8b46370bbc9cff5208823af60f31779b0ee02e03c796223ddfeb473f7c36bf7ee7da48c5712eea89ca8a96ef32695ff31c4902a76284caf543cf4937a0bd7aa5
 EBUILD decorator-4.4.2-r1.ebuild 585 BLAKE2B 5fa35e14878d8acf47afb8e7b78db7b861c66d66637a1b91f86c50bcdfc596b031d75adc0682053323b62a7094fd3ce2baaf71a8e2bc5b2abaed4b725e4a75c7 SHA512 2ef83b5d4d127453ace335df139b19f71b7f3222a6eda49c8caf00c253e870202e7f36f9d4f36f0668e543f8febb5cacd2ab9be54e605b246fdcbe7ff2d8105b
 EBUILD decorator-5.0.7.ebuild 644 BLAKE2B 2be4120a8fd47474e10112dc9f4afc6192399e4865f8332ba506d42ddb68a88b13351539305795c139404705ebcdf02bfbe0f8da5eeb44331904a3b2f3fa0074 SHA512 6198f6cdfd58b4b08f10e38b27365ad003a9bde53bbc469f674738853d695ae2a4195f6f4e1e583ccc6d71fe3b26cbb4d0b0c5a386df9cc0914c6a14cad858bc
+EBUILD decorator-5.0.9.ebuild 652 BLAKE2B b0fbac55eff383f492130bc2a1cf2561bf442c1c47be5a49ff4eb6ffe4a830d0e8dac33a53189993da2e4d999c0117394072163652df19e3382fe6faf0a72aea SHA512 15b7aa0db0a75bbe826bbef1358e3e51dc4a12e871a74658dcc5948408885c6c4c32f645ed7e8fb79e2fac919e4db8b1dfaa0fbcf27b27c71245f24bfd5132ac
 MISC metadata.xml 755 BLAKE2B adb49470c4efa969898e39f60002800c948f985933ae6f3ee773f03b1a5cfc4f4addca2f4cbd486ddb3f37222c69090a88c2befed4769d33df96fab014bf5715 SHA512 e8a2802a144fab6e73d358c30fe2fe9ce394a4497c82670ccbe23f2ee156111b848444814114d17ffda2bbab26e3a126f8fe58ff6c2a9d63738d7733f4463582
diff --git a/dev-python/decorator/decorator-5.0.9.ebuild b/dev-python/decorator/decorator-5.0.9.ebuild
new file mode 100644
index 000000000000..8047ed24268d
--- /dev/null
+++ b/dev-python/decorator/decorator-5.0.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simplifies the usage of decorators for the average programmer"
+HOMEPAGE="https://github.com/micheles/decorator https://pypi.org/project/decorator/"
+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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+DOCS=( CHANGES.md )
+
+python_test() {
+	"${EPYTHON}" src/tests/test.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/denonavr/Manifest b/dev-python/denonavr/Manifest
index 82b61a06a436..f3a669c0e948 100644
--- a/dev-python/denonavr/Manifest
+++ b/dev-python/denonavr/Manifest
@@ -1,5 +1,7 @@
 DIST denonavr-0.10.6.tar.gz 124692 BLAKE2B f0af92e0160d0533389e69dfad5740c432d52b3b6446288a572ef62aa9c8610397d3d8d5770ce6b46b4ad224b2782fc8a63a4f548a4237251d52695f5b4dde95 SHA512 336183e04e2f3f98faa1878a472ce69cc2fe7519398b34a61126cd6539ae6e40c60329d5b2f914e3dc85a9dbb11a1eb8fe9669f4e2910838d5ffcee0da7633c5
 DIST denonavr-0.10.7.tar.gz 148282 BLAKE2B a5168c1b00ce1e8223d619a8e2e7ae663fa913d673b6f62580daf57ff76d8da4306681d92df0e32e612376038255bc52e25a1f59dd5f6a429685c8bd9146d843 SHA512 6667edeb4272ce909f8bc2dfa51b31d78915ae6085064bbf0f53714f8b473e0fad24eb6484a10abb093ef27d59faeaebdffdb55eadb03f8b64e864642364a791
+DIST denonavr-0.10.8.tar.gz 148387 BLAKE2B 1ad6687655abe70e6f83119c893187efe88143521e5c91987ae6b3d393fe7a327bf34941d87a4ba37107ef415493471be0630a1f3c643f94cfb3e22460c80806 SHA512 fea1b2a03d83d520c837323939db503879ec0c973bbf9409087298977f4d07f8ed8b25c2d287c1529786a4e42cd59b0f0708a8a4b7df3d5f630967110d7fe906
 EBUILD denonavr-0.10.6.ebuild 755 BLAKE2B 19509ed35e79c27f4a6f352ff1cc06a06786e0a57806999bd02df983e41b04f62aa522fa96665c0fd875208ceef9b0121c7e4bc7427d5a10e71d7e3642dbae5b SHA512 3a6cb8ab60f3be41cd01d155e6501decf3ab5311f565392eb9b71d20b017ae9d3ea3e33cebb78b54ab7ff31ceb8fda0c570a7bdceda9015fff1b8c0ff1d1e7e7
 EBUILD denonavr-0.10.7.ebuild 755 BLAKE2B 19509ed35e79c27f4a6f352ff1cc06a06786e0a57806999bd02df983e41b04f62aa522fa96665c0fd875208ceef9b0121c7e4bc7427d5a10e71d7e3642dbae5b SHA512 3a6cb8ab60f3be41cd01d155e6501decf3ab5311f565392eb9b71d20b017ae9d3ea3e33cebb78b54ab7ff31ceb8fda0c570a7bdceda9015fff1b8c0ff1d1e7e7
+EBUILD denonavr-0.10.8.ebuild 755 BLAKE2B 19509ed35e79c27f4a6f352ff1cc06a06786e0a57806999bd02df983e41b04f62aa522fa96665c0fd875208ceef9b0121c7e4bc7427d5a10e71d7e3642dbae5b SHA512 3a6cb8ab60f3be41cd01d155e6501decf3ab5311f565392eb9b71d20b017ae9d3ea3e33cebb78b54ab7ff31ceb8fda0c570a7bdceda9015fff1b8c0ff1d1e7e7
 MISC metadata.xml 549 BLAKE2B 7031b8af81fe98059cf29d386d6f09493af833f33dacfd2be8f4e4e534a6ec1196e85cfc3ddf13ffe4a4333c0be7c95d453916bf6a223065e1520259956ce51f SHA512 01ecd0c14cce4a3479e70c3aea2d3f2e3c582bf9ff7bc8f887f341e19b0e45fd78638a12b6a617db018da4fe98704345e7e27fb9d6d0ed464daa71b2d1ccacf0
diff --git a/dev-python/denonavr/denonavr-0.10.8.ebuild b/dev-python/denonavr/denonavr-0.10.8.ebuild
new file mode 100644
index 000000000000..744cc8df1076
--- /dev/null
+++ b/dev-python/denonavr/denonavr-0.10.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Automation Library for Denon AVR receivers"
+HOMEPAGE="https://github.com/scarface-4711/denonavr"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/asyncstdlib[${PYTHON_USEDEP}]
+	dev-python/attrs[${PYTHON_USEDEP}]
+	dev-python/defusedxml[${PYTHON_USEDEP}]
+	dev-python/httpx[${PYTHON_USEDEP}]
+	dev-python/netifaces[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+		dev-python/pytest-httpx[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/dictdiffer/Manifest b/dev-python/dictdiffer/Manifest
new file mode 100644
index 000000000000..c32b588daa2c
--- /dev/null
+++ b/dev-python/dictdiffer/Manifest
@@ -0,0 +1,3 @@
+DIST dictdiffer-0.8.1.tar.gz 28555 BLAKE2B 0a6d330134c368e11e07b23d7fe592e72b64b02ede99eb2d52c2d7452b4d2505e7e3afa75ba76c30cbbd663d9cc4c073d8f236200fdfa2866c8beadd097d63b7 SHA512 e221bb0e25a35380519bf775a63fc0d692112dab15a46c8878ef2c9a6780932c8550a4486c4eab7803619a79c2f794a590a5c9ae0fbbccac04b5b11feaf38bbb
+EBUILD dictdiffer-0.8.1.ebuild 991 BLAKE2B 1b48b1346b2b754a47fcaf6af1fa4c6780d6febace0750dd73e79e09972aaa39f2874a455ad98b343ab5e27cd1a6db2aa6c8b7cf43e20a6fa21d11937b5257ff SHA512 36932fb5d362a3685953327eb0a22d0ddab2d6d9401103ef771b8cf7e3bc8b2e4cd1a759bca2a0f50271f2172cfbdd473971dab9ae2c85bd37fad7dd73cc371b
+MISC metadata.xml 422 BLAKE2B f926b468982f49d593d7752f56f8cd984dbeb0ddcbbf853612a56ffc63d3a2fda04c2780cb81139eac4801b1a0ae494dcbb9777850757a9e256136660dbe8f69 SHA512 e823a29e9d83a8b011c66085debed2ae9f48ed3208ce7f79e1f51854c9ca7231993e7a426da6273ea82e0c30f1ad6fccb0c9564290026f187fa94dd6e7c7e098
diff --git a/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild b/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
new file mode 100644
index 000000000000..fb46f2e49d04
--- /dev/null
+++ b/dev-python/dictdiffer/dictdiffer-0.8.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="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"
+SLOT="0"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/isort[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="
+	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
new file mode 100644
index 000000000000..86e09fd12fa0
--- /dev/null
+++ b/dev-python/dictdiffer/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">inveniosoftware/dictdiffer</remote-id>
+		<remote-id type="pypi">dictdiffer</remote-id>
+	</upstream>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/discogs-client/Manifest b/dev-python/discogs-client/Manifest
index f9d6642fd347..068975850a39 100644
--- a/dev-python/discogs-client/Manifest
+++ b/dev-python/discogs-client/Manifest
@@ -1,3 +1,3 @@
 DIST discogs-client-2.2.2.tar.gz 25005 BLAKE2B 1e87ce7a1cfd2d72a3dbbc0544a4e6a91d451c9d65c0712f261297e6bf4a46663bfe73d59781c9159902666cb10c0d1594a37ee6493623f794e0f4ec6ec6cfb0 SHA512 cf08526f739216efa9ef628f28650c8074cd6ddb21e0ab5431a8c8864c1f2707f612b065baf6b2f907b7fa7cdf2cfe5905cbefddb02c6f8f1c7796b0631a2ba7
-EBUILD discogs-client-2.2.2.ebuild 576 BLAKE2B 0e71d7f5f22bc4e0f53499f8dfea169724b3c7ec0e838ec7c05098eb475bb7e417cf37c359a5656d5551a9bf5b6bd95fa251819bd7fee676f55aacf9dd5a1e7f SHA512 cedc465783dc86041b050428108014d8a593599ca483e17cdd52d2166e1567decd409db8c4c94e0ad018e9209113ecd3be104d515e79c1448bd8482620accff1
+EBUILD discogs-client-2.2.2.ebuild 577 BLAKE2B fbdef58cd16b7f9b94e8e92620dc054e735fb4313648df4d00325784afc88fef52440fae46bf9a2f317d087cdfaa6d96e052b351fbf9855accc4a3dcb5307b55 SHA512 43802275a9d85cba2b360e820f4552e56dae53e192389ac1110ecb83af97acf2a9922555f95128760f14e5d7cbbeb00236cff9693e1459d6dcd2440db1dcfe95
 MISC metadata.xml 391 BLAKE2B 49def6f22633b0f670c92c9abead7bd18955527bf30c08443d3fa161ef1e8a9508d540bbdf4fbaa801d6fcad0a1b3b26071c25ad081ad3eb62fcceced57838f0 SHA512 37252a778b2f529b74e72a6f873bb1bb693c339619a7d9c236ad96a8693d9ec04e40299f4be8a03efe48b3f0ea052a676b5508871e3d03c82d2ba814ac325bd9
diff --git a/dev-python/discogs-client/discogs-client-2.2.2.ebuild b/dev-python/discogs-client/discogs-client-2.2.2.ebuild
index 4f8309d6b375..bb0ce05da415 100644
--- a/dev-python/discogs-client/discogs-client-2.2.2.ebuild
+++ b/dev-python/discogs-client/discogs-client-2.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/django-cors-headers/Manifest b/dev-python/django-cors-headers/Manifest
index 062eaff7e5f4..f828b76256cc 100644
--- a/dev-python/django-cors-headers/Manifest
+++ b/dev-python/django-cors-headers/Manifest
@@ -1,3 +1,3 @@
 DIST django-cors-headers-3.7.0.tar.gz 88367 BLAKE2B d8a41a605d4823852cce65ffa8005d1e82598cdd81702d1ecef304c2a117dc553447c0cc7e9c31641165f0ba6975b757365733b349c0f5b1f4e9964095b918c2 SHA512 e1dc9695f99108f0908d8d348d284f1fd4a8ccbb84b3c748c9ae8d81d6f32ac8ef3417b612710e64ea4c63d464d97ac31a199292ebcdaaec3f3e37ad025ed0de
 EBUILD django-cors-headers-3.7.0.ebuild 572 BLAKE2B a1068113db9527f8a9c28657fe2c444930081efd361d6a6dd55cf890c5d2a3e77d7c60aabc4b9313bd6faf10fa06292694772f45d0db1bc7bfbb072ebda45b85 SHA512 eb1cb24debf50e6e6c8b6d8aabdaa3c6630ed8cd027f5ff4694f3455d5670f962be982b74c3f3258b1169e95651a9f82f09a336261286bef04e77711569a43af
-MISC metadata.xml 400 BLAKE2B 924af06d562382e0c692a09f58bc6b8616e3d73a9bcd2f7073ea17ce8cd27ecfdd800d3311cce622f86bab9a01e9151c1514ca8ab6f1ba43508f6edc5497029b SHA512 b1ddf20f92855b534146b185843e816553fe4574bd8c4fdce7c7084f7c2ea9edf1e1d81a55cc220f687045ec8e8dfd4a77ece7c727adc633358b93fe22e563d8
+MISC metadata.xml 319 BLAKE2B 172f48a0df62ea35ef5c57f81b6714c71b2444c7df721df3c1a54e901673bd464a8aade83df244cef3f11dbb395d63c829cb5ce22a8d6b1c28848a1139f7ef8e SHA512 acbb3ae5e1f8637efa3073d839152036aebec92dfd706ea85d020ad7e66301a83e848b1f6f45c5112eb095d3316d383914c0365d476c360eeb09430b56e3d789
diff --git a/dev-python/django-cors-headers/metadata.xml b/dev-python/django-cors-headers/metadata.xml
index 5080a409e510..ff31d8b6b091 100644
--- a/dev-python/django-cors-headers/metadata.xml
+++ b/dev-python/django-cors-headers/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">adamchainz/django-cors-headers</remote-id>
 		<remote-id type="pypi">django-cors-headers</remote-id>
diff --git a/dev-python/django-filter/Manifest b/dev-python/django-filter/Manifest
index fbed275a1504..d12fe19f15d6 100644
--- a/dev-python/django-filter/Manifest
+++ b/dev-python/django-filter/Manifest
@@ -1,3 +1,3 @@
 DIST django-filter-2.4.0.tar.gz 146904 BLAKE2B 994b07c0f5e511451964f4f1e007ff9906975600d0bc8a02dcbeb86f91bf906490ca394ca95c23c57c1fff25a447f50a40054c0abfe385300f9db87645753978 SHA512 0584222b46add89aa7dd1dfd334fdd19903e0119d455a2c46644c501a66df224f9f51c33394d130bcd1fc0f28c6ede6d6853b9790430040ec7228f9a1dc55264
 EBUILD django-filter-2.4.0.ebuild 534 BLAKE2B b1f3032964c78d6722f05f711b62ad10a1a871c1e46f3e6ccaa7caf697a11661a60b7832f3b04737a4cf1c424a0b68ebc8b71408c9c518d3eb26ee09f8e59e48 SHA512 32160f83365c53b49991335dfbb4420f943f849354832e38ab914d25434b72cd46beac326aafbea6cab995ac1a7ff530bc07fb6501e6d0e063eaeb7e92d85010
-MISC metadata.xml 324 BLAKE2B 12344776128e63ef66885d1355375da977aeccd5119ff4d8a95ee4775a1eeb8365a69988409d1a6a37f0fa76abb04e9b03ba30e162a2d590bbe3ed138c4e60c5 SHA512 150744eb6e529228a82a340c30479c4a7018d1ffe29d406e6171c038e6b6c736cac9fc36ea011b606a2dd4d33f56326c8fb8ff1f8b5df9664c43982865f46bbf
+MISC metadata.xml 243 BLAKE2B 81d1eaaa671f8a3da91e41cffc6f164891b9c84a008c4ba8747709edea57e532c427c45093f351f6d7563294d4cd62914ebed9e9f735c7168545455d6252ae19 SHA512 1e162f6a5c3eeafd66b6fd8d63f8219754d9bfec0bec1f481d6b533fba73f48bf6f2d5cf36f405c2e6659fd1b51467f3ae02e73203142e7983e2402557b1634d
diff --git a/dev-python/django-filter/metadata.xml b/dev-python/django-filter/metadata.xml
index 94af350f2260..45b83995887e 100644
--- a/dev-python/django-filter/metadata.xml
+++ b/dev-python/django-filter/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">django-filter</remote-id>
 	</upstream>
diff --git a/dev-python/django-js-asset/Manifest b/dev-python/django-js-asset/Manifest
index e59c085350e7..5a5f3aaaec4f 100644
--- a/dev-python/django-js-asset/Manifest
+++ b/dev-python/django-js-asset/Manifest
@@ -1,3 +1,3 @@
 DIST django-js-asset-1.2.2.tar.gz 4436 BLAKE2B e6b2ff1b2b90da5ae95af08b28eb1970e6e0edffee7eeec0a4697855040c4afd0febcc569d0a78c46bca80835b404367c426019016e5089b3aed984916e13cc2 SHA512 ea050c5093abd8312733b1402e275fcb44f0702c27e28aeb64d0470a8514cd85906707915556a9878b669c96918813c4bf2b69d281d33f18fcc7c143f8ae9f48
 EBUILD django-js-asset-1.2.2.ebuild 574 BLAKE2B 20caa6c28ddd1585684114b97bda885e6e1d9c45dec7e3db717586a30814480e465cdfdf48227641a27bfd2af401dcdd360276007aa15b2e58283e55263a92cc SHA512 7c8bbf158be812136a9f1d501f8ede95afeefaf21b5566dabc16393e3faa5f01417d0fa7ec3e85d3981ee61289168c0889a3734c851e092f1e5a175ee50b8a9d
-MISC metadata.xml 326 BLAKE2B 0c3b07657f9f2a01e054709029aa38bceb8d7babab49a668122cac2a1736892d5892b4a3ec35b773ae82f6a146247238421fff04c11669c1f7ba5ba5939cdbb5 SHA512 23f16332ae8e2b165a4b43107a3c14ea46768e015433417993edceccecb6e0557441dde0bcde74b423ecb907a5645e751429a748cfd655b76119907c12e52121
+MISC metadata.xml 245 BLAKE2B e7b767c8045e3fd51ec09e7e54acda893ab1bb5091d031b38c7ca982ab9f9cae776a6878b39146ef59b7566d7515a1d97d0b7a109f8f23f667443cdb4e7d84da SHA512 92359b34c96a4c0462e5084db5c1cce68d3286b523111da239435dd9e77fbcdd2a568383583b9f77626472fe6a281aa5048c037bcc74e9d1eb8b809dd6891c6c
diff --git a/dev-python/django-js-asset/metadata.xml b/dev-python/django-js-asset/metadata.xml
index 1aca95d47fd8..797e817ce6dd 100644
--- a/dev-python/django-js-asset/metadata.xml
+++ b/dev-python/django-js-asset/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">django-js-asset</remote-id>
 	</upstream>
diff --git a/dev-python/django-mptt/Manifest b/dev-python/django-mptt/Manifest
index aacdafe7fc91..33620bce8f79 100644
--- a/dev-python/django-mptt/Manifest
+++ b/dev-python/django-mptt/Manifest
@@ -1,3 +1,3 @@
 DIST django-mptt-0.11.0.tar.gz 98300 BLAKE2B cbae24143007dfe8913aacf4cbe22bbccdf929617adc31640c2d429d6ea8be727a937be0aa8353e82862b9fe8c571397db4dd3877015eb17c2c5a56172cc66a5 SHA512 21af30007661db1474628b6f8af86a3f6de52494efe1aaf9235f8b1660ba153f0de3ad91ff979588e4b681b00b44652a05146df7d3951d6ee62da38a1900fd89
 EBUILD django-mptt-0.11.0.ebuild 530 BLAKE2B 6ec476ce4451ae16c49a0896992047fcb22177a3d54eb0e38aedca6814e0af90531285aa9a2e28e08dc1cc4c321ca2e196d5acd31bb21d591b2d4a30d559e6bb SHA512 6fc8d461af1f778e8d240bfaed4378d4b7b6993f28b209a2c74a158ee8ba12add77684063df6e1b1e09082eaee2f1d2ae343e1692445e14ff12aded46944f3e7
-MISC metadata.xml 322 BLAKE2B 5c85c273d60954e6bf317518cdea0487f3c4d4c3d2b0b9073941d8d03b9f69d0e463a227d8d0573afc4881d275dc36f3dea79a33c1715291148fe07749feb243 SHA512 589208cd8c1c207f03054d7dc25dfeff92c894780c8f7f34b6455912670a22b549ddbbbdbb2fdd2559707a7d046985923605dfb862a6035d92c2e79fd89b1dcd
+MISC metadata.xml 241 BLAKE2B bad9f760dafaea022669e7b898724926b5d06aae0cf9bccbf622f39c175f3391b900c17da4d5c8764702a0bcdf6d4a3b016dfc9aabe8875c384822d5df18474a SHA512 ddf81ebb9c853811cf273bdc71b4afaf7f30fa2116d53a87bbaebe0a67f7a29f1b371607e38b713750823f3afae609aab7d6bfc79c4d3762d228e7f2f8332b5c
diff --git a/dev-python/django-mptt/metadata.xml b/dev-python/django-mptt/metadata.xml
index 515395136cd5..961179ccf578 100644
--- a/dev-python/django-mptt/metadata.xml
+++ b/dev-python/django-mptt/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">django-mptt</remote-id>
 	</upstream>
diff --git a/dev-python/django-pglocks/Manifest b/dev-python/django-pglocks/Manifest
index 997bb04c0afd..d33825278462 100644
--- a/dev-python/django-pglocks/Manifest
+++ b/dev-python/django-pglocks/Manifest
@@ -1,3 +1,3 @@
 DIST django-pglocks-1.0.4.tar.gz 4085 BLAKE2B 8aaaaaf3b6ace4fb179117dd7b5064245ed9bcc44d0a613e3fd8a048196a15c9d9243bd683388b318c5ebab68b81b111c214ae3a7c3575ac86dcfe6e34a65403 SHA512 bb0a7dc18142fb668cb2f47acf48e62118c17b824d1d04407d253b1bcb3e572a38341e851f53f5e44e48fb6241d4c977e4971686e1f1feca191b27f6e9d7b133
 EBUILD django-pglocks-1.0.4.ebuild 487 BLAKE2B 062c035c49d9b5b8e4d7caf58ef0f19446cd524a2d02e479dafc7933b36b707e1f081bea2d38bdf3968f8092df9dbdaac87f243ecd60661d91441a2f8a34b988 SHA512 d21d58a616fe0504940c5e40de7c44274ccdcfc316adae425b4b9efd3786b0dee23fc49dff3ce9aeab3e774bf0e85c6f3ae51540e66c53993bb11405c668cfca
-MISC metadata.xml 325 BLAKE2B df8cdb3f0e103a18111f2d3ee454d56f87094bf29230d7703d836bcea1a795225371d4b02cf7b2fffdbb8e7a463424f334a448c18f26badf8f8f38a3566ffeaf SHA512 8adb49e54a1bf49b518a163a9204dbc8ec2a64b5668d73761256ce00939fefe201c2259750ac132ea72bb9d459fa4ac7a077c651e049c6a760e15ceebc3ff923
+MISC metadata.xml 244 BLAKE2B 88e917a01c6bedfbdbec4c89ea573e67804d5b08ec5bed179bc4dba29ee1daf88ddd548c6a3ebe47c28d7cf06dc6223904527e32acba01f30d088c8b6ab5c086 SHA512 c8e1b83b8ad4a238c742db3cd16f2c9b66e819c92b521ac6b818d44182d4a4bfe43b4cec59d4b0ab468b5683e47c647f22abdfaa0b7c4bfd56327ca83293a2d9
diff --git a/dev-python/django-pglocks/metadata.xml b/dev-python/django-pglocks/metadata.xml
index 00fa937a6b35..ac931d3e7af5 100644
--- a/dev-python/django-pglocks/metadata.xml
+++ b/dev-python/django-pglocks/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">django-pglocks</remote-id>
 	</upstream>
diff --git a/dev-python/django-prometheus/Manifest b/dev-python/django-prometheus/Manifest
index bfdcebe21f35..fd8e78ca0ac9 100644
--- a/dev-python/django-prometheus/Manifest
+++ b/dev-python/django-prometheus/Manifest
@@ -1,3 +1,3 @@
 DIST django-prometheus-2.1.0.tar.gz 24615 BLAKE2B 381aa345fac29e71e2b883fb485dce1d6ca3f13fc863d6ca9a62d5cd8f605f8cca727fbc3a3946e707d80f89d7fbaf544610cfb4857a45bc3dc13eeb22aeb4d6 SHA512 0c102467b99df409e31f99fb77d16558bd01c9c11f04ac0f80b59e486bc6e03979e16785083980c43ee3caad26b7a6bf618f9592fcca788ec2793a30d6b44241
 EBUILD django-prometheus-2.1.0.ebuild 553 BLAKE2B ab968f4e704555898fcf45ae2054cb2cd9c2a11338389fa8d730a65f21cdbbbca67a9cf511b6dfac54b10d3be5140632d069b7b4433b4f6f5cf3ff952b779072 SHA512 311687ee5cd990b6fc405ae873b02d1cf3ed36d3da269bc07cdf52df7d086039a82827a9a8c5ee470fb9d131a54782d690c0730a0b0f6786a572fa9104408f33
-MISC metadata.xml 352 BLAKE2B 4b1164a17399f32e071ee491334ffaea3bc09b2214de7c5bd05d3e0986ece1803a428bfd53af528009266ca836d5855df4dfeed9fe84059d617e6373d4296b7e SHA512 4295d46ce2da93c97b4f540a8ee85cb4a742c6c0499e4dd21d3e684125711e5d6b5e0f47c89de5e44a05d5373369db6ba353635a6af64cdc92dc19b00d7575e2
+MISC metadata.xml 271 BLAKE2B 59ade9d975d5b43f68cc06d20484fe8a9ef378c693565cf39cf32a60b52cf2e1c303ead362f47b0492ee077dad14f001c5510dbbbdfa722e6f4d2d63e9d89e07 SHA512 0119abc0a90049d27ebe90f2b2072f3703834bd7fc17a0682266e80933b2b5d5a24641a48d7f20da83442828eed18e475e0686a4696e1b73ed76f14673979a9d
diff --git a/dev-python/django-prometheus/metadata.xml b/dev-python/django-prometheus/metadata.xml
index 6d36a86afae5..ed9690ec5c47 100644
--- a/dev-python/django-prometheus/metadata.xml
+++ b/dev-python/django-prometheus/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">django-prometheus</remote-id>
diff --git a/dev-python/django-rq/Manifest b/dev-python/django-rq/Manifest
index 31af1a166659..bae60d742925 100644
--- a/dev-python/django-rq/Manifest
+++ b/dev-python/django-rq/Manifest
@@ -4,4 +4,4 @@ DIST django-rq-2.4.1.tar.gz 42558 BLAKE2B 8412db96dcc4b600ee7ca00e2a9aa5cfdb00ac
 EBUILD django-rq-2.3.2.ebuild 525 BLAKE2B 5c1320106a8bfe8978e224c420b3609b2fe836e8c80f28d1bab1287efcc9b46e5ffde5e7cef7f94ea905d2613e0646bb4ea24c7654e39e3e57ab3e2d4e45dc17 SHA512 08c197bfbf308ba690946bb4951175b72c7fbbe2c66b42428cbc258645a1e5159de31401aac8b2278c477bf29170269b9a7186afd02272713c17cf6e7defa063
 EBUILD django-rq-2.4.0.ebuild 525 BLAKE2B d4484a5992cc25bd8a71ba65db18a434048b38a0b8745f74b63aea001f8add6bbc8adf162ff6f04a40d1ff2b28e06e444df4dfb1e78ca7d6ed9c9e012f6a0709 SHA512 8a280e96d341f3954385eb161cc3a4960f880dc96a3351052ad93623d499ac0f6288faf2d1be0068d6368e93538aa679babdfb762bf88109245220d3b6b5f977
 EBUILD django-rq-2.4.1.ebuild 525 BLAKE2B 410d29fd1dde1b228e73e56e9d4c654af9998312950028dac9b54e11016b5ee62e5bcec3ffb45362fd90abf00c431e857eb0dd62fb85b3cd46afd76495e0ebe2 SHA512 1a2edacbd65b88e357334ef74ccbfe6c17769394e8ac302ec6a9072b5ee0c24d19bba694473b5bed307d05045230e1799605d8ded32d4ddc9912c5a45fdc7880
-MISC metadata.xml 396 BLAKE2B 2b95df79cb43309000b459c6cd231a98d1e0b6a0b7abc830ab4da894b57c0901269aa6ae8c725b8dabb3023d737d780dda04f179f4e5c991990f53620eb42bcb SHA512 cb0dd9d055a6b85033d14c06fd3b82d03d941dd7c920edebff633dfa6b5e86140adabb0ecc803ebe6522663794438de9132f84fae49c8094f126255cbb3295f4
+MISC metadata.xml 315 BLAKE2B fdf5c7db5a09481efef46818f25dd254934d6596a985f5e27e2ad939e87648fbf1b865ecf81f32f3ec3a2e425f3a00fdf5615459fc3688fd197c4fb651aafd10 SHA512 2d37405639c587db6bd9e04afaec8ccd1b566a8c7e8f53391fa3e13eb05a2510ff52a6fa6dcc79eb39f2e49a3dea80ab4ee61127402d778944443caac54c4eb2
diff --git a/dev-python/django-rq/metadata.xml b/dev-python/django-rq/metadata.xml
index 110bc52a20c9..5509f14c91a5 100644
--- a/dev-python/django-rq/metadata.xml
+++ b/dev-python/django-rq/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">rq/django-rq</remote-id>
diff --git a/dev-python/django-taggit-serializer/Manifest b/dev-python/django-taggit-serializer/Manifest
index 15a914bc63cd..19f3e8283e6d 100644
--- a/dev-python/django-taggit-serializer/Manifest
+++ b/dev-python/django-taggit-serializer/Manifest
@@ -1,3 +1,3 @@
 DIST django-taggit-serializer-0.1.7.tar.gz 5589 BLAKE2B 2e9fceacd1eb1908848da99d7ec6b708f4c37f64c7ccde9e1082356e7695430c4c1f436a7d1a37200a249d2736adb848c1ce4fe26f63a6b1748080b62c1215dd SHA512 90a3e39cda13826bfcdd0a6f262108112d261bc5e03f8ed973c0af0e1a6d8efd80e1e0926682754df4efdb697cea5453df39de70b0067c02bc452a8462ab2574
 EBUILD django-taggit-serializer-0.1.7.ebuild 475 BLAKE2B 8cc261954fe7c362ff61e99ddfb4ea7d6f07d5c3b534af9fc6f8866d4edb87c23a42c319e79d5b7cbafd5068c1b500b6b11f4724f50b1f770290c73d10cf84ea SHA512 f81d45744e9f9b6f5652bbfda73a065069be243003e5c07e43551ab5b71403227e319d39104035748bb5fb6eb7abb6a017916aedaf816bf8d7ad2543b6d6d8e4
-MISC metadata.xml 335 BLAKE2B 8d0cd28e833674e110f49c0ddfded1bfe4314a565b8e9fed542fe14b0d23710715d99ba430862f5438635ece13651972814c9f7ca437c615b7ae016bedce7db0 SHA512 bb3d5a6e63e6396747e8a4e5c2d266ef5cf3ec2414d1765548c28c356249ecb3ea6efbe7a1aa400ad210fb65334366c13ed5f63a6cfbe493e98095664baf5ce0
+MISC metadata.xml 254 BLAKE2B 96e2706aa3e71eb6e3aa484e5c03de42b397d24a08ed8ca11920ac18f5e0c12e792d92f1a4473b3598d9acb269f275e9f654209c72b068d0b2d0283c5de047f8 SHA512 0c42c63b7055a2f7f542e9b4ff2f2f2a7cd8f789add267868e58118070afb4278db3994ac1b0dedfd017ea6d899e839f946fce56f61039e48668c7be90486b60
diff --git a/dev-python/django-taggit-serializer/metadata.xml b/dev-python/django-taggit-serializer/metadata.xml
index c9b586832afd..a8f4e7c79696 100644
--- a/dev-python/django-taggit-serializer/metadata.xml
+++ b/dev-python/django-taggit-serializer/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">django-taggit-serializer</remote-id>
 	</upstream>
diff --git a/dev-python/django-taggit/Manifest b/dev-python/django-taggit/Manifest
index 2dad6580082e..ffe99f957337 100644
--- a/dev-python/django-taggit/Manifest
+++ b/dev-python/django-taggit/Manifest
@@ -1,3 +1,3 @@
 DIST django-taggit-1.3.0.tar.gz 46986 BLAKE2B ebe425bc17b67977d40c56b9072ef471e1239090056667f1a5792f005908cbffc31f9eb863575ff7d3d359ebef7263e085bad5b7b481ed9060720bd59f617bb3 SHA512 bd5a537fc11bc4b434a5dbbc11e583acb3878101fcfa7e24af3aca5f160e2f1ac8defc9454c0814d39eb47bbb8edea8d3cf47627ad4b4dc86b962cd69d415ccd
 EBUILD django-taggit-1.3.0.ebuild 429 BLAKE2B 58978a90503dde259fcf0c9b0e7c714276ab1bf3bba34a25fd4adb2927ccb005f3bd46561e336f89d41b06680341651d588b25287570ec4a5600277f753ee128 SHA512 ead14dcc1f7495fe8ff63883e660e9f3bd5b00501649e7aa227a8ab4b955421c915e94bec82311c06c6a3ae4433b377342e5bec1d80129f8c88fb14b736073b8
-MISC metadata.xml 324 BLAKE2B c935818d1db94f53997cabb493fd55829aae1b09e63487a7f9d76c0940c20271ef3e1a2b59e76f63fc75b76f5a6e58f60531be91c46e1486272704e2fb4127a3 SHA512 df661f7bbd8cd3a106bb943ab30913165d57e96aa8038b941671f5c1adc6e7223726a17d3f830942c48fcaf7eaab41603edff31c88f40aaba82cba498698be1e
+MISC metadata.xml 243 BLAKE2B 922ba740c2c2514de42be7fe3120cf65a80aa8887081415a4a19ff5f0ac00bdfe9e086092265593db35b682450da516371ce58335253cb44899f70e12d058e03 SHA512 010422b743b59d85185fe4e6ee9e5aa60d85b78f95dca86e1cc56b4e43c6bf2894b26f57eb3cd515407170e6d3bfe4780d15a611b434a22b104f6dac2c2394d0
diff --git a/dev-python/django-taggit/metadata.xml b/dev-python/django-taggit/metadata.xml
index 5cbf891ae812..4514a512c9dc 100644
--- a/dev-python/django-taggit/metadata.xml
+++ b/dev-python/django-taggit/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">django-taggit</remote-id>
 	</upstream>
diff --git a/dev-python/django-timezone-field/Manifest b/dev-python/django-timezone-field/Manifest
index 02c729550300..176dcbd508a8 100644
--- a/dev-python/django-timezone-field/Manifest
+++ b/dev-python/django-timezone-field/Manifest
@@ -1,3 +1,3 @@
 DIST django-timezone-field-4.1.tar.gz 8286 BLAKE2B 591a3d9a332102fd6b3a3cf865b1b9ca2ef1d7b37f6bc1a01ddc724050468d59ee5b6c14933203b6182a5efddad32e7e76b17980e415562404057b0e25393089 SHA512 3903e19ab66d636a4fa9c0364aa8232958c6b0d33c41253d57322320543e8f4993ff1eac2fdbee319b174e7e85fbb2dece9cd8db910913d4249de9eb862917e2
 EBUILD django-timezone-field-4.1.ebuild 521 BLAKE2B 9e9fd6e42cb5bfc36f0d5d15db80ccde90be27895e8e25b22f93dfcd8b8b7a89df98724c50645069fb02b89c25506b2647ade3a3ea24b83a5c0e5bc49f491892 SHA512 57c506aae9b717403fca3897c08bf3fd7cc1b319e218aeb4a8f574b7329d79f5fcb6803bbe798b4ed226aec86efc8125159dec408717437a1c6ab8169aad8aaf
-MISC metadata.xml 332 BLAKE2B edcb6dc33eb62f4dd720dd43000b309ba4d907d25d89d8b3380467c4d7d5c35e2ef46489c9cf0582232c7d3505824d1ea402d49ece7bf94b7494e319ab54d1c8 SHA512 d3d9e662a63076ecc9f0e7bc3acb79c98443edd523632fa28a10ce316c12d4dfc3ebd8145ea6eac5073cd5cda42abe87c18ccfccdca6b42a93ec39b028b445c8
+MISC metadata.xml 251 BLAKE2B 3b078b0494de8de6d7ce0bcacc20ce81030e714ef309f3314cef7f1fbe9a4cf82955638a3dcadfa359ae11e805f6a03ebed11f746f61429d2dbeb0f9d1ee48af SHA512 3ea63f6ca04ab11da661c2f18c99e52cd54ccca61c8dd95651361c431d61f385beb2a353c02f37b230c349a1f5814db2946be9d2c0250cbebcc36b4add22345a
diff --git a/dev-python/django-timezone-field/metadata.xml b/dev-python/django-timezone-field/metadata.xml
index 46a2959005e1..05081b957933 100644
--- a/dev-python/django-timezone-field/metadata.xml
+++ b/dev-python/django-timezone-field/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">django-timezone-field</remote-id>
 	</upstream>
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 5deaab957b5e..ef4f7c10aba0 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -2,11 +2,20 @@ AUX django-2.0.7-bashcomp.patch 1507 BLAKE2B 8aeb494087dbccffc69ad43f370e791d9fb
 AUX django-3.1-bashcomp.patch 2085 BLAKE2B 36a0aa4d3413f13089ac104f5d3f98ecbb152a9a5a35f8c1ff2e5ffc9824153b0ac89f1cbca76c31a1afefde471e4d6ed801e405551b25cb31da89c20f3019cc SHA512 82dceede4292bad6e3e4966a6dba01bd2bbc7db494fce592e25dc4a64236485d88d8ad67b247239a80f8fe96dff054d20afea6f48a5518b67cf88404d399e61c
 DIST Django-2.2.22.checksum.txt 2551 BLAKE2B b08f1d904caedfad04eceb57a704cec9dc660e59d2ceeddbd98f16b8bf4f578a030f1baaef7e8eb7ffb022bcf11957642d08b972eec12aed12e51d41bacea07a SHA512 20adea9a59fad6974679836f044bd4a1089faa881a7efbf15fc6a17e3a674ff9b638708bdfa7724b82d80db73c64b478eed08cec6eb5d040100aec20078dc1df
 DIST Django-2.2.22.tar.gz 9182392 BLAKE2B f68141772ec101332a2a0c7b1b2216a14535404e814d80a6a350effcd4ee07eb6a4271f997a43d24e4a083fef690492714858b2c92d982fb113352f6fd062545 SHA512 215497034224dbbbffb3e70f9c50e51a149c9962074d2ae7152a664d21f7e762a7f62baebad2387037feff02e880e1dfdfa04ad797907ba5daf65276c2b99fd7
+DIST Django-2.2.23.checksum.txt 2552 BLAKE2B 25763dad7ee67cbbf64a182998b53277d24866030c1fba5b1f53f0d944321dbf104b9b03fa714212a8051e44b3b56c2ecfad140999ab88ed563b854aa7b7eee2 SHA512 5479b7f8c6918cd7363851038e49b2e0f23e25e6f6e56b049372209db901c0caa621d1b6acf46983c5a887b78a47e801364cbcec3b996ea474472f9ca2304bbe
+DIST Django-2.2.23.tar.gz 9182567 BLAKE2B 97ba0f098fdc8f187489e7b25fe17e7258396e758ba0d566b9d17012612a2693f675b1049cc939c88dc5f5d2af783934369f9b6672e92e1420189852ebbd7ad6 SHA512 0f9b8705ce150f7c291452551933135a521b2d22cad00928bddbd6cac8ccb44da2c6c9a4302dc49b6f5188f6d72e148bd3c9806001e50972acefcb6ef853777b
 DIST Django-3.1.10.checksum.txt 2551 BLAKE2B 811e820ef036301ee1a6aafb2f74e5809baee591b37a04e5726bff4086f58d29e13ef7b0fd5f95fe9316232cff45ebd2d7c69fbdcd9a3d1322ede118c4577a65 SHA512 b1eb565dfb978cd4819817b1f0fbb9685c1a7d9d9863ea4a0da137056add6af98d6051eae1b81f37bfb0e673993a4af7dd760811e343bb2fd7a0d98a3ee1663a
 DIST Django-3.1.10.tar.gz 9654073 BLAKE2B c3729b7007b0b8309fda111f7bd988c861fb1002da3683e972a01bcd2aecfc6b42e896f91297239cba2061106096226552c26eb50325ea5b50f5a5df3a191bfd SHA512 6dd3c7a5cd1b5cbeb6e62f72fa56fce260bd407a3ac659ddee893489efae7a6bea862ecc113da342a2ed4cffa39e564c55dd20792b5435f9f00fef5488579aad
+DIST Django-3.1.11.checksum.txt 2552 BLAKE2B 11c8f9c26491dce2897e302e2ff92cfb8e481dcf93c46e91f1005a9ad92bfdc60e4e69682c94999f2e1fe37cf57ba452e03748862919d2f6afdb9c77c9ae1049 SHA512 8cee919d2a4d6b55dd1c6d91ad999caff0e7efe9a0d8c2a92e70d1fb51a534d924ac47fffd1a28b92e8060225c1fd7fda2bd693b977b29bed8f4ffe8a7f18041
+DIST Django-3.1.11.tar.gz 9654094 BLAKE2B 00e4ba95127d49b410cf0811e54fee5e5d17647a782ac6ffd30339ec81455479d913f62a29d83e7c87773cc81635393202a3065d3d0262cd17a033c7637fda76 SHA512 8da05ea46e4fdf20a90aadc954a9cf9e7e830e3822ff9095bd973628e74fa14e5397365740fcb5d76d393f2e5b39fdc578b3d7f12601feb9a3b3e057e6bbe086
 DIST Django-3.2.2.checksum.txt 2542 BLAKE2B 1a61ea4e8415d77b50d0dc227905596941a9cfed019c3442be1d7529d0b82204b08e15befdcccccd3a7a4625b762e99526b762053e9ec7c29068caa2dfe055a1 SHA512 eebb6e7172d85af3d6f65296d816f40cacd78c8270bd198d275c3c2844e9106ec517265490e7371d5df803d044ee1534a4eb836d2a279d395884c1ec7b9cb0f5
 DIST Django-3.2.2.tar.gz 9796920 BLAKE2B 09a720d169702f1d80b592e8a4c8e136b9b3c4539db44f8bcf3ef7d0e6bb678892b7ad4bbeac89fc887c9938cb35d8a9d3fee9a58e692f99c37e81f01615a6b4 SHA512 28d1d56cdf883f8fb5e438124be53dbefaa0045d1acf0b4b8b455a482422e2b88ffc5a3c8be2ee1b7d3c39fe29cfa854b44b438c3d43323483bd35e0d05f9e49
+DIST Django-3.2.3.checksum.txt 2543 BLAKE2B e15fd98b887e3e416d6636a84cfe08e23d920c3044c0382ff0821b47dced378fb89d05bd0e128b1237423be72ccdd1454f4a092b543f2325e1d3d1072e508ccf SHA512 7c898155e085f003dd9872cf266484d4d533d869df18aa5c431ca6bf9dee2682ef61921e3f31e43392c0539d2175a8000a37f371519ae485b38bda0eede54c67
+DIST Django-3.2.3.tar.gz 9798957 BLAKE2B b3b72fc405d13c63d6b12819390ee281319275350b38cbd7f8a2657f8ad39b7c4168b560d0c8db4a2f26231f6dccf5855bfa1259d6fb3d51fd1decc5e406d837 SHA512 a1f9f9661f1a851a00387007f5079615e70ad2357a3a99a1b4a77da6a31419b22fd9d321b8d9737092a02a3055df76cee2aa69404b804b392d94d3423d54b0f8
 EBUILD django-2.2.22.ebuild 2677 BLAKE2B 51325e634c8aa029d70de52fb128e4b168ca170d5bebee7763d55f3a924b7edf758031a9720ded7ee7e1f1a0f283e183a0cfe6d8bbe83629ba1cc5c1819b3457 SHA512 44812712ca209b8af0c14ee92d3db98d428feda28a8a16be9ec928e6c32c0dc9833a84f058f59d934181f57b658e2a6be2212eabd59f84eff17ee674a9bc19e1
+EBUILD django-2.2.23.ebuild 2681 BLAKE2B 118d4965e158c05702bd26488d3855f50cde2b711ea38fd010f4e251bec26420c760ae76be5532a9652e0b1e89b0f2553666f832834258050ef384622fdc5b60 SHA512 57e4675a6c154733b85a04e2d385efb2655aa0132e3207a798a659b269102e1fe5a2d3a0853c6d471538fe8bf17aff4e340e1709e12d286722ce29873eb44a53
 EBUILD django-3.1.10.ebuild 2772 BLAKE2B acad8972236a8f97952aa470f5cbe676f388e57302fce5fa9b6112ea77e9371e3bae3ef71034290a3f8d7ee814786b3c3228c4fcfd3cb71f739de69582745158 SHA512 1f062305576242f513303b6f3b2e9ba14a50c60200142429bb2a55ca6566233c4ab4bd5e19597cc52d5e9bf53a02d89f90ee0c72100aeeb5cc35314bef6c5890
+EBUILD django-3.1.11.ebuild 2776 BLAKE2B fecf7ec0e2d0f1e26b0f56dfea5f92f3b199334af5ea111e3a6c7508f8cdef3f49784ee4991a9fd439b735ab1b08bb75078b65009e3e1ec30055980cee005c9e SHA512 f48f07320ed0279783b5d9b4c221d28a83dec30916c4ae5ee7b1efa3adbc0a69c8e00fe4c3b864c8400603cd6f02eba78628bd5c6fb2fbb0f7d5091996304acb
 EBUILD django-3.2.2.ebuild 2726 BLAKE2B 921ef5276d36f224848cc7565b8d4134ae3e7fee9e9a191b38e9705396cd23f012d44512863861ef13cf86b48bd27c7ffb2337ead11f976bd1dacf0c18380cfe SHA512 ace7005c4d6127b9880a5b1eeb1639209fd6eed94ad02c53bfcffa7cf7fe2cfb612c73a1749b774c3517561189a05811689af31e35270d3da4c519ccc8d96ada
+EBUILD django-3.2.3.ebuild 2730 BLAKE2B 8250ca487a6f061f5b619b03f2885045c86a3b9db28a7d5487509ab2950fef155c76c4961321b71a8e58ddcdb11e4670682db561124c19422a86d31177600dc8 SHA512 9a49c009da2bb5ffa5f982a2c95e7869da105f755fce65d7a2926c9788332da897afc27a2ef6870a4ed5e835dacc56264d9eaa379b459f27407a64c322ee0f02
 MISC metadata.xml 399 BLAKE2B f49845f5a6476a0b43cbe47ab11b298f53703d850d145a31967f512d9402048fc1b1891606ddba7342ea9613c27ace3986f6b508ed83f0c5eccb26a13fd49f85 SHA512 92470f2930b1c940ccf3478b11157adcc4b84924b0cab4e1fd8aae98c7bba14e995491ce44810223eeb3802967be68c867d0ee4ac0df9f49b4234efd1a7ecfa7
diff --git a/dev-python/django/django-2.2.23.ebuild b/dev-python/django/django-2.2.23.ebuild
new file mode 100644
index 000000000000..e49bcb28c32e
--- /dev/null
+++ b/dev-python/django/django-2.2.23.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+	)
+	verify-sig? ( app-crypt/openpgp-keys-django )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.7-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.1.11.ebuild b/dev-python/django/django-3.1.11.ebuild
new file mode 100644
index 000000000000..e41026d47720
--- /dev/null
+++ b/dev-python/django/django-3.1.11.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/django/django-3.2.3.ebuild b/dev-python/django/django-3.2.3.ebuild
new file mode 100644
index 000000000000..87dacd55b40f
--- /dev/null
+++ b/dev-python/django/django-3.2.3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="https://www.djangoproject.com/ https://pypi.org/project/Django/"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/asgiref-3.3.4[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=app-crypt/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/dnspython/Manifest b/dev-python/dnspython/Manifest
index ded5b926d238..6acd62fd54ef 100644
--- a/dev-python/dnspython/Manifest
+++ b/dev-python/dnspython/Manifest
@@ -1,5 +1,6 @@
+AUX dnspython-1.16.0-py310.patch 408 BLAKE2B 7379d0ea280c9ca07e1d3d47dbb21cf1f1a0752f59ca3f30aaa26ef677d3a041f04b23ac0c244fdbca7661c5bbaf44cd30258410f92ab48330a236d92d78f668 SHA512 9e121f33ed148923a6aec919a8aac1f68e84a007f0ddc7daa550275681b1ecf5a47aca82bbbb7e27ced93752d4e76f4614bb10e379fec482e8f6bd730a5dc2b6
 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-r1.ebuild 1208 BLAKE2B 92504043644a59c6ee6d14b26734b9ad6e3b1f294891c4774f6964081338184ad0316b070a2b9d088a4034581eedb0e2f438556dc9db11d608817462e6bebe0c SHA512 2394781da6a08d92c3f0fc7ae0c4fe8388059ec497dfda522e56e3c36185f45c4300ede46ffaa849f6209883618957e6ee2c3ad126d4a9a7b3ddb57b5a872c25
+EBUILD dnspython-1.16.0-r2.ebuild 1341 BLAKE2B 96974c67109cf7b06cd9266886d12aafc4f2fd562d66de61b7e9eb7500dfea21cbea6d07ada8823eb71e3b916d82bccfe9264891c10153486f0aff48cf63434e SHA512 250253fd84576d2ee6b2d65166e6daec2322867d607336c663d56b474d6657a449718534b8e3916bb5367ddb3c3addbd7c0c2e510810091d43e0736894e4eece
 EBUILD dnspython-2.1.0.ebuild 931 BLAKE2B 3e7d0ce8ae971b1825dea9a56dccbbad7206b7457915fbbb20ef0898f539d0405531874a448e223c1063e4ca4293c3f4fa1501d88638b2a1dbd301679df384ec SHA512 fd3ab54001e5b576849c1e12895793e94c1bef9b0bc6ac8a702b988ef8fb54e6945eea4d7eb7a9b96a6896a68ad2329416dd44c72a32f6e546bca3c0baf003f7
 MISC metadata.xml 1482 BLAKE2B 52c201915b77d6d2f4379b74b67c8197dcfdc692aa9040a20a1ea4cfdedbb6e953d5764f8b3ef154cc1e899f644fd4e6fc3c8aa1ea5fd6f5d93c334d15f954bd SHA512 01bb39db4729b424742d567550ec05c3093158f12f3b5901029b2b4728220f703b0164d3e8f3469a0fdfd0b9492e85c4ca23a024a85bef37d738c439870ac1b3
diff --git a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild b/dev-python/dnspython/dnspython-1.16.0-r2.ebuild
index 5296e0e643fb..82f4762eb6f5 100644
--- a/dev-python/dnspython/dnspython-1.16.0-r1.ebuild
+++ b/dev-python/dnspython/dnspython-1.16.0-r2.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} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -23,6 +23,11 @@ RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]
 	!dev-python/dnspython:py2
 	!dev-python/dnspython:py3"
 
+PATCHES=(
+	# Mutable mapping was moved to a different module in 3.10 and removed from the old one
+	"${FILESDIR}"/${P}-py310.patch
+)
+
 src_prepare() {
 	sed -i -e '/network_avail/s:True:False:' \
 		tests/test_resolver.py || die
diff --git a/dev-python/dnspython/files/dnspython-1.16.0-py310.patch b/dev-python/dnspython/files/dnspython-1.16.0-py310.patch
new file mode 100644
index 000000000000..ad6fa929e5e2
--- /dev/null
+++ b/dev-python/dnspython/files/dnspython-1.16.0-py310.patch
@@ -0,0 +1,13 @@
+diff --git a/dns/namedict.py b/dns/namedict.py
+index 37a1310..7d52668 100644
+--- a/dns/namedict.py
++++ b/dns/namedict.py
+@@ -32,7 +32,7 @@ import dns.name
+ from ._compat import xrange
+ 
+ 
+-class NameDict(collections.MutableMapping):
++class NameDict(collections.abc.MutableMapping):
+     """A dictionary whose keys are dns.name.Name objects.
+ 
+     In addition to being like a regular Python dictionary, this
diff --git a/dev-python/doc8/Manifest b/dev-python/doc8/Manifest
index bc96f676e816..4d1ab5989d3f 100644
--- a/dev-python/doc8/Manifest
+++ b/dev-python/doc8/Manifest
@@ -1,3 +1,3 @@
 DIST doc8-0.6.0.tar.gz 21547 BLAKE2B 84908a28e46fa970db7510d5fec7815028b9e65bec3cb5c0352f4ed88560765bde4c76aea3ba803ce737dff1856b702b21cebcf151587f6ae2870d4d1126d0a5 SHA512 1858334d3a0247d4d30c311bd7f13be66a6cdb6131f9d24dc10e38efaed6e08c8c7d11b776ff5dac7d6ae5eeb1cb7ef03523bc3e244794625a8ac1346cc05d75
-EBUILD doc8-0.6.0.ebuild 864 BLAKE2B cca4fc8f0b3af6f91b06082fd0e0b05f811057f4e7ba8e0ae02c0f27ddd8ffba218691a1fd1fa526e3e9bd8c2f6dc9258d448f6a59f3012ba1cead069958e6ea SHA512 816d5d91ed31627d8970d318490f957c84df7eb5d2bb0b4f855ace220a88c70b6d6ff4631127b91587dc5d78688f9d9cda037a014d3e76791f05b80ba6ab2454
+EBUILD doc8-0.6.0.ebuild 863 BLAKE2B 7ffbb2689708c46229de6ec69695fc0ea466eee173e23a3b38183ca1af8e0948ed0e9459f23ec551b5f61b2c3bef60141c8ce4e732aaa79fdab029d6ec8973bd SHA512 ed9a8c5ddb1727ccccba2982b4e34b58dca4c64cda05e7474aed7d07379ab20823b48a448c8d20a9e3fdc6952bf97b0477b36d8d88f3f6bd5c2c896443cfe2ab
 MISC metadata.xml 321 BLAKE2B 91708fe1c777fab5db78b96478a40afe8e209db0a4eabe6e6f76bba6efa7c81add8a4e9c5b91cb126d491826b9e3fc325c3e0adcf5fe6c00360cbd60295220bb SHA512 ada3a7f942be7daceb700085466dfb812b457c8d1af21047cf359786e8d9d6f122b84481bfd5c05f3d07f02ced2e1b91b9edf079bc0c0655097e3884862ebfcb
diff --git a/dev-python/doc8/doc8-0.6.0.ebuild b/dev-python/doc8/doc8-0.6.0.ebuild
index 3057410d045f..9cc4c17c37b0 100644
--- a/dev-python/doc8/doc8-0.6.0.ebuild
+++ b/dev-python/doc8/doc8-0.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-1.6[${PYTHON_USEDEP}]"
diff --git a/dev-python/docker-py/Manifest b/dev-python/docker-py/Manifest
index 1ad243616dd0..dffef0d08f90 100644
--- a/dev-python/docker-py/Manifest
+++ b/dev-python/docker-py/Manifest
@@ -1,5 +1,3 @@
-DIST docker-py-4.4.4.tar.gz 247640 BLAKE2B 68b2e0d41e68fdf4826d61b7ab167321467b1b30f122f0b29955a62ac5f036fc0b60b02a8c9a6776ffd9a7cafb5744de44ec3b9284d0f266a1dd5c72fbec2879 SHA512 4106ffe353ce8c3227c30c38347f107e0f7da660f1c3ae68bf2c576fc6b270f6fae6774747c46491eae0fc85a48dfe246b7a22d8e45c74eff89ed43be285f0df
 DIST docker-py-5.0.0.tar.gz 247639 BLAKE2B 7e7f1d0edf228c967ee9252c6dc37e803a2e91601d3dce06db335c4bc4c8af43097864307ad72d4665d13f9ab0ba63b3dfd5ac7baa4dbc903ca57fe67985c1d2 SHA512 fae4afcda91ddf946048f76e62928a4891e1b0ce522b820aefb774dde58eb8e2aac0a381971acca04ca87794989ba675464e7913fab4abf2ed414719d66c91d1
-EBUILD docker-py-4.4.4.ebuild 1065 BLAKE2B 3a5aaf6e50cfde0db4323f0168d584c390bc0bbe3191b7a2e2696cec452f81ca259002d2a082a5eab8d4ae4109d7851f6b07a4185722722c720f7b3921d37a46 SHA512 815167957b5cb6356611516dd5c57f0b378c636380cace7ab6d40cf193d8ccbf494c6dfe2971bd83abe5196aef8664969fd48850c898f5a5b003ac039f582455
-EBUILD docker-py-5.0.0.ebuild 1068 BLAKE2B b6178ff5f46eb078438b0fbaadce34d67dacd09cac06e195fae3a48320a481e6a8f6733a808d66887a921f9dab74161fd4b8810221fdea7fe82a8a1b30c317ca SHA512 6dce6e300a341996b2693cef149a1ed7407d686bd891ef993ddd0be22fee1b0f3314cc0939e7617c57acae56388d9e8a8870f860a97aed4c4f5c2c453468e696
+EBUILD docker-py-5.0.0.ebuild 1065 BLAKE2B 3a5aaf6e50cfde0db4323f0168d584c390bc0bbe3191b7a2e2696cec452f81ca259002d2a082a5eab8d4ae4109d7851f6b07a4185722722c720f7b3921d37a46 SHA512 815167957b5cb6356611516dd5c57f0b378c636380cace7ab6d40cf193d8ccbf494c6dfe2971bd83abe5196aef8664969fd48850c898f5a5b003ac039f582455
 MISC metadata.xml 434 BLAKE2B a6fd9237a338297a004bc72f08239cc92642aba95c590bf7f2f287c5b3d196b632998dfe5c32cf8155498df1472fc84f4d41290880b14161c8d43d0a70ed7f5c SHA512 fb6af1a1021d752928bfad27313ccbba2f09ad88249ddb9cc7db4c1f1fd591035f636eb35d79f675b5fcfb984f1d201fdd7a8d4b38cb2193abbd31f2d62f039e
diff --git a/dev-python/docker-py/docker-py-4.4.4.ebuild b/dev-python/docker-py/docker-py-4.4.4.ebuild
deleted file mode 100644
index 911b9fb84a08..000000000000
--- a/dev-python/docker-py/docker-py-4.4.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Docker"
-HOMEPAGE="https://github.com/docker/docker-py"
-SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	test? (
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		>=dev-python/paramiko-2.4.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	'dev-python/recommonmark' \
-	'>=dev-python/sphinx-1.4.6'
-distutils_enable_tests pytest
-
-src_prepare() {
-	# localhost has a better chance of being in /etc/hosts
-	sed -e 's:socket[.]gethostname():"localhost":' \
-		-i tests/unit/api_test.py || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	pytest -vv tests/unit/ || die "tests failed under ${EPYTHON}"
-}
diff --git a/dev-python/docker-py/docker-py-5.0.0.ebuild b/dev-python/docker-py/docker-py-5.0.0.ebuild
index 6cfc62e02e87..911b9fb84a08 100644
--- a/dev-python/docker-py/docker-py-5.0.0.ebuild
+++ b/dev-python/docker-py/docker-py-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/docker/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
diff --git a/dev-python/docopt/Manifest b/dev-python/docopt/Manifest
index 6e61e7e48271..fb19f6bf2dbc 100644
--- a/dev-python/docopt/Manifest
+++ b/dev-python/docopt/Manifest
@@ -1,3 +1,3 @@
 DIST docopt-0.6.2.gh.tar.gz 26345 BLAKE2B e2a4b2030239387b6e7985c7e4ca15b001ec86f0d7a8c8f316c2321ccb18ed8cc94060a6c8eee4e84916d5f42e4a304551fae69b47abe2e173fa5e2409e9835d SHA512 228661924329682786b143f414c9df911016963cdc91ae6eba833285144e71744df507321a476b51f779e3ea270af6dc4e50edb8b0ee99674c19acccaab57a03
-EBUILD docopt-0.6.2-r3.ebuild 737 BLAKE2B 7cca653743708bb6bb65308e8d5c0f3357ba884a15c3607874ee89b2de322530a995fbd546b42337e881bda52050a3f0170a6b760f4e6839eda24ab7759eeb9d SHA512 7857d1b86b9779e2f40cbd0e2c257946373be0d02620a0cbdac0c243f094b1837fcb99db12a8fd63816f56e5cb94018540fd01c8067c998b2a76fb66cc122d04
+EBUILD docopt-0.6.2-r3.ebuild 738 BLAKE2B 2db9a3449ef0ceddf5d812d7767d6e17838233910a014bdf28990caa23632f5b94231731a4b6c74395df137dfc31316f68a3db965a9a4e89138c67449a01c72f SHA512 f2364a29382d54c227fb67acf804d345adbd7474368d2b37c77c2ee24217a8fb0b42215f380df0d77e5894ab4b96e4210f98d71958e07587961f748a3ca19dc5
 MISC metadata.xml 374 BLAKE2B d1c77e8ce90431f3d8ddfa1adb0b016713e7f3d18feadb25126333973e0cd7341838a2082fbc99f0dfbb23a3d3416887211e3f7ead69eb3c7ec284b23e7a010d SHA512 a54f0d59a3cda28748bc2ec5546b29de60dc4dba144b57014636fef7b20c97d2b7b20f0ea8166cd8c9970b7434e43707359ceb76efb015a8a00d06a0786252b5
diff --git a/dev-python/docopt/docopt-0.6.2-r3.ebuild b/dev-python/docopt/docopt-0.6.2-r3.ebuild
index 463d3fe461a0..1c0eec37c1b3 100644
--- a/dev-python/docopt/docopt-0.6.2-r3.ebuild
+++ b/dev-python/docopt/docopt-0.6.2-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/dogpile-cache/Manifest b/dev-python/dogpile-cache/Manifest
index 073ce2615902..ae0432c25102 100644
--- a/dev-python/dogpile-cache/Manifest
+++ b/dev-python/dogpile-cache/Manifest
@@ -1,3 +1,5 @@
 DIST dogpile.cache-1.1.2.tar.gz 370404 BLAKE2B 6895ffe057ef614ef6bcc4ba58a4bb2fe69b8e57943cff38dfc472bd3dec5ad4e34fc65d9fa0830a2396f6a789aedd6cd1e1e06dff911a3197ca4b64fdca1c36 SHA512 e68c2b358e6822d2db90422b92f1e9c9b997c89087ca69c8fc9511be1e06cdfeb14eef759085fdbca4dfc668dabf3901cddeb6a6c2f327d28c8968975908c160
+DIST dogpile.cache-1.1.3.tar.gz 387490 BLAKE2B 580be4f524196fb56e651d793045bf2e3419d3c98e65be0ba2cfaaed97f9c9cc08efe67191f77b273e97ffe907e8f5e050a7a36d2d8287522a21e7c4290d1354 SHA512 fd735b0bb9b7eb3bb559c030c15ac547aeb3f4718c64d7edb0f26f0f8a71b9b067434e984460c40cfbca57696d2b9579266f0c9d48bad4cb3c5bbc07030a4fb4
 EBUILD dogpile-cache-1.1.2.ebuild 726 BLAKE2B 13edcf5770f3c705b46b37869aef9d33f9126922f67edd4dac7953ca371823946e16bc5880afc7fa6c9f059c9999fa1423c959d3d3d519082a2b65d4908a556f SHA512 47ac46f3dae3369271b9ce249bc8f335d78308bf62786f5af4685d3450351aaedf5b9e2e595fdaa66c58609f184a23c9f9f611f0d1b905ad068089bfecd900a4
+EBUILD dogpile-cache-1.1.3.ebuild 729 BLAKE2B a0264e668c9f0eed0936a6dee7315c279b5e8db30174c543f6d2f2c901e064764f8379aceea23b13e04b17047e8d6841eccab592a7b9dd8dc19a60cb900c30f3 SHA512 034efa04ca66955a1db056a9ae2db5b876392c995deb45f5cdcac5e8ec6dd7e413cb6364a4dd56a7483833a863a34c6c4a6cff62a900d42cdfbeff3754d85ad5
 MISC metadata.xml 842 BLAKE2B 563cbf5028020e4afaf810c0b47b98c9e4c44cece6ca57575e91d76014f25892306bedf1812df08634001fc099d26e83288874e2f9274d09dc523d53775a9d46 SHA512 9640c0603ffeefe661427c6dda9fbb2c1633693beda0da39afcd2f8a2cbdb6206cae75228d692a1ae11352306aea3a9fdf602d0cde4324d21642825620e20176
diff --git a/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild b/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
new file mode 100644
index 000000000000..4174912da531
--- /dev/null
+++ b/dev-python/dogpile-cache/dogpile-cache-1.1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="A locking API for expiring values while a single thread generates a new value."
+HOMEPAGE="https://github.com/sqlalchemy/dogpile.cache"
+SRC_URI="mirror://pypi/${PN:0:1}/dogpile.cache/dogpile.cache-${PV}.tar.gz"
+S="${WORKDIR}/dogpile.cache-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/decorator-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-3.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/mako[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/drf-yasg/Manifest b/dev-python/drf-yasg/Manifest
index 87408c970057..fe4a4f0594db 100644
--- a/dev-python/drf-yasg/Manifest
+++ b/dev-python/drf-yasg/Manifest
@@ -1,3 +1,3 @@
 DIST drf-yasg-1.20.0.tar.gz 1800321 BLAKE2B 3db8b0b33c2919d4a331b06b1f6e324ce6e0e160c0454cb066e61cbf7bb580efadb5cd9624579492db3404edcc8e50753e63b6edae022842cd087b820779557d SHA512 b56cd00d7a09f197e95c0129e20e561ece783b4edb389b228027ab8768247ccba15db5768f52a3d5ac5a4c47faa7a447ed7eb9b22af2a21377a36dcb7e7b267f
 EBUILD drf-yasg-1.20.0.ebuild 946 BLAKE2B da0987843266c6da7b7f425f5e14cc5f70fe16ec254063879d10ada8b1e17343730ee0aea3d96ce94464c62b99046db1015213de7f2997c185f046d4db9658ee SHA512 69704ea4e7290e6d38a663598015991466af431b778aa38dc3b6ca0039eaab59955d17f84acce0e5a64cb6ffa76fc9838b97960c279de0572a1552527328c94d
-MISC metadata.xml 434 BLAKE2B ca982c1af439d65a6cb9a36be92866b239fe15c89af7c31d5954f619fb88177e5d46dae7da85a62449e07f51321e0e85bc1a9524fd70dc455a9a21c5576c3cc9 SHA512 da0183596ec73fb68dd859997b1f16f85d3740d8018c0954a31bf74f60978e1c980e56a418152f7a81718c58491cceceede1bfb09229e436c856459cbc6942df
+MISC metadata.xml 353 BLAKE2B 99a156ed6e04f2fff1585365c5b8f33974b21710045672e7135e3f097ab2b6a4c8aa7bf55f927f2e3c05e13d9234d4eb0e8da97ece39c52b066b3c24715775bf SHA512 fc9402bd70aa60865f9365e5a4304bb1bd534e1c6073748612400a1159c99c6339767a232cdbc181c1af950da4079de1754b7db7bc656959696abe5d516d5d54
diff --git a/dev-python/drf-yasg/metadata.xml b/dev-python/drf-yasg/metadata.xml
index 4a091e4f1cf4..f1fce18f76a0 100644
--- a/dev-python/drf-yasg/metadata.xml
+++ b/dev-python/drf-yasg/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="validation">
 			Enable swagger spec validation using swagger-spec-validator
diff --git a/dev-python/dulwich/Manifest b/dev-python/dulwich/Manifest
index 50fdacaa4fee..77fcd8fd408f 100644
--- a/dev-python/dulwich/Manifest
+++ b/dev-python/dulwich/Manifest
@@ -1,13 +1,5 @@
-DIST dulwich-0.20.15.tar.gz 391841 BLAKE2B 8db19f84154dff0851fd16bc534d92b506c93a93d7180079bc9829a2c81bbb25b04b234770e62ddab82440973d0702b8523896a9db90d771d8cc915b6321cdaa SHA512 a4e746099a90ea2d7eb5f0309508a4f625d41732bdda78997fab07b38ea2ecbd2c2aed08c8ef05b1b73fe3e2ba9b8c8cbf02270f8edbc6235d66cdee0317365c
-DIST dulwich-0.20.18.tar.gz 392023 BLAKE2B 891a02380eae06f2a6331825f6380917c0fd43b418149c30f640566f76b49996f79c7295215d3cf006af86d8ed5bd1465696bcbe402dcfd6b68748043eb4e376 SHA512 ae4311c5d460d7859728c9e9fa9e1888f228488a5cc427a637a7e3d1ae0de3effb1136500b13e0706da38158a245147b0996392b157e67d928caa339416bdf7c
-DIST dulwich-0.20.19.tar.gz 393004 BLAKE2B 89a63943a150ccd15549898689af68769b7f0cf25065e6cf9c9c5addb0fb3635fbc5c0fd23c79d2facdaf3086fd5e853e7ac3f9690f7fe40e0b561f0709651e9 SHA512 07a6b127fc1170a929b22cb04e34a0653131d175d3813fccc9e47e6d250bfa217bb0a2557d5e7fda6edcc5376809e6593dbd0fa52eb73360ba9c3dcdac69c81a
 DIST dulwich-0.20.20.tar.gz 397197 BLAKE2B 941cb09c0537ec9ab96fc65cac12f94cc74b549eb2a8a516def96f66a8d31ad602ae4253910a24efe7254411dd4723832481b0df3189a9cb8708e3bbd512eb6f SHA512 ca83bfe3566981830bdc91d2e4ed039625fa6780dcabf74e0e91c9d89001e06dd04c8a10e8dfaf5c5ad67081d77fc9e996e2e3e1a0589954faae09162c545b02
 DIST dulwich-0.20.21.tar.gz 399232 BLAKE2B d2768a4cc83ab2dad3b569c7c97c93ffea0293eb10ce269a7edfc7d5a6dc15d31d7637332d6968d40e67dcd2d76d6f9366f6d2e30527a666bc76fab32c5bab91 SHA512 1dc3042ef7ed0320b8e998d78c98e5d181981f665a708547b715ed5a16869f5c0c76b6228bf1e58cb957923ea9643ae2ae7cfca970056bc5230db18c5a110985
-DIST dulwich-0.20.6.tar.gz 388660 BLAKE2B 1a193d03e0f21a9fdd125617823742b87e9bea74c73734da10eb79f1ecbec0263cb90224f78413c724db8998f4d06ff6c448e7a6d50ce760ba1545f3321b95d8 SHA512 2f11ce9a1c716fb4242f1f93fce92f756bd93ed8f0951fc2e6b3fb18b0a495b0f372966149fca587efcafc0eaf00e9fbfcfd957442a96cc2004eb66cb7f0773e
-EBUILD dulwich-0.20.15.ebuild 1615 BLAKE2B 314c162ec3aef076e6fe91ec1bfb3c96c903cb67468c4e9b506899ca48902f82d25155665e8025b4a614874ffe223f8b49ae523b19f9a68145589422d19a8af6 SHA512 97f7575e1e4215922fea89e8bc4357ec62fdb72259c838d07939e9082ca65a93011da513be8ab3d4514a4641966f45b3380574c08d7ba1ea97c894e63d9888f1
-EBUILD dulwich-0.20.18.ebuild 1616 BLAKE2B 9ab3d2832f98bc8306445f514fc05340762640a2f01dc0e135134dde4e09d7370ea099d26c87adb46109a7968d47ab37008a6e99f9a9a7db628bfdd5f9400bea SHA512 414774364da95c1541f019648013bc0111fb948483e3740d65aafae364d38960b609aea7a65ad1524279f9beea68876e3b80bd68b6fbb072345cb65a86798888
-EBUILD dulwich-0.20.19.ebuild 1614 BLAKE2B e81850218eb90c69a9761da082291db310b65e97b6b6da39ee8bb9bdf18053ce8e955acd0b1ee913109af1d9a1f6aa7beb1106cd7d4a8a707676265f6aaa3a62 SHA512 80253a78344654e6b951bc8f23d21551404ce565b8d2c13ccec02cdbec3e91bc9a0b03153aaa7f0edca711ba4ba48ead4125f280c3ba05b13d533add7291ada9
 EBUILD dulwich-0.20.20.ebuild 1623 BLAKE2B f8973b73c094fe2ef5efb9ccb71f44e2da24c137a9b9bd28b5292217c78e1139ff8725417c422df4feadecbbf74ce0e0edc7b63f43e6761e2b9a203fffae986a SHA512 c43266e408a6a8b236036347694062a60c4c806736a4ec540957d509f5534d2c4e56212f23b8b67b48700b267718181977f01e1c389f33f8c90df98445bfae8c
-EBUILD dulwich-0.20.21.ebuild 1627 BLAKE2B 99c84f01cc3e057ed421c6f01d633a41ce36225530825b4e964f13ef920f092623a3ccd432a000b23d11fcb066e1d9a52b0f84039b771abc9fe445ad04674509 SHA512 059fdaaec6bc6666103db841c8730dc95f4a7d878c4171d9e32b93573583816750364bb7f16da6a1c1a98a578f004044cdbeb75d91b04f0f46d5bcd564a8d509
-EBUILD dulwich-0.20.6.ebuild 1609 BLAKE2B 35342199390c95bec9ec034af56586f07dbc522ff9faa4f4c45de6a04e72f98769a33ffb71348e52db1af227a88d1fcedea8e1a69358e8befff58270fa904933 SHA512 83db4d17d918c8972fb0eb5ce8178c60c57a32d1b0a53f9b9f8f1c29c51af960a5a3c410bc3a95b46bab4c110fa870574318b8dfd234cd1d2f73a853142cb99f
+EBUILD dulwich-0.20.21.ebuild 1625 BLAKE2B 0711d93411c4b6a679ffc36cd1b296d43debe2a1fdefce693156caa0b40c2584d43a2bd3eab5128dcd14d77328b8c21bede077a0f86fc5222a7019677c6eaa2f SHA512 50e21f8b4e732963275bf00a7d5029957e34486272db01f3726cb79efa47d60512ee748c7813806f52b0bffb8648e16396bb880867182092e9d3d4aee1741578
 MISC metadata.xml 557 BLAKE2B 17a7d57f6d3a8d0a01808be1f9d5381ea21cec37bbaf193f6f5b28b3f8381fbdf5a00b06cefd89a777ca11f11556ed33b13e295aa5687d4eac76df537dc6fa41 SHA512 6325997c6f1fca6d8bd2fb3987ca8a53ee068847e4d184b36928a7265ff0aca1918dfbea34a8cd93f6d3b68aace8e28133d261766524f7da3639a307ace0e160
diff --git a/dev-python/dulwich/dulwich-0.20.15.ebuild b/dev-python/dulwich/dulwich-0.20.15.ebuild
deleted file mode 100644
index 490983f204fb..000000000000
--- a/dev-python/dulwich/dulwich-0.20.15.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend  # tests use setuptools, setup uses if found
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) )
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.18.ebuild b/dev-python/dulwich/dulwich-0.20.18.ebuild
deleted file mode 100644
index 920df42f7bd9..000000000000
--- a/dev-python/dulwich/dulwich-0.20.18.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend  # tests use setuptools, setup uses if found
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) )
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.19.ebuild b/dev-python/dulwich/dulwich-0.20.19.ebuild
deleted file mode 100644
index 606e406f109c..000000000000
--- a/dev-python/dulwich/dulwich-0.20.19.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend  # tests use setuptools, setup uses if found
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="
-	https://github.com/dulwich/dulwich/
-	https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) )
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/dulwich/dulwich-0.20.21.ebuild b/dev-python/dulwich/dulwich-0.20.21.ebuild
index 4d3a0ca5146a..4d8b68f98f43 100644
--- a/dev-python/dulwich/dulwich-0.20.21.ebuild
+++ b/dev-python/dulwich/dulwich-0.20.21.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/dulwich/dulwich-0.20.6.ebuild b/dev-python/dulwich/dulwich-0.20.6.ebuild
deleted file mode 100644
index fa8f24eaaa78..000000000000
--- a/dev-python/dulwich/dulwich-0.20.6.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend  # tests use setuptools, setup uses if found
-
-inherit distutils-r1
-
-DESCRIPTION="Pure-Python implementation of the Git file formats and protocols"
-HOMEPAGE="https://github.com/jelmer/dulwich/ https://pypi.org/project/dulwich/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/certifi[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		${RDEPEND}
-		!hppa? ( !ia64? (
-			dev-python/gevent[${PYTHON_USEDEP}]
-			dev-python/geventhttpclient[${PYTHON_USEDEP}]
-		) )
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/fastimport[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx docs
-
-python_test() {
-	# remove interference from the tests that do stuff like user.name
-	unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE \
-		GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE EMAIL
-	# Do not use make check which rebuilds the extension and uses -Werror,
-	# causing unexpected failures.
-	"${EPYTHON}" -m unittest -v dulwich.tests.test_suite \
-		|| die "tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	if use examples; then
-		docompress -x "/usr/share/doc/${PF}/examples"
-		dodoc -r examples
-	fi
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/easyprocess/Manifest b/dev-python/easyprocess/Manifest
index 2d73c566eb8e..c4822f1e6f4e 100644
--- a/dev-python/easyprocess/Manifest
+++ b/dev-python/easyprocess/Manifest
@@ -1,4 +1,4 @@
 DIST easyprocess-0.3.tar.gz 11310 BLAKE2B d26405863f213a94687d646f57aed98d0285bd57c0dfe9c40d2f49e5cfe46710e0435ff20eb1d697648e6fd1b63a38adf46a03f0fe970e35d44bfe3ad058d63f SHA512 3a10a02b28139c2d3d53134ac7842dcc7027c855e55b17747be1545cbf77cf86303531b595a54d92d7dc8133aee210388d25f3362b705ee554323c01d742d336
-EBUILD easyprocess-0.3-r1.ebuild 644 BLAKE2B 9f855fc8aa133e27fdd964893260b7ecc1e6b7a9f73985c1d2b4557fab46db514ba2d0cfc701ac01c4b8bce912d611cbb06cdc85375ab6ee79bc0c31628c2286 SHA512 6b6bfdcd8615cc3cfbd1b5f168245aa29f4ee0f1458677dace1160c50056697339273eac400f70435ed141b5bab297aaef837531ba11b347eb3b093b9603a604
+EBUILD easyprocess-0.3-r1.ebuild 642 BLAKE2B e91e2594b0749b50f6d7c21203dd94888b290c578af8cb0a34d6a7a26a34f3bca9fc5d529a4b7239b24fb49be6ecda3fa3879005cfcafdc3ff53b0e01006dcdf SHA512 3aadc07bdb5c012c16f2e8a81605ea93139add64dfc153149ff53a1c94e2c9d832ebf17af3d44f610493c80d48bebff0d5092659063ddbb8c209f9b7946a9242
 EBUILD easyprocess-0.3.ebuild 640 BLAKE2B 38937850e2431502e56759991db3dbe672d5f3258068536524bae4127c53228f8a804066136a8e0b1bc581afd57cc7a8c3cfa3decc3f4d0201edb70df190bc5b SHA512 7b79a5453fd0ea8ca2490b82ba1721a8c85a22dc7ed42ba5033c9c879be3f2bdec782ee3eef03103acd605fcc56c4331ee76fbab87b0703bf27bcaf9fd915498
-MISC metadata.xml 503 BLAKE2B fe63bb62f9d302956a63fb23c75ac21ef7930a6b9ef7a0d94590ad5279d8a421a5bab875658c6204e72829932371eb7f90aa0d6027b6517c49495ba7682c6f4a SHA512 976165bb3a26d179c904f72a5ba22311a8533e83743d3763a6c2dc7c797903bd1b930e25d6a2f202816827386c97f8336462c3027bd5b98a67618699808ac72b
+MISC metadata.xml 356 BLAKE2B 46f8aa801520513b2d82a062ec01e17da2620126a20102a6ca859c28d0f3f21d01ab58f442fb450559a8cce28a73929f6586f7847bfb47066bc1efa3597e13ef SHA512 02b15b294880ebaf762bdeb5002e0d56e94632592f97116a3a5a9f61724359010e8e5da331d3775d4f57166fa2499875424c732929fc70b8a311a50e77b5b264
diff --git a/dev-python/easyprocess/easyprocess-0.3-r1.ebuild b/dev-python/easyprocess/easyprocess-0.3-r1.ebuild
index 20905b3cd3e5..bef5b8faf0c6 100644
--- a/dev-python/easyprocess/easyprocess-0.3-r1.ebuild
+++ b/dev-python/easyprocess/easyprocess-0.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/EasyProcess/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
 	dev-python/pytest-timeout[${PYTHON_USEDEP}]
diff --git a/dev-python/easyprocess/metadata.xml b/dev-python/easyprocess/metadata.xml
index ec678a81e4dd..756593616a8c 100644
--- a/dev-python/easyprocess/metadata.xml
+++ b/dev-python/easyprocess/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">EasyProcess</remote-id>
diff --git a/dev-python/ecdsa/Manifest b/dev-python/ecdsa/Manifest
index 1b3a344abb09..4928890808b2 100644
--- a/dev-python/ecdsa/Manifest
+++ b/dev-python/ecdsa/Manifest
@@ -1,3 +1,3 @@
 DIST ecdsa-0.16.1.tar.gz 126935 BLAKE2B 84e04c0afe076c009a88f7ef1a0193329e3d4945e34c752b869cbf449667c424341fae7da2e7c908b773c6f4ab495d29dd40aa3a9be35b0c03d315ac330dc3e0 SHA512 935416ff25a71b1e6fe442b11e8d2c1463b1652d539274e094112a4847c2c749ff58eb9f5ed108ed5613b7363d3f2b1c07ba3d01af8cfed4e1b4bec407d3f5a6
-EBUILD ecdsa-0.16.1.ebuild 771 BLAKE2B 372f5280d69123a7ccd1d7cd67f4b31ecd81077c5655f61d76051dbe9db494ccddd13d36411ba05890b9c596841a5be04dec2e894d0c298adbc0933d26bbf39c SHA512 274cdbcfa1cabb901a8fdbd4b9728836cb848cb994048173792f9f8716a94d448556e39fdd6dea6aeac18a34d3957efdf50edf7fef8b37477cd44461bec0b50c
+EBUILD ecdsa-0.16.1.ebuild 771 BLAKE2B e2708decf97044e799eade890a1b947521cd2c2d3cfcee9896ba47c9ae5c2211e2e961e17ca88dc469bd624fe97a59e0b55c0fdeb9b885d4645d5f079a20da0e SHA512 135442dcc2f55dcb1a58158b163d8faebe32317a8d8f9ec42cd874eb062a751889a3777ffb2b90ae0054b385b99962d633c9b980bfe857f2e4376d23eddeb16d
 MISC metadata.xml 407 BLAKE2B d98041dd8990a7022e91da42ede0427fef163b3ba1635c98e3c671a4962e5ad027797ec3b843ce3699f15b38b46b55d14544a85aed17c4826fc327edd73fe826 SHA512 24ee11b3314fa4d3da1e8f0d886290a9a7c1db776b32a618a702e72f0c1f9cd13cbfd64f7699cf3209ab90621a71aa9876ead8f916507dd9128ae03e169c3770
diff --git a/dev-python/ecdsa/ecdsa-0.16.1.ebuild b/dev-python/ecdsa/ecdsa-0.16.1.ebuild
index ff204fcca866..652c0dd68150 100644
--- a/dev-python/ecdsa/ecdsa-0.16.1.ebuild
+++ b/dev-python/ecdsa/ecdsa-0.16.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/editdistance-s/Manifest b/dev-python/editdistance-s/Manifest
index 8b61be401a2e..a11cf916d225 100644
--- a/dev-python/editdistance-s/Manifest
+++ b/dev-python/editdistance-s/Manifest
@@ -1,3 +1,3 @@
 DIST editdistance-s-1.0.0.tar.gz 5408 BLAKE2B 5420dff814de4d61f7c36c88113c568562a174205d8a4ff2b52b60e797f7459d95fd2a909b70911cfd7d0d67096a3844888bb88866980a2c43f8967a96ef4c55 SHA512 148234a38f54f70a2d6bc64f6a166a8954c79fb89d5f5c0bf3f041fe60056332901484a0626e218a72ae992f476305cbb662dfa0acdda794727fc682c569d718
-EBUILD editdistance-s-1.0.0.ebuild 521 BLAKE2B 6db01eaa94e8b9494554cfbd39e2347206a7b30623f518d737156f2a86f6689ba998aec1e0153980994ac32506086a67230d810ad0835abc27d297eda525c9e6 SHA512 5106cf5283e44524553a57bbe668017a6be066bf3728c39dd0a70adcf480f9cd78fd1cb2c1cc304f65b7566f6b23fa109635253340df3f25a3b1b50a41c189f5
+EBUILD editdistance-s-1.0.0.ebuild 522 BLAKE2B 762e6c6b395a2811c88fc3abb6303109d103132c0ed8446cdad9e92ed12cb360bc6edd487dedae4291af7b00c3a7ee7216ff07be5714a4c6c947ca21e4a1b243 SHA512 ba4e8e36c3540c086437c5b0ad3db6c18795dc160e407254b010cd4d71a1b1128edfdf71dc202c9779cdb7e1675e82f9576b5d2a0d53c4e614c83a827a20a30f
 MISC metadata.xml 769 BLAKE2B 385d6e712da66dfd89e385bc712157b3861c0238d2fd807755d636feb4625782e76e1f5272c4efe758cf0de14fa5bd63d519ddd04ff9c4fb4528566c5620f419 SHA512 df3869e4c09d072ab860470f74958a25a446e0c71c7529f13e85b3f82f8c18245aa1dd7e4594e1add53675f3b87da9726260a367c6c9cee17ea758b0bfe99b99
diff --git a/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild b/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
index bdbb49dbf8ef..5cf084bbebf4 100644
--- a/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
+++ b/dev-python/editdistance-s/editdistance-s-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/elementpath/Manifest b/dev-python/elementpath/Manifest
index 431ac5513bbb..ad84837c5cfc 100644
--- a/dev-python/elementpath/Manifest
+++ b/dev-python/elementpath/Manifest
@@ -1,5 +1,3 @@
-DIST elementpath-2.2.1.gh.tar.gz 228166 BLAKE2B 0fb0f338a28d155056bd551dc00e634a00a820945e8147ac8a1eb4811aca9e25c563e9011f1a0de9d2aad5761322fb8d9167b64cc5653bbc4012d0631c81fb05 SHA512 eadeb7fbdaa5470c39a59c8f02047aa8f8e76bfa03087bf2a3206f3fad57ae78da82ccee1de5e6c13207c9e22ca5a45de4c1b4b42c62f8141c8f2bacece02ebf
 DIST elementpath-2.2.2.gh.tar.gz 232791 BLAKE2B c28dcae59d29fe70422b6075a4a9627037726574c41e43947c00ba47054924c179e646a5dc01f2247b72f8c58d4fcfcaf411dfa1970cd6ae1cd2fb9f1f3753be SHA512 3aebfa15ec036674d716e6fc91745a14b897f757ade1df945270d39153ecfa9486d0465e9126a6c71470b191690158a853c3871d493e83ac08e065ce2aed3af3
-EBUILD elementpath-2.2.1.ebuild 726 BLAKE2B 7e48e109a9866b8cf9db8377e64c5e06d6cc604d58d97c115d475d9bb8f61f546fbcee4eb34b2bb619546bbbc081d51a3ca29e314d632b2cbae6b1150b128592 SHA512 d401560eea909571cd7aae0439971c4fb05bf131f2ec5721551e7499a218627da2f9e176b0ff63546f8c415aefed18cb9352dacbfc9874209ff066658fc1ad1b
-EBUILD elementpath-2.2.2.ebuild 695 BLAKE2B 54bba320b7345f8380fd87aaa7c840332849b3bee00dd2f5d5b7769995b429e99b13b2abf2011757431cbab412e83b3de3c6206e2ab4ff3c688389fa77cf16f6 SHA512 6bcd81455895165e4d345638e09185febe52f58091d87e8209ac2d24615c9d8c803a76378a68ebe8ce3600601276a5801b77592f1bf65e4200dbbc5774fc308e
+EBUILD elementpath-2.2.2.ebuild 688 BLAKE2B 624fe5885358c07826ebd54d256e36ca831183ae1476e1703d8bceecc8d5b4935d28a695f771396221f5a627f781073be2f163d4de6d91014b89e79267aef165 SHA512 6eebee6147e3728f2fbad198a606fdfcbfe946ee22edd641488c46c4d0cc5681d200a5c4824f99f132a90327c2c85a627c60d2cc2418d55e7d52221c1bb335fe
 MISC metadata.xml 379 BLAKE2B 83728e52dcbc4f5794b1d73c968e2f28858cc1e1384dc9c48b5d462f8c50124681691aee7d290b926654cb8453b7b372f81eefc5de785dc43a3165ab8933a22b SHA512 36bf1752608d8d5cb3de0be695774b09c0ac66934928476e8c972e7ec0d163d3e61bafbfdc9f587215a2d8996ca2ddd14ffd26c16791c85c70f5eca7e1e511ea
diff --git a/dev-python/elementpath/elementpath-2.2.1.ebuild b/dev-python/elementpath/elementpath-2.2.1.ebuild
deleted file mode 100644
index fb7e7fd131e4..000000000000
--- a/dev-python/elementpath/elementpath-2.2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
-HOMEPAGE="https://github.com/sissaschool/elementpath/
-	https://pypi.org/project/elementpath/"
-SRC_URI="
-	https://github.com/sissaschool/elementpath/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/xmlschema[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests unittest
diff --git a/dev-python/elementpath/elementpath-2.2.2.ebuild b/dev-python/elementpath/elementpath-2.2.2.ebuild
index f476ad08f7a4..a0818c4b77f5 100644
--- a/dev-python/elementpath/elementpath-2.2.2.ebuild
+++ b/dev-python/elementpath/elementpath-2.2.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="XPath 1.0/2.0 parsers and selectors for ElementTree and lxml"
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/entrypoint2/Manifest b/dev-python/entrypoint2/Manifest
index 66ef12470790..7c75288d9829 100644
--- a/dev-python/entrypoint2/Manifest
+++ b/dev-python/entrypoint2/Manifest
@@ -1,5 +1,5 @@
 DIST entrypoint2-0.2.3.tar.gz 11542 BLAKE2B ef1ef511e02a3c5601d3147af241965fa78361a8cd070b5f0240f3842cdd49b3f93a32af4299568d201382c8c5a694ec7f85191c5880d489056744f59cbcd346 SHA512 c02ca02be9f25533c6a37a3aa372cdb75de8419349e279f7bd82369667a75943fc2fd0ba5afad49281d623f8ac4d6f97ffb2dbdb7b72b4cdc9afec80e763bed5
 DIST entrypoint2-0.2.4.tar.gz 10407 BLAKE2B 16335f8e2bc173413f387e581892b1fe03efdb6bdea2e75d20a95258d55c0cb83dc70691cb4b41b07e49881db4e5c08593bba42adf5c1a69785e32c99d68a7fa SHA512 7bf7dea2afc7df3ebe57f89f472e4456fc22d5c66720930a2b15dbe04f708ff4bb00feec79af430620d8cc6d91d5df1770869d23d2282ecc0024ecc7583b360b
 EBUILD entrypoint2-0.2.3.ebuild 546 BLAKE2B 45248bbe41b1834dc97c3f0d23e6f5e74747750a4e50d845acb2d399ca60ac3d735c19c6cdfdd62fda90b277102d24a53dfee2eba66427a6c397696503987eff SHA512 7ecc7903ef8205db6998919932bf6aab6b4b0fd74c15dd777bc77ec47f07277cd824cef875bb3ee37cf163c611743166acdda64e55b15735d3ab82671ac51e49
-EBUILD entrypoint2-0.2.4.ebuild 550 BLAKE2B 193dde3847ba4400c3d4f77c842ace7b502033ec3ce98d03511b5210ab446dda8102d7fd7f66d8ac5bf7f7e868658d5b837e03f5de42f4f25fa9fb05dcd65b62 SHA512 b3a8c4de7edebe82c647f2586ea40b63c0e8d2c0a02aa9359347be4bb1f0a4d63424a024c25cbdbe8e16a24bc33e9af1d039d89259d8e4fc2e713e5d8e112755
-MISC metadata.xml 503 BLAKE2B 0b2b1941b2badb8b0fc0bccfef4b2b64b6af7603e15f62813074109be26b4384496f3ec39ed8e9c59252034c672e731f36270a56e4f4d243decdf38120d50618 SHA512 872e404b60b1ada1c6cf8666daa42a2e57b51acfe2360370788c2f9feca2d74d8fac33fc146b85821e7da73625d6c8fd983a23da68badb0579487be495eb5fd4
+EBUILD entrypoint2-0.2.4.ebuild 548 BLAKE2B 7eeb4dc0fc49dfb78b45ba7d134c3c155e05da0e1c16401759148d47e70d715e906bf7f2db999ccf2cf82aad9218bc258a7c8d854c53db73560ea53d65cc0ef2 SHA512 838bbc115027ea3bd3b05411a85602047427a7a7d39e83277448bf7259b556cae2b55a6cd96739c36387b716b63ffaa3b4a176c86775098b09c99bc057f508fe
+MISC metadata.xml 356 BLAKE2B efa83386b3794047db369036f6ab0efe0c1b6881a8375cea5f331237ef9f23db1f0b594f07fc071f0923c56a45e8903aeb87d101cb847736226066dfcdcb4504 SHA512 8b0f5502eb4b0fe766fdd706f1eada39c77e0dc1bd52f2c60d28d23ac9729f08409150d82c1a8b5d8a6c9a0c3c80f23a46c9f2e7776eea8d2d9058d4b8e87d23
diff --git a/dev-python/entrypoint2/entrypoint2-0.2.4.ebuild b/dev-python/entrypoint2/entrypoint2-0.2.4.ebuild
index 54283a5fbda0..1860abd0dcc0 100644
--- a/dev-python/entrypoint2/entrypoint2-0.2.4.ebuild
+++ b/dev-python/entrypoint2/entrypoint2-0.2.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/entrypoint2/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
 	dev-python/easyprocess[${PYTHON_USEDEP}]
diff --git a/dev-python/entrypoint2/metadata.xml b/dev-python/entrypoint2/metadata.xml
index fabc974a5cb8..da081937a49d 100644
--- a/dev-python/entrypoint2/metadata.xml
+++ b/dev-python/entrypoint2/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">entrypoint2</remote-id>
diff --git a/dev-python/eventlet/Manifest b/dev-python/eventlet/Manifest
index a5111e4e0254..c05fdd1acb59 100644
--- a/dev-python/eventlet/Manifest
+++ b/dev-python/eventlet/Manifest
@@ -5,6 +5,6 @@ DIST eventlet-0.30.0.tar.gz 401035 BLAKE2B 94a272ce810b28c00fc8a468f160e38f3c58c
 DIST eventlet-0.30.2.tar.gz 401552 BLAKE2B 89291efde90d106a96eebd4ea4a892eeb005d6850262b28f7a4508f4f3ccfb9b49dc392dcb6eb0cf20c5d171d26d2a6639627188c97123546162e4e8c61c464d SHA512 af31a7b126f2120dd77699dcf25c7134af1bcf664f40b2422238a3d2120457d5a4d5764e23016ce209882a8b888f94d2776fe194c33092f4a33111b2ac8f0cf1
 DIST eventlet-0.31.0.tar.gz 402530 BLAKE2B d4d5983b22d04fbd6102b7e1ebe58c6e23cba04968478808445d946a3d8fc9ee0b668e83321397163d507cacf58f0cdd8547b0fb2649bad23819fbee0a6cc5ad SHA512 1721ec5d3c6c02361a5993237426d0466d87327e3d429d7b9f20d3466eebf08c60e57a2b1ab133956fe508835e5e84c52317aa51f962e8487f22a6207bbbfcf8
 EBUILD eventlet-0.30.0-r1.ebuild 1785 BLAKE2B 6ba2285e9368427aa547becbaf4973654733990253be55b87500853925783456cbe4c72d7b9864ba1b2c062156386a4a5ba434bcfb5c091e80d9e162fa8189b1 SHA512 df33839410c4f074b6e5bd9d349226a0af9c94905b7beaf07410eef40776dd70fed116f40c30df9a152126ae26ea931839443f12107d3e0de1c58f628531ab31
-EBUILD eventlet-0.30.2-r1.ebuild 1696 BLAKE2B ff7ce278853e6ebd3e6f0e5939b3c011c4368cba536620e3fd56f10c6b80a2bf82856809aa9c72440080904684bb4466ea65a18d33104de55413785f24386ec4 SHA512 be1e474154b49e7aac41598ef2656510e07c748ad8f1501cb087091620d43986fb34be8ddf885eaa27790120a9e7e9539a5d27a5f7dd7b89b0a5fb419f96781a
+EBUILD eventlet-0.30.2-r1.ebuild 1694 BLAKE2B b196199c45d2cb80069079d67d17fa1c1279090873dcd7e8b0c2f3db2c4477956a1eb85f8dd9b053635f50774d1029a7ca4bf04fba093deecbe191d6cf6a5b5d SHA512 5c223da6a51b20c4427d8a7a16b760cbb4c85e5937fa46d793e5172f83c540896b71e1bb3098537941ec0008e52bfdad750414551abd87ef81729ad415d418ad
 EBUILD eventlet-0.31.0.ebuild 1696 BLAKE2B ff7ce278853e6ebd3e6f0e5939b3c011c4368cba536620e3fd56f10c6b80a2bf82856809aa9c72440080904684bb4466ea65a18d33104de55413785f24386ec4 SHA512 be1e474154b49e7aac41598ef2656510e07c748ad8f1501cb087091620d43986fb34be8ddf885eaa27790120a9e7e9539a5d27a5f7dd7b89b0a5fb419f96781a
 MISC metadata.xml 380 BLAKE2B abdf12718464c834d63994ad012a6d47279fa6f0e5cb0d075bfbbf24167438220ec9681eac874c93dc3abd9c1498a1a7f658a622f8ebe764cb6803b1b2bb4561 SHA512 8100edfde1885122848aa543b99bbc8529b9dc2aeea3b7efb74a3d1e8e01bdd2110e4cdce2c4ddeab9fd0182f193118e876843a61a25e17355d0916d50331daa
diff --git a/dev-python/eventlet/eventlet-0.30.2-r1.ebuild b/dev-python/eventlet/eventlet-0.30.2-r1.ebuild
index f8d57c28dd02..c4c178a0f136 100644
--- a/dev-python/eventlet/eventlet-0.30.2-r1.ebuild
+++ b/dev-python/eventlet/eventlet-0.30.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/e/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="doc examples"
 
 RDEPEND="
diff --git a/dev-python/exdown/Manifest b/dev-python/exdown/Manifest
index e8554596d913..42b8a5f9c091 100644
--- a/dev-python/exdown/Manifest
+++ b/dev-python/exdown/Manifest
@@ -6,4 +6,4 @@ EBUILD exdown-0.8.6.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f
 EBUILD exdown-0.8.8.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
 EBUILD exdown-0.8.9.ebuild 571 BLAKE2B a4119bcdd31e5c071a691a473a9c86a61f151889f6daf168d330cbd75902db3a44c9f5069e8acd414c021b842a84053026b246fa19f9870547f5ef170791a55b SHA512 96f0028113afdc70431c61058404c9202054accc92f43139f9ee2e0ddd12b49131c980996c3eeb21b8594c5c1fa0a95cca06426dc8e06a4220a19defb692dc8a
 EBUILD exdown-0.9.0.ebuild 652 BLAKE2B 4cc4f067900083e96108699c07c0fe50035802d8d2bfdea9128632f2a8cbe33fb4b2a8089af818f18b7a1fe821a325669284bbb8600c87077a03c787bf1bbdfa SHA512 d76ffdbeded4e9fe4d2a2ee0172e8cfea5ae9cec2f0ecdd95779f82b3a0eeea84e195bfda6ccfd5bce58ddee713af4bad8c0b71770ef810aba157717f77654c0
-MISC metadata.xml 629 BLAKE2B d9dc203013d701528ea7d879612250b25fa7c67c3c3378b4b106e848c10d997765d44de372e0ba5b2e34ff44a37ea1cf347971d58c7f3545e60e22f0735e29c3 SHA512 f4f656a6b2ec713b358564715611c69a2eb2292d17dffe58ebe9e450cafb943e9242dc92c63680a9cda78e5be92a7ad6001763fa1edd956fb1094732bd77fce5
+MISC metadata.xml 482 BLAKE2B e4a0581d72d9a27fd4376d849a3fca06a53f8d90111623f53443606c27ba030d004f9daf3bda5267b0b1d24b395e582a43e498d3ca1317734570176abb10e929 SHA512 71b956f791e6cb2335c6c19ec844ece93274f4c032a4cd86fc3a7a65893bc54c2aaa9a57d77fa5625b7a18f25c1821b561865ca55004fad740cc350d67b37ded
diff --git a/dev-python/exdown/metadata.xml b/dev-python/exdown/metadata.xml
index 38ff0546051a..e583da492b40 100644
--- a/dev-python/exdown/metadata.xml
+++ b/dev-python/exdown/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</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/falcon/Manifest b/dev-python/falcon/Manifest
index 4714afa66921..cda7fff57ab6 100644
--- a/dev-python/falcon/Manifest
+++ b/dev-python/falcon/Manifest
@@ -1,5 +1,5 @@
 DIST falcon-2.0.0.tar.gz 1075333 BLAKE2B 338e0b2474d743171fb0bc9dc3a05da428e6d46fc25e7cf1e978f799ed70e76bf265f32ba2cdf16d6eec8ea03b7b6111f70aa5b8f59141b7029d8ba9b03cd0d1 SHA512 d5365f91eb312cd058773d0a3809b5d8631acc188b9ee884e7c7db35664138608998f397d3fd831c568cafaf261cca2734b9dc7fb60590062e316ad1dbc74614
 DIST falcon-3.0.1.tar.gz 1300689 BLAKE2B 76dd59d0274cc2e78052b800e6e5b4c4244e1f5e47169a424882cda5bb59c38cd69c1c0942d506867728da9ddaf5d35b88195a1b003ca5f66549248293b7006d SHA512 c6a5763264b497979129df26d83a04323f53861b6d453a2b642d22208d0dad2ec1fcb88b13a53c2cb2b2988a1c0d19b94021099b458e23d640984b4d03880edc
-EBUILD falcon-2.0.0.ebuild 1123 BLAKE2B e9bd9c392d0e1acf98c5b70d51491ec351dc5238ef745feac774af71fcdbbaec4f31da7251fb9053b3ba7d10734882b8f390fcec86c6ee155f251573004e9022 SHA512 8697a1835ee097791f460d8c5868c8448c007cba38bedfada1c9ee3f781aee32832157c06990c29bcd9c1c96b36fa2fedb11149f5b7cb83d4553a6b3666a412d
-EBUILD falcon-3.0.1.ebuild 1287 BLAKE2B ff20935a0b2696dbd74822fab2fd94476a7dc0a9d082ee462b5f421812bdf89bca61876e6da8289a4fc537168cac1aea71d39d96b3f75c41e0c9c6f72f4e9e51 SHA512 1e71c8f554ec7f42f28b1b95ef3cbe768be6dbbc60321c16caacdbd64c67a207fa599960801a6a44f7036a5faa2bf8ed217604a0a35ba8e5aa142d4deddb9ed6
+EBUILD falcon-2.0.0-r1.ebuild 1034 BLAKE2B 4d8a24e8d9da45a735a7719becc6a6cb4c2c2d2d085dce6f3159c701da6cab0898ac635ce151e4ab7fdacc6aecc95093ad555434c8a10a11320829aee75a1279 SHA512 3f5369e05e28d75c67a537ee37dd86fed6659ea440e26943f1eb4782d7c2287415e0f75da32fec8bb790b337252e874a4509c607b45ff7e6c69e7ac0b1239bd6
+EBUILD falcon-3.0.1-r1.ebuild 1198 BLAKE2B 3da77afa28ba721301f042e26846bcb8f4aa563395bdb57dcc42cdc678f2bfa813a8ab6ab6f71935b7a07a888f745b09b8e89c3b81bd872a5424ad245c23e261 SHA512 c66a86d1ca817b1ed9552b9e95edd579488cd65932cab5a9921b11a3e9d0ee0af758f1723f95003c8836aec211971d264259b2e871b05a98b02f1a33cc7cac74
 MISC metadata.xml 442 BLAKE2B c89b3149da6cba7ac1d4b270f18048ab3aaec88b6f08f6d1fc35a3ef503c1557ac2902638741a6beec17f8e7d1ae0ec475de8e2e5c20fcbb1e55f1733e18ef14 SHA512 1420781016e746802d1f3bc3f9f0cf33f1506d1326a3ddf21a1da263d9fa3d8f8d271ce3241e3494519723a3befc157030e90a9d82931efba715be66e71f6fc3
diff --git a/dev-python/falcon/falcon-2.0.0.ebuild b/dev-python/falcon/falcon-2.0.0-r1.ebuild
index ff5be1f6d87a..1198e6c8fd91 100644
--- a/dev-python/falcon/falcon-2.0.0.ebuild
+++ b/dev-python/falcon/falcon-2.0.0-r1.ebuild
@@ -11,16 +11,12 @@ DESCRIPTION="A supersonic micro-framework for building cloud APIs"
 HOMEPAGE="https://falconframework.org/ https://pypi.org/project/falcon/"
 SRC_URI="https://github.com/falconry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+cython"
 
 BDEPEND="cython? ( dev-python/cython[${PYTHON_USEDEP}] )"
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/python-mimeparse[${PYTHON_USEDEP}]
-"
 DEPEND="${RDEPEND}"
 
 distutils_enable_tests pytest
diff --git a/dev-python/falcon/falcon-3.0.1.ebuild b/dev-python/falcon/falcon-3.0.1-r1.ebuild
index 5c8184be6612..3bd716866d67 100644
--- a/dev-python/falcon/falcon-3.0.1.ebuild
+++ b/dev-python/falcon/falcon-3.0.1-r1.ebuild
@@ -10,14 +10,10 @@ DESCRIPTION="A supersonic micro-framework for building cloud APIs"
 HOMEPAGE="https://falconframework.org/ https://pypi.org/project/falcon/"
 SRC_URI="https://github.com/falconry/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="Apache-2.0"
+LICENSE="Apache-2.0 MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/python-mimeparse[${PYTHON_USEDEP}]
-"
 BDEPEND="
 	dev-python/cython[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/fastimport/Manifest b/dev-python/fastimport/Manifest
index 1715e9473297..7b8ab9625b79 100644
--- a/dev-python/fastimport/Manifest
+++ b/dev-python/fastimport/Manifest
@@ -1,9 +1,5 @@
 DIST fastimport-0.9.11.tar.gz 41764 BLAKE2B afb82878ea1996894ff71fe99edc5ca26d45f98eedf7a8a6e85af45949e1e81c2112de9fc2c026438306a8a0e89c484063954ba7d2ff9a80c6b71ab40174f8d4 SHA512 e1b7e4897542ef6f33af51e1018340a6807688e44424e4e7e482b3347264d58d4290678cc2cfa230af500a53cabdcf35c9e7b03c8ff0f1ec3e6e0a9e869a1455
 DIST fastimport-0.9.12.tar.gz 41765 BLAKE2B fed4b350c5ff1eda194b0ec89da240ddf1f1bb48e08c16597d85eb443c0ff39b6e0af00c70da14a99fcff27ad6935245e9298b74273f210bc15f01b3aa6ccfd1 SHA512 0beab06145f7898402eff96bbc579515b506d9b7f6f30f77cdb35799d4531f0067b5d368e9245649ca435c2f7742c172c61f75d29a76c2d22fd90cc8d9605ae8
-DIST fastimport-0.9.8.tar.gz 39512 BLAKE2B 484ba865e749cca33df73417285e51a9117e7c905ab2922588d6eef9a64ea6b3d72de285a2affbe7d4a770ead9ece30f6242777087af1c469d59c8f2a4e1b008 SHA512 5d195b641cf6138fdbc6c75781a4a6d3699e3ada9743bbe4c4264879b2da2f8a2e995e7cc3955a5241e9c7a7f24f8114474a0a30907f86e2e335e2be4669f588
-DIST fastimport-0.9.9.tar.gz 41690 BLAKE2B c07774916d42a6ad98fea3fa8185bd6fd4e2b908d7eb90ec28a2d7dbe5fd806a97075ba0bb5e6dc4fa3330c9e1e46db125daa11062dba52cc9ebc4486c0fff12 SHA512 15005da2056e0d489f9317138833131ae2067cc5b4acd1ab8e82142c6a71e7cc600c3d5a2cbfc151ca253ba3f6aa5f0328fb45dfa912987bb28d4762248298b8
-EBUILD fastimport-0.9.11.ebuild 661 BLAKE2B 730b273b9efd35f89ea4c3a1faa8e93b92717bc3bc5cc81e7abe96c272375c3deffb8019736a474d61fbb0e694d88e0d9cfa0a8ea6bcc12c40b28a4ff8543d14 SHA512 9bd4136a726d692584413b1c1e9981130a621e7bef55c45332809a88e8c324adc189a21f333f1d896b4afa6d95e904b118a2c2bc77d9f09509d33958bfc4781e
+EBUILD fastimport-0.9.11.ebuild 657 BLAKE2B 1fbcb25dfc77ac39861b3e9034d52159d26d6ad83df77430510fc71e382be54c36eba837899626bb5cd5e66a5442ec606efad7a452832791c692f0b346e7f5b9 SHA512 e53dc04601eadb4633069b3c73c224c6effe9d5cf36f9b02446affc862ab050978c8cdeced16f18854dea4f14767cab403a0d5228e26c4ff64f3e7a8bdd3e7c0
 EBUILD fastimport-0.9.12.ebuild 509 BLAKE2B 2e0204de50794732413811b3c83fa3f87e0451d293eca6b7ac40f2917dd7e1bc6e806605f6f7c6b0a5f0b8de6369dd1d4ce552bffc2d67446941afa36754ddf6 SHA512 15476c4c274401c40800ea5ebb73a6cc4cd4383b1857d1b8cc09d2b9fe088ddc757e84f76de77dc9903299182beaa74cb22d762e12a77e6c82191b45b6b75845
-EBUILD fastimport-0.9.8-r1.ebuild 765 BLAKE2B fd9cc0c7818f32052e6079b085dfed2d07aca3e9826dadbe223437538f72d5ae871f99fabe3f01a4f18535ecb0025f91d3bb47ecf585f901de0848d9c00f5e65 SHA512 a690327a037774b8516c679174e6107a1c5116f5d976971e1b67e0d3db01268cfe8e7d0c274d767f23c3203f1e3f4604817627dad1e08d8abd1989d3f582e675
-EBUILD fastimport-0.9.9.ebuild 660 BLAKE2B 7f3d729234f0f89f0624e850f47980675e9dea498c5debd92fee7e5753970598846bd0be3f21a912fce3ac615b16a0d72859a223a8ea70c8ebc99e44c0aff943 SHA512 efdc0ac66850bb36f6685771c5fd39f656a1236505e9ec8fd6e4db5ed6a002f0b730559ac77b53597abb733995b20908283893ada4e47f34d631c94b5bf0637b
 MISC metadata.xml 509 BLAKE2B 23407a89645a4f2fbc0954f2f02eb60c74e8aaf2c7385d3d8c098e64fbf949b66f262378de964c5fae6d84db4e6e04d4000438c8cbf4d44fc629d74e2f524b42 SHA512 2242fe2ba9731aee3face6de5e7fe146ecab037b24825a7fd5ed26bbfcf4136ab50791ccaaea4bcac5a23711fdbcac30e2181a39c8d0a3d33cd7acfe56ea2f56
diff --git a/dev-python/fastimport/fastimport-0.9.11.ebuild b/dev-python/fastimport/fastimport-0.9.11.ebuild
index 9703a9d9986a..fc9af555a2c7 100644
--- a/dev-python/fastimport/fastimport-0.9.11.ebuild
+++ b/dev-python/fastimport/fastimport-0.9.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 python_test() {
 	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
diff --git a/dev-python/fastimport/fastimport-0.9.8-r1.ebuild b/dev-python/fastimport/fastimport-0.9.8-r1.ebuild
deleted file mode 100644
index b5d142043174..000000000000
--- a/dev-python/fastimport/fastimport-0.9.8-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
-inherit distutils-r1
-
-MY_PN="${PN#python-}"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="Library for parsing the fastimport VCS serialization format"
-HOMEPAGE="https://github.com/jelmer/python-fastimport"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-S="${WORKDIR}/${MY_P}"
-
-python_test() {
-	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite \
-		|| die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/fastimport/fastimport-0.9.9.ebuild b/dev-python/fastimport/fastimport-0.9.9.ebuild
deleted file mode 100644
index a000b6debba9..000000000000
--- a/dev-python/fastimport/fastimport-0.9.9.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Library for parsing the fastimport VCS serialization format"
-HOMEPAGE="https://github.com/jelmer/python-fastimport"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-python_test() {
-	"${EPYTHON}" -m unittest -v fastimport.tests.test_suite ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/findimports/Manifest b/dev-python/findimports/Manifest
index 34923ec41546..05f22299f9b8 100644
--- a/dev-python/findimports/Manifest
+++ b/dev-python/findimports/Manifest
@@ -1,5 +1,7 @@
 DIST findimports-1.5.2.gh.tar.gz 32211 BLAKE2B ea3110925085d466df7f95eaa06dce9e331ecba52c1772b76b05e51c633a8adc1ff91295db441049dab39129606e3927f69834376cc5fb864f5f3b62ac68bac2 SHA512 86432d29d180d4299ba789b69601722a6a15eed9badbf2f930e8867be06c64a2f1f8123ae182d7c6b73339287d04c2cdb4a18a31662ea72e86283ee165dc4d45
 DIST findimports-2.0.0.gh.tar.gz 33896 BLAKE2B e457d9e67102018cbd99f907afed33446fe11e3fc8fd9ec44459b2ed9fbe469d825b3f5fb1884b436d0576bcabacc787ef921bb5378e0389ecf789068d439e4a SHA512 c6f5b6aad6fe57f7625592c445286827c0eec74d513e85532c7e650a5f33021f7c204cb6857641a18874c640f0a79d468321875d13fb03ed645554488973294a
+DIST findimports-2.1.0.gh.tar.gz 34252 BLAKE2B 3433945b3c55f5607b5bd9e4694761b0d06c708d7873c8204d2b0bb14e15e0c60bf010e0dd30b336857891199d4ac5f1133a8ec6f3d4c37c1337f85674aa2704 SHA512 5a86d291e5888e15d612d06d4a94c0f08800a26d4ffdff4b485eb8cf1a10ed38883db2d79c6f73e6b2680cc1e5ffc51952c3405dfd4ff95716e0a2b2ac930a95
 EBUILD findimports-1.5.2.ebuild 470 BLAKE2B 23d93fc510c5654b09d52f9bbaf7316d4a9bd8bf6b3ea5c309068bb2a29b2ef48527ff6c3171476ef60b7c6ec6afdc781c2ea9ccf8b89140e140fd8d00b6c2c2 SHA512 ffb7fafdaa2830848083baea0a835f283f9da96d0bdd773c2290b963daaa9889a3c975201d7d9efdce407bbc37991df24281b91eacfa46200c66122cdfc85f05
 EBUILD findimports-2.0.0.ebuild 443 BLAKE2B 6ae8ac13810f5fd3c89f3158ab0ec4498dd80e11c103819f5c0048ad45092f30dcfaca9749e958f673c55588222866fb630b3106f4d788c67df66a5a8944752b SHA512 0c1e87e492c370090fc409f5434c49fbb91507b0f33baa710d7758ae0248a0423cb86d8442b282cd79c0ce72f919f91daac6b0d98e0c1af9e698ff01bd02d001
+EBUILD findimports-2.1.0.ebuild 443 BLAKE2B 6ae8ac13810f5fd3c89f3158ab0ec4498dd80e11c103819f5c0048ad45092f30dcfaca9749e958f673c55588222866fb630b3106f4d788c67df66a5a8944752b SHA512 0c1e87e492c370090fc409f5434c49fbb91507b0f33baa710d7758ae0248a0423cb86d8442b282cd79c0ce72f919f91daac6b0d98e0c1af9e698ff01bd02d001
 MISC metadata.xml 321 BLAKE2B 0ba0d2265364e7a059e43fc70702dfce93dbb85296594ebffd84d481ee2a6f10f49d983f1cdd86a85c20425cb8c0a5d74ca31b0b0ebb0f8cd2c663d29033ad00 SHA512 47a18d5032cd7b43e403d3c33fd30afcbca6b9fb45c2580381531bbdb8d227035278d86e689c42e927181f205c7123cd2c2e4935de1cf23d6fe03985d76b82c8
diff --git a/dev-python/findimports/findimports-2.1.0.ebuild b/dev-python/findimports/findimports-2.1.0.ebuild
new file mode 100644
index 000000000000..af4535f46433
--- /dev/null
+++ b/dev-python/findimports/findimports-2.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python module import analysis tool"
+HOMEPAGE="https://github.com/mgedmin/findimports"
+SRC_URI="
+	https://github.com/mgedmin/findimports/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests setup.py
diff --git a/dev-python/flake8/Manifest b/dev-python/flake8/Manifest
index d35c65c78f0d..fe072a6d8f47 100644
--- a/dev-python/flake8/Manifest
+++ b/dev-python/flake8/Manifest
@@ -1,9 +1,7 @@
 DIST flake8-3.8.4.tar.gz 163583 BLAKE2B 221234931365912adffec99c7c6761d2f35918222bee902ade4d8009d24f6918c66d23fc4b973fe653152cc6857b62ba859780b0d9de53fb91b7ea0379bee9d0 SHA512 51ed09beed50175573e6184b404431b3f89aa6594c40c70ed8288982fe12c2a68992e36d69c99013188f03555bf9fef1ba4f111f8e389cef1e1daa69b41ff5b0
-DIST flake8-3.9.0.tar.gz 164144 BLAKE2B e265a392445038b04ee2d8c24a763b4b1eebe9682295b70d14c07dbd739b34abbe5f76bc01dd31df7c666a106b62c5312c0522d6771c5649a91d2720a9d14467 SHA512 bfeaa13737f23318da8673c28f0f10463c0aad71a01fe70797321de3b9b7efbe7b5d0ee0664b8440db6b35d7f29f157848757d55fcac531a0c6da6371d681b65
 DIST flake8-3.9.1.tar.gz 164752 BLAKE2B 07f5049f8445bce87cee1509769e13f275f0e531b78a2769218233ac02a45ed7a8dc061f5253e4c136b47bfddfb574527d99dfff36d338516824167335f9a5fc SHA512 c592308fa32ae73982e6441624a989bdc213b639b0473f7342e75f11e3844282a713dce1f4649575d375766fa1d6b2a1840707109ac8d4672c0d2917f89a3d33
 DIST flake8-3.9.2.tar.gz 164777 BLAKE2B 1c991296a3e47e4c41f1196fcaf1e7ea059226dfb41657a52fc4f5a9023b54dba21dd99635398e12f37f52f6e498a0a1fb7d87aba0fe7098ebbdfb54dc5598b0 SHA512 618fe1b35070b24395e5d4da9fa1b1f6308abf6f85d8de71b8b553f84d70d9cd7d2a6f616fa1418db9a8b5ad3efab038f4e2d7c6020c0c1bdeb8157e666911fd
 EBUILD flake8-3.8.4.ebuild 1188 BLAKE2B 7b0c81113db70735cdb5757df5142aaf6a387133cf2a28c6c89cac1d316a3e632a0f3f39408d14e72a096a57040cb104940dda83b6c0c0c315e4cf7c7046f947 SHA512 a3b9b959da19ca3406c355108d3df65d7d17c7a33bf597e86d34b6fa51891fdff8cfb4831cdda6b36f78af19bc2045025205957bdf98c9484ed3d73968c01659
-EBUILD flake8-3.9.0.ebuild 1188 BLAKE2B 19dd0cf5f14bd6f3f9f16cfea0a8093dac3b31cfec0680b04163a38fddac86aa7e7b6bd69322c32809bd77daee78e0f0f36cca2998d3dba726434299aea63e38 SHA512 399079f81978dcf45f6025ba5b6e60f73a70641b239c05f19464b63ba3db58d3e2a3b2088a550706a3dfad04948b9818958a47bd55ee03af757aab49289bcb78
-EBUILD flake8-3.9.1.ebuild 1195 BLAKE2B 07d56ee894e891b073cb5d6e547f89d35771bad3b775abef2a2b27d91e4c56e2333ae45b1d59ed59a6b1d582c25177157e694bb4fe3c577cb57abb33a1e5944f SHA512 4e92a41c0d0de016ffd51b11d2174320e24ac67e5afd6f1f13abc67858db57c3ec8718fb525b4b235790dfbef5060b518d7f88b1f6aa4d545c27c8acb94751d1
+EBUILD flake8-3.9.1.ebuild 1188 BLAKE2B 19dd0cf5f14bd6f3f9f16cfea0a8093dac3b31cfec0680b04163a38fddac86aa7e7b6bd69322c32809bd77daee78e0f0f36cca2998d3dba726434299aea63e38 SHA512 399079f81978dcf45f6025ba5b6e60f73a70641b239c05f19464b63ba3db58d3e2a3b2088a550706a3dfad04948b9818958a47bd55ee03af757aab49289bcb78
 EBUILD flake8-3.9.2.ebuild 1161 BLAKE2B 2f1022758ab4b000c25f16ad88d69b808ff7377a1cd01d18452abc2bd88f2982b0cdaa984b17a6c460b3aa082a85f4fef015da51c0af94eba9b9243628096eff SHA512 6211ff30d05cd7d2ea5eb9328ff5242b7c0e37aed98b67d497809454886416f9fb8f59c763ddb534f17e92c33da9cfeb5eb49b979799cea9a63c7d24c7814775
 MISC metadata.xml 398 BLAKE2B 5a71d80adb94073494d12eb93722d21593a388b4f4cb47ad8ce1e8d053f24d1597c36743e720dabbc023f9318039b45b0b1ddc22d86455394b72789ab0c5e988 SHA512 823dbd0877b3ac042e5c51f260cb0f3d3490383a4975d7bf2267898cad7e3366a693be270d2eb9c8dcea8b7f66d1e6a3343b7a4be5c1b8f0fff8ffe514952e5a
diff --git a/dev-python/flake8/flake8-3.9.0.ebuild b/dev-python/flake8/flake8-3.9.0.ebuild
deleted file mode 100644
index af15bd9018f3..000000000000
--- a/dev-python/flake8/flake8-3.9.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="A wrapper around PyFlakes, pep8 & mccabe"
-HOMEPAGE="https://gitlab.com/pycqa/flake8 https://pypi.org/project/flake8/"
-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 ~s390 sparc x86 ~x64-macos"
-
-# requires.txt inc. mccabe however that creates a circular dep
-RDEPEND="
-	>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.8.0[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep 'dev-python/importlib_metadata[${PYTHON_USEDEP}]' pypy3 python3_{6,7})
-"
-PDEPEND="
-	>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
-	<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-"
-BDEPEND="${RDEPEND}
-	test? (
-		${PDEPEND}
-		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs/source dev-python/sphinx-prompt dev-python/sphinx_rtd_theme
-distutils_enable_tests --install pytest
diff --git a/dev-python/flake8/flake8-3.9.1.ebuild b/dev-python/flake8/flake8-3.9.1.ebuild
index 4b9b899ae918..af15bd9018f3 100644
--- a/dev-python/flake8/flake8-3.9.1.ebuild
+++ b/dev-python/flake8/flake8-3.9.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 # requires.txt inc. mccabe however that creates a circular dep
 RDEPEND="
diff --git a/dev-python/flask-login/Manifest b/dev-python/flask-login/Manifest
index e40308225b64..eef74a63775f 100644
--- a/dev-python/flask-login/Manifest
+++ b/dev-python/flask-login/Manifest
@@ -1,3 +1,3 @@
 DIST flask-login-0.5.0.tar.gz 44961 BLAKE2B a780a3ca1ced7f01cbc1f99e3d92f57819c73982a4098330be7b9b4dce88e5fac577d15b2989b99971c4b2f7e6c9f02a54aeab9f7fa1c101f409cbdcfa3c6942 SHA512 8ffecd2a512738f81ec3901ad30d356b1d63355268f7cf1b427e463d0a271a4623723255e139bbd0f88845d73fa4aab051418b5f68aef0b4576c30294f6207b3
-EBUILD flask-login-0.5.0.ebuild 944 BLAKE2B ef717bc604899ce54e382597d191781b2d30b470179f4e36a5efe6787aaa33b64037a279eb79ddd9a1c6e9a12a94710dbf359ca8491524c235aa8c29122734c2 SHA512 0fdd16bf0ff7b99403dc7bc43adc80d764c2f5d19ee8927d6194614bc9615b000799e09d0f3bd4c3b6a5911f60da58ce7e65f9bc35a8325a1358dc68635dce04
+EBUILD flask-login-0.5.0.ebuild 938 BLAKE2B 98355a765627fd33ed34af7bebee654140ed076b79e6c7614ba0c927dc014f6e0e764ee4a20b517b0417495d61285b02be1c8bcd9d31d41974a8daf5e28e61b4 SHA512 a8e401b4ac25170c90c54ae029c2a1169a05c443b39546b048ac5205437d09ec4a954e83ea63f72e4ac030b7a74470e2ebe0fd1b56a6f12c24c7fcc909317fc3
 MISC metadata.xml 403 BLAKE2B 6d3c96df8b0f4b87c4b08c55049c64e75d953228b7070f1fe9fce68f5c3cbc824d2d3d8430916678596102cf04b9493243a6c9d18d0c2e99eb2ffd24e63229b6 SHA512 151fcb723bb00f89e28147c2635a23834eac59fe2fccd250da22f386f897419071b31fde15f41289d48343803a7a6f1a14236c796c1772dca5f3a947c66a3d96
diff --git a/dev-python/flask-login/flask-login-0.5.0.ebuild b/dev-python/flask-login/flask-login-0.5.0.ebuild
index 238f22689b55..3891e82cb9d3 100644
--- a/dev-python/flask-login/flask-login-0.5.0.ebuild
+++ b/dev-python/flask-login/flask-login-0.5.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..9} )
 inherit distutils-r1
 
 DESCRIPTION="Login session support for Flask"
diff --git a/dev-python/flask-migrate/Manifest b/dev-python/flask-migrate/Manifest
index d46eb0e330d3..d72c2cad265e 100644
--- a/dev-python/flask-migrate/Manifest
+++ b/dev-python/flask-migrate/Manifest
@@ -1,3 +1,5 @@
 DIST Flask-Migrate-2.7.0.tar.gz 12627 BLAKE2B 2ad252ef6338bd45c2df4cf95ebaa137e43b5cce7780ccafcc9a0d972473ab230acae03ca14c1dd1f500ceb4c5fa1d0ed6a892bf7e2317c9dfd530a59c025da3 SHA512 9d5f5845c3483bc2ab1271431312331bbc45aeac5bd9464f99898e16e32d9ba124cb11f11fae59a29bf1d6e3dba5f2ca922ae32c2548a5d67d9286ca17d475ab
+DIST Flask-Migrate-3.0.0.tar.gz 11536 BLAKE2B 6bee958fc059f5980ed1b75309c7166940f6ecee536f83a7f7f219e0ce5acd4e62aecffcae5979d2da53b4b074c526c662b4c7c74be0548240f64501c0c2a27d SHA512 e13c3f96e68892b9319292998fcec43df253e01534d9d02a24fc54a2c2ef8fe87b5a01706842e9825819021d29a41f56f635963ed5157c6fc16bf9686212d107
 EBUILD flask-migrate-2.7.0.ebuild 767 BLAKE2B 7047b2c454f80ce023606feb9488cda75fba4e4fc2810035d60274b6df62dbabaf16b0da5d17d6a530a3c59f8c916f929897f78d4b8b4c2d5174b775970ae38b SHA512 e4a1e22eecdcc339a028c6c0ad079905c6a057c874fb299296c664d525798e5d525f9762c6cdb7741a964e244af052a392af2745a35b1a29f2335b7786a0b247
+EBUILD flask-migrate-3.0.0.ebuild 659 BLAKE2B 492ea38d7a8319a3c5df29fc46a46e3483dbea58d78e67ccb043c52db697cc1bd04daaa3c02f4558c1beec39a0d77d507540f76e2330abb1782d0fc98b8b4fa5 SHA512 7a21716fae2c16802b730cf35d34e58361d4d3ac53ed65df25ca76dd5f0d3765f453f3e44939b483f7d77646b531407ee45db73bd5529cca7dfd26c34c12493e
 MISC metadata.xml 340 BLAKE2B eceae6698b65718607ddd4d7e50807ffb6ad3731c778ebb13cb8bb936b9a79f29efe1b633687b981ba1e2905cade1f88667329db975b495c2f576e95d57e8fb2 SHA512 cc5d07905739843c9ecb867388f9be5b459306665e6fccdb236b715bedd0c59b2f89969a7437b8c72a5963254d55000de57284de2ec9bde75b3c46b07c575225
diff --git a/dev-python/flask-migrate/flask-migrate-3.0.0.ebuild b/dev-python/flask-migrate/flask-migrate-3.0.0.ebuild
new file mode 100644
index 000000000000..815f8aa2a278
--- /dev/null
+++ b/dev-python/flask-migrate/flask-migrate-3.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_PN="Flask-Migrate"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="SQLAlchemy database migrations for Flask applications using Alembic"
+HOMEPAGE="https://pypi.org/project/Flask-Migrate/"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/alembic-0.7[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.9[${PYTHON_USEDEP}]
+	>=dev-python/flask-sqlalchemy-1.0[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
diff --git a/dev-python/flask-restful/Manifest b/dev-python/flask-restful/Manifest
index ed37ba62b05f..33af11dfa902 100644
--- a/dev-python/flask-restful/Manifest
+++ b/dev-python/flask-restful/Manifest
@@ -1,4 +1,6 @@
 AUX flask-restful-0.3.8-werkzeug.patch 1517 BLAKE2B fa895690ca771f1b4431c62baec0577554fca082418c2421eb8012be2e234699eab54f2690d237dbd490f536eae5fe0fdfd8fedad16fc60bd92351f66c93a7a4 SHA512 96db20a0850f37ebb90fad0964448783c3af8b9b8128709fc52d509f9b1edad72455330a09f81b4b766eea7b88f3b79fb01e112f1684be7776a8b3a78ab90a19
 DIST flask-restful-0.3.8.tar.gz 114588 BLAKE2B a18eac613300102bb5a5ca78cea1e6f81f3de21d8bd2e6c72f2f1a559e8b4228175cc7d372b68f131267cd8bc759e354e5782e527d1e992579210348cd2b78dd SHA512 15172114fcedc2f4286cf5f583d95e42c8c8ce6553f9a44e57124f2b1417bf9f094dcb5154a6933ebebc8022f39d4d7969d29d38576111f9d5b45f630b36a66c
+DIST flask-restful-0.3.9.gh.tar.gz 118195 BLAKE2B a4f18c3faf06a7c9b628657aafbab4b9492793d9a61ab60a3e4d8112e0fb5e120cff2f2dae87915e44915838572ae0ca1737025ad5f906c2a953afc4b1f49c6f SHA512 34bea8ed6e9de3ad1c2ca63e7af67ed2a175f84c433b08ff643f91d88feda0e3c1c3967deb2fe5ad308b05f373b10c08245edf65ed97a7c5a3683aa900e9edf2
 EBUILD flask-restful-0.3.8.ebuild 1006 BLAKE2B 952156256c65bfe2b4962d0df8df914e27026a92ab1a178a760a9738e59885e1fadc531883ec29f36ff88a552f7053345b0997a9fe8073c69ae0b6b4c9eb46e0 SHA512 bcbad3a388eab456d78f6ff3ea985a8c1009cf07db5ea9376c49b751a943dbac248ac4a6f151b8a5838d5ca282e7a9012475d3b3951a55bdd8c05a08e53519dc
+EBUILD flask-restful-0.3.9.ebuild 952 BLAKE2B bf8b1f6c96677f443e2bd5499d3505ff55bc7d2d503702b866b18cbf3ea844dcc09e7f1b018052eebcce1b88f09bb076c2a5353fff2ada018a6ebe8486dcbff1 SHA512 a49e0792b560799e6a719d63403095c5ed82563a4ea1316382cbf3f6a61dc3be7398c5b57ca04b5c09a743ab4c7b82712000532d6ac4be3965abc55472dccdb2
 MISC metadata.xml 407 BLAKE2B 32075e72b358faf256d1f2b0a650eb7b1d966dcb4376a4394933545b0b96d77d633bdcd8cdc6db044c825fdc237b9b4674d38d3d90027f9cb758325121dcba6d SHA512 2b7f74ec3648a92e7740b22a8ee5f367d61553d37fbc854a90cf2774a383e1fdc3382217c7811d21f8a0a98dd363ebefd873a8a8286cbb8e0f781382584ddda5
diff --git a/dev-python/flask-restful/flask-restful-0.3.9.ebuild b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
new file mode 100644
index 000000000000..858cb0ca86fc
--- /dev/null
+++ b/dev-python/flask-restful/flask-restful-0.3.9.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Simple framework for creating REST APIs"
+HOMEPAGE="
+	https://flask-restful.readthedocs.io/en/latest/
+	https://github.com/flask-restful/flask-restful/"
+SRC_URI="
+	https://github.com/flask-restful/${PN}/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/aniso8601-0.82[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.8[${PYTHON_USEDEP}]
+	>=dev-python/six-1.3.0[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs
+distutils_enable_tests nose
+
+python_install_all() {
+	use examples && dodoc -r examples
+	local DOCS=( AUTHORS.md CHANGES.md CONTRIBUTING.md README.md )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index b6d7d4d9b6fc..dad54cdb30ad 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -1,4 +1,8 @@
 DIST Flask-1.1.2.tar.gz 637516 BLAKE2B 90dffbb8faa48489d1c71ff2a064d41e97d2103c07532fd5b252dbe0b32e4babb815e31f0ceae201a66cead645b68149d13d4bb39a0df1b27b4002e613920493 SHA512 9feb6a9a8f34fadbea508d465f73c24b1d81b3f66243804dc3904d198c2fd78e2e1bef94df6a4940a7eec6b9b54abea06557a87de8b27b0a9497d18b3e071384
+DIST Flask-1.1.4.tar.gz 635920 BLAKE2B c1f19e7449177ecf6e901d5932ad25cbe866ff53b9323f717541922b1ea5b10203ff07630fcf3eabaedd9b6a24ef031ad2aaa2e2f759925363bebfa7e5d967da SHA512 6f427a1264921b8560446afacee2757d16de0dc22d6ed249b7bc5d6f50f3af50c89b79ce900d75b41af4befc53910f2b532c2e280de42837e2133acb6b1bd80d
+DIST Flask-2.0.0.tar.gz 624458 BLAKE2B 82f552cbe714ea4fd64b56f88ee747c292659181139eae5fe0e496457d1f33cb5d7b464ed5250b6087c859691d89cb72a885d8640855dd9dfe7ecc6083bb0c36 SHA512 3fc66aa1568f7dce67bb70b0113401b7535dda32e33ac784a42f08fa21e08b055214218fac06dc6fb4b8f975b2a91321a6c97203f6568efc6bfbbb8d4ef9ddc3
 EBUILD flask-1.1.2-r1.ebuild 1336 BLAKE2B 1d9cd737bd40369f5d8e7372376d69546d1979aaecf38bd22980a86e7b9f4027f42645d68aba5bee2ce099f37064bfd40495ccc6728fb35ad2d92f3ffa45e7f0 SHA512 f4c81fb1f96574a06a20a1d8ae7758f598b07d9957bd6c82faffe1415344ca5ddd482cea55dc54a83cc86990cd6afb1fbae25f93282e9efb0d238fad17814cad
-EBUILD flask-9999.ebuild 1296 BLAKE2B 78ee07fe3a1bbaed5da574ba3db1f735908aa83b0eeafc47b1d1683869a3756660134c6f6129397df5b27c7156221aafcb0bf414b76a09c8ac3121e86597782f SHA512 86fa9d9bfff0b5ecd2d3c9cb71ea8c4b4c320cd3dcd20da43a3afa9d1b69c601cbf980ff31738e2e30c0cba1559afec754fdb9af06255a80bbb54054a4531f35
+EBUILD flask-1.1.4.ebuild 1338 BLAKE2B 5058ffde76eb4b3066d2dab05b5d4d8e491519b89f0da39b45a3b5c7fc942246f541b183def35f6c675becfad2f2d8fb8594fd6569fcb992cc3dd0fd8e56098f SHA512 007beb976ed79d475841d321dd6fdf849a64acb1bf7409aab92f4839e621c9ec079c037bb9085a7127728e57884df1a0a35c309a72cffc184706252f24ad8d92
+EBUILD flask-2.0.0-r1.ebuild 1124 BLAKE2B cd48701383758d8bea9805e5784f9bc82b296092c067b6e736d876685d3c63f615a5beca9ddc9477fd2c62978251689dfb60ccb7bd93f898e56e729ec97cd755 SHA512 34ebca9691e9c89c70a7c6f3e4a70633ab0824a7b11029729ac43b7a240743c365ff5e139ad7965c84ad08663019d5c3c687bd4d2982fec64bafb14fed80b5cd
+EBUILD flask-9999.ebuild 1124 BLAKE2B cd48701383758d8bea9805e5784f9bc82b296092c067b6e736d876685d3c63f615a5beca9ddc9477fd2c62978251689dfb60ccb7bd93f898e56e729ec97cd755 SHA512 34ebca9691e9c89c70a7c6f3e4a70633ab0824a7b11029729ac43b7a240743c365ff5e139ad7965c84ad08663019d5c3c687bd4d2982fec64bafb14fed80b5cd
 MISC metadata.xml 385 BLAKE2B 0aa1fc56ae29e91457344d7ca4f8a26506d46d22b71ac7363fb443ba7fbcad7974f86b898dd7b2e4cc2bbbc5d58fe1a1904a077e5c7b959ba2e1761f1561769f SHA512 223a1a9459b462c6dfbfc2fa0d6932e1f9457e86eb9a70e96c5182a3b4f898a121aa13dc9425811b8fcabc6dca8ba1d715e5aa221453e235a5b5ee2c25cc02fc
diff --git a/dev-python/flask/flask-1.1.4.ebuild b/dev-python/flask/flask-1.1.4.ebuild
new file mode 100644
index 000000000000..8f8e828fbeef
--- /dev/null
+++ b/dev-python/flask/flask-1.1.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="<dev-python/click-8[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	<dev-python/itsdangerous-2[${PYTHON_USEDEP}]
+	<dev-python/jinja-3[${PYTHON_USEDEP}]
+	<dev-python/werkzeug-2[${PYTHON_USEDEP}]"
+DEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+
+python_test() {
+	distutils_install_for_testing
+	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
+		pytest -vv -p no:httpbin || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-2.0.0-r1.ebuild b/dev-python/flask/flask-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..aa5080465c2d
--- /dev/null
+++ b/dev-python/flask/flask-2.0.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+HOMEPAGE="https://github.com/pallets/flask/"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+	S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
+	dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:httpbin
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index 586061db9361..aa5080465c2d 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-9999.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
@@ -16,33 +15,33 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
+IUSE="examples"
 
-RDEPEND="dev-python/click[${PYTHON_USEDEP}]
+RDEPEND="
+	>=dev-python/click-7.1.2[${PYTHON_USEDEP}]
 	dev-python/blinker[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.10[${PYTHON_USEDEP}]
-	>=dev-python/werkzeug-0.15[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+	>=dev-python/itsdangerous-2.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-2.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		>=dev-python/asgiref-3.2[${PYTHON_USEDEP}]
+	)"
 
 distutils_enable_sphinx docs
+distutils_enable_tests pytest
 
 python_test() {
-	PYTHONPATH=${S}/examples/flaskr:${S}/examples/minitwit${PYTHONPATH:+:${PYTHONPATH}} \
-		pytest -vv -p no:httpbin || die "Testing failed with ${EPYTHON}"
+	epytest -p no:httpbin
 }
 
 python_install_all() {
 	use examples && dodoc -r examples
-
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index 24a16b4ead67..8036e10c51c7 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,5 +1,11 @@
 DIST fonttools-4.22.0.tar.gz 2544600 BLAKE2B 685da467c40fc7cffe2b33b08da53e5bd148c5190efdc8d08e2c66ef06e67b5e26ec5fa090334b9ef427b1a005c6386b0f78b978d376c7daee7f4d540faa21c7 SHA512 06db054ce488d0291f876b05b5dd09a772a702f1d45b97c1ba46d02e01fe59f7c63e268fff958baa4076c1ce72f450384e473263250c1617791d78c0e311710d
 DIST fonttools-4.22.1.tar.gz 2544433 BLAKE2B 711737f696bd3a25f0c0eec2c1fb80c38dcab81d974c7f5c9d9e644aa3850dbb08502ba14111397b42615fc5287f9af8aa4d7b83e7fe9f23ae4d080f2864189d SHA512 2f38eda41ce913bdd6e62f495a215c38ed9c1fa7df87f1ecc0964b3065498e39c55e030899a5561321b16f995a705449c958244ecca2aaef492c49066db0ef93
+DIST fonttools-4.23.1.tar.gz 2550938 BLAKE2B df592a9a9e54b4b542bb2e5dc0ea7d56f25cbe7b5cf38cb3e38e5f6feee1a8befbebab2b2c73ae814234a26440bcd3e6869335037c962d482694b4e35cd5dd78 SHA512 ef7faccfabdd66655195ad4d1d09599e302dcc393ff88cf005732930cec62df3c05e06795fafe7cd1ef89671faef2bf642f94e6ab33ebdacaa388c254a71792b
+DIST fonttools-4.24.0.tar.gz 2551274 BLAKE2B d893d07729ee680c77ff3f2d369e1c77333e5a706ee5696e0843b19cfd419084d3278e35bf9f4cc3accc62bdc168d2e25cb0bacaf6b8adea17301e47cc185c34 SHA512 be80610e9c61a6f49b66b81d2e0ee50ed07e8ff8f932e3ccaf59869cce347088aa739883c6bc599dc47e196aecb69a648033dd485da3d18c84901c02f0aea92c
+DIST fonttools-4.24.3.tar.gz 2554695 BLAKE2B 8ef77e9c00a074a3d9ba92a976f5b22a20b24e89bb51e46e72ce88b6d09e5b9b77ac2b2d67aaa8988bbc34f81a17a52798bc2adb6b552ca68d36c29136a9ec21 SHA512 394d0c33432288670841d246167ca0c5af7c5dc843d8601ff7e681f8a81dba02023a1314053fb591256145b9063b8b6f9f0f13d5c319de926ec96f4f15dbe4ff
 EBUILD fonttools-4.22.0.ebuild 1308 BLAKE2B 8948cbbdd2891530e5e79f05e0ff752de0278afc6659c8cbb24bfa85a6fb35c1a4869cd84642acea99d1d612c31ac8fb2ec84626c497b8d735c4fdb7edec113d SHA512 33a7e0bf787ac86abae46dbbf93f58df730076ed0c2d7b3cd0c9645d6bbbd7a019c424064a0b6293a179f36d906cfc1f59d139e33c850e8ff43171ad5b460f52
 EBUILD fonttools-4.22.1.ebuild 1316 BLAKE2B 9d44143f4439f4f8c74ae55dc801945a7aad1c7d1e30e3826b488a14dfbe761ebb63501f4a92545a1eb2b8fb6bd37ad07cc494aeb73fb72169798bba63139060 SHA512 895e3d29de74df1a1782fcc9f7b15d3991e14e69b6066b249839ef86eff3ed4853faf48d9626c63fc3fad5c81c1c4946c2cc899ce1882dae8fbab60d1aa46687
+EBUILD fonttools-4.23.1.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
+EBUILD fonttools-4.24.0.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
+EBUILD fonttools-4.24.3.ebuild 1283 BLAKE2B b992a7ff5e4b3e659959dcadf0a3efda6e899f0a2aa1cbf229d14ae7ec64d54bd089477aa65d4e0a7891b01bcee7491bd4d2dc1312cfa7b18d5f2746bd6694b5 SHA512 62d6b43bcf6cc7d154955a79efc9df2e3fbf6fb95d47415c6e3f61170bd61e839b9599450c58d14ab93210de09e798a3747d0aa6ab68096ccbb5cfe465daf832
 MISC metadata.xml 395 BLAKE2B f31a990237241b04b7e3222093c878d57d990ee97466160947d4c85a5798543a76c480b01a8f1da13057773b3b6b6dc270d039a4211d7d5cde8991bfa9b7632c SHA512 6c676733e48ceab4d6dcc56359c62d610728e06e7483648d410cbb0826c603521823a0f73b6d832b0f90b3e2f6254a92195e751867e16fbdef8335bbb0bec430
diff --git a/dev-python/fonttools/fonttools-4.23.1.ebuild b/dev-python/fonttools/fonttools-4.23.1.ebuild
new file mode 100644
index 000000000000..95ced12ecf0d
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.23.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/fonttools/fonttools-4.24.0.ebuild b/dev-python/fonttools/fonttools-4.24.0.ebuild
new file mode 100644
index 000000000000..95ced12ecf0d
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.24.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/fonttools/fonttools-4.24.3.ebuild b/dev-python/fonttools/fonttools-4.24.3.ebuild
new file mode 100644
index 000000000000..95ced12ecf0d
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.24.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="xml(+)"
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Library for manipulating TrueType, OpenType, AFM and Type1 fonts"
+HOMEPAGE="https://github.com/fonttools/fonttools/"
+SRC_URI="https://github.com/fonttools/fonttools/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	test? (
+		>=dev-python/fs-2.4.9[${PYTHON_USEDEP}]
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		app-arch/zopfli
+	)"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# When dev-python/pytest-shutil is installed, we get weird import errors.
+	# This is due to incomplete nesting in the Tests/ tree:
+	#
+	#   Tests/feaLib/__init__.py
+	#   Tests/ufoLib/__init__.py
+	#   Tests/svgLib/path/__init__.py
+	#   Tests/otlLib/__init__.py
+	#   Tests/varLib/__init__.py
+	#
+	# This tree requires an __init__.py in Tests/svgLib/ too, bug #701148.
+	touch Tests/svgLib/__init__.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# virtualx used when matplotlib is installed causing plot module tests to run
+	virtx epytest Tests fontTools
+}
diff --git a/dev-python/fsspec/Manifest b/dev-python/fsspec/Manifest
index 6bafaf13ed5c..d5ad3436654f 100644
--- a/dev-python/fsspec/Manifest
+++ b/dev-python/fsspec/Manifest
@@ -1,3 +1,5 @@
 DIST filesystem_spec-2021.04.0.tar.gz 288179 BLAKE2B 896982345533fef9593f393209202e0a90473e9826ced9d69854dca20c66c64b85e1b1c44413dda718cdd1af7f41ac821b4d67b600536b32a873a4f73ab32801 SHA512 6806d6fbae89b514955a309346f19b2d199db10aecece728d117798368c311e3fbb38161fd5a54ea4a60ee7e656d2e50fdf8c4444ec3d6bdd761229b4a6341f2
+DIST filesystem_spec-2021.05.0.tar.gz 292796 BLAKE2B 5d56d860ced1a72c27d2031b7d257a4bcbd52f6b2fed5275fbcbf7088375fde26652f0a003e919ebd3948d5e9833d802304234282ca858a7a2a19bfa11f66aa8 SHA512 7c27a1ad4e21efdcc0f31f91a9929e4c09db7b9421e7bf8d2f485e961f6887a4a5c083f38f8d7b09005a4cf11f55c93cce4617e3dc6c2b241ed20f7847ad711e
 EBUILD fsspec-2021.04.0.ebuild 1194 BLAKE2B 0fafb3ea6563b4cab99f604ebe85a5515556a1018f850f0c154feb87f7e3aa7e65a304b4c4d9c244feb36563051706280a09de761a9782f1bfb9db3f2a150b43 SHA512 8b7cfc0266f9ff8a2f60b7853b356b357d98714e43f7074940ff57d2abf7d1e2636bf6498bb33a6ca2b59b9a2d3162471033ef97b9a05f9d5f390c94cd095fef
+EBUILD fsspec-2021.05.0.ebuild 1196 BLAKE2B 82cfbe3e6835ce01aff5eb944a83f70746590d2d72d793874d7997ef3ca8afb67ad24c934699e4641bb496f9709f55c00831f8d6dbba370d0cc9894a01450f29 SHA512 536f1540703e35e123c69db1183da475f2e67a142e47b0084d197e5dd84f434a5b829ad84a935f9963c661896183d74444e1181890a10f73515cac62e4009b5d
 MISC metadata.xml 373 BLAKE2B 8932a3ec06759eeef7bb91a181e07ceeef606995e944a6396d21ee6f9b26a7958e9c40f9f54ae27ebdfb9c7974b1ad79963213bb7a5b9bbb282cf35967a1ffe9 SHA512 42e44963570b3b003550ef6f60d1557866a72f362a3d98ca2a7900377422921134e4c8b7bcb6af3ea8bc061b433e4aba96de4fa5643a1f424cc64665a7efd654
diff --git a/dev-python/fsspec/fsspec-2021.05.0.ebuild b/dev-python/fsspec/fsspec-2021.05.0.ebuild
new file mode 100644
index 000000000000..4032b21e0f99
--- /dev/null
+++ b/dev-python/fsspec/fsspec-2021.05.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_P=filesystem_spec-${PV}
+
+DESCRIPTION="A specification that python filesystems should adhere to"
+HOMEPAGE="https://github.com/intake/filesystem_spec/
+	https://pypi.org/project/fsspec/"
+SRC_URI="
+	https://github.com/intake/filesystem_spec/archive/${PV}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+BDEPEND="
+	dev-python/versioneer[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	git config --global user.email "you@example.com" || die
+	git config --global user.name "Your Name" || die
+	distutils-r1_src_test
+}
+
+python_test() {
+	# sftp and smb require server started via docker
+	epytest \
+		--deselect fsspec/tests/test_spec.py::test_find \
+		--ignore fsspec/implementations/tests/test_dbfs.py \
+		--ignore fsspec/implementations/tests/test_sftp.py \
+		--ignore fsspec/implementations/tests/test_smb.py
+}
diff --git a/dev-python/gitdb/Manifest b/dev-python/gitdb/Manifest
index 7d1a9e14ef24..e0ce0b4eda6d 100644
--- a/dev-python/gitdb/Manifest
+++ b/dev-python/gitdb/Manifest
@@ -1,3 +1,3 @@
 DIST gitdb-4.0.7.tar.gz 394664 BLAKE2B 4a4586ac276c719110e7ad9ddccca8c0f45cca42f6740d990a974b043a749148088c495ad1939794382ff4094afa712cfa7f17619f371423f1b7a10e65ce72d2 SHA512 db63a613ee59249a3fccbd09fc0eca5747b166180bb5885737f849e339e81dfacd04f65e438fef241cf013cde33fe8c99a569c1599b2b5defd37b50e87dbdb0a
-EBUILD gitdb-4.0.7.ebuild 1354 BLAKE2B f8d9d018ae2dcbcd902c608cfbff10e3d1033e54a48e375e374bc15a2b97514ff2d5c2cb8a3d01a29687a663d36fd9a724aedd958407589910a865aa2772bbcd SHA512 55c9b2ca5988f2c7a1f71aa947e69e7e073635ff54c6d0ede3befef7f8fefd0f91ed0dd6cd81aa8f16631439fe8f337750c09b7fbf5e00121d1c9bf8d7974a83
+EBUILD gitdb-4.0.7.ebuild 1355 BLAKE2B f65247f47ee43c0358c543291657b27e42d6cdb0849203ece90b5c519135c1b359d1e95d610199c2e11423035956f65bb1c168a1e3c85c3f2e9ec085c8996a37 SHA512 01a2055c408de9cc7e447b04c43767b3e63e1a6047b91a8664c3e60d398431926ae686a6d5b691d70512f7a42dd409faecc598795943cf661949682d29a832dc
 MISC metadata.xml 411 BLAKE2B 270925cade7731451404999603981322c15224b7a6a2580c957af06cf8dbc940adeb40a63452ae6ce11f725a01af58ff56e85c4ba63a92e2027f4c13c81e1689 SHA512 361528c0a12026a9bef55a22d172ca8fbb0f82389ad2e867a2d8bcf65913cff9a2d510121f6b54be00a1d8ccb2bca471e2c3579054d3746fcedae910d4f3b361
diff --git a/dev-python/gitdb/gitdb-4.0.7.ebuild b/dev-python/gitdb/gitdb-4.0.7.ebuild
index c8eb0eab45fb..27d30441f9a7 100644
--- a/dev-python/gitdb/gitdb-4.0.7.ebuild
+++ b/dev-python/gitdb/gitdb-4.0.7.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/gmpy/Manifest b/dev-python/gmpy/Manifest
index 16dc5d3d2e79..765851b09522 100644
--- a/dev-python/gmpy/Manifest
+++ b/dev-python/gmpy/Manifest
@@ -1,5 +1,10 @@
 AUX gmpy-2.0.8-fix-mpir-types.patch 636 BLAKE2B 3f9a73390cab39ac02c9cdbf6c78381a14e861b15c4e0194e9727b3e801817111b6ece399a2479c0880f84d542816b2e388ad15e8f9786e2ab63b5e893f31cc1 SHA512 701e985b1d8f1d3ed0efa48a9ee225bfb9a06f5a19f53a8a1ec6c525e74fb2b6fd006f1bba28188926f77faec6cbc456985b810b7c774aef1699a0ab2c07896d
 AUX gmpy-2.0.8-test-exit-status.patch 1482 BLAKE2B 5fce4170ce1993cf7e44077b81ecf45b4c8d3b779cb8744c6deef6444cc728a4cf7831aac0cc31a0b6315518bead442ce232e0052e72229f397691c21afb5890 SHA512 bbb708c0323167cf86c60ef6d398a588adc9a7ccc96eb1cee9d36c38b34c69c896a7df99f50611b29ba6ccb79f77408d274074bd4878e86b8f3bfc38675b74d6
+AUX gmpy-2.1.0_beta5-failed-tests.patch 4756 BLAKE2B 1258a1b0dd5d0a86ffde979c8766e4829d35ef91c9c829c2d2b433ac5811d45995bdf089b3dc2dc6b58d9b3a10f0283b22d52551b06da4f7709d4f78c8366240 SHA512 a4478447e966292db24e208b763ac11463e7684372e7df5d2115e5908ca6fd88718005c3f8169dc0171e22160d10d3dac034106f50680bc7e1d86d96cc3bde11
+AUX gmpy-2.1.0_beta5-pyhash-nan.patch 379 BLAKE2B 2703f8fc891bb2742d8159834ae252014071745f5097b54990393ca560b804d1cf21b540efd71fea7d4371bb76f040d76596bc73f12f998554b58ae1a77c0051 SHA512 133d1c825f0af2108131ea9e702b5499e1970eef027fc63ee6516fea6cbe5a684aca2a3b8c09c20e3cbdbad87478d692d664bde75a04bae58feed63b8148e6bb
+AUX gmpy-2.1.0_beta5-test-input.patch 436 BLAKE2B c0cea44d17b1a44470c13893500dbad327b9f1b694eeeb65a62a307dadfcae06ad57450aeddfd410432a04d7d877dc14c330c0174c49784c676d4079b628f9ea SHA512 9647d199be4017495e1525223e6b40bef50655bc86ce348fd0db78ea56b832795925848ad6897c7c83f7ae92e0a683105a16ad8fcb312c5676005ddb6d35c7dc
 DIST gmpy2-2.0.8.zip 280551 BLAKE2B b73c48b739ae6972231672ad28598c09e00db6348cd281d190c6dfcf49b0e977563baabe84825658d78bf1e2ac4927ad1882787b6d4efd19f28a4f7fd6a061b4 SHA512 090f449641f378c73eb166831b1d956c6cee3da83e42fde8741f18aa0fa687e37927fc3b045d4b35e3a3b75570e6b1074150d8bc29d16119ab5c717bcfcf9fb4
+DIST gmpy2-2.1.0b5.tar.gz 264742 BLAKE2B 1dd6dc66f9ec8cb2738f449112aa44feb40ba983f6da5f7a0760016e79ffed19037d77d47c0c0b816f9088725207e50ba3bd423349ed4c744ff03059c4c6a19a SHA512 7dc647642d7b61af77258881a7b91ab967dd11a86ba88ff5b7fd41cd4c999d2bb4cfe586511e79cc5f21f0f00d0823bbd2620d69df051c8cead15090423a657a
 EBUILD gmpy-2.0.8-r2.ebuild 1716 BLAKE2B 85e9237fcdedc534b93243109f28754577f34328602317fb6a7d599f33839c5c3b019973e2a73974211d6e96e93653942de09946031ad87d996f66c90c1fc0d4 SHA512 195083630391eed0b1b392116d6a34722bbf4a1e40dc94448a0683d3b149a3f2f65937a95456879ce961fde2ee9da39370392599af5112f3ff913000369d6b50
+EBUILD gmpy-2.1.0_beta5.ebuild 1469 BLAKE2B 2257bc9017aef226eb904ecbb7dc7b56bf33d199566e68df2dca5912f57ead6069ae391fdc8aa481c7f636b9959859ff4da737389d9f78270a825ff19e106abe SHA512 fc9ad98b190d044e769c4ba0f96026f43502f32cd5e67523aa4fcfd1ce1ebb2d04bddb528ba0d66e68e8a881042a07f8023905beefc5d3bddb85c8ad41f2f07d
 MISC metadata.xml 795 BLAKE2B df987c466b2666db915c405dea507c17f90181c2e2948885292a6de44ba0c4bec640fe25bea3b8b8105d035c3ff999750b747cfd7f4caaab561f459056823eb5 SHA512 e7f8324cdacceed22f28e27a224668f59955fb5a639d26376da037b0d21437ef57708c7c325e00c771df9e11050be8dc423a3d4b631599da2cc1ef3f97cf3795
diff --git a/dev-python/gmpy/files/gmpy-2.1.0_beta5-failed-tests.patch b/dev-python/gmpy/files/gmpy-2.1.0_beta5-failed-tests.patch
new file mode 100644
index 000000000000..38a98579409a
--- /dev/null
+++ b/dev-python/gmpy/files/gmpy-2.1.0_beta5-failed-tests.patch
@@ -0,0 +1,132 @@
+diff --git a/src/gmpy2_mpz.c b/src/gmpy2_mpz.c
+index e5087fa..66a297a 100644
+--- a/src/gmpy2_mpz.c
++++ b/src/gmpy2_mpz.c
+@@ -69,7 +69,7 @@ static PyNumberMethods GMPy_MPZ_number_methods =
+     (binaryfunc) GMPy_MPZ_ISub_Slot,       /* nb_inplace_subtract     */
+     (binaryfunc) GMPy_MPZ_IMul_Slot,       /* nb_inplace_multiply     */
+     (binaryfunc) GMPy_MPZ_IRem_Slot,       /* nb_inplace_remainder    */
+-    (ternaryfunc) GMPy_MPZ_IPow_Slot,      /* nb_inplace_power        */
++    0,      /* nb_inplace_power        */
+     (binaryfunc) GMPy_MPZ_ILshift_Slot,    /* nb_inplace_lshift       */
+     (binaryfunc) GMPy_MPZ_IRshift_Slot,    /* nb_inplace_rshift       */
+         0,                                 /* nb_inplace_and          */
+@@ -113,7 +113,7 @@ static PyNumberMethods GMPy_MPZ_number_methods =
+     (binaryfunc) GMPy_MPZ_IMul_Slot,       /* nb_inplace_multiply     */
+         0,                                 /* nb_inplace_divide       */
+     (binaryfunc) GMPy_MPZ_IRem_Slot,       /* nb_inplace_remainder    */
+-    (ternaryfunc) GMPy_MPZ_IPow_Slot,      /* nb_inplace_power        */
++    0,      /* nb_inplace_power        */
+     (binaryfunc) GMPy_MPZ_ILshift_Slot,    /* nb_inplace_lshift       */
+     (binaryfunc) GMPy_MPZ_IRshift_Slot,    /* nb_inplace_rshift       */
+         0,                                 /* nb_inplace_and          */
+@@ -229,4 +229,3 @@ static PyTypeObject MPZ_Type =
+     GMPy_MPZ_NewInit,                       /* tp_new           */
+         0,                                  /* tp_free          */
+ };
+-
+diff --git a/src/gmpy2_pow.c b/src/gmpy2_pow.c
+index ddcb43a..cf96470 100644
+--- a/src/gmpy2_pow.c
++++ b/src/gmpy2_pow.c
+@@ -98,8 +98,11 @@ GMPy_Integer_Pow(PyObject *b, PyObject *e, PyObject *m, CTXT_Object *context)
+         unsigned long el;
+ 
+         if (mpz_sgn(tempe->z) < 0) {
+-            VALUE_ERROR("pow() exponent cannot be negative");
+-            goto err;
++            Py_DECREF((PyObject*)result);
++            Py_DECREF((PyObject*)tempb);
++            Py_DECREF((PyObject*)tempe);
++
++            return GMPy_Real_Pow(b, e, m, context);
+         }
+ 
+         /* Catch -1, 0, 1 getting raised to large exponents. */
+diff --git a/src/gmpy2_xmpz_inplace.c b/src/gmpy2_xmpz_inplace.c
+index bbcd977..e5bbf09 100644
+--- a/src/gmpy2_xmpz_inplace.c
++++ b/src/gmpy2_xmpz_inplace.c
+@@ -271,14 +271,14 @@ GMPy_XMPZ_IPow_Slot(PyObject *self, PyObject *other, PyObject *mod)
+     mp_bitcnt_t exp;
+ 
+     exp = mp_bitcnt_t_From_Integer(other);
+-    if (exp == (mp_bitcnt_t)(-1) && PyErr_Occurred()) {
+-        PyErr_Clear();
+-        Py_RETURN_NOTIMPLEMENTED;
+-    }
++    if (exp == (mp_bitcnt_t)(-1) && PyErr_Occurred())
++        return NULL;
+ 
+     mpz_pow_ui(MPZ(self), MPZ(self), exp);
+     Py_INCREF((PyObject*)self);
+     return (PyObject*)self;
++
++    Py_RETURN_NOTIMPLEMENTED;
+ }
+ 
+ /* Inplace xmpz and.
+@@ -346,4 +346,3 @@ GMPy_XMPZ_IIor_Slot(PyObject *self, PyObject *other)
+ 
+     Py_RETURN_NOTIMPLEMENTED;
+ }
+-
+diff --git a/test/test_gmpy2_mpz_inplace.txt b/test/test_gmpy2_mpz_inplace.txt
+index e7a8b96..147118c 100644
+--- a/test/test_gmpy2_mpz_inplace.txt
++++ b/test/test_gmpy2_mpz_inplace.txt
+@@ -147,18 +147,16 @@ Test ipow operator
+ mpz(25)
+ >>> x **= xmpz(2); x
+ mpz(625)
+->>> x **= -2
+-Traceback (most recent call last):
+-  File "<stdin>", line 1, in <module>
+-TypeError: unsupported operand type(s) for ** or pow(): 'mpz' and 'int'
++>>> x **= -2; x
++mpfr('2.5600000000000001e-06')
++>>> x = mpz(625)
+ >>> x **= 2; x
+ mpz(390625)
+->>> x **= mpfr(2)
+-Traceback (most recent call last):
+-  File "<stdin>", line 1, in <module>
+-TypeError: unsupported operand type(s) for ** or pow(): 'mpz' and 'mpfr'
+->>> 1
+-1
++>>> x **= mpfr(2); x
++mpfr('152587890625.0')
++>>> x = mpz(390625)
++>>> x **= mpfr(-2); x
++mpfr('6.5535999999999999e-12')
+ 
+ Test iand operator
+ ------------------
+diff --git a/test/test_gmpy2_pow.txt b/test/test_gmpy2_pow.txt
+index 89bd876..d5b1f45 100644
+--- a/test/test_gmpy2_pow.txt
++++ b/test/test_gmpy2_pow.txt
+@@ -15,9 +15,7 @@ mpz(25)
+ >>> ctx.pow(z1, z2)
+ mpz(25)
+ >>> z1 ** -z2
+-Traceback (most recent call last):
+-  File "<stdin>", line 1, in <module>
+-ValueError: pow() exponent cannot be negative
++mpfr('0.040000000000000001')
+ >>> z1 ** 0
+ mpz(1)
+ >>> mpz(0) ** 32
+diff --git a/test/test_gmpy2_xmpz_inplace.txt b/test/test_gmpy2_xmpz_inplace.txt
+index 94f86b7..c02f966 100644
+--- a/test/test_gmpy2_xmpz_inplace.txt
++++ b/test/test_gmpy2_xmpz_inplace.txt
+@@ -135,7 +135,7 @@ xmpz(625)
+ >>> x **= -2
+ Traceback (most recent call last):
+   File "<stdin>", line 1, in <module>
+-TypeError: unsupported operand type(s) for ** or pow(): 'xmpz' and 'int'
++ValueError: a non-negative value is required
+ >>> x **= 2; x
+ xmpz(390625)
+ >>> x **= mpfr(2)
diff --git a/dev-python/gmpy/files/gmpy-2.1.0_beta5-pyhash-nan.patch b/dev-python/gmpy/files/gmpy-2.1.0_beta5-pyhash-nan.patch
new file mode 100644
index 000000000000..9f59a6096fcd
--- /dev/null
+++ b/dev-python/gmpy/files/gmpy-2.1.0_beta5-pyhash-nan.patch
@@ -0,0 +1,17 @@
+diff --git a/src/gmpy2_hash.c b/src/gmpy2_hash.c
+index f276a42..1d2bfd1 100644
+--- a/src/gmpy2_hash.c
++++ b/src/gmpy2_hash.c
+@@ -147,7 +147,12 @@ _mpfr_hash(mpfr_t f)
+             }
+         }
+         else {
++#if PY_VERSION_HEX >= 0x030A00A0
++            // Python 3.10
++            return _Py_HashPointer(f);
++#else
+             return _PyHASH_NAN;
++#endif
+         }
+     }
+ 
diff --git a/dev-python/gmpy/files/gmpy-2.1.0_beta5-test-input.patch b/dev-python/gmpy/files/gmpy-2.1.0_beta5-test-input.patch
new file mode 100644
index 000000000000..16705d917c93
--- /dev/null
+++ b/dev-python/gmpy/files/gmpy-2.1.0_beta5-test-input.patch
@@ -0,0 +1,12 @@
+diff --git a/test/runtests.py b/test/runtests.py
+index 5e5842d..7d64e52 100644
+--- a/test/runtests.py
++++ b/test/runtests.py
+@@ -81,7 +81,6 @@ if sys.version.startswith('3.1.'):
+     print("with Python 3.1. The doctest module in Python 3.2 and later does not")
+     print("have this issue.")
+     print()
+-    input("Press ENTER to continue.. ")
+     print()
+ 
+ mpz_doctests = ["test_mpz_create.txt", "test_mpz.txt", "test_mpz_io.txt",
diff --git a/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild b/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
new file mode 100644
index 000000000000..739475e74e0a
--- /dev/null
+++ b/dev-python/gmpy/gmpy-2.1.0_beta5.ebuild
@@ -0,0 +1,53 @@
+# 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_PN="${PN}2"
+MY_P="${MY_PN}-${PV/_beta/b}"
+
+DESCRIPTION="Python bindings for GMP, MPC, MPFR and MPIR libraries"
+HOMEPAGE="https://github.com/aleaxit/gmpy"
+SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="LGPL-3+"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+IUSE="mpir"
+
+RDEPEND="
+	>=dev-libs/mpc-1.0.2:=
+	>=dev-libs/mpfr-3.1.2:=
+	!mpir? ( dev-libs/gmp:0= )
+	mpir? ( sci-libs/mpir:= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# In python 3.10 _PyHASH_NAN was removed and its usage replaced with _Py_HashPointer
+	# see https://github.com/python/cpython/blob/3.10/Python/pyhash.c
+	# https://github.com/aleaxit/gmpy/pull/297
+	"${FILESDIR}"/${P}-pyhash-nan.patch
+	# The tests program asks for input when running, disable that
+	"${FILESDIR}"/${P}-test-input.patch
+	# Based on this commit:
+	# https://github.com/aleaxit/gmpy/commit/db7ce2ef46fab84e7b9c32b05725e9b02e8cf206
+	"${FILESDIR}"/${P}-failed-tests.patch
+)
+
+distutils_enable_sphinx docs
+
+python_configure_all() {
+	mydistutilsargs=(
+		# GMP is the default, add mpir if the USE flag is set
+		$(usex mpir --mpir "")
+	)
+}
+
+python_test() {
+	cd test || die
+	"${EPYTHON}" runtests.py || die "tests failed under ${EPYTHON}"
+}
diff --git a/dev-python/google-api-core/Manifest b/dev-python/google-api-core/Manifest
index 4f29240af5df..5dea2238956f 100644
--- a/dev-python/google-api-core/Manifest
+++ b/dev-python/google-api-core/Manifest
@@ -1,3 +1,7 @@
 DIST google-api-core-1.26.3.tar.gz 133409 BLAKE2B ca3c63769f87cc79483d5ac52646cb044fa21e4f702a945994aeffad71b5be6bd1105e7aa3ec489c943d8adb1148f1c5eb868d64d71f0bcc4a6084ff470acf05 SHA512 8a7753ee30f6f3bb78265b083d8fb80a48021ab32c849ddadaf969263e5a63bfaeb3010b584440d5c5f1c4e0dcd4e8fcd4df16321ccb03d3c0932e19502bbe4c
+DIST google-api-core-1.27.0.tar.gz 134035 BLAKE2B be074208ac51b6e33466a2304e5780894d6a420ccf7ea36e5b98b6d9f920cd6f0cc9f94dababb154731ebe4a36d8b863897f5c654e00068a0f12753ceecb6e8c SHA512 5e8ca58c7f1dc9aa3e612ea635feb84a115c0f21bde2a3152cd54be5b041841ab1c0d2c725660794e15d42e63a4b6955a5318d3dec20bbbb3e7d683c630a5f5e
+DIST google-api-core-1.28.0.tar.gz 133640 BLAKE2B 8134e39cc3ff2fbb850d5e774d08589e3e64b83ca5d5209279f5d1b7fc2eb350a523bbe2890fba6d907689149df3872a7e0a11991b1ecc62fc64a4753dce38e4 SHA512 3702d27613e621394209047451729c1308beb88c917033b4340e3fa96bf4a5ec36ad2594c98ed14439c578f69a202d95a96d30472438a30417484cff6e06fe7d
 EBUILD google-api-core-1.26.3.ebuild 1260 BLAKE2B 41e5da2c64d6ae327135c47f9b14ea57e226d765aa948b2acedb8a895f0d603cf39cc79340401072538dd54326865d5d2f6ef9c0cf9db21ece6c9c8d34fa42ee SHA512 fa476f9c48b5d7c0aebdde04e1044535544d2ca1b518e158011ef82474defdcb377bb6cc38f0be11c1b28cbb2a5717bb357e8006bc98a0c0b88dfed84ad1c8fb
+EBUILD google-api-core-1.27.0.ebuild 1262 BLAKE2B 80d50ffd74520f2ecd050586bedb1067db37be45bc7879ca0abecb09d2e027f4a1c70e0bfc38750ace23ba4acd28235e09464c966a95239511b04454a97d8f51 SHA512 1840aa564a0b56f8d887e6446ce68f57f109e63029fe6dfa50bf1ad0df174656ab4f9bbce50498e3c1f937d855c20d9f4aa0df039e709ed8ee04b32c3dbde11a
+EBUILD google-api-core-1.28.0.ebuild 1262 BLAKE2B 8e04c7d42723eb278fbc64d756445bff4a21778218034b866e4f98adff762b36ac4a3f72e315bb9f876abd56219ff919a56b555df69a9fd9be9494fe03609fc8 SHA512 04e0a2dd047625d8376375d324dbfaadcf489deeae355cb743592520e903e7b4be754eec0e07a50dad736d24f68684423929aa01b2b590b793090d95420721d8
 MISC metadata.xml 452 BLAKE2B 0fcfeaec5750606a31eecf6794110c23bee9e2e56c9aa18201568e9ca8b1b45ef538efb4d0700eef7ddb28729acbc23946daf2c88c1cbe4f4f309d635455080c SHA512 0bb4089469ba140ff630b358150bc7ccb646465da9ae7b83ddbbb980b10347e0d3cb7b7e86cd8d0ab5897aa6a34017f6a921978a8ded784ef7582b00552299ae
diff --git a/dev-python/google-api-core/google-api-core-1.27.0.ebuild b/dev-python/google-api-core/google-api-core-1.27.0.ebuild
new file mode 100644
index 000000000000..af52a0d1189f
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-1.27.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="https://github.com/googleapis/python-api-core
+	https://googleapis.dev/python/google-api-core/latest"
+SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//google/python}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-api-core/google-api-core-1.28.0.ebuild b/dev-python/google-api-core/google-api-core-1.28.0.ebuild
new file mode 100644
index 000000000000..de335d4f57b5
--- /dev/null
+++ b/dev-python/google-api-core/google-api-core-1.28.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Core Library for Google Client Libraries"
+HOMEPAGE="https://github.com/googleapis/python-api-core
+	https://googleapis.dev/python/google-api-core/latest"
+SRC_URI="https://github.com/googleapis/${PN//google/python}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P//google/python}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/namespace-google[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/googleapis-common-protos[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.25.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/rsa[${PYTHON_USEDEP}]
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index 988b3662a921..6d38183873b1 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,5 +1,9 @@
 DIST google-api-python-client-2.2.0.tar.gz 24631108 BLAKE2B 377b87d30a0adb2bdbf983e9821e8be5db371e70572d79cafc1c4d231206461d50373b87aed5927cf5a485c3c1b21819db2719107cf58472551a7a0f858d8090 SHA512 9e921aa4b3868f85ecc3eb572d465c13851b1dfa0e84d11706821d5d02511cd4ae4fab4b9b55c606446d5753dccb973a99de888fbfa890aa1fcb6083fde976de
 DIST google-api-python-client-2.3.0.tar.gz 24912943 BLAKE2B 60233808f0f6243c37e8915791975e9aa10fa2d82e54c183582db9712dc36920d7d99f6caa67a25a96b1806ae9f96fd4f371010472b753f7a80d5e4fab49bd3e SHA512 11b9ba2f6417c017d47c9563460c38afdbfd01658e6c0f1812b1cdd1068b04bd37bb362e2ade4214fcc9a89d758f31bc977e281b093793a48641a2b7d926715e
+DIST google-api-python-client-2.4.0.tar.gz 24853833 BLAKE2B 4ed2083a9bb8b4f8fe31ab5dbd7875c0c36c972cdb0f71a59565fe4eb23ff1ef0a40794acd7af9646c1ee3904fbab3caaeb2700a3660b66d3069d2bc4f811e76 SHA512 db545850b9d2746e3bcf7b4a2f12b0d4827bd68f44d5627fd80d39bff2ca3303c8d520f72ee17637fe700bc935548706ce885ff0d7fe737ae157668e0314fbc6
+DIST google-api-python-client-2.5.0.tar.gz 24996941 BLAKE2B cd29420cde87584324fedc8a0ebb91fa20e65a84418cab1eae8ac5a7adedbb09a8f5b1367e3ff7606f448b1125c6d4289cb2dcd908031707774fe7dad50c9229 SHA512 b97abbf87aab42ea14907500d5955d43e318087a73ddb08c43d8f073aefdb56ef31dce7d3ce054ac8bbe6140d5adbb6a54dc977b4c504cad00fe99937f5acb7e
 EBUILD google-api-python-client-2.2.0.ebuild 1519 BLAKE2B bbce04ff3287c107f2deffd4614c62c71fe3e147b514fd46cc97761f3a30b8593aade945b40d7272d5b34813f897fd1bfb3ff96c89fe9208cc50960007217fd6 SHA512 7604601e0431d69f1b999fc5cad59c2118a4d5c5864ed6ab803fe3faa1be4833ab1a72df585ae278759cd1e8d73c617b60889bae6e41773c0f74dd36cf78a401
 EBUILD google-api-python-client-2.3.0.ebuild 1559 BLAKE2B e345907554560433de3888b24109ad3103348a620f9f85f0c842fa2350e5c3fcbd4cae21229787b634330a94f916b16bddcfea00cebdcfe49028f5ccd92d945f SHA512 1c0638e7cf57b6e3af304741a6c80408005877abff24e88a161bbf7233ddb28463ca7b3009f2d882758021f8ac2810235bc9986ca19a385fece84b3472e1b004
+EBUILD google-api-python-client-2.4.0.ebuild 1516 BLAKE2B e877dc9fa5e264b8f34504a203eb6454f163f4d8e50b124cbb2512e2128bb0c5e69a1f5dd7d8dc88d2951c85557318ddb36be92a6c11a5ca8ae13254596f8542 SHA512 07aff2f6ad21fe6f473d58e0931502c9c275a68a113cef7090dffa16641705b8d910b83148e645c892e0402da467143e2bb972a42bff69551f54f1cb1eb20c16
+EBUILD google-api-python-client-2.5.0.ebuild 1516 BLAKE2B e877dc9fa5e264b8f34504a203eb6454f163f4d8e50b124cbb2512e2128bb0c5e69a1f5dd7d8dc88d2951c85557318ddb36be92a6c11a5ca8ae13254596f8542 SHA512 07aff2f6ad21fe6f473d58e0931502c9c275a68a113cef7090dffa16641705b8d910b83148e645c892e0402da467143e2bb972a42bff69551f54f1cb1eb20c16
 MISC metadata.xml 537 BLAKE2B 5cbf80edce906cc5e6907af3df5b67662713d2eb503bcc619f616a5e770f57143d36089c1f2dde53c9c78b8df8b974e27e61d056b01bb70e6d7b9bd18a061afc SHA512 4d050e4c5f9b8f2284d4025570f5e52619b5304be4d7f76f856cce782120d8e1c0dcd23b5699509cb57a7720840b019f2c9bb981a08a6071be56977115708aa3
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild
new file mode 100644
index 000000000000..5ab50082b8d7
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.4.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="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}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+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 ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.5.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.5.0.ebuild
new file mode 100644
index 000000000000..5ab50082b8d7
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.5.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="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}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+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 ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 0eb01f20441a..cf1b4fbc0038 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1,9 +1,5 @@
-DIST google-auth-1.28.0.tar.gz 158266 BLAKE2B 7e1fcdd0a6d155c0170012d43062fa5df2c9dd731105990af6d055c0dc8f9c36917776876a25caedd4b804acf24cdebd93a0953a9f7642563a5abc05cc946156 SHA512 a02db23132950c99e032d8318451cd67127f1e9fc57731a8a76505a360d77484aef1859e54d8e4efa1bcde3f6f5379c3324d54cf57c0a95fb1fa7765f43e9581
-DIST google-auth-1.28.1.tar.gz 158294 BLAKE2B 3b6e7e746a10fee3f2fcbe1003fa3f5ea94582d092da32e44d8b9772babfb4db321780d1c4253f212971603d0e1212d10fc24dca10c3978faf06bfd8d9a96532 SHA512 e07dac8c0e9814d10bd53302c19cc37339b31141cc20c9fc7b6de8656abd68225f9a7c5502a8c64527c9bdaadd4158b7fa29e5564d02e878ee9acb3d9605c15a
 DIST google-auth-1.29.0.tar.gz 167058 BLAKE2B 0c6c9ac11330e46757bc554f7ae984d4ab94562e4524e0c579c0878fb093201240ebabc3a4f44f8d9f530a82ad5f84dd76100d57e2f874b78315c7f0d2cfb4fd SHA512 a6c8ca93ef493f16b7b16c2e1456891a09635bbc4a39053dc2c4cdca2f739692a74e4588c61c8aa5f06c1a5355ef304771770e26f1656edc0ef4c3c291df796d
 DIST google-auth-1.30.0.tar.gz 169598 BLAKE2B 4b0a0e66255abc11c697ca2c3d77ea0b7cf72cc13f6b1630307018e6ea52bda57a1f856787394455d71c61b58103d4e5e24da62f6ffd95022042b48842efcbbe SHA512 d07d6946635071e601c684a60e99ecec532ec51425aa934ece48b124419cb4c69c7651505018471431a7cf14470f4f8d894a2121999d3a482d603d41e5a8e66c
-EBUILD google-auth-1.28.0.ebuild 1407 BLAKE2B d9bf42682e316a48a3de11426d77c9455582a4bef95d9a80ce56e1cc2721f87576de987e03e85b54cf3a5ece100c41774dc7732592a04d0e25456cd119477a01 SHA512 c54b663e9916350f67df929001fae154820cdb24fdf0a2f46d9162634b75e9216f0c39ccff54533e1e110d7daa8200bd1bcb05c2ba9175038f201284d4a75d53
-EBUILD google-auth-1.28.1.ebuild 1409 BLAKE2B 3122b6bd350caeb99eae9b04c6fafeb47cf557b478415cc44fa9a6f586926bb19abb14f10705614e01fa4ab1e6b473cd7d3090e4bdd393a8e99406721f67075e SHA512 8ad46680c5b3d3b072a7c6386539fe72de6598388a4a8c891bc38b9ad69a556355b85d444e4c99decd0454dabe13e4e332ca6e3afe82ed54d32560f9410c47a8
-EBUILD google-auth-1.29.0.ebuild 1439 BLAKE2B e69fad338335e35b73372cce37c7776737655feaa9093f06082108915d07cf35f8b87d9a012147089201606bbc03c0e36d31b71e6381c663ba21050eff97de29 SHA512 da5e913d8f6e859fe59155f193ab18190dd4f0468368755c1937461b99685f1a6b082824d3698e57b0dd7edd6915882b60320565c83b8fb70208606219f7b660
-EBUILD google-auth-1.30.0.ebuild 1439 BLAKE2B e69fad338335e35b73372cce37c7776737655feaa9093f06082108915d07cf35f8b87d9a012147089201606bbc03c0e36d31b71e6381c663ba21050eff97de29 SHA512 da5e913d8f6e859fe59155f193ab18190dd4f0468368755c1937461b99685f1a6b082824d3698e57b0dd7edd6915882b60320565c83b8fb70208606219f7b660
+EBUILD google-auth-1.29.0.ebuild 1437 BLAKE2B 8ca006569936c4c27aba0c41a1101afc6cb03ee559e91c643525aa52e391edf48db40f0bc14b4f117e13cf18a85f0a3cbdf6fd5c7872878e7dde36e41c61f323 SHA512 36aae194362705122cbd36d52c431935d352b17fd0dda3221c17f900f71ab5b9e659295c2cfa3f21a67d831474ddda829435a07f997560241ea23b93755495e6
+EBUILD google-auth-1.30.0.ebuild 1446 BLAKE2B 69be2bce49c90a3a12c84a8f73e256707913762472d0a8bc94b399c02a92ecb9f3e1f040f27397c31c397f0cf1c8a2eaceae0015617b513ff2b1ae689ecaab22 SHA512 a56700dd0ac48ea125f1723d1e2035c13b798167307412dcf0c0f408262abf9d2dce1c92a5138b8cbe63b981ce690c2a0aa0ea91b13c963589cb2a83cc295112
 MISC metadata.xml 520 BLAKE2B c54ed12c21d00df20c4a605471df6fda2da0ae4bdad730a543a61cb1aed9f159af9db78675c3132142494a32c951560cb9f56a42844a29c3fe65c7522b34cd3e SHA512 761949db3693b2102936c08e9d02c3bfc91a2f1f73489e0fe562c8a64ceb4c1908f9fc7c19f2f142be30fb421075ce2be4628fd4d7d88748a1ac4fa5d42a222f
diff --git a/dev-python/google-auth/google-auth-1.28.0.ebuild b/dev-python/google-auth/google-auth-1.28.0.ebuild
deleted file mode 100644
index 1c615664beeb..000000000000
--- a/dev-python/google-auth/google-auth-1.28.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/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/google-auth/google-auth-1.28.1.ebuild b/dev-python/google-auth/google-auth-1.28.1.ebuild
deleted file mode 100644
index 400d08da8e38..000000000000
--- a/dev-python/google-auth/google-auth-1.28.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..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/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/google-auth/google-auth-1.29.0.ebuild b/dev-python/google-auth/google-auth-1.29.0.ebuild
index 5b5858f61e13..905829d2b1e3 100644
--- a/dev-python/google-auth/google-auth-1.29.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.29.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/google-auth/google-auth-1.30.0.ebuild b/dev-python/google-auth/google-auth-1.30.0.ebuild
index 5b5858f61e13..4c3742ac5a32 100644
--- a/dev-python/google-auth/google-auth-1.30.0.ebuild
+++ b/dev-python/google-auth/google-auth-1.30.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 RDEPEND="
 	dev-python/namespace-google[${PYTHON_USEDEP}]
diff --git a/dev-python/guzzle_sphinx_theme/Manifest b/dev-python/guzzle_sphinx_theme/Manifest
index 8e129a5acd26..0d7dd6e361ba 100644
--- a/dev-python/guzzle_sphinx_theme/Manifest
+++ b/dev-python/guzzle_sphinx_theme/Manifest
@@ -1,3 +1,3 @@
 DIST guzzle_sphinx_theme-0.7.11.tar.gz 2548612 BLAKE2B 797e44806ddf3e5f8dbd131db61e3fda33c5936b69a8672b73ed518557a62fbf35f968237ba508cbf1e447aa558a6cdf06e65d86ea52bb587b7c87a446047f20 SHA512 9aecdd4cf8ae286c9dd59a453790d957e96a57a9c9acd3aa38ff8fe64969cde4619c4154cd7304dd1c5bd0ea58fe71f556701b7a9b12f58fe3f5c1bdd2681da5
-EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 455 BLAKE2B 861baff778db773cb1c8019b181fe93815bc8c40e6d0d30a933b8e6e97ebaedfe600016749330cc7a202363da43e1384fea037d00e9f73bba6e625a61274ae0b SHA512 27c391c9bdcbc757b9eac62768ea1175185f90305963fda63400c7431bcbcbf7667778739018cee97674bcb3f7ae54f1ccc3a226566f4d867858311d0ec3eb44
+EBUILD guzzle_sphinx_theme-0.7.11-r1.ebuild 474 BLAKE2B 8d99dcbc37023b88163d0b812f99a2c8f25bf98905442d27908a1bd63d347e1be2e62b151a391c9a8c7b31349f6dc0420c861fa36c1ffce3a83ff90d332913b1 SHA512 03b9e3ac99ee005d6cb61739ee12bf00f089bdb68a22058e2adf2833250ef06da330e269edf13de62819ebdf6b8ec93db6a1483b9970569c7a2a9c6b13359a77
 MISC metadata.xml 339 BLAKE2B b05bc0183201fb2155f2ac06a76f77a1bb0cad3bcfaf0a6419f5de867d710b9ed7a336acb825ff25e685806128f733bdcd0d70825cbf995ca6d17eb57ed1c8c1 SHA512 2a0348e805f633535dc358cac761f51867b0e6dc13724e11d3671523ee13cfe67eceffd811989eb9cf71c697fc3b3f254844746468c5f4e0fff7f5e77346ee52
diff --git a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
index 72124af3b392..fbfcd1885e01 100644
--- a/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
+++ b/dev-python/guzzle_sphinx_theme/guzzle_sphinx_theme-0.7.11-r1.ebuild
@@ -13,6 +13,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND=">=dev-python/sphinx-1.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/h11/Manifest b/dev-python/h11/Manifest
index bb035d95ac7d..a7e0fcd3a534 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 460 BLAKE2B 17b38fff0edde0d73ba6af0f01c4b9df78433da8546e0d426b7ba8c12559ba01ad8cd87aba09563ce84b9119d4282d273c0b61d5af97567c6f46555789e69f18 SHA512 489f00b5d0ecd448ad514a3d97ef416c63ada5f133853d21b3b13b7aa09e0953c54551b84be4e7dd40480db5678ce49436cd611053f4daceda103517b0a85f97
+EBUILD h11-0.12.0.ebuild 484 BLAKE2B 7e3312751daa53a9e1a0677ed346a66ac501356a14f8744309686c8ffb07a83b0e8a2c6f9a3974961556f945a9e7eff489f8b4e3b20c3689ff1d53bc7e71ed3b SHA512 679bbc1a610eeef4174beef7866ca09537924bb103aa80885ffec47dc18659b974878eea562f10e94998f5983a2c259911cc8786c9fba6ad6c22007284fed837
 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 4e7e11c637ba..a77fbb16dc52 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 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/h5py/Manifest b/dev-python/h5py/Manifest
index c26f541de329..0d61c6be25d8 100644
--- a/dev-python/h5py/Manifest
+++ b/dev-python/h5py/Manifest
@@ -3,5 +3,5 @@ AUX h5py-3.2.1-i686-types.patch 1944 BLAKE2B 55b00cdf84a369fb1bce79fa5acbc82d719
 DIST h5py-2.10.0.tar.gz 301057 BLAKE2B 2e9da02224493b79b2df75ff9aa5cb16ab668d07bb95066356749be09091c54032efb3db8b53bdf0fbbbac2bcde532f9f051627327dcf3f35fb578b701ecc165 SHA512 c49b04f7dcddf03f36d4f063d79ecbe544e0b1daee432d4a76cfa83dac3a1f2cb144f40a74fb85ea17cb5b778f57f709969ea5d1a2afc5bdd5aecbc9d732898d
 DIST h5py-3.2.1.tar.gz 368170 BLAKE2B 2c198d0cfbd988a8531284e16f563ae630afbdd0b32d41ff1b8e33741ac9c678328a07dbb925d67c538100088de9423a45e65c76f3a1daaa0f7b08229916546d SHA512 c98f935f800f340239fdd5132534a3b79995dc952250521f0bd6972a60c34c21bb56d7ca3f1c655ad9d1e47fc5792f434f88a0919ae75bc9102e659bf4f1c284
 EBUILD h5py-2.10.0-r1.ebuild 1603 BLAKE2B c1ec4e72f614eb760f020ffb04fbb5988c79019eb9bc233e9f1359cdc6376e0a9ba4e1a2c51134755c0df088c126729f235cdada2d4ed1f4e9faea05d3e5d888 SHA512 a115a6a1122c2af0ffdeac399a5dd330d456c71864b7848e35664bad2a7dde1f2482e5a9e46a8da9e2196018145ceed7338dbc1b02b78749616a70f0d27d18d1
-EBUILD h5py-3.2.1.ebuild 1651 BLAKE2B 172d6f7650608ed7bcf16b7a8f81a26bbc97f86415686c17a7596b88a0b5c6fc09af0803c583c6c9596daaad3cac7ec262aac160310f21ad46ac1c2d8e333709 SHA512 32304bb3ef7d3648977f8da73dd3d4212377e8f70aede05b173f1fa42e6758ac44df7e7c37973a4c22ae8642ef79ef8ed80e0afbded03f0cba9a07ad59ce79cf
+EBUILD h5py-3.2.1.ebuild 1650 BLAKE2B 3536271efecc1df5a82fb49920d35f18f6f85cbe7a351306ea4518ef7471eeb3193547364c780820ee3a9ae4e0aeeb27fe58a1c6fabf6d04b750a103233f79ae SHA512 3fd0ce67704a271e3958d095ecf4a66e6429ec9a7e02a685e91ccb1fadb44e33c7ba414e2ea06a04e550016e42a71ce7b39bc5c3d1c6c0ac55ba2a828253260e
 MISC metadata.xml 1015 BLAKE2B 4b62b6e3d38b745ff2e27bfdd14e6ca380264089c9953e09e6f8c12e223fc9ad45072b8c884ee9a7c24329a00e71a93207d3ffb21b17e8377bf195fb20b54ad1 SHA512 1880b779b8917357e6301273a304314e73686cea70325c2ee17c1bd901190bf0b07575584275039d199df6b190df9be3ab6617ee9f2babb0b609c408cba5af52
diff --git a/dev-python/h5py/h5py-3.2.1.ebuild b/dev-python/h5py/h5py-3.2.1.ebuild
index 89ba32dc7dab..8601bd5832b6 100644
--- a/dev-python/h5py/h5py-3.2.1.ebuild
+++ b/dev-python/h5py/h5py-3.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 # disable mpi until mpi4py gets python3_8
 #IUSE="examples mpi"
 IUSE="examples"
diff --git a/dev-python/hacking/Manifest b/dev-python/hacking/Manifest
index b000daff597b..51b7013066d5 100644
--- a/dev-python/hacking/Manifest
+++ b/dev-python/hacking/Manifest
@@ -1,5 +1,5 @@
 DIST hacking-2.0.0.tar.gz 53296 BLAKE2B 50606d700c324acc8695499ee97cd592b051fe0cfc020efdfe7bf82b44d2f6ac858ed2f923ea08343066820c7da1686aa0b172bbab541cc564dc5ecc016cfac6 SHA512 d44d62f694c79af4c2044e745b140f0582fb5a6bbfa8050d45b17e8cb354198e8eac3a06586cf96d516844bb079d429d73ce9755a23e256857c4de19aca7ffe3
 DIST hacking-4.1.0.tar.gz 61910 BLAKE2B 95ced5b2fbafbb890478b5ef598a836520b4d1a3f1f2a0e708aa3f3135f394aab9e1ca8eaafa9d2f9f8dfcd1043d925b0232228234021ac89d2882ad6c7918a5 SHA512 44741548b5031777b0a508255129893da63a076615dc4245fdcb2368711be0ff6e16702c12c75a7f2c6b13257e2257c58e6e95dfad6da6640ff077fbf2b507db
-EBUILD hacking-2.0.0.ebuild 1745 BLAKE2B 0b317f53ac541c0efbab79a4c08a6814c4987a7648f012ebc219cd24b8aabc2a187bf554348e0881d5a38ea0c9349ac1d450aa0fbccbca517e3df948edd81ac0 SHA512 c44df0a35cad7656ca379df47c3f261857fee024a7540d2f97c13fd45a3775646f1347641331dce0fcf0b036b0b4124a8d2b02affc42f26d598a6dc41f4511db
+EBUILD hacking-2.0.0.ebuild 1744 BLAKE2B e82c8b0a3d32bab379ed9f7103afd5ba4e54ec5b1a71a44db5d0bd14f574d224b4d27e99a3b1bb1f27f79f8da12d06e06b022f23fe889302a6674f2a91f2bfc2 SHA512 4f61452313d00d0b35e739ab80ff557c7fefff3ba269edcf34a7db159c187f06b877c49b825c1e51cb6ab4c34a3d3c62e1be0f607be3c1d6096520ee967e4e4a
 EBUILD hacking-4.1.0.ebuild 1657 BLAKE2B a217c48d5dbcee6d87af164705e9b214241093112a6d2b58da74cf15ccd835681115db3058b0eaed2b3a7478e401fbbf7d64ad4365f4ba4d32ba1faef73a43e1 SHA512 fc9dbf5fd16b718ef305fb1a5a2c190f626066d264434bee172f6e0ccf3b5ad07104e23a1ede5d1d1135e494c1a8b05786ea5933858a1d73f031e6ed7cafe1be
 MISC metadata.xml 745 BLAKE2B 7108120bb708480a5a2db0fd0424cbc51b996fa26ba4d457a2bfe726ccc74405bb7475363e025977cea12426e01e00f0ed1748e8f4fd61f32367b53ec30c422a SHA512 5d546066e8e9e3578739508a442c668eaf48c69974ac7de2fa849f6310e19b6e20337c73bd8a6de2e8074f87b8d2a6089f46d3273f87ab75dee613dd350aeb70
diff --git a/dev-python/hacking/hacking-2.0.0.ebuild b/dev-python/hacking/hacking-2.0.0.ebuild
index 9c453b0c9234..29f8280c4cd2 100644
--- a/dev-python/hacking/hacking-2.0.0.ebuild
+++ b/dev-python/hacking/hacking-2.0.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~s390 x86 ~amd64-linux ~x86-linux"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/helpdev/Manifest b/dev-python/helpdev/Manifest
index 72bf3aa499ef..3f3d9b93a4ad 100644
--- a/dev-python/helpdev/Manifest
+++ b/dev-python/helpdev/Manifest
@@ -1,3 +1,3 @@
 DIST helpdev-0.7.1.tar.gz 51575 BLAKE2B b780513c8b7af12296c003360c5805e8414e5c82fe459ab1e4ccaf68c9f029c817a6cb86535d26ad0143ea7dc60fb86126f6d87d4a84e85a9b29a9dbe651e2c8 SHA512 ba0af843617c7cc69aae2bfe88d437e90df14afa90dd0a76c0e7c1062f03963270514ff7653c859a70caec0cde3cc3f18ca87573fdb6a1d5e2fd5874cc24e59e
 EBUILD helpdev-0.7.1.ebuild 714 BLAKE2B b5075b2ac2f71d1435ca507220e0d32be2211b4e9fd1a88bc8b0f499f348e806084c656bd61622fe64d1baf44577cda555f367c6457251932f9ea0a878e0c012 SHA512 c302b7b52eb36e25f7b7383abc94d3455df8148b223dac80acd6562036e150bb6356c968654cebc4a2dbf166b9ab391931a178b72ff38060bdf8c995223a2bf1
-MISC metadata.xml 475 BLAKE2B 552c9f13fe2422e6199a53d4e9ca75828a64f718f27cda6b6db30afdb27022d20b852d962c17acfd7f5effd6452a31a3d60443cbaf272f083c8287dfc4568de4 SHA512 f6836b6cb2947624ffc7a614c283983801e48be6ec829e102e60aef348b1bc0bd9d6c8032f15494ffa9cdecec2d76ed63a8ed5b484460c7a4020562da1846673
+MISC metadata.xml 328 BLAKE2B 5c8b1a39f847385ff5a06471c06da25ad81fc8fd114489a7d52e6bbe0b11c20c9661f25eeedf589bc71851105f863ea5fc9fd016a64d4ce7d4b4f3ebe8f2d951 SHA512 5d203be899855aa31c4b8f7d1f762a9657cd40f058edd06f7e0e94926bf4f6c7ea38b1a5ce5c2117639b479fa5e6c0492e276ec82da1d0b13afef0f0ad7aaa6f
diff --git a/dev-python/helpdev/metadata.xml b/dev-python/helpdev/metadata.xml
index 44eb352f91e9..61715a303c09 100644
--- a/dev-python/helpdev/metadata.xml
+++ b/dev-python/helpdev/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">helpdev</remote-id>
 	</upstream>
diff --git a/dev-python/hpack/Manifest b/dev-python/hpack/Manifest
index ec9088195b8c..3309a0e55593 100644
--- a/dev-python/hpack/Manifest
+++ b/dev-python/hpack/Manifest
@@ -1,6 +1,6 @@
 AUX hpack-3.0.0-hypothesis-healthcheck.patch 549 BLAKE2B 6177deb0b6a4de5fe5f2c65a82f8cd7eb7ef6140224070c0680b6c4646c111a063ec6a8c7d51ed2e56455eede1696abf6fb82f9d6d14d5aa81d58619b0c802bd SHA512 a1510a688d000b8f45ac48c39ba46336859f952356cf776d5204b512496c523e5dc622d16b17b50d0d6318bd94b817d52683e5f56287f0053ced2508cbf23259
 DIST hpack-3.0.0.tar.gz 5305971 BLAKE2B d1df8a1b2a1ce8b91e63cab475d3957f937fb74c0bec343d342971be1bb7cfbc929c53cf041845df2965cef0cfb098345bf0612acabc7ef3e5e23f6f0aa44f2f SHA512 7b9cf5e643dff2a6454bfe419b797c8ed1a0fe6ec3b725d2696da5a820ab96fe87a64e600b1831c7024bd82616b155a0aa058301acb32172155b6538ba0a73c6
 DIST hpack-4.0.0.tar.gz 5301419 BLAKE2B 0164f6aafc0d1f17f6c397efe710503a22501faae3c7dbba4e57ca2dc76e4d373bc5e65bf55acda8bc61975d12f8a2084de0e0c4587539e5a3102e3cf66d562b SHA512 f482d086d7a82649393e3cfea55c98966ce57055cb1826bc4dec1ea334661c02708e7903f2e8e588ee1c30df41373e1de9fb960c2e7bbc18d0ace0b8f97b195b
-EBUILD hpack-3.0.0.ebuild 1140 BLAKE2B f6a2fd48e83c6c7e922ab14023e3c3feda6df0147a78f597d5eeefdc354aced381422bf3860556c9fc970ae17078a8c5f210e9052eb0192c4993811b675bb616 SHA512 c265f09028d52bf7ec3e09db35dae7ad6c2ba0c0033fb9c02929eb12454fd04a842f2107da8de9daa8ceab4ede70dd361fd4d642c6c6eb5e2d5f1dddf2e6dc34
+EBUILD hpack-3.0.0.ebuild 974 BLAKE2B 607bc8aa01ab96927cc9ffee269e98d271d724d74fc55891952071cf39085005a0201f31e92e79afac2528d060e071699dce41dc01277ea95d1822128f07d8af SHA512 f01ce50154d99f293b8ba8f382695bacf22729a9499635fe8882c6c32da7ceba3004f3c7f7e90f972b24981bea64df091295b9b00754c95bd2735d799b5a0652
 EBUILD hpack-4.0.0.ebuild 704 BLAKE2B 7ef22aa114dc804e8d0059d5f2ff295a891f923dfc0e3ca451683120ea655bfa26e1760cebee20d2b1d64d06b4e4e516fe7003f274a3fb229f701d493d81d0b9 SHA512 811c55c9a73322154d0d4ca688e3bd7280b5af23cb255c295ab5219871af8b5be027cf289d238eb9040f4bce1ab4fe9216e7203745a278bf8b08b4ee42183852
 MISC metadata.xml 701 BLAKE2B ddbb1fb2ed0eff9436e212933ba3a6d91a3b439c3457bc613d00c0f8ec06468df44d4476f19a3bef9daa163938804ab2ef9ced38b51ef29a81f208a704599c4c SHA512 f464fca486d271112fe08d65f800858427269292720804ff620127bb5ff3aa920e334bb1155f1788feeeb98d02d0e60114d2801d97febd77031bd524758c4184
diff --git a/dev-python/hpack/hpack-3.0.0.ebuild b/dev-python/hpack/hpack-3.0.0.ebuild
index b52fcbda7054..99cf18dfe91d 100644
--- a/dev-python/hpack/hpack-3.0.0.ebuild
+++ b/dev-python/hpack/hpack-3.0.0.ebuild
@@ -1,42 +1,40 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python3_{7,8,9})
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
 DESCRIPTION="Pure-Python HPACK header compression"
-HOMEPAGE="https://python-hyper.org/hpack/en/latest/ https://pypi.org/project/hpack/"
+HOMEPAGE="
+	https://python-hyper.org/hpack/en/latest/
+	https://pypi.org/project/hpack/"
 SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
-RDEPEND=""
 # dev-python/pytest-relaxed causes tests to fail
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
-		>=dev-python/pytest-2.9.2[${PYTHON_USEDEP}]
 		>=dev-python/hypothesis-3.4.2[${PYTHON_USEDEP}]
 		!!dev-python/pytest-relaxed[${PYTHON_USEDEP}]
 	)
 "
 
+distutils_enable_tests pytest
+
 PATCHES=(
 	"${FILESDIR}"/hpack-3.0.0-hypothesis-healthcheck.patch
 )
 
-python_prepare_all() {
-	# Remove a test that is not part of the mainstream tests
-	# Also, it's data directory is not included in the release
-	rm test/test_hpack_integration.py || die
-	distutils-r1_python_prepare_all
-}
-
 python_test() {
-	pytest -vv hpack test || die "Tests fail with ${EPYTHON}"
+	local deselect=(
+		# relies on outdated exception strings
+		test/test_table.py::TestHeaderTable::test_get_by_index_out_of_range
+	)
+
+	epytest hpack test ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/html2text/Manifest b/dev-python/html2text/Manifest
index 2d51b31e4bed..22dbd9089cbd 100644
--- a/dev-python/html2text/Manifest
+++ b/dev-python/html2text/Manifest
@@ -1,3 +1,3 @@
 DIST html2text-2020.1.16.tar.gz 49464 BLAKE2B f0331daa63b9e5d7508e0446e19b4dd4d05e5f7af0279efd71dc43b633f8273666189899a27cb598e8afdd5bd8ffb3d566b97327d82870ef44a81310d8e7e7c9 SHA512 14453c98e81d05afb3241b04a9e50caf63e4b6f857337b4bd9f53e6b8fa7146aa6a1f4f64777db9fa350316b19fe62a0033dce5748191ca9fbd17a8757002855
-EBUILD html2text-2020.1.16-r1.ebuild 731 BLAKE2B 2aefb866900282942d58e28e82fae98eafd3cd4ae48f7141367ed72af9f312c04993c56d99a8ae6d3bd365716d1414fa9a2e678d254c0ec72c9497098fa8681c SHA512 e154aaa466c25c314521e4e6e7c1c622ea530680639b4c6307b73791ee14d4fade4e9cd1f1196d371f28a7ff050409e2d7ebc181e7864a22be1dd34d903ec9a9
+EBUILD html2text-2020.1.16-r1.ebuild 697 BLAKE2B a60d2cc00a4af95494784763d4e0d1d7c1548c85112d53d38e641ddb2128636c99dff3a2d64c9da348fb46967db574a462db644247e1edbd196b5838390a1670 SHA512 67925501194270fd7bf0d998cc3f2d699c7b7c7bb22eda8df57880d46ee6d5c8931354863a2c6cd96ad36268378777e404428839f6b46a9f9d74a857cf701710
 MISC metadata.xml 369 BLAKE2B d4f2c4f645c20a9e803e76df75ca78b79d8ccebe56ee8430d38abdcc096be85397b6541ddc2f25cb2c79d955b9ee913437edda69956cb78c1f0c38256b311be5 SHA512 dfa2834eca444d2c56f36b11a193c4e6b012b3a3afab08034c87d9ebb442010f2454788416380a4caf78ebaf47feb2212643977aab3100971fa99f29fe29955e
diff --git a/dev-python/html2text/html2text-2020.1.16-r1.ebuild b/dev-python/html2text/html2text-2020.1.16-r1.ebuild
index fa928db9d50d..d45328eb58c1 100644
--- a/dev-python/html2text/html2text-2020.1.16-r1.ebuild
+++ b/dev-python/html2text/html2text-2020.1.16-r1.ebuild
@@ -1,11 +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
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
-
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Turn HTML into equivalent Markdown-structured text"
diff --git a/dev-python/httpbin/Manifest b/dev-python/httpbin/Manifest
index beb704cc23fb..695f01f99cef 100644
--- a/dev-python/httpbin/Manifest
+++ b/dev-python/httpbin/Manifest
@@ -2,5 +2,5 @@ AUX httpbin-0.7.0-brotlicffi.patch 1378 BLAKE2B b8a4ed9df72c8e031e8ee6fe02d1c837
 AUX httpbin-0.7.0-optional-raven.patch 841 BLAKE2B bdf8cd94706b08d6706349ad471212fbda7f78e7125378073e4db43af352b26778706b2c61ca51f6c1c44aae4fd250432793e0ffef463102324ed39069da20bd SHA512 757bbe80463b332571e9d6e2e3266d2db3df519a180a7d3840b6f4813c2373382519e322547feb522c59ec3893d4721e42463d8231b4f5904725b9547af407bd
 AUX httpbin-0.7.0-test-werkzeug.patch 1108 BLAKE2B a7118afed382eeedcfb3e8ff9a31b31fb80c01cf97f19948f9d208d77289f829d3ef24f4cbdde74cc87d2d640b61a51994292fcdf5058f94b8768fd4c37a3cc1 SHA512 3556b921a6daed3dc561d78912b41ca9a3cea1274384f849bba1d7cd7e7014798ce5c9e93491351ca5225e26762be03c73cd0d09c60c90b8a55ff6e6ce0bf81f
 DIST httpbin-0.7.0.tar.gz 92613 BLAKE2B 59252df1d4d0ef853ec65263b472d3ba6c597336d844f9b457f2d0a009048d4222f715a7f6fb120aca00fa641d1687e302036dc151bd2fd67ba98cf5fc47a63a SHA512 82e80058b58943637e9f8191764cea79bf7a6e40f36069f9b5d3f908585dbef20a03ef070d1f865d350920b6e874a93a48a544b05c14ff4911038ec2c20f6f63
-EBUILD httpbin-0.7.0-r2.ebuild 1165 BLAKE2B e975444790084aecc03dc24fba91d55fd26075c7d84fffefe3bb32c4c3e4371e507f3622f011210adb348e8dbd355cef1dd4b3f81978c356e064b73c3e40d33c SHA512 6725bd68562cb376018a50e5c5caa180f0a389a0000888703592752f69a09d3174baad29cc21c7a1e779712d2cc2851952eb7e24a829a20f346f08ac6cb11d1c
+EBUILD httpbin-0.7.0-r2.ebuild 1447 BLAKE2B 074c87e9bd31c6b582344479a040122f9c035cca0e87507c2f0283c221565ce290b9dbc73b78ba3ffaf533cf95e6fd40e28d92a8b0761c937240ee2562c692db SHA512 e9b2d0dc75238a016562c5039099e930c341d860142bf6309545a0d2c671815f1fe4c4e6b45826c4519b5d3938e87ef162a4b4bf0e1225d9066b0d5d5407cf0c
 MISC metadata.xml 393 BLAKE2B cf8a612371dbefdf4f9718ea0add3cd52071cc8956852af0c629260e1482840fcf386553d18ca6fdfcafba9c08c0c7a195ec9a07cd1e467079edbbe4c3052493 SHA512 9509a57c48252340258d8a5e3bc655ca7b4e9f0983bfc7b46f2be6f6c03ae87fd611d6ca03cad7ee61815f5d856934207815ad4e6dde9fe4be2a8ffc0f260ee4
diff --git a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
index 45fbfbcc7915..8c04217f15d8 100644
--- a/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
+++ b/dev-python/httpbin/httpbin-0.7.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -36,3 +36,14 @@ PATCHES=(
 )
 
 distutils_enable_tests unittest
+
+src_prepare() {
+	# a new version of flask or whatever converts relative redirects
+	# to absolute; this package is dead anyway, so just skip
+	# the relevant tests
+	sed -e 's:test_redirect:_&:' \
+		-e 's:test_relative:_&:' \
+		-i test_httpbin.py || die
+
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/httpcore/Manifest b/dev-python/httpcore/Manifest
index 311034e2c374..50ff4af9dee9 100644
--- a/dev-python/httpcore/Manifest
+++ b/dev-python/httpcore/Manifest
@@ -7,5 +7,5 @@ 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 2176 BLAKE2B 212012e7fd78a099d554400346e868570e3f68bde05f3532d39e6ccd5cb69d584bf8f4cc88bcf6d1f82b872f3181b211eca529cdafbd121b57e5dc73259e5881 SHA512 9ae8fcae4dc453c361b2bf04d317e2b3306bc3e2cf7efd2397de4b7f3d6f3200e03f24fdce9dc22044169b7216e08da98842dd1143ac2f643ef5a7b4c43a9745
+EBUILD httpcore-0.13.3.ebuild 2207 BLAKE2B eaf9514993d2bbea088c983ddced1513291b475cf9e241435871dcf1fc5fa21f21f080828148c4584f23f1e7f47dd1918ce3a3d9035e3df1c7d46ce8d220e0f7 SHA512 9fdccbf682dacc9b10b26c2b534c75cdbafab08dd89d167e218bd851112e1b37852626eb6d6892dd928bfe6a32b3d7edfedf581593006087273dc9a259455cd0
 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 c4b2dfe05a99..31e01c5b750e 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 ~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 7561839fa9f1..bce170ca1a1f 100644
--- a/dev-python/httpretty/Manifest
+++ b/dev-python/httpretty/Manifest
@@ -1,3 +1,9 @@
 DIST httpretty-1.0.5.tar.gz 414946 BLAKE2B 8bbaac3d53fbf5744f7bf8ef952bd9305112934af24809a233ef0446886e09b7d2a897e69aded12d9e715580305d729609365b0be55f8d324cc48e6aa0699d75 SHA512 2e5f4834848ab1a0b84230f000afb0409b30b3cc1769d36ad61f712f56abc8d6076e7507598f791fe343ce282cf9e26939add71ef794ead2836badfc2321d6bb
+DIST httpretty-1.1.0.tar.gz 417966 BLAKE2B 2decbfdb8b8a1e04bc2a985bb605d59ef2ee84a434dcd3c420ecf68857a5a409cee622db63bb5bf8981c1bf287b7dcf56cf91360fec4dd219dc349b1d4425a6d SHA512 a6da71115d4dc12125bec451888c30858ec94f2a3aec530b21efcacd9c595cb3d2196dbca3631f4b6f50c985c14b3c4bc6f34ec1d9e41aaf2b48fc8a072f5739
+DIST httpretty-1.1.1.tar.gz 423682 BLAKE2B a68c28155082d01d2cc3af9672dd03d6e1e0427426bc5db08fea1fe9a6cf6ceb422315f321cb66e9a6b9fa13f8abad02ca7fe78753c4deb27e220263f18b363c SHA512 29d9f1a4845b0b3dd6d3e1e9cc3f81d673a939286203de06ff34b167f69cbab180eebc0ccc4a733d81728deb2e44ffb14df25cab31475267609ce510664af736
+DIST httpretty-1.1.2.tar.gz 426456 BLAKE2B 1b593344de4d2470a6712075b8476c024ec16bfd5501d0ab63e5e15ee65d3c4a7c89a24cc0c0ccee019554ab751afa1d09bdcd162602edd0d1d7523961e0fee8 SHA512 674641509e43cb36c14af560853271495474157477350ff80a9bd311b435fb64e9aa2b710419b34b1f344ffc963f8c7141a631dd3f0d9599accb43647b5680c0
 EBUILD httpretty-1.0.5.ebuild 1335 BLAKE2B f8c14b37da5c0e0045a7e921b0e7b6865e691d951cabff545725c42a89098786064544b83c466cb07ecf5de05d8313b54c48f11c7872523310f685ef20a0199c SHA512 0ab4ea2ca20b103c10361d858e89238583bd547e371b6bc19bf89bc3091188be0e44ed9fcd92090b55c20de1ee1ded8b34f9015a9afdf280adf03703f8766983
+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
 MISC metadata.xml 615 BLAKE2B cbb8f3643ad93eb01b98baccd41c86da491499f068f5fbfab8d9baeef534b1d71b118c798f0d09777c251694492a55cf1e9bcd8be619c5fecaad63fd8ce52c56 SHA512 9cfef8b6e35ad7a533ef9b8efe991b0e248e6ab0444a169aa47111373d4da464d883cde23a4d6a6a2920ae5b92270ff18ae87b7f41fc2f87cde4595f9b0b2c85
diff --git a/dev-python/httpretty/httpretty-1.1.0.ebuild b/dev-python/httpretty/httpretty-1.1.0.ebuild
new file mode 100644
index 000000000000..4945fbd3c3e3
--- /dev/null
+++ b/dev-python/httpretty/httpretty-1.1.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+# redis skipped as it requires a redis server running
+DEPEND="
+	test? (
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# remove useless deps
+	sed -i -e '/rednose/d' setup.cfg || die
+	# tests requiring network access
+	rm tests/functional/test_passthrough.py || die
+	# requires running redis server
+	# it is skipped correctly but it causes unnecessary dep on redis-py
+	rm tests/functional/bugfixes/test_redis.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/httpretty/httpretty-1.1.1.ebuild b/dev-python/httpretty/httpretty-1.1.1.ebuild
new file mode 100644
index 000000000000..d4b4d4ebba91
--- /dev/null
+++ b/dev-python/httpretty/httpretty-1.1.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+# redis skipped as it requires a redis server running
+DEPEND="
+	test? (
+		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# remove useless deps
+	sed -i -e '/rednose/d' setup.cfg || die
+	# tests requiring network access
+	rm tests/functional/test_passthrough.py || die
+	# requires running redis server
+	# it is skipped correctly but it causes unnecessary dep on redis-py
+	rm tests/functional/bugfixes/test_redis.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/httpretty/httpretty-1.1.2.ebuild b/dev-python/httpretty/httpretty-1.1.2.ebuild
new file mode 100644
index 000000000000..bf841f155b15
--- /dev/null
+++ b/dev-python/httpretty/httpretty-1.1.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP client mock for Python"
+HOMEPAGE="https://github.com/gabrielfalcao/httpretty"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/urllib3[${PYTHON_USEDEP}]"
+# redis skipped as it requires a redis server running
+DEPEND="
+	test? (
+		>=dev-python/boto3-1.17.72[${PYTHON_USEDEP}]
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/httpx-0.18.1[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		dev-python/sure[${PYTHON_USEDEP}]
+		>=www-servers/tornado-2.2[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests nose
+
+python_prepare_all() {
+	# remove useless deps
+	sed -i -e '/rednose/d' setup.cfg || die
+	# tests requiring network access
+	rm tests/functional/test_passthrough.py || die
+	# requires running redis server
+	# it is skipped correctly but it causes unnecessary dep on redis-py
+	#rm tests/functional/bugfixes/test_redis.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/httpx/Manifest b/dev-python/httpx/Manifest
index a0940eb14a77..add5bdb50539 100644
--- a/dev-python/httpx/Manifest
+++ b/dev-python/httpx/Manifest
@@ -7,5 +7,5 @@ EBUILD httpx-0.16.1.ebuild 1208 BLAKE2B 1764d1e6100c2b2b6412d157137d7b8750189714
 EBUILD httpx-0.17.0.ebuild 1208 BLAKE2B 1764d1e6100c2b2b6412d157137d7b87501897140f8881052db73f6812afb642c23f4ed03365ab3daf6c223625a4d6d7179c4189fd8239fde232cfa2cce5f4e5 SHA512 086f4195cd49cd102d95f7e83add82dd4027b5e6b6b71b858501e058659432b9823b5208aa7e13aac30dc17b69a377624f86f9d313c07e3a460d3443c62e263a
 EBUILD httpx-0.17.1.ebuild 1255 BLAKE2B 32ef44049e9f25d489e9067fd060a27ada135a1af8814246289501621799d156106ba7414e15ab006e1b3efd9e88604b9e8a0c30962e7405aa87ac03b04536c0 SHA512 f584eeb324071170302ee466a6e7c59904937bd10b26943d3d8e184ff42784574414b9f26365da04c68e577f779b93470510acef8462e38df2f90d52e4bc7693
 EBUILD httpx-0.18.0.ebuild 1280 BLAKE2B ae78c0015180a410be632905e8773b118ef999a06cd3fb4e88d1216ce40f28df853183b5c997048bf28ca7c8618e386110b34543e35390fe5b0f7a6d6420dc6d SHA512 dd794d52f2a77aaef254a1fde5afd0b67c8c66eb2c8ab6bb13521224358aa05fc84324208dce60e8f07bc77e470f482e2379f9b32486426f88a00537b4417f19
-EBUILD httpx-0.18.1.ebuild 1282 BLAKE2B a90e0d8e070cec44a348809b55e1ea8288060e758fd5ddb2189a8072ea004449511417eafaa681f1a69c1b5e8bd900be2dd272e87028e23360b92f18debec68c SHA512 c9d000585ebb6dc4336b94351638d002e7e02cb1baaa41f9a8a8d480fb1b9aaa19dca81fecfa62a34aeb74c2454c957ff475e4bbef8507db1b15a776b17754d6
+EBUILD httpx-0.18.1.ebuild 1313 BLAKE2B 68def2f215f9042245cbc6dc0f087da87450db00f24ec1b6882634ba7e682de347ceb13962de9689814024c83eecc62525fd01d00b55b9d075653f80ec4add09 SHA512 718acc217a2853e1cd17bf7c903b39d53d942139c88720e3f89bb7f3552c85ce75e614bfa4452abdae87607736889b04a85e0c925b6948ca916d6c670d72a426
 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 3dec4d445fbf..7f70c6b70ccf 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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/certifi[${PYTHON_USEDEP}]
diff --git a/dev-python/huawei-lte-api/Manifest b/dev-python/huawei-lte-api/Manifest
index 36910bba247c..8cdcf5e33a1a 100644
--- a/dev-python/huawei-lte-api/Manifest
+++ b/dev-python/huawei-lte-api/Manifest
@@ -1,3 +1,5 @@
 DIST huawei-lte-api-1.4.17.tar.gz 29441 BLAKE2B 75615092a1d8ee598a99e9ae7a0567e11a72fad21a8304005364bd21e4ecb9bf9efa9a2d5c8de86c6d7442ec12f06079819c20ca9e2e4646255ede961b1a1275 SHA512 bf4a6a43d02b56f0aa799e2936d7fd0afa88da4dc18c152c635b0ccb87a7ca9afcf1fcdee3a37d7ab232d5cd4688e24499ad35a1969d97db405b818cf17d33c4
+DIST huawei-lte-api-1.4.18.tar.gz 29701 BLAKE2B 0e242f2f2208646c9f3291dab8397a80934bce3757fb79b58fdcee389a087788962cfaea3350d7b95e53ff3e0f1fbefdf7ea6714266872fc1591848a4fb84462 SHA512 4750fcc84fff46c76f42715e6668d402b9057f8dd826276ad0682e9bac76742c86566794d4aaab7aa9ebf17d06246c4d4cc9385ee1fff9642ff5c995491fc646
 EBUILD huawei-lte-api-1.4.17.ebuild 727 BLAKE2B 56f9663430fabc5e1b3e4c93c978b4fc976f716e982680472e35bf85dfa7614deb5b7fe88d262b56dbd5b992ad8505847c4658ccc94e529c5f74c07a56301bbb SHA512 6755cc1e5accf3eb383ed4e1a47a26949a238dfb0c1f22382677fd0e7e59d68de6feee4ce0d9a3ae67e22b48b1a3c4ad9913780d874d5dc0d930eca1b98c2748
-MISC metadata.xml 385 BLAKE2B 962737026dd3a7daaced4e561f39defb5abfb76570a6cde7e083699f79d95000f6818bf65466ccfde2407b00db401c27d507b954ee8f546c4f5ec92335ed1088 SHA512 d70d91e85572133e2093376e55daf6a501270339cac68f19b26d563f20650f890177c02fa3b264fe3b6c62e51471a5dc484827d0ae2cdf8a657b95dbbb47691d
+EBUILD huawei-lte-api-1.4.18.ebuild 726 BLAKE2B fff44a353aa68c40a9b3f9f71b4b91c58429e74fb2550bdf63022455c0a4e90c67f7a9fed1bf714866d0d64f19be3da7fa77e7fd944338f7ed9745fa53812975 SHA512 5530c1696dcdd7a67bd74366eabdb0fd05c060df2b07b745d146028b40e4ba3ffc940ccf2fe9e8ba3df58cebedad41eebff1b2833f8e86fc09f78ab8aa4a7664
+MISC metadata.xml 486 BLAKE2B 1e0adba09107420b8ce5cd57a113b7fbf279569603e0dbcf5d46fa50a55bdf5e6b7542805a7da86325d12fd2b71fef1845f958e229617368c3f7d54d302b6d4b SHA512 f72435998aac307b623067acc4442df6d5f7f281e08997dc84bc2a9cfbb5a3761da14e7bf89af06c6adc49d2c4a3af487745d318dd301cbbae6a6a197bcbe149
diff --git a/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild b/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild
new file mode 100644
index 000000000000..cea09d4633ef
--- /dev/null
+++ b/dev-python/huawei-lte-api/huawei-lte-api-1.4.18.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="API For huawei LAN/WAN LTE Modems"
+HOMEPAGE="https://github.com/Salamek/huawei-lte-api"
+SRC_URI="https://github.com/Salamek/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="dev-python/dicttoxml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]"
+
+python_prepare_all() {
+	# https://github.com/Salamek/huawei-lte-api/issues/86
+	sed "s:'pytest-runner'::" -i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+distutils_enable_tests pytest
diff --git a/dev-python/huawei-lte-api/metadata.xml b/dev-python/huawei-lte-api/metadata.xml
index 7c8d9faf0487..b7b17f020921 100644
--- a/dev-python/huawei-lte-api/metadata.xml
+++ b/dev-python/huawei-lte-api/metadata.xml
@@ -5,6 +5,10 @@
 		<email>ago@gentoo.org</email>
 		<name>Agostino Sarubbo</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">Salamek/huawei-lte-api</remote-id>
 		<remote-id type="pypi">huawei-lte-api</remote-id>
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index 074e23a9217f..865dafa29e64 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1,7 +1,5 @@
-DIST humanize-3.3.0.tar.gz 54639 BLAKE2B 7861a5e0403aa9ea047e39f9aa42fdfd7c7f38f295e93b9790f7fea3a86a57e33e65cb302165f1f962a46bf84238fc8b53b2e3e786eb1804b674dca97f959fae SHA512 a25bbaaa8cdd8fc0a7375637c19f91f892b33b8576e4c88b9adc431e976cb4f8937f1f98d71f442547626276c75cb6be445cac9b11b6504b6a444740df486faf
 DIST humanize-3.4.1.tar.gz 56119 BLAKE2B 79f91e03b0c3ab1c645552ee3a0bf321e0ee620f5c0af827e44ba9995c9128638d1dc5cd80e4210de143ab55b39fb25e03abb4afaf5fa9a98973ef6c37d99b2d SHA512 d7e201717ee6b1065920faed3fa70f48c7b6acaf246a707126246d84f516fe7a14713bf4c488b18815907a0926b6cf505f106e15f17051f69756a50f50cea51b
 DIST humanize-3.5.0.tar.gz 56651 BLAKE2B 05095fbdf7c55258bf3d01c73f47bf913e1fda3e6d8a2fcf666f4d70cfd6e437071140716b9f5b6a31c02c06da1d2df6f80d5d021c279d4f97f756f41f3c3bb3 SHA512 ca04d79533b08f1549cd530fec35352696b314d6d667476bf5506a482a4ff379fe6ae021a1f338aa6837877a90e57ce032cdc671b68be34dd52e0e41aad10170
-EBUILD humanize-3.3.0.ebuild 546 BLAKE2B 136da0da80d4e729636d0fb03069009795d282f7ee7aa10e699fc2bcd40df7b035248fce8452ecfeda4377b058a219530d2c7f001db1215ada2fa5ab1b83f689 SHA512 539e9fec04f88a99e85fc83b3ff223d7792b60fc02ad421a7ce485e93776bececfdad27de9fbdb5a12388a3c41097ebfa67418c702936a966efdc7a03638a6b1
-EBUILD humanize-3.4.1.ebuild 548 BLAKE2B 2b86d4aa8a9585e8daf3fcf9a896596ac6104c9f76c9803dfa5934b7f3ab9f13eac36831867941677865f86e27ccd489e7f867e537ce965709c043f137d496ef SHA512 46f45b8ec4517f65b5488e91aebd1c583ca6bf6e51a50d2f7da29fa27dd3dea9bab27e5b0a287be370b6365a4cc02ce7a469f71da74207fe2505c88929776cf5
+EBUILD humanize-3.4.1.ebuild 546 BLAKE2B 136da0da80d4e729636d0fb03069009795d282f7ee7aa10e699fc2bcd40df7b035248fce8452ecfeda4377b058a219530d2c7f001db1215ada2fa5ab1b83f689 SHA512 539e9fec04f88a99e85fc83b3ff223d7792b60fc02ad421a7ce485e93776bececfdad27de9fbdb5a12388a3c41097ebfa67418c702936a966efdc7a03638a6b1
 EBUILD humanize-3.5.0.ebuild 549 BLAKE2B 092e302b0a9531f3bfe77f7484c6769c7f1481096190d80de98892f94c9b4cdef21e09be30495fd41caeea1bf7c0e258bcd1e2342482d4545dfc44700379146b SHA512 a940ce2d83805b4c3fac10401292256184b56ed069239531ab22e4aa70c13caaa0de88f6dc63749dadf40ed2c5c297142335a22efe2c8e92f0eb523f6370de6d
 MISC metadata.xml 561 BLAKE2B a7919d3646edc6a4e7c2e13d74b1ae4eb18e16c41d33f27adb2841e80ab12e5d85f42bedab668c1096740e7ed1323e5accac1ba45a78290f0979c55e39c9d682 SHA512 b31a4947368fcbfb0edf93b48f843c49d5209820cf9da1a8aeb8666ab4fffebac765ca4aeb3cf2523837fcfc9c21d858cecaed65002ac23bb9d946a8c818f113
diff --git a/dev-python/humanize/humanize-3.3.0.ebuild b/dev-python/humanize/humanize-3.3.0.ebuild
deleted file mode 100644
index e402dcc8a026..000000000000
--- a/dev-python/humanize/humanize-3.3.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Common humanization utilities"
-HOMEPAGE="https://github.com/jmoiron/humanize/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests --install pytest
diff --git a/dev-python/humanize/humanize-3.4.1.ebuild b/dev-python/humanize/humanize-3.4.1.ebuild
index 7bc5554aa175..e402dcc8a026 100644
--- a/dev-python/humanize/humanize-3.4.1.ebuild
+++ b/dev-python/humanize/humanize-3.4.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/hvac/Manifest b/dev-python/hvac/Manifest
index d5096f8d9097..0a77e99f3f65 100644
--- a/dev-python/hvac/Manifest
+++ b/dev-python/hvac/Manifest
@@ -1,7 +1,11 @@
 DIST hvac-0.10.11.tar.gz 297146 BLAKE2B 279cd53d6aff18d8b393214c3370bf8a5a0e8f597cefc739269086db66fe4f43a931062c18d76815d777d12ffdfd431ed2174d77afb58669572e6e0e8ed9e43a SHA512 6b68bd19d5621758637ec257992e03da6b1746e5ac1d1b8d63098b6c0c1dc0c0f92fb6bd653b5458e8c55060a48619eb4d09ec4d0529cc2b3f4b91745bd2095c
+DIST hvac-0.10.12.tar.gz 301534 BLAKE2B 3d60bc428faa2e66f5c3b1e7d4aa0df7777e76f996c6d49bd9429e6a69f43580067a0de396ecc4234ed416a304f6e017f35b60b4655eafa6335666c6c00b88e2 SHA512 a52791bee2eedf488fabb488971f84f357e94812b14de36b45360690d3d018c9162dba9b8a54a719f1fe45b5f526fb729c08c8ece4f3c093f8a8f50a37731260
+DIST hvac-0.10.13.tar.gz 301612 BLAKE2B 1b3524f72b54bf6fdfde6c02ecae8f16e32363bef206eb34f148f2d8b6a6fa69765e2ce35048dbd0b5f802160fd81cb8fd287da698a74c0c87b2ba4a25c5b498 SHA512 d4f4c3935fcf4a15d2f12f01dee1c267cf9c242642037b816e669c004269cd0b98d90e97774408e70c325b4449f2aa35f6158d0f6d4125226eafe353fe0c7471
 DIST hvac-0.10.8.tar.gz 290963 BLAKE2B 539e604d2c0476c3f8bd9bf9e803f2d7c6ea8671cd86ef650a7a3e615fa3461135e956726a869fa8b9c1883b70c11eaa51f28e6d07f284dbb43b51a696dd9958 SHA512 010a851c39bdc4d420343fa42aef5cd7faa073c11bf1507fc563791b8c93e85367b2081d573123acccd467881bccb9f9f33487551cac763d91ee7e5341ea5568
 DIST hvac-0.10.9.tar.gz 291045 BLAKE2B 63c48b21e402a1af3f73e5b295061a2f82040cedd412fab69e8759e290a46eb67d1aa0ddaeb40c1638eefbc492441e238cbe4be114093015af6eabd99a0c0a75 SHA512 4af23583110ca4c2c9714f5234daf21ee199c2ac97cde01a220db6f5d89957b95c1e8b84904104e5a96ec39b54cea567973427a73ed7cae5806e794d37403a8d
 EBUILD hvac-0.10.11.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
+EBUILD hvac-0.10.12.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
+EBUILD hvac-0.10.13.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
 EBUILD hvac-0.10.8.ebuild 1337 BLAKE2B 54e332ea5a21dab765c2da086cd35ae0ecb03f65db484e35cd84b0eb686f823f7d0ede10903e65b5ce824067c12a55ff22b62b6c8f9df7d5ad7238dc87c3da45 SHA512 cd9d8f51940498aa1749bee33833fcb1edae278abf764a87da4bdd01ce25ab944af827381b6ef232eb416ee878699711e1488875fca0b8ab29804bd1a29d7125
 EBUILD hvac-0.10.9.ebuild 1302 BLAKE2B 6eb5e5a6976fc0fe4724d442083676dcef747554ee19f7c1164dd058fef99eb14df39d0b19b346f32deeb850b463ea7d625a5f7496880cda77113547201a6b85 SHA512 d5dd450dbd1b77b9321e14171057363cd69c6914299ed1554294c6127900202042277b6c7d1997398775cf7a7ea5a820bffa943c05bb54baca37e831e3399d4d
 MISC metadata.xml 599 BLAKE2B 84158e64a8354d461d7a02cf871e3e2fe6b47d5983246d7bf01ce53467b68a2e45708b85728862853e4659fe7b0b514c2c2f268f67c660cd1948df9771233704 SHA512 6382293682cf7990487a76b88dcee4e43a1e679b751f8ae79fffb1ad0640db500ed16f9d75edcad919999f72858b7a6c6e86f0a1711c22c6394b5a8a8a2a2f95
diff --git a/dev-python/hvac/hvac-0.10.12.ebuild b/dev-python/hvac/hvac-0.10.12.ebuild
new file mode 100644
index 000000000000..a9529bd22ad2
--- /dev/null
+++ b/dev-python/hvac/hvac-0.10.12.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="hashicorp vault client in python"
+HOMEPAGE="https://github.com/hvac/hvac"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hvac/hvac.git"
+else
+	SRC_URI="https://github.com/hvac/hvac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="
+	test? (
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/jwcrypto[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/python-jwt[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/pyhcl-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local ignore=(
+		# ldap_test is not packaged.
+		tests/integration_tests/api/auth_methods/test_ldap.py
+		# https://github.com/lepture/authlib is not packaged.
+		tests/integration_tests/api/auth_methods/test_oidc.py
+	)
+
+	epytest ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/hvac/hvac-0.10.13.ebuild b/dev-python/hvac/hvac-0.10.13.ebuild
new file mode 100644
index 000000000000..a9529bd22ad2
--- /dev/null
+++ b/dev-python/hvac/hvac-0.10.13.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{8..9} )
+inherit distutils-r1
+
+DESCRIPTION="hashicorp vault client in python"
+HOMEPAGE="https://github.com/hvac/hvac"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/hvac/hvac.git"
+else
+	SRC_URI="https://github.com/hvac/hvac/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+BDEPEND="
+	test? (
+		dev-python/flask-sqlalchemy[${PYTHON_USEDEP}]
+		dev-python/jwcrypto[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/python-jwt[${PYTHON_USEDEP}]
+		dev-python/requests-mock[${PYTHON_USEDEP}]
+		dev-python/semantic_version[${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)"
+RDEPEND="
+	>=dev-python/pyhcl-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.24.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.15.0[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local ignore=(
+		# ldap_test is not packaged.
+		tests/integration_tests/api/auth_methods/test_ldap.py
+		# https://github.com/lepture/authlib is not packaged.
+		tests/integration_tests/api/auth_methods/test_oidc.py
+	)
+
+	epytest ${ignore[@]/#/--ignore }
+}
diff --git a/dev-python/hyper-h2/Manifest b/dev-python/hyper-h2/Manifest
index 2024f73ea12b..eb4a07cb7297 100644
--- a/dev-python/hyper-h2/Manifest
+++ b/dev-python/hyper-h2/Manifest
@@ -1,5 +1,6 @@
+AUX hyper-h2-3.2.0-failed-healthcheck.patch 3381 BLAKE2B 0eef97897e58ca0b580371e1cd8dfeb4c85d3e333aea4566121bbabd08cee5a46070360e3f40f244058082c5949f3fc1ed8c5a9d80bdc6f9c7ce741a9dfa915f SHA512 0e5e9a6f3380e3a2b54f63c9894e3fd5c5987b7e55834200b051e6d8ed13219f9784340275ff136ba273eb5b989b5bed80e85460bc7b25049974150f0340911e
 DIST hyper-h2-3.2.0.tar.gz 2203333 BLAKE2B 245bab162852070e850613c41162c75efe5e43535945dacf448afdc948cade83402f77259aa46f375d0772a5287e42d8842b1259cb36392cc8fc222dec7cef75 SHA512 103a4ea2cd29037ce03ae676864125b4111c7d31a82bbbe7028557da886d88fb5363d885f08d5d3f68dfa29013b7b03350cc0cb4d9dddf32735e98dae5d7fc7c
 DIST hyper-h2-4.0.0.tar.gz 2142185 BLAKE2B e5ae692c1f21b6e3ea8695ec269a4d02f72b8d385b6f9c523775f3db2200379f9af5accb70fa06a357575728a6a5b2644dd1225cfdf458fffa80e84c7b1c7b2f SHA512 84578174a13782897f9286c62d450eaf11aa71c01c96b8660179cd2df77618dc1a6c4b354b2bc5731cd21c4709c8c0a8282a859a98c4a62a7295b6dfd1b5cfb2
-EBUILD hyper-h2-3.2.0.ebuild 957 BLAKE2B 35500d93c0d2dd87135e0838c666456b1c47bacf79a96de3ae7953b80535f5c451b055a1aaeeca2e7e3793bf82fe96c5572252bdfeafe1833a61e065da6bca13 SHA512 23c1cea8d9b2a2331f31932af3575b9f4e8d3d540010070417545b27bc9733419d1400816dc120de17849a5d93c675db1878a50300f33f586d02b335e01f8cf7
-EBUILD hyper-h2-4.0.0.ebuild 788 BLAKE2B 4861e4b8334edc67c363c8a5f95c5fe172074c1f70b77d794709bd7745ffde759590a5bd7e2e69db865500a5007f52164d988f9d3242ad431071ada8f9218a4c SHA512 7c456e47aa45546715f5fec08d019f06077acd7000b53a233766e20c6b259b033ebb998016efa8595976eab8dd7021ddacd25751e45f2a3f08bc24a4baad08ec
+EBUILD hyper-h2-3.2.0.ebuild 1525 BLAKE2B b84bf5d10d75fba77829b49066e0f6086bd2793afeedaec1cbc6da8a408f28c46106ff26a96c91ec6f1c47d7d8698b308bd72fa5ab94e54445dff8a958339556 SHA512 09aeff21748797a137cee17cd49d8087e5c23d4dd99c545474da2e4ee97225964e4181ed0674db210d7e8a996d338826f36d260bfe30968f8776fa7863445b7e
+EBUILD hyper-h2-4.0.0.ebuild 1492 BLAKE2B ddc3845d611093e9c192a46b61776bd23576f733bf6527a51b32f2e2b5633f84526759266c65c3797f86d1f90c46627d035be846713f8cf90450ffaaf2626920 SHA512 65797119e25ba069926f454cc96c8de1718d134b1bc68fefb7fe483ef65897e9195e81e62defb387242f737b780b934f197434a0ecc86b3463b2d63abeb5d921
 MISC metadata.xml 693 BLAKE2B 40bdc58c6b6541754e1fb5d2b3a6fa4ffd234f84768061f7ac1c1183f2f944a72948ca54824488ed2f177d96f9a0a74dc990ff6e97e6b9dabc4602522c0d27a0 SHA512 3f083b3de6499dfc1dbe59c4aa201f7b159847cf72076e0a7a9f80b029f668dd668395c2219e01dc5035677b21e6cd60f3ccf646fbef6bf458e208a0d79cb94d
diff --git a/dev-python/hyper-h2/files/hyper-h2-3.2.0-failed-healthcheck.patch b/dev-python/hyper-h2/files/hyper-h2-3.2.0-failed-healthcheck.patch
new file mode 100644
index 000000000000..04adc2748c21
--- /dev/null
+++ b/dev-python/hyper-h2/files/hyper-h2-3.2.0-failed-healthcheck.patch
@@ -0,0 +1,74 @@
+diff --git a/test/test_basic_logic.py b/test/test_basic_logic.py
+index fb54fe50..8c8f3b7d 100644
+--- a/test/test_basic_logic.py
++++ b/test/test_basic_logic.py
+@@ -21,7 +21,7 @@
+ 
+ from . import helpers
+ 
+-from hypothesis import given
++from hypothesis import given, settings, HealthCheck
+ from hypothesis.strategies import integers
+ 
+ 
+@@ -790,6 +790,7 @@ def test_headers_are_lowercase(self, frame_factory):
+         assert c.data_to_send() == expected_frame.serialize()
+ 
+     @given(frame_size=integers(min_value=2**14, max_value=(2**24 - 1)))
++    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
+     def test_changing_max_frame_size(self, frame_factory, frame_size):
+         """
+         When the user changes the max frame size and the change is ACKed, the
+diff --git a/test/test_flow_control_window.py b/test/test_flow_control_window.py
+index 24b345aa..7a445af1 100644
+--- a/test/test_flow_control_window.py
++++ b/test/test_flow_control_window.py
+@@ -7,7 +7,7 @@
+ """
+ import pytest
+ 
+-from hypothesis import given
++from hypothesis import given, settings, HealthCheck
+ from hypothesis.strategies import integers
+ 
+ import h2.config
+@@ -715,6 +715,7 @@ def _setup_connection_and_send_headers(self, frame_factory):
+         return c
+ 
+     @given(stream_id=integers(max_value=0))
++    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
+     def test_must_acknowledge_for_stream(self, frame_factory, stream_id):
+         """
+         Flow control acknowledgements must be done on a stream ID that is
+@@ -740,6 +741,7 @@ def test_must_acknowledge_for_stream(self, frame_factory, stream_id):
+             )
+ 
+     @given(size=integers(max_value=-1))
++    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
+     def test_cannot_acknowledge_less_than_zero(self, frame_factory, size):
+         """
+         The user must acknowledge at least 0 bytes.
+@@ -837,6 +839,7 @@ def test_acknowledging_streams_we_never_saw(self, frame_factory):
+             c.acknowledge_received_data(2048, stream_id=101)
+ 
+     @given(integers(min_value=1025, max_value=DEFAULT_FLOW_WINDOW))
++    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
+     def test_acknowledging_1024_bytes_when_empty_increments(self,
+                                                             frame_factory,
+                                                             increment):
+@@ -873,6 +876,7 @@ def test_acknowledging_1024_bytes_when_empty_increments(self,
+     # This test needs to use a lower cap, because otherwise the algo will
+     # increment the stream window anyway.
+     @given(integers(min_value=1025, max_value=(DEFAULT_FLOW_WINDOW // 4) - 1))
++    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
+     def test_connection_only_empty(self, frame_factory, increment):
+         """
+         If the connection flow control window is empty, but the stream flow
+@@ -916,5 +920,6 @@ def test_connection_only_empty(self, frame_factory, increment):
+         assert c.data_to_send() == expected_data
+ 
+     @given(integers(min_value=1025, max_value=DEFAULT_FLOW_WINDOW))
++    @settings(suppress_health_check=[HealthCheck.function_scoped_fixture])
+     def test_mixing_update_forms(self, frame_factory, increment):
+         """
+         If the user mixes ackowledging data with manually incrementing windows,
diff --git a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
index 50176089cdd7..819953993d97 100644
--- a/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-3.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -13,8 +13,6 @@ SRC_URI="https://github.com/python-hyper/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-python/hyperframe-5.2.0[${PYTHON_USEDEP}]
@@ -22,14 +20,31 @@ RDEPEND="
 	>=dev-python/hpack-3.0.0[${PYTHON_USEDEP}]
 	<dev-python/hpack-4.0.0[${PYTHON_USEDEP}]
 "
-DEPEND="${RDEPEND}
+BDEPEND="
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
 	)
 "
 
+distutils_enable_tests pytest
+
+PATCHES=(
+	# From https://github.com/python-hyper/h2/pull/1248
+	# Disables some failing healthchecks
+	"${FILESDIR}/${P}-failed-healthcheck.patch"
+)
+
 python_test() {
-	pytest -vv --hypothesis-profile=travis test ||
-		die "Tests fail with ${EPYTHON}"
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# these rely on fixed string repr() and fail because enum repr
+		# changed in py3.10
+		test/test_basic_logic.py::TestBasicServer::test_stream_repr
+		test/test_events.py::TestEventReprs::test_remotesettingschanged_repr
+		test/test_events.py::TestEventReprs::test_streamreset_repr
+		test/test_events.py::TestEventReprs::test_settingsacknowledged_repr
+		test/test_events.py::TestEventReprs::test_connectionterminated_repr
+	)
+
+	epytest --hypothesis-profile=travis ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
index 9698bdee39b8..a133fd58b9c7 100644
--- a/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
+++ b/dev-python/hyper-h2/hyper-h2-4.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -27,3 +27,24 @@ BDEPEND="
 "
 
 distutils_enable_tests pytest
+
+PATCHES=(
+	# From https://github.com/python-hyper/h2/pull/1248
+	# Disables some failing healthchecks
+	"${FILESDIR}/${PN}-3.2.0-failed-healthcheck.patch"
+)
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == python3.10 ]] && deselect+=(
+		# these rely on fixed string repr() and fail because enum repr
+		# changed in py3.10
+		test/test_basic_logic.py::TestBasicServer::test_stream_repr
+		test/test_events.py::TestEventReprs::test_remotesettingschanged_repr
+		test/test_events.py::TestEventReprs::test_streamreset_repr
+		test/test_events.py::TestEventReprs::test_settingsacknowledged_repr
+		test/test_events.py::TestEventReprs::test_connectionterminated_repr
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/hyperframe/Manifest b/dev-python/hyperframe/Manifest
index 550b9b6e0a10..f714b0acd1d9 100644
--- a/dev-python/hyperframe/Manifest
+++ b/dev-python/hyperframe/Manifest
@@ -1,7 +1,5 @@
 DIST hyperframe-5.2.0.tar.gz 19115 BLAKE2B 6dfd7c6e7f07eb52a499794709fb498a30bc4b534fb49d57295cf280afa200342139fa6c794613e518bbd0e2301672b05826d2adcdd7eebf528469af5e9441f7 SHA512 2e04b48c6d31adb0893a3246046b447c32f3d4485ffe9b08370b6c534ed4273c19e2e2c1a23d48268e333d91d8e911578829776076d8f73743cd9ef597926e3c
-DIST hyperframe-6.0.0.tar.gz 24640 BLAKE2B 7b420c8bcf54510b9dabfca7c7e8718c0c547109874671d11528709572d55e463c91bae14b8cbf6db1eac99a9cceb1799050afc54b709805c9850b3083b72679 SHA512 54812dcd5bc92ebe8333e6976c2edba7309cff9921fbcbae0eda7666bf7de7758b3646f4738404bcbd069c4904e57710cb312c42ef9b6ae1d88a057b0bd0ca44
 DIST hyperframe-6.0.1.tar.gz 25008 BLAKE2B c5cea5b54fd9ecfc0d619c07c484cdd1e2813c656120faadf3f1b61739c608b43d19bd7527b221ad25ea824da05b5747d38f3a6e27d058c1030cce2c4069f10e SHA512 2a5101b2e91e047fe39b32f81a1a8b2240c371fed28a5e1581e743371418388a7dfb55bc819c46a45804e7f00a5231ca54c92aa1b5b41ffeb714b8cb3ac485ca
-EBUILD hyperframe-5.2.0.ebuild 534 BLAKE2B a688483d6758696bf30604410516c424457083969dff113bf905b712d7b1da183f3b9bf47b97ca628f162297181729c6bc4ae0ad2bf868162251ab9405960690 SHA512 70bc15ed6a849bb0991e0c6e8db6cec7b653eefbc87a3734ae26343034d392ce58d8b8dff3973028d569375e4176fa95ba20b9543c60d1fa648ecff31d4c3ef4
-EBUILD hyperframe-6.0.0.ebuild 534 BLAKE2B a688483d6758696bf30604410516c424457083969dff113bf905b712d7b1da183f3b9bf47b97ca628f162297181729c6bc4ae0ad2bf868162251ab9405960690 SHA512 70bc15ed6a849bb0991e0c6e8db6cec7b653eefbc87a3734ae26343034d392ce58d8b8dff3973028d569375e4176fa95ba20b9543c60d1fa648ecff31d4c3ef4
-EBUILD hyperframe-6.0.1.ebuild 542 BLAKE2B ed4191053c3fd48df96c562243d3797c360cff6241cb7f0308f721143ad7f1866206b49cb36972b119d8615fcceca3b9ca2de226f85e27c425ae086f6b5f740c SHA512 90c35216285a54854ccfee5348966b43edbe4d79c11c0b042e71b3b647da8ea94b3f20dbfc8738e267e42c516e4d402b0a2c6c3a332028512553df3921976432
+EBUILD hyperframe-5.2.0.ebuild 534 BLAKE2B 89d47d2c723acae04854c0f665a672a7cf9bfc9724c95c8f8f0316f67c42bb561187b5f831d2cfa14e421e4561b0343e5463fb7c2985c6ee95e3081081b798c6 SHA512 508938500f51282331b003fa57843e4399d0edc5cda61a78e292c0da2e572535bc0a934bf7a6c4070bc3cb11eb2469c94015ca5dd8e63aba4c57acb82096f1b3
+EBUILD hyperframe-6.0.1.ebuild 534 BLAKE2B 89d47d2c723acae04854c0f665a672a7cf9bfc9724c95c8f8f0316f67c42bb561187b5f831d2cfa14e421e4561b0343e5463fb7c2985c6ee95e3081081b798c6 SHA512 508938500f51282331b003fa57843e4399d0edc5cda61a78e292c0da2e572535bc0a934bf7a6c4070bc3cb11eb2469c94015ca5dd8e63aba4c57acb82096f1b3
 MISC metadata.xml 711 BLAKE2B 0670274d28d20ceafb1a00714879f99711b920b1f5fa81c1441db3bf0c09a5e9bab1e9a73ce4e4a420374159de4ece8c1dad1c03fce9504934cc6a9f23df2140 SHA512 cec7173aebbe148bcbe1726e459970cfc1d44fba7617b82335909a115685cbc00f61d0e736bb8fb0c9658c9152dea4d49f3ffa63af2549dc712277c4290c0192
diff --git a/dev-python/hyperframe/hyperframe-5.2.0.ebuild b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
index 58177a229f38..e0445c9d2f07 100644
--- a/dev-python/hyperframe/hyperframe-5.2.0.ebuild
+++ b/dev-python/hyperframe/hyperframe-5.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/hyperframe/hyperframe-6.0.0.ebuild b/dev-python/hyperframe/hyperframe-6.0.0.ebuild
deleted file mode 100644
index 58177a229f38..000000000000
--- a/dev-python/hyperframe/hyperframe-6.0.0.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit distutils-r1
-
-DESCRIPTION="HTTP/2 framing layer for Python"
-HOMEPAGE="https://python-hyper.org/en/latest/
-	https://pypi.org/project/hyperframe/
-	https://github.com/python-hyper/hyperframe"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-distutils_enable_tests pytest
diff --git a/dev-python/hyperframe/hyperframe-6.0.1.ebuild b/dev-python/hyperframe/hyperframe-6.0.1.ebuild
index da2c546c3588..e0445c9d2f07 100644
--- a/dev-python/hyperframe/hyperframe-6.0.1.ebuild
+++ b/dev-python/hyperframe/hyperframe-6.0.1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 0298afc3841b..6dddfb61243d 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,20 +1,6 @@
 AUX hypothesis-6.10.1-py310.patch 2493 BLAKE2B ffc3e9669407a20a2820a59980719d0a176348798a6aa9368f5249cae65cb7c8053f79fdf53d833709793b049bc2c3e4130ab3c9f166d48e5909da1ff07b86ac SHA512 c5762698d1a463ca942d024619453e5e89aeaf5b884eee099489ea91de71d82cf6797e661767cc77a6c84338dd4b989eb255b988ecc6938aa77418667ffaf048
-DIST hypothesis-python-6.10.0.tar.gz 9126095 BLAKE2B 7dbcbb1d1099490c5329fb9a134b87449a8224565c4ccc88692c6cdedc847b0c3143b438f1d7bed98932ddfdf53fb5d09980ec0cc7d5e23fe60e651aef10ddbe SHA512 a9ced1baccaa411c264aa02de3ebc2d76985b3f61a378f9ec413b510b7b16c40cc3072d0d042a03046593b303ee367f3dd34f8b09987a1b0fb97de77f6fe3e8d
 DIST hypothesis-python-6.10.1.tar.gz 9126246 BLAKE2B cc8cb3436d1de5d3d65a13cb5edefdbaae8bf9daed296eea9111ac46c002c34f43119f10b2ab1f45c5cbca5fe46d00738676290eb0e8437f2c10b5926d9e0915 SHA512 586b7f380cb850089f7d5321f11da92ef4a9b80e2ea925103e29c1f6c6c9da0a2a899a1a45ce77e0a40073f147561bc4fcbd5cb2ce77a9c0c65f6f64dfe4b716
-DIST hypothesis-python-6.12.0.tar.gz 9127949 BLAKE2B fae9be5f82362f46554e9912f34e7da06b2e8f8612428af7a8a77bda06e926b8c541e79c40a8aaab4a1d4d299cd947f2ffc92f44c8d569c185891e5b6aaac61e SHA512 7eafa80a546d17cb5239caf3aa18df1a23caea3021fe9a8d1e180c85443920df44ab93a31c13192ea9856db6a1ee8d5af82f44dcbaefb6dba6c37ab63081e050
-DIST hypothesis-python-6.6.0.tar.gz 9117847 BLAKE2B bb88ebee9db53f1c5753730d04e5dfe6a39ac4c5f7d534778b22b813ba188a55de6ad8a34f611f7863d1c3287be39ed7e10981e9d6ed8d8dd106688f154c3a49 SHA512 a446b4a11c6ee013225bfcd58e26efc6c9d867545d9bcf90a19468cb01fc5e2c5a7280ff9a80d4a1adbfe06dd155df6152941d5f53869d85e1d259e68a33a5e2
-DIST hypothesis-python-6.8.1.tar.gz 9119495 BLAKE2B 4d98e30a04f652af79dd49e921b856124a312b63f087a6fd200282e9b0a0cd6fcad1a42a6008406bc347f21bf9cd6c5ff2db79d013987281f59365bd9d91550d SHA512 2f25e994438479b5faa15b2038146ab385445bf2722b0951ff55f324b074248d7322c4c6f3e9c659c18d0aa94150eea4c6567a7ac24debf2de4b32bab37a4dcc
-DIST hypothesis-python-6.8.9.tar.gz 9122168 BLAKE2B 2568dcfcbc7182071247d0b7d978abf2184be4583937a42568c3e199eac6ce538adb7b3687747979fc6ab9da1e61088db7d1a01294982e75cb04992cdc10537a SHA512 4dc3884e2487f27a3b6b362e04cecd281f9072fdd2e8e91738899baf589d6d48df9eeacb9a158251c20b210d1190b78eadd191aa95f151023bd81091131dff66
-DIST hypothesis-python-6.9.0.tar.gz 9123041 BLAKE2B 5c9a4d1bed02417dd35e67f7f8e63accc7a9c071fde03b7c38b835945605377d8898fbc760fa8149e8476beb247ce19ec946f5365065dfa66b2cb52381760373 SHA512 8d63b22ec3ac9418dde758f70f2a8b65b455cffa32fbbf1fc99c2e64ca40f73436ee9eddea7ada34d8d68a41e88b50d54166babee9869fc03b32926bd85a4507
-DIST hypothesis-python-6.9.1.tar.gz 9123088 BLAKE2B 6a960622fc14d507d5ac66737b88e7b7184c827f31c505797be33766ac8d1721191e48334b58d1d73ef1058eaf94d88ef9d7ddf256948180a12c707b6963d1de SHA512 ad5f18ecbb0376b04eb26f58ad2b72ae6789029bf89f36d4880e5212a4cf7d669a048bb8d4f0bdeb0f5c1f1cc053d054d60235224f5154803fd0319d7b140b3b
-DIST hypothesis-python-6.9.2.tar.gz 9124848 BLAKE2B f1d13f37ee2c9fa4d2716e6c4df412cf652704c1fecda575be2959cde10c9e8b9e54b4a772bda4f1c476936817e6d47d8c17880fa13714daaa9e7b7fd0eca56d SHA512 c209e921e89b5b5863e7b103462cf34a0fd5d06c373c4d880b2aafd8b9521fcd95f58cd00f55eff81804352721b1114f208ce0e19f9142783834e93867ba336b
-EBUILD hypothesis-6.10.0.ebuild 1751 BLAKE2B f84f1719fece3b44d09ba88e12404b0c74d045ce4752dd2360f5479cf0cf88fbb764a19f3b43fda536629a45da0981d1d50c45c1f8446696c7c62a9c30b23cee SHA512 c1d8d55ed2ec689845a4901efe22835ba98da8e358f0d96a4c2d64893e27467d9ed179d41807cd937dd14931bac1a5695416d78a38b6a87e7cf83fb1c86a757e
-EBUILD hypothesis-6.10.1.ebuild 1775 BLAKE2B c4c0ecfd0f56207f664d5e2ee58671672d9222d9644b5dceba87229daa8efd5136e861a5ae03c8746ae0e4ad4ed4dee210fe62b4ea0cb6be08376639874e34c7 SHA512 198e882f9b9d4f47a7cbb9178e322b69dbd7da0dc39ef08c89501efad5ef178d25c6840106e1cb26642d649ffe43935732c3a3ad77cd1ecb768f12a95e610146
-EBUILD hypothesis-6.12.0.ebuild 1730 BLAKE2B 84d537ed7efae1e6abd955073fb36da430dff3197223b86039299e87122c2214b9c5e2879d085785c6e22b2e2ba389c62e3982bdab1cc9fa6426215757e2b746 SHA512 7cf50f09c62bff9d35a4d7455590c86471c535d0d5e00f73ce6e33a43cb17d31d365118a064d2a3c60c49d6c20b0e56ebf63a33146a73de7035e250b200588c4
-EBUILD hypothesis-6.6.0.ebuild 1795 BLAKE2B 55f094af24a70891b7029c691b48515905f2c57b75e3802e0db49ce61e896abf33d824efe20ff2361c3be546c44474010925eeef4ae2a0db54aafc57758d082f SHA512 b7084976bf688e4b25eef954ead0bd80908baf4e54d84e7a6ff23abab22f6408191f8225b9e79a5ea52144a946f7a34f8be7a0919bb400a5daa17d2e058d959a
-EBUILD hypothesis-6.8.1.ebuild 1751 BLAKE2B f84f1719fece3b44d09ba88e12404b0c74d045ce4752dd2360f5479cf0cf88fbb764a19f3b43fda536629a45da0981d1d50c45c1f8446696c7c62a9c30b23cee SHA512 c1d8d55ed2ec689845a4901efe22835ba98da8e358f0d96a4c2d64893e27467d9ed179d41807cd937dd14931bac1a5695416d78a38b6a87e7cf83fb1c86a757e
-EBUILD hypothesis-6.8.9.ebuild 1751 BLAKE2B f84f1719fece3b44d09ba88e12404b0c74d045ce4752dd2360f5479cf0cf88fbb764a19f3b43fda536629a45da0981d1d50c45c1f8446696c7c62a9c30b23cee SHA512 c1d8d55ed2ec689845a4901efe22835ba98da8e358f0d96a4c2d64893e27467d9ed179d41807cd937dd14931bac1a5695416d78a38b6a87e7cf83fb1c86a757e
-EBUILD hypothesis-6.9.0.ebuild 1751 BLAKE2B f84f1719fece3b44d09ba88e12404b0c74d045ce4752dd2360f5479cf0cf88fbb764a19f3b43fda536629a45da0981d1d50c45c1f8446696c7c62a9c30b23cee SHA512 c1d8d55ed2ec689845a4901efe22835ba98da8e358f0d96a4c2d64893e27467d9ed179d41807cd937dd14931bac1a5695416d78a38b6a87e7cf83fb1c86a757e
-EBUILD hypothesis-6.9.1.ebuild 1751 BLAKE2B f84f1719fece3b44d09ba88e12404b0c74d045ce4752dd2360f5479cf0cf88fbb764a19f3b43fda536629a45da0981d1d50c45c1f8446696c7c62a9c30b23cee SHA512 c1d8d55ed2ec689845a4901efe22835ba98da8e358f0d96a4c2d64893e27467d9ed179d41807cd937dd14931bac1a5695416d78a38b6a87e7cf83fb1c86a757e
-EBUILD hypothesis-6.9.2.ebuild 1751 BLAKE2B f84f1719fece3b44d09ba88e12404b0c74d045ce4752dd2360f5479cf0cf88fbb764a19f3b43fda536629a45da0981d1d50c45c1f8446696c7c62a9c30b23cee SHA512 c1d8d55ed2ec689845a4901efe22835ba98da8e358f0d96a4c2d64893e27467d9ed179d41807cd937dd14931bac1a5695416d78a38b6a87e7cf83fb1c86a757e
+DIST hypothesis-python-6.13.0.tar.gz 9128293 BLAKE2B be618d42639602bc6617f8b5e9374812298e9d6150b6510a8060ca7c489ea69f1d6bd2cf9322c325c9bffc3c3f886fb4a4fb038159fa2c81920541ac4cb668cd SHA512 66fd6e7842b7b257c92cf756db4cf97bfb64006c89e3e58cda154ebe9345302f0264297df8d9de0685033a0f4e43909d65e76495689a8ded9968ecda586b668c
+EBUILD hypothesis-6.10.1.ebuild 1767 BLAKE2B 39d721a030c21acf4ab802f2f9f86cefbe9580346885fab4ac10191dbc7aa97598c28145566cdebd755d850550acb841161f4219f2165a02bf73a37797626476 SHA512 1008328cdfab7d2d517923817d50e6ac2ad154b1ef2903da704f79311036bfc8c0d3ff4565372d2c1890b2344bf8e8dc0ff8977291829187efabb4d62c73dba1
+EBUILD hypothesis-6.13.0.ebuild 1730 BLAKE2B 84d537ed7efae1e6abd955073fb36da430dff3197223b86039299e87122c2214b9c5e2879d085785c6e22b2e2ba389c62e3982bdab1cc9fa6426215757e2b746 SHA512 7cf50f09c62bff9d35a4d7455590c86471c535d0d5e00f73ce6e33a43cb17d31d365118a064d2a3c60c49d6c20b0e56ebf63a33146a73de7035e250b200588c4
 MISC metadata.xml 755 BLAKE2B da1fcfe4509905d2058d448b0178dacbb87026a3542368d8aa3ffca38edf1cd3d76d9542f8badc0220f5b5c916fdbb054f65b054a361977e0258e475768e3cf3 SHA512 3f046788581ef05937ec8376538cc60628f9d8e25486fc6e4421dd8461a9a085f51540e1d5203ccf85007adf1a978a23da9ac39cc486d698967412eeb3f2a793
diff --git a/dev-python/hypothesis/hypothesis-6.10.0.ebuild b/dev-python/hypothesis/hypothesis-6.10.0.ebuild
deleted file mode 100644
index d27660625403..000000000000
--- a/dev-python/hypothesis/hypothesis-6.10.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} 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}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; 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/hypothesis/hypothesis-6.10.1.ebuild b/dev-python/hypothesis/hypothesis-6.10.1.ebuild
index 7afc12a80287..84ef68e57bef 100644
--- a/dev-python/hypothesis/hypothesis-6.10.1.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.10.1.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="cli"
 
 RDEPEND="
diff --git a/dev-python/hypothesis/hypothesis-6.12.0.ebuild b/dev-python/hypothesis/hypothesis-6.13.0.ebuild
index e8455f78614c..e8455f78614c 100644
--- a/dev-python/hypothesis/hypothesis-6.12.0.ebuild
+++ b/dev-python/hypothesis/hypothesis-6.13.0.ebuild
diff --git a/dev-python/hypothesis/hypothesis-6.6.0.ebuild b/dev-python/hypothesis/hypothesis-6.6.0.ebuild
deleted file mode 100644
index d7dd6c54f55c..000000000000
--- a/dev-python/hypothesis/hypothesis-6.6.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} 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}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; then
-		sed -i -e '/console_scripts/d' setup.py || die
-	fi
-}
-
-python_test() {
-	distutils_install_for_testing --via-root
-	pytest -vv tests/cover tests/pytest tests/quality \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-pkg_postinst() {
-	optfeature "datetime support" dev-python/pytz
-	optfeature "dateutil support" dev-python/python-dateutil
-	optfeature "numpy support" dev-python/numpy
-	optfeature "django support" dev-python/django dev-python/pytz
-	optfeature "pandas support" dev-python/pandas
-	optfeature "pytest support" dev-python/pytest
-}
diff --git a/dev-python/hypothesis/hypothesis-6.8.1.ebuild b/dev-python/hypothesis/hypothesis-6.8.1.ebuild
deleted file mode 100644
index d27660625403..000000000000
--- a/dev-python/hypothesis/hypothesis-6.8.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} 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}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; 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/hypothesis/hypothesis-6.8.9.ebuild b/dev-python/hypothesis/hypothesis-6.8.9.ebuild
deleted file mode 100644
index d27660625403..000000000000
--- a/dev-python/hypothesis/hypothesis-6.8.9.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} 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}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; 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/hypothesis/hypothesis-6.9.0.ebuild b/dev-python/hypothesis/hypothesis-6.9.0.ebuild
deleted file mode 100644
index d27660625403..000000000000
--- a/dev-python/hypothesis/hypothesis-6.9.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} 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}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; 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/hypothesis/hypothesis-6.9.1.ebuild b/dev-python/hypothesis/hypothesis-6.9.1.ebuild
deleted file mode 100644
index d27660625403..000000000000
--- a/dev-python/hypothesis/hypothesis-6.9.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} 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}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; 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/hypothesis/hypothesis-6.9.2.ebuild b/dev-python/hypothesis/hypothesis-6.9.2.ebuild
deleted file mode 100644
index d27660625403..000000000000
--- a/dev-python/hypothesis/hypothesis-6.9.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} 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}]
-		' 'python*')
-	)
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pexpect[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		!!<dev-python/typing-3.7.4.1
-	)
-"
-
-distutils_enable_tests --install pytest
-
-python_prepare() {
-	if ! use cli || [[ ${EPYTHON} != python* ]]; 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/identify/Manifest b/dev-python/identify/Manifest
index b27c9787f502..25db28ac4ffa 100644
--- a/dev-python/identify/Manifest
+++ b/dev-python/identify/Manifest
@@ -1,5 +1,3 @@
-DIST identify-2.2.3.tar.gz 100962 BLAKE2B 0e56b7443f19e0956b72c428b2cf4c741b10cb38e6cad3efa6fa130d3ac1ec84e351d049c58bac9098b85cd32d64459f96e2cd3f13ee43b6cf7190c1894b5a88 SHA512 44bf3b845c9ef93cc539645765af63b037fc9e421f0a97c848946399de13c1d47df86efe63b0bb50fbd54a76912d3bcc7f7f972e7f77c491933d20243492a7f1
 DIST identify-2.2.4.tar.gz 100967 BLAKE2B 9473a157ce2aed13ed45d6e8d83b4510c40ae977406b9d7b211caa70c27d1850cf49da8848495841281b1f192b576d269a5372215effd7d89c9211e51d51151d SHA512 25e255fd62d0e75aafa7037085362b7bf2ba8ae142bfb11e0e20452d503d8ec3f90ec84c8ef8966fb021fe1054c226862b3ce99d2288ec9aaa758a8971d1c87a
-EBUILD identify-2.2.3.ebuild 526 BLAKE2B 8138f1b173a62887ec83a95a40a3a8e47f587bc2dcf80f4d82dd01400b812dd30258a134f5726025f8d1cfb1d977ad006e0c3f711af0e5df42279b7b6648c6be SHA512 146f06e9f358b9d826c9d8cdeb972353cb943bad82fe808322009543eb8fa9c4a80ef2abe89cb8b43bb58f261ba65cda415855bc6fc4c77c5faf878679af76e7
-EBUILD identify-2.2.4.ebuild 526 BLAKE2B 8138f1b173a62887ec83a95a40a3a8e47f587bc2dcf80f4d82dd01400b812dd30258a134f5726025f8d1cfb1d977ad006e0c3f711af0e5df42279b7b6648c6be SHA512 146f06e9f358b9d826c9d8cdeb972353cb943bad82fe808322009543eb8fa9c4a80ef2abe89cb8b43bb58f261ba65cda415855bc6fc4c77c5faf878679af76e7
+EBUILD identify-2.2.4.ebuild 527 BLAKE2B 7f31f76b93b5af6086dd3e647ad2fd8f918a6547c1b7e0b6255bfbc6b7685bb116f1f1a6b4f790178aacf14c147bd950f7833e90223ad5827a0cc4af95d56339 SHA512 887fc5846659dec85733ea0cfa5aaeabafc348bea98faf0d3cdb5a07e0d5aa3f46e9862059c443e3c88db49e0d78e9dd2f92062f460a8469a32c1ff988cbdd70
 MISC metadata.xml 375 BLAKE2B 5f97fa87c1c286f77f578814baad9249203d07249c189e59e33353d34f91d1301c0055c5ec6a8374657e47609188e1da83cc8f420e72caa2e38a1f2f45e91ce1 SHA512 519958c4a7447a47d8c7e63349b989354513fd7c7f90256297486601752e8e8d00a233a353602ac0ad1240497fad69e4124efff72d1e4b21fffb690d68164024
diff --git a/dev-python/identify/identify-2.2.3.ebuild b/dev-python/identify/identify-2.2.3.ebuild
deleted file mode 100644
index 302310afdfe1..000000000000
--- a/dev-python/identify/identify-2.2.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# 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="File identification library for Python"
-HOMEPAGE="https://github.com/pre-commit/identify"
-SRC_URI="https://github.com/pre-commit/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/editdistance-s[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/identify/identify-2.2.4.ebuild b/dev-python/identify/identify-2.2.4.ebuild
index 302310afdfe1..a83837f77d4e 100644
--- a/dev-python/identify/identify-2.2.4.ebuild
+++ b/dev-python/identify/identify-2.2.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/dev-python/imagesize/Manifest b/dev-python/imagesize/Manifest
index 3da0ba205414..c65e9ed2782b 100644
--- a/dev-python/imagesize/Manifest
+++ b/dev-python/imagesize/Manifest
@@ -1,3 +1,3 @@
 DIST imagesize-1.2.0.tar.gz 1274955 BLAKE2B 20293418635362f7360d2f02299f9392a96ca09773c97dd8eed38ca424008fa9d71139bbaf8d61e0daf5dbc90f3c46af9ee60d26e9fb1c2479eb8875ebcb7305 SHA512 c82a7fe433064c3a60ed664bad8ce4e602c527bcf2f7c9ab9be6ed650654626d9e0907028b2b0c5a484712bc989335b2b4f66494c8d445f5043ed4c2bc519700
-EBUILD imagesize-1.2.0.ebuild 521 BLAKE2B dd23a7a87774ee9158212122754f534c48023a97f3f5b76b7301305df80b4a75f6bec7656be4f25617eef192aa7189b12481db2e0b83755a29023239ecdb6bba SHA512 369fee8e7fcd77a5cfd8d1edcd7864da03fa5b04289f823105ba186fcf142eb1b66514cbfaea20c323f634ce72db77b2715ed288ed2b4a4261b12724c1ea3b9b
-MISC metadata.xml 459 BLAKE2B 55933c293a6441f69b47f9166925382254383ac600436fd822279fcd63dd9fc576d761bcea24e7b5faf9812f554907bb7635b1fe4a2ae85de6fd3d5c01f0fcf2 SHA512 b9ea9fcab45671b1c26c5128b3350ec6637c1c558855f3cf4637c7d1ad126842d66b5d914b9f1d7594df44bae73ac636ef0fc631b16e2550f5a7fa81ccfe91ee
+EBUILD imagesize-1.2.0.ebuild 522 BLAKE2B 9f6b100ca6a1a499a5a812ae506d723bcf1378ebc307dbd5e15b010a4ff32b1755702fb50c1484e6c4356ea2558a4c93a12ddd8b834f1238a991a6261a3f43d8 SHA512 11ddb721a47c0a222c6e3d4ec644bddd6f34debf46b3a4490a7baec0175106a7184fe40856fa60810e8b94704b498e9e09abc64c68a3b371b7fc29d49fa463e1
+MISC metadata.xml 483 BLAKE2B 4c298f3f3183bfc932253e10cce1e82ab38f2872c5dcbc71c96ac62ec39af7baa883053220a62536a7dcc55cb0b630c7204e8adf11a0ac63545c8ecee40af57a SHA512 b6bbec263029f10161cd73d710e0b2c4723a90642132500c051e28fdd69a0b46edd6d213c7392da424dd23eb785f5e4533904df7dd29a8a57cfe7a9e8280b4b5
diff --git a/dev-python/imagesize/imagesize-1.2.0.ebuild b/dev-python/imagesize/imagesize-1.2.0.ebuild
index 7e782a25b696..d4bb686c0269 100644
--- a/dev-python/imagesize/imagesize-1.2.0.ebuild
+++ b/dev-python/imagesize/imagesize-1.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/imagesize/metadata.xml b/dev-python/imagesize/metadata.xml
index 8d34c13cf35e..027aa3f94f05 100644
--- a/dev-python/imagesize/metadata.xml
+++ b/dev-python/imagesize/metadata.xml
@@ -3,6 +3,7 @@
 <pkgmetadata>
   <maintainer type="project">
     <email>python@gentoo.org</email>
+    <name>Python</name>
   </maintainer>
   <stabilize-allarches/>
   <upstream>
diff --git a/dev-python/iminuit/Manifest b/dev-python/iminuit/Manifest
index bfd15c2059af..d53e085ec50c 100644
--- a/dev-python/iminuit/Manifest
+++ b/dev-python/iminuit/Manifest
@@ -2,8 +2,10 @@ DIST iminuit-2.3.0.tar.gz 371854 BLAKE2B e432da9281c5d50eb306766b65e20a1d02b0fcc
 DIST iminuit-2.4.0.tar.gz 372122 BLAKE2B f6590bb67d8c79cb8398345a76a7af7e95bec83864ca950701a97cc3e0543c6b6f2aac8340cd814586328ca519387f592dd45115348a3e5c1096c87799db2f81 SHA512 9c5664cc2b21ccb0f09a63bd5484dc65a6226d385d073f2430a0d5230a3c624694b37adc911e787d87bd6d6541a5d322dcf937a0bd82cdbf9362cb53edb4a7ea
 DIST iminuit-2.5.0.tar.gz 375912 BLAKE2B 422bb8ec8f6a763ff010bd28f695a1b26ef3b3c44e324ffc2f4592d224ba5380d29b47b99d9f8b3f9dd8a5d81ed45197b6f89eb2d2fa599d8d1fdf9e50358e58 SHA512 25ce217ded4f9a142cf0522d9e66efeee4c3bcc16cd1f324a5008c1b64477b2a37a9655ea939c74bc60f9222cae8045bf7a77a5807b09cb3e3e61da4f41e3c91
 DIST iminuit-2.6.0.tar.gz 376846 BLAKE2B 5c5c8ec223ede39ea3c02d3df0639e52047f897eed7b441d567ed3f88656c6ae5740efffb234bbf29ecfa4578bce38a6a5ff4983d738ad1321df35efd0c14acf SHA512 6f413e11d8be3a823a7d12bf1e9197abb27561a15ec29127f6bf4c2339dfc67344b0900522d10e59dbbe1eb08bafb931950b2edb5f5679e06459bdf52abc1170
+DIST iminuit-2.6.1.tar.gz 376846 BLAKE2B bec73b182a24c242fe5c8931e7cb745728b8f492c8989c9d58615b71bcc705e5c36195e28158b550e06b9356235d5a89f9e170da62b808dd89a1083f705e0650 SHA512 5a600842c8e4ae0d2c1ec4b24d5f5a33dae6d0e7659b1908b4215289f82974d97a932366817c7af257d63bf5418080884c01936d84b55942f6149b05db7ab03f
 EBUILD iminuit-2.3.0.ebuild 683 BLAKE2B 23379ee200bd6aec74325484e0095eec18edb0a9a71547e25588c962592d40c7cfc29dcc5bb295b56d32e90bc7b71a12ec956f68d5c1592df9112f5181690321 SHA512 4b8593b0e739b1466db4199fcb2122ede44f5642df417a35d010502e19b7068e6b9513d2478b2d2906f5fa0970a4f53cc431bb1a45e49bd118f9cfa655499503
 EBUILD iminuit-2.4.0.ebuild 683 BLAKE2B 23379ee200bd6aec74325484e0095eec18edb0a9a71547e25588c962592d40c7cfc29dcc5bb295b56d32e90bc7b71a12ec956f68d5c1592df9112f5181690321 SHA512 4b8593b0e739b1466db4199fcb2122ede44f5642df417a35d010502e19b7068e6b9513d2478b2d2906f5fa0970a4f53cc431bb1a45e49bd118f9cfa655499503
 EBUILD iminuit-2.5.0.ebuild 742 BLAKE2B 0ff6019ab1c0332c44ed9f39f9b5a1dc4c4ba9eca25e65259ab4f22b1c1f9e9dc7d72275d725e13b9c57db53d729fa29a508dd9b6b2ad4ff55f74dfdf2961565 SHA512 5a5dc72740f6e0765c1be58f703f8e1f2d56c4d1a765388404d7e984e9065866d1268cc51a64adc4bc043ab435f6f08d7c4db30891312b60b4fd1561047a3b3d
 EBUILD iminuit-2.6.0.ebuild 742 BLAKE2B 0ff6019ab1c0332c44ed9f39f9b5a1dc4c4ba9eca25e65259ab4f22b1c1f9e9dc7d72275d725e13b9c57db53d729fa29a508dd9b6b2ad4ff55f74dfdf2961565 SHA512 5a5dc72740f6e0765c1be58f703f8e1f2d56c4d1a765388404d7e984e9065866d1268cc51a64adc4bc043ab435f6f08d7c4db30891312b60b4fd1561047a3b3d
+EBUILD iminuit-2.6.1.ebuild 742 BLAKE2B 0ff6019ab1c0332c44ed9f39f9b5a1dc4c4ba9eca25e65259ab4f22b1c1f9e9dc7d72275d725e13b9c57db53d729fa29a508dd9b6b2ad4ff55f74dfdf2961565 SHA512 5a5dc72740f6e0765c1be58f703f8e1f2d56c4d1a765388404d7e984e9065866d1268cc51a64adc4bc043ab435f6f08d7c4db30891312b60b4fd1561047a3b3d
 MISC metadata.xml 493 BLAKE2B 6b9a29fc8851930ad4c8a23ee8e10983f68dd21eec5637efb12cacd6a20b154746333918f6acd81c71422dd3f54128e210448f6ae9710c180939d38c4325840b SHA512 8715ffcb3ac90a2ef0cb20efaefa6375b4bb901c5b7e224702ce951a6dc5b963a64ebd57ad55bc46eece978a9ea4c24124a2ae09dde2315d7fc4a79fbc2154d6
diff --git a/dev-python/iminuit/iminuit-2.6.1.ebuild b/dev-python/iminuit/iminuit-2.6.1.ebuild
new file mode 100644
index 000000000000..9dad35750c8b
--- /dev/null
+++ b/dev-python/iminuit/iminuit-2.6.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+# forced implicitly
+CMAKE_MAKEFILE_GENERATOR=emake
+inherit cmake distutils-r1 virtualx
+
+DESCRIPTION="Minuit numerical function minimization in Python"
+HOMEPAGE="https://github.com/scikit-hep/iminuit/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT LGPL-2.1"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
diff --git a/dev-python/importlib_metadata/Manifest b/dev-python/importlib_metadata/Manifest
index e1dac929ab98..22dbdbf2e65d 100644
--- a/dev-python/importlib_metadata/Manifest
+++ b/dev-python/importlib_metadata/Manifest
@@ -1,7 +1,7 @@
 DIST importlib_metadata-3.10.1.tar.gz 39980 BLAKE2B 9e7ba25618c9a530d122e43d6d56cc0386aad87accef111574b24aa53aaea51e08c422275acf4650eae2102a92de30d066a66c72c02b3a3b432ce9bd9453dacc SHA512 e028fb6abba0c7775943c346db0e733b5ba879583184c99f8413ded6314162e5dce03e10661b16392825038096fac8f6fbbea47ceac9565c60227129f3a3a48d
 DIST importlib_metadata-4.0.0.tar.gz 41881 BLAKE2B cd0330e2a5959f651ef6ceee722762c3cbb034a534dab6c24523ca76d25dde4cb2c6bb06cef7e787db9a9cd83ca08a71bfd7b849db57ef4a95e461e6d887b14e SHA512 bbdf7b3f1e714c5a02babe0f9ff5eb366942e21b626d1d61839ee04040d0ed529cd299afd446639795b34665be20e6438d8e9970292b282946a8b6495682f726
 DIST importlib_metadata-4.0.1.tar.gz 42189 BLAKE2B ed0fda0a2218efc75ce4fd614c8d69767042f035d026b28348d7909b7d6a520e6c1a6f1edb8a00f5e0c0e0e9f818d65e97ad590471d2398a5fb21f4efbdad600 SHA512 972e2f4bcd6433f603f0c6e23f4dbf4269993a47a5a8f66740e0143df63568ea8ca4ed6aa84587dcf967c6c4ba93e5d5ead9ac9444db9bc6424bd8c238f8335e
-EBUILD importlib_metadata-3.10.1.ebuild 1267 BLAKE2B a4be27960ff413f8f7be4ee4e1e7ad8c74be2bb0eae0489c41e84ad76dc8f384b50c7f721b459d317ff5c3634cb0b115f0a46880cd49d47f77c623ec3bc82372 SHA512 cd3387d35bc21512f607ecfeb5d192bd83c1fe8ab49684b1a69b1d36f4c5456f9a9182f2f9707345d475730bbca1ce90b0cd4b1e078e99a41b0d9179e6263f4c
-EBUILD importlib_metadata-4.0.0.ebuild 1275 BLAKE2B 151f0c0660967a67aec7959309e5ed2e85f2ea7547c2f7d273444f097287c04e87010a7338e6f4f87f0345b2a64fe7850804adbd174a12d81f676ba0c8f278f8 SHA512 cca8e63ec6b503b3290e65ff425cb1cdc32d6aee6b9d2a1dc5effc05a9f8b9382b1b42515df45c0cd5b2804135d25628d8a19ab242bddb43b5ecbaf5aafb15c4
-EBUILD importlib_metadata-4.0.1.ebuild 1190 BLAKE2B 5f848f70dab64967c21581ecbf0f72fb20abdc2704368eb09295e7d951bbd88bb71f7ed649c937bf7b4c0bed14b516a6948caa383ffc8f91243c579726480dd1 SHA512 e4f9058bd6af196efdd35da639a0db5fd55107f340a96b6b4ea7fc76dd1f2c663df525cd6ca9c036e538f107436bcbcef0b17f95d06ad33fa30345c7f987e6cf
+EBUILD importlib_metadata-3.10.1.ebuild 1273 BLAKE2B ec33cf32a3fc2a92666c0e9aac0d3d72968b7e31d7c8e4f5f6e90462b8b07efc2754f20c011a11065f726a6197b642d08eb4c6c70240a64eff67aac23b51b3a5 SHA512 eb3e8fc070b6a7f797ed1a92fd34bd7263046ed44603a436a882daf38d0da3a4eab4c981ca6c0fd6d4c4a3a0d6ba5822698f82b7e3dce90ae8b37e0017f27cb2
+EBUILD importlib_metadata-4.0.0.ebuild 1281 BLAKE2B eaf8b2c298ee8510f9182e88d2f01bcc33461c7c4fd18f5a26f06a692c6684618aeb3747bea8f330d0a6e2926b1b86ef0eede8d7aa73022c0e6372ffbb13492c SHA512 77544555aa575bd4accb1a6bf073e916e80b094a77af906bdccfe05d11e5ccc31fdb0c6ee218470317708c2d3b1a45d71a1e9d7893acf486eff1510a9809f404
+EBUILD importlib_metadata-4.0.1.ebuild 1196 BLAKE2B 3ead6c5f928b927213b7e34f1d6e8827964f19a2887c2c543483eab71003410f31a2098a33bc926630a76ba2f33e5c48c52b24383a6645074b5d2a82032d027d SHA512 5de2f8ff2a79ddd95065d3bbfc0bbfb10a5265f52e0d3dcc6825989d632aba957c605a0ca0fcfa9ab1c040359f51a17bccc54fa4497b2ccc744b972dc53c084f
 MISC metadata.xml 645 BLAKE2B e0d506f3cb5304b3cb14bd546c997978bfa70d77b16abd318c8e733ae90057b4dae2533107c3157a53df21b9f3046be0317c62367b3de26cfb245f4bf572ae85 SHA512 054fdafb3815ca9fb34178219c48ce5779f2ac8a700112d470fbf3bfdf780a6d98e0f30b6b0c7d6bc48cb12bda304dac01eacfa45d06964da704457311402679
diff --git a/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
index a8827f8bc182..98ce41c1e073 100644
--- a/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-3.10.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
 	dev-python/zipp[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild
index c7a1cf5de753..ee6431b44f73 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.0.0.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
 	dev-python/zipp[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild b/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild
index 39c08af934b8..e7af70accd2c 100644
--- a/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild
+++ b/dev-python/importlib_metadata/importlib_metadata-4.0.1.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS=""
 
 RDEPEND="
-	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7})
+	$(python_gen_cond_dep 'dev-python/typing-extensions[${PYTHON_USEDEP}]' python3_{6,7} pypy3)
 	dev-python/zipp[${PYTHON_USEDEP}]
 "
 BDEPEND="
diff --git a/dev-python/importlib_resources/Manifest b/dev-python/importlib_resources/Manifest
index ad1acd7ac9ac..fd6d87b4e10d 100644
--- a/dev-python/importlib_resources/Manifest
+++ b/dev-python/importlib_resources/Manifest
@@ -1,3 +1,5 @@
 DIST importlib_resources-5.1.2.tar.gz 32177 BLAKE2B 5374cad672f7324cc31ff4709f0fda27dc48435c2469282fe84bb9a453917ce15b1c3529f502a8b42993638768e7ee781a4601665c60ad6da2811748b4866006 SHA512 894bcf55aa4789a8d47d832cc9a20ac0763270e78f03548b7e714d18f64f4b4ebdabdadb4dd1b2bc9513df13a3f328ef5d62e6015878738ea59e6f139e4c195f
+DIST importlib_resources-5.1.3.tar.gz 28613 BLAKE2B 7edf1d75ae977c674223059504e5d7912cb83503d7a70b0b9251c5af130acf8c1466b0314c583167c1210a3fc3005d298be5fd1e6b1d7e6d128ad46142decfab SHA512 cfd778e6a07799577625a0102b79d3fa69c710215168b6aaeffea68db41ff84ff5c15681fcd4d68be043a618554189720520fc0d1266df3e522035924903d39a
 EBUILD importlib_resources-5.1.2.ebuild 822 BLAKE2B a5278d617f596adb9b4bbd2be1327f8d3101705e843ec41314fd8de71880998451717406fd06547e7467c13906c4aa4e9134f88ac72600d0a61b1d73cee86a19 SHA512 4f541d1afca24b5b3a7a60bb0b121eb3d513f67e975f4f5217b8669ea444ab52bede560ed0ae13695f243f05208b6955ff2d5bc56afce03a853af0ad6c19a7bb
+EBUILD importlib_resources-5.1.3.ebuild 830 BLAKE2B 202b6e72a123540ea2ac6241831ac814a648989e411d75e40a63f44cb1d31114ea877bab62b188f64881983a8273b5ce94fb7a647213c41a8b02be1526b7e556 SHA512 8c78ba7c7b2470e0d18b4c720fb756fc7967e26369f94ea509da875a848b2651c4e1c75b29b90917b97b58af964f866668b813c6a51c1e7881665bd414d98ff3
 MISC metadata.xml 944 BLAKE2B 7a5aa1dfb947b0115f3e22f9550471b452204daedb386e78374c5dc19b408ec52bf5887d3e645c41be9ebd16f3bd003a2ac1bb3bac539e603d44decd86b92458 SHA512 f17b2ad2e3eedd75db96765537c30d68aa28c60137b12bac3bb47307347431a19ca064a94c8e41e4a3947ab2669605d7183b5b62e55def66631d20ab903e1ea9
diff --git a/dev-python/importlib_resources/importlib_resources-5.1.3.ebuild b/dev-python/importlib_resources/importlib_resources-5.1.3.ebuild
new file mode 100644
index 000000000000..832a9c131a5d
--- /dev/null
+++ b/dev-python/importlib_resources/importlib_resources-5.1.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# This is a backport of Python 3.9's importlib.resources
+PYTHON_COMPAT=( pypy3 python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Read resources from Python packages"
+HOMEPAGE="https://github.com/python/importlib_resources"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/zipp[${PYTHON_USEDEP}]
+	' pypy3 python3_7)
+"
+BDEPEND="
+	dev-python/toml[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-3.4.1[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests unittest
+distutils_enable_sphinx docs dev-python/rst-linker dev-python/jaraco-packaging
diff --git a/dev-python/incremental/Manifest b/dev-python/incremental/Manifest
index f4b2fe1629a8..63d0c5efe06d 100644
--- a/dev-python/incremental/Manifest
+++ b/dev-python/incremental/Manifest
@@ -1,3 +1,3 @@
 DIST incremental-21.3.0.tar.gz 17058 BLAKE2B a6c49d15eb73abbab129e675d937e795a47aca10f74a8d5fc80ebf6575ca996cc7dc16aac9ca02c7a206cf8f59b239f3fc04fc00b28827d0a3c76a88189dabf7 SHA512 b8b50151cd2467e552d9268decadbb839b047cf58a450b72e0437ffc5f9af7d78c20a24193c0668cf48dd6264b852d9cee68e59529018e0ca07825e0c185d1e8
-EBUILD incremental-21.3.0.ebuild 774 BLAKE2B fa3b3deb1fb7d1769da6fea6321bb043a86ff0f5f3152a788d78f5c3db5a11993195fee506fb1ae1dda5e94620a593663d7e838436aeedb4a71e728c91fbf484 SHA512 876f88b87ee192e2f22c09aa12c47c85f275910e93fad40fbb7b8727e8da06897f74b4c4565b99103b7441ddf77a5228dbb8d2015ce34752ec694cd1c8d301ea
+EBUILD incremental-21.3.0.ebuild 775 BLAKE2B 5668ca422798aa43b3ef2afae0072b2992447e7e3ea6422ba277a4c06f7e9460521e6115b8cc6112ae8615ff6311a6c9118243325f955679cbf35972ac873158 SHA512 99145fdf211f16c7b1d28bcccd7add875b3920f9400db4a1e3e7fcaa8591a5ed48ac5f3b0f8d8af378c15a335f22d46306a7a69edcc218cd3cb3e996afca514e
 MISC metadata.xml 500 BLAKE2B 5bdd21b11ae3bc588f4391be9e08f0ac27f4f028ab8b86225eedc3504260a85ea8e89d443027efd25bd7c46e2fefe0c2f3cd2ce8cc2ce0bdc1f99c3ef6944af1 SHA512 ab126925cdce36ddb4b8b59c296d8e61172e281c9d2e1f45e17bfd174fd0e8563cc967a360898a23513be8cfe8515af2395e6e28f1bcffeda22a53d1df3a8c2a
diff --git a/dev-python/incremental/incremental-21.3.0.ebuild b/dev-python/incremental/incremental-21.3.0.ebuild
index fb8dc0a493c8..4ac1a7c75523 100644
--- a/dev-python/incremental/incremental-21.3.0.ebuild
+++ b/dev-python/incremental/incremental-21.3.0.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_{7..10} )
 # TODO: revert to rdepend once this has been merged:
 # https://github.com/twisted/incremental/pull/59
 DISTUTILS_USE_SETUPTOOLS=manual
diff --git a/dev-python/intelhex/Manifest b/dev-python/intelhex/Manifest
index fd0652565cca..a6c5d7116606 100644
--- a/dev-python/intelhex/Manifest
+++ b/dev-python/intelhex/Manifest
@@ -1,3 +1,3 @@
 DIST intelhex-2.3.0.tar.gz 44513 BLAKE2B 935fb6d5c27231c4b09f7fbe624df07adfdb9eecdd99b17cbbb4994dc74e0c7a141546a663229b0598ddd3884b8d17dd7244f770319a594387de074e7591aea8 SHA512 41b50feb7505474d74a2b6293d755d118b6dfd23a5c9b995791e7dcb7a97fc6f39d8f804b72f6372ba8e136684f9c979c7ce9ef2ff9796b6202eefc9d18f4424
-EBUILD intelhex-2.3.0.ebuild 459 BLAKE2B d3d37e1982dea2b876e0ac307c8b0d4c34d8cd1b1daee64cf6466f625b300d15e6438448ae2ca2a56ed30277002b475235932bed3ac173de4e643ca328346c25 SHA512 ae6f6c1d66d50e2bec56a0e6a39087dafcb5dbcb1bfa2763cdbd6e09316c63818c396b781c418473ece79babad678b38bca85c932c4cb7867d5f8df4a056138b
+EBUILD intelhex-2.3.0.ebuild 460 BLAKE2B 32cbe1adf6469cdab1d6e933f058567219af5d46c1db062ad019535e70a53ab75eafc1a32a42907e45251bbca360d7ad067da679d9cefb0ddc351867d69b5774 SHA512 c79d33836c54a9c1ed54e4cd8f52ed8ce3ae2a464c892eaf073efffc7e3891b04dda0370902c9559de23d0c733779600f39bcfa4f69f75a76e293b058e49b1bd
 MISC metadata.xml 367 BLAKE2B 7b356120076a1c1d5f9072d78e19d2edf77bdccc200276dd3929fa340bfc4aa6d7b3b89a29674958a8f6a886511e6c50678959b6e82f0e9ba8df95c140e498d5 SHA512 66592e014b2ab9faaaaa895e8c05d7bb96f7a8055e1cd77321e8751f32f0ff6eba141225af292256a88687679f8d5b64807f3c2e9586942039607187ca822040
diff --git a/dev-python/intelhex/intelhex-2.3.0.ebuild b/dev-python/intelhex/intelhex-2.3.0.ebuild
index 4eb06fed4f8f..744d1d64c7fd 100644
--- a/dev-python/intelhex/intelhex-2.3.0.ebuild
+++ b/dev-python/intelhex/intelhex-2.3.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/iocapture/Manifest b/dev-python/iocapture/Manifest
index 971efdc39293..27c8a770b300 100644
--- a/dev-python/iocapture/Manifest
+++ b/dev-python/iocapture/Manifest
@@ -1,3 +1,3 @@
 DIST iocapture-0.1.2.tar.gz 13114 BLAKE2B 4404ed96cda15db41d30c10fd68747e61980c1ee173671ff496ba05af5d122eeebcbd7fa901a8ad43ffd46efe219e437e205236392855d43fa3bfdd1416ca6d9 SHA512 1205d13b107d83dcb45d5546038d8b0b5417a20a51149c405123111488c351ff81a447f10653cd3dd9ecc236e01a0fcceb6647091e38ff2fa34c69e0baff1567
-EBUILD iocapture-0.1.2-r2.ebuild 499 BLAKE2B 61482d60e265af49572f2071d2cd8bb115eff95f73bb9bbd2e9b0cd9bab182a37c8aad9d9ce9257e1d15aa42aadcb343b78741ba1c6970a5c609aedb583fb83f SHA512 9354468d61b6296596440fd44f8c58dd29dfd0ff78f4c109090d85b49449eedf7eb41d1e398e5f1b29087f0f2c4e45cba4f7bb0c239a0de2a9ec536e7093eb98
+EBUILD iocapture-0.1.2-r2.ebuild 526 BLAKE2B a3e6b379d7d41936b68a30bd07c926ee13a71b2641a8c83bb7dd379e36edf5f391b2640b1f564e9ab199c5e6c34d763be9f5cec0905d980d87fb41ae1442c56a SHA512 8bbeedfd40fb1494a8e485a3f3dc86d53f62097c5ddbe04260dd77a2a004598eb24969fb2b9a8f26e1ce5ac3a0708e438f77e9813a04004a898e3713e66c1cb3
 MISC metadata.xml 368 BLAKE2B 5cfce1df114286d06d7dc4482bdc3d9475c50a17cd9778acf6cfbd04fee31e171db4ffee2803580f2865f07e646d63ecc2ca878846609b7cf43fccbddcbf8ee4 SHA512 3d11406f243fdf87bb03f9d2d9b7ff9af902ff006b6095b037c15ba2756f9519fa1289123f24163a211b302c1d4df484d66fb68688413dab23580575d55f343f
diff --git a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
index ce856ce4b3ba..9dae0845b002 100644
--- a/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
+++ b/dev-python/iocapture/iocapture-0.1.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://pypi.org/project/iocapture/"
 SRC_URI="https://github.com/oinume/iocapture/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 LICENSE="MIT"
 
 BDEPEND="
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index 9e1093604bcd..9e60e17a32fe 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,5 +1,7 @@
 DIST ipykernel-5.5.3.tar.gz 112656 BLAKE2B 4cad13f24baafc591558136405c8c643e12033ffd01b5608ffdef5442080c3e2003c0f2c4b1562c1f326b4c10e124afc358f5258a6c59b7c9db90b8bb23278e3 SHA512 7b7f0a0aed71f7713934ac071e7283be2028a221fa2b87cad8c2d26821909f81d21dec23a5f72c91e7c9de639b0d7430957c8cc58bbc026d95bd81bb0a005800
 DIST ipykernel-5.5.4.tar.gz 112728 BLAKE2B 489e12d0cbde2f80f2c921f026c7b84554b1fef481164e07f89b063127b01d106fc6b19f830ac321d79285fb9df065352dbc0c2a997b3629a64e766d2e50f347 SHA512 96728321fe71d528435415eda917c623269af734598a78168144d983aa64db4f9ced981fa67c83263da1ed878831669d821b84a769a08a271adafacfcbb75bf9
+DIST ipykernel-5.5.5.tar.gz 112909 BLAKE2B ff898dc10f767838353de13571de4c42ea59aae9b367046265808d9f1f7abfbd3934b7b4370fe024b647b5268316c573f7d52b2e62284a6c430005a901dfd6bf SHA512 580c3a3d5d10c325524287c091a885955981bedb8c7bd8eac569ee19393b258dbfbc7ea8700137071c2c55bfa94b5a7bfae1c687bc5e2d532525c6fc3e043835
 EBUILD ipykernel-5.5.3-r1.ebuild 1167 BLAKE2B b517d8d54a4ab2882657857af2e0a96fdc5775cf4291ab087f844bdff575ebe6e09f2f35c1206671386b842c5ab284c77bcb551d6aae6a4dc2d87cccd9bc3946 SHA512 5e493d830ff61535fe9ca5c8cf8094efbfdaa7fb47564ff1b500f09349d72957641f7ae67cc72dfb4a1f7606f55ca1e47a3a0472011478962014f0190cc4abf5
 EBUILD ipykernel-5.5.4-r1.ebuild 1170 BLAKE2B 90d21a2443b04efe39c015be345a6d08304929225d61c84f6a9ac1b70f6ce8d01c0ea4e0936b463eaf6b0b4e5da39e0dd0723aa98af427b40cef1aceae965def SHA512 7d392edeae27090b8b97c14609e215154bde4438e144abcc2544175bb702098b035788b3d042fb5239041045d3f6162716aa8b6983735e76971d78fb9b3954d4
+EBUILD ipykernel-5.5.5.ebuild 1140 BLAKE2B a33ffe5b5e8ce99108729bd99e1074695df2a936497811f367eaee228b6e2870952bee60f48a48aea4f6194b1f813adb2ebd1b00ba2c5fa96aa7cbc7f2aa3a7f SHA512 7486b112f5189d01fb3aa9ecf058f0aeb286ce688aed329f5dfb8787a7ed28bab769193aacdd259f8856be479d30d0d5bf8c9f042602a64feeaf0276e428d8a1
 MISC metadata.xml 526 BLAKE2B 736792bdddadea61e82623e7b510347bc00a8b0ac35fa6e10cb420fca4b3890bd00f26cfbc91eb15964a5718b14037cfc8066503345ceffb5c69214f93babc50 SHA512 33e7a9809469d373b1279395f3b09cb735defa451982b69059f10d334b449e8fb75851271db71315939b44fe4f1ac6bcdf988308faa05d705ccf0fad9887daf0
diff --git a/dev-python/ipykernel/ipykernel-5.5.5.ebuild b/dev-python/ipykernel/ipykernel-5.5.5.ebuild
new file mode 100644
index 000000000000..c392b74130f6
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-5.5.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS=""
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+	<dev-python/jupyter_client-6.2[${PYTHON_USEDEP}]
+	dev-python/jupyter_core[${PYTHON_USEDEP}]
+	dev-python/traitlets[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/nose_warnings_filters[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# TODO
+		ipykernel/tests/test_serialize.py::test_numpy_in_seq
+		ipykernel/tests/test_serialize.py::test_numpy_in_dict
+		ipykernel/tests/test_serialize.py::test_class
+		ipykernel/tests/test_serialize.py::test_class_oldstyle
+		ipykernel/tests/test_serialize.py::test_class_inheritance
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/ipython/Manifest b/dev-python/ipython/Manifest
index ebf5a3f6861b..8abb9a5bd4b1 100644
--- a/dev-python/ipython/Manifest
+++ b/dev-python/ipython/Manifest
@@ -1,10 +1,6 @@
 AUX 2.1.0-substitute-files.patch 1017 BLAKE2B 70577eb950a18345804a2a4b750bd233dc6a0b6bbdb524dfc66e0f4a7c69b0eeb2d35efb9d1845d567a11d1afa7881068b4757e42b9baf24dc01ba3026608a38 SHA512 fc4c9e12267ac5f04a2e16ad27334a093638538b8149ff380099fcbeb674a276ab9eb624a508010e37f82c05d5f7ab527a80e386b3e7b61c123ecb8effd9d542
-DIST ipython-7.21.0.tar.gz 5141725 BLAKE2B dae44d481e959ef7d002bdb51d0ab1e2f3eca3449071a2e4161aa735c06fef8a948d80bafd3f2bdd066208437b5ed36615cad5885af453771a32a313fba907eb SHA512 200e41d4e06343b6320f3d106925f6c995f39cf88d01250f53885d4e94d0fd9454a6be4cd7c69410f7dced94b05634f6d2269f9737cc563accf85206d4d7fff8
 DIST ipython-7.22.0.tar.gz 5143229 BLAKE2B be78fc7089d620cb9ad437ed8154b37ac8c7cd68ca18a2569cfcf7ea9af968c58eeee18c8d18a1f26459ccef73e59083ac27055c19e4df254836e484ce0a9908 SHA512 2647dcd5e0d9b6afc8d990d2c099ad7ed581b5eff6d657630929e0d0d9f8965e7c7924c51a10a797e7d7406212d7a06c941c163e6f6046aa62130049a9bbc0d0
-DIST ipython-7.23.0.tar.gz 5143701 BLAKE2B 6672ea3a5bbc9afa38c73acef87a8c8f6d1830e3b949543537b522b809b68b80e5369566c8bee68139f9c3213fbe4c07ad36377a686fe2d26d7bbafd5e54fc4a SHA512 b00b71dbb2851f03f72b6c0e93920afc52cdb3cd5b8f27ba8cca4cb062a0f313db359ba83ba3a9608bca22744efab24c27350e06c5884946709b7fd29536820f
 DIST ipython-7.23.1.tar.gz 5188898 BLAKE2B 9713b0f1f75e283e53ba19044c9919f0c4d0b1c120e63d7a79ab9c6b8783499ed115e86a24cab34fc13c46245fb43865b851e6f98a2ee729ee35c3db242fa2ba SHA512 9b35626a8a07c6bd0b93552341e5a61d3d90a60c72ad6e3fc71266d9509134366c46a7ae8aeca9c3acc7509dfeab47b5144f105cb3d1d05ef1c7acca6c2f365d
-EBUILD ipython-7.21.0-r1.ebuild 3719 BLAKE2B 08caa9877f87f6dabd1223f92b2b879f679a4f75816d9876d9cc48bdc290500504a392bd0b520c73576f2fbc8fc3c32a734d83317a078e319fbaba50f0caf963 SHA512 05dff1600bd5c9193d1e6067ea588f30c5c69fe1cd5069f00e42dace5b8be1f6994044a0ff91aa34b97bef57378bfbdc1d455fca0589b140aa99347098bd3e5d
-EBUILD ipython-7.22.0-r1.ebuild 3765 BLAKE2B ec5e5ea2f82cf238e22f86af7548af42756deb360bbd11ddbbed6918de4c39109321a46a95b37b06d67daed4d985384b776a342cf4d042c60e59761a8efc3cc6 SHA512 c20991511bbdccf027f19dcefdfe3abfa6d9ca7c45d47f3afe15eb597d6ac8962336d8586302106da6fe7005ad2f3e518615843aabcedc36ec337218a0bdc20e
-EBUILD ipython-7.23.0.ebuild 3818 BLAKE2B 37d0a0eefd4902d1f5b7d6d54d5c95384d12017f133a1a962646e30e839405f467e2b9856c7c102c9a7d8580033e93daaf6e216a33f7d7eaf97a0557e3b57e5e SHA512 a893b56ec0ea66559d173bad90ddd26857a61eb785be36cf519e5e1a5ab70af55248d5ae802e22dcfb834fb87cbeaab9e055df609a32cd0efdf657aa80e14774
-EBUILD ipython-7.23.1.ebuild 3818 BLAKE2B 37d0a0eefd4902d1f5b7d6d54d5c95384d12017f133a1a962646e30e839405f467e2b9856c7c102c9a7d8580033e93daaf6e216a33f7d7eaf97a0557e3b57e5e SHA512 a893b56ec0ea66559d173bad90ddd26857a61eb785be36cf519e5e1a5ab70af55248d5ae802e22dcfb834fb87cbeaab9e055df609a32cd0efdf657aa80e14774
+EBUILD ipython-7.22.0-r1.ebuild 3761 BLAKE2B 0fde64e41f1827ffaccc69fcb62db96e81c4c755bf7085d8890499eca01c776ed1ef500c20f277c1597c63c231587d2ddaf3ca68265629bf897d08f75a482cfe SHA512 bb27d30f8fa1fae515f1f92cca52846fe78bda310e35c84053cead7438898ec8b3d30475f36db3808d74e4ac02caf80f7bcabce4c570376a9f8661e6fecdb378
+EBUILD ipython-7.23.1.ebuild 3842 BLAKE2B c8e2900a436112ba50c3c5bf505da365359fe914dbbf132dfb901186456276472bfad6d2bc0e1290b1594ccac2d5368ec876e1dd786e58e12e37ac2b005ee3f5 SHA512 921a79ed0b75e69f1c390663e3a7a02263cdbb65cc2e580b5e6b1717d46b9eb742e0382f5aa03c220dd6fe95e8f17b7b27d4e0b87ef6b0915b834f4939a6a87e
 MISC metadata.xml 2882 BLAKE2B 189477b4ccde9051b61d2a4ff5134907886795f97c5201fc2bf9c012526333151931a1445b6315f286474b71af84253033cbe9bf89bffa7813bfa49a4a07ef6c SHA512 f54fef4552d09a03a8d186c45f917c091928f1de84dfbdd80f1db80912d616d509f10c588de533916d9c494f5b3ca5e6e50a6d8b8c59ea47781311ad4319442a
diff --git a/dev-python/ipython/ipython-7.21.0-r1.ebuild b/dev-python/ipython/ipython-7.21.0-r1.ebuild
deleted file mode 100644
index c79433936c28..000000000000
--- a/dev-python/ipython/ipython-7.21.0-r1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.14[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-7.22.0-r1.ebuild b/dev-python/ipython/ipython-7.22.0-r1.ebuild
index 25ac38e710c7..657a62aa4b73 100644
--- a/dev-python/ipython/ipython-7.22.0-r1.ebuild
+++ b/dev-python/ipython/ipython-7.22.0-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/ipython/ipython-7.23.0.ebuild b/dev-python/ipython/ipython-7.23.0.ebuild
deleted file mode 100644
index 2f2dc34fb24a..000000000000
--- a/dev-python/ipython/ipython-7.23.0.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE='readline,sqlite,threads(+)'
-
-inherit distutils-r1 optfeature virtualx
-
-DESCRIPTION="Advanced interactive shell for Python"
-HOMEPAGE="https://ipython.org/ https://github.com/ipython/ipython/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/backcall[${PYTHON_USEDEP}]
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/jedi-0.16[${PYTHON_USEDEP}]
-	>=dev-python/pexpect-4.3[${PYTHON_USEDEP}]
-	dev-python/pickleshare[${PYTHON_USEDEP}]
-	>=dev-python/prompt_toolkit-2[${PYTHON_USEDEP}]
-	<dev-python/prompt_toolkit-3.1[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	matplotlib? (
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="
-	test? (
-		app-text/dvipng[truetype]
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/matplotlib-inline[${PYTHON_USEDEP}]
-		dev-python/nbformat[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/numpy-1.16[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-		dev-python/testpath[${PYTHON_USEDEP}]
-	)
-	doc? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		>=dev-python/sphinx-2[${PYTHON_USEDEP}]
-		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
-
-RDEPEND+="
-	nbconvert? ( dev-python/nbconvert[${PYTHON_USEDEP}] )"
-PDEPEND="
-	notebook? (
-		dev-python/notebook[${PYTHON_USEDEP}]
-		dev-python/ipywidgets[${PYTHON_USEDEP}]
-		dev-python/widgetsnbextension[${PYTHON_USEDEP}]
-	)
-	qt5? ( dev-python/qtconsole[${PYTHON_USEDEP}] )
-	smp? (
-		>=dev-python/ipykernel-5.1.0[${PYTHON_USEDEP}]
-		>=dev-python/ipyparallel-6.2.3[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/2.1.0-substitute-files.patch )
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
-	# Remove out of date insource files
-	rm IPython/extensions/cythonmagic.py || die
-	rm IPython/extensions/rmagic.py || die
-
-	# Prevent un-needed download during build
-	if use doc; then
-		sed -e "/^    'sphinx.ext.intersphinx',/d" -i docs/source/conf.py || die
-	fi
-
-	# Rename the test directory to reduce sys.path pollution
-	# https://github.com/ipython/ipython/issues/12892
-	mv IPython/extensions/{,ipython_}tests || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	if use doc; then
-		emake -C docs html_noapi
-		HTML_DOCS=( docs/build/html/. )
-	fi
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_install() {
-	distutils-r1_python_install
-
-	# Create ipythonX.Y symlinks.
-	# TODO:
-	# 1. do we want them for pypy? No.  pypy has no numpy
-	# 2. handle it in the eclass instead (use _python_ln_rel).
-	# With pypy not an option the dosym becomes unconditional
-	dosym ../lib/python-exec/${EPYTHON}/ipython \
-		/usr/bin/ipython${EPYTHON#python}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
-
-pkg_postinst() {
-	optfeature "sympyprinting" dev-python/sympy
-	optfeature "cythonmagic" dev-python/cython
-	optfeature "%lprun magic command" dev-python/line_profiler
-	optfeature "%mprun magic command" dev-python/memory_profiler
-
-	if use nbconvert; then
-		if ! has_version app-text/pandoc ; then
-			einfo "Node.js will be used to convert notebooks to other formats"
-			einfo "like HTML. Support for that is still experimental. If you"
-			einfo "encounter any problems, please use app-text/pandoc instead."
-		fi
-	fi
-}
diff --git a/dev-python/ipython/ipython-7.23.1.ebuild b/dev-python/ipython/ipython-7.23.1.ebuild
index 2f2dc34fb24a..8a339cf37473 100644
--- a/dev-python/ipython/ipython-7.23.1.ebuild
+++ b/dev-python/ipython/ipython-7.23.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="doc examples matplotlib notebook nbconvert qt5 +smp test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/itsdangerous/Manifest b/dev-python/itsdangerous/Manifest
index 7bad9e4553f0..55c0ec17ace1 100644
--- a/dev-python/itsdangerous/Manifest
+++ b/dev-python/itsdangerous/Manifest
@@ -1,3 +1,7 @@
 DIST itsdangerous-1.1.0.tar.gz 53219 BLAKE2B 6ad74dacb9728e77d57ac5e364e79e3cc749be206fa03e82a407cdd77b5b72ddb4861bf181772915e684539e6404c6a45f6081c7c8e17a33a2d532b4fc3fed80 SHA512 61bab3fce5f87a3b5fc8fad61e735a63df6aa039416ee3494e1c99a2a1162b4fb72793bc5dc949de0985724c40121810b159513606c4c3976a7666dba3a1b93d
-EBUILD itsdangerous-1.1.0-r1.ebuild 683 BLAKE2B a1ae506c4fac210c9b5c513fab88096124e0e1eba2c804b7694c9ebe08c609d41dc91568ba6395dc4719db62d2db2b6eff67ac10a2a0dbef890b2453fbeeee91 SHA512 216e87187ecdf2eeaa7bb796e8dfc7c5952ba40e8267290335cc0d34297e5e282a79fdd08ae69356217a5eb06fc90ef869ffe5f55d2ad43ad45a131b1e3822e9
+DIST itsdangerous-2.0.0.tar.gz 59128 BLAKE2B 0d7eda7e38a3c87a87d1e6fb8522bf7b95354168ac0db6fb1c621f7961c4f0b8382e382d03829a4c18949baf533b9b67904569783990f94fbd3384570cfebf87 SHA512 cc838aff218ff9b119b8f4b4d09b83204990880abdd25e4c33e83f98d521601f272c245d8ac4aa6efde8bf4d443318d7400fb1a0ea8debbd9641ab65de9d47ba
+DIST itsdangerous-2.0.1.tar.gz 59336 BLAKE2B 53661c31c6ac8b3db68287f52367ecf53d871c2abd8bed077b5a2039b29da96cdb1b9c717d1382d831b63aa79c421fece1afd6799f31b85df46ed4627e69f792 SHA512 bc1e51eb861c13b4e3c4c1c655a3b6f28e326d70db23679269d2bea84f0f8f94afd4fccecb745cf40f5a5956a14a336dfa42f0f5149666ae43061feb1366302b
+EBUILD itsdangerous-1.1.0-r1.ebuild 645 BLAKE2B 687fe2d1170956390af9295f8dd795d9427df893ce91e279e7cbb073eb4d61ae78cc86faea0adaa5c38d39299332bbfe192544eb2754ffb1d455ee34feb7ac11 SHA512 fa6d71b62c656868ebaf2ad451bde2ce9967ba2983a63871bc58be31903dde7969a551d84c918d6241385fe4328163301a3446582918e071536828f326009dc1
+EBUILD itsdangerous-2.0.0.ebuild 652 BLAKE2B a327e6f57e6a91d235b9779ad09a322984488cd714b98f77868522d46acfcfabd67015940c585200d5a8ee00805d9db7a12818f89a4871ab75a2f0741f569ca2 SHA512 312d32dd7349b36e507401ed538f21c320225ff25f41873ebb71158c83db78ca21a38bab007a909ab6297878a44c71b22dec89c86d9e3758df0e0f458061aa4d
+EBUILD itsdangerous-2.0.1.ebuild 652 BLAKE2B a327e6f57e6a91d235b9779ad09a322984488cd714b98f77868522d46acfcfabd67015940c585200d5a8ee00805d9db7a12818f89a4871ab75a2f0741f569ca2 SHA512 312d32dd7349b36e507401ed538f21c320225ff25f41873ebb71158c83db78ca21a38bab007a909ab6297878a44c71b22dec89c86d9e3758df0e0f458061aa4d
 MISC metadata.xml 412 BLAKE2B a322c547a4f919089636c3e18854cef753724b4dcdfd9dc2b7a5f37ae4311c282f6cd671f6b565f77b8e6413f044f4ce72d11a8d1270e8b57461139e55570513 SHA512 e0926065d8995d64b7bd1db92e6e365434d90c5e93884991f2c1cd54639ad17bc61f3da90e23d6901884b62252afda4639bd66e41bcaaf872abf61e1149e47cf
diff --git a/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild b/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
index a91d6e21528d..21a98fda91fb 100644
--- a/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
+++ b/dev-python/itsdangerous/itsdangerous-1.1.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -15,7 +15,8 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
-BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-2.0.0.ebuild b/dev-python/itsdangerous/itsdangerous-2.0.0.ebuild
new file mode 100644
index 000000000000..b84003695cf5
--- /dev/null
+++ b/dev-python/itsdangerous/itsdangerous-2.0.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
+HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild b/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild
new file mode 100644
index 000000000000..b84003695cf5
--- /dev/null
+++ b/dev-python/itsdangerous/itsdangerous-2.0.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Various helpers to pass trusted data to untrusted environments and back"
+HOMEPAGE="https://pythonhosted.org/itsdangerous/ https://pypi.org/project/itsdangerous/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
diff --git a/dev-python/itypes/Manifest b/dev-python/itypes/Manifest
index fb6f91c6291e..035c6ab0441f 100644
--- a/dev-python/itypes/Manifest
+++ b/dev-python/itypes/Manifest
@@ -1,3 +1,3 @@
 DIST itypes-1.1.0.tar.gz 2188 BLAKE2B 5b24790944b130530d4bb3f0ee266c897ebf7946a37133535622f823cc66bd2d2aba838170769b326d706fb123ccd1f4ed7aea8e877b9fe0a9d19692e0c9e0e2 SHA512 fbaf82a82e0685f54eb98bdea722cf9fa230881d1940e2a74306972eb9f99958cb0cc62b858c340b649e092262793b83dcf76d11d36d04755ecf05e7a2c77d81
 EBUILD itypes-1.1.0.ebuild 422 BLAKE2B 811f2c1e4d89ad70bef5cad8826479d941484c9e9a191636b851bb2529741f77ebd49d32366859e3e643660cf2a098cbdb07341f510c1eb3209f19df6d50bd69 SHA512 6a39ef2c55a3b65d2897ac7099b88119cc0c09bd62d5a252c0be4f0b71aa69352aafbcf9ef7bf16d7f27c58012e7cbe7030ad4a1e5f0843a1a1591756f46d992
-MISC metadata.xml 378 BLAKE2B c3b8c660a9e8cc55ab6a931d7824ba49939bbb55b6116556b3e409644af9adea4ca84b134fdb078a9318c27079a710740ab70268946538633b26c7df90118cb8 SHA512 f10e26c3707772d18e82d027cf5dd897d560ae5bb99cc626ad3b8fda492bf75c3e91e85957d042e73e6e8c914a92523a844423c0fa571600c249ffda04f60fb8
+MISC metadata.xml 297 BLAKE2B 6a3bf5fd762d5ac69fec999adb19008bdca6aaebae6864e4130eaeae2627e51d2918994f176a9dc434883479c62311b388340c761d21846726bd2c715f690d12 SHA512 7375ab3ef2d5fe812cf7fbb825ac611d0d95b71de5b7d636b67e68aaed974a177a663440892f2dbf49c6f2df5894b5c71f7933361164772db51405ab16d212d5
diff --git a/dev-python/itypes/metadata.xml b/dev-python/itypes/metadata.xml
index 7b8ffca6831b..bf9e4fb26aa5 100644
--- a/dev-python/itypes/metadata.xml
+++ b/dev-python/itypes/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">PavanTatikonda/itypes</remote-id>
 		<remote-id type="pypi">itypes</remote-id>
diff --git a/dev-python/jaraco-path/Manifest b/dev-python/jaraco-path/Manifest
index 3eae9f2ef064..4c3e74b792ab 100644
--- a/dev-python/jaraco-path/Manifest
+++ b/dev-python/jaraco-path/Manifest
@@ -1,3 +1,3 @@
 DIST jaraco.path-3.3.1.tar.gz 13287 BLAKE2B 8a803269fc02cc85391b4b1e1f2ee2a94c039d433b505aeb4aa0fcbb23731b802f236cd2de80dbb8b9e59297312892a085632f41234d3e1bb7d4bd04f62e00ba SHA512 00dac02fdc6df469f8661d552b16a8ee6150d86a7df9459264377a03e96fd94608f9782ad4cc2b2df67c64a10f8af26ed650b0bac0b1e59607d429abdbe64309
-EBUILD jaraco-path-3.3.1.ebuild 965 BLAKE2B a907cde2a10b659905582c348c9bf8f09ae15201d3d109938a8d7724e7efb41fa4a9b8e1a2cc262cfbbbf97ea5d928d9b85c2f0fc4b81425436a8471a66b54ac SHA512 bb224630a872a08a03659af06b8233f8ff7b58c2350512211f2d3241f80f792827492ee482f82cbc6995633763d4c27a3e04188d357fbb79b86b9be5d40748a4
+EBUILD jaraco-path-3.3.1.ebuild 970 BLAKE2B 7822158fa5d58bb9bb984aafbcc7ac6c0ee6099f52897c43ba122eef126a73d284e32e155ca888884b496fb7db4ba5bd7dd7007ba63d3ab8f119a1e863bd9570 SHA512 ec48c05476d0624bae844347555607958795d240cf5349e1094f9ef3bccaa72e8a5d99211791d01166dbe457593d11fbbfc332e3141e05647947d34375904e2b
 MISC metadata.xml 396 BLAKE2B 3ecf8b1f6392c3d14122458f7b5fc3c08e5693570685a6ad0f29da64e9f38e4e93c83b180fe01803471342343b0420769af6a01086cd71cc3031b2efaaf3b54c SHA512 eb3cdebd2a8d524c88b519d8e4bb6020e63da5cf69cb4f81eb7a7867bc6d880c313afcd8aa7dd6bd82b661e1aabc60c6ea0c4319ad2b2589e1825d8e3ea65de3
diff --git a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
index 37f986eb38a1..7223348aa819 100644
--- a/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
+++ b/dev-python/jaraco-path/jaraco-path-3.3.1.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/jdcal/Manifest b/dev-python/jdcal/Manifest
index 2485ba98339a..88c1eca1f841 100644
--- a/dev-python/jdcal/Manifest
+++ b/dev-python/jdcal/Manifest
@@ -1,3 +1,3 @@
 DIST jdcal-1.4.1.tar.gz 7479 BLAKE2B a53954b12c5f1fed81fe6241b5097a7def4074ae83d6e31a528ac0fa87a3d90b504e2fe1a80b44cf19663e1402695460f9e3acb54a2333181f21e7cef47f737d SHA512 5e14f470f35764c0d76fcf0ee13f9ea0879e645b589a48636207b7848f3df0437343898595c8cf19b8e4fe8a172d4e82aa06e56284ed263154c93de217e24e39
-EBUILD jdcal-1.4.1.ebuild 452 BLAKE2B c62fbbc4ed16a0a0c31429d5ee96b87f6e8bdf1f39107334556318f72b0e25f45082adfcc7e3962d695ef1133d745b976621827ec64cf98d0847bd0dd9a8966c SHA512 434197e53d1778b38e20033b1292a6c8a3c6706fa5e02330bfe9b8dd1225506b64a4879c955b6a9b5781389da3f802be5e80565518241875f9374dd6247b2f0e
+EBUILD jdcal-1.4.1.ebuild 453 BLAKE2B ecd394ed310acf8448a8701e9756eddf9ed78413e5ba215aeafc90814c11dfda0955239ccd1f462732eafc0465b1225fc0ee41f89a2a5e990f168dde5223f691 SHA512 cc67027304f0eba46bc28f7d4a32e39bdc023dd5e0bc3fdd093d99f83ec7a45e8075b65bc5537a08f5ce4194dcfc5725f655497c9c9b0c6837c309fadbe2e352
 MISC metadata.xml 394 BLAKE2B 9c35062d139a232a70be4bbf6daa238737a318061879c48e32b287e8269d5020f1698f0968e75c4077d8a92bd0048218dc6a5cc8c505aff393430b41f275b962 SHA512 d2de830b52671780250d301ad183337bf0020141abae9931183158f1222d0e46691054138ec283ea16ad31b3403b07d0d8313013067d4e6c51e54c4ae08b5688
diff --git a/dev-python/jdcal/jdcal-1.4.1.ebuild b/dev-python/jdcal/jdcal-1.4.1.ebuild
index e1c3a13f59a6..85a8ab2e8613 100644
--- a/dev-python/jdcal/jdcal-1.4.1.ebuild
+++ b/dev-python/jdcal/jdcal-1.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/jellyfish/Manifest b/dev-python/jellyfish/Manifest
index 62b320d7c5c8..5c8b8f3fa88e 100644
--- a/dev-python/jellyfish/Manifest
+++ b/dev-python/jellyfish/Manifest
@@ -1,3 +1,3 @@
 DIST jellyfish-0.8.2.tar.gz 134200 BLAKE2B f765047414e4c1de4588d51598583c49767dde07fe2b94cdb40674bf90f4af8b5b3fa59d0ddf1e0bae3793e531426ccc941dde3fbdaa25839dd13da8b19386c4 SHA512 c4cc2b22df37497ed1ee595f03ec10b7ffe6b8441accaea77ca1b6018df07d23bbe9f2ed72d0c3e06792d6e1229b7e56f77f1758396d83120236d018ce2328da
-EBUILD jellyfish-0.8.2.ebuild 731 BLAKE2B 7f6e797de017e660a7fe586c606a38a4c1878367187084e6ccc32af680234f7df927add95ea8ddefd684e9fb354017e737444a017c1ee28af25e046889476ab1 SHA512 954bb862ff917a7a03d4f698889e23e48b9956095e7a37b6470596a51a46d409369ba0b268a57ae224a07ad95bdf4bec53923065c1ccb3e00796514fbe816b80
+EBUILD jellyfish-0.8.2.ebuild 691 BLAKE2B cf021985defb5d28ffe5426114e40b9e7adb94c6811ee86fd02adf46ca244e26259a11d5ec24ffc4b84decbf3b6093efb62c81a77f23252930a81eedd7733c75 SHA512 64f9f210ddc1898bdc4c28e454426ef55a3b2aa29504583990f4e75bfcdf1de8da92ce0fd20eeb5f29535a5e84bfe663075032ed125b68efc2306494c6042fe2
 MISC metadata.xml 503 BLAKE2B 5233c8c8b58779463d926f276a3fac04e25f70ed8992e75aaa4963a259de9d525b3dd4f040e0fd2aca83efc5bbbce73b7eb86d5b59cacb81f9aa1f82c7949850 SHA512 47e552f516be95767e3dfe9b5b43ea36b02369cc426cebc25d66ed6c3e449c1041d6c79351669d80ac13d19a45f699a719a80130073d02d14459c4630c87736a
diff --git a/dev-python/jellyfish/jellyfish-0.8.2.ebuild b/dev-python/jellyfish/jellyfish-0.8.2.ebuild
index a7c44116c5b2..39fa8d842c5d 100644
--- a/dev-python/jellyfish/jellyfish-0.8.2.ebuild
+++ b/dev-python/jellyfish/jellyfish-0.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python module for doing approximate and phonetic matching of strings"
@@ -14,7 +14,7 @@ LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-DEPEND="
+BDEPEND="
 	test? (
 		dev-python/unicodecsv[${PYTHON_USEDEP}]
 	)
@@ -26,5 +26,5 @@ distutils_enable_tests pytest
 python_test() {
 	cp -r testdata "${BUILD_DIR}" || die
 	cd "${BUILD_DIR}" || die
-	pytest -vv lib/jellyfish/test.py || die "tests failed with ${EPYTHON}"
+	epytest lib/jellyfish/test.py
 }
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index 54c01550a578..c8a17bd54ac5 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,3 +1,7 @@
 DIST jinja-2.11.3.tar.gz 258057 BLAKE2B 4735464d044718ce1e6b2663ecb1b238b38fbf0f37ed683257775fe9e853186c089b98494209e511be5aa96bf6df8f6d472be132b6184a7d9213e182099c0433 SHA512 f8e2951edf780d7b44ac74d36579c89b0a5c076b4250faf643ae7e3ff6a431fedaabed640e5efb496cda1a79a4057bf312ae652484c8d4631d521689eb0adbc1
+DIST jinja-3.0.0.tar.gz 271882 BLAKE2B 7013d74802534273c62db275d95f05f203af97f52fdf9f9be9ec89522e2fce2d4cd0dc00611ad1442680da9ec624dd4ca8be375f021bc9572ef736801fb4b0d0 SHA512 54841f5fc07349eb01002156fb148e8e5905574dcb6e0d51bef2f340c8b94f2b50964b94e09d888d8cd6aa834de3a495301bf2b3cdf3282bce1b04129ea6d69e
+DIST jinja-3.0.1.tar.gz 272329 BLAKE2B 71aff8e78c49a522ef78d418be1b3b104dc149dd623b75aed3022f979930c8d6071c2adc3693a6110425469d6092e84a7721ac9d7907a8dc0c8414ccdf7c9049 SHA512 da3238bbab9f5966df933dd0511faf010d799aebf06d17b9352f412417ceea842145ee970a0ddd84f49a3ef1f7fbca29f62a14ee75c136a083168311eda89ddd
 EBUILD jinja-2.11.3.ebuild 1558 BLAKE2B 11b319f676e492a970f2ade22a208431ae247aa5277219c5cff90ef23e21b675b779cf1c09402f6c07f41629f77b4f8be427bdcb97d40c8b8de07c6ab45e9645 SHA512 26f8f456af243710d4fe9d2b7782f90c6800b23403b6da77742f975b4fb151c1f18b34b091689ff8b84fbacfa78b81564fc363fae467848d2841572be1007a5c
+EBUILD jinja-3.0.0.ebuild 1321 BLAKE2B a26cfa25c06793e7f6a64f0d5822ea4fdd1d05925ecfcd6236278740d825b29474fd693171a2593364e72974f40110f4f550cf3c0b2637a019af9ed147a78ece SHA512 b66905f4f7b230a266d0b3500066604de1cc9823276ed87f988a487a5d971a93ff7bce3e11727f6e3a9326d05c8b75e613c655c1035958f5b44800227f3a2bd0
+EBUILD jinja-3.0.1.ebuild 1318 BLAKE2B f82bc926f6ff4d0c32b1ddec651cd9c8fe7cb8620fe403f940b03e042eb0df29d935ce22ff5781e345a7dd811d23407d3520840932f73eae3562b450010102fd SHA512 11348fbc645a929ce2fec09c7042558977250930f9811ab464983fcc81846d2d7f729e7d72b480abfba7b0bc11efc8952420fc432ac943a9a2883537afa42a63
 MISC metadata.xml 466 BLAKE2B 76540215466d45bb582810d8e8fad3db88cf0ccb7d4340d3ddb2c6c85e3ce552fdfe81517466382db89adf660269711a0fb861cf881487d7e4d1ce474114d6a0 SHA512 3ae5a895f264984d8538551346b7031c712ca244c154ff435847949db29239ca1c7d9ad88f82dd7cdd02ea8906600b6d7f7d4c0c6dec1f025a5d5e1173569c10
diff --git a/dev-python/jinja/jinja-3.0.0.ebuild b/dev-python/jinja/jinja-3.0.0.ebuild
new file mode 100644
index 000000000000..c8cab106f7da
--- /dev/null
+++ b/dev-python/jinja/jinja-3.0.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
+# pypi tarball is missing tests
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/markupsafe-2.0.0_rc2[${PYTHON_USEDEP}]
+	!dev-python/jinja:compat"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/pallets-sphinx-themes
+distutils_enable_tests pytest
+
+# XXX: handle Babel better?
+
+src_prepare() {
+	# avoid unnecessary dep on extra sphinxcontrib modules
+	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/jinja/jinja-3.0.1.ebuild b/dev-python/jinja/jinja-3.0.1.ebuild
new file mode 100644
index 000000000000..d44c19383010
--- /dev/null
+++ b/dev-python/jinja/jinja-3.0.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="A full-featured template engine for Python"
+HOMEPAGE="https://jinja.palletsprojects.com/ https://pypi.org/project/Jinja2/"
+# pypi tarball is missing tests
+SRC_URI="https://github.com/pallets/jinja/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
+	!dev-python/jinja:compat"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/pallets-sphinx-themes
+distutils_enable_tests pytest
+
+# XXX: handle Babel better?
+
+src_prepare() {
+	# avoid unnecessary dep on extra sphinxcontrib modules
+	sed -i '/sphinxcontrib.log_cabinet/ d' docs/conf.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	if use examples ; then
+		docinto examples
+		dodoc -r examples/.
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	if ! has_version dev-python/Babel; then
+		elog "For i18n support, please emerge dev-python/Babel."
+	fi
+}
diff --git a/dev-python/jmespath/Manifest b/dev-python/jmespath/Manifest
index d18e85c8bb2e..b2ad9498524e 100644
--- a/dev-python/jmespath/Manifest
+++ b/dev-python/jmespath/Manifest
@@ -1,3 +1,3 @@
 DIST jmespath.py-0.10.0.gh.tar.gz 81860 BLAKE2B a6181bde0189badcf3ec9a8cf2a913ddea27634b89e181c4b990a0c1eeb3bb777f6f3758ed6ca8acd061b06d853b9857ad33faf037201132bc73572c5d009f4d SHA512 84d787a9547bf0d33dfb4cf42514d6a7a1e69fb8867ccb9d84aa0555ea52b3064a9c6a49b3c51564090bb1d1d2d067fe1887105d744a0f25a991d9e9595c85c5
-EBUILD jmespath-0.10.0.ebuild 552 BLAKE2B ef9fb13724feb4452428e762eaabf5c9e0219de77307cc24661c8a852497ca1531c9c830c5b8d68445f1ef9a00017297df0f52545964455613f427ae61aaf43e SHA512 e82b12b4e4083cf8b814a2f7e9efd0d66a935f4658e433792e0fc341d0819ec2736663523ecc710418a8204e27208978b22f72c24fb1aedf9735f80a879091ac
+EBUILD jmespath-0.10.0.ebuild 571 BLAKE2B 88ba1701d3a773d7f5aea77d6f96b752a626d8d451cc2131f7a34b8ec89e410bfd926495bb1e86ed1af44e44171014758bf2a8220016523ef309192594d85285 SHA512 c082dce268b8c9bcfa07b014cdf6f6e48c976ca6723f7c9863f5908c02774748c9089a7b41a73f3313c00191308441024e1fa4d8b58ab7960aa7e166be75f066
 MISC metadata.xml 408 BLAKE2B 9181b68543881bbf8c74385b007f757debcdf6e6dc8c92524b8f86eb9ad893a1fc8a23f49e37f68e568ea99eb52580b2f7c40d997705d54fb526ff3235bb941b SHA512 f7f732a0e399f618d1b5fd59211c2f8fd88883ba7f94b40745d46342b7c9ac61cbf47ee8b0938151eb5d5e1191341796c4e2cb89010560fc7468fb632ecbbbaf
diff --git a/dev-python/jmespath/jmespath-0.10.0.ebuild b/dev-python/jmespath/jmespath-0.10.0.ebuild
index 1855ebc5d739..991938bff772 100644
--- a/dev-python/jmespath/jmespath-0.10.0.ebuild
+++ b/dev-python/jmespath/jmespath-0.10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -17,6 +17,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests nose
diff --git a/dev-python/jupyter_client/Manifest b/dev-python/jupyter_client/Manifest
index 4b10921ac6e8..eca9ab042661 100644
--- a/dev-python/jupyter_client/Manifest
+++ b/dev-python/jupyter_client/Manifest
@@ -1,5 +1,3 @@
-DIST jupyter_client-6.1.11.tar.gz 293651 BLAKE2B 73a8567927c452a6a6a591eed04d592c6bb52211214e6d27ae816a2ce07a61c3f80991a2209b42c1d679ff6d3ead564f6ac97e6500473e0e5bd86bad83db07c1 SHA512 3cd6c3d299ea7097b04ad88b08dad8c23d90c5feee18bf441434a6069151b85717c4d00d2c186c463995d26383442c4f63c86565b1606e60afb61426515f9a11
 DIST jupyter_client-6.1.12.tar.gz 301499 BLAKE2B 8041b84ad2e89413ee60d1aee2e49a67a89b5aad1c3118c8fa7d7d719c8ec2acbc72278c9aaea095cdcb89235800d09b1792b2138c09a4aad59ceaaf695af431 SHA512 f31ff1a24b264c32d35d07491785e1d77935cdb463243e90e4aadcb0a093a074cdce75f01662591766588f39b146077639ca697f71157309dc92f12ae04d5cdd
-EBUILD jupyter_client-6.1.11.ebuild 916 BLAKE2B 1990debc99f8b0d521dba190cd798b436f95a7c5c3ed521ea582d5d00f24b34956ea3ba474bd435067ea2a11ab6b0f5bffb9d70d65b6567c95ddfa534425706e SHA512 8ba23fd56807471edab7da0d32d599dcd60410bf7e890b960e35ea940488c94552a642d3da0eaadaa9fed161666ea4a5701d303c560bdaaccd189d638fbfc405
-EBUILD jupyter_client-6.1.12.ebuild 919 BLAKE2B 279e30d213e6c5c3d9c7032783c1be0760ef7c5d72cb04d66ede06abfbaa15423021f4c2de7017efc6abc9901c5520ddc5c5d2984606f47cd70f5f58cecd5dbb SHA512 8e6592e6f7c3e19073443165113b2b5f029d59a3f22fa67c022f7781080f1091d73eae44c8a8d1385f5b8a439608b6833f1c89cd066e9e2b08a3ca5d55dc3038
+EBUILD jupyter_client-6.1.12.ebuild 916 BLAKE2B 1990debc99f8b0d521dba190cd798b436f95a7c5c3ed521ea582d5d00f24b34956ea3ba474bd435067ea2a11ab6b0f5bffb9d70d65b6567c95ddfa534425706e SHA512 8ba23fd56807471edab7da0d32d599dcd60410bf7e890b960e35ea940488c94552a642d3da0eaadaa9fed161666ea4a5701d303c560bdaaccd189d638fbfc405
 MISC metadata.xml 779 BLAKE2B e9744283eb51cd9df5ca7a65a29d80e7712e22a1c4f039bac233a4301a821bbf616a59bc5f923dca0edfc16e32fee9a676a6aa90fd8011beaeca68ee97d63355 SHA512 3e07a943513fb5d2d0e689572c39084c63ef2b54503843897dc1492adbd9fb217a3a26931e48f2bef2fbb99e32900aec85968a9597ddf54350e174ccd82a7b4b
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.11.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.11.ebuild
deleted file mode 100644
index e8fe30f2796a..000000000000
--- a/dev-python/jupyter_client/jupyter_client-6.1.11.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter protocol implementation and client libraries"
-HOMEPAGE="https://jupyter.org"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-
-RDEPEND="
-	dev-python/async_generator[${PYTHON_USEDEP}]
-	dev-python/jupyter_core[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-14.4.0[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]
-	www-servers/tornado[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? (
-		dev-python/ipykernel[${PYTHON_USEDEP}]
-		dev-python/ipython[${PYTHON_USEDEP}]
-		<dev-python/jedi-0.17.3[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
index 8f92382aed2c..e8fe30f2796a 100644
--- a/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-6.1.12.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 
 RDEPEND="
 	dev-python/async_generator[${PYTHON_USEDEP}]
diff --git a/dev-python/keystoneauth/Manifest b/dev-python/keystoneauth/Manifest
index af499a5d3ccf..de0bb7d1dbe7 100644
--- a/dev-python/keystoneauth/Manifest
+++ b/dev-python/keystoneauth/Manifest
@@ -1,3 +1,3 @@
 DIST keystoneauth1-4.2.1.tar.gz 258328 BLAKE2B 62f8b065a77d4150c9491f4352a3a2d37d42cc54df8db6a1eabdbe93f18714838ebed2dec0d6188e91f2dc3708b0c3cfbcf17a96411df05dd96c409a1b6c8beb SHA512 cb137d259dba7cab31fa39293d40d6654c6b36157f088948995d55755fb4dc8c29df1f978a58fbc0881516f11db840f0a25c7621bb092ab95d901dde6bd210ca
-EBUILD keystoneauth-4.2.1.ebuild 869 BLAKE2B d639d00b5621c5e2dfd48c1889f9e899a57f1aad3ad1fd1eba07ec9d2b3d5e49dd261de7606836f64188c616846ed4cfe98b944351e57f319c922ee394586d22 SHA512 211b42996555130ab1f9e094b05a1ffa0e51f880be825bb76c80466cb17bbaadf9f9fb23a8f1cf7ac5ea6b53b881445e7292253276610f831705de2c922ddbd6
+EBUILD keystoneauth-4.2.1.ebuild 868 BLAKE2B 1296c78c6c94ccf4d4e08f6bc35669ac801ff91794ca16fa4289d69b5f15c2dbe3f567597f7bde928d5171ed365f0c87e8effa30e77af1a7ace31013c2e6a975 SHA512 578c3754d921b53fa5a4614b9974f00f5011798a18dae5858b28a262ffedf052061e09965bb9ec107ae2ba8e6be0fd3a5f42f489039c131aafe005ab03564cfa
 MISC metadata.xml 416 BLAKE2B bcc14a9c5f130a064c4eeef77b770df6e9e1e10c26643f46a3f7d771d692a698f619dbbe5b5a0c74eb7836da5040009d0e7814271c8dac7bc2a1c121a98b1269 SHA512 03d53f525bcab409931b02962538a8d49b28e31040a98fce7f37de73bd89f1c59853e22280bcec2a98f4fe9d48eeb51432543f62adb66dd29920a7f0a7e3b3f2
diff --git a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild b/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
index 2f5ccd1f9f84..359f7c6b0ab6 100644
--- a/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
+++ b/dev-python/keystoneauth/keystoneauth-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}1-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 79f1c22d075f..fd9dd7cd0690 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST lazy-object-proxy-1.5.0.tar.gz 35938 BLAKE2B 11e091538f4bcddd5acb39963572e30535b01227481affcb160d55b39c5b4548fef2da316efe483d6b0450e204126b957884dfb7a96727b0a00209addd6097cc SHA512 8d594df743694f01b9710e55d8e88831d6ac2e81a925ad310f0c39d061f20115550c5adf1da40d0d7c4749eb3a7ffbbb6000ebbda3dbb445c9efa1d05ff37cc3
-EBUILD lazy-object-proxy-1.5.0.ebuild 943 BLAKE2B 7ee2d5d21634b62e8b93779f09242a4f453a104922361e8e7122c1c84953e69a4e10e43b3e0395d5066ee24e5ba5f0679b6480c34c099c2013cdc107657f007a SHA512 f3801248924d818e300e17cdbfc2e145afc15df6455629ab9468d0008a09b237b53d822a42de4a32052aad92ecc89c47268240c021167d744df9ab9cfe8ee9e5
+EBUILD lazy-object-proxy-1.5.0.ebuild 949 BLAKE2B 0b2767bd8364ae226f4be7821f47f4e538addc23bd88677917fd6a4b4f5027a1d5ecae35209e3af53f8bfc9d16b399044c07917c59ff906ed456e1e229c4b874 SHA512 b6fbabd893404234a12e09f6c85164e6a64b59ee64b491c38e61a9b0ede9a728c059457ac0cea8746e8cd195cf77b044b93a5e64538b715efd53a970debacd55
 MISC metadata.xml 539 BLAKE2B 7f76da60b882c2832b84e774d3db85b1349d7e7190ac629c9f1cd99abaf6aa94e55ebb5867f75fbc948b03cf32121c4312a32a9435c2f037866af855130076d8 SHA512 7e5fa1513ed6a00183c3722f53b25062e35a3128dce6fd4e0d40fc10dcce8157eb902654b2f7606184378f81972f9bafc6e1ba578581ecf6d8e1b3ec09e1f473
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
index f834d8059f95..087f95941deb 100644
--- a/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.5.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	dev-python/setuptools_scm[${PYTHON_USEDEP}]
diff --git a/dev-python/libsass/Manifest b/dev-python/libsass/Manifest
index 258b08d3c600..f265610fff25 100644
--- a/dev-python/libsass/Manifest
+++ b/dev-python/libsass/Manifest
@@ -1,4 +1,6 @@
 AUX libsass-0.20.0_rename_sassc.patch 1710 BLAKE2B 410f1256dbe433d5836a0c7f94a30b0fbe174285408d5c3c0589a7f4f58d2417c9be37af6ae137031365450ad2bca51ebb2cd6083c625d95a33ac8c0eb3bc80e SHA512 3e30b6a5cc387aac526ca2159d5854b28090ab41d7d4b2512627cc1e5b392569b81c0b1c845d3311a9cd44c73a6ed109b2a06a9677cbe15a4a39c7ab0c7c4a6d
 DIST libsass-0.20.1.tar.gz 316227 BLAKE2B e4b4955a2ad0722d76e79979405c8e549b911d31c3fb828563e1e52cad9f9fe72cf543bd5e2ac2383faf85a44f4f0258253f7d45394f37d30076425660ebd031 SHA512 8918154f9fc4b0618d4729195414b2d8c5818a3e4dde2d4e084a73c01c3f6a2d46028a35b4e11759bc001266bcf03423319230682507c6952c9b0eb2df17feaf
+DIST libsass-python-0.21.0.gh.tar.gz 55774 BLAKE2B 3c584ff3b6c09bc768554a3a4f7ef28ecea0726f59206da8540f9c1b4db74ab1235695074dd6b95db74f174066bb856c9854026525da82e7763f341920f0bd53 SHA512 d5b7a1bf0dc736a6a38e2e609f0a213306de31d5ad84cfdcd96f9ff72a1c38f15bad3cf25a1cec6dca5a9f3b00a8509afff2b4ea5e4db80e218e3ae603d55856
 EBUILD libsass-0.20.1.ebuild 886 BLAKE2B 94a8372dbf0353ecbd32a27f5fb2842654eccaa9093a8a8b437df1dd79755e93d9de2af16d48407e20a60fea6386d08ca02618badba2f4ae72397fe4b7bd6c38 SHA512 8a3754e235124aed45afe5dfb3c5b741300c33d4a7d2f3fb11246fb1949e08c9862bd9df4ae4a1696484e78726fab5cddec0fc496a99d1eb634e3a604b27d5b1
-MISC metadata.xml 475 BLAKE2B 8a6ef9c2f30ece13a6999c9c1a3f367464e8174f30bdd271bccfdd1cb6ecb115c55d82d30d7088d8c6ee3ba0d5924bd30b45fcc2a8664b1860b5637fbc8b9412 SHA512 1571c99f8c2e7631869972da697f784c3b0670ac6bec93ba9ecb0e78024e75a26800b0e21fb424d218a89c2b9f8cc965973df7a2d6e6fec900a310305ee85907
+EBUILD libsass-0.21.0.ebuild 1403 BLAKE2B e2a3007b4fb99625c3f87a410e9aeea1caba7cbc9d95ce8fa6e1956af07f8b0868649203eed6c69513a551a54f19a25ef6edc7703fcca76afdf86cc5759a37ea SHA512 e8d747fa91052e1ba2d1c1ee3ac7e815cb57310b2d1646de7e8d1f3bef1a2775a7fbe0570d8d39b9bced8416341108bb4f4d83464b21d20e2c73482cd7d87e2c
+MISC metadata.xml 328 BLAKE2B c75e306610c41d64a7d68392c44c72827ecaae50a26ea524d8826d48c418e7fc34a2345d682dd9f6ccd5db887f032de1b6c6051801037a67dbe5e1700b9e1d77 SHA512 fb6418e4e357c35fda2e78378db2b7646a49401989a695b0ae615d11f132267819fe896335259482b6b91c20cfc832417e4fe2ce0a93768b3de8f85b0db93806
diff --git a/dev-python/libsass/libsass-0.21.0.ebuild b/dev-python/libsass/libsass-0.21.0.ebuild
new file mode 100644
index 000000000000..e3565c7cdb2d
--- /dev/null
+++ b/dev-python/libsass/libsass-0.21.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+MY_P="libsass-python-${PV}"
+DESCRIPTION="A straightforward binding of libsass for Python"
+HOMEPAGE="https://github.com/sass/libsass-python/"
+SRC_URI="
+	https://github.com/sass/libsass-python/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+
+RDEPEND=">=dev-libs/libsass-3.6.5"
+DEPEND=${RDEPEND}
+BDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	test? (
+		dev-python/PyQt5[testlib,${PYTHON_USEDEP}]
+		dev-python/werkzeug[${PYTHON_USEDEP}]
+	)"
+
+# Remove sassc, in favour of pysassc, see: https://github.com/sass/libsass-python/issues/134
+# This avoids a file collision with dev-lang/sassc
+PATCHES=( "${FILESDIR}"/${PN}-0.20.0_rename_sassc.patch )
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	echo "${PV}" > .libsass-upstream-version || die
+	distutils-r1_src_prepare
+	export SYSTEM_SASS=1
+}
+
+python_test() {
+	local deselect=(
+		# probably broken by removal of sassc
+		sasstests.py::SasscTestCase::test_sassc_stdout
+		# skip the pip tests because they need an internet connection
+		# not relevant for gentoo anyway
+		sasstests.py::DistutilsTestCase::test_build_sass
+		sasstests.py::DistutilsTestCase::test_output_style
+	)
+
+	epytest sasstests.py ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/libsass/metadata.xml b/dev-python/libsass/metadata.xml
index 7038044626d6..82636ad94d40 100644
--- a/dev-python/libsass/metadata.xml
+++ b/dev-python/libsass/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">libsass</remote-id>
 	</upstream>
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 0da1ef3b23f9..8c34760eeb35 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -4,8 +4,11 @@ DIST libvirt-python-7.1.0.tar.gz 215468 BLAKE2B 5734f686760d118bc326c68d93714db3
 DIST libvirt-python-7.1.0.tar.gz.asc 833 BLAKE2B be4101dcff4f95e36929dc70657a527e7b0b30fe9556c8d42f240459f86f7ba71980cf483f4d828d63cf94ce3c4521e7303d72f6df5e6c4c2a6de1b160970073 SHA512 db0213bb95d77c690ef8726ae559cae7970d31e633104993e715dd4e34e2f3c52bdcf7303e90419055d571d21417ac6375d78463143e20e94bf4aaf666684174
 DIST libvirt-python-7.2.0.tar.gz 215380 BLAKE2B e9c55a193c571b8fdf3f7f2545ae82470ff74e74e4f2fb58dda6278bc484eb26ae84f2991bc34adc6030973e7d53d364576247e1f8ab836edea06a5da0f8575e SHA512 6df5be4d98884751e4a098b54ec1d8827268993b6df5769c1a687420dd5889c629ca0bd286f5a0c22a9c81974fa02565b36628f8026c697ae414137f0c1d8441
 DIST libvirt-python-7.2.0.tar.gz.asc 833 BLAKE2B 3f93f4841da3d86c6a0ba073b70c44e3732eb0ca91fd80a7089c1731851173d163101428d07f82f688478a7967e71bd66b49cd70673157428d2c4802a5df3bae SHA512 fe4f7bf6a9ea6e008ed73fac588785281582dd5eaa738e5ca05b88534659096af137408e1222f791d5a13190358fcf5d30eaa8d8a24791e3b5a15622516fe05f
+DIST libvirt-python-7.3.0.tar.gz 216823 BLAKE2B 2f7ff569e1dc05ac013e21046eab26290d1977401cda063f9f60e27f09cbe7ab1f30e17c2d9dfb11b36930a7af8496f2d36b19760819c64836844ce8daf8da01 SHA512 a99c0d7258364464df6a68e5fee3137daab3e6ef0dc8924b95a2b7bb69bcaf221d6be17d004ec994e9fae223db920360352b5b32945586ecc1407cb6bd86682a
+DIST libvirt-python-7.3.0.tar.gz.asc 833 BLAKE2B b5c26dbf520570ab0b66f3b31a2570a6bab0e252970d0a952411b91d08141edb1a7b53a7404e29426558502dec3f9260bfc815209c524a761b87a70004acd008 SHA512 8467a0af37849b64aab33ff1083f6feb82c39f6c732f53f407037d3f7add5c5007e16d5906e268576239d61ab8d871356fd3e476b8a64fa7aeb51b018383dcf0
 EBUILD libvirt-python-7.0.0.ebuild 1191 BLAKE2B c1030acd572cf307d85b13e1bf5ed2bfaa165da32ce231d2d74254359eae67d80733349677a63532ea2e282303cbd9e9954f13a2d401a8db04cf289acd770d61 SHA512 7a60511c786ff65894121a094e905f76d018fe8163d3ea526bf788fc8beea81adc067658d82edf469615989b52e0216a469d7826855c481efd2b4ffb60c43496
 EBUILD libvirt-python-7.1.0.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
 EBUILD libvirt-python-7.2.0.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
-EBUILD libvirt-python-9999.ebuild 994 BLAKE2B 90d2e376d09a0d1e222e98e1f408abe8d8b5c9d502aa487ebe0b67470cd2bfa8193ed58f5682ee2f2bca3107a77d9ac8b0977587e4eb9f41e3a23c1cb00be03e SHA512 092e94e7441e52f70c972c57403d3072eaee6dc40f9b4f3e00915849d34248c0c313e53ebf648ea8a2f6c7879ac14d7f784b69e70292a8dc459f155db293448c
+EBUILD libvirt-python-7.3.0.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
+EBUILD libvirt-python-9999.ebuild 1193 BLAKE2B b04c09ff8cc3b352528082c62a96a92d8f9e78dcf2ee0e70ae14f58fb7872c758733dcbef5e4dbb794e5400739f88f756a154da0193c696238332864d051a5d4 SHA512 f025d4ca62f193a0243784c0343ffd198b1e5c36374d25dcb84bfd1821317f6dfcc34f01360768296c61b08f7b533b6961e5899ed70aa6b3d7448e9b96b09199
 MISC metadata.xml 518 BLAKE2B ac9993d622790a5cec52f737de0494b7ac6a5a6e17e66ccad8e4862257ba8926d688fa4b6e68cd96ea5a4f2d35825204219fd79bc5917d05a6f39787f80bc1df SHA512 243b815c70c65046d672bc2b4a05d67f61c6e70dc6677ef7e8b76783979d801793f8d864a33ed9c64072c4fa30786d4455c82c82fa37933dac0b0efac2264083
diff --git a/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
new file mode 100644
index 000000000000..eb8b2abcbc09
--- /dev/null
+++ b/dev-python/libvirt-python/libvirt-python-7.3.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DISTUTILS_USE_SETUPTOOLS=no
+
+MY_P="${P/_rc/-rc}"
+
+inherit distutils-r1 verify-sig
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
+	RDEPEND="app-emulation/libvirt:=[-python(-)]"
+else
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+	RDEPEND="app-emulation/libvirt:0/${PV}"
+fi
+S="${WORKDIR}/${P%_rc*}"
+
+DESCRIPTION="libvirt Python bindings"
+HOMEPAGE="https://www.libvirt.org"
+LICENSE="LGPL-2"
+SLOT="0"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/nose[${PYTHON_USEDEP}]
+	)
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )
+"
+
+distutils_enable_tests setup.py
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/libvirt-python/libvirt-python-9999.ebuild b/dev-python/libvirt-python/libvirt-python-9999.ebuild
index cb778ad7f1cb..eb8b2abcbc09 100644
--- a/dev-python/libvirt-python/libvirt-python-9999.ebuild
+++ b/dev-python/libvirt-python/libvirt-python-9999.ebuild
@@ -9,14 +9,15 @@ DISTUTILS_USE_SETUPTOOLS=no
 
 MY_P="${P/_rc/-rc}"
 
-inherit distutils-r1
+inherit distutils-r1 verify-sig
 
 if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://libvirt.org/git/libvirt-python.git"
 	RDEPEND="app-emulation/libvirt:=[-python(-)]"
 else
-	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz"
+	SRC_URI="https://libvirt.org/sources/python/${MY_P}.tar.gz
+		verify-sig? ( https://libvirt.org/sources/python/${MY_P}.tar.gz.asc )"
 	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 	RDEPEND="app-emulation/libvirt:0/${PV}"
 fi
@@ -26,6 +27,7 @@ DESCRIPTION="libvirt Python bindings"
 HOMEPAGE="https://www.libvirt.org"
 LICENSE="LGPL-2"
 SLOT="0"
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/libvirt.org.asc
 IUSE="examples test"
 RESTRICT="!test? ( test )"
 
@@ -35,6 +37,7 @@ BDEPEND="
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
+	verify-sig? ( app-crypt/openpgp-keys-libvirt )
 "
 
 distutils_enable_tests setup.py
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index cd7d19c6f181..71bec7d6c9fc 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -1,13 +1,9 @@
 DIST llvmorg-10.0.1.tar.gz 120880730 BLAKE2B 30f19f56c4d1f6abcda5fec76256219d1e3c8a6ff1a1f152f94bfe362c07884339fe571ff7fe903ed3b3deb150b2fa868c387887a0dea2930dc08b81db71a5b1 SHA512 48078fff9293a87f1a973f3348f79506f04c3da774295f5eb67d74dd2d1aa94f0973f8ced3f4ab9e8339902071f82c603b43d5608ad7227046c4da769c5d2151
-DIST llvmorg-11.0.0.tar.gz 122743665 BLAKE2B 3f95570240789fd68ddb747df817f5c6cdc9da40911bbe9ee3531c15ada9165e5002b1c2f778cf8735858485ea05a8754e3d3a5f4b15bdd6cb33d64a14692984 SHA512 b6d38871ccce0e086e27d35e42887618d68e57d8274735c59e3eabc42dee352412489296293f8d5169fe0044936345915ee7da61ebdc64ec10f7737f6ecd90f2
-DIST llvmorg-11.0.1.tar.gz 122790338 BLAKE2B 0130996b4a8c4d9f757136fd7fb318068c9bfdc565060dec0d4336480c4ab66c4ae3185a7fdb05f13cf9ee8fd4123b09df938881b75d6e5d3689595114b7e32a SHA512 f5e6ef0b3111aae08a89cd01adb2ff4abfa9ef779c68b9190421d0447efd25c2cc00e5aae9f4764805f5fa31434866043d1510ae7389817e28ae53a5442e2fdf
 DIST llvmorg-11.1.0.tar.gz 122776532 BLAKE2B ca842ff4afff8f44c82b5e7383962a9c45ca1c93b64fa4c6ebcd70a1d3849dbad2b8e4e24fba02d144c6266d7fab3607ebc6999b28c229cb35256cf40f26a985 SHA512 9a8ce022a935eed42fa71a224f2a207122aadcbef58ee855fdb4825f879e7d028e4dcff22c19b9d336db1c8bf63fb84372d44981acf84615f757e54306c92b81
 DIST llvmorg-12.0.0.tar.gz 134226215 BLAKE2B f9c3ba8c58571855caa4f206fd285c9b5be66672fb0814cb8bc0964a051f57f5d35013aa1e27cbda502652b37df1ec23474129109e76a42066847860db441dbe SHA512 0cff02155c5ac0d6db2b72d60d9819d5b5dd859663b45f721b1c7540239c2fceb1f57d9173f6870c49de851c242ed8e85c5c6d6577a1f8092a7c5dcd12513b26
 EBUILD lit-10.0.1.ebuild 893 BLAKE2B eb0a0a0dc7d159d03fc7f791feec613ab9fe2111e010c6ad2a9d805f69990d7d821770d28383cfd3efb740641b8db4b0359f0a9c41723859a419c45e1dd6435c SHA512 803a2e38ff1eb50983f030b5ec38e40b543e1cdc61cfde708f69494dcecd2dace4e00aac6be4342f3950c252769b6a1ef31178ed0337d581b33269d682b95fd5
-EBUILD lit-11.0.0.ebuild 900 BLAKE2B 90b478966ab5582ca0a073dad5450f29068bd75f107e48fa1371304c9e9d87e202b9e85f5cf03b30c54c3f3e4b2c950253e987cd3c44473797cdfe031f5085c2 SHA512 0c461cf8ffee04344f22291b06298ccb63cbc57bac6849a39da9accaf64077046f5ed927db13963ba961536f84f2d71449fafbd5e91bb602a56ff3e5ebd8fa7a
-EBUILD lit-11.0.1.ebuild 902 BLAKE2B 1b2524d3c5216f47c0a81ad24594af8af9310904434a9dc4a32be827aa41fc65d236c6bd0c3d1dbe7db904b81ff6851ab36dcc128e16a19d3ae959f1fb27f5fe SHA512 fbec68212c533e9f37f46b2a421ffc4ebdfedc21a52bb92460b61dfc9eb9d1ce9d70f7d293abcd963b3ff5d297de417ec6ec33066849434a0aea6058ff5416b0
-EBUILD lit-11.1.0.ebuild 902 BLAKE2B 1b2524d3c5216f47c0a81ad24594af8af9310904434a9dc4a32be827aa41fc65d236c6bd0c3d1dbe7db904b81ff6851ab36dcc128e16a19d3ae959f1fb27f5fe SHA512 fbec68212c533e9f37f46b2a421ffc4ebdfedc21a52bb92460b61dfc9eb9d1ce9d70f7d293abcd963b3ff5d297de417ec6ec33066849434a0aea6058ff5416b0
+EBUILD lit-11.1.0.ebuild 901 BLAKE2B 03656b1026178d703dc2274b8c8e64504d9f84f9946a34efc1e6a03d3b3038f2a6c23e3c16efc6666314f695315a1995d3cbb5a385a17811fb44a372d6caa6bc SHA512 7a09406d817d5110a489686aefb87d85bb0b8b0a958cb2c4a2065b02e2eb6152023a1f06391be934629c27032b73dbca971404bd848a93a9ab602baf7591b838
 EBUILD lit-12.0.0.9999.ebuild 869 BLAKE2B 124a91bfb39964af4222f3dcd88250c2c91d9c399e87b00b721e14b75d08f9aa9f2b55a105174bc8a2764664c287812e823621e272742b83f497d2f9ee9f8a1c SHA512 238e92e87e72989a6818be202f5602dd94fb4e8f9a172736d9f0548feb1770d7befe77fc23b00ddb5182dc7e8649cf7e639b50ca26301fcb7bb596ec8b59401e
-EBUILD lit-12.0.0.ebuild 906 BLAKE2B 9e7f47f55e7f33ca5644f654e8d6f200442549b6698c18f0bf6b6cb78a5ccbf8151bf08cbd103003445d87f4816b366cc281aaa3c2318d12025c5afbe813f0bb SHA512 bd5907f22002671d674fe0f5cc40fdb3895ce271bf3cec2a1c0047317c11153aa98dbfee415c165fe9c9637a6d809a182f50e0240fca7026211a10a247f38d99
+EBUILD lit-12.0.0.ebuild 911 BLAKE2B aaf5dda5550e4bdd5354fc4ab00f1b6d1540791e21944b394f75e0c42966cff49999a16047560b0286e6ed29753949aa92efd55a8bd945a91e9a4f70ca1cfb99 SHA512 5a91da5a8c8d58dabc445f6a55e3febaa3404f8fa89d5bc7fd8f6031eeeab45cad8c05fd68a5adf6b73595fe9836d18c6416f9ef7a186aa47c13c9ef4b591da8
 EBUILD lit-13.0.0.9999.ebuild 869 BLAKE2B 40773aa5d208d0d5690ea169e20206160436a2f7cda95d10e760e6f8cf65df25cde6d54bcfa541b8853296cbff3808d61c5c1c30e325ee381ec0846d100525b4 SHA512 4f553e04cda8c1248f28d504367fdf2659f88b65a74b3061ac250943d1a071827621cf2a80ba1745a0ccc40fc574bd5550406427549dfca44e0706cc4703a1a5
 MISC metadata.xml 282 BLAKE2B 36e6403814edc8e79eca456ef9648a7b261f79d4823082a8dce876127b11bf89182dabb02e58b2a42dec3cf9e21fe2f5c474ee4a8416213901f82cfc481ffcda SHA512 fa292059e410ff5e751980c5f5b0145c579b373d77970b797850c3d92641bbcf27b2c18a33d665e76e59553ba7dcc124ae09ec34fcaab4b2caed74248ace0e57
diff --git a/dev-python/lit/lit-11.0.0.ebuild b/dev-python/lit/lit-11.0.0.ebuild
deleted file mode 100644
index 16097962720f..000000000000
--- a/dev-python/lit/lit-11.0.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-11.0.1.ebuild b/dev-python/lit/lit-11.0.1.ebuild
deleted file mode 100644
index dbcd74000ef7..000000000000
--- a/dev-python/lit/lit-11.0.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm )"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/lit/lit-11.1.0.ebuild b/dev-python/lit/lit-11.1.0.ebuild
index dbcd74000ef7..2d27ec84ffbb 100644
--- a/dev-python/lit/lit-11.1.0.ebuild
+++ b/dev-python/lit/lit-11.1.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/lit/lit-12.0.0.ebuild b/dev-python/lit/lit-12.0.0.ebuild
index 4cb68ab291ef..b54ce89ae254 100644
--- a/dev-python/lit/lit-12.0.0.ebuild
+++ b/dev-python/lit/lit-12.0.0.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/livereload/Manifest b/dev-python/livereload/Manifest
index 5b3b9d9a0ca9..ed94eb62685f 100644
--- a/dev-python/livereload/Manifest
+++ b/dev-python/livereload/Manifest
@@ -1,3 +1,3 @@
 DIST livereload-2.6.3.tar.gz 29407 BLAKE2B 39f030dbc21bec1b132fd9d43f9072f4c35d23ccdca56819e2c6b35277e9eac9caeeff7052fc766359e34bf415319f809ebd45927bd2cc223be7ac88594feef7 SHA512 ccccb17cb4d835eb9e812f8076f871164f6afb2fdc1aee9e35c5ef2d75be2c0403cee51d4eb30b029d7b35522f357ee8c3e9df926fd93511ba7d010ed2a69e8e
 EBUILD livereload-2.6.3.ebuild 1130 BLAKE2B 1452bce11e913390c12a60318322be973559516bd18cfef6b304dd2837b432f63250737581f88aa9734ff023b96aa97fbaf3bccbdb26d42c582a18baa8235eaa SHA512 645754ec27b4006d3d39d9e81da6762c3d0278c7fd42a8506f6787bd25220316366ede9730191c9831f50847dd943970a05ee034b1da8dbb484067b54c60a494
-MISC metadata.xml 567 BLAKE2B f61a2d3159e27eda307ad8345721a9074e1bd4583e5a37892aa063f810cc5b350e00dedc40389fd440e0662607b2843e37658b2afa134035279c507af1c4478a SHA512 3071ccd89e481e3cd8c89b2d449583b94d8322dab15420240ed4033265a8cf2776c98176b0fe341f6b2e1131f7b427d3c4f55feafb91e79abe2a733be031a1e8
+MISC metadata.xml 420 BLAKE2B d6da117065add2be1e0e6359b9856600f9105b4372588f7a0c329be35ad100f289337f225948d0ed3af21587393e0b69b7221f9a7f0627174921b23780ef9f2b SHA512 ba16e84829dd05a2a3d866ad9eb60d5d665088cf812c70ffd9f43e1d060978d3db1a43858c5e0aa501a8c9d412be91cfcd11e55d60c24f8d4805efd212dccef0
diff --git a/dev-python/livereload/metadata.xml b/dev-python/livereload/metadata.xml
index 7f894d64d357..19a8d2eb82cb 100644
--- a/dev-python/livereload/metadata.xml
+++ b/dev-python/livereload/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">lepture/python-livereload</remote-id>
diff --git a/dev-python/lmdb/Manifest b/dev-python/lmdb/Manifest
index 694e7f9ee7d6..1e1c0d02db55 100644
--- a/dev-python/lmdb/Manifest
+++ b/dev-python/lmdb/Manifest
@@ -1,7 +1,5 @@
-DIST lmdb-1.1.1.tar.gz 880359 BLAKE2B b202154eae151d3748e9e90fcb71a3c8a722923c2583e469ef1a0017a4c3dfdfd62d99db24fb79e7da1fc7c6a4fb695d9db5ed6a67750967788a12fe0ba24761 SHA512 4621c87dd646f8ca37f4cdc40ffa2fe809ca4da21b335856e50e6d0ae07f3828d424cde9cc383e4cdc761cd9311eb504d67678a33de51c1931a006ec86a2fcd0
 DIST lmdb-1.2.0.tar.gz 881437 BLAKE2B bcb045868c100bcb82daed99bdbd73699dcb5a0e982679f1d9f49747f468e2ab2cbc412ba020b9deca7263fece501c25d984397ee2969187c8118da920c691aa SHA512 75c7aeb3e98ffddb9e40b4eb7404afd3c6ade93753488eac2cb5facfab3ec9b660d925b8bd1c40ca5f8180cb6ca33483020bb4c5ddc074b841693ba278883529
 DIST lmdb-1.2.1.tar.gz 881515 BLAKE2B 76d56e046b5a481411c9a180989da0d1c4b7371058e38abe6d8a6b76f7e2bc62678459241d319850cf739b7b067f3e89d309e5f9a538a187c52c1044fe8b768d SHA512 fa763e24c8f278e0b9c379f39329b7b80051e10d5d8edfdd631486490cfbe5c7bc641d885ffb9f298c0c07f7e6901cc826023c472f98b430a4ec9c0bc71139d5
-EBUILD lmdb-1.1.1-r1.ebuild 811 BLAKE2B f0e38c082186bfd8a0178e4d7cfadba41373a5d38a5bfffc25db1efd8c0389ca63f95197344c45c92c3144e85cd78a1614eb662b5cb62bb4080bd514fa681ad7 SHA512 bfd35e5e39ce4021687aabd371d618b1174bdc2521ebb1069d0681e75248ead0fe167e78cc6ff194e8c91455fa1c37a222554ca536659dcc9467c8896d893e1f
-EBUILD lmdb-1.2.0-r1.ebuild 851 BLAKE2B 4d708e43c8bdc6f5bf6523445512e197fd654f9af561336bd88d5e65014c95a386b7c245899534edc869e475982f32f7e073685b6a4264f6f8e66b514f7d9562 SHA512 937bdcc4237c98009fae5fce4316f13bacc38b4ea7c2039117682e902d9f438cc376cc43791cf516d788f996eacf6a3e2f53bd01a40c530d53e1134946b5f19d
+EBUILD lmdb-1.2.0-r1.ebuild 849 BLAKE2B 3e7786603e70262d6de6dba3cb68430ce934825105ea188e1397317c7df9bbd90a23fe649ced7ddfe7e7faa53ab12f1ef40bbfd91498d8d3740ce7e72138d3eb SHA512 0b8004fb92370c30448bdf67cdedb0d13133f74489f66ce5981471cb6ea7e079ade4c5fe2a2b5f944bc4a5b85b2ba3108a41628a8d7db5c020b5d5bd3c864f00
 EBUILD lmdb-1.2.1.ebuild 804 BLAKE2B 61e2883315ca10151c43169da9013b45cfe2444185b6b6d5d967ab75773918da333238f1a372a38d7e912a8d8844128d42791046cbd35ed451ec47c1b649b818 SHA512 d6f37db07a8f8f00dd17112e45574ed7f7271ae80a5e8b4adc64c8c00b32da25aedb956b89d45b820102ffe77013d2aba59738081fb27b0af6d4245d9ad3f42d
 MISC metadata.xml 419 BLAKE2B 7bb3bd08439249e8bcb7f64d91a707245dd2c32eefed576a4389019217c304173754628f1fdd82f147e6f7a077e2abcb6062dcbaf76d0547c8d710c8d16d0a64 SHA512 700345b4a50d602e35c983fadf73eee5da01b7d9dc4a647966277aeb7fe1fb26f583c681acf1718060dff14b195df7fa4689bad2451c475d1883b66e223ad29d
diff --git a/dev-python/lmdb/lmdb-1.1.1-r1.ebuild b/dev-python/lmdb/lmdb-1.1.1-r1.ebuild
deleted file mode 100644
index 587621283a02..000000000000
--- a/dev-python/lmdb/lmdb-1.1.1-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python bindings for the Lightning Database"
-HOMEPAGE="https://github.com/jnwatson/py-lmdb/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="OPENLDAP"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND=">=dev-db/lmdb-0.9.28:="
-DEPEND="${RDEPEND}"
-
-distutils_enable_sphinx docs
-distutils_enable_tests pytest
-
-python_compile() {
-	LMDB_FORCE_SYSTEM=1 distutils-r1_python_compile
-}
-
-python_test() {
-	pytest tests -vv || die "Tests fail with ${EPYTHON}"
-}
-
-python_install() {
-	# This is required when the CFFI extension is used (for PyPy3)
-	LMDB_FORCE_SYSTEM=1 distutils-r1_python_install
-}
diff --git a/dev-python/lmdb/lmdb-1.2.0-r1.ebuild b/dev-python/lmdb/lmdb-1.2.0-r1.ebuild
index 9c9fdaea7812..b44f35f3e686 100644
--- a/dev-python/lmdb/lmdb-1.2.0-r1.ebuild
+++ b/dev-python/lmdb/lmdb-1.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="OPENLDAP"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-db/lmdb-0.9.28:=
diff --git a/dev-python/lunr/Manifest b/dev-python/lunr/Manifest
index c89e58f21812..03ccc4a8f93e 100644
--- a/dev-python/lunr/Manifest
+++ b/dev-python/lunr/Manifest
@@ -4,4 +4,4 @@ DIST lunr-0.6.0.tar.gz 839533 BLAKE2B fce81bfe0e12138b8ab335ecec828ac18be13f0d9f
 EBUILD lunr-0.5.8.ebuild 1059 BLAKE2B b5477761c205f3638b85445424b8e75fbabaa7e4b5898d0a2005e096c51d4ad8d582525b8f0a15943cd46d21cd9bb7693036d168d9e1e3371d529d65d694790a SHA512 2f7206d376c36be97f0563a7e06d7c4cce5f5c99dff1a9fa85110a40eb6d97fe408bed86b193514432e57e7d602b57061628663a3d11e78fd3571030d87da1e9
 EBUILD lunr-0.5.9.ebuild 989 BLAKE2B b7605c7d002aacaca0c3f861378f5aa48591e72cee1cdb98100450646a26172797a96d623d276c65f7a76097a65f51c500b8ed5675592a415340550cbd2014b3 SHA512 6a78310034dd0ece86dd579b0d200fa2a582dfc34461375812c21f1a633e219b9f9b7236708ce24a383e4444e5423ff98a58e9fe9c67798b8b3af56cfdc2337f
 EBUILD lunr-0.6.0.ebuild 658 BLAKE2B 1ec9dd7c866c1f425cafadc6b2e748c49b795096a857932735fd8b41e06d2235dd44e96fac6dc5fc1b9b28a9c81e3c94c06ffa10d983ea94c28d161db28ba301 SHA512 824527620addda5615f624cc3f46f60483cc009c5f36e63001a78347e429073af1bf2fcfb6709a2d8b4cd998ede6dec66a88196889e59705c4fdf5bef3e4696f
-MISC metadata.xml 640 BLAKE2B 08b7d65582122ca1dbf5612b10609654a1e44e03dc746eb0d584b9c06bef9e8840ff45cde7741cde863cfbf9165d855ea08ac4f347a5d0351bf720aaa8091cf3 SHA512 b6adc128ca04bfb62527b50fb418e01b146682fc63d45161546bae4bc357c4b8ab2867afe3bae09fce5b627aca6956fd3001ab0c6ef423f598791d4a2cb3e19d
+MISC metadata.xml 493 BLAKE2B 76427e64dc660b83bf96afd10026bd8751346876ec99e1557fab59a9eb99e3da48c555b515f32aad30d2ed48638dcc53d93c5d25d3f1d754e2eaea26a58c9263 SHA512 fab22bf59bae341d289baf58e3ccb60029ed1ccc8b20000c624ba7cab9e315af46a8583c1c834493d8e1fc6dea2d60fc1637f771936f4fdbf2f9829d50414bc9
diff --git a/dev-python/lunr/metadata.xml b/dev-python/lunr/metadata.xml
index 602cb18ef31a..4f11f36659b2 100644
--- a/dev-python/lunr/metadata.xml
+++ b/dev-python/lunr/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</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>
 	</maintainer>
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index d892eee3aa2b..1aa9e7794da6 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,6 +1,5 @@
 AUX lxml-4.6.0-tests-pypy.patch 17417 BLAKE2B fb4c8452f1401c5d617ebbb3a944772c4da72d8261a99d3593c9886ec7c734d145f4919c61d5a4d434a3df942eb30183988965d28407fbfdae6f228c23dd5ab2 SHA512 527d330145491227319cfbf07d176f100b6d61b285a13f3e6fb0c3fb259df697de45ea22e2dd18db7d927cae32219992c542616c4c0120003b796a30974becb5
-DIST lxml-4.6.2.tar.gz 948652 BLAKE2B df6ec7e183df48c0edc6cce0fbdd6ab78eb8d1b7e8fb81a76bd9f4a24f05923c757d5b21f508be9be50c7bb187927c4e3a66146d480f2d40efc05388d26d3bf5 SHA512 81dcf5cade7b05c0e831beae7cdfbdb21e876fa55b23da98b89cbfa7960a4737efc13346ea3ade22a2448f20e036173cf5e32d43df6656c3231bfba07981f9ed
 DIST lxml-4.6.3.tar.gz 948931 BLAKE2B 373248827cb6bc0698b632ef60978adb2b8f7c37444fa1804567f08eb669018dc38fadf52422262fd96280e88c59578d244e4c5a1ed55609af55c010b3bf2b09 SHA512 50e42d6269dc45b4c0ab3285c49307f8bee87fcc4b9e0f531e1ee37bcf83c5938b7e361f906a3158fac8df89a79b932dd64a8839455e45f45f3a5f0ba73ff6a5
-EBUILD lxml-4.6.2-r1.ebuild 2758 BLAKE2B f65b9635f36db402c199ec3f1bc670db3965b14af7d4ab81049f8ea9ab2ebad391dc54084aded5a5896e6e499329d8e887369f27333a2567dfff153594254fc7 SHA512 532bc3a7c525071e0ad9b0925c24bdbf39ea0c6f4b055b73f8ac9f6d6e96b117f23dc821450547f5ccbb7bf724b8bd161f03d185ef158d4d284dcf062b8a3173
-EBUILD lxml-4.6.3.ebuild 2757 BLAKE2B 67b1bebb6b59f14bd201b075368c4ce16b6fcc037bcedce50a7b4f9795eace655a37d2b80f105c1e01cac11fff150cb9df6aaca767f128a6d51ea948b3ac2caa SHA512 eaaf72930197031b9f103b65e617e7a982ee85f9b703e815c64fb17cb8524f445ab0fd6b209f7d1dfd0c07ce770b16b8f2d55de1b8bc1990740acd2e550eeb06
+EBUILD lxml-4.6.3-r1.ebuild 2729 BLAKE2B aa8dc34da8819d486e30e373324a57333293eb03cf2fac313cccd0a6be23d46e1f1adbb09f4e7e24453cb8c2eec5cdc0557ce14e33711385a9d59720ed6a0a31 SHA512 d7491ba98a0be007a3fff028f62b6477576db0ff0b6736819a09c549333d629b7331550a0488b1bdb5b461ebc1ca579410f2162be623a42338022342be947362
+EBUILD lxml-4.6.3.ebuild 2717 BLAKE2B 2e8557208185cf2c0a5a46302266b6bf05e3fd614d5aca04dfcf9b758912b8f6379c06039746ab70b070d3d25b830397683cff87eaae08051534a4ab4fe19b07 SHA512 e65da2610f2de905c2c867c9370824ab9d7c94c6c40ecfe660587b7b0f75c800b0846191ba5c961daec73434351260ac50c4983f063eae23dbadbb46d58c6001
 MISC metadata.xml 409 BLAKE2B 95add82278696324ff1c27f90f3bee49ed0b1ec46546751b5c9551991e1bb208139cb9e6594dc013ff14c032611f890da2330471bafa30960f8b61f45a1f0d4a SHA512 f4ab9197ba14428808081c0ff600b4b6d004690914ef6e8d053726a8d4d7dcf8df6ed2da56ce45a2aecc7484e9c5beced927771f1eb46dd7f6f61d5fd91b4f91
diff --git a/dev-python/lxml/lxml-4.6.2-r1.ebuild b/dev-python/lxml/lxml-4.6.3-r1.ebuild
index 422afe2febfd..57937b2229a6 100644
--- a/dev-python/lxml/lxml-4.6.2-r1.ebuild
+++ b/dev-python/lxml/lxml-4.6.3-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1 optfeature toolchain-funcs
 
@@ -14,19 +14,18 @@ S=${WORKDIR}/lxml-${P}
 
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc examples +threads test"
 RESTRICT="!test? ( test )"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
 RDEPEND="
-	>=dev-libs/libxml2-2.9.5
+	>=dev-libs/libxml2-2.9.12-r1
 	>=dev-libs/libxslt-1.1.28"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
 		$(python_gen_any_dep '
 			dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/lxml/lxml-4.6.3.ebuild b/dev-python/lxml/lxml-4.6.3.ebuild
index f600d3a5f551..56111fe84a47 100644
--- a/dev-python/lxml/lxml-4.6.3.ebuild
+++ b/dev-python/lxml/lxml-4.6.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1 optfeature toolchain-funcs
 
@@ -20,13 +20,12 @@ RESTRICT="!test? ( test )"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
 RDEPEND="
-	>=dev-libs/libxml2-2.9.5
+	<dev-libs/libxml2-2.9.12
 	>=dev-libs/libxslt-1.1.28"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	virtual/pkgconfig
 	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	doc? (
 		$(python_gen_any_dep '
 			dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 3c7a5ee14b0b..03c9c09d34bb 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,9 +1,4 @@
 AUX m2crypto-0.37.1-openssl-fixes.patch 3074 BLAKE2B 3daa583d4f7e04840a9c2f15fc583dcf8e4ee996aee93d9c180ccc4920f36cd2f90e2f2591732597b0108f3944cb3b22d0eb202c8dfd500fccb8e805aa74666d SHA512 fd73a98592026b39341200fc378042b71272dad4c43c63e4da3aafabae4f5a8aadeb41738ca99cca87ebeecb5455abadfe96d0c6640702b14f138f8122dc57ee
-DIST M2Crypto-0.35.2.tar.gz 1117706 BLAKE2B efa15e023be7755b94c642bb23eade912edcbbb76bcdfed3414d27937cd705ec4c83069ca620fe20e58e126549ba7f98e84f6f8330b78133a8a8b953d18f467b SHA512 3608b29a8e7d0732a2359e35fcaae191447aa7c0211ca3d057eed6cee7f0819f5c1121e7d41caca8cdea3c7911f8c447ee475b1b3d125e8dc3adde2718a59f36
-DIST M2Crypto-0.36.0.tar.gz 1127584 BLAKE2B 5cdbbb11ff67d4ddffb2853a72383f3c7f1e1aa53ab84166aeda4fbea1b0d7f506761bb07bf8cb5b36f94bdbeb2ea2b46e0693da8355f81b4bf5c4c1c1cc18b1 SHA512 5b7d6d10c943ff0e09e0e9748d5578e7e0f7659a73de4ba49481152bca05871aef2bfbb869e1636a7cebcf2dd8b9f67fb0d299a833d1d4ebd538031c35d7bca1
 DIST M2Crypto-0.37.1.tar.gz 1247031 BLAKE2B 3628150b8da15d7356298b6e52e0d8fa7875921a184a0eba3a97eff0588c9e0fee340c92fd486919057d900d6e3b2b711174dde9761fe247848f92ac6434df0a SHA512 9a5e0220704b4897a9ca7efa4b3b57447b9175c52e8039a85bff7bb1a43b709c69f3c8b5903df461f8de39d3f8a20f9bf494df6f5882771846adfe2c03fbea9e
-EBUILD m2crypto-0.35.2-r1.ebuild 1289 BLAKE2B 376878f2a67c9e9ef6b2ec628fed337f521567e107c63bad62bd2e751b46c0bb9ad74dfe41abcba137beadfe9d4a34d72582b4a1460bb0112eb78c3099893931 SHA512 852ed45c0773ef735dd11efaea31e90e4cbde198cf2159dab524a055f404b6714eb302f90d9a300016a1884fe807084d9169e95ecee77253ab5da89f64c76c42
-EBUILD m2crypto-0.36.0-r1.ebuild 1420 BLAKE2B fb4ca5fa9c710aa7605003eca2bf1b96e3c423b7521ebb43bbb16ac78fd9f27ae411a6ae0b06942bb099a659847f4ebdd0f71c755dbd913d8df6d7bc27d3850e SHA512 1858b478147e291e86246a1d23e6147d8e9e2a8b615d1e242cf2c23dbfd434482ba771eb13e851a9644e1908574d2f8e2d5cbbe9df2f3bc6348585432efdad1c
-EBUILD m2crypto-0.37.1-r1.ebuild 1456 BLAKE2B 5c6bf853a417c2f612657ff17d1227d5b47373cfbbb29101af5a4f3dc6d6ba75d052ff6028e73ad57288906d215e797a847840898562c88070e889e311158824 SHA512 50ce80bf12a29c377930f662585ef2f5978f8c3e93a87a92a565e3b4b6d9d77ae6024678d653b3c8d0b9b886e867d2a83044e0bb142b5ece6c2768212d4a9b4d
-EBUILD m2crypto-0.37.1.ebuild 1408 BLAKE2B 7dea42ac2fe95c5a740cd723bc2b6f583b58908102e3b748a808dc612ed8f11ebaeaec0cdabe3b0d24febbebf9f029754637366547dccd16777dd84914c46fab SHA512 a6f0fb112a0d5c476393125087830f29ee37a500e3a35d146aae02cb359b0521db4412c8931755bbd286f876ac0e6fe3dbfe4c89fc2c30c4d73ea1bfcd5a5b84
+EBUILD m2crypto-0.37.1-r1.ebuild 1454 BLAKE2B f28129888e0203ff76da8e5fff40d6b165be238bae308b3d15c770f07fa8b02942fea8a60d50a7d07f68d1a27d7088855f80d36f4a16f9d584e9f08ddeb6ecb2 SHA512 b2083b920fecff0abd0bf4702e0494b22c9f6e2b29d8e354c261c0dbc10219c4bb2497b1f5cc891ddc59e73e922f40fae38f8fa2c4beb0fef499235c9235f48e
 MISC metadata.xml 380 BLAKE2B 99a1c8e8202bed7c6d0ff8cdff3f17b664791405b082be2b7d72b3fe2b77bf89c886666d9bdce6a96c540b9518042b9d49b9af926ca10ab4c5b3b416182de01c SHA512 f2e3b4228c45471f0132b3bb412f017f4006eb82bd63e187db3efdfd3f412c1db19bdb79d37630bb059f75ef69f110687b8924d22c2aef0101cb40eb3486f1e6
diff --git a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild b/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
deleted file mode 100644
index 20ad917a37b9..000000000000
--- a/dev-python/m2crypto/m2crypto-0.35.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8})
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs
-
-MY_PN="M2Crypto"
-DESCRIPTION="A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	$(python_gen_cond_dep '
-		dev-python/typing[${PYTHON_USEDEP}]
-	' -2)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/swig-2.0.9
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-swig_define() {
-	local x
-	for x; do
-		if tc-cpp-is-true "defined(${x})"; then
-			SWIG_FEATURES+=" -D${x}"
-		fi
-	done
-}
-
-python_compile() {
-	# setup.py looks at platform.machine() to determine swig options.
-	# For exotic ABIs, we need to give swig a hint.
-	local -x SWIG_FEATURES=
-
-	# https://bugs.gentoo.org/617946
-	swig_define __ILP32__
-
-	# https://bugs.gentoo.org/674112
-	swig_define __ARM_PCS_VFP
-
-	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild b/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
deleted file mode 100644
index 221b4223b392..000000000000
--- a/dev-python/m2crypto/m2crypto-0.36.0-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs
-
-MY_PN="M2Crypto"
-DESCRIPTION="A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	$(python_gen_cond_dep '
-		dev-python/typing[${PYTHON_USEDEP}]
-	' -2)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	>=dev-lang/swig-2.0.9
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-swig_define() {
-	local x
-	for x; do
-		if tc-cpp-is-true "defined(${x})"; then
-			SWIG_FEATURES+=" -D${x}"
-		fi
-	done
-}
-
-src_prepare() {
-	# TODO
-	sed -e 's:test_server_simple_timeouts:_&:' \
-		-i tests/test_ssl.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	# setup.py looks at platform.machine() to determine swig options.
-	# For exotic ABIs, we need to give swig a hint.
-	local -x SWIG_FEATURES=
-
-	# https://bugs.gentoo.org/617946
-	swig_define __ILP32__
-
-	# https://bugs.gentoo.org/674112
-	swig_define __ARM_PCS_VFP
-
-	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
index c763adcbf2d5..b6c17695032a 100644
--- a/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.37.1-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/m2crypto/m2crypto-0.37.1.ebuild b/dev-python/m2crypto/m2crypto-0.37.1.ebuild
deleted file mode 100644
index e4bd5539a6b2..000000000000
--- a/dev-python/m2crypto/m2crypto-0.37.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 2018-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 toolchain-funcs
-
-MY_PN="M2Crypto"
-DESCRIPTION="A Python crypto and SSL toolkit"
-HOMEPAGE="https://gitlab.com/m2crypto/m2crypto https://pypi.org/project/M2Crypto/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-lang/swig-2.0.9
-	test? ( dev-python/parameterized[${PYTHON_USEDEP}] )
-"
-RDEPEND="
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}"
-
-swig_define() {
-	local x
-	for x; do
-		if tc-cpp-is-true "defined(${x})"; then
-			SWIG_FEATURES+=" -D${x}"
-		fi
-	done
-}
-
-src_prepare() {
-	# TODO
-	sed -e 's:test_server_simple_timeouts:_&:' \
-		-i tests/test_ssl.py || die
-	distutils-r1_src_prepare
-}
-
-python_compile() {
-	# setup.py looks at platform.machine() to determine swig options.
-	# For exotic ABIs, we need to give swig a hint.
-	local -x SWIG_FEATURES=
-
-	# https://bugs.gentoo.org/617946
-	swig_define __ILP32__
-
-	# https://bugs.gentoo.org/674112
-	swig_define __ARM_PCS_VFP
-
-	distutils-r1_python_compile --openssl="${ESYSROOT}"/usr
-}
-
-python_test() {
-	esetup.py test
-}
diff --git a/dev-python/m2r/Manifest b/dev-python/m2r/Manifest
index df7ef5a0e7f3..9122949c1ef1 100644
--- a/dev-python/m2r/Manifest
+++ b/dev-python/m2r/Manifest
@@ -5,5 +5,5 @@ AUX m2r.1 9244 BLAKE2B d7ac673d0750695f8b21b6e9d0c5328ab8934dd20eb88835c655affab
 AUX test.md 34 BLAKE2B 88eac9a501f3fd54ac3c9555612c7d3860d5c692170fcfeca3d75b665611b75e627443e8a54d8dbba4c820b2f793c5b933a76493381d295aefdd5ef55b7fc1d5 SHA512 c4b98b3256e14d46187d4c5cf5d3b26e4e4e0b1c6f2f61618987c234f49ea5a9bf31a94b9d2c4907bbd0685fb30138a5916b5dd3c8f92cd80bf0c7c2e657ae26
 AUX test.rst 45 BLAKE2B 1bdb710270f83f8a5177fe457f3ea40bd0bd8ddd36e5acabb4d6fcbdd1cded336a736978a79efff42c7cebcd1a420d8bc4485593d675b3a66e3f427434147c9a SHA512 a2d44de89e17b5a023928fa695c8dd61163a2b59968a514b9a976f92923881ce53625930f0e05f7f257250e46f25747928f71e8f25fcb9c05445b221688077d7
 DIST m2r-0.2.1.tar.gz 24455 BLAKE2B 42ec5a919301b6dee2b345a5eca9e62a1bd44186fb61dbd8cc9de6cacc34821e912f242355cc7368b755f923a433353cfa567afc480e9b8c63bf209ff9d3c624 SHA512 847f04538ee52f0b0a88cee9474ed889e8114a3a7b1fb221cdaa867ab70ca52f517250f2c8bbf795ae598c7b6614e6d03d9f6f05b7e3d56fb8087d63eb52f1bc
-EBUILD m2r-0.2.1.ebuild 1423 BLAKE2B 3f9883795817a21a4e6f7d3dff086218fef371ac0088be8b7e0354c4c93c1b10fdbc6ec1afdc6d67d282af086423d02ea982fadc2bada48fe9db62141b7b292d SHA512 2a6f2bd149bee4a4e808c293c41d77313f18a557157256fb0e137aca1b7ff841dabd258dd5a925ffdd56984e3e02a0f5474f14cfc468dbb09b488267df817ed6
+EBUILD m2r-0.2.1.ebuild 1572 BLAKE2B 1e9a6448927cec19c87d08d0cc03972d0446626f4a7ef610c3ea4f848dee8b1876efc99c9024f3ab2163504bca6cdcf29ba5e9e21c0bc33b3eb05ecd0d63617f SHA512 b1893b47f4d37bb42548fc8caa02cc51000805553f6f490e5615ca62d9f3d137c0134047a4296a9e6ac7b7669ce18e7ea92e0c19e434ac7df150a002b20b5e5a
 MISC metadata.xml 484 BLAKE2B 3b355a1278f7d4228f6a050fc7ed24eca1755362843cb166c3870c8c6b9ee86d5e4fed899c2e27dd6294767197c0df1f7f081cc82a8fdccbba1bf7fdf54253e6 SHA512 df5da26b52db4a7d5f62f7c75fbd3ef51f5b59d5fc63fcf33040b3402c001065e44c2f6daf616d1b87188415bd786a85526705e7bf1b1b08c9ef50b3239d65c3
diff --git a/dev-python/m2r/m2r-0.2.1.ebuild b/dev-python/m2r/m2r-0.2.1.ebuild
index cc8e39ecf1ce..376b91573204 100644
--- a/dev-python/m2r/m2r-0.2.1.ebuild
+++ b/dev-python/m2r/m2r-0.2.1.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-DISTUTILS_USE_SETUPTOOLS=rdepend
 
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Markdown to reStructuredText converter"
@@ -23,7 +22,7 @@ RDEPEND="
 BDEPEND="
 	test? (
 		dev-python/pygments[${PYTHON_USEDEP}]
-		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7) )
+	)
 	${RDEPEND}
 "
 
@@ -44,6 +43,12 @@ python_prepare_all() {
 	cp "${FILESDIR}/"test.md tests/ || die
 	cp "${FILESDIR}/"test.rst tests/ || die
 	cp "${FILESDIR}/"m2r.1 "${S}" || die
+
+	# in python 3.10, the text changed from "optional arguments" to "options".
+	# the test matches on the concrete string, make it match on the part that is shared
+	# by both versions
+	sed -e 's/optional arguments:/option/' -i tests/test_cli.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/markdown/Manifest b/dev-python/markdown/Manifest
index 3759a8a05d45..fd611c482c66 100644
--- a/dev-python/markdown/Manifest
+++ b/dev-python/markdown/Manifest
@@ -1,5 +1,5 @@
 DIST Markdown-2.6.11.tar.gz 274132 BLAKE2B 0d14d308c97d925db83d71f3b9be5622e77ee4a159fced15c811390b39950e81bff9ffc567f32e878cbc44014640ab0a2f596258cfd0dce6b66029105cec7370 SHA512 4e7dd3e04f181fa2751a359aede301fb29a23b9af74867ff9d1d0fdd051dcd16d04a5891e37aff0b309649c5fd13363802ec7e10fc33896e9453991efcab4a66
 DIST Markdown-3.3.4.tar.gz 322192 BLAKE2B 37122305112440b85d7f0e5e1bf90bafe15a8bcb84e8d8bdd9b4183dcb4be1010d287450062bab7dc9017d8e618f84a8245e6fd35f8204e5e2ece14d302fb13b SHA512 37422619dd8f542bfcf7975c92e76a39e4eeeb42386727d52037869cee1617f8efcb74a382a9c7cb903907ebf3643a27ba0de583bc0dbd327a36e72bbf8520af
 EBUILD markdown-2.6.11.ebuild 822 BLAKE2B b817bff5c3d6d1d62b86b451d49076f2b84fcf1c9e448935258c1b35fd7f3fd59173d26628ce3b6338ec87a8b9c8866e430c5585fd93d186f5b8784e7fa8b31a SHA512 4c15ff73bfdac09321c707cb962c94f106787a0787dd828c86a4629eba6801b63db1ff10ba9ca87a2397a7599b73f4aa71ddf918886d9b3c6270f3c67b735c88
-EBUILD markdown-3.3.4.ebuild 1075 BLAKE2B 7a3dbdc4535c2efc623a7bdd8d83f167fd38f238bf8fe4baa33497ef6ca1e19641ccfd0f4b25e2da1e80edfd628679b8390c037772b64f13f0f8022d8a9d438c SHA512 c9d718aaf8e7b9b6ab425f90986866c0b0a23af77f59c340ca0ca384905384ff6c379e1a9033bc8dc636edbcf009076d9c70262746e634cab8e241f8f0e79450
+EBUILD markdown-3.3.4.ebuild 1082 BLAKE2B 93bad1a568d23cb28dac7e0058588836f4d55611413b37bb81cc0baeba2be53fdea952d47f1d4acaae87725322478dfac9800816ea2354903465a8d10b10b1a4 SHA512 95e0558dbbfe2e1e3d6fd3d95a750f7158403951470e1c1d713757c1f6c6d46448734d8dd667762264cf77e97f0fdd3eb5b3add679a6447c1a0cd3c7597220c3
 MISC metadata.xml 399 BLAKE2B 675bf8fa68dad4dc02b4572a74a7e4cd8c7876a78d7a9769b118551ae2f4217028a67f1d206537a08d2b0e26763ef0d396b007d0ca86b498397b6aec5d516435 SHA512 713fe9c2390fc8726140a5981c63bfd901e9288fac25b3b9aa5b7d6a1d5502334df09d4b9f57a1d0f4766ce6e2c36695161ddb796c1263bc090940f99bc1d689
diff --git a/dev-python/markdown/markdown-3.3.4.ebuild b/dev-python/markdown/markdown-3.3.4.ebuild
index 504c044ccdac..4cb7a066f436 100644
--- a/dev-python/markdown/markdown-3.3.4.ebuild
+++ b/dev-python/markdown/markdown-3.3.4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${P^}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="doc"
 
 # importlib_metadata is only necessary for <python:3.8 according to setup.py
diff --git a/dev-python/markupsafe/Manifest b/dev-python/markupsafe/Manifest
index d3e01f63f47a..46ea05df9226 100644
--- a/dev-python/markupsafe/Manifest
+++ b/dev-python/markupsafe/Manifest
@@ -1,3 +1,7 @@
 DIST MarkupSafe-1.1.1.tar.gz 19151 BLAKE2B 184ab0bc42f8d254ef4239f700f019c0a380bdf2117dfe1abe2eb4dfa0f037158d181a120d8654a6971e9c8badb078f997e3a8bf231898e0f4bb3e8496d9abd3 SHA512 f3014e6131a3ab866914c5635b5397ef71906bffb1b6f8c5f2ed2acf167429ff7914236d38943e872683a57a9be9669f4c5aace6274f3307ab21ef25373db0b6
+DIST MarkupSafe-2.0.0.tar.gz 18466 BLAKE2B d065eda7f3f2e02abf2d1a9a20c2eb8ed774fa5153cf4c0584de859ac790a7c4dccc2304f7e920a2345877653ffd9be386bfe677e96bcf1cebb5ca6b87ef9d32 SHA512 260121db97178d5903645c9d1fd38c5d7c7a5bcd31a8def1d5a921328ff86ad025bf62d73734434a7920a00024ff8c0898352f7406713af51051e750b5df7cab
+DIST MarkupSafe-2.0.1.tar.gz 18596 BLAKE2B 3f6d576733a0033ca46df5e92892c1f052c1b0c03a92f27926383279f81531981139e5a659a7d21d436643795706480dd9e6aa979f70a81a2b95f2b9d0ac9f8c SHA512 77249bda784111ece15d59eb3de1cbb37a58fb9f22902fe6b73fea9eb0f23857ccbe53dc55463278e3b91f78dc35e2b027fd823ca50d88d8985d5a98ce2327f1
 EBUILD markupsafe-1.1.1-r1.ebuild 639 BLAKE2B 267a221a71d8dc36f34fdfb818298e268a7cd2759d1e0ab49099c6f57d934516e71ecea2b7c529c745c4aefe6124a7d52eab880e3c157f8d40384eb0cd6e59e1 SHA512 ae11b1f75420b8d4f142856ffeeb2e68929243bbaeceb8d08e19523bde4cb659e1b08ccbc68a87cee2bc97225bc35bb73268cf61b6b2c63fbd47bb9ec39209a0
+EBUILD markupsafe-2.0.0.ebuild 647 BLAKE2B 249f78f4628f85d1d5998373544c70c609d403d9f9a572fd8929dc4ecea7495e7efcae42aee361a037368f9706096788825a44bed25b65b68720e85352c09ca5 SHA512 ccf216823b5eae1fb4572f6163381410e59dbe3a194b76e01456f0c787b59560b5b5c8b75379350980c789e81806b98f71c1c84cb5429fe80b5c4d2daaca4ac0
+EBUILD markupsafe-2.0.1.ebuild 647 BLAKE2B 249f78f4628f85d1d5998373544c70c609d403d9f9a572fd8929dc4ecea7495e7efcae42aee361a037368f9706096788825a44bed25b65b68720e85352c09ca5 SHA512 ccf216823b5eae1fb4572f6163381410e59dbe3a194b76e01456f0c787b59560b5b5c8b75379350980c789e81806b98f71c1c84cb5429fe80b5c4d2daaca4ac0
 MISC metadata.xml 313 BLAKE2B d83629ec355bdf3a33ec1987d8826509f6485ef34a873a6db1122c72beff76de648c5f80da70f2102e60532d852462e13826f714b6ae263d65d5c81bb9aa63e9 SHA512 91b859646ec529ca9b646ac0a6526554de887d6aca353069dd00a6b01dcd2b5765a7b1a1e02c8b52bd50ea67f1476cc2dce086651ee46f7c575c56d1ab7f4c8d
diff --git a/dev-python/markupsafe/markupsafe-2.0.0.ebuild b/dev-python/markupsafe/markupsafe-2.0.0.ebuild
new file mode 100644
index 000000000000..ecf52ba1008f
--- /dev/null
+++ b/dev-python/markupsafe/markupsafe-2.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="MarkupSafe"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
+HOMEPAGE="https://pypi.org/project/MarkupSafe/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/markupsafe/markupsafe-2.0.1.ebuild b/dev-python/markupsafe/markupsafe-2.0.1.ebuild
new file mode 100644
index 000000000000..ecf52ba1008f
--- /dev/null
+++ b/dev-python/markupsafe/markupsafe-2.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+MY_PN="MarkupSafe"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Implements a XML/HTML/XHTML Markup safe string for Python"
+HOMEPAGE="https://pypi.org/project/MarkupSafe/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
+
+distutils_enable_tests pytest
diff --git a/dev-python/matplotlib-inline/Manifest b/dev-python/matplotlib-inline/Manifest
index 65d6b5c81649..8c51431986f2 100644
--- a/dev-python/matplotlib-inline/Manifest
+++ b/dev-python/matplotlib-inline/Manifest
@@ -1,3 +1,3 @@
 DIST matplotlib-inline-0.1.2.gh.tar.gz 7340 BLAKE2B 026c08d8a96d4402a1b70e50f1adce2b620c17b00d9e4dc365540c41b2d8f189a73cf6c65c8946ae45e7e5325321d28918692c2c6b5f81668fa56fedb40fd425 SHA512 e6ac7efe10979afb773b75c4d2ee321c52b1e9788a80703d063b0936b4989946aa35206ff7e8ad4ffaf6c1116d893de9516fc033f53685ad3a55d8f1a9a8fd48
-EBUILD matplotlib-inline-0.1.2.ebuild 510 BLAKE2B c99fe1dcee0fdb3169e5ff2b7522e496c537647efa1ca9691f212fea122d51956d075084e6ffc678afe9de3ca96dd09d15ea7c0ae3a841daa73d0fc8eeff84b3 SHA512 c07deba2ce72490f030e0dd4f25807afedc8c1b96bb3be7c75a3d12bbcdcc781d70438452e8152e573aca2eb68d530a3d60bb41dae8613e16fd8f0a4ec6dfe4a
+EBUILD matplotlib-inline-0.1.2.ebuild 534 BLAKE2B b1d2d5d87df00e3545234dcb34c048c152a183607552a3fd4d92ffd14d172def4489a4ce32336decd582b6cba2432fcb7f7451ad76d4b184fd6311fb7d3d5a35 SHA512 2dc95716a3f76bf0aa0af42038f40952c0b83f61e261fb7052cadc10ac60235fc8bfab09d7a59e352f956764e35a41ba0c613500e95bd4908c847238892d6218
 MISC metadata.xml 363 BLAKE2B 3cca406a8e51346ecb5b3dbb3de8a0e3bb82a09243afd82f976d4ebe19207d11487000752cb20601a3e190ed2673dfaf8ccd37bfdb4b53a1b344fb8be2c8dfcf SHA512 eb9935d48f30a722f73335aff5bb53a539002d3018249ca57006db40621b6f3ed9af0d02596c5938c97bf8b28aa7bc3bdb2c0c14cbfa60a08400b95fd33b67de
diff --git a/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild b/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
index e9b94dda69ff..9a9110d9d3d1 100644
--- a/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
+++ b/dev-python/matplotlib-inline/matplotlib-inline-0.1.2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
diff --git a/dev-python/mdx_gh_links/Manifest b/dev-python/mdx_gh_links/Manifest
index 738b6986a05f..e11613877f5d 100644
--- a/dev-python/mdx_gh_links/Manifest
+++ b/dev-python/mdx_gh_links/Manifest
@@ -1,3 +1,3 @@
 DIST mdx_gh_links-0.2.tar.gz 4961 BLAKE2B 02a391d3a0dde532cecbd4f025a7624a90aea698815ddb797cc4f74e2be80f5b55013b9cb3d358f92dcdb43fa9a160880c881ed3ac2a4f2c306f16dad06e1f3b SHA512 0a6be387e4b3d5f31601a365679733647f9669d61537ef3b630321d61f1d645f633098b92cf2fbd61faeb8469094bd89a5df8a561d15b8908645314ded4dd42a
 EBUILD mdx_gh_links-0.2.ebuild 472 BLAKE2B ca2208f239d50fc920920bb96496b7ac8759cc3c32f28d89bbbca6ae327d9d5a491fdb8cd4ce1c535a0f73716976cbaad2d8a863833a05606863c814ae14d97f SHA512 6a2b4ba6b87084d6c4da50b91a647965101e593f9046d697eb44240c17a61df1f6ab1c7b99fa0e8d1f051c3650c5b1afae14f95e0a7d78e4ae38914ebbbcbc61
-MISC metadata.xml 504 BLAKE2B 2e56c5795ae62fed8468315f292a3de41060b59b5a167148264c3d67cfc8a927a239be33d1a26759f5ad763f67ff40ad19f9f2f6ac16e2e2e2f49c61628d9605 SHA512 1e10dfce8bcf81ff7adbaf9879fe979d3d3f297f0afcdd0eb2c1c0cd16ccf6af679356d0a64fc91ae462ec054845461decbd7eac548cad709c58f0c97f6b1d87
+MISC metadata.xml 357 BLAKE2B bdbfeb29d0f7e37568adedc0b0442a60a1b4aad7dd421d242ab29b4bf2ca6fadbb16a0a511c474991359fa428596f308f4f7892838fb7c81dd4b3158aff5d6b5 SHA512 2913aa9edd1f0692735f2afc7fb39eeabdc2dd8088a025345a433df0df847207125ec467d8fee95f5ef060e9bbf6bc858584421b9500daf635f5de19ee6479c7
diff --git a/dev-python/mdx_gh_links/metadata.xml b/dev-python/mdx_gh_links/metadata.xml
index 7d63c6d38f79..f74e363e17af 100644
--- a/dev-python/mdx_gh_links/metadata.xml
+++ b/dev-python/mdx_gh_links/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mdx_gh_links</remote-id>
diff --git a/dev-python/mkautodoc/Manifest b/dev-python/mkautodoc/Manifest
index 3542ffe55313..fcb695966965 100644
--- a/dev-python/mkautodoc/Manifest
+++ b/dev-python/mkautodoc/Manifest
@@ -1,3 +1,3 @@
 DIST mkautodoc-0.1.0.tar.gz 5654 BLAKE2B c0ae754e800ea25e9cccc621b4fd5c8d1561c57808b301ac5a3036ca18fda1adc432006e13b777a83dcc2cd6960a34745e17dfbcbbda24098902198d4fc9d743 SHA512 7ccb0a03016e2984d88d78eca2a8ee01e2153ff574c912358640c158b2084e3c365ace0fdb89cb74bb1950c68775d9d3cb11201cbf3c6d136dc7886a3294dc89
-EBUILD mkautodoc-0.1.0.ebuild 640 BLAKE2B ec22d2c25b8ad03cda5941ecda997ffee8f004fb036e560e36ed489af30000e13ba1ee332511cf65ebf8e7d0ef19a9de3cec2e3d9da88ffd56a943ef0e1e2dd4 SHA512 463b98fed20cfeb1a3d9caa826c8f7bc17c1591b1cc96ae8128d4ba749848be8518a48cb07b68d07e4ec89317974902f9fbd1bfd596fe3aa771741da19ba3a6f
-MISC metadata.xml 538 BLAKE2B c988582a704d246ee748bd43b226b03649e66280a346834f408f5adf988b823c0818e31794f4ea8aa17f4528ef7a7e8366983261f60fd7e2f9e27b0752925e09 SHA512 501a7e559572746f090bf3cff337c178f9ce7c83b8b5677400e87f8835d284b2db5568bdecd7fac503fe31d1555c41348099e977e84b5119eacee9f265b1e2e1
+EBUILD mkautodoc-0.1.0.ebuild 643 BLAKE2B 403486972ff04cd7d737cce8fc8f4c007858df17c41cbb1e4ccbede2006bcd8cfd9c9060669de6bbc4740a73ebc23b37dfbff6e4f2c9ba61218ab0c6d9576d03 SHA512 b69f6a6c62fd3ff393ebe00a1d6ec905718c7f948aa849a99a6ffc1fd2ec28ad99b48a34b95a1e8563e6ca0e11c8255a773b7685b9d2d20d674ed3f643fbe1ad
+MISC metadata.xml 492 BLAKE2B 7a80c9b384ec8b2323d9eb3a76ac59527e2e70a371c444913d6ad64c711fd4526e942f22f00e6cb517237186d43af7a974a6df189f585dad526be6c0fc1677b0 SHA512 1b9240bf7cc0cc5f30f457736dd6ac5bba43c1e66ec7e0b467ac21000c53015eb45aea3a11219961edbbeb40bc10e3bb78320a924078efdf7826871f8406cde7
diff --git a/dev-python/mkautodoc/metadata.xml b/dev-python/mkautodoc/metadata.xml
index 5aa1ad6b1bed..d3cd9cc9b242 100644
--- a/dev-python/mkautodoc/metadata.xml
+++ b/dev-python/mkautodoc/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">tomchristie/mkautodoc</remote-id>
diff --git a/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild b/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
index 0d10195ce544..578aa7762319 100644
--- a/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
+++ b/dev-python/mkautodoc/mkautodoc-0.1.0.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
 DESCRIPTION="Auto documentation for MkDocs"
 HOMEPAGE="
-	https://github.com/tomchristie/mkautodoc
-	https://pypi.org/project/mkautodoc
+	https://github.com/tomchristie/mkautodoc/
+	https://pypi.org/project/mkautodoc/
 "
 SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
diff --git a/dev-python/mkdocs-bootstrap/Manifest b/dev-python/mkdocs-bootstrap/Manifest
index 49b5e66d9a84..87a8ca9dbd0c 100644
--- a/dev-python/mkdocs-bootstrap/Manifest
+++ b/dev-python/mkdocs-bootstrap/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-bootstrap-1.1.tar.gz 233231 BLAKE2B 64470a4e5ca6d44976944c16244daaefa99702fa68d68fb14e31201fcfd5f927dc2b962fd0b1967a6fd7eec8719389a78dd13cbfcdc387fa6de5f21c9c1a4960 SHA512 a494afa614f96771fbc640862b5cb5674d4eb5c978a56e86e2f523137fed315808067f20cfadca463cbeb5384de062c91001b6eaf5f3ebdce329f167b461d2b5
 EBUILD mkdocs-bootstrap-1.1-r1.ebuild 467 BLAKE2B 7e2aaa48a479abca872127686814c7c9357689cd372e028b3db5ea488d3b71f82d32a74f08ef6bf89a1d6e173999d3fb51e40cd5fdab1e1312bd32531408aed7 SHA512 4bdcbfed64c5ff777d4e7d37b40c903ebf414fa521629c6ae8087f2602858c97bd120be9d5d5277e4a6bc8cd12bd99f28209829ba360787bcddf552924b70278
-MISC metadata.xml 595 BLAKE2B 241c3db7360d3dfd0ef73bf8b2e85c2e84934ea4567dbd06891e228dac5c70517a205bc2e6f73ea12514af4842ae7f5f46776d6a23295ca01c01bdcdf79fa9d7 SHA512 d753cfb29f3c2054476323b5c3c06a4909667288962c5da0ca2ab575f941bd38cb40f2bf6608ce0d26c47950f8b22d384955b8db1a86866ed8ac479ec40dfec8
+MISC metadata.xml 448 BLAKE2B 23c5529c439d77e17081dfd5931150bfe5932eb9c4501750d624ba9cb519237e3de9c87e65cba9ca596699dcd34f00b86525897440202449e9255e1ad2b5b7a4 SHA512 adc0500ecf4cb45dbee9a76fb133b46b97ed6e3d7310e4a57faba6046614de1ea497098aa1beae5a82fd06132869e1350543c04ffa95234d756fb106fdf3fdf8
diff --git a/dev-python/mkdocs-bootstrap/metadata.xml b/dev-python/mkdocs-bootstrap/metadata.xml
index dcbfc82c7cce..79d373e7c09f 100644
--- a/dev-python/mkdocs-bootstrap/metadata.xml
+++ b/dev-python/mkdocs-bootstrap/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mkdocs-bootstrap</remote-id>
diff --git a/dev-python/mkdocs-bootswatch/Manifest b/dev-python/mkdocs-bootswatch/Manifest
index a8db20a2b4af..adf190da084a 100644
--- a/dev-python/mkdocs-bootswatch/Manifest
+++ b/dev-python/mkdocs-bootswatch/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-bootswatch-1.1.tar.gz 1514738 BLAKE2B 0ee80c7816a1a8d6c8e09494f3e07d94cfa8fd1fe8d4dfdd44c55974edf9811be20c22a6aa0424b07f21ca89764e1c15617cc43aaa1a6503365b237905f010e6 SHA512 1a3305434a11aa5dbb79b6a9e7162ddb458f987f44f2e48bcf74776e6ef33d172b2f38e6b46c288401af344386f62d9c814d015be70d38f66b7635ff87bdbdb3
 EBUILD mkdocs-bootswatch-1.1-r1.ebuild 470 BLAKE2B 784d646acb783562c26533333063a681e97f61fe4af096a499daee91bec562183ce4df37bd0548b4737cc44a11502631fe15d51d59d50366cc74e9fe67b59e36 SHA512 0f8faea27c065eb30a7c32754ebbbfc464f5abb7c9703a6fce8b33424ed2d677d7c41ac7a04c19ba2451197f9623b05d4d244ff70f5a08f8e6277bde8457c93a
-MISC metadata.xml 597 BLAKE2B f3b509341126e0010f46a47412756ec81f1c3d05c2d56bdc7181fd0bb30a2f34961fc6a210915257b7722ed0d84b24efb36b03b84a2423dbc867656ec7c81548 SHA512 cb42ee7ff1be9b3b7ab858e9e5103eaafe75dec69eda1387480a113d7ee3d8832beae8b7d21d541536540541f52d093c1b775bb1c150f01de63ec8d32c13b11e
+MISC metadata.xml 450 BLAKE2B 61cb55c837a8b4c70c5fc1faf7516561440504d1e010eaa230b9de05a5584a29676d360b3f86436c4fada6e000128bc5908e4124f253300f6f9736acb33d70e6 SHA512 88ef2795093510cafc6205d49ea658cce1bac469d5752cc8c8ce9a37ea77d8ca7e47386f6588d015aebabc0a38eec2327cac52c3671c83cfb086bf21ed6d4435
diff --git a/dev-python/mkdocs-bootswatch/metadata.xml b/dev-python/mkdocs-bootswatch/metadata.xml
index 5de5c94747d6..2df721f55e14 100644
--- a/dev-python/mkdocs-bootswatch/metadata.xml
+++ b/dev-python/mkdocs-bootswatch/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mkdocs-bootswatch</remote-id>
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
index 2fb444aa45df..50bc0b7ce822 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/Manifest
@@ -1,3 +1,5 @@
 DIST mkdocs-git-revision-date-localized-plugin-0.8.tar.gz 364352 BLAKE2B cfd1709b5c9e1f99ca1a2d8d194634afde6d57aecaca1d2cb70edc21c28d0b210c3497a4214d6a95592bc5a7aad3b88d96b275427f3218aa198ab7b3ae8f364a SHA512 84f19aa13189b74f18f98433939935052f1d757f66972d4f1cc1bfd14b614f8fd57b0ac0dcf41fcb678eb8dddba93ddc78dc776d6a81977d096920128d31f58e
+DIST mkdocs-git-revision-date-localized-plugin-0.9.tar.gz 367850 BLAKE2B 0bf02b9de2b9ee8c4ae36548ffab85a9c880fc89dd5a4f39961093e36fc0b87b53dce8269400c804fed67f5a3a3a2ec45e6486ec80706be0651b9ceefe7de6af SHA512 488cd20e7ce8cd8df4c277f3626b8d628ce58090791a1b7e36efbdcacf6bf434bd4bc3e73f0402fdc8cb60767e6d63fac56a56b0dfd4728d6a49438caf5ad3d2
 EBUILD mkdocs-git-revision-date-localized-plugin-0.8.ebuild 1159 BLAKE2B 393def0c9eed9f7002691b5cca836933220ffacaf4f6faf783118e33a60e760a2dc3f482fe578a835a9e17bd01581f7f60992918ccfa15b74a46fcd409963af0 SHA512 a8c330aa29186821bba5061ad871896cc48aed48a9915a33c50108604d03d451725d220d8b3b24c54941da37ad11e80c5498e903e8e659e75bd7322dab094bd4
-MISC metadata.xml 641 BLAKE2B e052e96b8e2fccdb3f3decc41630da26740eac3412e4a7c28ac14119738fdd8400b5c6df4720f09b036bc5a1be64b770c42ec8da8a5e1d95f8c57c903dac5dbc SHA512 02789972d61cb99e0ad39ea0777c42bff265f15596e5cf470fa9029bdde2d743f17bb1e24478fe3c1ea35c4d1f62b5db46987760810deb23952974286deb39ab
+EBUILD mkdocs-git-revision-date-localized-plugin-0.9.ebuild 1250 BLAKE2B 5f82f2ff6f82d0dda5fd1617a9905e80058270ab61fe9506de4d68005e8401285ae05c481ba5e0d655dc962b3000ebe6f65d15cd8630efa849dd6bee47921cf8 SHA512 d74d67f788a065c29226631f13f7adef598b56c3311d76bb42a37f588dbde33bf0d463537a114c452e8fef73c7c18d9fbf6a1ddebc45b71791fe45e50a2135e4
+MISC metadata.xml 595 BLAKE2B 930979c48f81e50af6d892a4c66f93851d862cf0e0562ad6e6f9f903b4aa6db3a3d989e7ac45ac1d5f5ebfce27bf718e143587eef5890695c86c08bd66050118 SHA512 58e5db1bd1f0e6c613ba2957fa4d2d6ff34c067ce29a67bf4171235f38a4cbd57c5d8cc5e5687176f6ac270798ee9694a20dc64a8b720fc03119b5964f8401a1
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
index 90fed82a89bb..9fc8a7aeb8ac 100644
--- a/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/metadata.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>andrewammerlaan@riseup.net</email>
+  <maintainer type="person">
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+  <maintainer type="project">
+    <email>python@gentoo.org</email>
+    <name>Python</name>
   </maintainer>
   <upstream>
     <remote-id type="github">timvink/mkdocs-git-revision-date-localized-plugin</remote-id>
diff --git a/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild
new file mode 100644
index 000000000000..baec4d97e38f
--- /dev/null
+++ b/dev-python/mkdocs-git-revision-date-localized-plugin/mkdocs-git-revision-date-localized-plugin-0.9.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="dev-python/mkdocs-material"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Display the localized date of the last git modification of a markdown file"
+HOMEPAGE="
+	https://github.com/timvink/mkdocs-git-revision-date-localized-plugin/
+	https://pypi.org/project/mkdocs-git-revision-date-localized-plugin/
+"
+SRC_URI="https://github.com/timvink/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/Babel-2.7.0[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/click[${PYTHON_USEDEP}]
+		dev-python/mkdocs-material[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# mkdocs-git-revision-date-localized-plugin's tests need git repo
+	if use test || use doc; then
+		git init -q || die
+		git config --global user.email "you@example.com" || die
+		git config --global user.name "Your Name" || die
+		git add . || die
+		git commit -qm 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/mkdocs-material-extensions/Manifest b/dev-python/mkdocs-material-extensions/Manifest
index e5035319efcd..70e39e6fc6c3 100644
--- a/dev-python/mkdocs-material-extensions/Manifest
+++ b/dev-python/mkdocs-material-extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-material-extensions-1.0.1.tar.gz 12259 BLAKE2B 464b0856f10f0b9311d5c6fe15def4af9384354ab86e62392052ae1bb7450bd09ac56b5d3e9f40b252b30c924f1cf35597ffc9c898f0cffb2c11a74b45da4090 SHA512 68bfdde71f654a9ae42cb6d4545005eddc235e74f6a4c49707853de9cb30261c77ab8c8534b15019c7030d01b97a32645f5355a9e6511470466bf0e6f17b6890
 EBUILD mkdocs-material-extensions-1.0.1.ebuild 976 BLAKE2B f1c673db7e500ce0f76edf726ab19ac3c201ec46f8beb8ef6c2d9ecc6455c06ad566b8a3a6628a8815d22726c8c6090c68b9b952f60e000e9e7aaf7102e928ba SHA512 fa813a88adafcf3a35745902daea4c8b261f88639a64d9c25536f44470b2a9a7682f4a6549ae78d456a9626e6f317bdbeeee7bab381de6c53aee4b33053cd713
-MISC metadata.xml 597 BLAKE2B 8bcd1968d031a15df28ec645adc55342e2c43e96b6451cf149aed8f51ab9c42ce4fe43c0ffc3eac319ed7fed4fb470449097aa86314cc85f5ea9eba746e84b42 SHA512 770d8e1ae4fcb866b163f044ddce5670a90fa19e71375b7b84979751a41515964a22c10c9bec4ff0c02a49b24666c1ef1fb896d185cc4678b32d93d8bd6d7b25
+MISC metadata.xml 450 BLAKE2B d5afa6fe4a8633ec7e42f01e9a35054017e11b4ca346e18c468b96baab394803a48f2241ab367dbb30055f9851b29de055279b062e4548cf6b72a1191b0fdf4a SHA512 d3a77bbb34d2f31023ec3186a1abea8399d20af672a2241aa94019945776d51aa96f8401542fd1476a3534763b390f54715d950c17b5227088777b223c5905c6
diff --git a/dev-python/mkdocs-material-extensions/metadata.xml b/dev-python/mkdocs-material-extensions/metadata.xml
index 974aef64816e..fb28804cb561 100644
--- a/dev-python/mkdocs-material-extensions/metadata.xml
+++ b/dev-python/mkdocs-material-extensions/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">facelessuser/mkdocs-material-extensions</remote-id>
 		<remote-id type="pypi">mkdocs-material-extensions</remote-id>
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index 5c74d8b66e95..d98b817d827b 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -6,4 +6,4 @@ EBUILD mkdocs-material-6.2.5.ebuild 816 BLAKE2B 8a9a7cc9d112a5c596f2168372372658
 EBUILD mkdocs-material-7.0.6.ebuild 816 BLAKE2B 8a9a7cc9d112a5c596f216837237265834c6217606d8842c1026e2af6062ab12515d0d1784f16a77f22a9afcc293d2607a4937352b562a23646d541afb6263e6 SHA512 0ba0ef0706b08b9a39abaee80756cab1f177a9e9403fe88c8a02b7d86f96f401fc88d51708ab6d7bf5eba699c1ef3c193748850fecfc879ee213d429f062d474
 EBUILD mkdocs-material-7.1.0.ebuild 816 BLAKE2B 8a9a7cc9d112a5c596f216837237265834c6217606d8842c1026e2af6062ab12515d0d1784f16a77f22a9afcc293d2607a4937352b562a23646d541afb6263e6 SHA512 0ba0ef0706b08b9a39abaee80756cab1f177a9e9403fe88c8a02b7d86f96f401fc88d51708ab6d7bf5eba699c1ef3c193748850fecfc879ee213d429f062d474
 EBUILD mkdocs-material-7.1.1.ebuild 818 BLAKE2B 8458825ae0286754a3568cfb3cd8987e6fcdd09043b218f340f88d38330f86cc56e91846b2c18d07186a3c7d8ff4b4ed23d30d800f67c7c7ab8648b3ed1a0466 SHA512 13a2b6a2783b3e6368c84a30898a799d9b2d2dc4cacb9a7e0ffc187312e7ea123c8ff9975986795748b353ac251e869baf5e45c016f54afec3138060680a3cb9
-MISC metadata.xml 1189 BLAKE2B 7d469ee13518655fb32978d4237cb619b37eeacb099ec2661187973737852bc98dc393cfc7ce819c7a1f276b64808f6c163bcca22b143af9f8d1d1b8959e159d SHA512 012aa77e5a7bf94210c4e1e5f6d81b76c1abd3fbab09403e918c9a24fb0138c07187c15272cfebc620ef48a359a03537b968d03010f1e6a629cdcbb2c57e7295
+MISC metadata.xml 1036 BLAKE2B d9f342d8f3da5a5b1ce9ee0e68938b0c8f7235ff84e39c59d9da18cec1b4553193aaa7eff85157c92fd014e971f2ac947bd252caad791605b0867cf2d7622ce4 SHA512 31db1dbe3433dbbcb6036ece9803d22913980644f014f8e8db80bb00899e0b98602016a08e887f7fdd5d99627d411ea8cb18fbb091faae0a03f8804e3497b52f
diff --git a/dev-python/mkdocs-material/metadata.xml b/dev-python/mkdocs-material/metadata.xml
index b0e3dd82e867..ef2df102d2ce 100644
--- a/dev-python/mkdocs-material/metadata.xml
+++ b/dev-python/mkdocs-material/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>andrewammerlaan@riseup.net</email>
+  <maintainer type="person">
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <longdescription lang="en">
     What to expect
 
diff --git a/dev-python/mkdocs-minify-plugin/Manifest b/dev-python/mkdocs-minify-plugin/Manifest
index 930b3b11538e..895b78b28c08 100644
--- a/dev-python/mkdocs-minify-plugin/Manifest
+++ b/dev-python/mkdocs-minify-plugin/Manifest
@@ -2,4 +2,4 @@ DIST mkdocs-minify-plugin-0.3.0.tar.gz 3101 BLAKE2B 6b3451734d2d87f967c46521350f
 DIST mkdocs-minify-plugin-0.4.0.tar.gz 3097 BLAKE2B b1bba66539cc3470e922ff2bd1c6ae21de401ea343e2bd313bc93ec692e15794476681d48c9dceb9edd09f3c6274dd9174d5861137312ce9b9836e02f34a52e4 SHA512 6a42f649a2a867b2c796de3c602f19375705859fc9b3592fc1d8c102b42a96d7bb7150a4f75b281843ece40bd19ca5bb82654c658e1fe6d1b94f34c8279b2602
 EBUILD mkdocs-minify-plugin-0.3.0.ebuild 619 BLAKE2B 21bc69da07457a68305d4fe09e8e624af1de6554bd611de1a1ba66ec30438143acc4b2874792c6e5aa4b9453b1f1d3cb70312f157f2d7cc11e5e6537c4a56294 SHA512 e24e345cfd128b0eefd7770a1e8a868c6be60ef10b90122442336d88eb0673bf711754b144cac5bdb0a9ac385b63f33848f82887b2b513e0946ae80b21a0aa9d
 EBUILD mkdocs-minify-plugin-0.4.0.ebuild 621 BLAKE2B 9e35cf1f1ddf1db3f5a29ed4099cf5b33392a55e6e8a5f4239c3e0c388d76e46e7bf68a4f407f816fa29f8356569a1a30c723c51d6b00093785a052b381451ff SHA512 76c3b5558d78f43803ce0a2dc000dc111705881be1f2c1bf6f4eb8c0cfd0afef2bc1631c17d7052b49c4a78689206654d091a9e39facff53b5ea6e22c1299aa8
-MISC metadata.xml 583 BLAKE2B 69c7b8c0fb5bd0f87aea39d2f49a5a978754133fb594f2de1287c18436833c67a0deb44635d9d5bdc00e8baa28a80697a6081cd84d2dbbd3d6f511459534ea78 SHA512 ed171fd623488c0ba23611d54c888edafcb250a5e3575e3c5841857e9fb58272b7d26091ab5a16f30180a8badb3de956110ed8fcaf88f6f82504db49d6f54505
+MISC metadata.xml 436 BLAKE2B 8526d6e7cfa9eacf74fded910cb20aa183404673b4f79ac8bbaebe300ab5054bd7540b31d7a56f3e26ed3cc377a75be9e204ebfd12ccdf1d2cbba573b7f417be SHA512 8ce9979defb138817298e45dfcdba9444ee8452d1f027b6ba2dd3104e872fbfc53fc97e36becea6d46cf182fea709f7fcbde6c59572ea72c6a913fc572a999d7
diff --git a/dev-python/mkdocs-minify-plugin/metadata.xml b/dev-python/mkdocs-minify-plugin/metadata.xml
index 028556428849..e19619093862 100644
--- a/dev-python/mkdocs-minify-plugin/metadata.xml
+++ b/dev-python/mkdocs-minify-plugin/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">byrnereese/mkdocs-minify-plugin</remote-id>
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index f41c57ab66fc..491d46d92cc3 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,3 +1,3 @@
 DIST mkdocs-redirects-1.0.1.tar.gz 5772 BLAKE2B e48a35b18690c040efcca2e3e6a97650a3f951b89d537537b54b297e61c590099c6891dd1d64f21dd4efcc4a20d3d709a2815280c2846324f9f57b5a953a31bb SHA512 e3eb31ce920aceab2e4c93988853fc0e63ba789db229ac798791061b26252416c5c68b2c221f82e3a08ce7522e6b2aa58ca606b9a31653f782e31c415861f7d0
 EBUILD mkdocs-redirects-1.0.1.ebuild 544 BLAKE2B df0b1da015351df4ced3ea65d78fbd02edb2301bdba6e8702cf5fdeae28ccf2934d38d5c55436c223081d917e2e1908a84e64e0f462b3bb4201b91b6962aee47 SHA512 f645caa7148922f8911027c0da213410baf6a40ce6211baaf4657966e383fc5244b63248d332e46fc88ba6ae4081653b9017d9702bc9f7cb6546d04372cdffad
-MISC metadata.xml 574 BLAKE2B 3cfd10a14581d5aa20566bb9d2688c74fa804e739f5946d3e3640e8d48b42c68f998c8ad3fbefa8b568117d222b69370565739c1e3f97bcd7edb5a55887b2fa5 SHA512 f89f5306ad5c7adddf8f38a60611a9be47e78bdebd8219869c43ed5d92e87ea4cfe3ac5c09bc48d489a3ee5f758f5c1b03b3f1453aa00babe2bc1a7fd6757580
+MISC metadata.xml 427 BLAKE2B d909be9be313ddf4f7930bcb591498a6194b2e574a2e73ff35be34c19198b4aca7c49c8f95db53810cfd4f3d5a1ba8c60b9ea4c1fd6ebd678dd48df4bc8aed8d SHA512 2013df82c0a0dfa0ca017c0022abee47623eb44fcf14627a622c259c8d400f560e1f1650cd6a648e2e75f0e40adb61a942ca1196ed32187eaf28934606346df8
diff --git a/dev-python/mkdocs-redirects/metadata.xml b/dev-python/mkdocs-redirects/metadata.xml
index 1d499ba4c777..2e442c4d3a04 100644
--- a/dev-python/mkdocs-redirects/metadata.xml
+++ b/dev-python/mkdocs-redirects/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="github">datarobot/mkdocs-redirects</remote-id>
 		<remote-id type="pypi">mkdocs-redirects</remote-id>
diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest
index 0f0dcd85fa26..e8e4307534bd 100644
--- a/dev-python/mkdocs/Manifest
+++ b/dev-python/mkdocs/Manifest
@@ -1,4 +1,4 @@
 DIST mkdocs-1.1.2.tar.gz 6987352 BLAKE2B 98bf604aa15eac693368e77e6658c3906909a0cdc323772550a65c35cc301929cdc136919a612438563cefd74c9076b2e273cb89e3ffbe04bff2a419e6e36513 SHA512 bf0e5ba8a15524ebe433fce9f2d16404922850ca562339d60e7860e243f9523321cbab5dca1f276a71d3158c7b1bfadfa25b134da50ef1cedc0b1a9658b6f10c
 EBUILD mkdocs-1.1.2-r1.ebuild 1699 BLAKE2B 59e02ec5ea24d932eef86268220feff250e3f2aa7112c29e74829fc747cc9a27b86ac544ddea54759f019def3d5b2c17958b809d94ac63f87b5ab54aed2ccb3a SHA512 c10a8b6bd1ee42777d69225963521b5941d595f6a8f0fabca19ba830d3a7389a4ce7d9d88f66b63f370595bf07be33c7b69920044faeb61d76b418c177086347
 EBUILD mkdocs-1.1.2.ebuild 1353 BLAKE2B 14ed1990f54f4954dba6afa3b01f967508412573e2826c7feb40c873a2f55000df8186166ea7a31f8bfadd6d040f357747007f889c19f072026bb86887a3a43f SHA512 7d24f6aa455983535ff489f3a34509e236b336a65750b383429dd7304e3243feddc6bdd94164545284f5a29b7e111ec3911591b6e478671637589c24d50a3d11
-MISC metadata.xml 551 BLAKE2B 1ebea5ce1cbcbc6cf90bab20c782b40f6bd59bbb3b3931427627a5d879310eaa41c4de30836580b28b69e150817cb9e20ebd7d70073583696fb1d6b42b761b6c SHA512 cf7f3b7bc75e945ea95627961ac6b21069d5a31b5244756fe9ca364136f5b182be2529d98b9924a778533988e8c6dbc145dd9d023818040d97060690b0d4f0b1
+MISC metadata.xml 404 BLAKE2B 69b46289dc5228603da7575ea456d95e456c969bb5821820d91fa85599960ff9442bd1d7af810f936fbe94e9fcbc3ccace1156572d52f5445322a22c163bd2c1 SHA512 27dac2bb6455dcf92d9d86e3e1d9e29c87d5fafdc6d3e1f8afa059e562cfe9b233a29ed890cc7c3dff1e948d243b007f08b5decc4915deda6a0357d496a7be3f
diff --git a/dev-python/mkdocs/metadata.xml b/dev-python/mkdocs/metadata.xml
index d15529bfacec..7025df6c32d3 100644
--- a/dev-python/mkdocs/metadata.xml
+++ b/dev-python/mkdocs/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">mkdocs/mkdocs</remote-id>
diff --git a/dev-python/mkdocs_pymdownx_material_extras/Manifest b/dev-python/mkdocs_pymdownx_material_extras/Manifest
index 33f851e4c56c..949bbbc5e0b7 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/Manifest
+++ b/dev-python/mkdocs_pymdownx_material_extras/Manifest
@@ -4,4 +4,4 @@ DIST mkdocs_pymdownx_material_extras-1.2.2.tar.gz 40542 BLAKE2B 583b06830fc230e2
 EBUILD mkdocs_pymdownx_material_extras-1.0.7.ebuild 559 BLAKE2B a7f74cc62b62fac5f12309b34a9e458ba69b4e40903cdb148b5e0b3796208298f5fb15f4ed0d471ab1a7c8c2907bcd36292fb12d9f2b596941c5da73b668afce SHA512 6bf499a431ccac63b1235da6d386aaf6dc2e15b2f417a8c83a113e97b20be0654a08580e86c26069a726d57221aa6e08949745c7b584ec05eef3209f5112061e
 EBUILD mkdocs_pymdownx_material_extras-1.1.3.ebuild 559 BLAKE2B a7f74cc62b62fac5f12309b34a9e458ba69b4e40903cdb148b5e0b3796208298f5fb15f4ed0d471ab1a7c8c2907bcd36292fb12d9f2b596941c5da73b668afce SHA512 6bf499a431ccac63b1235da6d386aaf6dc2e15b2f417a8c83a113e97b20be0654a08580e86c26069a726d57221aa6e08949745c7b584ec05eef3209f5112061e
 EBUILD mkdocs_pymdownx_material_extras-1.2.2.ebuild 561 BLAKE2B 086ee2f238c7cbcec3a4028cf7642387eda803de5584b128e96789cccb14727a8ca2d49554faf20b6ffbe992ee9e75acf12a3fda1a9d5bb2aee6238d1521c9de SHA512 7b72bc9630030ee807c7dc5aa6f3ea989899e40648c403e6f5e195fff34055d1616ed97b292b0225e2c55c6a1067d08707c23501f80b5ef13b38ffd6b93e201a
-MISC metadata.xml 1204 BLAKE2B e96e6c73f20eee6f103914c3a6e3fbc2acf29f7e0bb542cb3425409ec396d124c9839619e69aa2112cf99b5020369302130225877586802dd241a7e81be9f3ef SHA512 6ad5d2d2c8b9c0d401fe442b64736143780722f325f7efd70914993cdd8ad9ce871c22ea6b34b8d52927457ed89de891e7deb2ad01ae80e262cf37b6adbe8489
+MISC metadata.xml 1190 BLAKE2B 05a3c4ad81cb2d4247a66274037ee45e606bc1ee273659841aca22a22f09019515813a4a1dff520b3db252e0641a07e3d6927dd63b941f0a58ae623047687f4c SHA512 3285f70348e70c92c0b5526431a4d4b1d8206dd4df9d7f0d13b4a7d550a14c6a5349baa6c4c553b70bac0621a047448de374b44b52eea1f6ea55296ff61795d5
diff --git a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
index 54b88360c384..50a13facc0b1 100644
--- a/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
+++ b/dev-python/mkdocs_pymdownx_material_extras/metadata.xml
@@ -5,8 +5,8 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
diff --git a/dev-python/moto/Manifest b/dev-python/moto/Manifest
index 53668f41665b..044ee10d2969 100644
--- a/dev-python/moto/Manifest
+++ b/dev-python/moto/Manifest
@@ -8,6 +8,7 @@ DIST moto-2.0.1.tar.gz 1530088 BLAKE2B eb35bcbc8b22044ae86eaa6eb1f71eb24174a8686
 DIST moto-2.0.2.tar.gz 1534459 BLAKE2B b4609f332e8f8eb8d61250919eca805f82a6dfc468cf0b9cfe81f462aae9f93373efec6165c818589abe60955abe061a273148a36e4b1f8534ce9fa7e59f5cd2 SHA512 b478f9938f8e7b92c3e718a1aea5907c2070bda42995050d39f8e62cbd7cfd30fe4c9cbd7e7475f5a50c71c3370a89f53480adcf83df1fe08968125f2a1427f6
 DIST moto-2.0.5.tar.gz 1551415 BLAKE2B 452cb94443188e1715145bee574f04924d894a3d647673443a8a335bb907f8601098540b032d6c9a8ced3e1fc490c49ad70c877547d905cece05bbb742d05976 SHA512 70e64ab98873d480e776a2139a4d351665c6c2f98faf90e2871c6b9998571d1bd239757bc90bbc6ab6e1ed510598bfce77157ad522953efe40c884068885c57d
 DIST moto-2.0.6.tar.gz 1557871 BLAKE2B dd4c23758bc9c98fbd2b2a70af744daa245fc8b4b1154348486ae85d195e5e3fa2c513f61386504d05c0d646e81fbf8ec5bf41be317b9fd7581668cd23cc1db3 SHA512 9f287ff07f948dd3d2d6af1c6120d29e9625e420bb94f83c230d813e26689161f9a2e89e2b32947e82084cdcd865fef714ad14309ff41371bd37d251481f8dc9
+DIST moto-2.0.7.tar.gz 1565849 BLAKE2B 1c6491828a43156fd347bcce80f3440cd8d4964e28bab19593e29fd88aed558652b08c81c577312f9c612adc666ddd35fdd46b4d2d8fb82eef380210e9c62d8d SHA512 5df26f478909c57d4ba76bb7c6e002c37d7f604084c157744be32da93dbb705605a7a85eb0774cbf2c0083f7096f01075ddb1a119cb7ac2f3931cf58896f1629
 EBUILD moto-1.3.14-r3.ebuild 2875 BLAKE2B de0b07e01a296d89ae22fe0a91c91fc76634f054a148c0cf60101d85df67f0a17cfd9a80cd41e264a0641e79602b5e3cf23b90f2eda98a50af78794ccc9ef0b7 SHA512 c6bef4b6f0899fbc31d97cc101fd14894814edcbf66df837f776fbb51780f86a95bfd94dbf278e274897ba25e4465938eb9bd0410910a95ecddea56962a70f3a
 EBUILD moto-1.3.16-r1.ebuild 3189 BLAKE2B 6c4612eda3bb91d40b7e0ad451568d5c877ef4d3a6563fdf13513d11abbb477702d542109174e91b7c1e580c366d448248453170480b7a15a8b8e9918814624b SHA512 5df5495f98a4929a7e97e257a2bd7b8ee44c915fa008b6d45674d6172ea17fb103b2c579e76a7d14944995019a73217e510c60938b42ea5d2885f92f785d92ad
 EBUILD moto-2.0.0.ebuild 2359 BLAKE2B c9204998835e0f41bc23d820a9ce677f33d1f18f614905cf2d572ef194fc422a7be02f5d37ca6a25389feeebf4e1bd8f8439ba1e44466a45b12678d8e0cf69e7 SHA512 3689854904d3c9f5152dc2211d52e21dd475151c18fb9463b288634cd0754cffa744e4de129655277e5b1f4d5b1bb78f451a7282a31203483d75a7990aa3d693
@@ -15,4 +16,5 @@ EBUILD moto-2.0.1.ebuild 2366 BLAKE2B 25b780427da33dbdae8cb9ea6bb0c834a02ec745f4
 EBUILD moto-2.0.2.ebuild 2286 BLAKE2B f370137ce59587c9725f64911408efb2e8faa31e63ef3f719c30da646e7b075b2051b8bf0ca429621a98b98b651c659c739593d5d1f3667fd971fc1a291f36cf SHA512 cde2248be2511cf28fed1334134c85acd393cce1b9fe28e05b7f1c51324e42ee6555beddca8b3a95c18a0d2a0a7ebce111a377955c674b9c813c9e11ae28f28e
 EBUILD moto-2.0.5.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
 EBUILD moto-2.0.6.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
+EBUILD moto-2.0.7.ebuild 2251 BLAKE2B ef7a7f4c0972f75284f23c438b1ec1e26690e0a668a0ff0a928f2663b54a1608637fcf7d753ae24ae790a1f774aaaddd53f849bb473eaea2e733ee64affc64ca SHA512 03a92b48dad8a2afe4afdc94bded9476dea8b72f2eee8bc7519e4b0a10cc0bf30b4e6951153e9cf9cf08502c3d141ac0f8756d8d3f59dcab0b88dc84440b4dbe
 MISC metadata.xml 551 BLAKE2B 5473a586a27737f95b3795ff19bd08359fa5135aa60858c52b633d1ed53412fc1cbac3952f937ed497de18e90b00bd45725b920ad6fc75c8928181ca48ac5c45 SHA512 5b68da384123be90f74ea6cdd216f59ee004c4383b13da95fa17864c998ecb821fd0f16bf65abdc9b29f081a1e06be482518ede38139e29e32e46c962b3d4805
diff --git a/dev-python/moto/moto-2.0.7.ebuild b/dev-python/moto/moto-2.0.7.ebuild
new file mode 100644
index 000000000000..7c3740bdf84d
--- /dev/null
+++ b/dev-python/moto/moto-2.0.7.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Mock library for boto"
+HOMEPAGE="https://github.com/spulec/moto"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/aws-xray-sdk-python-0.93[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/backports-tempfile[${PYTHON_USEDEP}]' python3_{6,7})
+	dev-python/boto[${PYTHON_USEDEP}]
+	dev-python/cfn-python-lint[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	dev-python/cookies[${PYTHON_USEDEP}]
+	dev-python/dicttoxml[${PYTHON_USEDEP}]
+	>=dev-python/docker-py-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/idna-2.5[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.10.1[${PYTHON_USEDEP}]
+	>=dev-python/jsondiff-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.9.201[${PYTHON_USEDEP}]
+	>=dev-python/botocore-1.12.201[${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+	dev-python/flask-cors[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/pretty-yaml[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.1[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/python-jose[${PYTHON_USEDEP}]
+	dev-python/python-sshpubkeys[${PYTHON_USEDEP}]
+	>=dev-python/responses-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5[${PYTHON_USEDEP}]
+	dev-python/xmltodict[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/zipp[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		>=dev-python/sure-1.4.11[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# unping indirect dep on ecdsa that's supposed to workaround pip
+	# bugs
+	sed -i -e '/ecdsa/s:<0.15::' setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# pytest-django causes freezegun try to mangle stuff inside django
+	# which fails when django is not really used
+	epytest -p no:django -m 'not network'
+}
diff --git a/dev-python/msgpack/Manifest b/dev-python/msgpack/Manifest
index b39bf0ecb9c4..75b4c768d9eb 100644
--- a/dev-python/msgpack/Manifest
+++ b/dev-python/msgpack/Manifest
@@ -1,5 +1,5 @@
 DIST msgpack-0.6.2.tar.gz 119062 BLAKE2B 6b20a0d31b811ae66e66dbfaacec6f0cf2152b2937423b78f3e6244bfa49c87767788c5ee1db41b9020801b8777a4c15b1fe1853182718adf622bc7e1bff858e SHA512 95b92e3d35e0500dd4256d18bf76e586e57cc66319b4459ac5daef599277a5049177a89ad86e291dbdc4c7a918901a89d9218353ddc4a7d0b399e8a98afef363
 DIST msgpack-1.0.2.tar.gz 123033 BLAKE2B 8ecf743f5cae536bde9328974827e48376fdfbcaf4d3493fe295a114fd0de4c7dc2629d67a0abf6ece036131715587d2eeaefde0ea9614779a64015ea7fc2be8 SHA512 afe658c2cd5b443aae8fc3305eb3fd56811130062f95e283e3538cba27949d534de60171a927426fedb23b48a938de3f15d77057beda6c73e5204ef1130cd046
 EBUILD msgpack-0.6.2.ebuild 964 BLAKE2B 8a253263d5cc5027ac0827ca5e7bd0a093e54ba2c558084cee2a0f33ab4ba8898e4e9aa1a2fad710e13a14740163eb80e22c38f1694482d4babdf23020150d1e SHA512 251ec2c7702f95ead296a78c8a251cef4b3e8c697b6f23899b1a1be813cbdf411df7b3567adc72f09d3ed328fdbc71da17f58a7144c775f0064d782c5e4c32e7
-EBUILD msgpack-1.0.2.ebuild 973 BLAKE2B 3604dc75a36f35e86e42f67511ab6316029e8521ef935e7c7fff812481469a95abcde21bdc8d79fec6c4d20efaee7fd5fd6b0217ecf19ccccc1fe5661930363b SHA512 683d6cc3f8dca40a0d5b6b9faafd197979085ac1fae78827fb23a567654d18f28973f837eb80a52038c8f032a5e29582538f1201747c7fb261c5521d5fa5073e
+EBUILD msgpack-1.0.2.ebuild 974 BLAKE2B 0252324eef164d0841ee6d14e14316ff14a8402ff235fe1a6889e4c5bfa6a6f38eee5c729ab44e50148431c151e82907a3610e3455056ca8867a87bbe825b6cf SHA512 acec84a5bffb48a5204ddaa4b6a96a05b8ab5a55b4a5830ea5f3630c417d62aae2477ba09c1f9affaccdf4a01949fefd02d65a1f0243224f25c3140421d2ef24
 MISC metadata.xml 519 BLAKE2B 2947e6ef092dec03d89e409684e08b7f8f2bdee001e0884424f75f9473bffa9cedc99d0932f83bce5a4e255ea29a02819611ec9eb3d16767b50a24982172e1e0 SHA512 27e121bfde1989d5018dc5c87d29b8cb317b264a41ab4480d6c13332d78219e23cb4cb9f803fdbf9198305af1d831000d5e1fa2e2e975d76425a73864561390e
diff --git a/dev-python/msgpack/msgpack-1.0.2.ebuild b/dev-python/msgpack/msgpack-1.0.2.ebuild
index b13aa71145e7..b1c1d22e10dc 100644
--- a/dev-python/msgpack/msgpack-1.0.2.ebuild
+++ b/dev-python/msgpack/msgpack-1.0.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mss/Manifest b/dev-python/mss/Manifest
index 47dbc91350b7..20f099851a17 100644
--- a/dev-python/mss/Manifest
+++ b/dev-python/mss/Manifest
@@ -1,3 +1,3 @@
 DIST mss-6.1.0.tar.gz 90421 BLAKE2B c99bc7a1950215402cc4fe3b512951a723fa1f5ffd8ab747fc29ed8d4e51f786ef84b69e3ef2238d7cf9d6ebb5765dcdb4d1d3cc3e9a2caf66cd658fa6753f5f SHA512 2b84fec6e162480cb608c0ff605f528f3122c8397a81bb0cb6cf9223cdf097a633ea2e29a95925297439dc038a0be4cc628d3455827a8548cb3d8e62cd68d9d7
 EBUILD mss-6.1.0.ebuild 763 BLAKE2B 81f824c319d1d42ac0de9855bade1cfe92923d38cac3bb24f2be774a64bc5f7df4d8b46c5be8c4c8fe27126b7f26b38bb3150e55e349a60f8a9358a83720bbad SHA512 3cff7e7a92418b11cf0d3f793d692b1b7f4a91962b4da3fb7dc789817255efce69a3772763eed9ecf7afd0c8c74ba9ffac73d434fd9efe64d17834d0b5bcf0ba
-MISC metadata.xml 495 BLAKE2B 6efed58076ec705d1be08cf4fdc7acb2fc8855e2464d33f553f5acc264a069555467ebe493b76166d6eea5fb7df63a68f1de5ce2528dad44921c65328629d793 SHA512 8b119f8c31a0f36236ce1a1b5beb7fd929aa6ff0e1534787be00a00c128c3e39e52a923a6758ebead3c1b2f92a0fc117caf34d8aec034a0427bed310e8f88785
+MISC metadata.xml 348 BLAKE2B 74049da1523c38ef4f46b73d9f1d6b1a9bc383a1ae1c7aa43fdc30b85a931b8964cc1f0444d86ff6c3f6e0cdb1b1d8b2ccb11cc4c5ee84244ec3321c023b92ba SHA512 6a72dbcc89de5381e894a1f4b959fe860eb0f936c8443a4b8c27fb2c384ded7e05e5f263d4d62d4c6ba9016d7497d48248e2fb0bfe21864bc55edf234b829e99
diff --git a/dev-python/mss/metadata.xml b/dev-python/mss/metadata.xml
index a68d10c6ebbc..eebb2bc4a4f7 100644
--- a/dev-python/mss/metadata.xml
+++ b/dev-python/mss/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">mss</remote-id>
diff --git a/dev-python/munkres/Manifest b/dev-python/munkres/Manifest
index 2513b1b41308..1ec4ce9059ba 100644
--- a/dev-python/munkres/Manifest
+++ b/dev-python/munkres/Manifest
@@ -1,3 +1,3 @@
 DIST munkres-1.1.2.tar.gz 11186 BLAKE2B 2ba5ab7ce85fdc06598829123ed334209f37c0fa4f82e863c78220db82e9b8b4c51c7369042bdac6e9b33b4d580145bdd37b5743f0b3f511141782588803cb0e SHA512 4a8b698f53812303f5020b4fc357f859a63d97370fe311d16ae959addd9cacee65667e430cd0d00496e423c1f0c7a3c8d4219ba49600a982de323fadd2c03bec
-EBUILD munkres-1.1.2.ebuild 516 BLAKE2B a985a7d51023646d0f1d5f663067606c2ce5f87a7e4b0b8325fbc85274bd411d2edaa8fe7b21eb0e4ae19ed7ec05709e6c901cdcf49ad3264b24a92421a77431 SHA512 61b7ff6ae93e67cbcccfd7697b663eda9116d8deded8c9d2864d8d789a87013baaf61fe936eb43b40b76ff19192c63bf555202b2c58d5b7a8ca5972f9f831f74
+EBUILD munkres-1.1.2.ebuild 517 BLAKE2B 22eefd75c91e21a10e52f9606ed6a0c66a4931d39cb6712356c7f4f213b425ab7fdd5c1890dc27917a75f042210c6e0e4bd8b62606b50e6bb0cfb4228a26b910 SHA512 15e8d533b4c1c9f37790af7143b20b9524b7e0d995e94d0f6b229ec2ad7bdd6868d86d720607486dca3e8738053ce4d33381bc9e4d26ccffd1e73aaf369098d8
 MISC metadata.xml 718 BLAKE2B 75958d4473d05b859b977e6e34b05705fc0368af0650a7ca57ee5e9804ab8ea67d975c0747427583a906989363c938abe196f5b96f03612d7684d8ee85bd0948 SHA512 89ef689f80b8393d33c6137b3e0be7625c26e58d7fb81432d86ff012ca086357fa3a31b24b9789bd43554471faeb8a131d112594d520f0ae35c486c4ad4cf32c
diff --git a/dev-python/munkres/munkres-1.1.2.ebuild b/dev-python/munkres/munkres-1.1.2.ebuild
index 1b19ee636c63..f243268ad495 100644
--- a/dev-python/munkres/munkres-1.1.2.ebuild
+++ b/dev-python/munkres/munkres-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/mypy_extensions/Manifest b/dev-python/mypy_extensions/Manifest
index c2ca59648b90..882b6563acc7 100644
--- a/dev-python/mypy_extensions/Manifest
+++ b/dev-python/mypy_extensions/Manifest
@@ -1,3 +1,3 @@
 DIST mypy_extensions-0.4.3.tar.gz 5545 BLAKE2B 8f1f988562390ee1ba3d90cafafec73c6fe080eef6b4321252d3b3aeffebf1ad13bdcae7ae75c69eac7bef91dcf3f846ae7f9a3f2ad6bad9de2bc8cfe5eed29f SHA512 22d8dc538cf6f77d97f4113dd34fce8095dd98944c7613fab2b3e71a3e9b7df1374654af41ead5c934f789ef1b72f54d980ab06f3ca28b8b4c6bb14ba1ca3ce2
-EBUILD mypy_extensions-0.4.3-r1.ebuild 827 BLAKE2B 726babec3960003b95d1e29b89df3bfc23297e5be6d386c94627a5b7ac721ab2eb7d64e38ffccf9f5d174d85265f4d95e41ab9abbfd7c436baea7de049f8a72d SHA512 7fbdfb4aa210f028e6509fa98a8530dc1ba15c877c17bc9bd28c4904f6511b6a2af85807848db1aadccf4435fec5feaeaf142e5997632c06157436aea19ad1ef
+EBUILD mypy_extensions-0.4.3-r1.ebuild 828 BLAKE2B 35b03e9b37eb417aca1971312e57c92070858438c3b268b407573d6c15b423cea2c5bf98f79bfe0906f2bd0b33d4d455782c4423f8224104287774e6e070e826 SHA512 11151c92c9f8cd11bdd9aa48dec49887347da04a5fb1198d21200c681641db1448354c6b3ef3af63c5862275da397b03b2047a742f9347b5ca61830073cb40b3
 MISC metadata.xml 406 BLAKE2B 39bbd87f1c027d9f608a8cd91378b03741d8c7fe480bb800907fcdbbfe17f27f5df105259bf88ad4614c43dd2e4e2943c87b8c89c8ca866878c27862c4648f37 SHA512 327a3958e787e4d2cf43a4ec78ee534d644883a627cc7a690af90e1440f49f2f04d80ddbf9fa6dfc0048b499a441955699bf277d53f6cec1a407cc4a31c770cb
diff --git a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
index 08b338c62557..2fcf5b51dccc 100644
--- a/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-0.4.3-r1.ebuild
@@ -1,8 +1,8 @@
-# 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 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/mysql-connector-python/Manifest b/dev-python/mysql-connector-python/Manifest
index 1dbb2bf55f59..4d6c6bddfe6d 100644
--- a/dev-python/mysql-connector-python/Manifest
+++ b/dev-python/mysql-connector-python/Manifest
@@ -1,7 +1,7 @@
 DIST mysql-connector-python-8.0.22.tar.gz 12081967 BLAKE2B fc6b724ec2eb47a92294f7316093d4a4d2f4925981adeb07b305e946a047dbdaedd96c6ff9a07426fd56185f467cf6473bc84e0896d2e8fde70a188af16e9df2 SHA512 07f380922c18f9ade38f95d8e107fe8f90b8a7901fb9a36bbdfdb2b29f9cb79b0b6387a608e89bf90e9344c635d47184c750a206beacb2c9cc7615d6a7df2c29
 DIST mysql-connector-python-8.0.23.tar.gz 12095843 BLAKE2B e4cc24f045d0e988ad97a9427fa3f6e20eb9d993d97f51033140e12722bc04fc3a2b252b811402daea2fea8f987948ebd8c68623f2af3e0e7e35d2b0d6fa7eda SHA512 66ca61c15573555a3f42ad8a9e9b3a4bc612c4d2b4e54928af87adcf609e131e9afd53b76c3a8da30f181e4f2111245cda5995063109526ff72f4f2062c2e528
-DIST mysql-connector-python-8.0.24.tar.gz 14600574 BLAKE2B 93efd9430ef65c63a3097d5af4b10e4875e306674d306161e10388c873f79213da3c04dcda9d32ad3f19021253014e1f98d884a3da70dbe8be1f6d96da2ec9ef SHA512 6b28a6017b8c4f78bf9710d9e0213bb6c0f63656b40a17e2576a82b6e249f0ae63c916d282392e577e8471d03ee19fa9e1f9a940e08f3dfec23a05064b851912
+DIST mysql-connector-python-8.0.25.tar.gz 14600643 BLAKE2B e3452aa82dc047cfdec8e64975ceb4f1ba7804aae770956fa52293e185408a4a31b2f563a21dcc6f0c5be0f4a5858d6b58f0d33ab5cf5071543e2c68b2b52b52 SHA512 2a76b879b369e69e0ed6a67d1eab4787c0f9a29c505ad785b03b6b25d7c92b85547082adeae572c75e61b613f39ee01d291fdf54927bdaf25dfcfc85cb8ced7c
 EBUILD mysql-connector-python-8.0.22.ebuild 1523 BLAKE2B 482d37af75f68fcfbf92074f82474a006e66376289a177e49e3421c25895d2a8cbdf40c4d9301a7b8fa17d69737252ef99a2196c969bc65b57cc000819ef86d5 SHA512 5f1eea17a35e9277f09eb8101c3e91d3b47ae9803b6c949afea3206b22757c73144081cb456faa1c46b992c7ca14a4b39997f35a12f79100f823d6dbd7eee970
 EBUILD mysql-connector-python-8.0.23.ebuild 1524 BLAKE2B f97c6f95c11fa80fea43d8ac86d1f7369561f5bee7ae7e8826187e5d9b758d4ff85b6d3f1ffaf096d680fcfb4b8dcd7133e0203d89011dab60ed3b4789f68a42 SHA512 e2a3f26be785e0ec920b828584e7c9bee38ed78bdf336d2d2e02e595c0b5ad6441dd971b67a4e5219999b0ca5b05d31f9733bf200813b8b2cd86b733081a1f98
-EBUILD mysql-connector-python-8.0.24.ebuild 1553 BLAKE2B 24aeb8794a3cfe6e6b3cdb74eb732dc3bf5c1373535fb6e146f1f6a06ef35e45f645a11224ff8143e0f29ef30c33b870bd65ff58a65fbbe7f6c63369aaa1aee0 SHA512 3853b7d68e2cda1b472b29c80529164b8eeb87c67c9910e240beb7de813bdbda8a02b7949b5a305ec2a1be1cfdfea565654058534fc3a361736fa4e7978a414e
+EBUILD mysql-connector-python-8.0.25.ebuild 1552 BLAKE2B a07510229e2b661993118ed1c1e18138a0a837aa0a15b38b2c841270534be962e247fecb00b293679998eef9ebc2fff6497bb396bd2116933978a1a774276655 SHA512 e91b8d26a81fc6065cfc516be3a2c9f74c402340e467a98a648f2872cd3fe43fdc6973124fbdaed4e9123fe8b29d9e8a1a456adaf7291de78df4c05743bfe008
 MISC metadata.xml 429 BLAKE2B ecbfe7e88466287141bd923db191969d384118b464659804a4aad33d811a6042b8082c9675a103e3e50b1ccbf74357be609ed714890412d2534bc77388f6b61a SHA512 812597d8918eeb1c0b94b8afb0b605cf98fe6e0f3d4f79b644d90e78f026a13d1233c7c0665022c752818acf07deea7151b988a701c8a5060aefe9264c2a592f
diff --git a/dev-python/mysql-connector-python/mysql-connector-python-8.0.24.ebuild b/dev-python/mysql-connector-python/mysql-connector-python-8.0.25.ebuild
index 98d012be9e7f..cb3b42fdfd51 100644
--- a/dev-python/mysql-connector-python/mysql-connector-python-8.0.24.ebuild
+++ b/dev-python/mysql-connector-python/mysql-connector-python-8.0.25.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Python client library for MariaDB/MySQL"
 HOMEPAGE="https://dev.mysql.com/downloads/connector/python/"
 SRC_URI="https://github.com/mysql/mysql-connector-python/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
 
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples test"
diff --git a/dev-python/namespace-ruamel/Manifest b/dev-python/namespace-ruamel/Manifest
index da02b920a5d6..eefaec9b3d9a 100644
--- a/dev-python/namespace-ruamel/Manifest
+++ b/dev-python/namespace-ruamel/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-ruamel-1.ebuild 901 BLAKE2B 25ad64a30e93b3a277e2f409869a2a9727085c07572d752247858884783cbb806a19866d6eb7150ec5f4e2a87f02d36f618a38c342ad619a4e9a0bdd50153e59 SHA512 d78735f7e48a99d14e65124e6f50e7a61f3cbd04ab93d73cc07b364f3f8e8f4ca0b7445e466895c0dad713f659d86c6225e0c444d8f443ae2d6355bd9ef84fa2
+EBUILD namespace-ruamel-1.ebuild 902 BLAKE2B 8d7078e9ff3f82a9af7fa2c010d6bf60eca277323e60d5404f8b9d30a9ec346964ed6c9c08cf4efc3a0d0d4a1b2ce52ce181da29f2ecb44f2155efc0a1bcf6c5 SHA512 ebc3fcbf4186d2b1d54b55593f0978bb6da49d5213768646afb999f7ed69500d7eb8145aa5030f57936d131c3185f798ead7b26e4712e5cbe28cb7012712edab
 MISC metadata.xml 218 BLAKE2B 086fdcf7b63ca7bd6c58e861d717bb375e1cd372eff26d5d2eeeb176d8c5e6f10e653562abafb50eae7d7508f8e3d421b87e6a749acd0490308672828d0da697 SHA512 4558fee4c51117e21b1f42ca3edbdf1195ed297db798d6bfa0e5fbb7019654a187422b0abde7af5d800caffed66d1e55e4280e8be602bad591424d9776c46781
diff --git a/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild b/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
index 35e5459dc08c..5263778ca1ca 100644
--- a/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
+++ b/dev-python/namespace-ruamel/namespace-ruamel-1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit python-r1
 
diff --git a/dev-python/namespace-sphinxcontrib/Manifest b/dev-python/namespace-sphinxcontrib/Manifest
index de3274ae4c04..d7cd7c0e8650 100644
--- a/dev-python/namespace-sphinxcontrib/Manifest
+++ b/dev-python/namespace-sphinxcontrib/Manifest
@@ -1,2 +1,2 @@
-EBUILD namespace-sphinxcontrib-1.0.ebuild 944 BLAKE2B dca78a5ec9a95b4c83e1228bc52c7d3f8dd592a7ae892c56e58dcbabde9cd82db4474a5e5476320f34a567946148c0eb18d3cb51386487442e7bcda3ea42e080 SHA512 9c661d6bc2cd42292b2e17267f4ed24e6e29aec6fda0f23cb9242860d869a71a5c1e8fc758c4e6feffead1985e41fe0d00271436561d5e1960d5fc1c53501380
-MISC metadata.xml 222 BLAKE2B 627c0e9a843219968eef5f67d4a3656240cc8795a1fe885983efab35f57ec02cff5f28533c665c77e1391de3c7d2e1d7025aff9f82213e38f4c5c0e6b504c11c SHA512 b9b20f913c2b6bc8ec843d5d46a97ca2d847ccadd4dcadf7b68a60535e44b721541c72cc74b17c55fe21161a1dcfbc86a3d08e58659a8c431b574729fe87607d
+EBUILD namespace-sphinxcontrib-1.0.ebuild 945 BLAKE2B 3ad2c71620b9dd5bd371e6ef293cba46b58a2e5f9d982bdabb2102bcd6438df8bf06537587a686858b0c620473f19b67daa0693270d2ac316570265faa5b5c56 SHA512 4d7a4a4ab47def3754af61f2a35ade6e163af685f494cecba230531bbbc770991972bbbacd60c52b0b659c4e8fec2507366be80e3d4766dd8be6bbc10accb8d5
+MISC metadata.xml 246 BLAKE2B 3a28b3bb42a0352827a446ea608867a7782fe682458527ef441a528a22c9f951dc203639934a69ffb520f63aadce3037df28bf8c5304b3a5921b336142f9f246 SHA512 3245fb694492b2f698fb63aac02e66fb8a94fe35eabda45df4790bec043a1ea552e112315334001902f070093bb73e7b741aa3004757404aed97ebdb86cc9fbc
diff --git a/dev-python/namespace-sphinxcontrib/metadata.xml b/dev-python/namespace-sphinxcontrib/metadata.xml
index 3743220e59f3..e24dd86faa2a 100644
--- a/dev-python/namespace-sphinxcontrib/metadata.xml
+++ b/dev-python/namespace-sphinxcontrib/metadata.xml
@@ -3,5 +3,6 @@
 <pkgmetadata>
   <maintainer type="project">
     <email>python@gentoo.org</email>
+    <name>Python</name>
   </maintainer>
 </pkgmetadata>
diff --git a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
index a807227661d5..6a28d9882522 100644
--- a/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
+++ b/dev-python/namespace-sphinxcontrib/namespace-sphinxcontrib-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 inherit python-r1
 
 DESCRIPTION="Namespace package declaration for sphinxcontrib"
diff --git a/dev-python/natsort/Manifest b/dev-python/natsort/Manifest
index 1c59c860d2ae..26d8bbf6babe 100644
--- a/dev-python/natsort/Manifest
+++ b/dev-python/natsort/Manifest
@@ -1,3 +1,3 @@
 DIST natsort-7.1.1.tar.gz 142749 BLAKE2B dffd5b7b18ac49653d4d65ae1335c85d441748903aa983df092778476988cf0ca59c08526ee0da1761fce1afe4849d4c9a9e2f3e0c5400ebca2478781d0986dc SHA512 1903c933c6203ef0cd194ea444d79276b79ec385728a92b6e73d1698abc8e1351e96ed8ea4ae5f9f413ef6daecfd269a4d0de74c45eedff682fe929d8f977f30
-EBUILD natsort-7.1.1.ebuild 537 BLAKE2B 6b27c4f831685103adec3cef80af7107b1c31803136a9d71154e9af51f5df29829ea9d6510f17d25a1e5c344d3534ea66eaeba62d2127e26f6f3201366719154 SHA512 44ea75c82f352fd3d849e31f2e6802d2604070a2b2dd0d327b9100b0528e5409e7782b72c80b3b7be73005a1f11411a717931468776acea400deb54a2b449359
+EBUILD natsort-7.1.1.ebuild 506 BLAKE2B 221ae324d458de4576654be823b0fb1e4d72cdcac51bb478e1e5c30567f6117138c7bb9fee19b0bf7be71ffd99fdbc907cf9a0106c4da4dd59ca60cf6c4918d0 SHA512 6ef6e12f9b606c88eb91ae2d879adff8538037f43a31f667ea25165a856134b6abf1956c5bbe65e64efa6c73e86f370654f1921bc73a14fc766f42eb23d341a0
 MISC metadata.xml 406 BLAKE2B 1bd6819234aa6417e45d2e38c65863145930ff04eccd05690ca9d210fc9572394c18ef59e0d2c5adbd6791047fc8090baca5d6ec0c1118aaaa3fa23e2fa9427a SHA512 693524d7b020bdf70374c4ab784d6e230963dde0ba168fb9b5a4c39652a81bf67feecf091720f1fc1c853830705bf7aa4da64f2c3b4e921cf316507c8a79aa17
diff --git a/dev-python/natsort/natsort-7.1.1.ebuild b/dev-python/natsort/natsort-7.1.1.ebuild
index e6a79b0fda57..b9d6fd8c9887 100644
--- a/dev-python/natsort/natsort-7.1.1.ebuild
+++ b/dev-python/natsort/natsort-7.1.1.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -16,7 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~arm64 ~ia64 x86"
 
-DEPEND="
+BDEPEND="
 	test? (
 		dev-python/hypothesis[${PYTHON_USEDEP}]
 		dev-python/pytest-mock[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/Manifest b/dev-python/nbsphinx/Manifest
index 0d5965cb61a1..20fa830dcfb8 100644
--- a/dev-python/nbsphinx/Manifest
+++ b/dev-python/nbsphinx/Manifest
@@ -1,7 +1,5 @@
-DIST nbsphinx-0.8.2.tar.gz 135256 BLAKE2B 9e2f733df713f5285bdcd876d595e5268a193e07c9d3d85e84f315cc1f11250be4e36854c307b96c0e03ab1f64e573896ef387eeea874553f7ca60c51bcba746 SHA512 b474bdbe291c498f8c392c9c5877eac12d9242e4784f2c8621825ed74dc264be60c1bc1b8ae4ff40809c4eb2a65b04ac54e5369eba3c3c79c1ad6b0a4c711bc5
-DIST nbsphinx-0.8.3.tar.gz 135336 BLAKE2B e015c51ccc6ce8ff6a5233f32ca90be696e9c837e7a66b3581b34712afd439679bb301146cd0b8fab083a1f2e48c31930c790b759c8fcc4e2a07a4cd56c732bb SHA512 27b649243970d7a4daadf9283a6cdecfb2b6e9a05ced23c8a487a960af580bb1a6e45d812efaca75b7c09b1e76e3f8a9fc845dee409a84f7767c624765173119
 DIST nbsphinx-0.8.4.tar.gz 142976 BLAKE2B 953c74e5d90a8a304c30334b15409b4d50b3aa4560c7669bcde6526529041b1088cd51ba66573ef3ff9e24843550ed42080c6f6bddc1022d2e1ce59d4e3ad914 SHA512 4e644c02661440f0705a792655c35e1789e2ef051ec24b538e7ddcfb68024063b60a742efc67afbe7578eb3a3b1880a284e8710d08de4c014e46ea34c48dbdf5
-EBUILD nbsphinx-0.8.2.ebuild 623 BLAKE2B 7664e14a7a77f0546c6ec7d30ff5cedae91071ca491ca531c83f1d9a707ec809f6b031e951e8f24f5e865bba8ca7d82d2df5936debc3ef9cdd2e04036e2cf8d0 SHA512 a76285e720a1847ada1ca241fd9999681ba2f70337b3704a1a4f5d2e792aa9504204079c07d75920a9b1f991297c9e8d2fe90dacafd621e28edd1fc5656ae82d
-EBUILD nbsphinx-0.8.3.ebuild 625 BLAKE2B 3881d7ca9b686e0003688ef8560328d054b3967d88e55a306418967a77401dbabade0ee5ffcfa444b89b636eec15ce02d62aae55a79c5efabab265670893c303 SHA512 29a3fcefa678731c7c4f7c2628d37e7e0ef41f27170241ae802c6dcfa26fea9abe39b54df811335ed8e3ff57f8235288ecc11c59790ff3fd89a8469379ab664c
-EBUILD nbsphinx-0.8.4.ebuild 625 BLAKE2B 3881d7ca9b686e0003688ef8560328d054b3967d88e55a306418967a77401dbabade0ee5ffcfa444b89b636eec15ce02d62aae55a79c5efabab265670893c303 SHA512 29a3fcefa678731c7c4f7c2628d37e7e0ef41f27170241ae802c6dcfa26fea9abe39b54df811335ed8e3ff57f8235288ecc11c59790ff3fd89a8469379ab664c
+DIST nbsphinx-0.8.5.tar.gz 145770 BLAKE2B 734ce1081aa18b670f15d00b79930af5fac8a531a9a6d645ad903fcea537cd95561f41360c3028a60503bf878aff0d7105a0a753563ae5bb70ccb68db118e761 SHA512 1fdb52741e01afc7e3a67d97d3edee14b5270a3404da607c97c116b839ba23c641b2d3e338df81db52bd677d71861c62dcc08184ef92165d6a53a6841c1a96e5
+EBUILD nbsphinx-0.8.4.ebuild 623 BLAKE2B 7664e14a7a77f0546c6ec7d30ff5cedae91071ca491ca531c83f1d9a707ec809f6b031e951e8f24f5e865bba8ca7d82d2df5936debc3ef9cdd2e04036e2cf8d0 SHA512 a76285e720a1847ada1ca241fd9999681ba2f70337b3704a1a4f5d2e792aa9504204079c07d75920a9b1f991297c9e8d2fe90dacafd621e28edd1fc5656ae82d
+EBUILD nbsphinx-0.8.5.ebuild 625 BLAKE2B 3881d7ca9b686e0003688ef8560328d054b3967d88e55a306418967a77401dbabade0ee5ffcfa444b89b636eec15ce02d62aae55a79c5efabab265670893c303 SHA512 29a3fcefa678731c7c4f7c2628d37e7e0ef41f27170241ae802c6dcfa26fea9abe39b54df811335ed8e3ff57f8235288ecc11c59790ff3fd89a8469379ab664c
 MISC metadata.xml 834 BLAKE2B 628cddfa0e7fba3b9668e7cf53b3a906330a2bcc8d1bd8957d811558c98e48487f28f058d0bb45b4987977857461af2bb122853f6578ab67c2a6f97d242b4880 SHA512 b6c045e0fb6636f440e97b167318ff6cb0f71c8ba6cfd05c3afeecb4580ca1f37f03d765921624ad8ae54bfab76d0d913fb8eb30cb70387104d6df90167b4c65
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.2.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.2.ebuild
deleted file mode 100644
index 6d626dc40a76..000000000000
--- a/dev-python/nbsphinx/nbsphinx-0.8.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Jupyter Notebook Tools for Sphinx"
-HOMEPAGE="https://github.com/spatialaudio/nbsphinx/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-RDEPEND="
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/nbconvert[${PYTHON_USEDEP}]
-	dev-python/nbformat[${PYTHON_USEDEP}]
-	>=dev-python/sphinx-1.8[${PYTHON_USEDEP}]
-	dev-python/traitlets[${PYTHON_USEDEP}]"
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.4.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.4.ebuild
index 94b3df799087..6d626dc40a76 100644
--- a/dev-python/nbsphinx/nbsphinx-0.8.4.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.8.4.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"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.3.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.5.ebuild
index 94b3df799087..94b3df799087 100644
--- a/dev-python/nbsphinx/nbsphinx-0.8.3.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.8.5.ebuild
diff --git a/dev-python/netifaces/Manifest b/dev-python/netifaces/Manifest
index 529b76699774..621f5bac1ddf 100644
--- a/dev-python/netifaces/Manifest
+++ b/dev-python/netifaces/Manifest
@@ -1,4 +1,4 @@
 AUX netifaces-0.10.4-remove-osx-fix.patch 353 BLAKE2B 49b66642156ada3e01e7a7fa28b6e12a36b5bacd38676972b1685a2c2710bcdb531849d3c27ce5279feafa1048d060eb227a79ddd5569c5d48accba600f32e69 SHA512 0c47d026e1be42fdae860aade01762d0c7e27083fbe17dbed76526e72852f0444e56617431d081de9e4e86c7ce65293d83e704e56a3219face4d07106730255c
 DIST netifaces-0.10.9.tar.gz 28844 BLAKE2B abbe36ef82c5fa70bac60abe4c7bda671f8bc009567dfd38fcf2084bac5b09cbd42cc16c5c8023f3219129892f8def296e3cad8f9241d8c904a9c362c8077aa6 SHA512 8fc593de4d2cbda46a3e2430ede031360f1abfc64d47d00fbec09f3395fd83479bf29d97cb6834b1df06850c9ac2745c9344b6814f34be5975d4d5df98e05e87
-EBUILD netifaces-0.10.9.ebuild 559 BLAKE2B 17f23e24e7524601dac4927dc59b609b3abd57b92c19e69230dcba57641fda6845efa50ca1b656aac9f6175de96473ea317d4af6734925c802de8b7f809e62cd SHA512 851b4876be95673f6f385399383ab41769d3dcbb511dfe8c4e0902b4b86ec671ab105390cef4d95bb1d1608cdc68c5f423710aa4ea1d8e9cd05f94198e45f47c
+EBUILD netifaces-0.10.9.ebuild 559 BLAKE2B 880319b79fa4545d2b218275dd435502997c7682c8bd9fc2bd1203405da17a10bd50b9063ba83351df2b98eb64d109dbec3b6e722817f3a7ece4c9580ee16172 SHA512 c5ecf5f66ede07513cb66cd4e4c61db85f32229dde380d6f6e7c5cbffb8856d4589a7f402967ab16ec855be58bc52c30a0b19c49b7e9538f9fa983444c43b5d1
 MISC metadata.xml 513 BLAKE2B 2668fe590efd338d410c10a71076e5de04297b18f998b07dbb88a3df99e1c4e66ed92f97fcf6d06b2496bfec3ec308d3812f08b1640b73f1d2221beb669ad3d6 SHA512 88793ae0c8b539b78d70e1af3a18e65b7702e3663d950a9ea1ce7528ed3300ea0b4c69c5a48a652fac4c2a32ede679062dc929c165035a3cd4dec13513669691
diff --git a/dev-python/netifaces/netifaces-0.10.9.ebuild b/dev-python/netifaces/netifaces-0.10.9.ebuild
index 9e27eeaef54f..9d457ffccb7e 100644
--- a/dev-python/netifaces/netifaces-0.10.9.ebuild
+++ b/dev-python/netifaces/netifaces-0.10.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/nodeenv/Manifest b/dev-python/nodeenv/Manifest
index cb2ed8a213d5..c59b4a8339a8 100644
--- a/dev-python/nodeenv/Manifest
+++ b/dev-python/nodeenv/Manifest
@@ -1,5 +1,5 @@
 DIST nodeenv-1.3.5.tar.gz 32824 BLAKE2B 4f9e2c14562ff9c396142c5980876a97103d9206f796e9d9d1f67f29819a04db0e8ed232eb3f841a1e2efde84e55d6d7213082f6be568d7a6291562c5624a9dc SHA512 c7e9068a220f183a217b15e724aa8197fca8f2234c76eafd230899963b6796e66e151c20c529e6540f7e3c59849bda3860d563b38f5feeff73601043f79cfba0
 DIST nodeenv-1.6.0.tar.gz 35407 BLAKE2B b952fa95787b02353ff01c27a3e4b692c0cb27954e99af4c4aec682c00692bf3e509947ffd378639dcfdcb2d8077e1b2679f56cef7818997a13a31f882251a2a SHA512 abf4fe55ba478570a32ff3bb24fc3c60ba2d100822f8295c4c55c301ccdff2dc2d20ef76990ea3ac203e30db8a1e85f3ef2df671f87c0cf7305cf1aeb788efdd
 EBUILD nodeenv-1.3.5.ebuild 471 BLAKE2B c286ff7cabc65a9b50cc7cabff22593eec5d852624afb4bf1fd35ea54fe881f9774da8b8d362f3585d1f620b17f33b464d6f7312769c31803400148de528ef2f SHA512 2f672269a59835dbe4806c4518da8e95a3842eff0b3435bd06a622c0e2e7dc9ea6597cb262df8630de7057962ba10648c0adfac0b76b4a3a517a1fc56cfc04fb
-EBUILD nodeenv-1.6.0.ebuild 471 BLAKE2B ba8c4e240b702f010ad1ef9cd5ff9de8c9e4c838a4b3f88a25ebfdd6e3c12d1d8365eb22d5bce93d6b1ad8f7971108dee28d01fba8d0ee534b693196fc156bac SHA512 9f79b7214459de74019c5d94255cc876d8e0436a6d6365f3af12902f112f72a6d9e38183618b0ee3663273d3ac072281661b861353212ec79db9d76621cec5b7
+EBUILD nodeenv-1.6.0.ebuild 472 BLAKE2B fa62d5ae0c566cde8d4f6e7a5bc231ff443db533c0a8309b5290351d9444e3fba8ca11cac0dbf80a564808325e4a8e079a6032bd81bd62684896814658a536fb SHA512 27f881dd8f4daef26b1fe74856e1f67c8ca0b8935b56ba016cf882b8a6f1fee5318ce6309db859df9067b16006c387acadc54f99010f22081bb34846698266d0
 MISC metadata.xml 377 BLAKE2B 10309882a21ce0f0f8b7ec7d4d6c057a1741e27d548eeac8126f39b8a564c8e0e2a1b26cb09f01402b928df40dfeb1169fcae44ff629c901ef68b51bd12391de SHA512 7cf97ad2163fca6b4bbf962373052497e64926848dde74beec8e6a194de669709474af570a35e9ffc31134d2c252852cec8167420d54ea5745a6d377a878b2a5
diff --git a/dev-python/nodeenv/nodeenv-1.6.0.ebuild b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
index 609da67f424b..f79748c9e382 100644
--- a/dev-python/nodeenv/nodeenv-1.6.0.ebuild
+++ b/dev-python/nodeenv/nodeenv-1.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/notebook/Manifest b/dev-python/notebook/Manifest
index 102073c9c46b..f6fa74af1db6 100644
--- a/dev-python/notebook/Manifest
+++ b/dev-python/notebook/Manifest
@@ -1,4 +1,6 @@
 AUX notebook-5.7.0-no-mathjax.patch 1438 BLAKE2B 66719f5342c08fce7576a70780b38a97ac3e768f3385218da15e7e2b7073ec0e1bbe943f320e4ebd0618401760de96295fc1b0ea0f2e919487b41f90acabfef0 SHA512 ef2754a0e7f552de34411532e7cbddffeab66364075a5514290b09f956b3486791f757b9a159a6c3f975507b8a5626612efeee754933927e2b505aea5f5df2db
 DIST notebook-6.3.0.tar.gz 13922153 BLAKE2B f24b03d4887b1e786da215a4ab10d83e4ae8391d1b88559f4bb35fcf7813d98e487447bf21a1772d502d6b3594c53e6e7b743b681cdb07b5118cc4808bcd02a4 SHA512 112bb0b176f7e6584ca0f09d74cb34fe756d0491320dcc23932f84236fd55b9f56f13a7057c89be073486637fc8c0cf2c44dfce18f27fa16ad0f9d15d2bcd5be
+DIST notebook-6.4.0.tar.gz 13937270 BLAKE2B 41ba6e3dd22c92b6044199737fe93563aad07117e8c64817566765d643867b582218a1b34099acf2a84df9ac9f8eb2773f6f3e6779b14255867fd97ec443df85 SHA512 8bb57b3efaaddb781ee963a569996e45c563b50b2cb918fb7722805710dd5852d895ff5b5f5575686032a037d7395aa581140b471b529d68dfcb371841607481
 EBUILD notebook-6.3.0.ebuild 3070 BLAKE2B 93ecfcfe269fd845b0d11a606c1fd0cd26ad890c809b038267790c1d1e3ed65e4992d68293d5edc77c22c0f35b969c803a8daabcbaf0af7328217c7af4676a78 SHA512 2b960b7aaf61855c1ff6dac7f51051958093d0b3022b133397688ba1089bd4524a4eb34adffb6f1a94fea67603c3f1610ede263ce0df39e2006ebc09d7518e97
+EBUILD notebook-6.4.0.ebuild 3072 BLAKE2B 4f4705acc219e1a43975e1af1f49f14f744552f497f0003add91c82cf7c92891b51ace78386763f17c5850ceecd349d7cb263b944920fc51b469d961bdd39ed2 SHA512 4e5a2af4eb7dc7095dfafbffeb55a1cc047590ba797e571ebb6d21e0c0a40abf2ebc1ed45e47470efa54a9adfaf832e0ffafaafe5729c04bc2bd0fce5c199c92
 MISC metadata.xml 524 BLAKE2B dfca744ea63418ee961bc5f106be6a01acf80af2e4179e0f3446c370a416bdae998887a55e866cd2fe5ede334653b46205f32b5db275e2ec54efefbd10455541 SHA512 a3511781a2086a80a0cc7a02842e1c71490ae1b200ac5263ace00610d37df7cf9ad866f4bfb89441514dbf26a5dfeb6559cbef9e1e6e2fba534c14feb5fcd616
diff --git a/dev-python/notebook/notebook-6.4.0.ebuild b/dev-python/notebook/notebook-6.4.0.ebuild
new file mode 100644
index 000000000000..9de1aeb1b611
--- /dev/null
+++ b/dev-python/notebook/notebook-6.4.0.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="Jupyter Interactive Notebook"
+HOMEPAGE="https://jupyter.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-libs/mathjax-2.4
+	dev-python/argon2-cffi[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	>=dev-python/terminado-0.8.3[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.0[${PYTHON_USEDEP}]
+	dev-python/ipython_genutils[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-4.2.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_core-4.6.1[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	>=dev-python/nbconvert-4.2.0[${PYTHON_USEDEP}]
+	dev-python/ipykernel[${PYTHON_USEDEP}]
+	dev-python/send2trash[${PYTHON_USEDEP}]
+	dev-python/prometheus_client[${PYTHON_USEDEP}]"
+
+# sphinx 2+ seems to have a problem with its github plugin. temporarily adding
+# a version constraint.
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/requests-unixsocket[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}"-5.7.0-no-mathjax.patch
+)
+
+distutils_enable_tests --install pytest
+
+python_prepare_all() {
+	# disable bundled mathjax
+	sed -i 's/^.*MathJax.*$//' bower.json || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local deselect=(
+		# trash doesn't seem to work for us
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_checkpoints_follow_file
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_dirs
+		notebook/services/contents/tests/test_contents_api.py::GenericFileCheckpointsAPITest::test_delete_non_empty_dir
+		notebook/services/contents/tests/test_manager.py::TestContentsManager::test_delete
+		notebook/services/contents/tests/test_manager.py::TestContentsManagerNoAtomic::test_delete
+		# TODO
+		notebook/services/kernels/tests/test_kernels_api.py::KernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::AsyncKernelAPITest::test_connections
+		notebook/services/kernels/tests/test_kernels_api.py::KernelCullingTest::test_culling
+	)
+
+	# selenium tests require geckodriver
+	epytest --ignore notebook/tests/selenium ${deselect[@]/#/--deselect }
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	ln -sf \
+		"${EPREFIX}/usr/share/mathjax" \
+		"${D}$(python_get_sitedir)/notebook/static/components/MathJax" || die
+}
+
+pkg_preinst() {
+	# remove old mathjax folder if present
+	rm -rf "${EROOT}"/usr/lib*/python*/site-packages/notebook/static/components/MathJax || die
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+}
diff --git a/dev-python/numpy/Manifest b/dev-python/numpy/Manifest
index b05ab8a7f266..d4c5625d88de 100644
--- a/dev-python/numpy/Manifest
+++ b/dev-python/numpy/Manifest
@@ -1,5 +1,6 @@
 AUX numpy-1.20.1-no-hardcode-blasv2.patch 2582 BLAKE2B 5057f925a12e6703ab5d9d4c342db80f7f5a7f02a5b5884bd9fac574dcadb9234901b08b1b2ca5bc5ba0345a58e896a241e3a48b4b050b2f5a1063324359d84c SHA512 4418b9c5ed3842848bc06a56ebbd7cd9261657e407775374f2f060944522128d8a5178888def6e4cf42ff6d81082d9cc1425d9553c5334ad4e728d0df9b86bc8
 AUX numpy-1.20.2-fix-ccompiler-tests.patch 1616 BLAKE2B 3e2796029854207187322b1061201e7f014472c64d8c66a2dd3f82ec2eed7311f5cc3351d98aeb4b8b75d95608853066a30394e5316bb91e443744f33d66966b SHA512 5ed01b466a0da96b5d7c56b78e420d6c589c48c20053b9da66344384fa93048f90e281d3ed5caa9325f6afe00ff48841b24abc926c75aacb8a6bd5418ed32117
+AUX numpy-1.20.3-float-hashing-py310.patch 4677 BLAKE2B 410438f8b9ba7bc346cd9fbb4d3087d60af6cc54b7ba4a839a1d9559d5b09db623932089ca8c34a70d30622d6260f3bff13fd2d97c94f6af437502f2e5b3c27d SHA512 a7605bf4db0886f4e7d4edd65c7b46d6b47ccb43140555cc86b35c2f003cdf29e8704593d77f7cc551f3be1550af209e7910a95e1421fe45b5d0ea5716d62588
 DIST numpy-1.20.2.zip 7756879 BLAKE2B 8b76942e04701e164029b145fed1747de72142ea4f5a8aa7472a01caeeed5e0b5b6d9e543106f9786e231df5a8afe3b7ad9256e69873e4f8876c659114bc494e SHA512 337a66d68c965da06f757a89b58d30b83ec0b2f3c7a3bb39496e5031e50fee6c4f2ec090202c3da9a20613864ea46d032ae75af1de5c33eebe515133ef37d40c
 DIST numpy-1.20.3.zip 7761912 BLAKE2B a4da49f7c1aadca299acb1b6d92deb4f50b1881c4b131cd389524a88ffc70179b2acdc88235dccd1ffd09879893db45b16bf2f54ced9b9639b806e85f7346285 SHA512 897be1cd6f3880711149dcedd838357e2d937a3c5f36b2a0db6ceed341654acf96b8b775610e1b43bdb6eacb987bbc51aaa8906244ca02cc8c2eae359ccef405
 DIST numpy-html-1.16.4.zip 12097069 BLAKE2B db1f897342fbc80a761fbaee7b0eee3761dbfa04ef6c46a137bb2392caaec8256580467ce06498cceeada2639151a1ec75dafab484d64cb897c008727d6d32a5 SHA512 c44c5e1e0cb22f9dd46fe9e302030292d85e567456178fee296746a414271634e906509fb6665ac63fbfebdd13c5383574f0aa47b4fbc639063da31addc3316a
@@ -9,5 +10,5 @@ DIST numpy-ref-1.20.3.pdf 7362241 BLAKE2B bf17564d7aea0db25ca9ef6b24dbbd25093c09
 DIST numpy-user-1.16.4.pdf 596203 BLAKE2B da3ad1f0ec1c965d20656f73a970911cbb58efa73a5df89e2e6485e0dd763f483e35eea1395ac919bf35d496fb216cee954fc5d31edebc1796a24a2a7a2d12b9 SHA512 3083008547213bfa98ffa5cd8e2cea13f6947f42d83aef61502a2a852b0d5f27d727c76b42d281d7a2f4f76c78e88b12ee3d9b164b39fe1f0213ace7097357d6
 DIST numpy-user-1.20.3.pdf 4977046 BLAKE2B 3548463cc878645bb169255d3332681685d0f05e02abf4cfcdd03773826d34f5a25c020240652839867a76258b25ca601ed292462f80bdf18b92ecfb46710487 SHA512 f6c37152228eac1fb69ddfc3a37454066ed678d57f12a587e0edcfe0adb390cc0b470384c2751033f7407bac44df9f69b0da4f3da1c300e6fc02231035ff634c
 EBUILD numpy-1.20.2.ebuild 3734 BLAKE2B 2a4dd063c94eb074c8ce3f60039710d4426f1f8e0be2be1419af23a791bdee32cb52aaf03084741fdb4d6a849b9e6c4f08aea3d642178361e5d1dd8329ca9f3d SHA512 541e3a324ef2f06236c78b5578a338b0084e1067b2fdd214f95bb579f706e6db91fe00513999deaffd5e7bb4736e49326c8f919e4c1b3b7b8c1dd473364032b9
-EBUILD numpy-1.20.3.ebuild 3620 BLAKE2B cecd9f66ae407dfde773acab8599b03039ec5aebd4cc6d7f7595487a40b4b940ddd4d40ef73b81ee5750037204849ba1d4c22c36cc567f4124bbf041249597be SHA512 607134d85ccd121f581cbedf8f46a0adbe843193a96b9b4341adcd1d0253f154b2be19bdd4a54ab7b4c8daa8c031141d8fdf35aa0be631b0d36a89eb887f7407
+EBUILD numpy-1.20.3.ebuild 3675 BLAKE2B ca4e67e97798cd46444cb49587a6e9549fe8bb67e4ff8f8d1da400ad3b8b03823e767cd936b58ae6abc307e1a2c49857c58e2d2d428fe102e0959f72ca37197a SHA512 cb0a52a6c41db0097413117363d1e243e3b56b13f0d731939f556795f9c68ecd2e274b89ec675e0b6f72100c775e4d92137547527b32e27dc6ecaf0b941495fc
 MISC metadata.xml 934 BLAKE2B 948b9a948cddc46d20d672992bf73ddb1e59ba18f470acf805c78f561249e7bce2cec1cb1affe63aad447f2f0ad627147cf05ca04ac3c321781255357de92d63 SHA512 404bc31423a1093c19dd535aa3cd5a6b925f4ef1699f9991ae19b46495c46ac4ab3b0b1995f62ea8bc5de15889b975dfcdc416360978508b837d4d5d518dfeeb
diff --git a/dev-python/numpy/files/numpy-1.20.3-float-hashing-py310.patch b/dev-python/numpy/files/numpy-1.20.3-float-hashing-py310.patch
new file mode 100644
index 000000000000..f3b2ea3ef0ca
--- /dev/null
+++ b/dev-python/numpy/files/numpy-1.20.3-float-hashing-py310.patch
@@ -0,0 +1,129 @@
+From ad2a73c18dcff95d844c382c94ab7f73b5571cf3 Mon Sep 17 00:00:00 2001
+From: Sebastian Berg <sebastian@sipsolutions.net>
+Date: Tue, 4 May 2021 17:43:26 -0500
+Subject: [PATCH] MAINT: Adjust NumPy float hashing to Python's slightly
+ changed hash
+
+This is necessary, since we use the Python double hash and the
+semi-private function to calculate it in Python has a new signature
+to return the identity-hash when the value is NaN.
+
+closes gh-18833, gh-18907
+---
+ numpy/core/src/common/npy_pycompat.h        | 16 ++++++++++
+ numpy/core/src/multiarray/scalartypes.c.src | 13 ++++----
+ numpy/core/tests/test_scalarmath.py         | 34 +++++++++++++++++++++
+ 3 files changed, 57 insertions(+), 6 deletions(-)
+
+diff --git a/numpy/core/src/common/npy_pycompat.h b/numpy/core/src/common/npy_pycompat.h
+index aa0b5c1224d..9e94a971090 100644
+--- a/numpy/core/src/common/npy_pycompat.h
++++ b/numpy/core/src/common/npy_pycompat.h
+@@ -3,4 +3,20 @@
+ 
+ #include "numpy/npy_3kcompat.h"
+ 
++
++/*
++ * In Python 3.10a7 (or b1), python started using the identity for the hash
++ * when a value is NaN.  See https://bugs.python.org/issue43475
++ */
++#if PY_VERSION_HEX > 0x030a00a6
++#define Npy_HashDouble _Py_HashDouble
++#else
++static NPY_INLINE Py_hash_t
++Npy_HashDouble(PyObject *NPY_UNUSED(identity), double val)
++{
++    return _Py_HashDouble(val);
++}
++#endif
++
++
+ #endif /* _NPY_COMPAT_H_ */
+diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src
+index a001500b0a9..9930f7791d6 100644
+--- a/numpy/core/src/multiarray/scalartypes.c.src
++++ b/numpy/core/src/multiarray/scalartypes.c.src
+@@ -3172,7 +3172,7 @@ static npy_hash_t
+ static npy_hash_t
+ @lname@_arrtype_hash(PyObject *obj)
+ {
+-    return _Py_HashDouble((double) PyArrayScalar_VAL(obj, @name@));
++    return Npy_HashDouble(obj, (double)PyArrayScalar_VAL(obj, @name@));
+ }
+ 
+ /* borrowed from complex_hash */
+@@ -3180,14 +3180,14 @@ static npy_hash_t
+ c@lname@_arrtype_hash(PyObject *obj)
+ {
+     npy_hash_t hashreal, hashimag, combined;
+-    hashreal = _Py_HashDouble((double)
+-            PyArrayScalar_VAL(obj, C@name@).real);
++    hashreal = Npy_HashDouble(
++            obj, (double)PyArrayScalar_VAL(obj, C@name@).real);
+ 
+     if (hashreal == -1) {
+         return -1;
+     }
+-    hashimag = _Py_HashDouble((double)
+-            PyArrayScalar_VAL(obj, C@name@).imag);
++    hashimag = Npy_HashDouble(
++            obj, (double)PyArrayScalar_VAL(obj, C@name@).imag);
+     if (hashimag == -1) {
+         return -1;
+     }
+@@ -3202,7 +3202,8 @@ c@lname@_arrtype_hash(PyObject *obj)
+ static npy_hash_t
+ half_arrtype_hash(PyObject *obj)
+ {
+-    return _Py_HashDouble(npy_half_to_double(PyArrayScalar_VAL(obj, Half)));
++    return Npy_HashDouble(
++            obj, npy_half_to_double(PyArrayScalar_VAL(obj, Half)));
+ }
+ 
+ static npy_hash_t
+diff --git a/numpy/core/tests/test_scalarmath.py b/numpy/core/tests/test_scalarmath.py
+index d91b4a39146..09a734284a7 100644
+--- a/numpy/core/tests/test_scalarmath.py
++++ b/numpy/core/tests/test_scalarmath.py
+@@ -712,6 +712,40 @@ def test_shift_all_bits(self, type_code, op):
+                 assert_equal(res_arr, res_scl)
+ 
+ 
++class TestHash:
++    @pytest.mark.parametrize("type_code", np.typecodes['AllInteger'])
++    def test_integer_hashes(self, type_code):
++        scalar = np.dtype(type_code).type
++        for i in range(128):
++            assert hash(i) == hash(scalar(i))
++
++    @pytest.mark.parametrize("type_code", np.typecodes['AllFloat'])
++    def test_float_and_complex_hashes(self, type_code):
++        scalar = np.dtype(type_code).type
++        for val in [np.pi, np.inf, 3, 6.]:
++            numpy_val = scalar(val)
++            # Cast back to Python, in case the NumPy scalar has less precision
++            if numpy_val.dtype.kind == 'c':
++                val = complex(numpy_val)
++            else:
++                val = float(numpy_val)
++            assert val == numpy_val
++            print(repr(numpy_val), repr(val))
++            assert hash(val) == hash(numpy_val)
++
++        if hash(float(np.nan)) != hash(float(np.nan)):
++            # If Python distinguises different NaNs we do so too (gh-18833)
++            assert hash(scalar(np.nan)) != hash(scalar(np.nan))
++
++    @pytest.mark.parametrize("type_code", np.typecodes['Complex'])
++    def test_complex_hashes(self, type_code):
++        # Test some complex valued hashes specifically:
++        scalar = np.dtype(type_code).type
++        for val in [np.pi+1j, np.inf-3j, 3j, 6.+1j]:
++            numpy_val = scalar(val)
++            assert hash(complex(numpy_val)) == hash(numpy_val)
++
++
+ @contextlib.contextmanager
+ def recursionlimit(n):
+     o = sys.getrecursionlimit()
diff --git a/dev-python/numpy/numpy-1.20.3.ebuild b/dev-python/numpy/numpy-1.20.3.ebuild
index 10bbd07b87e7..5b772a58a6f9 100644
--- a/dev-python/numpy/numpy-1.20.3.ebuild
+++ b/dev-python/numpy/numpy-1.20.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE="threads(+)"
 
 FORTRAN_NEEDED=lapack
@@ -46,6 +46,7 @@ BDEPEND="
 PATCHES=(
 	"${FILESDIR}"/numpy-1.20.1-no-hardcode-blasv2.patch
 	"${FILESDIR}"/numpy-1.20.2-fix-ccompiler-tests.patch
+	"${FILESDIR}"/numpy-1.20.3-float-hashing-py310.patch
 )
 
 distutils_enable_tests pytest
diff --git a/dev-python/openstacksdk/Manifest b/dev-python/openstacksdk/Manifest
index 94d3c7d0f9cd..419c8d26fe55 100644
--- a/dev-python/openstacksdk/Manifest
+++ b/dev-python/openstacksdk/Manifest
@@ -1,3 +1,3 @@
 DIST openstacksdk-0.50.0.tar.gz 940210 BLAKE2B 0ca7740206139ced4e8fc761cee90c7b1d3a31a6fd64afbe1de9d46552dc6fe206351854a80f4e56d5a2852ca9c2714f8e8001434fafc39e16c60b8c5c935323 SHA512 d0e69ad046712d3d54b4e21faa20627faf96d633b1eeeac09c3b9c129a5912883f22945200b65233ff8517c67dab4c6eeac73817d2fe543cc5ba05c0d751e157
-EBUILD openstacksdk-0.50.0.ebuild 1327 BLAKE2B 207b2be9aa48232bb8be93bee2f464a415c5e52224173d1dea7db0b72a48e8c6a68f22b3c77f592f639b5cc140001ec6b4b1eb0582e34f943e41fa8865bb249d SHA512 a99a96a8819ee99795090790a2e7b078f292a2a22ca1ea3f2fea2a4fec40a6861b78648d955c54059aa1cec2241d1fd81a3a49ff42a9207c6bad88a8adac5430
+EBUILD openstacksdk-0.50.0.ebuild 1326 BLAKE2B 07fece6346948f5271f30aac64518ff3f123db35da212a9f0e5c37ec96416c8f56c1d6ef14c767b5c226b0608aaebd7a9528531a8da38ac20dce104da1a0ad6b SHA512 dcecca99c2329242e4ec4b4acb296e0d36bf78142a797b1f4d0b7c640862e33aedbc784f385d770b3ee707c2596f59be006c80ac08f9c863a9e1f65b10621243
 MISC metadata.xml 422 BLAKE2B 57e22147ab28f2b4be494dc46b385575826275561dec468e72c4a1ccb753961cc57b5dff26fcd392c302fdcaabe7cbbe1418fd32bb1064a5c48c5d56a3a2a6b5 SHA512 f66f341a5c0ad49bc89dcb8e167c2c6caaa95f7b52f6729300969196ebba9eb48616bead34031dd1633224161117200529a3e0a2bfee7ad9e25bf5375529bccb
diff --git a/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild b/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
index 6ddd8b0cbafc..d5e8c982eb17 100644
--- a/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
+++ b/dev-python/openstacksdk/openstacksdk-0.50.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/os-client-config/Manifest b/dev-python/os-client-config/Manifest
index 941738d3d2f1..3a3174728b89 100644
--- a/dev-python/os-client-config/Manifest
+++ b/dev-python/os-client-config/Manifest
@@ -1,4 +1,4 @@
 AUX test_get_all_clouds.patch 662 BLAKE2B 33ae4a1400073519cb41bf048b274dcec6a0182260e60a126adbee68d39b2fc031114432b966ee6ae96661a0487fb9846edaac1c032a767cf7ede1be25d53a33 SHA512 614e0bd874ec282b9b90d5cfe7d3693056fc5811d0fbb8f436f57a9f9a55abf4609fc6a647313c3d83ba733f7f57e69b3eb5df4ab8b0664a730f6e9197502cd3
 DIST os-client-config-2.1.0.tar.gz 48257 BLAKE2B c88d2c9c34103abfa60c3d983ed50309a2a552cf275f48e3c1dde9837b98849d09062546c5bc096d978a059afbae54eed9eadb8aa53375aae67f409bf3cf3e05 SHA512 31f53e5bafced1d7d57ac8818a7b889506b45347655ee41db6d5d9c0a6f2ead2a6d820553aec4a6ad9fd817abf9d6b666938a24ba85ab3745e06bb10b312e33a
-EBUILD os-client-config-2.1.0.ebuild 616 BLAKE2B 291b1339843cad67272a9286b412e7fe64370e77ba4c4be492940e1ce9c23d568ebc8be07826f9a52875689b7df6159db0041c102a6603ce033e48522b806009 SHA512 4a20695b899550bc9563d63fcf2102887dae920c6767ee9b91bf23823078b6bb11521a83e25b17b5b575a84bf403c87e5c2284ce5cc36294bed39ca76ec7d4da
+EBUILD os-client-config-2.1.0.ebuild 615 BLAKE2B d80ce7abcfcb821e60316c9315afc4fbd4dc0e9a5dba7a7f2e6cd6d57210438a5b302d207a471f37a77e779faa65896b7d94945df95adef761bacfdc801d86cd SHA512 2fca1dba72888c57ee232d41f3e216ba76d1aa68762a2898b4d640bb091ffa04cf77e12a102765f295380a710395e7d532bfe4b2c773657d1a36375d5e2a42a8
 MISC metadata.xml 475 BLAKE2B 7039b83d2690d7ffa5b36bcd974dd48d5174a16f03b0be2000e520e18c5a572fa3425d79a60f2cab1c72e890c2dcbc5d17f23e2da78d03c7be51187df48beda7 SHA512 f81faed05cdd372895b7d1df885bd10e795dd844caa8445a332d66e574c7a147e902662033b3eb0af9e7e1ae28b982afb436795b198fedf3c86b534e0da971e0
diff --git a/dev-python/os-client-config/os-client-config-2.1.0.ebuild b/dev-python/os-client-config/os-client-config-2.1.0.ebuild
index 27f44f571155..eaef5e3ce68f 100644
--- a/dev-python/os-client-config/os-client-config-2.1.0.ebuild
+++ b/dev-python/os-client-config/os-client-config-2.1.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oset/Manifest b/dev-python/oset/Manifest
index 01667438b077..80a983cb5446 100644
--- a/dev-python/oset/Manifest
+++ b/dev-python/oset/Manifest
@@ -1,3 +1,3 @@
 DIST oset-0.1.3.tar.gz 7345 BLAKE2B 1ef3fc6e0acc0bdbabb139a968ada851a0b1f19785b30c1f65bc3205600ae868add111487404b0e71b03cb5c2fce9d3991c32c5b0034ead62da058807efabfe3 SHA512 d34d11e76740c85a41be3d055710fe08afa7de1839ae43d76c152aa5838dad5895f0a0d95c5a2625a94494fc462e08f79a7614756ee5748c35e434176ec21121
 EBUILD oset-0.1.3.ebuild 370 BLAKE2B f37ae2e55496a4cc8af9216461790b1233ff2480114728b775b88d3ab68dc51a002a6297ba599ad04782a334c4dacce4752673c1f2eb2848dcd88962f5ba337d SHA512 61769509bf1a14e698278e12b0fc555fbc366c5da3c123a115a9551f900c3bca44f0c9ba753f872f50744bbb6d3b8cca4e0827843120d32614898c59eea27b63
-MISC metadata.xml 472 BLAKE2B 1c278571adea29a16c713e8eb917932eeb05440f5520cf5a59f3dc9e061d380632a0d0958f2a004c754cabd01ea5f51bd9d634f49d71288daffac0f7d6006956 SHA512 4b216bf306b3caeb799716172888f8e3129aacbfcf9e333ffef1b65e336ec12dd937f388a88bc9ac71f5c11931ab98ff8e39d4d69e6464fc011b12abbec3476c
+MISC metadata.xml 325 BLAKE2B 7a9d5fa1688919833dcb2dceea06d31f2d1484e84b96a4096dc5302d85b4bf378df5d1119d0f07ffa9b7aa650628561680830f5cd58003c3f1134949c90dcabe SHA512 91c69acd217279dd7ea4fd57758cf5dabd21cbe5adeb0a9f6f1f88814702fdaa3752ff6c6747bf13365c0f3fedd9f586ca63792be9a880c7837c3f3d149ec4e6
diff --git a/dev-python/oset/metadata.xml b/dev-python/oset/metadata.xml
index ce5437234e2a..ba9e1475b0d9 100644
--- a/dev-python/oset/metadata.xml
+++ b/dev-python/oset/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">oset</remote-id>
 	</upstream>
diff --git a/dev-python/oslo-concurrency/Manifest b/dev-python/oslo-concurrency/Manifest
index 942c16c53e8d..8e3b5b6d3697 100644
--- a/dev-python/oslo-concurrency/Manifest
+++ b/dev-python/oslo-concurrency/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.concurrency-4.3.1.tar.gz 54815 BLAKE2B 5926ffb363003e899e08d630e352cc4842b45939a23d8f26db0dbf96432c19cc37f8629d396fe86f5afbfc1b8e9a64a14d3a9d9d53b3ded1300e3f1e6d0151a4 SHA512 fdf89a622bcb999b1a7a77b9c5bdf15baa986e288d2af47485abf5dc4617b84ba53621a6cff72a9764e9c8a4f1504d6b5faa96c13ef29c37f2d63f7a1c3b4d61
-EBUILD oslo-concurrency-4.3.1.ebuild 874 BLAKE2B 4931d267c6bf028d259a27191c3910ec08ce64e7bafc1e9af876bd01cc5a1dd2d05f7f59dd1be757796ba3ecd5fe993f8505efd32fea6bc31e2b032fee4faf28 SHA512 1b55da6dddfc8f2c29903b93617f5378cc6c65f0e1b8298bf2d41ccf571893cc9a5886d2efb0849ea8c540e69dd70bb6fbc2ed262b16544f0a39765a926028bb
+EBUILD oslo-concurrency-4.3.1.ebuild 873 BLAKE2B 868616f7fad1af5c2eaf4bbc85c8353da10e06cf9f55dd6d23adb03f22b652845453f2565646afca14012d4f0d11247b1e0ad5f88ab52d0749c2b70e96b82a91 SHA512 24aa2a90e27e3506655e6f9ecec5f54f37e57a5f82d654fc06b5c56b5362435288d91f4d4ed505d0eff437b2a1fd08bfc0d4f0ae65ee0a699779dbc36d692e72
 MISC metadata.xml 690 BLAKE2B e5fef0056820a341d97501b8af588a987f649910973ae13b83175a34d6d36651fd445e0f0684be834f3efb203642dbb245db822945e181777914a6a64c458019 SHA512 cfbdac8d81aea1c3133de01f7cc624b44c3862bbae75b80c78d0d979cf28fa796be25119434e70b5552d4820b19e64ba1ad22bf7cbc93ea1c9fba88490c385dc
diff --git a/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild b/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild
index 04cfa264f2f4..e7127f3a698d 100644
--- a/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild
+++ b/dev-python/oslo-concurrency/oslo-concurrency-4.3.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.concurrency-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 RESTRICT=""
 
diff --git a/dev-python/oslo-config/Manifest b/dev-python/oslo-config/Manifest
index fe745048d9dd..666fe7d05ea9 100644
--- a/dev-python/oslo-config/Manifest
+++ b/dev-python/oslo-config/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-config-8.3.3.tar.gz 154910 BLAKE2B d9d3d45d3f9bd191e2be9ef277719d723c35d36006836b2803dfa973283432745d6f11c7d764f2cf4a9ce62098cc0b94ba6aecb364869fd8957ffa309d47bb38 SHA512 6071fbcb4f9e641e6914d676bab3f58cd9e763219bcce0f7de16017a4e1d3a16fcf4296a36c232ac14d8c5c4555f4c433fedc1811e505e62decb0400a9cc2a7c
-EBUILD oslo-config-8.3.3.ebuild 986 BLAKE2B 8d32203643e04afdd0a8437ea0e4e93baa8162e7baf1db02b1488d9a855b294fbd9fe6f54e98842e560fb3e9d3fae4d8e2b3e9ec0e28627d35d65cbf89769e44 SHA512 ca88fee4e952a4aa0f5d3ba4991b7762aaf437d2f219b8435fb2bc8cf8d186c101da11194be4aee818ccb5b7a2f4b62e69a11e0edaf82dccef4069206a11aa19
+EBUILD oslo-config-8.3.3.ebuild 985 BLAKE2B e6e7ad1fe165466578d09ce9e9d22e9b30cbfa5fc6add48e0b54ad82b650adabe7668e0458e9899dc9b0692894d1f931d23e31c74d1e9f3cf8ae60ce7b558d36 SHA512 19810a86aa2fc185c184c05326999f1db38b1da94f2db79aecd8f2ef8608dfd7cfce355910885c583d33b3964ae0403c592c046daf188ae10df72bdcb231c060
 MISC metadata.xml 695 BLAKE2B 0212d67590b4a45c15ca718cb088f52ef025b3fdf4327363d8cfafd705d06ae56cfd5ae8ce9b42bea04399398756ebcb7572495e5d470d2999a69a6e1a74369a SHA512 3ded64c073be245f2087840a098deece2ee6f4b84a7e412ee9a4c0cfbc72bbb2622dcba4912fb714dceb6abe025204212fd3c8861f68c7af3e6e8f1ba78520f1
diff --git a/dev-python/oslo-config/oslo-config-8.3.3.ebuild b/dev-python/oslo-config/oslo-config-8.3.3.ebuild
index 062d0ae1537e..46340c240910 100644
--- a/dev-python/oslo-config/oslo-config-8.3.3.ebuild
+++ b/dev-python/oslo-config/oslo-config-8.3.3.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-context/Manifest b/dev-python/oslo-context/Manifest
index 9de4714229d1..ca322ccf67ce 100644
--- a/dev-python/oslo-context/Manifest
+++ b/dev-python/oslo-context/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.context-3.1.1.tar.gz 29335 BLAKE2B 2179e5c273b5e387806fc4a8b1ac2f0641f4cc9f2345cb00e6ef9c2e7c8b69709c0c14dd11254d026283b2be7e032044b6f753a13f062915db9f000ae1873f1a SHA512 a9d16475bac5aa96d086019632f417fa5b496f615b814527e547a43362f1e36ed47c47266032e72194f88716237ccff7a24bf941d66bf36afe09b846a810583b
-EBUILD oslo-context-3.1.1.ebuild 685 BLAKE2B 58eb0eaaa0db63e9f12092170d1f43f85eb417e5b5798e38d7a2bb6a86c2f326123a5be4671bfe0a1e229011562a611cf7e145568a04cdbda0bed8d113ce2ca5 SHA512 9fc3560b34545f326d2c1a67243b9f54787f2b006c69f080992f122727356b8f8ac314c7a1318ec19d210183178fc4c1c4a0f64faf49403a17dbb2c0e3b5d0bd
+EBUILD oslo-context-3.1.1.ebuild 684 BLAKE2B 132f64f38e6f6b1767671bd255f1b0455128d1cc351039a7f67e3b17fdaeefcbffe883b2177a81b5fc81aab3939ac3f5ed84c5d16623205f05e930e5fe76bc7b SHA512 fc81df4a2ef1a2261d38318cf67d1700b33d8173cc18f1a3833d0f1e310bdfd190173565df152627f96bb390018acd0039e8b1ba0e63a4f5ef0d04714befc0b8
 MISC metadata.xml 725 BLAKE2B fb817231aed63e38c9e093cdbfe155521da1c3b7fb3b1d8ea6b7d2b0b1fd4fe8afd647819e1a216f3a591ef8c1f67af78bdfaf0ea75e83cd72617a4dfd679ca9 SHA512 b399412459dbff332edd84c87867cd95bb8cf5dd3b91b15b79f4eecbd577076c4b83fa251f4410a9cf9fa5608287048442786d6f90a0a7d5a3ead11b0a9a4548
diff --git a/dev-python/oslo-context/oslo-context-3.1.1.ebuild b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
index 1c5ffe5112c5..958d79d40512 100644
--- a/dev-python/oslo-context/oslo-context-3.1.1.ebuild
+++ b/dev-python/oslo-context/oslo-context-3.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.context-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-i18n/Manifest b/dev-python/oslo-i18n/Manifest
index ff82c71231d9..4736d2bb10bd 100644
--- a/dev-python/oslo-i18n/Manifest
+++ b/dev-python/oslo-i18n/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-i18n-5.0.1.tar.gz 44636 BLAKE2B 69df723bff7a279ace2a8bb2ea795e6beaa626ffc4bb364c513d16d2ce3cb07f6e9957a98d1b633f95154672d118de6fbb71ef5c1a3a53520f4d1f4b8f72748f SHA512 d55238616dc90f85ff458fc6680b3a3b2493d2a640bf5849c19cd7271e7127b535a301ed3085b5e0131b46a635b5a09423f6cba60f9f1b9b0352a0e7115a8057
-EBUILD oslo-i18n-5.0.1.ebuild 627 BLAKE2B 1d99c3cb485baef522b2da404274645be249cafcc8c69ce1327d4508f9b96cc2eb842dd93d00d00a77f21e48998b4376215fe80b0acde105f10c43e3e7b02eda SHA512 e0a40dee6e819527388e4ed9ce9f2fb1e362d15115cf8d4a6cafd89be1b3a93177b9a2b767fea0aa9bf5c654f0913243a97749c0ace9ea83c196b4281b048fa7
+EBUILD oslo-i18n-5.0.1.ebuild 626 BLAKE2B cad76aa12b12d4c7d8bc1ff3aa3b4a211638a88968811e998cabec466d1e42689f58849622479a8f060957bea23b6a045a9251caad4db6a8a51f580714617faf SHA512 36e8c89876800fed68842bd62799f7196d440c38bcb7a7e1b4c22ab6f684b5de6160a41dd05149c5bd7f934d9dfa216fc43acd29a0dc6faff8cf689b62b2d344
 MISC metadata.xml 504 BLAKE2B 646830c9f625ec395265019b730dad69b5359ec85c56bdbd84b98149f05ab04381cd44f8952bcbe1a939dc0b09c7ee492043d4b0d2ece0b0b04bfc7124f6e675 SHA512 305c7352a138341af2ad61c72928e6b3a0b1f6c86d8aab8aa5636a7404161dce1500a482cdbc4c7c08ff7cbc7f1a518302195f9edd95ae65ba2657f1ff75b169
diff --git a/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild b/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
index 8c8d873ef48f..940d62e22546 100644
--- a/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
+++ b/dev-python/oslo-i18n/oslo-i18n-5.0.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslo-log/Manifest b/dev-python/oslo-log/Manifest
index 04020e96606d..ee9087653ad5 100644
--- a/dev-python/oslo-log/Manifest
+++ b/dev-python/oslo-log/Manifest
@@ -1,3 +1,3 @@
 DIST oslo.log-4.4.0.tar.gz 86108 BLAKE2B b710d110759612dc7c1516a0df7b0ffe5af1ee83f99ff776212e72a52a4249657b4857a8fa99aa06047093ac554b6374ba529bafee75d4589beb538baca5b190 SHA512 6501963e90d40d2e722f338ec7c78fa36f6b5b255d36fc5df7d6160d1f35397ff112b88053603f6b57d9d93539bdb665e3c1b6894f3898988fd8d06b5a356120
-EBUILD oslo-log-4.4.0.ebuild 1041 BLAKE2B 2657702318db4128b3c954ed8094035cff1d2cde962f1b42afdd332e30e0c386db7e67da7567bf8c60b654001e40e26364e2c33a8365e054ca3d86f70dad93e6 SHA512 2204ea526023b9208fa03e4eaa99f9a0ad3726b16f41369da4d299b5420f44ba3d1233a06adefffedf6385f0b73df886e330e28b4427272300f806bd7c1ef5da
+EBUILD oslo-log-4.4.0.ebuild 1040 BLAKE2B f8517155ac90f2aeb7906c04f9d1df6c3210f4c00671f8a5404d30048a0a400693d5d9a8e881af9ba45af60d3394a11d440e9afe42a5c836217b334c86ed6331 SHA512 2996f9a423643aec7207429664ebb55254970fe924e4bebbc7181b0ad5c4cf4be344dfda2438b61c24fca12d115f1aeb8c99a82e9ba21c405096ed34cb7e108b
 MISC metadata.xml 907 BLAKE2B d91afdb5f720175be1bf2f8064d509ee94bc78fda6a428059e62a6e14753a567d6e696912d841a2ac9c68acb07f076212e6ae50aec0da23079f536952311fe5d SHA512 802e195e3bd2b4ae730be1766033dea2d8df58e664c506ed1ffd4c7c426a5a740ca31bcc0557d8b5acf660a1f751c106de17825dfbb71229e84d299647a509b7
diff --git a/dev-python/oslo-log/oslo-log-4.4.0.ebuild b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
index 19b21571e9c6..3c61e7131633 100644
--- a/dev-python/oslo-log/oslo-log-4.4.0.ebuild
+++ b/dev-python/oslo-log/oslo-log-4.4.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oslo.log-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 RDEPEND=">=dev-python/pbr-3.1.1[${PYTHON_USEDEP}]
 	>=dev-python/oslo-config-5.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-serialization/Manifest b/dev-python/oslo-serialization/Manifest
index dc64dc7fe6f3..113e3363179a 100644
--- a/dev-python/oslo-serialization/Manifest
+++ b/dev-python/oslo-serialization/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-serialization-4.0.2.tar.gz 33029 BLAKE2B 8e0d4b71b87f38bc22994d423d7bfe7e7d4d66c6279ec1a8cd33fdb064d56c6aea7de41795c7bdacec3c970eb46a49a3204ade20d8128f44eb94b95d0239ba13 SHA512 30d5a6d0f91c8a4bebeb0389e7d8d6b306efef420dc1dd2141ac27fd43be7526443294082cfbc1a4eb9b0b88dbff5be3b854aa8493595f3d0145e8a938e00131
-EBUILD oslo-serialization-4.0.2.ebuild 899 BLAKE2B f62ff87739420024229f0c57e3b479450392c303cd9006af91d6ccc70463ac390e0edba9ea43f523b05f263ed71e7daaffe6612aa4dbdeb67d8b143ffe403571 SHA512 22c86662d539a0dc1051f6f920793bbd3bd7ab7e791236d5d9c240e7473b0f9234719da550e8b71aa5ee547cd98b50450c488869aa79f6113734f727ee50ca01
+EBUILD oslo-serialization-4.0.2.ebuild 898 BLAKE2B 749aa4d837ec14c7bad5f58fa71f41cd86a0d8d2247cae8e50cdd23dd1b767b92ed65b9e35b6f383e852dac49fadfc77c8e98565c6377018e444a65a45aedf57 SHA512 28922ed5ef9bbd0bcc438ffe813ff5a84695980089b9ca6ee131c7d2bab519897f18afbfbf018b4f7c0f23b1f68d7a7c071106a8e3c2c140dda1f93e0bb7bc35
 MISC metadata.xml 513 BLAKE2B 019650e2c80bf2578f18cafd2479e411976d0e52b3dfcdc6f072e90c2349dd700de96fbfffd6a54729b5d2114f2b10e45760c43a1efbe93f2d903551aa4bbd6a SHA512 701020897031a3a452366bc192ffcfc79bb94c1af69487fd8d2f4c92e7469191d89d9be53994291053835ca06c00b613ad8dc09988938972d2620755cbf67ac3
diff --git a/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild b/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild
index 69c55794b4c1..953286222872 100644
--- a/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild
+++ b/dev-python/oslo-serialization/oslo-serialization-4.0.2.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE=""
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/oslo-utils/Manifest b/dev-python/oslo-utils/Manifest
index 325d636f4e39..18b7b560fb4e 100644
--- a/dev-python/oslo-utils/Manifest
+++ b/dev-python/oslo-utils/Manifest
@@ -1,3 +1,3 @@
 DIST oslo-utils-4.6.0.tar.gz 94148 BLAKE2B 2de92b22b849522a43e81f0fa9bb5e92d2c380c07eca81cd916c536e10ec55869d5933a3a9dcc65b682ac793534094e6b0aaa74b7ac9c74724231dccc0dbae3b SHA512 fe91522c9860a7637af8b8521c297d6467f2af643f026abc97b72fd3032789219d2b3fdc9a6d8beecb0e55e4e7c319e800be295abf9639b52e32da81dae0c9a7
-EBUILD oslo-utils-4.6.0.ebuild 1037 BLAKE2B 78cbf59da8cc7032ab0f34e75e19444e39435e4d12db606b4a96af7ccdb2f6d75572a0627ab2bc9f83fe51ad75fc0d893519b21f7bcab7f4d9eea17f60641faa SHA512 e129a2dbb02f9783d2a324e4603c582086e58687a61bb440878d6e05edc5d9e4e80639b72451e1c74b575c2bc93af0af24b930355d9fed8a5cd42bddfde2ecc0
+EBUILD oslo-utils-4.6.0.ebuild 1036 BLAKE2B 4ca629456cfee6adc2d5b94618549d311e46352a3c775465fc15693ad4fe23c5db26ae3a077251f00fdb5eef04bf777b12ed6a45d06a51c8fdf8cc1edde0bcde SHA512 f224c0e35122a5e8443d6e5ddf80c14b093e2ecb0bfbe527a36d3844484b74b605a081219f194cc1cfc014279da5505bf9bd7c349f4150ad20fb0ebaef0c3bc0
 MISC metadata.xml 505 BLAKE2B 2be3ef3a19dd451b4744efcec650e0764602364ada8bc2e6d266f7ef7c540fc2ad856d014438b4e61a8468677dcc10a395b50ac2393b09bf463324af830533d9 SHA512 9f902ca86002de14fb0d0099c834586ae2159819fd0a0fd198a13eb9a7e0505d8b7b31b4c0aa7d6b4c454ff96f9177c2f4d873f8237c543979d5eb2b6822e97f
diff --git a/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild b/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
index 6a7cc303ce48..d9dc808f52bd 100644
--- a/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
+++ b/dev-python/oslo-utils/oslo-utils-4.6.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 
 CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
 	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index e9becf4544bf..08a59fafafc4 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,3 +1,3 @@
 DIST oslotest-4.4.1.tar.gz 34879 BLAKE2B dd7241793f88f31c9427e07b07c015a0f8fe39f65c59341be0874fd4f9b735d1da3b105213d77bfc8cec3ea0d7587cd770a88c2a4b59902c595e9fefa5dc4730 SHA512 e4d60ab399b4eee02d1798948f62ad3acec0d9a81e6ec3b6a8d3dca7035dec0d79a5164c05e8ca4615b0489f44b6ff0c06e6420bf3d96131d15f3458e751896d
-EBUILD oslotest-4.4.1.ebuild 625 BLAKE2B 65c72d58a57a8bb3083243f65e2efd89c3f38531719b6c381ea9118db43a8b593d85d57a5690cb980136606366e42fafbe59dac38c3bd32defd5dca6d5d5f13a SHA512 e8838681e94c4bf4419afd4f80dd4dc7ade043ea12f13816e06fe9058b7374071867782b0b28c8aba7ba9582299eb592f5e3327a6d14095e66b11df1c21c52a4
+EBUILD oslotest-4.4.1.ebuild 624 BLAKE2B 8dc918bec2ee23911215952b94f76ea8c82bd26f7c95f44dae7b09dc49c179a8066e1306f46a0fb3c536868d0a17b50bb5dcdabdac4cb62c083d177a3b703b2c SHA512 6c66224c5cc3f45364b6233260ada0300155c659445d5b2b68b9129032dd9d2305d8854b655ece5fc48eabf9469f71d9df11c2ff33b87211b54ea5cd5c33ca23
 MISC metadata.xml 876 BLAKE2B cf0d406713d4859baa20404513835b83439c92a99ddad4312ce94769c64fffd4d4ef0dd11c06427c09393b4f151491733efa0fef14e49acc2253f3bd0e9d60f7 SHA512 b38c2229b374a960bb060ddb65efe97b9e6fa6d9cd58c0f6de60702ba8ea736cef1c79d08491bc12c4b1dda633e2c7a6b053744bb28e47e6ad194014d28c6b12
diff --git a/dev-python/oslotest/oslotest-4.4.1.ebuild b/dev-python/oslotest/oslotest-4.4.1.ebuild
index 7757b1705f2c..3526d62822cd 100644
--- a/dev-python/oslotest/oslotest-4.4.1.ebuild
+++ b/dev-python/oslotest/oslotest-4.4.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 x86 ~amd64-linux ~x86-linux"
 
 BDEPEND=">=dev-python/pbr-1.8[${PYTHON_USEDEP}]"
 RDEPEND="
diff --git a/dev-python/pallets-sphinx-themes/Manifest b/dev-python/pallets-sphinx-themes/Manifest
index 487864c293d4..92d5218b87c2 100644
--- a/dev-python/pallets-sphinx-themes/Manifest
+++ b/dev-python/pallets-sphinx-themes/Manifest
@@ -1,3 +1,7 @@
 DIST pallets-sphinx-themes-1.1.2.tar.gz 17054 BLAKE2B 2c106be4a8ba68c6c270035ad6764bf87c65a20ca3515991f6287e3bd6a280d3ad0df121c6bad995fe8964425bee4c6ec4d229eef15489c3ae4e4e98eebe4d22 SHA512 0537f1e24b22612720909f1e19f2893b35622411d72298a407cb19318eaf33a0f7c97ee6f69874a172c135b65c9c16726115c1decd6d7a3d6cbda3e1dbdb50fb
+DIST pallets-sphinx-themes-2.0.0.tar.gz 20242 BLAKE2B d1a75b26deced5fe3adb2a71f06486770fa29ec0e087fcfb59ca19a8c250ca7d780217612bd218a828368a7208e6bbddcfe1c672b078573516adba18b57490e3 SHA512 f75a3498438a04e3213caa7ecb2f91adad896f070b61a8a24623f1613efbc38cb8c2fd27e5e9ae125d5851801b58da9dbc22237cc9c7482b49dd89c2af79c4e9
+DIST pallets-sphinx-themes-2.0.1.tar.gz 20312 BLAKE2B 6fc745ffc5d344cd542f1b299ef5151144a13d1f75923398d42a6882d3c80aca4827123a3bd1f751dd771e882170c76f5bad99ad42d09dec2a9baf474d846365 SHA512 6e16ead8bb489336f8b8fe7e50d1e65acf950ab64c90ba1508ceb07bd598d8ddd5b960d9b31697867ddb7bffa970a08d7d53b778b5eec5e01b7c07babf2d5de6
 EBUILD pallets-sphinx-themes-1.1.2.ebuild 605 BLAKE2B 23c9ba0d559e8d4695387fb0cc78c29505e39ad60b8b9d6200a4c83fe184d2509835de1eb2374b7a6e9442bdbfe2409caf064234aafc78e24da22f1bcf0daedb SHA512 ce03608573586a58b3cc06241affaef388d67702c92a02e17ac7cdfca5a03fe71d0a3c0a9accd34991bdb5b7f3364177da0cc322a4e74b534f6d515df8b4bbcd
+EBUILD pallets-sphinx-themes-2.0.0.ebuild 708 BLAKE2B 06f5c92c1067d7692c4a3c820def5ba81d62129fae73d74387f0b828824869091675bf9275d6dd8a4c211089e00e1c3f7334bcd1d0b5088ed27016712315d452 SHA512 10e52181cceac6d91891c8ec061bbeb9e1e29139f2cdbe988e090972b192b69f296ff034cf90a41c2212b9415159b2fb5fc555296c4988d329cec3d4fd17a5fc
+EBUILD pallets-sphinx-themes-2.0.1.ebuild 708 BLAKE2B 06f5c92c1067d7692c4a3c820def5ba81d62129fae73d74387f0b828824869091675bf9275d6dd8a4c211089e00e1c3f7334bcd1d0b5088ed27016712315d452 SHA512 10e52181cceac6d91891c8ec061bbeb9e1e29139f2cdbe988e090972b192b69f296ff034cf90a41c2212b9415159b2fb5fc555296c4988d329cec3d4fd17a5fc
 MISC metadata.xml 393 BLAKE2B d8c69e0e27a8f43412965ccfc92643aaa7d0fb258a40562d4beb00704b05f6fe17471a4da12040e585dc8264e115e8bf3c88001eb24d6a405a183009c4651506 SHA512 338abb6db5323bc85ac5eaf97ce9e1c7d51449c0e78625f344b3b5d63373a88bbdc6ae7f3291cc5e0f0a5caa36034eb1ef1ef96f1c0ac192b061e94257f1442a
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.0.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.0.ebuild
new file mode 100644
index 000000000000..7dc51e33d765
--- /dev/null
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx themes for Pallets and related projects"
+HOMEPAGE="https://github.com/pallets/pallets-sphinx-themes"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7 pypy3)"
diff --git a/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild
new file mode 100644
index 000000000000..7dc51e33d765
--- /dev/null
+++ b/dev-python/pallets-sphinx-themes/pallets-sphinx-themes-2.0.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Sphinx themes for Pallets and related projects"
+HOMEPAGE="https://github.com/pallets/pallets-sphinx-themes"
+SRC_URI="https://github.com/pallets/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	' python3_7 pypy3)"
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 65d8d1d6cf68..7c9e99e79b46 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,5 +1,5 @@
 DIST pandas-1.2.3.tar.gz 5466356 BLAKE2B f392321915128769814b3a8b7673cd7b00c9c292f4cb8d8b2e8537f7cc513f92cb6b8ff74dffe3b167987e8fa387738264dbebfdf4019f9cd7afd4f78234212a SHA512 3108424253aa143a85ef166091829bbd8c9b6446b516f37252742146d184f722e1fb8af5b4d04937362a298068019a91392e40c818126df6a7459bab7f3077cb
 DIST pandas-1.2.4.tar.gz 5469105 BLAKE2B 7f39e3ca67f5997c0668b0c2e9792869963adcd0347a3983188a992794ad58ccba82105b4dc3315cc17d79104f7fea7a273c218967eb51b1ea1514e87aeebb66 SHA512 79e7a38b8edad52b70eb81ba821141b928c782009d59c50076e7d1e7c015078d333c0c80bda7ba720f4ccb221a0ba93a02885fe6a573567ee37ffae14ee9b2c3
 EBUILD pandas-1.2.3-r1.ebuild 6196 BLAKE2B 3770a8646d55a10945a4845e61c125a1b211415ad73579378cf93835826112620790acf0a146b552c16a35a6f5294440f4ff1c7fa90bb91c131132c75dfea5d2 SHA512 00d90cda83aed40cd09245183fe8bc76b222f8817f0f4c2381ac115e9e68e1147afc6df748bebd8d5ca97574d1445f678c854b976e80aeff5d70d37279c1efff
-EBUILD pandas-1.2.4.ebuild 6198 BLAKE2B 87cc9f91dba3c24462b8bf2e06e67e16ce4808facea7f0eea171a8b54cbbc844563ba644e9b81041282e85e2fea53e1eb885ef57d155d8bd138b747d82245591 SHA512 add13e762742eec440f078c8f7b6ebdc6372f4b0308397b475828983b4f8b0383360ac9f24cf6f9ec7334805e95a01e1c0b5f4246fe3cae07706a9cc29ba787f
+EBUILD pandas-1.2.4.ebuild 6197 BLAKE2B b79d9a3d6ee85f59d8e1166baaf18d22e7ea48153b64e18b95306007123598ee0efc38b8653ce3e607d911261f4ffcbd3d233d8f0660b158a058e6c58463cd69 SHA512 2f9ecc7c9c3d9092edb3b024eb31d1d31e3c3997e34cce041fd0a9fc09858fa4a2a50616b34a46245af959b8e7c4d11ec7b70c404eca900d217de458ba551476
 MISC metadata.xml 917 BLAKE2B 52ce164457db6dcf39fe8cd3482021ca88bb1d8d35f09adbc189e23f31b098229d2d5381ce2df7e68f996f50dd5b41b8ccb851fe877d5a7c468c8e42d1cc457b SHA512 fdfd49c8327288be612fa5f5a7a230a278d0634b090ac8da1dcc63c732db84dbcd7cb37dee74a9996127c4062bc73a5be1a9f911715166ed6af16758a578e333
diff --git a/dev-python/pandas/pandas-1.2.4.ebuild b/dev-python/pandas/pandas-1.2.4.ebuild
index 5ff9e82c2133..e8005c2752e4 100644
--- a/dev-python/pandas/pandas-1.2.4.ebuild
+++ b/dev-python/pandas/pandas-1.2.4.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${P/_/}"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="doc full-support minimal test X"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/parameterized/Manifest b/dev-python/parameterized/Manifest
index b1d2ed329e4a..9442e68a762a 100644
--- a/dev-python/parameterized/Manifest
+++ b/dev-python/parameterized/Manifest
@@ -1,3 +1,3 @@
 DIST parameterized-0.8.1.tar.gz 23936 BLAKE2B 3d36b049071907f66ef17dcae0ef9480210344f2466744b2bee8e964f46e2553411a07b233fab032d1acbc2523dc32890bc5e6e4ffc5b37d1fee3f0db3a70cbb SHA512 ad6e31b2bb27623bf070ee5c30686a5bd6a531bc71602f77ca6aa01a77fc246caaacca121098dcbe13b1a174cdcfafa6545bf6e62f6a5337a647821c02fac64a
-EBUILD parameterized-0.8.1.ebuild 538 BLAKE2B f0004e2e0c36b68094eeea67c9a5b9be8325fa78972371fcd4724f61802e84ab2fc6d9451813080c9f6cda8d30ca7a6a3d42b622559bd728bf099a48bdf41f5e SHA512 d52a341311545c3febe37b6e968ca2bc20e8709b04b4d5c1e1e7170f68aaae97883476eeb0cfd3ca3ca91ac486fbead06c90083a96f68b82a27d0482b754dfd5
+EBUILD parameterized-0.8.1.ebuild 539 BLAKE2B 2daf4bb2ed3b186440db47e49cb9513028e6b889837c48bf194f0714dfd273d910b31009b3995a9333ce3fc83e3a4dc9e12de0b41c56fe47a08e9c36382ef348 SHA512 daa23fcaa7796f98213ed5c46a7db14a0773b9a811f913d49e9ba39342a09da010e759fbf0844d1600a223204d31fd3dfe0d751790f6627b38743a9f6371ef5f
 MISC metadata.xml 317 BLAKE2B b1ce95ec42418491f1b046e126bc795d39ce0d09fd321f1f3f4e43a4c23620e7fe11f53f6801e8961e40c693492d0ad92d590d7ea370ef99baebb6af26fd81a5 SHA512 ba150667e4629927575df71e855e12cff065e061fb28f757f452d306f26afee7436c2bc2491bf73e096ed37d755a5b791050aa8c201b388aeab1254ea54d70bd
diff --git a/dev-python/parameterized/parameterized-0.8.1.ebuild b/dev-python/parameterized/parameterized-0.8.1.ebuild
index 4f8e4aa54d49..e3a3477c416a 100644
--- a/dev-python/parameterized/parameterized-0.8.1.ebuild
+++ b/dev-python/parameterized/parameterized-0.8.1.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/partd/Manifest b/dev-python/partd/Manifest
index cfe5e4bfa710..d8b45bceb8fa 100644
--- a/dev-python/partd/Manifest
+++ b/dev-python/partd/Manifest
@@ -1,5 +1,3 @@
-DIST partd-1.1.0.tar.gz 35497 BLAKE2B fb9461daccd5f3215471b201bd30be1fdd499f929490b1819899c7396d1d541fa46c629c26bcef5567df259ef0de1ec8effc3b7b498dec0235a4c0117a1c6014 SHA512 5e26c4a63fc2f9a290b211c1fce291da6b3354b4d0fdf941d29ddad1252629c94275ac360d33c88d11ff4e36a4f4d6bee42edd867c92eb7ef0d2697472c9a338
 DIST partd-1.2.0.tar.gz 36720 BLAKE2B dccc14704134d1453b92e896080a820b817efc78f86511307d4d1f6e2787f38935edaa8fdfb0ea4f2350ab99f5ad06cef98bb1eba4d4e45b2582a3ada2f5d907 SHA512 dbcf6a73e23aacd6502f0669abcb8e51547f280b1b7b94baa7ab5637cd838f8427ad1c4e39127fb7f8b164f3a83b66611b2c71667d31fe0137619fb6c457fab9
-EBUILD partd-1.1.0.ebuild 723 BLAKE2B 03ea30e316dce3de4941146f4030253f7c2603b8643f9b1cac375a415528ef9e5463363dc86dcf2fdbe66a836f3828a1d35e99017d1c15c2629ebbebc4c0bc9e SHA512 8a3b50b6769fa81ab83adce49e7bc85b89cd17cebb9d99920ccb50fede5f22e253277d1f066e051c06f17f8634eb45bdce25ee942c82b8c0f0cdc3d7e0e78f01
-EBUILD partd-1.2.0.ebuild 725 BLAKE2B f081ee900d0542393025225d2161349eebd3231803db4a9e1cb489a84823d389a5713bf46f058227b3c97e34fd58662b8592ff172cec2fbd5d1944f00f6e7bd4 SHA512 0b0c75603f71369e0c6949a4d78d6e321601463ab8d4b3375d672ab438deec0c37354cc68f201f83f9f9543145f7ed029e5e486df08a0fcef4b0fd207e2326b4
+EBUILD partd-1.2.0.ebuild 723 BLAKE2B c356e8bbc05de1397cd4708afbc66798785aaaa89ab516f5752a75c75b820f57e513558d051689c89c2acac4856240b76ccbaa20e3d17717cd212e99b948b4d5 SHA512 8f0c5636f654630d640467f72c66e74ef1dbd0a89e67730810e849b3390dcaac596d48f7375410dc9fd341e02adf63ed9504ecd44dab619add584a9db97f9bbf
 MISC metadata.xml 693 BLAKE2B eeef98e5858d164721e62fdd97dad746d228423be302597c0cbafc2d4835802f33c10b63744c98fa52a11c1089888781d80555f3b29c993860c0f668c250c0c0 SHA512 eab347512f7b6519d61afb10fa404c311406d7fdd49d4525205da719f48c7688e0fa4dec52e8ea2933a50a4981f407680d8d36b0865827e85c4c1e8b3a5b3b47
diff --git a/dev-python/partd/partd-1.1.0.ebuild b/dev-python/partd/partd-1.1.0.ebuild
deleted file mode 100644
index 9ed81bca7550..000000000000
--- a/dev-python/partd/partd-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Appendable key-value storage"
-HOMEPAGE="https://github.com/dask/partd/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/blosc[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pandas[${PYTHON_USEDEP}]
-		dev-python/pyzmq[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_tests pytest
diff --git a/dev-python/partd/partd-1.2.0.ebuild b/dev-python/partd/partd-1.2.0.ebuild
index 91a5db4fd7ca..f6f2f0a6e2c6 100644
--- a/dev-python/partd/partd-1.2.0.ebuild
+++ b/dev-python/partd/partd-1.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
diff --git a/dev-python/pep8/Manifest b/dev-python/pep8/Manifest
deleted file mode 100644
index 7c922d7d0f75..000000000000
--- a/dev-python/pep8/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pep8-1.7.1.tar.gz 80334 BLAKE2B 71a038c8fbcbd7c94ff713d1eb8fa248106d283fb520f97fe35819b14382eff6e55683b739acd933cfe22001ed262f76a9b6f3f55661938b3b199ec1f4c35745 SHA512 d20d6a6f91bc865580e3d39c50e26f9c6be81fd8e80a1b9a029d7ea9c906748e46080b841dc5507004089e5ee0d0cb3f70a74bb35131c58113ff5571153af4da
-EBUILD pep8-1.7.1.ebuild 854 BLAKE2B a6b91ccb42264bee8a6b1e8d11a9db216a978943fa918104dad0fc1373022bee9567b89ca77ab5f49b9e44ab72f5aefcd4b54c12090ae722d305c28e8cf3e978 SHA512 4a913d0124a057044db8e2edac88c4bd122dbfe2954ea2a0287eb944e966a4dd14e4ce6a9481db76ceb6583277ba5f97d28a662fbbb27249242fb21024f10dff
-MISC metadata.xml 401 BLAKE2B 38a3d82a63a9f903a3d135ab620bfdd4a2e8de7b998bd45ca9ada37d7d08aea6e360fc15a0414e3c11276784c4c60aa557d4cc326f220d7b39bbaa96322e60a9 SHA512 b3cc2915ab81da987a14260c611822ea0ee3b550c60c34e88cacc9e760d1b3965aaa101cef1947c34d269ad8fabb8eb8e29403cd961d99a0e99563433f1cf336
diff --git a/dev-python/pep8/metadata.xml b/dev-python/pep8/metadata.xml
deleted file mode 100644
index 2eb1288b3c1e..000000000000
--- a/dev-python/pep8/metadata.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">pep8</remote-id>
-    <remote-id type="github">PyCQA/pycodestyle</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pep8/pep8-1.7.1.ebuild b/dev-python/pep8/pep8-1.7.1.ebuild
deleted file mode 100644
index c3789694baf1..000000000000
--- a/dev-python/pep8/pep8-1.7.1.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
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7,8} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python style guide checker"
-HOMEPAGE="https://github.com/PyCQA/pycodestyle/ https://pypi.org/project/pep8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-distutils_enable_sphinx docs dev-python/sphinx_rtd_theme
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# AssertionError: 7 is not false : 7 failure(s)
-	sed -i -e 's:test_checkers_testsuite:_&:' \
-		testsuite/test_all.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/phonenumbers/Manifest b/dev-python/phonenumbers/Manifest
index 669a4bafe6a7..f80bb9c832b0 100644
--- a/dev-python/phonenumbers/Manifest
+++ b/dev-python/phonenumbers/Manifest
@@ -1,7 +1,5 @@
-DIST phonenumbers-8.12.20.tar.gz 2257751 BLAKE2B a35423ac7c80a8533e360355d4beed5219ded5619b2da3c2dfd6691b9d270353107a6e43f29591ee86f1eb8eaf058b5c5f307b560e33ef9b25c662f02262aac3 SHA512 79fe102b9619564a2b43797440147da8240b901eea30e199b5e4ebb3555a1b95cdbd5153b5938ef6bea9847f71c62b83a0d258b7c8f477f446385b74450305e3
-DIST phonenumbers-8.12.21.tar.gz 2257983 BLAKE2B 2630cc429b49a1d5a2e5cef63b27dd676463627468dc8f3b5bd880573e347c1339cd498e65eaa22566f80e08d4707dba4b1c74f91e37c3caa3e567e8bf577fee SHA512 dfd18ae071d70a5388d9f76941b56b9728cb383dc99fd25efdc3aa7d36b8b60e18fdf1765ee8cf80724c57d165642376eebd131d4738af9bfa11f1af7e4122fa
 DIST phonenumbers-8.12.22.tar.gz 2258000 BLAKE2B 0aaabf98997a254166267e3f37718e6ed745f0ae55b6b338eabc65067d1115a08f035879bbfd6a2ebaa76f4edbd4c50510119d3eeb4502ce2e53e097dc021c5d SHA512 80fcfda8051b6b77f5f75f39341a8b588ec7cc4620433f415f34feac1eaedcd8c36bd43ab75621386282ce1b77b184bd6407a7dff2c0958ce0507dc96383e47d
-EBUILD phonenumbers-8.12.20.ebuild 433 BLAKE2B ee125018a884d96c9aeac1ae7c3e387393389c5c512437a46e34e8f5a32de1f64e015ddc02f55530c13246cb7dfcf097808c79381b0d8861214ee8579be42f7b SHA512 607f9740cf7c0a5226b14450b9c0c07f6a44ff4add54e70abb278221c4779018e88bdbc4c16bb8f45a1fe712a49b33939ddc9889bc49f3148dacb77518d8b8dd
-EBUILD phonenumbers-8.12.21.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
-EBUILD phonenumbers-8.12.22.ebuild 435 BLAKE2B 49fb4066a42c70f9cb11cdb7e7f3ad6d9442b19be2906e6cfafa87bcacf9e3427daa9f25c5b0ed141e2e274cb590c9404de2f9a385590ec29c3224db4dfd877a SHA512 3c438bbc354dcc588383c3b691e0400cf77e0a70f716c308a55ef52da736cff26edded1ce9275949016e3552d79b62e9add0bc0580ec68328561e1a9647496d7
+DIST phonenumbers-8.12.23.tar.gz 2257693 BLAKE2B 338a3e943e98c768178768c0e352a8c162f88f47d51652c032a5492b869ce1bc047bc42a9194699d36bdb1699a360324d3211cd4670225a7fbeef6f46f2e47a7 SHA512 2ff7f4a9118a2d1dcf32e7dd919b8f91af0240ba7e180fbb4f11a7af197ad1236f65a7ed985c39fd8059dad80e9859284c3b1ece7f1bf699ccbe399971b060a3
+EBUILD phonenumbers-8.12.22.ebuild 433 BLAKE2B ee125018a884d96c9aeac1ae7c3e387393389c5c512437a46e34e8f5a32de1f64e015ddc02f55530c13246cb7dfcf097808c79381b0d8861214ee8579be42f7b SHA512 607f9740cf7c0a5226b14450b9c0c07f6a44ff4add54e70abb278221c4779018e88bdbc4c16bb8f45a1fe712a49b33939ddc9889bc49f3148dacb77518d8b8dd
+EBUILD phonenumbers-8.12.23.ebuild 436 BLAKE2B ae3484cb7def1c6fff1fecd3e19923e9f0200069f9169d1b6593ff9f6461610171ac06f001df26f465bf25b436f31becd5cb44d1d5b22a039ccecb9366b51fa2 SHA512 a868c265b85ace987ebfe3df5b5b6fdd2af69255d95245fbe973dfbc364a16bdddf445eec541f5c27b545ae2082ed719b8076e2d638e63b27967934359f0a54f
 MISC metadata.xml 412 BLAKE2B 3244f00cf537fc9f8129cb4c499963a121ce2b33ea1edf0c1cc3833afbfe22c9afd5442e532b7324ccdb13cbd6a25e64e312715b13fe31ec16cf8d12a4e218f4 SHA512 a527e1c4d9bf2446bb5ef628d22731a2647bd937260f015a7cdb02c42fe3ce8a9c3d6a27660f3ab2521bf0a1400575063682dfc3faed2187edfe3f531e8427ed
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.20.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.20.ebuild
deleted file mode 100644
index e1586dbb97b8..000000000000
--- a/dev-python/phonenumbers/phonenumbers-8.12.20.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-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/phonenumbers/phonenumbers-8.12.22.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.22.ebuild
index 8f5b4d0422ab..e1586dbb97b8 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.22.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DOCS=(README.md)
 
diff --git a/dev-python/phonenumbers/phonenumbers-8.12.21.ebuild b/dev-python/phonenumbers/phonenumbers-8.12.23.ebuild
index 8f5b4d0422ab..728d3a9eaedb 100644
--- a/dev-python/phonenumbers/phonenumbers-8.12.21.ebuild
+++ b/dev-python/phonenumbers/phonenumbers-8.12.23.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/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 82c09bbb20a8..e0ce6488fa9b 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,15 +1,5 @@
-DIST pikepdf-2.10.0.tar.gz 2376794 BLAKE2B c9f85ddec15a7eaef2ed3c43221196d957dc5d8d03aa9931886d52653efa238d6d847862e2610edcfca85cd2ad0746f2f0ae78e70ecd6666cc1a37b4f6644dd2 SHA512 d2a8ecd91ef4ae8c16b5e6fcd7149a1180d6c7c1f16c262566d7d43f82d25a6701676511c8327b265cf0ac2bfc6db29b43c4713e4b51651fdb5f680449a53af0
-DIST pikepdf-2.11.0.tar.gz 2382340 BLAKE2B 60a09d1b7f463720af17be4b3ac70fd575f01f0e4f27b87723fddf18424d97fddc6f11de59bb1a061496f9d847babfcf3446d3bbd7445dea56106879a2ff31a3 SHA512 d55c10799667a142ed651ab36de01011abad0ae95c3dc267871147deb458e0930aba6fd5c3a20487641f2d8fa60d7b15f6ba40cbb2370bc13ef418ce3b300233
-DIST pikepdf-2.11.1.tar.gz 2382829 BLAKE2B 97a3cd65c22de0e7e3ab3099a3f51993367ec7b7fe5353d0cad0f68e309df1a3c0aedf9e391cced16bd3c11e5353dfce464632c1ac890b2cd412b0e1f84e71b7 SHA512 26589155b4380cfd0a97a6eb3c130a1b71535f182f8cac0a19f0ea8b1ff749bb58dad4a5f881d27f404a6b20db9581d3915323ed9739704f8e52e51a1b5ecb16
-DIST pikepdf-2.11.2.tar.gz 2297115 BLAKE2B c1ab1b99d13da7a52eda214d550597871f4d67553490f2c14096e6a620fa8bab6278a34b39e162de1bd0d71f781b79011468e5d045201dc936ec8eef07272657 SHA512 ff86e5c12e029978c0eb8e6bae7c5cd9a1b8e1f8eb07a6e623767ccb14ecc747493aa9eefc48be25464192e97eba5cd49c56983182f237532c4b4817b5732c28
-DIST pikepdf-2.11.3.tar.gz 2298121 BLAKE2B 981c3607302ef5406bff886706b0d192943b367b753e4acbdbb36ea97a6921a24443f0204bc99b982b79260ba32b619e4a5f07b8a5b834be54feb0a6efdb950c SHA512 f9413ebf5bbb0a17c2ffeccc08262e59d47aaba60e68a7b1c2c43276c33fbe8b8363203394c850e21f1cc4883100047b966f7a8fbca6b3d5950bfda6f6918064
 DIST pikepdf-2.11.4.tar.gz 2298520 BLAKE2B 4c657e50259cc126a4537f699c30723eb5d06303b2fabaa53c4ed2862236bcc253ab793d20905f7f2e298649a3ba8c5c8b66deeb4b859b66e18ab50cd512b843 SHA512 292fa0cfdd0a3d43bfc533dd339acc35b93958cdab476a7963274f0e98f2d8ad0c121d7605b53fe9e1a318cab59b24a46343ccf9f25e6de32e6e39d6dfc02ff1
 DIST pikepdf-2.12.0.tar.gz 2300821 BLAKE2B 17f2a316d7139471f1bc1106b52895246ecf4503a0c52cb7ed0b8fd408c9bdc8f4e4539f7381b184be50747edc12ee4ab1d58587c9db1fd4c3384d83a56a3ea0 SHA512 7484da6b6aeb8dc93c7b9eacbf5f5096bf738c2b75e4d3d63b189494acddba3da8c707fe25526ef2fa0be15be03729b347ef971f1ae61e38fe6c55ee72272359
-EBUILD pikepdf-2.10.0.ebuild 1538 BLAKE2B b56471c516e7c203ca3b712d9ebffcee5c322bce8ca2eb6a31baa5238f7999bd4445dfe0149dabb6e6b259878b2afdbecf46e0bd60c95da63be2f8d5a251e8a6 SHA512 f1e661917c48506ccf19eb50c3ff7ff9c2ebfc2ab6e731a8ac9c81dc22b92c253bafc037d69d8a8e9372712699a3004734278a0fd78c709502ff2066bebddbd0
-EBUILD pikepdf-2.11.0.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
-EBUILD pikepdf-2.11.1.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
-EBUILD pikepdf-2.11.2.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
-EBUILD pikepdf-2.11.3.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
-EBUILD pikepdf-2.11.4.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
+EBUILD pikepdf-2.11.4.ebuild 1538 BLAKE2B b56471c516e7c203ca3b712d9ebffcee5c322bce8ca2eb6a31baa5238f7999bd4445dfe0149dabb6e6b259878b2afdbecf46e0bd60c95da63be2f8d5a251e8a6 SHA512 f1e661917c48506ccf19eb50c3ff7ff9c2ebfc2ab6e731a8ac9c81dc22b92c253bafc037d69d8a8e9372712699a3004734278a0fd78c709502ff2066bebddbd0
 EBUILD pikepdf-2.12.0.ebuild 1539 BLAKE2B 841c0a3650d5cc0f09cc3c076fbb5050d2c2e34c636c0ab8afc0ddce709dc46d7a2feb723026ab6c3f2bae636b3c6d10f7127de6d840efe1c10577dc941fd9c0 SHA512 a4ac1019887e723a6562a0f0e2d97f6c7049f469409be3abcf08ad8b9d72b5b99b254b7d319b58df88f86c7a6f0ec6b03f7ccc6de3b3573c860a6b022200fe82
 MISC metadata.xml 686 BLAKE2B 1f1d046dfc50cdcd7a3fe3f7b0c059cda23dc88173e5024a9c267dab6e061693d29bd41de17b26a957e674daeb0330d0040fb354f0ff2632f29bfd7cfacf1a9f SHA512 55fc4fdc78fd0f9c9edbb7a6dc62a946086c98cd4a0779e4ff73c462e14634db0f3b67ba79aa7758831a365cdacc7e931be66d16680c8055895468e08f285bbe
diff --git a/dev-python/pikepdf/pikepdf-2.10.0.ebuild b/dev-python/pikepdf/pikepdf-2.10.0.ebuild
deleted file mode 100644
index 65a4241e0eb6..000000000000
--- a/dev-python/pikepdf/pikepdf-2.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-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/pikepdf/pikepdf-2.11.0.ebuild b/dev-python/pikepdf/pikepdf-2.11.0.ebuild
deleted file mode 100644
index 2a76869d388e..000000000000
--- a/dev-python/pikepdf/pikepdf-2.11.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-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/pikepdf/pikepdf-2.11.1.ebuild b/dev-python/pikepdf/pikepdf-2.11.1.ebuild
deleted file mode 100644
index 2a76869d388e..000000000000
--- a/dev-python/pikepdf/pikepdf-2.11.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-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/pikepdf/pikepdf-2.11.2.ebuild b/dev-python/pikepdf/pikepdf-2.11.2.ebuild
deleted file mode 100644
index 2a76869d388e..000000000000
--- a/dev-python/pikepdf/pikepdf-2.11.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-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/pikepdf/pikepdf-2.11.3.ebuild b/dev-python/pikepdf/pikepdf-2.11.3.ebuild
deleted file mode 100644
index 2a76869d388e..000000000000
--- a/dev-python/pikepdf/pikepdf-2.11.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..9} )
-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/pikepdf/pikepdf-2.11.4.ebuild b/dev-python/pikepdf/pikepdf-2.11.4.ebuild
index 2a76869d388e..65a4241e0eb6 100644
--- a/dev-python/pikepdf/pikepdf-2.11.4.ebuild
+++ b/dev-python/pikepdf/pikepdf-2.11.4.ebuild
@@ -15,7 +15,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="app-text/qpdf:0="
 RDEPEND="${DEPEND}
diff --git a/dev-python/pluginbase/Manifest b/dev-python/pluginbase/Manifest
index 83facb440a13..af70d637857c 100644
--- a/dev-python/pluginbase/Manifest
+++ b/dev-python/pluginbase/Manifest
@@ -1,3 +1,5 @@
 DIST pluginbase-1.0.0.tar.gz 41795 BLAKE2B 68d7704b52db39af4f0c2e1f790802eb5f2fd15d91726752605901b3e8a3c736204fad93d96b5dd1a4199586b4d9b42895cbe8290acaed1b4051e8103efb43f9 SHA512 95c3b770980fa5ec745b8d788df29c6219ed6e5af7666f9830d56c6acae01f90831655127bcef69b2dfc423d09429373ae7d4c8b45c76c62a41f909d0747c0a0
+DIST pluginbase-1.0.1.tar.gz 43588 BLAKE2B 8d72dc0afcf4e4e65670902bd3f28a1a36de7f7cc11fd56c624f871ced39e8b989bc6ac74d64e4f96b3bf32f0f4e187ae8b517f9a09cac94b7a735ffb08ec55b SHA512 20844fb78daf3e03a7a8013f82a059bf6b0723a184e89061ce5cb674b5a978900623f2eceed56fc9f9a34410e7e6ca8d41a5ac0a21e374b1b3ce32d4e522348e
 EBUILD pluginbase-1.0.0.ebuild 929 BLAKE2B e9485562e1881d15451b232d8c1e3c0b4e6c970b383b3f4b241f22aad82c439b257c510e9b2c575e84ad4d9c8f3bfc82339b7edc858066acaccf7be8c6be802e SHA512 d262af48713becb588d11213eed438f892ff9645a105ed63ff05e6e240841611c5d46b40709b0a27aef5302b4d3e694a875abff9ff5db1398ba64a76d6682b2b
+EBUILD pluginbase-1.0.1.ebuild 504 BLAKE2B 59abd779cae7dd3498ac47f4eca4c13943b8a7f5c7785ee729913761e53f480fb6f30ee17f732214bf89c1ed4b75e147253cdb1c110c0afc599f80b9d3c5fba2 SHA512 9cf3bbde8019c9e8e47ce3178547a8659f4fa3a22e34b9a0582610903360199cd7290c80474598f774c2fe5574b6abf779e87b0f9f5dccb5a4c256c61043e316
 MISC metadata.xml 373 BLAKE2B f6aba121e38caebe2406cceb3ceb2ffe92107c8c4a540f29a9befc70d0651b3bbd6c9e16d4f56c4462e105ad7e8a525c199bab32842b2507e351e9c10030ddb6 SHA512 077cce7d989c18f2a61a634801783f106f2c3839762da37e7835debdad5093cdda3f40934cd99d3c0e0759c4e856c450c9a8e229336de2d08c82a5204ffaf437
diff --git a/dev-python/pluginbase/pluginbase-1.0.1.ebuild b/dev-python/pluginbase/pluginbase-1.0.1.ebuild
new file mode 100644
index 000000000000..b0a0602f7938
--- /dev/null
+++ b/dev-python/pluginbase/pluginbase-1.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Support library for building plugins sytems in Python"
+HOMEPAGE="https://github.com/mitsuhiko/pluginbase"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
+
+src_test() {
+	cd tests || die
+	distutils-r1_src_test
+}
diff --git a/dev-python/protobuf-python/Manifest b/dev-python/protobuf-python/Manifest
index f6045ffca6e7..ed3994492b1f 100644
--- a/dev-python/protobuf-python/Manifest
+++ b/dev-python/protobuf-python/Manifest
@@ -11,7 +11,7 @@ DIST protobuf-3.15.6.tar.gz 5284018 BLAKE2B 5895f618e233edd5744253821036857aa23f
 DIST protobuf-3.15.7.tar.gz 5284817 BLAKE2B 43821bb283a0c1f87930593046a5c55f6efae3f644337289fd438c0612a9b7ef9531b61e48940b74dc5d20253ee1b6a805b902284a442dec2efe8c79f82c5aad SHA512 2b18ccba1ff8a0623c52abed0e0674bc6cfa2cd10d49764031a47e68f654f54083f4a4f9e3a94d833a6808426904ee642f173641063e79cb41a61fc348d603ac
 DIST protobuf-3.15.8.tar.gz 5285277 BLAKE2B 798fc011ac03cdc2406acf5845c667d8482082044bdace06c2c1d02b5b1b69c1b1f30e29774180dc1801a1d21d62e2ce50325105859564a1e36d3fe478e64d8b SHA512 56fc6df2dae14eee0fb67dd4204fc1ec54a18d994a69c9e42c7888d0cd50d269d1c5e1445d74f0fa705850d4ac86a22d86781e09769a716e5c6f829b15b05592
 EBUILD protobuf-python-3.13.0-r1.ebuild 1821 BLAKE2B 1ad689be6b15a3d334ba98a71187059fc77137c9be4357200919185887a9a111d1d8e2772afc0a552c52f4f3f5b3d01e6de0dc8606b33bf41379eaf54a618529 SHA512 ae7027d8366dd82b52e17ccc7f7ec5b5286ab143f2ce172792bcb32ec3f2792f49d62f91fe8b3b271207d891872d35518c08632eca26e18d4c50fc37e69690d9
-EBUILD protobuf-python-3.14.0.ebuild 1619 BLAKE2B 91ee87adfa6a1657ba8e7e64d80164a5a5f416176787863dfdfaf61cb8af3f92954e04fa6391044bbb702a0424f7df7719dfc4792854b520497cdf26c8d5db2d SHA512 d9b195e991f692ce9b7cb7dd470443fda6a38d7a63fb16761def0330b4e4f6b3f991954a3ecd5d9d9686f5cca0672712de5d7b2dcaaaad85a984ec38d4892e11
+EBUILD protobuf-python-3.14.0.ebuild 1618 BLAKE2B c1e05c2fc9abaf0b1b65716cc5f9e5f6f6c4295094dd3564147f32a56c01927611c3c4e8a1ec07e234950a41aa92f9dd570dd18e89ed03245584e7f11a3276a7 SHA512 2c103938eab1f3c56df13f0b52056c029b88d310e41fe2a48b1857e8a6029261dd269af628bc6ae137bfb9550768e4ac84e47fe87a436efc67c1b0f9f46e64a6
 EBUILD protobuf-python-3.15.0.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
 EBUILD protobuf-python-3.15.1.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
 EBUILD protobuf-python-3.15.2.ebuild 1624 BLAKE2B 8602934650f68e93cb0b42aee20ff0b013645b8dea8508616d58233022bdf95b501f4a07f6acb651c6e95811c2b7955d97253e25b322d8168adf6886e46f1df5 SHA512 390f018d0226dc3b94db7630ffd2332f1d114cbb4c6daf2ccc03e2734fb9a5f53c8fb4fa5d78b707e27a4ed1a2569d1e43f8f7a5a7b3aad234b4b85ad72638e1
diff --git a/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
index 3189391f1f30..b2ac1bf9e133 100644
--- a/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
+++ b/dev-python/protobuf-python/protobuf-python-3.14.0.ebuild
@@ -24,7 +24,7 @@ fi
 
 LICENSE="BSD"
 SLOT="0/25"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/dev-python/pulsectl/Manifest b/dev-python/pulsectl/Manifest
new file mode 100644
index 000000000000..e6f8f6a42e27
--- /dev/null
+++ b/dev-python/pulsectl/Manifest
@@ -0,0 +1,5 @@
+DIST pulsectl-21.5.14.tar.gz 41357 BLAKE2B e88953b07b49de2e33762bb85e4bcb2a4e5555970127e6395e3374094dc1c87627f2bd4779ac9fb79c5ccc531c23ea76ead4dca7317313881ed495aeae9b17ee SHA512 b9a9ffa33c31281c6d0dc3084cbdc342b2d45cac713a1d928e106162fa412d80718c8f6443369b67b6c6af9d6b2dc6dbfb85d137ae693ab916ac08e19f048ba1
+DIST pulsectl-21.5.17.tar.gz 41487 BLAKE2B d4e547a140a9843107bac70a0a98ab230018b6457875b395528c3c1c1e7f20df4c4e6db569334c98f62be549930ab8e8f07927a54396554f1aaabc9a6eb46d7a SHA512 fdfceea8833955880326c04c536e6b2d63a260a851b98d7a76bb3637f30f414c2b2f4bd50c493f86edde76983e0a0f83c39839fa39646d8f1f2a4e93229d42fe
+EBUILD pulsectl-21.5.14.ebuild 493 BLAKE2B a984073010318e8f72422fa6b20ebc11471b8a8deb0069357f94af4516ddb8afd30066b52ce457f4a69d6939ba57893ac847b0a4448c9c1ddf0843715f111bc5 SHA512 ddec663104131c9ac1eb143d130c801908af5721cb0de38a3e12026c318d792e149a5a9caf84f9e3a339dee6307fc2c4ee6dee7ad24040f224ef98005860ceea
+EBUILD pulsectl-21.5.17.ebuild 493 BLAKE2B a984073010318e8f72422fa6b20ebc11471b8a8deb0069357f94af4516ddb8afd30066b52ce457f4a69d6939ba57893ac847b0a4448c9c1ddf0843715f111bc5 SHA512 ddec663104131c9ac1eb143d130c801908af5721cb0de38a3e12026c318d792e149a5a9caf84f9e3a339dee6307fc2c4ee6dee7ad24040f224ef98005860ceea
+MISC metadata.xml 557 BLAKE2B caeac803705c90d7fed8f0bf8274b97ca08089af065d9b797f0041489c80d0f0f54e5ffd6b47d868cae6e25c2f5d68030cb06e8ab5ac7678687f3adeedffb20b SHA512 24ffaf4e6034d38f7acc00834fe040358b6460be27e91a07e70f918d01b2e3880238a92cf0c31a3af69ef81d27667ab1c89751a91d4e6bf5adfe05dec6527d04
diff --git a/dev-python/pulsectl/metadata.xml b/dev-python/pulsectl/metadata.xml
new file mode 100644
index 000000000000..a57991ea8758
--- /dev/null
+++ b/dev-python/pulsectl/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>sbraz@gentoo.org</email>
+		<name>Louis Sautier</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="pypi">pulsectl</remote-id>
+		<remote-id type="github">mk-fg/python-pulse-control</remote-id>
+		<bugs-to>https://github.com/mk-fg/python-pulse-control/issues</bugs-to>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/pyotp/pyotp-2.5.1.ebuild b/dev-python/pulsectl/pulsectl-21.5.14.ebuild
index cf8967a7eb75..faa621fb11f8 100644
--- a/dev-python/pyotp/pyotp-2.5.1.ebuild
+++ b/dev-python/pulsectl/pulsectl-21.5.14.ebuild
@@ -3,16 +3,18 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
 
 inherit distutils-r1
 
-DESCRIPTION="PyOTP is a Python library for generating and verifying one-time passwords."
-HOMEPAGE="https://github.com/pyauth/pyotp https://pypi.org/project/pyotp/"
+DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
+HOMEPAGE="https://github.com/mk-fg/python-pulse-control"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
+RDEPEND="media-sound/pulseaudio"
+
 distutils_enable_tests unittest
diff --git a/dev-python/pulsectl/pulsectl-21.5.17.ebuild b/dev-python/pulsectl/pulsectl-21.5.17.ebuild
new file mode 100644
index 000000000000..faa621fb11f8
--- /dev/null
+++ b/dev-python/pulsectl/pulsectl-21.5.17.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python high-level interface and ctypes-based bindings for PulseAudio (libpulse)"
+HOMEPAGE="https://github.com/mk-fg/python-pulse-control"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="media-sound/pulseaudio"
+
+distutils_enable_tests unittest
diff --git a/dev-python/pweave/Manifest b/dev-python/pweave/Manifest
index 99bef449a643..4bf1afa9fa22 100644
--- a/dev-python/pweave/Manifest
+++ b/dev-python/pweave/Manifest
@@ -2,4 +2,4 @@ AUX pweave-0.30.3-docs.patch 384 BLAKE2B f965c866a87e4ba7084767e73113d119ca6c1c7
 AUX pweave-0.30.3-rm-online-tests.patch 3991 BLAKE2B ea2462239edd8cf029a308a0fb3d3464a3932d6f714e7d6501730e62deb6b417482c5dc67a023c467d3efc1456674f0d31fa96f585ba9d81943e4c9dcf0aa875 SHA512 74f496bd263d87b9f63293be843eac78c40c6f66de5b493afe8aca893441e43bf02b157130b8252f893a928c8a03ac6b7594ae2876b4af1c1a2745e0aaf8d3ba
 DIST pweave-0.30.3.tar.gz 2173323 BLAKE2B 13aaa70d424026e58648ee949d8046d1f9fdf6e402df018b120dbb235c7b7a29846cb341aba1642c97be5a8ebafeea33a71be177f92498db186e8044624eebb8 SHA512 d2ffc2a6921837eff471041cc13789ac370d9e00c8a66f451ae53859c110c838e360b4bfd820aa33656fdf509cda8dc24a1d2c1bfcb44ae99de751726c33b3ae
 EBUILD pweave-0.30.3-r1.ebuild 1371 BLAKE2B 1f77826512802801e4f18786f7a140ccda82cac14c0644798602d3964c1d47067338d4cfed9d2b54e1771517f78868e780fb3060d5788cc6453a28ac9e9ed978 SHA512 79973c9b0e624f3cd60da235de74c6966c665788f10f46e19a5e8f50204357dbe28dcc060cd9251fe9ecf86fd6e819a0c193b0c90c87b102a7a35a29271e94b3
-MISC metadata.xml 474 BLAKE2B 2f34e832ddc9bbd21483aac27c4e9dd90b56c91b5f8074838eed78f215eea21b097c945514cc4012e16077c1ff7a9ab29ae9bd1d9d17998067239fe57c16c1cf SHA512 d6f59c259eebda10accb40b9606b1436d2064c03e74713468697d3f6d5479c60f55b659c1309cc1f534352e7d954d73b952397f6788de61a4cc83283e6b54483
+MISC metadata.xml 327 BLAKE2B 57907eeb81c512106130a35d3b2de35ed4054e7434a48c1fc63adc4c70f4c110834a453f06a13f760187fe99e28a5a45f1309295a461c80280a529f7cfd6ac72 SHA512 0e2877f277155affd47aa4144fffea29949fe238269f4794837e7179c0854c6a9dd14d256bd84e0130b23fd0ec3667b87ad26352035037c28046c1eaefc0cb3c
diff --git a/dev-python/pweave/metadata.xml b/dev-python/pweave/metadata.xml
index 3bea03a73f76..86940343905b 100644
--- a/dev-python/pweave/metadata.xml
+++ b/dev-python/pweave/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">Pweave</remote-id>
 	</upstream>
diff --git a/dev-python/pyFFTW/Manifest b/dev-python/pyFFTW/Manifest
index 6085b85233f9..0edb5260ed21 100644
--- a/dev-python/pyFFTW/Manifest
+++ b/dev-python/pyFFTW/Manifest
@@ -1,4 +1,4 @@
 DIST pyFFTW-0.12.0.tar.gz 147372 BLAKE2B 1ea1f1f8de6759c42781a535b30d7119c0cb02dffea3abfe4130a97c465e000aa9b3064a219718569552304513a77ac51aa309f1be29f9eecae25c63cce70c6c SHA512 e4d7258d5c053b5367d8c4f1892eba8e595f9d540c1c3e6caf61e0c113d598ba872b5e72a21edace66be70d9ad75c599e4b1fbc692e0015c3c1ae35e9a7ba599
-EBUILD pyFFTW-0.12.0.ebuild 641 BLAKE2B ccfaf6daa16f840ce89bcf9764cebcb012d5f30cfa88041341c0bbeea96b463166ebd4585b8fd5fcaf00bb4ae6c6e6640de6d3454f81c23fa631fb433a2a1662 SHA512 f7f63d1361120f313fec0daf7302777d5772feae12fba4501b52a6fc0d06a5f7010d02536c74f525e968c7ef2c8f2d1d9b01b9a3d7790017cea9f8d80260d208
-EBUILD pyFFTW-9999.ebuild 641 BLAKE2B ccfaf6daa16f840ce89bcf9764cebcb012d5f30cfa88041341c0bbeea96b463166ebd4585b8fd5fcaf00bb4ae6c6e6640de6d3454f81c23fa631fb433a2a1662 SHA512 f7f63d1361120f313fec0daf7302777d5772feae12fba4501b52a6fc0d06a5f7010d02536c74f525e968c7ef2c8f2d1d9b01b9a3d7790017cea9f8d80260d208
+EBUILD pyFFTW-0.12.0-r1.ebuild 690 BLAKE2B e2d9ede8c238fd5b2a80179471c84e544dadfa6c66b8c9757a9ec4d6b71874c88ebc39ffe964821ecd939ccecbb30c17015e9ed175b5c322a1efa038fb8f97f9 SHA512 63a4e34b8f54643e136b45b71c7090c15aa34e4b32811ca49833432d8ba9c5afb7c06860f77cca9eb5386e6cf6adffeb2a143c2a8e13f5a48732f3dbc7434659
+EBUILD pyFFTW-9999.ebuild 690 BLAKE2B 3fbbfd46920dc70b29269224165a837b1a226c69ab140d183deff1e228c7e159a0ab9e547cb97bf324b0eac4333d8b1e571f97ebea49e047dd750518548f31e0 SHA512 2c569906af5320961bf7cb125ebfbd9830d12090a1255d25336116e7d08ec5b4a4139ab791c09940e04cd19f2eb1e94044e5fd965cbfe351d626a9d2fd0ce1d6
 MISC metadata.xml 468 BLAKE2B e194260c6ef62152730eaba4b41cdb62313327a29397ceb80bb5d01e2e10b90111368becb2d13098ce91d06322c651891882a6e423401e1e5c49d509d26cb0ea SHA512 f21d715e91adee75fbd7d1eb25c10b7149bbb04bd41dadc01292afd80dce349367335e47a294b49033e54f8d26ce91c9dfe5f9fd58a738dacf6ddcc16091ca68
diff --git a/dev-python/pyFFTW/pyFFTW-0.12.0.ebuild b/dev-python/pyFFTW/pyFFTW-0.12.0-r1.ebuild
index af2331671882..80870ef7a971 100644
--- a/dev-python/pyFFTW/pyFFTW-0.12.0.ebuild
+++ b/dev-python/pyFFTW/pyFFTW-0.12.0-r1.ebuild
@@ -22,6 +22,8 @@ fi
 IUSE=""
 
 DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-		>=sci-libs/fftw-3.3:3.0="
-RDEPEND="${DEPEND}"
+		>=sci-libs/fftw-3.3:3.0=[threads]"
+RDEPEND="${PYTHON_DEPS}
+	${DEPEND}"
+BDEPEND="${PYTHON_DEPS}
+	dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyFFTW/pyFFTW-9999.ebuild b/dev-python/pyFFTW/pyFFTW-9999.ebuild
index af2331671882..c667ef6827f0 100644
--- a/dev-python/pyFFTW/pyFFTW-9999.ebuild
+++ b/dev-python/pyFFTW/pyFFTW-9999.ebuild
@@ -22,6 +22,8 @@ fi
 IUSE=""
 
 DEPEND="dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/cython[${PYTHON_USEDEP}]
-		>=sci-libs/fftw-3.3:3.0="
-RDEPEND="${DEPEND}"
+		>=sci-libs/fftw-3.3:3.0=[threads]"
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}"
+BDEPEND="${PYTHON_DEPS}
+	dev-python/cython[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyacoustid/Manifest b/dev-python/pyacoustid/Manifest
index 738a240648a8..e6b3d80078cd 100644
--- a/dev-python/pyacoustid/Manifest
+++ b/dev-python/pyacoustid/Manifest
@@ -1,3 +1,3 @@
 DIST pyacoustid-1.2.0.tar.gz 15770 BLAKE2B 9a5d62a8b8450393aec103d3755ed9e1fa999b6d4b25d1180d12e96020bb8bcf44b32f7de2e7de2ab0902ca9e65b352bc09edca173ce738019f4ca3330489875 SHA512 45827841df97b0f3a5d090edb076456fb822dfb35f3efbe55cc2877801b6c706f22a38f216d4ce7e4217d7da650e2116cfd987ea87000c828b06221fb8b06312
-EBUILD pyacoustid-1.2.0.ebuild 692 BLAKE2B aded1d5c2729a9a08abfa266943aa768070f4b2ced5461c1afe6fea633eed8c0c5335de04be1cb159902303c53c061403250a737116aac9399bbfc02ffedd415 SHA512 e016e1212819d5718bdd7c0ad8dfdc89f39cdb4ac298b240a1142d4be184071b848df6b88a79ac85ffdd397d0ef4fd8c4aecad7c07432ac6534f6c52704aa609
+EBUILD pyacoustid-1.2.0.ebuild 693 BLAKE2B cde0fb7d648f3616525b072a99109ebf5a055ef6d73c65a9eeb87139b13169700d7c4bc8301dafefc40c57941dcdd75bd80da0f7532b0402e04d3c46fcaa0391 SHA512 32f69fe18b0d7daf746770278b7f2132195968d55a1750ffdbb00b2f2786d4f191ff1e24880d098b48b28c8612ef3b7353b31556bb195ab8f012c7538f59cd8a
 MISC metadata.xml 941 BLAKE2B e2c0f2ba00e81b39ca18239af61369b3bc9ab8c9443ce0f38b0fedd944ce66970e08228596aeab5be7b7cb65040255bdb8a3e5fda27d58b13b5ae41e6de4e4d3 SHA512 56cd3cd86aa7685345ccb2618b98195fe4d890a8a91c4ebef2c9655c2941a5e49199f4600858a42101b555180a38bf62006278fe16e4d69d0a6df3e94b824f5d
diff --git a/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild b/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
index 720eb05f8b67..7b23ee07bc58 100644
--- a/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
+++ b/dev-python/pyacoustid/pyacoustid-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pybind11/Manifest b/dev-python/pybind11/Manifest
index d55a0ef8ac17..6cc13076be87 100644
--- a/dev-python/pybind11/Manifest
+++ b/dev-python/pybind11/Manifest
@@ -1,5 +1,5 @@
 DIST pybind11-2.6.1.tar.gz 634179 BLAKE2B 33f057e88e45985a0475783b8931ec669a16efcad5d66ecb265744155e9941b2d618391a36bff1d8c1c2d74a7e0b41de50b26eae689215d4585542fbd4282cc1 SHA512 8730efec82eef8dc09a58ca3e3b28fca45880cef85d32aa5524a8fe64e23d5f6dff4ca1b48b3034a287199bd56f4db4d6806c5358bef66fde84ed0fbf80ec264
 DIST pybind11-2.6.2.tar.gz 647954 BLAKE2B e336d626d314538123a121d48998b15d9d16b80a6a513e85b4ef2b3179f73732ef23b85ab91d815f15c31f7e2c5091192e90b9ff8e727725882963a895367612 SHA512 1eb346ff6b8f827053265340925e2c8038b1e2a89c352fc09f15ebe86128e7ba1f48c4368b193941f034b30bee7f72a94343e05d4841fdbbd0e4d91ed3d32025
 EBUILD pybind11-2.6.1.ebuild 1161 BLAKE2B 7659fbed755e30d43df45a866c38f04aebfb31522b2af3985977eba7a60789fbae631d404165610aa1968f0c276cbfab41e56a158ffdc32a7c47bc360bda2bab SHA512 1484031b362330e62f4f7e7d65ebcc2bc4473aaff5fff1c7e9ebbf67d914982074490295e640625a9cbd198e97334ec6814e5b52977af04285861f94fd41a461
-EBUILD pybind11-2.6.2.ebuild 1075 BLAKE2B 03727907697c2f42498344b2c026a15b4f8c551490cadfa7b5d7c8409efc7351e45f6ca6d5a4b434527ea0faffa775646e0eb545d75a933b24e0ea6ef841196a SHA512 c9fe7974ada7fa9b9af38b8fb542c660d2dfddc965488e101a4686be9b8639d09e3658ef919298731983426890347466269c5bae9540eda842e628732e947a12
+EBUILD pybind11-2.6.2.ebuild 1076 BLAKE2B 5a8b090e732be719cbc9ca63ba6fe025a7feea4e60fb1bfd3ad9466aeb55b422dfa70062657c235c59e702087c4f14a5bd53cc8680ef9b8c83655157f53b53ef SHA512 0029900327a599b4e57467aa842cfff58d59d1477dcf14171caf6bbe9fdad82d8c5e16639f1e63612ecd88b2e6eee1fb8fec6fcc4b876a061ea9c63c8da35fb7
 MISC metadata.xml 419 BLAKE2B 4b76037af5a23b231241e9d53f12dd3866cb07811888d1de3e022d3ea812a83a17856107b257f608343aafe763975cfa621061e225c7ecdcc175f3bb0b8a51a8 SHA512 b17fc1d7231812f22077e7feb0400a3c1e9b66f29c125457b5cf568694ef35332d83fdf405d6c849df55e1f0e517a8c25ecd6f24d1d67ca6654cae8522bb10a2
diff --git a/dev-python/pybind11/pybind11-2.6.2.ebuild b/dev-python/pybind11/pybind11-2.6.2.ebuild
index 93aafcc7a3f4..553c637d08d4 100644
--- a/dev-python/pybind11/pybind11-2.6.2.ebuild
+++ b/dev-python/pybind11/pybind11-2.6.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit cmake distutils-r1
 
diff --git a/dev-python/pybtex-docutils/Manifest b/dev-python/pybtex-docutils/Manifest
index 5f6deb052f6f..8aedff29ed56 100644
--- a/dev-python/pybtex-docutils/Manifest
+++ b/dev-python/pybtex-docutils/Manifest
@@ -2,4 +2,4 @@ DIST pybtex-docutils-0.2.2.tar.gz 12556 BLAKE2B fac2d669d7e71fdfae75dceae847693f
 DIST pybtex-docutils-1.0.0.tar.gz 13627 BLAKE2B 5a18c29fb64f9b19deb4699017de17b1d4a112e0739d84066c4eb0df9d51005fe3b0132a7d1e46e3dad5b9b8e41340cf1a4da094ab20dd140cc83a3a53d82ca8 SHA512 d0054c5ed27a8c57b85963c5f3443d53fe8edab8ce2cf924eeac73240d662a6ac3cf74b2e38601d708809ddbf0984b3c7f24f177c67f77039bc236360474fa38
 EBUILD pybtex-docutils-0.2.2.ebuild 550 BLAKE2B c2e4f7f9c86187f3b7cef9958b42520f581069ecebf66fb8eea66eb91862bd74db981e123be82c9d4212a42c26b2a48587e5e6fd4caf64b195084d8c6fd2c5e0 SHA512 b82b33269520d226dac81bd17693dedb4fc407cd67bca1d238209262e1e454031f880a18e4d68c94f0d014761379a1f91439063300ee3cd1dce3d9febe7c1e16
 EBUILD pybtex-docutils-1.0.0.ebuild 519 BLAKE2B cbbae5e244ac1fa35e72793e417ea929844bc1871e8e8070c1e38f38188d329f953de8e62e24269811d2fcf20ca54eeefd5588dc8e2ce941516406dad5eaf604 SHA512 cf105c7c72a509e9adea923063775492e3371c59a640cacb8ba557befe4bcb541b64682b219981083ccb0c87085164aa16119f320d80479743ef2b9cedd4e5ab
-MISC metadata.xml 550 BLAKE2B ccf2aa474b5271ed751945ff17b446f6f2de7b9beda22e8a7e79441bcef2955f93e9ecec15f9be196bb041cb75476464805e696dade44269ccdce2089f26a135 SHA512 ad156d81b65fe70ff053b2bd78b00afb7338cfcfdf0b31191c852a1fd1cec2c53ab4db4d375b433d2b041c4b7a73de351c3d4c5d1905ebc7c3fc19eee576ddb4
+MISC metadata.xml 403 BLAKE2B 9712355309a42e37afab144f87bc83e52a2ece3dc4e0118d1306d20c97e1c13e3ea8d0b8829616abe8e990ceb66640bed2413f3d7a9b344cb2047d8ebddcdc9d SHA512 75453a219a35bb80248af8512cdd5ac7299ef5b11e4c256fbc51978f715af953ffb96a3b9994323f1c61e5a9450a3fe5c7c4cf1d3c3f919817add56b6c1569e4
diff --git a/dev-python/pybtex-docutils/metadata.xml b/dev-python/pybtex-docutils/metadata.xml
index e6d5218bdda9..87a222fe4488 100644
--- a/dev-python/pybtex-docutils/metadata.xml
+++ b/dev-python/pybtex-docutils/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pybtex-docutils</remote-id>
 		<remote-id type="github">mcmtroffaes/pybtex-docutils</remote-id>
diff --git a/dev-python/pycairo/Manifest b/dev-python/pycairo/Manifest
index 76381d492c86..a2d133fc2ca3 100644
--- a/dev-python/pycairo/Manifest
+++ b/dev-python/pycairo/Manifest
@@ -1,3 +1,3 @@
 DIST pycairo-1.20.0.tar.gz 344370 BLAKE2B b72a3dfd3ad6332f6be2c0fc0650ef87d97a51881bd239421cdb6355016e952093f9fa05b7872d7cce4a50bc4bac27ff0fb4c11e446e51ada9d7c1adc019a175 SHA512 d32d008b741653d02324b206a438f5fd85f2a433201d6f8b98c8f1adc712abea611a4b5ed95c55258efb662dc579eed6b2f752b10d9fc2b6a7c8e5edd19e5266
-EBUILD pycairo-1.20.0.ebuild 1106 BLAKE2B e0d5f5597300b22c9a453d55f11e61f9e987805ec42121e36bc711ba2e079ecdbaf1377536fda1ee083ac27798ce0c08e1cfba8f71485f4096d47704d317f4b3 SHA512 d14b5eb1b4f226d287edaedb0d9214e2148097283b16a363b40c4674adf5cc5d0125d3e7eecb60a5c7d578e924ffc016e4a1fb4fb1e4cabfe88aa6f1258f0cce
+EBUILD pycairo-1.20.0.ebuild 1114 BLAKE2B 9d4513890596f702d48fcf67a67dcbd3026759afd9b5e209bcd4a3c1ac80cd1afe6ee0b513806a4517c6cc4ff683337ef4a561c5cb4fceeb73bed629ab31e9bd SHA512 117dfeae67a2586aa32ad8a14eea43e895cc2ae010516234228c5509919adc3de3ccc1a9034ef05abed374ffb76d74d83a86e0b8c124ec68bdb9b5140e4a02f8
 MISC metadata.xml 310 BLAKE2B f27144a3f463297efa01ba4b6d7198f455c9e62470e56e004cb2cea621e4f1f7d3adfc45099a60fe54d670debd0cce4aa68e2b34e756df8d593a150ac040d97f SHA512 0280f0bba6101b163ec1304d7f8fbc36d00d86cd7ce6f8c671dee74f7931aa363f5887c85cd8d582d4ba0cb78753a61efdbe38e072d68511ba3a66ac36aa490b
diff --git a/dev-python/pycairo/pycairo-1.20.0.ebuild b/dev-python/pycairo/pycairo-1.20.0.ebuild
index f40de00e9400..e815623d2dec 100644
--- a/dev-python/pycairo/pycairo-1.20.0.ebuild
+++ b/dev-python/pycairo/pycairo-1.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/pygobject/${PN}/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="examples"
 
 BDEPEND="
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index 61943a782d16..60a6177d6aa9 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,3 +1,7 @@
 DIST pycares-3.1.1.tar.gz 216259 BLAKE2B 4481689e418695838c456f1e15b38dcdabadb106f393f52ec21a358b06621650d4e82086ca913abb341b9d8658db1c9ddd0064e68413e71a4ddded070647edfb SHA512 52c529510e3342c0b97ad0b4b9277d1f364da7719817a31a3cfac1f88613ea82f127182eab7c52c2fcd08008c689885bb4196f887a0f81b769f08f7cbf39909e
+DIST pycares-3.2.3.tar.gz 214612 BLAKE2B e06f45a8b8e9312596ff6a56262cc91c32cd578ea2dc4c54c0a9e52ec1aa1cb8174aa03c486c74c98bbc22e7801e231244e64a943d40407f7731fe00400723f6 SHA512 126c4cc1390b558da4ce82dfbd11c56ad6be038ce5eda93641548faa4a59cd81f08265b71de31d5b54238ccf8e7d937272c13611111b04230c6ee7e4f01cb8d8
+DIST pycares-4.0.0.tar.gz 43512 BLAKE2B cccfd5738582da570a2b9b17e6e31764ff2fffe4306f08c09374707a8e1c997ca7bdf0c867252c6ec66712622c927989c4d8bcad42075c48cb2af0a5364908e8 SHA512 796f14fb13c5e848b98459287d9658e8d81a48b2b6e08793f794bf9bcf7381bd400f43a07b50b23c4578579098dab5954beae09f8d35da7b809552f701d03b05
 EBUILD pycares-3.1.1.ebuild 665 BLAKE2B e590cfbdff113f1aa0907e80d1f7ba32b1aa5f1ae223d80e28e76906b6e5c47fc98dbafe86d4cc44ffce3418d90cd495b504f2a70ee5cb1248fb826510d0e0ff SHA512 dabdbfea307deabf0e6ee9a8cefb75926ad6040e4ddef43faba3e399c177ea3794aecacdf210ad7e85c4eaa0c3af653b72df73ade483ca877ef6b331515bcf9f
-MISC metadata.xml 342 BLAKE2B 673fd0795be11f8ede70971b4313e5b9cee3aec6b93ebdc38f4454f0c6bb024c8128598208a6ba9777f52b584a9faf71f386de2e33aad2b96bba1023c6599046 SHA512 fdd177da9082fc650173331be63823ef6eb8dd195c526c3f5e7a38521f3203fc12ca591ff2ac4bba5fa64aa2ac8a9b419385285991696c9f02dd29bede7784a6
+EBUILD pycares-3.2.3.ebuild 659 BLAKE2B f8869ae0b07703388fada5d1f3461002dba9e9da052bd97dafd7a74ee3031d6ab65dbbd295f79f33a6e18e0c1241e9c598debfd3a078d6144731e33bba25b225 SHA512 ffe2ae9736eae7ded3b42683fe90aaeeb49cdcc9368cbacee6354bcac9ee85f3a777af5ed19e0ccd29110794339c91af3ce42022e18ccc84bdce72d02f93a88e
+EBUILD pycares-4.0.0.ebuild 727 BLAKE2B 92945219bd93633e8a204dc50685d993302ff6696a8a64dec8d75dc6dc5854f9dc931540f1fc582776c2901ebbaf33cbb2ebb3443ca06601836c422bfa9c4cdc SHA512 7230dbb53e5affd87bca6b81660c165b299f7f0e43e9ba40b54b58a758bb64d4db891661c28dc77e7b60f158aff5fc6cf9533777bc88282cd1114b5cac5698fc
+MISC metadata.xml 443 BLAKE2B 87f5e504859a7e729743bc75cfbc6fbead747b3d456d1b27d3f59cc8d23ad3c48ccf63477894a3a7bf142f29c1cafe584164a1a1aeb560b831598af1616c3200 SHA512 db04dbee5d9a1fe893a0d9ca4dfdf1c92d6c20249e167177d5c37c5d934c66e49c694e4de4f7898dde6421b8cf61791f43a3e8a86ef980c71f4505606f19b53e
diff --git a/dev-python/pycares/metadata.xml b/dev-python/pycares/metadata.xml
index afce7552c1ca..64863d5a9f0b 100644
--- a/dev-python/pycares/metadata.xml
+++ b/dev-python/pycares/metadata.xml
@@ -8,4 +8,8 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pycares/pycares-3.2.3.ebuild b/dev-python/pycares/pycares-3.2.3.ebuild
new file mode 100644
index 000000000000..dfc12ae28b0c
--- /dev/null
+++ b/dev-python/pycares/pycares-3.2.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="https://github.com/saghul/pycares/"
+SRC_URI="https://github.com/saghul/pycares/archive/${P/_p/-fix}.tar.gz"
+S=${WORKDIR}/${PN}-${P/_p/-fix}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+# uses bundled/patched c-ares
+RDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+BDEPEND=${RDEPEND}
+
+python_test() {
+	"${EPYTHON}" tests/tests.py -v || die
+}
diff --git a/dev-python/pycares/pycares-4.0.0.ebuild b/dev-python/pycares/pycares-4.0.0.ebuild
new file mode 100644
index 000000000000..f1f64adb868d
--- /dev/null
+++ b/dev-python/pycares/pycares-4.0.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="https://github.com/saghul/pycares/"
+SRC_URI="https://github.com/saghul/pycares/archive/${P/_p/-fix}.tar.gz"
+S=${WORKDIR}/${PN}-${P/_p/-fix}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+# Tests fail with network-sandbox, since they try to resolve google.com
+PROPERTIES="test_network"
+RESTRICT="test"
+
+DEPEND="net-dns/c-ares"
+BDEPEND="virtual/python-cffi[${PYTHON_USEDEP}]"
+RDEPEND="
+	${DEPEND}
+	${BDEPEND}"
+
+export PYCARES_USE_SYSTEM_LIB=1
+
+python_test() {
+	"${EPYTHON}" tests/tests.py -v || die
+}
diff --git a/dev-python/pychm/Manifest b/dev-python/pychm/Manifest
index 9556bffcd63b..588fc7ab2ad2 100644
--- a/dev-python/pychm/Manifest
+++ b/dev-python/pychm/Manifest
@@ -1,3 +1,3 @@
 DIST pychm-0.8.6.gh.tar.gz 23803 BLAKE2B fdf3c37eead60455fd5bde1638a010f2788074752f98c32cf4b3431b4a87b8893c23a9fa29995352b35b41f628b7026fdbfa6ff20b75e8a6efdf75fc2da3f67d SHA512 cc1b254b6c58aba038171ad9db1eea3212094d7fb9386b22ada67381d702b388e6a1dde0317b5724587ee135d2695c546a7c2d65af7091dafeb394647597b0ae
-EBUILD pychm-0.8.6.ebuild 675 BLAKE2B c36fd039d5458d9ba27c1ca0f5aae2df7ff74bb2689b27957b62cfeb6993aa00b8019493ad139afb305b8461930df534374b02b879baf4328885f548547f98f3 SHA512 c3ce090e8e8c54cb1211db39e496d78e77cc13dc1d2f7e219a5f78f3760ae60fe5f04d630b88653206026b0a12dff644d12bf6da6d1af64b916549449c9cfa71
+EBUILD pychm-0.8.6.ebuild 676 BLAKE2B ca2ca75cc0e3a191967871b0ed9e72763ab15b3bf67e2afd07bcb524c7b1a9e3b52f98ec5705b01390f9182f3c6550d7a685c7c7bc70ae908851172262c75d79 SHA512 7ef6d0f97dd9e7d201e9a2bff4d2e0808f129defac4fce5c92644aa9a94039d25f3e5926bcce6f8b87f68a928faafee5f407a58891870cd22b08cd7b9aeb87ff
 MISC metadata.xml 1024 BLAKE2B 4284f9d29a44bfb1997cc7e529bc28bef911febe769135b5837f5d81482d353e3377e162fa35f677a6ac1e29b1b467ee15caa1607ea789d3287d5a75f6db79a8 SHA512 f67597a0718d67bfc13216966d1a47f7192c17cbf939f10758c1ff09c761a07bfde094b1d4cf1c35acb872c6c6426cc1dc699a10f46448669ae645dd9f07507d
diff --git a/dev-python/pychm/pychm-0.8.6.ebuild b/dev-python/pychm/pychm-0.8.6.ebuild
index 3957210dc1f6..5a33f0e58ffd 100644
--- a/dev-python/pychm/pychm-0.8.6.ebuild
+++ b/dev-python/pychm/pychm-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/pycryptodome/Manifest b/dev-python/pycryptodome/Manifest
index ef9a8c131c4b..aef74c585ec0 100644
--- a/dev-python/pycryptodome/Manifest
+++ b/dev-python/pycryptodome/Manifest
@@ -1,5 +1,5 @@
 AUX pycryptodome-3.10.1-parallel-make.patch 837 BLAKE2B 9d7b3088d547d294dab498dbdcdef7f5eeec0ef8c264fd62a49e2e64a9adfc785f8becae91a6f889184e53af04aabe638d503f523daa62edaa3bf91596a268bd SHA512 2b2f310a3ab332f9d1c2f7742fdd902cfbecf49360df3412839cb67bf69e8eb1f9e051461d4264ff7d732d1bbad285b5a635aea085945d543c2b58e880f0b807
 AUX pycryptodome-3.10.1-system-libtomcrypt.patch 1729 BLAKE2B 57a2022ef17e0b86e98b085336f5ce815304e326a5a2bd5cc8ff5d33b6efba440505767517b79c2f0bba39ab33f04d7434a3f0ee529b880ff7552aee2805dab5 SHA512 d53677c0ad96f161f9aed14b8f353a8cc12c92f31de9733789f9c4151710376d33e974fd611b763de94c631796d7a57cd8787656e3c1e985696e20537b34760e
 DIST pycryptodome-3.10.1.tar.gz 15545471 BLAKE2B ef1922efd0b6bef6beaee76fe03a4201a6f1cf2a203abcb12b96a5ea7c8de59a34ac704fe7508a3728a214efc0755f289d66dc14a0adb3f2eac882bc8db691bf SHA512 4c7e7e989d5363064e7e184f6b00a174045e03916cdf1199626afd7fe75eb5efcd13888ecdee607b974e96faad465694b384eb6d91edb8de1d0277ad71888c52
-EBUILD pycryptodome-3.10.1.ebuild 1432 BLAKE2B 1f1fe62790c14041b655564eb295ebc0d1e7eaa3b3fc24cdc7e8de3a01608782af8de4a366e56ac75fa8dc4c1d12f2b1c4c668e3b3a70fdc9c427d1831a4e018 SHA512 9bb2793baf768211777bccd7ba4b68f11269aaad979cea0f5fe7d88f4236dc0710fd29ca2326fdc2f261c6dfd3d064fdfabf6d539645b63dfef69af3b0165cc2
+EBUILD pycryptodome-3.10.1.ebuild 1433 BLAKE2B 647397fcc209fbdb79fcf043eb4b46b1b5286fae3d58764af4615eee3fbee01578b31d2574b9714fb1a957b3b63a2d5bd6ec0cb97b44eb0a24c70f11ea17219a SHA512 654f6de5a745f8366335f42f438b2b61fccd87965fd503136f3f7f30a77d5911c9a6a58ea18043598ac56ac93593776dea55063f6749114c13e51ed5d083a216
 MISC metadata.xml 385 BLAKE2B 8ee308521948e0f6bbc9c70e25c231a02424c9d4bdbf2c6ddda10767d4bf77bbda74607f4dce97ff42bfe6fef8a5ac2ee25e0b91bbc491e977c5cc46b3486699 SHA512 073885df3e0742b6088a537d54bfe9fcfb646ed9a5d3d19940d02fb05d453601b71db583567a4810a8d739c935488291624bc06948c4cb21b28a5500fbea4e97
diff --git a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
index ac8b405e215f..d32f4cc20f80 100644
--- a/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
+++ b/dev-python/pycryptodome/pycryptodome-3.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-python/pycurl/Manifest b/dev-python/pycurl/Manifest
index 338cc3fc13d9..2ab5ba3e6651 100644
--- a/dev-python/pycurl/Manifest
+++ b/dev-python/pycurl/Manifest
@@ -1,3 +1,3 @@
 DIST pycurl-7.43.0.6.tar.gz 222895 BLAKE2B 5a923a3d7a57aa553361206fd0c0e43e6ad66a70af72540c08a29903a9a71ed6b9460c06ab6e50fc2a01d1badd45edf41eb36f6dd97fca3c83bef30f12e41c40 SHA512 5625d9e38159fb785afaf539372a8ac658d9118fb25f581f11629859fde400b6fccf65e03a19e182534a78169531304639b1e6f1bfdd2cb09bce95d581b52850
-EBUILD pycurl-7.43.0.6.ebuild 2803 BLAKE2B 29d80d13661e488055efccd9a10877ccd25d8950418e42af2d62a662f181ef0ac8732733376009ccc2bcfd2df05bdfc8998eb07a688acb395caabe98e146785b SHA512 fc25011153e9a1dc7b4683b6969d3da698a693d12f73aa254ba47cec020fe78037386a0d2901f66e2aaf23e347bba5f52bd9ce0c7435b38c9dada1dd2857373a
+EBUILD pycurl-7.43.0.6.ebuild 2938 BLAKE2B 1791b80b9588a5d6317d2e6568b02dc211f48c84855252269de84e70a17c7c56c632b7614fe53aec9f804e7dec289ffa9a6aae1b2dab403b96aa05882edb4fa6 SHA512 ac9c0b8ba7b452d7d1e424ea4a01dfac585aef9b5953cd44f1899c18e986bba81893cbb8fe595f86002ac39abe233063dde389a474797a2af752b4641bdeae53
 MISC metadata.xml 1099 BLAKE2B d96159920135d8d85a01449423d1638889d2c6ed9f84d08eabd7405a3271efe85315cece0fc4f6832bd43b622089c819df3d20fd725150c89a0910ec26ac339a SHA512 8f8b3a10d2f72aa67d1b5f7462ea62803d9150cab3d96792adbd65b379a45c074d68809b25d4a2b558bf28dae72e095c598bd0485fce4c5dafba0784de517a6c
diff --git a/dev-python/pycurl/pycurl-7.43.0.6.ebuild b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
index 130987a64a06..6614d8660689 100644
--- a/dev-python/pycurl/pycurl-7.43.0.6.ebuild
+++ b/dev-python/pycurl/pycurl-7.43.0.6.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
 # The selftests fail with pypy, and urlgrabber segfaults for me.
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1 toolchain-funcs
 
@@ -53,6 +53,10 @@ python_prepare_all() {
 	sed -e 's:import wheel:raise ImportError:' -i setup.py || die
 	# these tests are broken with newer versions of bottle
 	sed -e 's:test.*_invalid_utf8:_&:' -i tests/getinfo_test.py || die
+	# these tests break with newer version of curl, because they rely
+	# on specific error messages
+	rm tests/failonerror_test.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/pydantic/Manifest b/dev-python/pydantic/Manifest
index 29bcc263c500..cc8befc3a66a 100644
--- a/dev-python/pydantic/Manifest
+++ b/dev-python/pydantic/Manifest
@@ -1,3 +1,3 @@
-DIST pydantic-1.8.1.tar.gz 300512 BLAKE2B a7840bd895c73c3049184fc2c4a165783fd68a82290c3826be53667e7b7919580493aff9f2aaa25274b0251da14218dd6f7a41c1cb3cb55f0fbb0c90f79b7833 SHA512 dc58ab2e411744e63408c952c92c589acf037e809c60b85e02f277af2c6342c99c4fbfa7a585f14e57256912c0e6471821973bd2f755aac3822eb3a7883fd407
-EBUILD pydantic-1.8.1.ebuild 917 BLAKE2B e1db90e2bc6e8842876b77ab98b0c85dfdd3af411d1aa4e06300489942497e567f773782c7617aaa0adf73292d9abf66acce514a3fb9bb1338b596891b34e28d SHA512 d3baa0113efd4eaafc5734b9258ac1901cc26f3572246386c094ed7fe323547bec2f9c21326963b9ae37b96b1af15f70045166db02389403e7b6bb2a37e0320b
+DIST pydantic-1.8.2.tar.gz 301802 BLAKE2B f02fca273c356dd0ab177de73d21da7749e1a9ea1ead92f4e82b44285b97e8b8431961b2c30d230cbec817698791e4b0cdf8498615b7a0639fa739b09f1b58e8 SHA512 0a28c64b97678b932092e546da877a4a6d104fc7d3b7cb043b3494f0b7c6900cdc1ab8a83bdbd1879956a81da1b28ca27578b1a003bdca3e08f0f107e5690e06
+EBUILD pydantic-1.8.2.ebuild 917 BLAKE2B e1db90e2bc6e8842876b77ab98b0c85dfdd3af411d1aa4e06300489942497e567f773782c7617aaa0adf73292d9abf66acce514a3fb9bb1338b596891b34e28d SHA512 d3baa0113efd4eaafc5734b9258ac1901cc26f3572246386c094ed7fe323547bec2f9c21326963b9ae37b96b1af15f70045166db02389403e7b6bb2a37e0320b
 MISC metadata.xml 491 BLAKE2B 1c17cf9901705ce6aa44e87902e2d52dbebf6c465ce3210b005ce0a2a69df04f91f90d3f8bfb3f44c1ce804bdb02bfd959920564b5e496ea58089fa77b4ccb22 SHA512 f7fd4fa24b1df7ecb7260f74569413af570c75df6e2c52fa59a8e01d030e4c0bbef120e53f6c3a6b0ad8100d8797c86dd8c1586f86f02c3a740362f6f0b96479
diff --git a/dev-python/pydantic/pydantic-1.8.1.ebuild b/dev-python/pydantic/pydantic-1.8.2.ebuild
index 26b8dccc514f..26b8dccc514f 100644
--- a/dev-python/pydantic/pydantic-1.8.1.ebuild
+++ b/dev-python/pydantic/pydantic-1.8.2.ebuild
diff --git a/dev-python/pydata-sphinx-theme/Manifest b/dev-python/pydata-sphinx-theme/Manifest
index 1714a7b247aa..b6d00c6bfd31 100644
--- a/dev-python/pydata-sphinx-theme/Manifest
+++ b/dev-python/pydata-sphinx-theme/Manifest
@@ -2,4 +2,4 @@ DIST pydata-sphinx-theme-0.5.2.tar.gz 2556695 BLAKE2B bcf54d1353fb8a46e19b738e26
 DIST pydata-sphinx-theme-0.6.3.tar.gz 2617286 BLAKE2B caac09add734ab3127461f3b54069cf9bbb22b00b54e6d0ed999ff6d7783f68d2d97bf31d19ce99bdefa0e1d754e6194e5ead8347d89c5d704dc38e148fff619 SHA512 0106accc2f7b64899d09d1da5b39fccd074732c07db78a924aceb403923b3d67cdc0592834211ab1fcc2788ef55616da63e9eb058a7909b2486006061b6d367b
 EBUILD pydata-sphinx-theme-0.5.2.ebuild 975 BLAKE2B 696f5fcfdd00d3d2db2b6fd38105c4685a0dee20d8b8ef94ab1e5bb899487dd7c022d0af911279a5f758b3657470c86728d5f50f243e6b3d118632dd902616e8 SHA512 f86de04c41b98ce98281bc4374a0884437a50da14fb337fb9ffe96394504cbec170b15c7615571f7eba10f50f2c21dcb1459c4d9f4a267d1ba1bd181d3703a0b
 EBUILD pydata-sphinx-theme-0.6.3.ebuild 969 BLAKE2B e14b29d67ee6ab7a1fe25ba9f4697fa951e9fbdfb282394d0f256331004dbc8fff9688e838fd64c55004ef11d91396ce28a83454161b8e00feb25c52cbbaf963 SHA512 9f52b4520aaf31118ff00b8761ec39e8a8468973664514baebd252b51a04149536eee4d51cdaa66f232dcad98453e05850215198342e37ecf3660e6b348fc3ba
-MISC metadata.xml 678 BLAKE2B 658c1ae379e02e63ec20b61e2caf9d90658b4f5278cc0edae5cd075fea2fff46f1d7743e9d795d81e4b12c7669051be85012342955e2494f8ea0be5c3c1721a9 SHA512 44b0454f59b2221f34d6b9c9d90dce0fa244347e6aad6c5b0acfb2304f212f632024f8c4d2516a537c2ba5d928fe49a0326771fc09cb9d7468a03692d27afb15
+MISC metadata.xml 531 BLAKE2B 29ac12ff8537f67bd180905341f96eb0d1ef88b15fb194ae08c37894b7a784f66f97001e3a5fd8c522020322644d06b200029eeb22a9f4a35bdcf7297eb5c450 SHA512 9174d12f80cd62c94dba8aa34003291b074f3c859c98e223a131949d6b6ef061add5782d2503d1e0af99b923f95f18844652282a6787601a06524816760c9e29
diff --git a/dev-python/pydata-sphinx-theme/metadata.xml b/dev-python/pydata-sphinx-theme/metadata.xml
index 8db7c1642941..5ef2e0e1dcc8 100644
--- a/dev-python/pydata-sphinx-theme/metadata.xml
+++ b/dev-python/pydata-sphinx-theme/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</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/pydocstyle/Manifest b/dev-python/pydocstyle/Manifest
index 6fad9e4553cf..5e29dd7e2fbe 100644
--- a/dev-python/pydocstyle/Manifest
+++ b/dev-python/pydocstyle/Manifest
@@ -1,3 +1,6 @@
+AUX pydocstyle-6.1.1-disarm-pip-install.patch 1001 BLAKE2B d82d9b358cdd6b517cf64f5b620e767342ba6230ebda715e039be2b5bdbef639ad5d0e715f033658887bede3ee330da79f2a6ca3e1a597466f3bbffdd617d371 SHA512 434a576cad8fe6a2c8086893982887306ad6b4797c1ed0c3682782a3a9ec1109fc48d94ad469cd11128232d773d5beaef2cfc1c9a68c0386581e4864d43371fa
 DIST pydocstyle-6.0.0.tar.gz 72143 BLAKE2B 1036a5eab38a38bda0f98371f7e4094248cf5057a9afd8743a478f153a5f06feab6b3e7d6be031615b5e88c388786f59a0619f774f492e40a722f39973051d5b SHA512 609a10307aa24513f476ef639771fc095fe7a65ffd8d530fad02886369c62969c69a5134fd0ec79a1e07d1b6cb8f920c3478db546c26aefb0e45771777c02a0b
+DIST pydocstyle-6.1.1.tar.gz 73982 BLAKE2B 6a896221fdcd257f0475472e1cf87ef892d8292a4c0faf661595adb17e2d18f4a8277cda498197309d34597c448203856c272256277a7e35fba20e2e5ba47f2b SHA512 ce4932a6601c80d05a46600f5af7df54798025a5f3dc41ab8cf1bc0d63e7f78b70cccb17dc99ddab25eda9abd639f91468fca1b1ceb4539708350212e481a156
 EBUILD pydocstyle-6.0.0.ebuild 868 BLAKE2B 652cd5342fb55b0075a106cba51a852d9a599cf95d77853dcfbfef9c1fa4866837ef20331aef50e7ab0637920228714eb8234a1c73e1dc91f9f357dc732b01b8 SHA512 726537ef77a1915afc04686b64ab990d43248a8f9bca7b449b69e5c0d8a3cd348fdacd51df5bd187e464b0ecbd3b74934bfb3fb720f367731e85b3dcd83de858
-MISC metadata.xml 817 BLAKE2B 850fe7b35b30a2d302a49409979b3ff43916b19bf2e970da7b1cad7e76cabb66c217fa68198959a1c2595766398151221643184812d98165045e7498b2d38932 SHA512 8e9b85d0e13750e8beacc06c3c448a6a9e3876216d882f34c7a0f75bf64911aa8335dd38221af8852fa399008ba740c5dd3038f465de14d55b465c3114754920
+EBUILD pydocstyle-6.1.1.ebuild 809 BLAKE2B 7692250ee2f93ead51e8d5c17ea60ab0311096bcc9a13cddb14015da78611aa920c9a9295ec70a89454dbe08d29d5153c391070d953e91df4f26885863d4ba23 SHA512 0e38618c3bc74e8a461a51df18dd783a48362180629b0d859359e2ae37c05b09004f35f3e839f4c6bf410ae8faef03c1640a9db60120825fff8bd16d0a38505a
+MISC metadata.xml 664 BLAKE2B b93a0c28241c15026f0db4098aa48339fa0841e13b38315448dec94d2a7c0b0bf8fbb055bbbed689db92102e5b0379e5765d33f364e8f4b68832c0758ccf769b SHA512 a04b694b6bece73b9abdff12e13f09c691de413e4f8712187fe288f72daa3a8f7629ecd97bf690004c9313cb8d74de2a0109f4684696abb26df116f2a7784b69
diff --git a/dev-python/pydocstyle/files/pydocstyle-6.1.1-disarm-pip-install.patch b/dev-python/pydocstyle/files/pydocstyle-6.1.1-disarm-pip-install.patch
new file mode 100644
index 000000000000..b0467a136435
--- /dev/null
+++ b/dev-python/pydocstyle/files/pydocstyle-6.1.1-disarm-pip-install.patch
@@ -0,0 +1,31 @@
+From 46947c9dca95caeb7b1f4348994d1aa2b8db93ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Tue, 18 May 2021 10:02:16 +0200
+Subject: [PATCH] Disarm install_package fixture
+
+---
+ src/tests/test_integration.py | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/src/tests/test_integration.py b/src/tests/test_integration.py
+index eb4994f..4242476 100644
+--- a/src/tests/test_integration.py
++++ b/src/tests/test_integration.py
+@@ -128,14 +128,7 @@ def install_package(request):
+     This is so we can run the integration tests on the installed console
+     script.
+     """
+-    cwd = os.path.join(os.path.dirname(__file__), '..', '..')
+-    subprocess.check_call(
+-        [sys.executable, "-m", "pip", "install", "-e", "."], cwd=cwd
+-    )
+     yield
+-    subprocess.check_call(
+-        [sys.executable, "-m", "pip", "uninstall", "-y", "pydocstyle"], cwd=cwd
+-    )
+ 
+ 
+ @pytest.yield_fixture(scope="function", params=['ini', 'toml'])
+-- 
+2.31.1
+
diff --git a/dev-python/pydocstyle/metadata.xml b/dev-python/pydocstyle/metadata.xml
index 0923fdb760e9..a9b559cf313a 100644
--- a/dev-python/pydocstyle/metadata.xml
+++ b/dev-python/pydocstyle/metadata.xml
@@ -9,14 +9,10 @@
     <email>monsieurp@gentoo.org</email>
     <name>Patrice Clement</name>
   </maintainer>
-  <maintainer type="person" proxied="yes">
-    <email>andrewammerlaan@riseup.net</email>
+  <maintainer type="person">
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <stabilize-allarches/>
   <upstream>
     <remote-id type="github">PyCQA/pydocstyle</remote-id>
diff --git a/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
new file mode 100644
index 000000000000..f97c88a48af6
--- /dev/null
+++ b/dev-python/pydocstyle/pydocstyle-6.1.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="Python docstring style checker"
+HOMEPAGE="https://github.com/PyCQA/pydocstyle/"
+SRC_URI="https://github.com/PyCQA/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="dev-python/snowballstemmer[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/toml[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests --install pytest
+# Requires network to lookup github issues
+#distutils_enable_sphinx docs dev-python/sphinx_rtd_theme dev-python/sphinxcontrib-issuetracker
+
+PATCHES=(
+	"${FILESDIR}"/pydocstyle-6.1.1-disarm-pip-install.patch
+)
diff --git a/dev-python/pygal/Manifest b/dev-python/pygal/Manifest
index bcb9b14bffc1..cfd2a8ed46fb 100644
--- a/dev-python/pygal/Manifest
+++ b/dev-python/pygal/Manifest
@@ -1,3 +1,4 @@
+AUX 2.4.0-fix-tests.patch 645 BLAKE2B 92158d2350eedca67e2706fdc1ca38902bf7b23abd6ecdc1778c0ddc3ba60bb6830b86a850c2cca6eaf49e35c5ea0644af2aafd3cc00195d78af5e1bda245402 SHA512 b16881cea59eae7c354e36f06b1d6e7e76062a3a83a740700e4b1c964a51315dcb9ab729763172f237a132ce900d2f76c74e0e16ee6bc0fe2d50bf104153279c
 DIST pygal-2.4.0.tar.gz 4554802 BLAKE2B 9627558e734420bfb3137989d0cc1978a0a06a597d3d5d071e13653876a4bb3266f12f1a8a358076619d997998754c29ee75058356ba66da64b112a24c2cbe2a SHA512 d69fbcff3792cb0b952addc3bfbaea76628d5546482c291ef217c592a820a73a65b1eb522c5d7877e7a794d19b74636126d99a4ff280e8467ab07a95000ba823
-EBUILD pygal-2.4.0-r1.ebuild 1187 BLAKE2B 6976b8c9926a06f901433e0e8adc60ecdda74c7aea4de7db86a33b5a37ca1b578676585449da0b1264cb6299e018873e02d8e711b29ca273f34995080ceddf7c SHA512 21518fbd4bf2e3c03f38d4e64598b423e8118e6a32c96f82edad18ee0acfed5a9ee9940f6825406ff74ea3b26931f95096b028ef659298f858006b028bb00eb5
+EBUILD pygal-2.4.0-r2.ebuild 1154 BLAKE2B 3aea0bf24f37d195888abd88a6695148fc08f5cc6959598c193a064f0a7b540369be18afe9b203a9fe6a3051019218247c6a7713738e42154f812a249d3b838c SHA512 074bc67b94683d445fc3126cab8fd740a089504ece23c6c31dea56ca5eea2b2034f9f499b14ceafb4b12b8748845e39f0871a33c2f222aadc35e26df454be112
 MISC metadata.xml 432 BLAKE2B 935ce59a5a29aecbe4015fc52312fb03be02821a20863d20171378a68ced0aadfb43f7d1898fe52b8159cc0cd5a78ae0daedb97b730fd864de39abf3a617cd92 SHA512 1d2e68e4622a235b6df15390271b1f331b366a2ad1432740de81de20b494ccfc9e5f0e94f8b63acee67679e10267c0f21c66b58514e72f32d0fa3b5b262640d3
diff --git a/dev-python/pygal/files/2.4.0-fix-tests.patch b/dev-python/pygal/files/2.4.0-fix-tests.patch
new file mode 100644
index 000000000000..6ae07df3427b
--- /dev/null
+++ b/dev-python/pygal/files/2.4.0-fix-tests.patch
@@ -0,0 +1,17 @@
+diff --git a/pygal/test/conftest.py b/pygal/test/conftest.py
+index ea36010..6fe40cb 100644
+--- a/pygal/test/conftest.py
++++ b/pygal/test/conftest.py
+@@ -48,9 +48,9 @@ def pytest_generate_tests(metafunc):
+     if hasattr(sys, 'pypy_version_info'):
+         etree.to_etree()
+
+-    if "Chart" in metafunc.funcargnames:
++    if "Chart" in metafunc.fixturenames:
+         metafunc.parametrize("Chart", pygal.CHARTS)
+-    if "datas" in metafunc.funcargnames:
++    if "datas" in metafunc.fixturenames:
+         metafunc.parametrize(
+             "datas", [[("Serie %d" % i, get_data(i)) for i in range(s)]
+                       for s in (5, 1, 0)]
+--
diff --git a/dev-python/pygal/pygal-2.4.0-r1.ebuild b/dev-python/pygal/pygal-2.4.0-r2.ebuild
index d99f0e5a873f..c67f4dee8145 100644
--- a/dev-python/pygal/pygal-2.4.0-r1.ebuild
+++ b/dev-python/pygal/pygal-2.4.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 PYTHON_REQ_USE="xml(+)"
 
 inherit distutils-r1
@@ -19,15 +19,12 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	media-gfx/cairosvg[${PYTHON_USEDEP}]
-"
+	media-gfx/cairosvg[${PYTHON_USEDEP}]"
+
 BDEPEND="
-	test? (
-		dev-python/pyquery[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+	test? ( dev-python/pyquery[${PYTHON_USEDEP}] )"
+
+PATCHES=( "${FILESDIR}/${PV}-fix-tests.patch" )
 
 # CHANGELOG is a symlink to docs/changelog.rst
 DOCS=( docs/changelog.rst README.md )
diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 65f5e58d73e6..4b191cb2fad8 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,7 @@
 DIST pyglet-1.5.15.tar.gz 6429039 BLAKE2B 5835d2c8c0c6e309664bea4a4001d0b68622379ae27555b640ed4441cb4319bf4ffd2b491cf789cba5639b9ca43e047f1e2cf820e540123939dd386a4c88fbf3 SHA512 0ea6f936895b0f17d7272866ecec7721ae1fb353af3654c49bb09eb81729f939df07ba3cdaf8b8bece345a8f144d56a45dc23d82e1887db306fd08c7989c688e
 DIST pyglet-1.5.16.tar.gz 6446875 BLAKE2B bdc40303b096a91924eb1b9c541cea199792ebf36d857f0466df4c5dff4ec2945dbc6e6c4933a293ae5bd5033dbcf49af913f3b0915082f33ea98a7d5f66fde6 SHA512 5cd1c604245c45f4b9d56c6a6290d301f8a925a4988d847df978b0f4431afb46046592f25d73b54cdf99402022a616afb3eb9c579d5ac29160408a74769f7a43
+DIST pyglet-1.5.17.tar.gz 6448500 BLAKE2B c2e27d5525c1e8eb5203b935b6a901283521ed12cf08b1d18297bd2772b83ee4fd721a9aac4fc41b6249b140b36e70d060d3649f4d2eb30f1e6f1f8fd42aa314 SHA512 3bb9594c02894fc58937b9312187b7848843d591fadb8e46553602ebad7c4b2bfd5dc615cc5f5d0cc1f8b59f10afda8e5130a0dee3c2066decb7af3faf114dae
 EBUILD pyglet-1.5.15.ebuild 1290 BLAKE2B 95388a11b82c09f2284fd4a039c01a4a60a30cde9c0f121a40585719aad989f0cbceea7bdb963fb68120dc910c26d155d33a049fd2e681763cfde1caa54741da SHA512 76f03d4f17c347a6aa0a0ab502de363b4f64db546182e8787a7dc5406ae82314f8fd9440ee5fca49e74344c47d88653d5b1eff45f1289aec947f679bfe1d4d9f
 EBUILD pyglet-1.5.16.ebuild 1251 BLAKE2B 879fdd7998a37e788ad481356dcd77d4a7b7737bc6ca7a7f23aefed2311e93e0ed08998ea12a3d71f67afcc48d5ceb87ca68cfb3b5274482fa29bc24512e5425 SHA512 4e4dbc2b2e5d7bdb901197b015750e8f0c815307fc46777330bc3cb871a86de1113d2a223bfb5242cf0e1b9f53081db8c8269cd89265ee1cc4067b8e49362488
+EBUILD pyglet-1.5.17.ebuild 1251 BLAKE2B 879fdd7998a37e788ad481356dcd77d4a7b7737bc6ca7a7f23aefed2311e93e0ed08998ea12a3d71f67afcc48d5ceb87ca68cfb3b5274482fa29bc24512e5425 SHA512 4e4dbc2b2e5d7bdb901197b015750e8f0c815307fc46777330bc3cb871a86de1113d2a223bfb5242cf0e1b9f53081db8c8269cd89265ee1cc4067b8e49362488
 MISC metadata.xml 996 BLAKE2B 74fda944aaa3954eafb31e21741f8cb599c9f8bff46c662a598cb384da9770d3160302b37ce8cbe9ddbc7dfe63c594614783afa568ab4be5e73db502fdc3a095 SHA512 a13a1aa2134de7bc7e007f81540631623c5a3fc1f5bfd4b6f7bc744eff8cc037da321292aa968184d324099dbfd87f608d7c0a2aeea90707c27aee5532a1fe15
diff --git a/dev-python/pyglet/pyglet-1.5.17.ebuild b/dev-python/pyglet/pyglet-1.5.17.ebuild
new file mode 100644
index 000000000000..7893369764fd
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.17.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	epytest tests/unit
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index c76d49e2d78e..83ca85568554 100644
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -3,5 +3,5 @@ DIST pygobject-3.40.0.tar.xz 555920 BLAKE2B e7b3fa926066ddc6992c3087a582e25207ff
 DIST pygobject-3.40.1.tar.xz 556104 BLAKE2B e6a092bee68121d9ef82f41f21c9811f384b8578c48de445f707f1b0de124cf38d899d34b8f4269a154ebd4e323afdfa7afef5c0c5cc5dc451b2cd68b30da04b SHA512 a8350f43ea99c93aa66a23102d4ee2ca3c7f8ec2c8bcf5cd142dd097b4fb38167f1713efff3584aa323c34656c911fb940e462c83c02b107e4aad93d005022f7
 EBUILD pygobject-3.38.0.ebuild 1750 BLAKE2B 5e9fb1c304867db80e8abd422d6a2acc73cc04d04e5183d6aa6be9e5dea7a1026d9e5888d389eea628dce8fea026363dfea8325f2d971a33a0861ae3b490f6ef SHA512 aad5d9bbbc022fa21b3491eedd9237bb125387639031c2a9897cbc1d7afa6f6f26d435612a73486e157d56000a1011ea80b215ed5e68753ca432eaa07f1a4b68
 EBUILD pygobject-3.40.0.ebuild 1758 BLAKE2B a85eceb3d69edb260372851136bdc829bb67f7d2808e738af42f5a7d2bdd859c6b793259ede2ddf7b0218d2ba5027ab778749f3d8482aacb845bc020639dfe86 SHA512 43a99bc52d4fd93c4225b6acbe998fd506ed7abaccdacb0b8f5628bc1aa9e5cba05dda44856279856f20db9ab67672a2b941a32be7b9ec1b2f4a76b6442a8345
-EBUILD pygobject-3.40.1.ebuild 1758 BLAKE2B a85eceb3d69edb260372851136bdc829bb67f7d2808e738af42f5a7d2bdd859c6b793259ede2ddf7b0218d2ba5027ab778749f3d8482aacb845bc020639dfe86 SHA512 43a99bc52d4fd93c4225b6acbe998fd506ed7abaccdacb0b8f5628bc1aa9e5cba05dda44856279856f20db9ab67672a2b941a32be7b9ec1b2f4a76b6442a8345
+EBUILD pygobject-3.40.1.ebuild 1766 BLAKE2B 1100560c8851bf37cffd5b63d7a46cdd3e0e9439ceb3de3624e0e9b245b8ee6020cdcf1fcea2cae29b23c9af200c6b49d74f37759636a7f29c584baaefd7893c SHA512 c56352c1429cf3f5f63600f98abfb30bd46e0d2cfa090976ce071444ee919ef66d0f73ca11754c8dd2346c8ceb1ad20de8424ce7658df0dc22e9c69f2b8957a2
 MISC metadata.xml 1292 BLAKE2B ba52782219669d3f01ff1befd8ddcd445c36ac0af2f9e4125ca4fedca7c01665282485b9457b189689c80d4db55de9316ee2dfc19d06340c23a6f00e08e92213 SHA512 7aaf7a98227e36a6d556f225161eecbc43140736f3e79583694d131e99218f887aa6cfdb9991d6fb041bba6e7df2318e65e8cdf181d97bc41301aac6f040df48
diff --git a/dev-python/pygobject/pygobject-3.40.1.ebuild b/dev-python/pygobject/pygobject-3.40.1.ebuild
index 8e08699fd4ce..233f53abe6b7 100644
--- a/dev-python/pygobject/pygobject-3.40.1.ebuild
+++ b/dev-python/pygobject/pygobject-3.40.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit gnome.org meson python-r1 virtualx xdg
 
@@ -12,7 +12,7 @@ HOMEPAGE="https://pygobject.readthedocs.io/"
 
 LICENSE="LGPL-2.1+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cairo examples test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index a212a76d2fba..fbce884f60f0 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,7 +1,3 @@
-DIST PyICU-2.6.tar.gz 233826 BLAKE2B 318b87b878f8d49f47f48780567751671f5f88902c4cae9a243a81300b002ca6ea2336aee38bfc76a3037326f15f197fd71819173b678c68094d16f8db51864e SHA512 ab4c167cbeb80a23904476e51a3c16aa4721e26840b1d4c2f44b5a610e5467a6880c45f27636efb9e44e8e4302a095d437f4868409103270d79ecd56a3d90c9c
-DIST pyicu-v2.7.2.tar.bz2 238645 BLAKE2B cca24a2cda18e943ac00a50b9a28342845af156b66bffcae2ec915e8e5d97577e1c5975b6711051558223278ccd7ad33782d02e759427ace4ce609fcad1c7ba6 SHA512 ece8a7a7e5162de8a2ad7a1ae1310ca4f32c6d27695942580a9a4cd1755a94c4230fe9f9e1c9a6b5a7d4a712b2ad570660e89316f437a7af502521e91137960e
 DIST pyicu-v2.7.3.tar.bz2 239703 BLAKE2B ce575c313d0e24838f87d270afce70e8b702753ec41d188bcdd60492f97ea276bca194c1bfd6224de17eaf84455509079e007b81e58c09ad0f48340b231e8671 SHA512 ff3bfdc5f24f259dc470f44c65707f7c29bff5c56dc85be7d4551269e5b6cc6e8f3a6953c5faae63aa9eb62e55f6ac75b32a1524f80ce2a7661de56ee1a5bf99
-EBUILD pyicu-2.6.ebuild 531 BLAKE2B dd5d34de8c32d34c7338472dace7823a70b4d02f07f0a7c04f473e4d6682dfc07cd93c1722a7137106e005de23e4c406e8b940fd243df2bde12ce232a7c6e9d9 SHA512 c9b5483e64fa209d1a771af4505ecc45e264bf1a8684eed933b5b9068c878f4d934bfb4e56b8b390e8ab258f4e3f6694c030e65e176c7840b824425c7392154e
-EBUILD pyicu-2.7.2.ebuild 576 BLAKE2B 9a3cb9bd0bb322a3e382f16cfc55b3f98d50b6a058cf4ff4158d0e2d56ee6a1d9f910f4c0f6d0695f42b4add9cc3db93d15cf88c1aa9823113ab198738617a9f SHA512 2489b7a263875fb8248b9f06d9c11ee6ddbe584d74f91e2fe2412ec7ad78e3ec7b698da261d849f7089096afccc6f25851d9005ffa67212944196c9352f73d23
-EBUILD pyicu-2.7.3.ebuild 576 BLAKE2B 9a3cb9bd0bb322a3e382f16cfc55b3f98d50b6a058cf4ff4158d0e2d56ee6a1d9f910f4c0f6d0695f42b4add9cc3db93d15cf88c1aa9823113ab198738617a9f SHA512 2489b7a263875fb8248b9f06d9c11ee6ddbe584d74f91e2fe2412ec7ad78e3ec7b698da261d849f7089096afccc6f25851d9005ffa67212944196c9352f73d23
+EBUILD pyicu-2.7.3.ebuild 575 BLAKE2B feef69daec52c720ffd9f57d7f29c932f232eb3cfa71086cf3f3563859a7df6b7209ccb98f17d8f710bc40ba39f6d51b4848aa5f1308b9f3885579cbe4c8a7c3 SHA512 c0d3c1d6097facdf29fd11833672d9d3a8b7b94923ece6f168e27ff42e1b211567ae509c68e07bd6ff285a4ad8e1eff6be842d05e6f5004340b00d459ec7fa71
 MISC metadata.xml 414 BLAKE2B c5d5e032b7e62372f92e6312f926171dc1ebf9d382dc2ed0f45994cf0a9768b7d467d6ea1ad47be7e9f0edcb58967632bf1b0973fea745c4ce4ce2294ae349d5 SHA512 4e094880c6bdb97f02812d29d95db1ef73b0f08ac6d7538d10cc989e695fc6df5b931be03748ebcd61f07e3078a4f1d969cd58b81b886003ade233c24f932364
diff --git a/dev-python/pyicu/pyicu-2.6.ebuild b/dev-python/pyicu/pyicu-2.6.ebuild
deleted file mode 100644
index 8b50556d8dcd..000000000000
--- a/dev-python/pyicu/pyicu-2.6.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-MY_PN=PyICU
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="Python bindings for dev-libs/icu"
-HOMEPAGE="https://github.com/ovalhub/pyicu"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-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.2.ebuild b/dev-python/pyicu/pyicu-2.7.2.ebuild
deleted file mode 100644
index 98aecea4d8c8..000000000000
--- a/dev-python/pyicu/pyicu-2.7.2.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..9} )
-
-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.3.ebuild b/dev-python/pyicu/pyicu-2.7.3.ebuild
index 98aecea4d8c8..c8c40052fa1d 100644
--- a/dev-python/pyicu/pyicu-2.7.3.ebuild
+++ b/dev-python/pyicu/pyicu-2.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -18,7 +18,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="dev-libs/icu:="
 DEPEND="${RDEPEND}"
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index b0f98d3cdc30..98b91079332b 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -4,5 +4,5 @@ DIST PyJWT-2.0.1.tar.gz 57496 BLAKE2B 1258734d2cd5ca6a4012691bef0ae2a7d653908324
 DIST PyJWT-2.1.0.tar.gz 60092 BLAKE2B 59bde5f73558c74c964136ce0e8e9b5db6b76d226805fdb8aa8f201f00dceed0036693aa9295fa0ebac03c8fdac29a28f2aa79c697155c0ca744d1549e9bb47a SHA512 d701919c6cf06acb45cb0762a4ab7cc5e6ea247fbc0de80d0efdd1fc4b966c0d27c7400869858bbdc457b200586635aeefa8a38b85db818df6a8713f9bda8ab8
 EBUILD pyjwt-1.7.1-r1.ebuild 1370 BLAKE2B 51dea191f279f4758ea5aa6529ac60aa4ece061aa18438c1c6ac0874efe5262a0a979eed1c5ffbcb2df0b866a73032d60e5c2519dfb90d41e5dc8900cdc0b941 SHA512 21007fe2955e747c2185abb48327b21a7a397bc95c289f0acc4951230b5a17b3cbc22784d4bf413e3dbf4054ac1df878e187d383b7a9fea118a9dbc0ada7abca
 EBUILD pyjwt-2.0.1.ebuild 709 BLAKE2B 7dadb2bc6162ab45568e6b9abb55cf6a6225e30a4d8a99245913f2dce734eb347d62b1d6c66a58d9f39a547c4e253af8c070bf72ad78be6a152f531b0c72f903 SHA512 dc1315f8242059ff7c4ab32a785c26e907f824af0717b86d46985eddcb773294cd8cffc4646f39035e60d63dcabb4207e58f6c347fdb3b584cc036be31257d87
-EBUILD pyjwt-2.1.0.ebuild 736 BLAKE2B 492af7ed876a13e5a99183c1ff61671c2ed2b725238dd41f8e73e2a8c0257a2c34d9efae29bf8039851f6fbd336be7eaa0d3ddd6254de144fc84846540fc2032 SHA512 05dad6de9d132e09c76f64d1a8239024e274fd593a7274fe17a4c561c2e958feb4887b5284c6e8ac24718339626fdb0b6e025e9ee5463de3494d1bee50c8f317
+EBUILD pyjwt-2.1.0.ebuild 738 BLAKE2B aa3a91f493e99df758e02b33343002dfdc58202d45ce544ab5e6e6ec2cf5bf0d4d86e929269c32938d702c87cd4439eed41021008d9e4cec5629129304c83f53 SHA512 0116569b0bb36b973b3ea64e4922e1b0439885d217f1a36413ccb6e7e891bf1d8a60571d5750bb80c1c9b68f4b2131be9e1d0b46218c3dc98d4858025a545605
 MISC metadata.xml 449 BLAKE2B 72bc65496c7061fe2e9033a92e89fd44efc69ad8055559891279f8ed2fc60fbfa5cfc06c536a6904408f8da6db3537d70337590fc9af3543d35bf9f6d0f482d7 SHA512 1712608360e4eef320fccc8408374c966d9ca611f9170cfbf7043c3782eae002f2d85e56787474c4e7f119b694019495faba3d4e004db18865337db87d290b55
diff --git a/dev-python/pyjwt/pyjwt-2.1.0.ebuild b/dev-python/pyjwt/pyjwt-2.1.0.ebuild
index 0ef235564940..fe4664475ef1 100644
--- a/dev-python/pyjwt/pyjwt-2.1.0.ebuild
+++ b/dev-python/pyjwt/pyjwt-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1 optfeature
 
@@ -18,7 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="!dev-python/python-jwt"
-DEPEND="
+BDEPEND="
 	test? (
 		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
 	)"
diff --git a/dev-python/pylibacl/Manifest b/dev-python/pylibacl/Manifest
index 2a26253ddfe3..b34b81d5decb 100644
--- a/dev-python/pylibacl/Manifest
+++ b/dev-python/pylibacl/Manifest
@@ -1,3 +1,3 @@
 DIST pylibacl-0.6.0.gh.tar.gz 40231 BLAKE2B ba76f5540de62cec8572960b65f65289d7fe2066f76861240849c4c8175a9219b7ced086739b5a9b4d560a125c8fe759cc7b5b688bd4dc3d84ca4dc78897ea75 SHA512 a93ad199d9946490a863906411893a204bf801df71cf70217d6b29940a9365f05fd121116f22e054a3b8d27cd62e35c73566c1e0dd246ae5c0edd2f967df50ba
-EBUILD pylibacl-0.6.0.ebuild 910 BLAKE2B 7ee6fb119ce840523a97fc004eb5109d47f360f3c20e78be507506856ddcd7bfc2461d165b0c1bb10c94da0f9df71252dd850b9a94ecb049e87a0f9b3eb00944 SHA512 64a15fcd14ca015a659cdb3bc364761d3440cf7990b163578ccadd9cc0dc0bc927819e0be1a52fb2329be04f1093091441b282bfb67309adf9afa616bfff8d5f
+EBUILD pylibacl-0.6.0.ebuild 939 BLAKE2B ee3eba728784b26691298cab92e375c0fbbd540ff0265baf494cb5055c2d38e61fb46007efd6397c7e6f8e23de162efbad5286ca8fc0dae4a23435ff2dea6885 SHA512 6f37180f8b7712a94a52e892c1dba792ca7e24e70bd21753d6db3c711d0ea8b3728cb5134547e41373b2713775fccbf3149a31eb501e52a768d8abae81c61422
 MISC metadata.xml 445 BLAKE2B 01fa6d3dbb4f640a84c7cde4fc2c0c2691345fde557c7d26af9b5aaf5f64ee281a9c50eb273471ef3ec1a4c7cdfd8b48bccfdf3e50804f88981353a7a5433ce8 SHA512 b5fd28a88149cc0afb3535daa5c5e8f67f137e98c0671595a381d9d748212ed93a3226339b4999c7cfce1779fa6fa0cf568f38610ef77fed685e62dff9f9a344
diff --git a/dev-python/pylibacl/pylibacl-0.6.0.ebuild b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
index aa83a7dfbfce..fb914b7a8bd4 100644
--- a/dev-python/pylibacl/pylibacl-0.6.0.ebuild
+++ b/dev-python/pylibacl/pylibacl-0.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -23,6 +23,7 @@ KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 sparc x86"
 RDEPEND="sys-apps/acl"
 DEPEND=${RDEPEND}
 
+distutils_enable_sphinx doc
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/pyls-black/Manifest b/dev-python/pyls-black/Manifest
index a6161b7ce64f..0c4d0e2a6bc2 100644
--- a/dev-python/pyls-black/Manifest
+++ b/dev-python/pyls-black/Manifest
@@ -1,4 +1,3 @@
 DIST pyls-black-0.4.6-gh.tar.gz 5121 BLAKE2B fb1265d40e7c8b85d066d8d3078a60ff719992abcd84efc9d9df582d6fd7e47f211dbed004081413955524e9455218085d78f1d843769a40168ac448139e283c SHA512 e9fa3faec0fb3f2a8bcbdd4c9b8b8e6662d1bcafa88f693b09e2a7a4df8c2d35df8d8f79c50bbb33342a07cde8931e7f136136ff40879898612b13bdff7277fc
-EBUILD pyls-black-0.4.6-r1.ebuild 586 BLAKE2B 01ac0d0b234ac66358f111bb23588343baad97cf7dfa28486df7aa0810cc1205a6d07af92748a26e1cd440a9a36bbd214a19fbc34132f80d3135cf3bd6762d33 SHA512 72bb4ba47685f24fbd91e2549fa8085f714ec873b4d580ab80e171c4dffdf9ed8e809b3f28e18442715d1638a16c3d0b2255e9012b3cf4616fd31a1721f2dd11
-EBUILD pyls-black-0.4.6.ebuild 672 BLAKE2B bc8f2814d68463e21af47c15e8cd2cd6b5471672aea30d9e3beb0fdc78ac13f26aa58718523c87ec7c5553e73a3b77d69cda1038f6d43bd455c91741a8e91287 SHA512 583e9f27cd2f7447aa74efcac2219f9cbb41f28cbee6e89d268b5f3884b10b427b08d3ac1273417194d5f0d99dc361014b9d9faec01eb9f59d86f7ab09a90f16
-MISC metadata.xml 559 BLAKE2B 9126dc39c0ffe0b2021159097851c6a3b279a01c535df18bae814ecea07a5f1204c5ed770d022946f090dd691e4f018e6fe9cfb9e2526744a71a29f8d3bf061e SHA512 79a4ce757e46cacf19f048350ddf8fc82767d00d92f39b92ecf2806501eec1a57fa9800ac5eb7b1460a624e7996a065217d15cd5907ea491792696f7730cf3cd
+EBUILD pyls-black-0.4.6-r1.ebuild 588 BLAKE2B 5be9ec47d5b4874b489969aaeec5af60eace5bb2c3ed1388f6b3ef7ae4b7f606a38a16254ed2f46c1a996bdcb73a147affca934080eb3e35be02c6557eb28b8c SHA512 3f020431e190add9ee08c322634b8903fd702e693f0b4c234385142be66e22b3990e9308ba69c7f5861214c3d784f79fa182ccdc0cc1353b77e9d7d18b6747dc
+MISC metadata.xml 412 BLAKE2B 7222f35dacb0ee8c88e71efc1f9c11c4f029f479102dc2410dbc0d61e7cbf129fbc76bfc7dc62f0ee784a02ff92b8c90f74230e6f00988d455e8f0266e39ec51 SHA512 6059d5f251b81ef9a2b29d379b3d19859e4f8f1aa8588044f1a36a69aaed932840cc9c200efcedfa7ec8f918d8cf1d9ce45b89d73323cb2b872a2e14cb782e18
diff --git a/dev-python/pyls-black/metadata.xml b/dev-python/pyls-black/metadata.xml
index cc185c88ead3..7b06e078f1b6 100644
--- a/dev-python/pyls-black/metadata.xml
+++ b/dev-python/pyls-black/metadata.xml
@@ -6,12 +6,8 @@
 		<remote-id type="github">rupert/pyls-black</remote-id>
 	</upstream>
 	<stabilize-allarches/>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild b/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild
index 88c1b0d5e0c3..ed69ccf14ff8 100644
--- a/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild
+++ b/dev-python/pyls-black/pyls-black-0.4.6-r1.ebuild
@@ -14,11 +14,11 @@ SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-python/python-language-server[${PYTHON_USEDEP}]
-	dev-python/black[${PYTHON_USEDEP}]
+	<dev-python/black-21[${PYTHON_USEDEP}]
 "
 
 distutils_enable_tests --install pytest
diff --git a/dev-python/pyls-black/pyls-black-0.4.6.ebuild b/dev-python/pyls-black/pyls-black-0.4.6.ebuild
deleted file mode 100644
index ba2c2f835736..000000000000
--- a/dev-python/pyls-black/pyls-black-0.4.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Black plugin for the Python Language Server"
-HOMEPAGE="https://github.com/rupert/pyls-black
-	https://pypi.org/project/pyls-black/"
-SRC_URI="https://github.com/rupert/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	dev-python/python-language-server[${PYTHON_USEDEP}]
-	dev-python/black[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	distutils_install_for_testing
-	pytest -vv || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/pyls-spyder/Manifest b/dev-python/pyls-spyder/Manifest
index bfc64290b48a..3c54e459258b 100644
--- a/dev-python/pyls-spyder/Manifest
+++ b/dev-python/pyls-spyder/Manifest
@@ -1,4 +1,5 @@
 DIST pyls-spyder-0.3.2-gh.tar.gz 8781 BLAKE2B ac24e0433c2e5ba43274d6266bc7532e7a1f1b0c3c34b9acfe10e5c7d789937536e81c4b19f96090f32d34c932529c0f4c23b49d2b01e7a0b628f8c2dd6f7611 SHA512 c08910ebaf161ceb712f273f054add1f3a202684b001d8d95650555bd67fa5675b3fef9e3d62d0d1b9da0f5adfeae9ff0fbfee44e4362856550d77582dbc6e95
-EBUILD pyls-spyder-0.3.2-r1.ebuild 597 BLAKE2B c8585464bcae1da2180305d20afcabe4d05d1abbbb3170daed653b6787add41a90e9cca2d429baa59b69609f838a9df4a27717abce7beb8b7a62c0ccdab29d95 SHA512 3794c130e17dbdefaeae491bb37558074e514d4a961f520e9abf01e4bceb6a2f223e20964af27b1a4fcc74519c1529ff9a1adf1e0a358203227d877e40ae177e
-EBUILD pyls-spyder-0.3.2.ebuild 593 BLAKE2B 393d2a7cd130260dd81158408652872cf35dd270b02814e696e05e86e2a8cfdab94aeece5d184321583864b25ce61db57c95dc55194bb1f0d798f2bc26144b4f SHA512 e1b485c45aac28f1f31b32c7cf68f6fc762d02c7bb8f87f4420cf57f7119df2b9f6405bbddd4caa87fefc5dbc8935a0ca190c069e57d19a0c46273ffd85fba06
-MISC metadata.xml 584 BLAKE2B 68e80afeb533c195a73554ec8498d9a419260fefb7bb084350d446088bdb3af7f9fd1c06add2cb32ac31f751c06271acbed27e65e656c7cd9314a3bd2b844a84 SHA512 e17357b928f91acb0ca60e4c2797c607d117a307d9bbb9e0de81fbca48231a42c8842872dd962897aedaa233f83dea8454cebec3545b04dfbb816e86fa5ae4ed
+DIST pyls-spyder-0.4.0-gh.tar.gz 8854 BLAKE2B d14a78be98c1db0a37a2fffe2e6bd8955687a95af8524c852d434e57cdd157dda8f5ecceb19ad34527dedede4497c59fb7949a709d266803c2d8cd67c60380ce SHA512 5a9d6667cb85434ec41a176e097d20c78751d5f3879d4d361e097da214b54b37fbef97d95a763a58d7f5e3c148215672e769091814f06a34139c6625cdae3f9f
+EBUILD pyls-spyder-0.3.2-r1.ebuild 595 BLAKE2B ed213a646d2c88b0d7a039269cf82f55e4828349468b2f708b617bf88b0e1c819b95ec6bb2bb6031fc82fa4bdb9fc7e776f8513415f572b339b2e3e536272230 SHA512 c51c944f6884b03e7b75dd7635be9c506b7146ce0aba55bfe83d1d793f59c9aa461d9172a591a660e69c772ac6afcd1823d34c52995642f07d0574fd7861f0a7
+EBUILD pyls-spyder-0.4.0.ebuild 600 BLAKE2B 1a2582b0ee86ba3b74995420d58ac2257f19957fe7ead2d4ef1ff3b61abb92260c00bfea0559929913ed67c2fe38f4101009b74f11f9577a15e855668daff0e3 SHA512 8f147f6382d7bc44525e8166a0a65bf4e0f948e7a48a8fa5c7b77de2649ed97cca05b09c4b2dd5d7167c411b9c4d75abb003a77f6b2d57ef4329685f5505b518
+MISC metadata.xml 519 BLAKE2B 56a611a4a62e08659e92f60d8262aaef2b81c60036517b7b6cc47c1d9af998e6d18ca08844ddd1ecb6c6853db778a9f79edc34e4618d363f7e6fe93ddaa60a11 SHA512 9ed90f62c0ec5fb27f5d18b78df942b9bfc15fbd39d39ef21eb050d011a880514a4f1361c84e72f026195bf9e8630d65f21136170c90c7929f83bc69c74fa0cb
diff --git a/dev-python/pyls-spyder/metadata.xml b/dev-python/pyls-spyder/metadata.xml
index 3a143bba6eb1..3539f1f0e9b7 100644
--- a/dev-python/pyls-spyder/metadata.xml
+++ b/dev-python/pyls-spyder/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <upstream>
-    <remote-id type="pypi">pyls-spyder</remote-id>
-    <remote-id type="github">spyder-ide/pyls-spyder</remote-id>
-  </upstream>
-  <stabilize-allarches/>
-  <maintainer type="person" proxied="yes">
-    <email>andrewammerlaan@riseup.net</email>
-    <name>Andrew Ammerlaan</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+	<upstream>
+		<remote-id type="pypi">pyls-spyder</remote-id>
+		<remote-id type="github">spyder-ide/pyls-spyder</remote-id>
+	</upstream>
+	<stabilize-allarches/>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.3.2-r1.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.3.2-r1.ebuild
index c83b8414d3a6..de6152857350 100644
--- a/dev-python/pyls-spyder/pyls-spyder-0.3.2-r1.ebuild
+++ b/dev-python/pyls-spyder/pyls-spyder-0.3.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]"
 BDEPEND="test? ( dev-python/mock )"
diff --git a/dev-python/pyls-spyder/pyls-spyder-0.3.2.ebuild b/dev-python/pyls-spyder/pyls-spyder-0.4.0.ebuild
index 8557f82629e8..0e13e95ffaa2 100644
--- a/dev-python/pyls-spyder/pyls-spyder-0.3.2.ebuild
+++ b/dev-python/pyls-spyder/pyls-spyder-0.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit distutils-r1
 
@@ -14,9 +14,9 @@ SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
-RDEPEND=">=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/mock )"
+RDEPEND="dev-python/python-lsp-server[${PYTHON_USEDEP}]"
+BDEPEND="test? ( dev-python/mock[${PYTHON_USEDEP}] )"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pymdown-extensions/Manifest b/dev-python/pymdown-extensions/Manifest
index cab186001c2c..12a11ba760aa 100644
--- a/dev-python/pymdown-extensions/Manifest
+++ b/dev-python/pymdown-extensions/Manifest
@@ -4,4 +4,4 @@ DIST pymdown-extensions-8.2.tar.gz 766818 BLAKE2B db14bcb0e7bf572e97c6dc7d7ebb00
 EBUILD pymdown-extensions-8.0.1.ebuild 1555 BLAKE2B c16c2095c8ef9b6f279474c62c9f931257f30d1eb0a98b0cb9bf3120d18ad6171fa225ba3ddce9ddd158798850eca5e0f36253105b7aeedfb8abe9b33be67bf9 SHA512 83c34fb23bc4652ef28ad6290944081bf554663d5ea881f6699f373cc9e34f72ea08542fef2365d439c137329baecd44340df67d20397a34733626b5c45a9b2c
 EBUILD pymdown-extensions-8.1.1.ebuild 1187 BLAKE2B d06ab2588741497006b6d79ceb4ed139dfc194c3bd38eb72878bac1aed762679cb9b3a1a040072323d54fd77d766e60285c501462e48174cb7ba0e4c7a3282e9 SHA512 8834351713a8403334c5022210d3a4c915bd99fdad7b97ab8621b8ea104b5060e4871abb624b593936684df6a8c44414dee7a2e711e0e6e75d6e022dbd172030
 EBUILD pymdown-extensions-8.2.ebuild 1186 BLAKE2B c6b96e35f20edf2cc4739d8a48c3b5841da2600db2cf89617a9d8182ca2b87566278cc95e5e47b00e1baf28b87509462453285390d5db553846b3d4aea9f8686 SHA512 cf453c3792b8d8d9bda0713d24aece7e855797f42190d8d7f2e6df5046570303ac12f5447291e8691791ee1131fd29f6807b610e1fd100bdb555d955ca041353
-MISC metadata.xml 658 BLAKE2B c3c02e20a11ffd755742b5870212eb17977c133f331e84ccd92c4e7f152ad3a08844feb92b0709ccd7ef527af5abf782e9dc7931a48e26df7564dd739c71499b SHA512 46ac38c817c306a627f9a25dce07fcd74bf75be663118e024641412f09d235f3c37777dd775eafe091a264dc5d39a12e142aec6f82e3dfead8da8d97bf5e10f4
+MISC metadata.xml 511 BLAKE2B b5a68b917839d33949dd5b3e215472912088c4d309b0ed2bcb03eae8037369f08e2a305af85e919bfb71d3e5854618ffcad97b1e73c393648688469347d2b369 SHA512 b32168fb28f40f96cc22c1f1e16ab9a03bd62ca85661aa89b203c6626099e28a7dec6a6af8bdbf251360e21e5aa43c727e44204a2b355aac8546008f660582f2
diff --git a/dev-python/pymdown-extensions/metadata.xml b/dev-python/pymdown-extensions/metadata.xml
index 8e69a6776f50..15a26705528b 100644
--- a/dev-python/pymdown-extensions/metadata.xml
+++ b/dev-python/pymdown-extensions/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</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/pymdown-lexers/Manifest b/dev-python/pymdown-lexers/Manifest
index a5509bdb5fc1..a2eb95da08c3 100644
--- a/dev-python/pymdown-lexers/Manifest
+++ b/dev-python/pymdown-lexers/Manifest
@@ -1,3 +1,3 @@
 DIST pymdown-lexers-0_pre20180905.tar.gz 2596 BLAKE2B ff08ac12fbb242ab5b51b80f91d18281cf8cd9bf121b1a6d389ef47a069c614991d6fb99ff05cca9802e68b4dfc2c89d9f6d4b02051a133968ab9ee24943756b SHA512 d0a509cdd9924053b79259b873ec3a3671869b37f7a97112370d21c360f6315961d13610cf08a00e10f58d5e25ac360b3844fc997392dfe724ec14f02a079596
 EBUILD pymdown-lexers-0_pre20180905.ebuild 558 BLAKE2B 9f9f3c1a239fbdf3abf143926d83a8066b7b500c52b0410b31ecc49245b0b82b5d47b51a7faabf476b1f3476ee2063ee2d943685f8553aa0b8c11290356d5d1c SHA512 8eb46df0690ef63d4913bc06cc938b39bf01ad5862d51992112bcbce0d8258dcb87f23649b87fae1ccb8f97e2822303f359c06147833be6fa3baef0ed3651bf1
-MISC metadata.xml 631 BLAKE2B 3acbf47f898f92294a65d0a65ce121238acca668c9802d0eff4e82c652d4bd7ed1e655f0f5bab12c887a405b707f98de4da4e234fd5fa11d8503d44bcb6dd94d SHA512 79229b1d5c5a080abf915b4a43e8ba23c7369ccfcf79824d1c6ef3d9cc3f36a009c7a8800a87bd33d20133875b725d570fba8662928d643a6d291c58c9a78e3c
+MISC metadata.xml 617 BLAKE2B de6281be935e74606c1b2ecaf28c1f22f237d830d959217728a4e194ef3911651148e059f3528ca671b71f1589d8821c5c638d664e3935b26f40bbd63a1a00ef SHA512 8df05380fece8b006abe5145eb876dfad712832b12743c81623c1081d7d9d1a3c8d1b7fee249a2fd8448039a243fb296dbb8f7f8f2d32181e960c6d1196518ee
diff --git a/dev-python/pymdown-lexers/metadata.xml b/dev-python/pymdown-lexers/metadata.xml
index 924bc0a43c6f..55ec4409f77c 100644
--- a/dev-python/pymdown-lexers/metadata.xml
+++ b/dev-python/pymdown-lexers/metadata.xml
@@ -5,8 +5,8 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
diff --git a/dev-python/pymssql/Manifest b/dev-python/pymssql/Manifest
index a7cee644b197..26adf2221efc 100644
--- a/dev-python/pymssql/Manifest
+++ b/dev-python/pymssql/Manifest
@@ -1,7 +1,4 @@
-AUX pymssql-2.1.3-remove-setuptools_git.patch 243 BLAKE2B 51f598a199867a6278518a0d204a3bfffcba662e22377d0b927e404a420a32a771a56ab23c99b8fa819b216e95efd8efdb8f61955da1ed79e64c84cb6b6634d1 SHA512 e8a24dfd4e4c6320ef854592d890a8e34870884ac05e0e60a52bd4e05f5eb7fbac86311da98d1ba8be2a55233788e070f7dfc529570c1cefe25471abbd22fa20
 AUX pymssql-2.2.1-clock_gettime.patch 882 BLAKE2B 946af94874afe840ba4a44015321bc539695100bc9a73b5ffc0c5155c34adc8820eed0447261ce6bf8b404b16336b56b16d77c7281db1eae0f680808aabbe9b1 SHA512 27fed1a9b0b8f8fdad6a744da1c6c46637c9a1a755fb0cb6ec5b025314e5058365377828b9cebf19cb31f0dd59c4a4d500951a7ff32a1da4c08f1c85633f7043
-DIST pymssql-2.1.5.tar.gz 167928 BLAKE2B c94fc29fa9d83627dbee05095a7c0d6e4e2d42ac34b0e6801bbc757d89728aee409c98519d6e8bfe8d5009f06f88bd23a3e62c050f2c964cb7139bdd3185a0b5 SHA512 7cc7336d4c2fcb7c3958fb3127801e3505fd93259d1aaef40a67941ef5aa519e285cdb04fd378c9712f29b0f8a25ce1747a4a8dc21ec57b004c9f0ceb8f5afab
 DIST pymssql-2.2.1.tar.gz 170421 BLAKE2B 0bd57ffef97f6a557bf78056ed0f184c3b5de09fa031f80f1b7420486bb137ba1750c2ac63e89c0476a3b1808e08beb037b2d9c3fce89bce98a266626222b5c7 SHA512 d44fbe506d7daf3b5fc1dfa20b99814aa3ed025cf8e4e14097f53014bc21918e0969e15149fa93c39367a06567502be08bb673e30ebdf87d6fc2c30b01216b7c
-EBUILD pymssql-2.1.5.ebuild 837 BLAKE2B 56faa9add8ed0774bc3498ff797f3fedf82b64172eadd67db4dce99838f8c9ee82d4ccfbc524583fc34353a47de8a6fd160137b6d6dc329e2950d68eb2b5a9c0 SHA512 7a328313cbc1f703d89d0647a8d1b6091f419e22b7f47217f874e6d7dd48a223668b423d5b799d1ed6b2635f523a5b12287a87081d54ea496c15c6f4671d9f4d
-EBUILD pymssql-2.2.1.ebuild 856 BLAKE2B be986462234d21a5571858cd52bfc35d9c6122f1b795ff893fd4e782603383af0c67ed606af2171db8ca5bab805f129967049ffbffacc2900909e8b4ebf3c22f SHA512 00a769e4091a1127ed4283a366ca4a8fc8ff88c4724a479f1909b33095547bb85f18325225da0fab94722a10f02a1cfbdb6fe11cc631ed359286c0a33b0ab0e0
+EBUILD pymssql-2.2.1.ebuild 851 BLAKE2B 909212153912d03ff79e9fd0099bd549df0a294d76705c24229c67b8f2631074d816c9b37955bcffc5e913b2ecb428e8494124cb3e682a15dd31c1d3d939ab49 SHA512 0d0e245bcfc83befe42f549bcef2048178777d568d70ac2401b1be536de8aaa6245c68ab5d0d8134b029555b60760fcee58cc7a97e3c3294e3b07277eb59fa45
 MISC metadata.xml 287 BLAKE2B cafb123e3b26779c3a20717f1fbb6bf1b567c5bd7116ee3f78af658c27ad6fe7c2a2e4e1f8474ff2c8a798259ff1a906c29197a506a0eaed7521f3e102faa36c SHA512 0bf5ac83b22b5b8be4af595e89e7eac936f2e9a6f9a5a1c85248a52c52f8fd1a81bc291ac295e071f0ec4d1368fa20e3c834d7cfa960757c0812a3011ac18a4f
diff --git a/dev-python/pymssql/files/pymssql-2.1.3-remove-setuptools_git.patch b/dev-python/pymssql/files/pymssql-2.1.3-remove-setuptools_git.patch
deleted file mode 100644
index 1a35cc064f78..000000000000
--- a/dev-python/pymssql/files/pymssql-2.1.3-remove-setuptools_git.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -472,7 +472,6 @@ setup(
-       "Operating System :: Unix",
-     ],
-     zip_safe = False,
--    setup_requires=['setuptools_git'],
-     tests_require=['pytest', 'unittest2'],
-     ext_modules = ext_modules(),
- 
diff --git a/dev-python/pymssql/pymssql-2.1.5.ebuild b/dev-python/pymssql/pymssql-2.1.5.ebuild
deleted file mode 100644
index 0c605034ed92..000000000000
--- a/dev-python/pymssql/pymssql-2.1.5.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Simple MSSQL python extension module"
-HOMEPAGE="https://www.pymssql.org/ https://pypi.org/project/pymssql/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="test"
-
-# tests need a running instance of freetds
-RESTRICT="test"
-
-RDEPEND=">=dev-db/freetds-0.63[mssql]"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-python/cython[${PYTHON_USEDEP}]
-	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/unittest2[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.1.3-remove-setuptools_git.patch )
-
-python_test() {
-	py.test -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pymssql/pymssql-2.2.1.ebuild b/dev-python/pymssql/pymssql-2.2.1.ebuild
index c272cd2b2d62..4c459086beb3 100644
--- a/dev-python/pymssql/pymssql-2.2.1.ebuild
+++ b/dev-python/pymssql/pymssql-2.2.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="test"
 
 # tests need a running instance of freetds
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 3e38d669301f..b9ec15968fac 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,5 +1,5 @@
 DIST pyopencl-2021.1.3.tar.gz 447070 BLAKE2B fcd8c5d06de9c14a7bcf3c3d37f89cb208adf0225cc88a081aefc86aac82a99026183f2c9975f34cd8247f784335e4ba6c0a09164ce01e527123b5c1dd952a76 SHA512 8799e73b3b1596387f619fd997f643228679fb1d9ab5ce6704da9df51922f96229efc98ab6b7a7361234848078b15bc67946a4188f4d17cb8760040b48b346e8
 DIST pyopencl-2021.1.6.tar.gz 448568 BLAKE2B aea3f6f28d3377b0b8aa7b6c726252299039663e9684316f48c5e875be9d25600582a4af931cacda3fa39834c000a00e2d29720ed6a3cca8e46141ee189107a0 SHA512 320b521e9ed05e0c183d0535b81f27355bdb21577a8a8ba254599a9e853cbe6e0ef44ee6e5be742b44fa1e1e5005732643217f327e4b347845ee6c706db5da87
-EBUILD pyopencl-2021.1.3.ebuild 1458 BLAKE2B 813176a34b1b1d3110bcd6535e9a9036bc62b720c7b24926e791437ac1ae9cfc5e08705632a1ce059f2ee9e7d7917d0b0d22310200d90967e734202e8f2f2abf SHA512 f163387b2fe9a65dd52b94c5d5f2c12c4a105cbfc47f5d4c2bbf3327668f0bd646ee0af37e737fbb862f278d0e239e503d29992fd9ca44bf87a23c0d743cb2f4
-EBUILD pyopencl-2021.1.6.ebuild 1459 BLAKE2B 59d479bafd5c8631579ae52b0d1ee05da5580223dae30fc56c71b6f8174f7a04743a3ca7f41adb53cb7e3eb4681d43200a91b7158bb48cd0e21174d4443375c0 SHA512 1c338fba025f055da1dd75891f90898ff36cc8976ba1a34ae0c6b0157d5c5c5f53799d92bfaf01839a45940f09f8000bf213658a3e315134c85bbaae6bc1974b
+EBUILD pyopencl-2021.1.3.ebuild 1458 BLAKE2B cc0a0ee17bb7c072098dded2973d6e13142797c6b867da34bdc9d1a7d6ba00f0dded0fc9b9a0ca48037dd2a0fd394338fa3a729153b7c09a653e1ea70f453b56 SHA512 42e47d1baf85acf94087fc0f23cb8660bdd36adfa8054560f10d5db45254fd05c72b5c523e75740b2e49e13613d6af3f0ae691b3d8f434e8e39b7b9e0960aaa3
+EBUILD pyopencl-2021.1.6.ebuild 1460 BLAKE2B 1102a8a5aed69bdb9ac19f8eb775731a5cd0aff8150abc6c6fda164c85f9997cb0632d4a190aac9d474814472bccdd0ac09320423454b1ecbfe1c0ba2eca039d SHA512 8152742974fc8e34b2cd5737a43edf9993bf5bff46c34000ace1b8b30ed49da5f9c842ba1f90f3c78e2a6f3f58ec8925d7d3c10ffc83746a793b971c9720d432
 MISC metadata.xml 316 BLAKE2B 46de5d09541dbd7e1ae6cb3e46a87f0f7dde068ca48dfb4f8885b3f25a2c6ad258019a7585bc6dac42a01ce41292d5458aa7ba122fd81a1fe6f12307b0642966 SHA512 1ac69571c5ff5abb94dc68dc87d02d8675e12e120dedb0bece65a9cb81764f496a587e7345b43e8037f8d7ed6e269dfa276d8482ab42fdb4f3adda336570d703
diff --git a/dev-python/pyopencl/pyopencl-2021.1.3.ebuild b/dev-python/pyopencl/pyopencl-2021.1.3.ebuild
index 2c8ad069433b..a08b0c4fd9b4 100644
--- a/dev-python/pyopencl/pyopencl-2021.1.3.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.1.3.ebuild
@@ -17,14 +17,14 @@ SLOT="0"
 KEYWORDS="amd64"
 IUSE="examples opengl"
 
-COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
+COMMON="dev-python/numpy[${PYTHON_USEDEP}]
+	>=virtual/opencl-2"
 RDEPEND="${COMMON}
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=virtual/opencl-2"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 DEPEND="${COMMON}
 	dev-python/pybind11[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyopencl/pyopencl-2021.1.6.ebuild b/dev-python/pyopencl/pyopencl-2021.1.6.ebuild
index a9a305e869f5..863ef6a22457 100644
--- a/dev-python/pyopencl/pyopencl-2021.1.6.ebuild
+++ b/dev-python/pyopencl/pyopencl-2021.1.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -17,14 +17,14 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="examples opengl"
 
-COMMON="dev-python/numpy[${PYTHON_USEDEP}]"
+COMMON="dev-python/numpy[${PYTHON_USEDEP}]
+	>=virtual/opencl-2"
 RDEPEND="${COMMON}
 	>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
 	>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
 	dev-python/mako[${PYTHON_USEDEP}]
 	>=dev-python/pytools-2017.6[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	>=virtual/opencl-2"
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
 DEPEND="${COMMON}
 	dev-python/pybind11[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest
index 1e8baa87a567..d4eeaa97adef 100644
--- a/dev-python/pyopenssl/Manifest
+++ b/dev-python/pyopenssl/Manifest
@@ -1,7 +1,3 @@
-DIST pyOpenSSL-19.1.0.tar.gz 160510 BLAKE2B e6e39f860221a2696aa3fa32ac89ed48e34b18e4accc366a86264d943a15a1b00ba1a0d8349550d1775d25836aa5d214e1e3fe4ec0a9c0f6d5ab00cd9fede633 SHA512 4acd96f287d72eb11bd812697d28cd6eb6a96a4653248b65f967187830a6b17cc1254775a18a3405469f3d45abdae6f02d165f2f35f035f3174c2826fba82916
-DIST pyOpenSSL-20.0.0.tar.gz 173786 BLAKE2B 3fb1e90e20b3e083fc93f6dc8a54fb54e15ceb38c4d2e84e2d7d68bb56f9e3828cd264e3554f25465e858687e74a7f20b91216fb7a0b4b2c656ea86423cd3442 SHA512 26e8a64d53a35434ad4bf5ef50ed5c37d7b92b0db971a2103dcafea56a0b377d67333af630a31405a97cf2cffddde320907b4950ed336a8321391854bcd2c50a
 DIST pyOpenSSL-20.0.1.tar.gz 173736 BLAKE2B 37e1741425a296142d38c20c70f9950eec2bd043fc58e50c9955b98dc6825111328af852d247b154aa120ab42ea9dc2ae8186d350dd0c664cd5920b9a902963e SHA512 e81e0870398b882d77453b02e972559c0be82dbfe87bd8a48a65e8943acc3ea07dc8c3150b88e299c237496043443d1a5832219c337e4436f99ef419b36dd23f
-EBUILD pyopenssl-19.1.0-r1.ebuild 1394 BLAKE2B 4984732d92add2817d671af037bba4c81ae5310626ef3d6f97906e6bea686a25cfb6f626784e32823e8a1db994a44d51ea5fdcdf78b1f727c35e1234e991d64e SHA512 1abde17a2921dd8a9862abdc25b5b317d712df2e1d8e5401c6873ca0b926c264d81442eb9df8f6ff4f3cacca8cfceb469ebfc1c8a56f0b5f279f8e46b022ef40
-EBUILD pyopenssl-20.0.0-r1.ebuild 1397 BLAKE2B fe16692349c2f737177524189856d39000d82880f8105f9afcb4d23ee3e2184680596359604f0c641521980f79999152455de7da0b3c7a4fa22ed193d9eb2584 SHA512 3fb1da86880a51c4c1d0fb185caaac45c179f47ddc3e3435a14b610717a5c135320d540c929763e31059bd29629c8e58b1945897a9f4d07c253e983a321f10ae
-EBUILD pyopenssl-20.0.1.ebuild 1816 BLAKE2B 6f3a8d5649924f6992f5781d0e10e172586080c1521388cd467c1a28d313b3ff76374e1cd9c08cbb668d5039bc40e6c186520e791e3e8966ac8ae8e7315a49bd SHA512 20b6244d8ce191cdb44e8030d6d748dc9490ccde5f2121645018049a89dcc21050dac000fb881ed92ff84d7c3e5039388542625c6073c200f85239481f5e3856
+EBUILD pyopenssl-20.0.1.ebuild 1816 BLAKE2B 13d011399ce88ba255b778691107133cbfbb969fe5eb97e026cfe72b34d627e1a7bdcdb8a4d883970964fe47cc5215a64b0fc2d1d7e0c5858a00d497b3fa7125 SHA512 681a5ac95d9379a05b85978b04887ae80505bb0a88dfff9a95e3e35a18df8e22e31ee8a86dde0a09c807e1e9902e1b8c26f92af4378b2f2ffeb82d2c0abda14e
 MISC metadata.xml 535 BLAKE2B bf6dde29d0d101534792aab82e884425a32a6d96385e21e46d760902684b32d0560c57eb8be37db82365f5332906540d145f88bcd76626f00a11e12428664ced SHA512 64f374479e80652f5803b3c6ef3fbeb94c3dc23c5805b11390979be02c312c631ad8ddca0056f439f41da7ebf245119c7da1110cad637efb0e4290be9fadd4f3
diff --git a/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild b/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
deleted file mode 100644
index 180a40299af2..000000000000
--- a/dev-python/pyopenssl/pyopenssl-19.1.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	https://www.pyopenssl.org/
-	https://pypi.org/project/pyOpenSSL/
-	https://github.com/pyca/pyopenssl
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-2.8[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# Requires network access
-	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	TZ=UTC pytest -vv || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
-}
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
deleted file mode 100644
index 24caf321b365..000000000000
--- a/dev-python/pyopenssl/pyopenssl-20.0.0-r1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1 flag-o-matic
-
-MY_PN=pyOpenSSL
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Python interface to the OpenSSL library"
-HOMEPAGE="
-	https://www.pyopenssl.org/
-	https://pypi.org/project/pyOpenSSL/
-	https://github.com/pyca/pyopenssl/
-"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-3.2[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	test? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pretend[${PYTHON_USEDEP}]
-		>=dev-python/pytest-3.0.1[${PYTHON_USEDEP}]
-	)"
-
-distutils_enable_sphinx doc \
-	dev-python/sphinx_rtd_theme
-
-python_prepare_all() {
-	# Requires network access
-	sed -i -e 's/test_set_default_verify_paths/_&/' tests/test_ssl.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	TZ=UTC pytest -vv || die "Testing failed with ${EPYTHON}" # Fixes bug #627530
-}
diff --git a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
index 0fe6df2d2da7..3d086041dbbc 100644
--- a/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
+++ b/dev-python/pyopenssl/pyopenssl-20.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1 flag-o-matic toolchain-funcs
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
diff --git a/dev-python/pyotp/Manifest b/dev-python/pyotp/Manifest
index f9731d86deac..8e9741cbc6a7 100644
--- a/dev-python/pyotp/Manifest
+++ b/dev-python/pyotp/Manifest
@@ -1,7 +1,3 @@
-DIST pyotp-2.4.1.tar.gz 15232 BLAKE2B 0690364209bbbfc7bdaddc0204168a584696b98d974b203513ce8f6ffef9751ed1c9d19b7f875631805cf704ca494b2412eb731b0415fdedbae7f57ece630981 SHA512 4bd60ecef1ae22207732a539e5b46c3ca35fa6158da552e537aa522bfe2a2e0743f7426c437cd93cc9901ce5b834cbd9d9e4481eb95478871367f1d5373b67af
-DIST pyotp-2.5.1.tar.gz 15503 BLAKE2B 73cbfb37f0d795b5d7a538e7b973c0281f161226559df1a8db20d4df5121c0efbe8dc8b0bed806903a83dace3388efca6c1ec84a6b7ef21becbd020c04074ffc SHA512 628bcc4c18c469dff9007cbe2f4a9b55a2100e1845e3196fbf2f55fd37b6c95a0d4d5df7a31f8df3e84b8a1b48151cb8048574cf1cda6bc7c098c5c0fb6e5649
 DIST pyotp-2.6.0.tar.gz 15687 BLAKE2B 9e1b97c5fd5a3d9b335c173d44922a0427f9f49f4fb27579ee528d1e6f4776b33db31a1664a9bd6295bbec331458e17ac380c1fcd9860bc200577051f2af2e7e SHA512 8d650c6840dd243c4dcb522745ae80b462c1819bcafef226923d13be6a2b096cf5f2146829fd553d5e096d82b67725706d69d0cbb15a5d6586ea234201671bcd
-EBUILD pyotp-2.4.1.ebuild 464 BLAKE2B 8bde98b74adacacb90fdd68a364cbfd9ee4abb8071d11c6ef002157739697d59f416c18ad9cc65b7283ae32d67ae0d2472517aa00288c18bbf8fcf53abbd9391 SHA512 5d99dd08b4135997e0392e0bb78c929bd0ecca14d640ee4767122fddd09ddf96e5dedcb762442d85013770c123c97890b817565264ca5f3381f3cb37cd44efc3
-EBUILD pyotp-2.5.1.ebuild 465 BLAKE2B eaec5f8071a70132e171860e228b6a9e69def5df9ba9e77a2af7affcc4306bfa55b9db08beff6b4233eb08be861dfc3e26bcc4d5f13b53d5cd9fc1df85f3b10e SHA512 8a301ebe087982331b499f7207ecf7d843c20cd176e17f3b08da420bfc3d74f0419321bcdcbfd5f15ac3cc9736fd725ba598040a314803b91b59b8498a78228a
-EBUILD pyotp-2.6.0.ebuild 465 BLAKE2B eaec5f8071a70132e171860e228b6a9e69def5df9ba9e77a2af7affcc4306bfa55b9db08beff6b4233eb08be861dfc3e26bcc4d5f13b53d5cd9fc1df85f3b10e SHA512 8a301ebe087982331b499f7207ecf7d843c20cd176e17f3b08da420bfc3d74f0419321bcdcbfd5f15ac3cc9736fd725ba598040a314803b91b59b8498a78228a
-MISC metadata.xml 360 BLAKE2B fe2c3ad33d18c0f3198787f1186aff853e401d2da59ce6fd318917fc55f45c7d56e0d22a236bebf81b8bb24333157712dddac0f41f2508f421bf73e1218a5cda SHA512 db2d53c8ead7280b79bf0b39f9da54091b01ad08213f59c14f43879bbd05af176d677b26aa9b7924f2c744df9ecc3f9579b2141875bef9bbad1f3310bc56c4bc
+EBUILD pyotp-2.6.0.ebuild 466 BLAKE2B e86b547636e70f005348fabcd0902438ff6e48d2080364594acb15d463d05366d4fcc00913c251601a097df8eb88c6705811da020b9fda91f588fd73af232054 SHA512 27d7749d003d6b9d64661411d24fce851c2237fe030b578c1bb14936dd45468a7b8176cf6d4561306ce2b507896a22d34b133860d187b013f4c4ac0b2d8e9e70
+MISC metadata.xml 384 BLAKE2B ab8ec669b3211e59d6495628f906eef9fcb508b91dba515b1104da77a6b1d0598ed0caf4cab4071ec32c6d340341a9c034ff7c5f3dba37119c86177367e3a65e SHA512 67edc53913e08ba2379140f2642d1fb2cbe1f3507080feed2f94d36bca62364824a6194ed0d8b362a175659a790670c83bc7eb24dd9c917f1543ac09822cb90c
diff --git a/dev-python/pyotp/metadata.xml b/dev-python/pyotp/metadata.xml
index 75e6248ea089..1e4944e801ab 100644
--- a/dev-python/pyotp/metadata.xml
+++ b/dev-python/pyotp/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pyotp</remote-id>
 		<remote-id type="github">pyauth/pyotp</remote-id>
diff --git a/dev-python/pyotp/pyotp-2.4.1.ebuild b/dev-python/pyotp/pyotp-2.4.1.ebuild
deleted file mode 100644
index 7b0577c66244..000000000000
--- a/dev-python/pyotp/pyotp-2.4.1.ebuild
+++ /dev/null
@@ -1,18 +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="PyOTP is a Python library for generating and verifying one-time passwords."
-HOMEPAGE="https://github.com/pyauth/pyotp https://pypi.org/project/pyotp/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-distutils_enable_tests unittest
diff --git a/dev-python/pyotp/pyotp-2.6.0.ebuild b/dev-python/pyotp/pyotp-2.6.0.ebuild
index cf8967a7eb75..50162dd561a6 100644
--- a/dev-python/pyotp/pyotp-2.6.0.ebuild
+++ b/dev-python/pyotp/pyotp-2.6.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/pyproject2setuppy/Manifest b/dev-python/pyproject2setuppy/Manifest
index fb2483005db8..c5f664bdb674 100644
--- a/dev-python/pyproject2setuppy/Manifest
+++ b/dev-python/pyproject2setuppy/Manifest
@@ -1,3 +1,5 @@
 DIST pyproject2setuppy-14.tar.gz 10669 BLAKE2B ee4fac31546455ac3144f4989dd4260d876a7b8bd749bb34b210e5fc0194fb6347f9b5e7ebc9aa1374b4e4e5e4f22d260923097a58b47b5b940c69ec77f3b5b1 SHA512 46bbe31460195ca7df2c7e707772a430ccdbabf264a26f54d98101d08031d302343a6299a8e20d7be3d7984c48ad095dae942bf4da085285f61e2900a501245a
+DIST pyproject2setuppy-15.tar.gz 11796 BLAKE2B 7fd7176fa611e293d35db0cb91a029c0896921947252ffba51ba25599fab5ebe7d4a5c2f65593ec83bfcc180983de6e2022053bcaa3583c3f6cce9640e57c5f6 SHA512 dee048eed352ebf178981fdf9fd69143a72658d9161e2d65257001b3ee6773bb7040d12145e79496cf141cdf86aa5e5eeaf4de7023c4e721a3d978f9eb267374
 EBUILD pyproject2setuppy-14.ebuild 781 BLAKE2B d403d6dd98399d391ef1ddb3201fb950f1cc99efb8e2f4761be7ad2b3b1b09254d86d19473b838b7c9e2a7fd0d359a6434174f0d123fb3bed848d0dbf4d62028 SHA512 2abbd4d0bed4683738b352b7f32629069bc29892077e72209dc591ada05e5276f36f2ee6f551a39ccb3158738e9270c59452e7c2ea46336158385c18334093f2
+EBUILD pyproject2setuppy-15.ebuild 789 BLAKE2B bffb9a8c0c37a2b63fa8b724b39ac94a1bb17f08ae971d4a102975b6b2a716d01869066a3a08a9c60180af1e6b14287bc94e5e302e3579eed63b228889f7ab3e SHA512 c99f58d08758bfc58a8528671314e199b0066901bfa454595d2b8612e8c16aa3844dd47019be6511416ef0c8adfa67928882a6905f6b9786b4ffb129517c3356
 MISC metadata.xml 430 BLAKE2B 934e5a791bb16f3717ace5fa869aab4998938109ee14ca1ae0c9c378d67366060b705ff4430f3d267d33c04cf23ffa0b4c1b2654b2a95d586fc22ab4fb43f8f9 SHA512 f52d07edc973dc7665be77367cfdc37d92f27adc730a327c57374b54b60f77802b79ca5f2ebfce2c687090763224e5939274dcf4fa2555834c580cb06c32419d
diff --git a/dev-python/pyproject2setuppy/pyproject2setuppy-15.ebuild b/dev-python/pyproject2setuppy/pyproject2setuppy-15.ebuild
new file mode 100644
index 000000000000..2134ae093aac
--- /dev/null
+++ b/dev-python/pyproject2setuppy/pyproject2setuppy-15.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=manual
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Cheap setup.py hack to install flit & poetry-based projects"
+HOMEPAGE="https://github.com/mgorny/pyproject2setuppy"
+SRC_URI="
+	https://github.com/mgorny/pyproject2setuppy/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/wheel[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/pypy-exe-bin/Manifest b/dev-python/pypy-exe-bin/Manifest
index 9a34b37d97c7..a4d80eaefefd 100644
--- a/dev-python/pypy-exe-bin/Manifest
+++ b/dev-python/pypy-exe-bin/Manifest
@@ -3,5 +3,5 @@ DIST pypy-exe-7.3.3_p2-1.x86.xpak 10215453 BLAKE2B 34bbac2f3fab96eb91d2f3a9514e8
 DIST pypy-exe-7.3.4-1.amd64.xpak 13659131 BLAKE2B f8dc0875bec1027fd86499d13e435f97bd015882260b449de279ef41f8b8e9b89fc6e9f197539314ada54e2435a2cb7e7baf3da6e47b872d6717c847c3b7ddcf SHA512 e14312457c1fed4d815c7dee0487b5d77e781b3139381a142156e6fc524df7e7f4f613799a570716d89c95fd704ecad3c095f839296d7c1e63bd675aaac2c92e
 DIST pypy-exe-7.3.4-1.x86.xpak 10291603 BLAKE2B 62e83aa57b176a02a64a1826515763c24d008a02733ef32040ba2c908dffaca371cda3f55eddecfe93f45c1ba52aa7d0ccb898d84f0dbf8ab004f8a79a3814bb SHA512 73c6481530f4c4305a16d12995b11860023f7516737f892df7911d1effd01142c22f2318fb3b392e2483b976fa2609dbff37b61ad8847e395cbaaccbac0301dd
 EBUILD pypy-exe-bin-7.3.3_p2.ebuild 1089 BLAKE2B e5ae34937ba2774e660e91fd3ca1a1a4e11d505c0ad7783bf7ff24d61bed3138965bc769d01c3fcf6413664f92f4819747fb96badb6c489c730217718a5e4685 SHA512 b85514d575478a4f14dfc19dc389a563d96e91e57b38219b5d65c6a75dfebd353bc19a806d3701e23e79a9d83b038fdde5cd09960c655834ba7a7bae15e944e0
-EBUILD pypy-exe-bin-7.3.4.ebuild 1091 BLAKE2B 0be760cc02b31062222064026a7b9841a28116ce108163891d6ace8af7f76f2a384e6948a861345c51df1c26a7087d35b678d15a9ff401009f6076ab3c9f4acc SHA512 6dcc86170c9fd7e88bfc1e9f7338fe53d49ebe5ab84ebb969b6d8f9fdec7bd5cb376e40755b7e240225742d2543921095067c0b24861cfe45a582e9fd9ac9b18
+EBUILD pypy-exe-bin-7.3.4.ebuild 1090 BLAKE2B 7c2e8787fbaa020298eb80b34f8c22a368042f62f010226ea32d1211318ed1cfb3732e4e5e380e30e3adfa8e11807b4e5be8a70278eb4855ffd52c28e3d5a37e SHA512 033ab74a18692e376051070d14233eecd1b8f7d8b21c91485c24a3442927d414fc6af5f8c296d316316fc76a89f68650b351a72ebadc4c88c8647d3b51995e3b
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild
index 23e8a4ef4993..3efe53b38758 100644
--- a/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild
+++ b/dev-python/pypy-exe-bin/pypy-exe-bin-7.3.4.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy-exe/Manifest b/dev-python/pypy-exe/Manifest
index 3c2dde5ecec8..91b8a148299d 100644
--- a/dev-python/pypy-exe/Manifest
+++ b/dev-python/pypy-exe/Manifest
@@ -1,7 +1,13 @@
 DIST pypy2.7-gentoo-patches-7.3.3_p2.tar.xz 11184 BLAKE2B b2b9b94478609372d616c65a87cbb12a07e217928beef9fac26c428f81c662ef390db3fd85bf368ffcc8c6fa3802e506412b7bebd14bdc453009008bc3459d25 SHA512 9ab8ed99b42b36e9c212683ef93f7f1fb99caecf056293ab9a5734f8b52eedec192860702baa121630558530cb5c4652f8542300ecaaaa282377ea6456618b95
 DIST pypy2.7-gentoo-patches-7.3.4.tar.xz 7844 BLAKE2B d06694fa085667e40ef8805c29f7ccf95b49f9de4e99e3ebfa3d69c4202a0ddcebb54c524d7d9f9ec67573a8d2ebe38fb7023d4d3ecef67afc907ecef5c16c02 SHA512 aa8ffefb5d30070ae86c1c14c55c277e39d3da66aea3a0951319158fb65e716e7fa7864e8bf5d26314d4b2a8030c766b63cad6a3663822d2875cd8cc1f3f2de5
+DIST pypy2.7-gentoo-patches-7.3.5rc2.tar.xz 5792 BLAKE2B 2380dc09be7e8dccfcc151e5c3cc5cc0aeb6a5a284b3b3fa8d12bdc0c6352d0da4fc3cb52762c1b5a38b97b3736147cb10986e0e6fdb622ff277445ba7228252 SHA512 1e269a02fc70b67fe44a8d57303a1565acbdb4b7f8065ec489b6bdd9275281e4b516fd1e01223e9635e4759a71c73be941f02e6bc561ab728d6a67e22bda47e3
+DIST pypy2.7-gentoo-patches-7.3.5rc3.tar.xz 5796 BLAKE2B b1c0fb0a8d86d117a9d4102777605eedd026b614f4b66272b3fc5da246bbe5edf516e95a40471117b61078c18b9fc615e55e0992a5d0a1be7caf9026ee26b6be SHA512 8699813837dfa4560a6e73b96f770c5d5999ce008e17cf62a856a454cb0b63146787a54934874162c79345488959e0936b3bd03823bc9f8e276f80df1122f7a8
 DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
 DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
+DIST pypy2.7-v7.3.5rc2-src.tar.bz2 21561927 BLAKE2B 1fd8aeba0698c95015716109d6a3aec74f95d1a4faea130ffe872b43d0ef8e1e8f8b742aeae6048ab596c5b78634e83c83c95ce3ed047d068dae7bddc02e1281 SHA512 d1d4b45c29c5e4c1735744b4aac46c87787bda7db496c8865e099e669f666f223ed9c014f3637065bb7762eda39a0116bab54078cf10ce8fbd8505d1ab952575
+DIST pypy2.7-v7.3.5rc3-src.tar.bz2 21563312 BLAKE2B e343dcd617026ea5f951f3d24deeb59736c9a6ecc91d1b9c1bd980b6f3c239a5bf0edb9b72a0847a6aeeaead8aca9ecf537af81c9fcf0a2f6647c99edc0d1735 SHA512 e080771ea10a30820f8844b3f512a7681f2e619e8a37fa8ac60198f3c8c3780a8e08aa63749be375c00cd547994f428df44e2cd9f61b272b215ded433374e0a1
 EBUILD pypy-exe-7.3.3_p2.ebuild 4300 BLAKE2B 0b02d3c04a0921c1a0de139ce1ea6990c923931641567e57a5827e40f87d8538ca2d0f500ef062260b43ded984f8ec6063d72ded50600b3a8b643224b5d67a7d SHA512 d3b388afb00117df5c739fdf6a27e9dfe1e8b892b0e248e8ad915bc4661ad24da3119340e5a32fa4c09b9800329461760b0a17b3eb37f6fc294912ec06b9fb08
-EBUILD pypy-exe-7.3.4.ebuild 4302 BLAKE2B 1b66c71c7584d3b80d686740727c92fe64a4f81360451da4212e5f6618c8368f93df16488ed50bbc94f9472374fac48b7028054b3266c2e01d5826c642f38239 SHA512 b95a9a2558758835ec6302d02fada4b02f3c711ddc55df8728ec9f6b64cf3846ce63f910df458dd47a6a7a17a22abbc7029bacc7527a12233fecb55b260211f9
+EBUILD pypy-exe-7.3.4.ebuild 4301 BLAKE2B c1310028ad3a452c2c03458dbdea90f2e1c58badecda30240cbe0b3e9be9e0d41403e27c506071308ea8229edcadc2c9247dea00b50791e5f3f0aba376161965 SHA512 ed19844284bfb7a6d9020b868f890cf0865bba5fd6d852728877cc7d476219cd0e6e3aac837219c925fcff35c4c5625ab9a9b84261f27451cb9a4d1bfc4af958
+EBUILD pypy-exe-7.3.5_rc2.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
+EBUILD pypy-exe-7.3.5_rc3.ebuild 4257 BLAKE2B 0c273f183edf602621563fc02647daa8de8414783915e2562703395120e457bdd33a655b338b5b3957717448a9fd3341570a4f24279145a9cc144de52722827a SHA512 4beeb8723fd9c4a9956eb5ac93b6d8d836d73c6e6b4808a25f255661f883a24d103de063bf5c50feff2c49dbb473e37f421ceff4022d386c3cb32ddc18b51109
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild
index b76695a82c8b..94a0f8c74a8a 100644
--- a/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PYPY_PV}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p1.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.5_rc2.ebuild
index 3b5b032c10e7..8678327f1313 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p1.ebuild
+++ b/dev-python/pypy-exe/pypy-exe-7.3.5_rc2.ebuild
@@ -3,23 +3,22 @@
 
 EAPI=7
 
-# pypy3 needs to be built using python 2
 PYTHON_COMPAT=( python2_7 )
 inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 
-PYPY_PV=${PV%_p37*}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-PATCHSET="pypy3.7-gentoo-patches-${PV/_p37}"
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
 
-DESCRIPTION="PyPy3 executable (build from source)"
+DESCRIPTION="PyPy executable (build from source)"
 HOMEPAGE="https://www.pypy.org/"
 SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+SLOT="${PYPY_PV}"
+KEYWORDS=""
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
@@ -28,10 +27,11 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	dev-libs/expat:0=
 	bzip2? ( app-arch/bzip2:0= )
 	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PV%_p*}"
+	!dev-python/pypy-exe-bin:${PYPY_PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
 DEPEND="${RDEPEND}"
 BDEPEND="
-	low-memory? ( dev-python/pypy )
 	!low-memory? (
 		|| (
 			dev-python/pypy
@@ -41,6 +41,18 @@ BDEPEND="
 
 check_env() {
 	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
 		CHECKREQS_MEMORY="1750M"
 		use amd64 && CHECKREQS_MEMORY="3500M"
 	else
@@ -59,18 +71,17 @@ pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
 		check_env
 
-		# unset to allow forcing pypy below :)
 		use low-memory && EPYTHON=
 		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
 				{ has_version -b dev-python/pypy ||
 				has_version -b dev-python/pypy-bin; }
 		then
-			einfo "Using PyPy to perform the translation."
+			einfo "Using already-installed PyPy to perform the translation."
 			EPYTHON=pypy
 		else
-			einfo "Using ${EPYTHON:-python2} to perform the translation. Please note that upstream"
-			einfo "recommends using PyPy for that. If you wish to do so, please install"
-			einfo "dev-python/pypy and ensure that EPYTHON variable is unset."
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
 			python-any-r1_pkg_setup
 		fi
 	fi
@@ -158,10 +169,10 @@ src_compile() {
 }
 
 src_install() {
-	local dest=/usr/lib/pypy3.7
+	local dest=/usr/lib/pypy2.7
 	exeinto "${dest}"
-	newexe "${T}"/usession*-0/testing_1/pypy3-c pypy3-c-${PYPY_PV}
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
 	insinto "${dest}"/include/${PYPY_PV}
 	doins include/pypy_*
-	pax-mark m "${ED}${dest}/pypy3-c-${PYPY_PV}"
+	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
 }
diff --git a/dev-python/pypy-exe/pypy-exe-7.3.5_rc3.ebuild b/dev-python/pypy-exe/pypy-exe-7.3.5_rc3.ebuild
new file mode 100644
index 000000000000..8678327f1313
--- /dev/null
+++ b/dev-python/pypy-exe/pypy-exe-7.3.5_rc3.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit check-reqs pax-utils python-any-r1 toolchain-funcs
+
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
+
+DESCRIPTION="PyPy executable (build from source)"
+HOMEPAGE="https://www.pypy.org/"
+SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
+	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
+S="${WORKDIR}/${MY_P}-src"
+
+LICENSE="MIT"
+SLOT="${PYPY_PV}"
+KEYWORDS=""
+IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
+
+RDEPEND=">=sys-libs/zlib-1.1.3:0=
+	dev-libs/libffi:0=
+	virtual/libintl:0=
+	dev-libs/expat:0=
+	bzip2? ( app-arch/bzip2:0= )
+	ncurses? ( sys-libs/ncurses:0= )
+	!dev-python/pypy-exe-bin:${PYPY_PV}"
+# don't enforce the dep on pypy with USE=low-memory since it's going
+# to cause either collisions or circular dep on itself
+DEPEND="${RDEPEND}"
+BDEPEND="
+	!low-memory? (
+		|| (
+			dev-python/pypy
+			dev-lang/python:2.7
+		)
+	)"
+
+check_env() {
+	if use low-memory; then
+		if ! has_version -b dev-python/pypy &&
+				! has_version -b dev-python/pypy-bin
+		then
+			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
+			eerror "being installed. Please install it using e.g.:"
+			eerror
+			eerror "  $ emerge -1v dev-python/pypy dev-python/pypy-exe-bin"
+			eerror
+			eerror "before attempting to build dev-python/pypy-exe[low-memory]."
+			die "dev-python/pypy needs to be installed for USE=low-memory"
+		fi
+
+		CHECKREQS_MEMORY="1750M"
+		use amd64 && CHECKREQS_MEMORY="3500M"
+	else
+		CHECKREQS_MEMORY="3G"
+		use amd64 && CHECKREQS_MEMORY="6G"
+	fi
+
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && check_env
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		check_env
+
+		use low-memory && EPYTHON=
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] &&
+				{ has_version -b dev-python/pypy ||
+				has_version -b dev-python/pypy-bin; }
+		then
+			einfo "Using already-installed PyPy to perform the translation."
+			EPYTHON=pypy
+		else
+			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
+			einfo "recommends using PyPy for that. If you wish to do so, please unset"
+			einfo "the EPYTHON variable."
+			python-any-r1_pkg_setup
+		fi
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${WORKDIR}/${PATCHSET}"
+	)
+	default
+}
+
+src_configure() {
+	tc-export CC
+
+	local jit_backend
+	if use jit; then
+		jit_backend='--jit-backend='
+
+		# We only need the explicit sse2 switch for x86.
+		# On other arches we can rely on autodetection which uses
+		# compiler macros. Plus, --jit-backend= doesn't accept all
+		# the modern values...
+
+		if use x86; then
+			if use cpu_flags_x86_sse2; then
+				jit_backend+=x86
+			else
+				jit_backend+=x86-without-sse2
+			fi
+		else
+			jit_backend+=auto
+		fi
+	fi
+
+	local args=(
+		--no-shared
+		$(usex jit -Ojit -O2)
+
+		${jit_backend}
+
+		pypy/goal/targetpypystandalone
+	)
+
+	# Avoid linking against libraries disabled by use flags
+	local opts=(
+		bzip2:bz2
+		ncurses:_minimal_curses
+	)
+
+	local opt
+	for opt in "${opts[@]}"; do
+		local flag=${opt%:*}
+		local mod=${opt#*:}
+
+		args+=(
+			$(usex ${flag} --withmod --withoutmod)-${mod}
+		)
+	done
+
+	local interp=( "${EPYTHON}" )
+	if use low-memory; then
+		interp=( env PYPY_GC_MAX_DELTA=200MB
+			"${EPYTHON}" --jit loop_longevity=300 )
+	fi
+
+	if [[ ${EPYTHON} != pypy ]]; then
+		# reuse bundled pycparser to avoid external dep
+		mkdir -p "${T}"/pymod/cffi || die
+		: > "${T}"/pymod/cffi/__init__.py || die
+		cp -r lib_pypy/cffi/_pycparser "${T}"/pymod/cffi/ || die
+		local -x PYTHONPATH=${T}/pymod:${PYTHONPATH}
+	fi
+
+	# translate into the C sources
+	# we're going to build them ourselves since otherwise pypy does not
+	# free up the unneeded memory before spawning the compiler
+	set -- "${interp[@]}" rpython/bin/rpython --batch --source "${args[@]}"
+	echo -e "\033[1m${@}\033[0m"
+	"${@}" || die "translation failed"
+}
+
+src_compile() {
+	emake -C "${T}"/usession*-0/testing_1
+}
+
+src_install() {
+	local dest=/usr/lib/pypy2.7
+	exeinto "${dest}"
+	newexe "${T}"/usession*-0/testing_1/pypy-c pypy-c-${PYPY_PV}
+	insinto "${dest}"/include/${PYPY_PV}
+	doins include/pypy_*
+	pax-mark m "${ED}${dest}/pypy-c-${PYPY_PV}"
+}
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index 20fd09d6c929..e967b9a317c4 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -1,9 +1,15 @@
 DIST pypy2.7-gentoo-patches-7.3.3_p2.tar.xz 11184 BLAKE2B b2b9b94478609372d616c65a87cbb12a07e217928beef9fac26c428f81c662ef390db3fd85bf368ffcc8c6fa3802e506412b7bebd14bdc453009008bc3459d25 SHA512 9ab8ed99b42b36e9c212683ef93f7f1fb99caecf056293ab9a5734f8b52eedec192860702baa121630558530cb5c4652f8542300ecaaaa282377ea6456618b95
 DIST pypy2.7-gentoo-patches-7.3.3_p3.tar.xz 12936 BLAKE2B 7d00353f79d535044e4e2c9cb8ad06d637bca4707123a566989b0ab97ac2f22d9f631d1d5f4e32bf1e0d5202dbc31fffa8d39718963da2a4594f814b90aa8132 SHA512 818910bbe3c01399a0da361a48098a4e875ddd7d4fd50f23bc06501dae7ed5eb3ee773b0dd76d256d141ba190d55b5c725fa4d7ed8d7a9841e6be81babaf518b
 DIST pypy2.7-gentoo-patches-7.3.4.tar.xz 7844 BLAKE2B d06694fa085667e40ef8805c29f7ccf95b49f9de4e99e3ebfa3d69c4202a0ddcebb54c524d7d9f9ec67573a8d2ebe38fb7023d4d3ecef67afc907ecef5c16c02 SHA512 aa8ffefb5d30070ae86c1c14c55c277e39d3da66aea3a0951319158fb65e716e7fa7864e8bf5d26314d4b2a8030c766b63cad6a3663822d2875cd8cc1f3f2de5
+DIST pypy2.7-gentoo-patches-7.3.5rc2.tar.xz 5792 BLAKE2B 2380dc09be7e8dccfcc151e5c3cc5cc0aeb6a5a284b3b3fa8d12bdc0c6352d0da4fc3cb52762c1b5a38b97b3736147cb10986e0e6fdb622ff277445ba7228252 SHA512 1e269a02fc70b67fe44a8d57303a1565acbdb4b7f8065ec489b6bdd9275281e4b516fd1e01223e9635e4759a71c73be941f02e6bc561ab728d6a67e22bda47e3
+DIST pypy2.7-gentoo-patches-7.3.5rc3.tar.xz 5796 BLAKE2B b1c0fb0a8d86d117a9d4102777605eedd026b614f4b66272b3fc5da246bbe5edf516e95a40471117b61078c18b9fc615e55e0992a5d0a1be7caf9026ee26b6be SHA512 8699813837dfa4560a6e73b96f770c5d5999ce008e17cf62a856a454cb0b63146787a54934874162c79345488959e0936b3bd03823bc9f8e276f80df1122f7a8
 DIST pypy2.7-v7.3.3-src.tar.bz2 20881821 BLAKE2B ce1ecdd1fffe40574c7662da6038b84d2bca47ab168939ef0c12be2c6348317f17a94a3026e7fa53c71601edc153aefd98f770bd148e7af07ca751c0a5fc1252 SHA512 c2b6c44fdcac5f9445fab01572f859228fc286891fd09a4ddb95d283683d805276c853ec8e61fcd04cb9ee811d0e959d19bb03fdd7442c044f28a773633122e7
 DIST pypy2.7-v7.3.4-src.tar.bz2 21571561 BLAKE2B d0ac56fadec63fe7e65728c36c2aaf96fc5f54919dddbca9571a24c42a9e3e21f672f84555a18a384c4715f0489bd7aef009c0a47b635de88c472a93e2ae8d71 SHA512 4c18c2dbfbf0cc1034bea773828204df77aec7ef82119fb94e5cb762ce1783e00ad70e99d1432b4948dc132e726bdc6015f4a5bf10a5b10415bcfe99da2ecd17
+DIST pypy2.7-v7.3.5rc2-src.tar.bz2 21561927 BLAKE2B 1fd8aeba0698c95015716109d6a3aec74f95d1a4faea130ffe872b43d0ef8e1e8f8b742aeae6048ab596c5b78634e83c83c95ce3ed047d068dae7bddc02e1281 SHA512 d1d4b45c29c5e4c1735744b4aac46c87787bda7db496c8865e099e669f666f223ed9c014f3637065bb7762eda39a0116bab54078cf10ce8fbd8505d1ab952575
+DIST pypy2.7-v7.3.5rc3-src.tar.bz2 21563312 BLAKE2B e343dcd617026ea5f951f3d24deeb59736c9a6ecc91d1b9c1bd980b6f3c239a5bf0edb9b72a0847a6aeeaead8aca9ecf537af81c9fcf0a2f6647c99edc0d1735 SHA512 e080771ea10a30820f8844b3f512a7681f2e619e8a37fa8ac60198f3c8c3780a8e08aa63749be375c00cd547994f428df44e2cd9f61b272b215ded433374e0a1
 EBUILD pypy-7.3.3_p2-r1.ebuild 4820 BLAKE2B efb4bb8f194568c909365e06d2f3c1593145bff3c3fdbfab867bd15368df13cef642029b41739b4547256819f322f4dbe251c64cfac1d8c525391ebca4e8aef0 SHA512 82809ab39edfb0cd54a377740ce223baee9ae9abeb348ee2ae2fd2e1dd203900a1def1ee4c276f748d3823cab04dce8da25e12f3c477cad4fe560252bbd714c4
 EBUILD pypy-7.3.3_p3.ebuild 4826 BLAKE2B cdf8416b6dfeeb167e17e958db45bfe287b4e972c48b988fe0029685aae15e9cc179452e62ea9088650373b5236f17e5bedf78283b85acdde2a0f990626f2a10 SHA512 43f5336d74176230c20ff7448503cd44d8cf1ab265e50cefbe2e65729815ef32330c51d231f7624719e93b12475fb4fb11f3508e644f734c4687d725d8fe7bf9
-EBUILD pypy-7.3.4.ebuild 4822 BLAKE2B 2d0ec18b1f09e8eec257a19be038e1e6201265d138f4a2af938b1cedf5793be6c1584a390629a0b134ed3a81572aff8c3b3ae7e814f41f23356da6c2da75958d SHA512 5a1d667aac2b5d0324015b5098c810f97dd9ad87441c1731493467794b14a60e95dc1d19b8ced47c15dd17dbc7b893f56e1a85c7244087e6c528773ab3660651
+EBUILD pypy-7.3.4.ebuild 4821 BLAKE2B 11555d42034da0a9d07b0368992693d4ad6634de283b8878f9a71c4c667d4fbbecac42157b4ba5ce0e749593789dfe0312b1ef82d43b78af9f9d97526050ecbd SHA512 107f8614f1a8358239a66b0fe8be314ddf8b29b0ad3f5ebc816360d38526bad71ccbc3a9489c555a71a19e6795f0d68007ba51f9c44dfeff52a1a4b951bf1cb6
+EBUILD pypy-7.3.5_rc2.ebuild 4777 BLAKE2B 7893108718dc64d1514fddbd491db3157b0ae067e4a6eeca980ddc5ed09eec88d8524a733816ad5124ac80c3e716dda1a8b1567f3d15a4e98588db0fbc24891d SHA512 19b23d8467aed4ceacae09b9f06d25ce111578e592a8414217101a8cd9b4a928e9da6e897133e23925ea812365e2fa52a9e1c44b657a2094e0a7ace13c7c4fa5
+EBUILD pypy-7.3.5_rc3.ebuild 4777 BLAKE2B 7893108718dc64d1514fddbd491db3157b0ae067e4a6eeca980ddc5ed09eec88d8524a733816ad5124ac80c3e716dda1a8b1567f3d15a4e98588db0fbc24891d SHA512 19b23d8467aed4ceacae09b9f06d25ce111578e592a8414217101a8cd9b4a928e9da6e897133e23925ea812365e2fa52a9e1c44b657a2094e0a7ace13c7c4fa5
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy/pypy-7.3.4.ebuild b/dev-python/pypy/pypy-7.3.4.ebuild
index e5e583ac6645..8b32239d43ae 100644
--- a/dev-python/pypy/pypy-7.3.4.ebuild
+++ b/dev-python/pypy/pypy-7.3.4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}-src"
 LICENSE="MIT"
 # pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
 SLOT="0/73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit ncurses sqlite tk"
 
 RDEPEND="
diff --git a/dev-python/pypy3/pypy3-7.3.4.ebuild b/dev-python/pypy/pypy-7.3.5_rc2.ebuild
index 7c278dc39c19..82edf15baf9d 100644
--- a/dev-python/pypy3/pypy3-7.3.4.ebuild
+++ b/dev-python/pypy/pypy-7.3.5_rc2.ebuild
@@ -3,32 +3,28 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 toolchain-funcs
+inherit pax-utils python-utils-r1
 
-PYPY_PV=${PV%_p37*}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-PATCHSET="pypy3.7-gentoo-patches-${PV/_p37}"
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
 
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
 HOMEPAGE="https://www.pypy.org/"
 SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy37-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
-# pypy3.7 is in alpha state and a lot of tests are failing
-RESTRICT="test"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit ncurses sqlite tk"
 
 RDEPEND="
 	|| (
-		>=dev-python/pypy3-exe-${PV}:${PV%_p*}[bzip2?,ncurses?]
-		>=dev-python/pypy3-exe-bin-${PV}:${PV%_p*}
+		>=dev-python/pypy-exe-${PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy-exe-bin-${PV}:${PYPY_PV}
 	)
 	dev-libs/openssl:0=
 	gdbm? ( sys-libs/gdbm:0= )
@@ -37,16 +33,8 @@ RDEPEND="
 		dev-lang/tk:0=
 		dev-tcltk/tix:0=
 	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	local PATCHES=(
@@ -55,35 +43,28 @@ src_prepare() {
 	default
 
 	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
+		-i lib-python/2.7/distutils/command/install.py || die
 }
 
 src_compile() {
 	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
 	# (not installed by pypy)
 	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
 	mv pypy/module/cpyext/include/* include/ || die
 	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
+	pax-mark m pypy-c
 
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
 		|| die "Generation of Grammar and PatternGrammar pickles failed"
 
 	# Generate cffi modules
 	# Please keep in sync with pypy/tool/build_cffi_imports.py!
 #cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
 #    "_ssl": "_ssl_build.py",
 #    "sqlite3": "_sqlite3_build.py",
 #    "audioop": "_audioop_build.py",
@@ -93,11 +74,7 @@ src_compile() {
 #    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
 #    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
 #    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
 	use gdbm && cffi_targets+=( gdbm )
 	use ncurses && cffi_targets+=( curses )
 	use sqlite && cffi_targets+=( sqlite3 )
@@ -109,7 +86,7 @@ src_compile() {
 	cd lib_pypy || die
 	for t in "${cffi_targets[@]}"; do
 		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
 	done
 
 	# Cleanup temporary objects
@@ -122,50 +99,57 @@ src_test() {
 	local -x PYTHONDONTWRITEBYTECODE=
 	local -x COLUMNS=80
 
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	# (--deselect for failing doctests)
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
 }
 
 src_install() {
-	local dest=/usr/lib/pypy3.7
+	local dest=/usr/lib/pypy2.7
 	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
 	insinto "${dest}"
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
 	doins -r include lib_pypy lib-python
 
 	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
 		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
 	done
 
-	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
 	dodoc README.rst
 
 	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
 	fi
 	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
 	fi
 	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
 			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
 	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.7/site-packages
+	python_moduleinto /usr/lib/pypy2.7/site-packages
 	python_domodule epython.py
 
 	einfo "Byte-compiling Python standard library..."
diff --git a/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild b/dev-python/pypy/pypy-7.3.5_rc3.ebuild
index 901b875029bb..82edf15baf9d 100644
--- a/dev-python/pypy3/pypy3-7.3.3_p37_p3.ebuild
+++ b/dev-python/pypy/pypy-7.3.5_rc3.ebuild
@@ -3,32 +3,28 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-inherit pax-utils python-any-r1 toolchain-funcs
+inherit pax-utils python-utils-r1
 
-PYPY_PV=${PV%_p37*}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-PATCHSET="pypy3.7-gentoo-patches-${PV/_p37}"
+PYPY_PV=${PV%_p*}
+MY_P=pypy2.7-v${PYPY_PV/_}
+PATCHSET="pypy2.7-gentoo-patches-${PV/_}"
 
-DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
+DESCRIPTION="A fast, compliant alternative implementation of the Python language"
 HOMEPAGE="https://www.pypy.org/"
 SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
 	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz"
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
-# pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
-# also check pypy/interpreter/pycode.py -> pypy_incremental_magic
-SLOT="0/pypy37-pp73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
-# pypy3.7 is in alpha state and a lot of tests are failing
-RESTRICT="test"
+# pypy -c 'import sysconfig; print sysconfig.get_config_var("SOABI")'
+SLOT="0/73"
+KEYWORDS=""
+IUSE="bzip2 gdbm +jit ncurses sqlite tk"
 
 RDEPEND="
 	|| (
-		>=dev-python/pypy3-exe-7.3.3_p37_p2:${PV%_p*}[bzip2?,ncurses?]
-		>=dev-python/pypy3-exe-bin-7.3.3_p37_p2:${PV%_p*}
+		>=dev-python/pypy-exe-${PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy-exe-bin-${PV}:${PYPY_PV}
 	)
 	dev-libs/openssl:0=
 	gdbm? ( sys-libs/gdbm:0= )
@@ -37,16 +33,8 @@ RDEPEND="
 		dev-lang/tk:0=
 		dev-tcltk/tix:0=
 	)
-	!<dev-python/pypy3-bin-7.3.0:0"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		!!dev-python/pytest-forked
-	)"
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
+	!<dev-python/pypy-bin-7.3.0:0"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	local PATCHES=(
@@ -55,35 +43,28 @@ src_prepare() {
 	default
 
 	sed -e "s^@EPREFIX@^${EPREFIX}^" \
-		-i lib-python/3/distutils/command/install.py || die
-
-	eapply_user
-}
-
-src_configure() {
-	tc-export CC
+		-i lib-python/2.7/distutils/command/install.py || die
 }
 
 src_compile() {
 	# copy over to make sys.prefix happy
-	cp -p "${BROOT}"/usr/lib/pypy3.7/pypy3-c-${PYPY_PV} pypy3-c || die
-	cp -p "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/* include/ || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/pypy-c-${PYPY_PV} pypy-c || die
+	cp -p "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/* include/ || die
 	# (not installed by pypy)
 	rm pypy/module/cpyext/include/_numpypy/numpy/README || die
 	mv pypy/module/cpyext/include/* include/ || die
 	mv pypy/module/cpyext/parse/*.h include/ || die
-	pax-mark m pypy3-c
+	pax-mark m pypy-c
 
 	einfo "Generating caches and CFFI modules ..."
 
 	# Generate Grammar and PatternGrammar pickles.
-	./pypy3-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
+	./pypy-c -c "import lib2to3.pygram, lib2to3.patcomp; lib2to3.patcomp.PatternCompiler()" \
 		|| die "Generation of Grammar and PatternGrammar pickles failed"
 
 	# Generate cffi modules
 	# Please keep in sync with pypy/tool/build_cffi_imports.py!
 #cffi_build_scripts = {
-#    "_blake2": "_blake2/_blake2_build.py",
 #    "_ssl": "_ssl_build.py",
 #    "sqlite3": "_sqlite3_build.py",
 #    "audioop": "_audioop_build.py",
@@ -93,11 +74,7 @@ src_compile() {
 #    "gdbm": "_gdbm_build.py"  if sys.platform != "win32" else None,
 #    "pwdgrp": "_pwdgrp_build.py" if sys.platform != "win32" else None,
 #    "resource": "_resource_build.py" if sys.platform != "win32" else None,
-#    "lzma": "_lzma_build.py",
-#    "_decimal": "_decimal_build.py",
-#    "_sha3": "_sha3/_sha3_build.py",
-	cffi_targets=( blake2/_blake2 sha3/_sha3 ssl
-		audioop syslog pwdgrp resource lzma decimal )
+	cffi_targets=( ssl audioop syslog pwdgrp resource )
 	use gdbm && cffi_targets+=( gdbm )
 	use ncurses && cffi_targets+=( curses )
 	use sqlite && cffi_targets+=( sqlite3 )
@@ -109,7 +86,7 @@ src_compile() {
 	cd lib_pypy || die
 	for t in "${cffi_targets[@]}"; do
 		# tkinter doesn't work via -m
-		../pypy3-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
+		../pypy-c "_${t}_build.py" || die "Failed to build CFFI bindings for ${t}"
 	done
 
 	# Cleanup temporary objects
@@ -122,50 +99,57 @@ src_test() {
 	local -x PYTHONDONTWRITEBYTECODE=
 	local -x COLUMNS=80
 
-	# Test runner requires Python 2 too. However, it spawns PyPy3
-	# internally so that we end up testing the correct interpreter.
-	# (--deselect for failing doctests)
-	"${EPYTHON}" ./pypy/test_all.py --pypy=./pypy3-c -vv lib-python || die
+	local ignored_tests=(
+		# network
+		--ignore=lib-python/2.7/test/test_urllibnet.py
+		--ignore=lib-python/2.7/test/test_urllib2net.py
+		# lots of free space
+		--ignore=lib-python/2.7/test/test_zipfile64.py
+	)
+
+	./pypy-c ./pypy/test_all.py --pypy=./pypy-c -vv \
+		"${ignored_tests[@]}" lib-python || die
 }
 
 src_install() {
-	local dest=/usr/lib/pypy3.7
+	local dest=/usr/lib/pypy2.7
 	einfo "Installing PyPy ..."
-	dosym pypy3-c-${PYPY_PV} "${dest}/pypy3-c"
+	dosym pypy-c-${PYPY_PV} "${dest}/pypy-c"
 	insinto "${dest}"
 	# preserve mtimes to avoid obsoleting caches
 	insopts -p
 	doins -r include lib_pypy lib-python
 
 	# replace copied headers with symlinks
-	for x in "${BROOT}"/usr/lib/pypy3.7/include/${PYPY_PV}/*; do
+	for x in "${BROOT}"/usr/lib/pypy2.7/include/${PYPY_PV}/*; do
 		dosym "${PYPY_PV}/${x##*/}" "${dest}/include/${x##*/}"
 	done
 
-	dosym ../lib/pypy3.7/pypy3-c /usr/bin/pypy3
+	dosym ../lib/pypy2.7/pypy-c /usr/bin/pypy
 	dodoc README.rst
 
 	if ! use gdbm; then
-		rm -r "${ED}${dest}"/lib_pypy/_gdbm* || die
+		rm -r "${ED}${dest}"/lib_pypy/gdbm.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_gdbm.py || die
 	fi
 	if ! use sqlite; then
-		rm -r "${ED}${dest}"/lib-python/*3/sqlite3 \
-			"${ED}${dest}"/lib_pypy/_sqlite3* \
-			"${ED}${dest}"/lib-python/*3/test/test_sqlite.py || die
+		rm -r "${ED}${dest}"/lib-python/*2.7/sqlite3 \
+			"${ED}${dest}"/lib_pypy/_sqlite3.py \
+			"${ED}${dest}"/lib-python/*2.7/test/test_sqlite.py || die
 	fi
 	if ! use tk; then
-		rm -r "${ED}${dest}"/lib-python/*3/{idlelib,tkinter} \
+		rm -r "${ED}${dest}"/lib-python/*2.7/{idlelib,lib-tk} \
 			"${ED}${dest}"/lib_pypy/_tkinter \
-			"${ED}${dest}"/lib-python/*3/test/test_{tcl,tk,ttk*}.py || die
+			"${ED}${dest}"/lib-python/*2.7/test/test_{tcl,tk,ttk*}.py || die
 	fi
 
-	local -x EPYTHON=pypy3
-	local -x PYTHON=${ED}${dest}/pypy3-c-${PYPY_PV}
+	local -x EPYTHON=pypy
+	local -x PYTHON=${ED}${dest}/pypy-c-${PYPY_PV}
 	# temporarily copy to build tree to facilitate module builds
-	cp -p "${BROOT}${dest}/pypy3-c-${PYPY_PV}" "${PYTHON}" || die
+	cp -p "${BROOT}${dest}/pypy-c-${PYPY_PV}" "${PYTHON}" || die
 
 	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto /usr/lib/pypy3.7/site-packages
+	python_moduleinto /usr/lib/pypy2.7/site-packages
 	python_domodule epython.py
 
 	einfo "Byte-compiling Python standard library..."
diff --git a/dev-python/pypy3-exe-bin/Manifest b/dev-python/pypy3-exe-bin/Manifest
index 29e645a6ff69..02c13a5dc4c7 100644
--- a/dev-python/pypy3-exe-bin/Manifest
+++ b/dev-python/pypy3-exe-bin/Manifest
@@ -6,5 +6,5 @@ DIST pypy3-exe-7.3.4-1.amd64.xpak 12038379 BLAKE2B 6f51ec285cedef0703a9e145e5ac0
 DIST pypy3-exe-7.3.4-1.x86.xpak 9159557 BLAKE2B 754fd401084c480a5a2a20c6e9a533fa5f691cbca06b0516d3d44fdf9529541c43f84fccdfdd70422231ddb887a9f5a9e38789b6fc3dce81d9f0fafade587bec SHA512 ff05c3ae252b0a5eeb403a18782707ea8884126763a83bcebe1e60934ad7cd6070db24ebeeffb15397b6c02fc68766011438b2064b484ae6d24991311e2a012a
 EBUILD pypy3-exe-bin-7.3.3_p37_p1.ebuild 1125 BLAKE2B c73b6673f3fba074df41979e3ce6f8f01ed51f3fbd7e95141e3fcb9340a1f434adda98465276d19c235d8dd94aa1422aaac5ef7fb33b4e6853f7c08eef9f48f1 SHA512 b7a4c2074b7b15a91aa546c40c61d24b0c1259ae677260182d6b7eb625c795fc23b9b469b44ee151b45b545431305b53f7379a6fc32f0b93d5fb6571fd741313
 EBUILD pypy3-exe-bin-7.3.3_p37_p2.ebuild 1125 BLAKE2B c73b6673f3fba074df41979e3ce6f8f01ed51f3fbd7e95141e3fcb9340a1f434adda98465276d19c235d8dd94aa1422aaac5ef7fb33b4e6853f7c08eef9f48f1 SHA512 b7a4c2074b7b15a91aa546c40c61d24b0c1259ae677260182d6b7eb625c795fc23b9b469b44ee151b45b545431305b53f7379a6fc32f0b93d5fb6571fd741313
-EBUILD pypy3-exe-bin-7.3.4.ebuild 1127 BLAKE2B 08da61e98198eed1b7989bacc748ea7030cab222b3c043bdc5932dc0ce31df2b8d4b9c759c3fb9b724fd274f6438140b52aba553bc136e915c77d21a34d643c6 SHA512 8dfbbbc20aa7ee40fd332db0517be883c72fd3c93bf7c2636848339666a9dad15019423caad338ae99ce81b4290417f7cc4ef7f17717814ebc03edf223b3a003
+EBUILD pypy3-exe-bin-7.3.4.ebuild 1125 BLAKE2B c73b6673f3fba074df41979e3ce6f8f01ed51f3fbd7e95141e3fcb9340a1f434adda98465276d19c235d8dd94aa1422aaac5ef7fb33b4e6853f7c08eef9f48f1 SHA512 b7a4c2074b7b15a91aa546c40c61d24b0c1259ae677260182d6b7eb625c795fc23b9b469b44ee151b45b545431305b53f7379a6fc32f0b93d5fb6571fd741313
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4.ebuild b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4.ebuild
index c25ec9fa093a..277fe587ef6d 100644
--- a/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4.ebuild
+++ b/dev-python/pypy3-exe-bin/pypy3-exe-bin-7.3.4.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0/1
 	dev-libs/libffi:0/7
diff --git a/dev-python/pypy3-exe/Manifest b/dev-python/pypy3-exe/Manifest
index ab457891b6a1..dcbd73ef7017 100644
--- a/dev-python/pypy3-exe/Manifest
+++ b/dev-python/pypy3-exe/Manifest
@@ -1,9 +1,7 @@
-DIST pypy3.7-gentoo-patches-7.3.3_p1.tar.xz 13816 BLAKE2B 135a029e2d881ed5e43869fde391571285454b8612f2857fb5fe7aaf5b126f84d01293bd31e7a7746ad03fce1e14ace6a6f9cc2634269ec431b4aabfe70f9b4c SHA512 acf4938bc171e757196cf138358a298880792367ca5fff6b462d6971c8597e064777f99b687cb25003c6f25762a901ed482eebd791fdb008fa729ca9c9c300e8
-DIST pypy3.7-gentoo-patches-7.3.3_p2.tar.xz 14508 BLAKE2B c2df6b9a88fc4dfb5fd4d68dda65e69e039c28a44193d94b1efeed58aa944a111f755096b8dc3d3318a294eaafd75eb1d583fa3acc704bc272260f25545a9da8 SHA512 5736fefa62b359e2a86c336853142114ceab0e68cf8337aaaac18492d6521d780109cdab80ab46f577610a32082477610a1f56882650d45f41b17083387f1f8d
 DIST pypy3.7-gentoo-patches-7.3.4.tar.xz 8464 BLAKE2B 6d458a41e87eabeb2920b28752fe5cc49bbfc9c5f03d2fc1321362fbd02e9dfb3b41c99cb765b7f2644b9c49c5c60f879ad1c60a66bc991462edb50215b1802d SHA512 1282cf2fa9054209ceb5a91e0b4adcd86de33a326230fabe154b572d5e798d81e93d136e815f1c2816fbfdd5071fcfc175585d4fa5ae93145938bb4cf1d2baa7
-DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
+DIST pypy3.7-gentoo-patches-7.3.5rc3.tar.xz 4872 BLAKE2B 15970c21eb209407af5234719755dd5ddfce95f5b7dd5d525126045d71a00f22d56f26e54a85b94e54dd286334a39cb08abf681e56d466547be206322cf319ac SHA512 4a946560daaba8214f3f5cf828128293bc9aa0eec7d0000e184b3791165f255a7169ee63f9a569a1faed9e8095f593ac7982d49a07f93e085b41be50b275ce3f
 DIST pypy3.7-v7.3.4-src.tar.bz2 25344083 BLAKE2B e88dd0cfcc6123dbf894f603162ebe43675c96b992d15c29e14a611a166b8da8d1d2f3298e65e5794b295215440cb88f31d252fcdaef1a0dab52777c24212a49 SHA512 c570d34f284f41dcd8dd909216c69831dd83b8501423c7635a4fe506fb16fd3705cf87975a664735e52d0b805a0432267d611a993437d17aac3defe4b9ea4401
-EBUILD pypy3-exe-7.3.3_p37_p1.ebuild 3875 BLAKE2B aed7bde6ddbefa3a5abeeae05cf4c5fec25f6e83141d998a2b6f95fae214fc4d986f01293ea50dfff07f85cbd39fc28c87b8f45810ac552ad97d2b1d1ae16be9 SHA512 026a3a4b44f4d1916c9e8c520ac4021035bc08aeb98b8bc676bab0a2b04e34656b8a5885930b3ba6dad82d0eff788bee14bc10598d7d8a17e4b398c013efb3bb
-EBUILD pypy3-exe-7.3.3_p37_p2.ebuild 3875 BLAKE2B aed7bde6ddbefa3a5abeeae05cf4c5fec25f6e83141d998a2b6f95fae214fc4d986f01293ea50dfff07f85cbd39fc28c87b8f45810ac552ad97d2b1d1ae16be9 SHA512 026a3a4b44f4d1916c9e8c520ac4021035bc08aeb98b8bc676bab0a2b04e34656b8a5885930b3ba6dad82d0eff788bee14bc10598d7d8a17e4b398c013efb3bb
-EBUILD pypy3-exe-7.3.4.ebuild 3877 BLAKE2B 8e51c2e911a7ec9aded060d86ef67748a07345dfe179035c52f68ddfc696afbfd40e492830ce92abe92c9de9e0425e6a2e528e23995dba5a7e4942fe8d00119c SHA512 33e4f61c2d68a32ed43a476606df2fb76e431b315963de341d6ebc09352d930b038b54f6d619908d05b6fafe9c58defaa4c0cc3a9a2b229c87139320a0e14563
+DIST pypy3.7-v7.3.5rc3-src.tar.bz2 25255084 BLAKE2B 10a7c6c9879b2956726e9457e6939cf7597136dcc54bd8d6c20311468ed622697c151fb6209d49fda21e0710d0c3d18f702f43b01720341b7967663b007b1f09 SHA512 6ec569cf80741a540f39687e3cc1c4bf18c4cd038ed1b0782a333ab03e5f85ca221e3af4549d2332c78fcab5a430bd59a5ab14f9fa333624f6f1b9441049b5c3
+EBUILD pypy3-exe-7.3.4.ebuild 3875 BLAKE2B aed7bde6ddbefa3a5abeeae05cf4c5fec25f6e83141d998a2b6f95fae214fc4d986f01293ea50dfff07f85cbd39fc28c87b8f45810ac552ad97d2b1d1ae16be9 SHA512 026a3a4b44f4d1916c9e8c520ac4021035bc08aeb98b8bc676bab0a2b04e34656b8a5885930b3ba6dad82d0eff788bee14bc10598d7d8a17e4b398c013efb3bb
+EBUILD pypy3-exe-7.3.5_rc3.ebuild 3824 BLAKE2B 0b6a08dfbb51402cb56e237197d19a529ac9a6f796f42a0218df8c1eee1335eb59cc7ef222098aad834c62440435391875705b4a323d523bef529a482ea9fe12 SHA512 814805ea1503c05063c0de5bf81674d85cb01dae33903914cc4e9a2a12e9880680065fd04de602fec8afb72fe2540fe81b6ed17551fbbdc937cc28951783b5aa
 MISC metadata.xml 497 BLAKE2B 02040ea95327971e16090c00e5771bc684710e90000ca07b366226fedbae8973a1f4bdd9d37506446a2fe3caea4fdf83ca186d2706747adccd14ea24a19486b3 SHA512 816621f5288b822fc1c7b360ac6f1e5f7b464a60c9b6e58fc464860bb8a4f44be932fe6562625006925ddda2b5cc14feeaef587303642d894494ddea6472cd2a
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.4.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.4.ebuild
index 27b0473f2566..3b5b032c10e7 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.4.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.4.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
 SLOT="${PV%_p*}"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
diff --git a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild b/dev-python/pypy3-exe/pypy3-exe-7.3.5_rc3.ebuild
index 3b5b032c10e7..70dd2bacbc82 100644
--- a/dev-python/pypy3-exe/pypy3-exe-7.3.3_p37_p2.ebuild
+++ b/dev-python/pypy3-exe/pypy3-exe-7.3.5_rc3.ebuild
@@ -7,9 +7,9 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 )
 inherit check-reqs pax-utils python-any-r1 toolchain-funcs
 
-PYPY_PV=${PV%_p37*}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-PATCHSET="pypy3.7-gentoo-patches-${PV/_p37}"
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.7-v${PYPY_PV/_}
+PATCHSET="pypy3.7-gentoo-patches-${PV/_}"
 
 DESCRIPTION="PyPy3 executable (build from source)"
 HOMEPAGE="https://www.pypy.org/"
@@ -18,8 +18,8 @@ SRC_URI="https://buildbot.pypy.org/pypy/${MY_P}-src.tar.bz2
 S="${WORKDIR}/${MY_P}-src"
 
 LICENSE="MIT"
-SLOT="${PV%_p*}"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+SLOT="${PYPY_PV}"
+KEYWORDS=""
 IUSE="bzip2 +jit low-memory ncurses cpu_flags_x86_sse2"
 
 RDEPEND=">=sys-libs/zlib-1.1.3:0=
@@ -28,7 +28,7 @@ RDEPEND=">=sys-libs/zlib-1.1.3:0=
 	dev-libs/expat:0=
 	bzip2? ( app-arch/bzip2:0= )
 	ncurses? ( sys-libs/ncurses:0= )
-	!dev-python/pypy3-exe-bin:${PV%_p*}"
+	!dev-python/pypy3-exe-bin:${PYPY_PV}"
 DEPEND="${RDEPEND}"
 BDEPEND="
 	low-memory? ( dev-python/pypy )
diff --git a/dev-python/pypy3/Manifest b/dev-python/pypy3/Manifest
index 975136f5eb55..44a46366a55a 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -1,11 +1,7 @@
-DIST pypy3.7-gentoo-patches-7.3.3_p1.tar.xz 13816 BLAKE2B 135a029e2d881ed5e43869fde391571285454b8612f2857fb5fe7aaf5b126f84d01293bd31e7a7746ad03fce1e14ace6a6f9cc2634269ec431b4aabfe70f9b4c SHA512 acf4938bc171e757196cf138358a298880792367ca5fff6b462d6971c8597e064777f99b687cb25003c6f25762a901ed482eebd791fdb008fa729ca9c9c300e8
-DIST pypy3.7-gentoo-patches-7.3.3_p3.tar.xz 17356 BLAKE2B 3418e4d600cdff96c228890dbfe0c63927ff4971be72eb951fb5fbc6ae803f4d26490f4a444dc788b165fa69ec77526413417ec5a697906a3089122f78351a8b SHA512 738d14e5ca693738150a3b9c1152a9b7a9c38dc77540fc7dd14f6d3a556a4b8716785f8f858ddd6b75545dadc623f0fccc57c84a869064ac423bee3acb1dceb6
-DIST pypy3.7-gentoo-patches-7.3.4.tar.xz 8464 BLAKE2B 6d458a41e87eabeb2920b28752fe5cc49bbfc9c5f03d2fc1321362fbd02e9dfb3b41c99cb765b7f2644b9c49c5c60f879ad1c60a66bc991462edb50215b1802d SHA512 1282cf2fa9054209ceb5a91e0b4adcd86de33a326230fabe154b572d5e798d81e93d136e815f1c2816fbfdd5071fcfc175585d4fa5ae93145938bb4cf1d2baa7
 DIST pypy3.7-gentoo-patches-7.3.4_p1.tar.xz 8868 BLAKE2B 5f897f920079dc86d6300ecaf6c9a43c30173b99e90d585151d3efec8718109e9165947ce772f48b6b15ff5c22c3f04f27aec088b34fd2c5c387f0b59728b333 SHA512 aa59f8eaecb1115fe391fe27ecd2c38a6c4213ea6e6de4954bd8a420ce5eb224c225b0ef1df19aef029546b05fa517a4965c9c24d98bc1be46c7eb024415a348
-DIST pypy3.7-v7.3.3-src.tar.bz2 24633503 BLAKE2B 0fb9fbb8866cf661c5b1d8d029fb2bc50737fae097875d0dac86c9ec21dc907093173b350a4f89d2c5a1fbed4c92ca4919f047536b828d4ee35583d615e7ddce SHA512 c98955e72dc0bd0452e4e16e0fe0ab318a34d6d57217ea33349e98ed047597ba97be7d15b41edd4dc85028fcca0a6257a4bb98fe96ce876e41a04df012261f4a
+DIST pypy3.7-gentoo-patches-7.3.5rc3.tar.xz 4872 BLAKE2B 15970c21eb209407af5234719755dd5ddfce95f5b7dd5d525126045d71a00f22d56f26e54a85b94e54dd286334a39cb08abf681e56d466547be206322cf319ac SHA512 4a946560daaba8214f3f5cf828128293bc9aa0eec7d0000e184b3791165f255a7169ee63f9a569a1faed9e8095f593ac7982d49a07f93e085b41be50b275ce3f
 DIST pypy3.7-v7.3.4-src.tar.bz2 25344083 BLAKE2B e88dd0cfcc6123dbf894f603162ebe43675c96b992d15c29e14a611a166b8da8d1d2f3298e65e5794b295215440cb88f31d252fcdaef1a0dab52777c24212a49 SHA512 c570d34f284f41dcd8dd909216c69831dd83b8501423c7635a4fe506fb16fd3705cf87975a664735e52d0b805a0432267d611a993437d17aac3defe4b9ea4401
-EBUILD pypy3-7.3.3_p37_p1-r1.ebuild 5269 BLAKE2B 246192170f486fec3156352aadf16c060d10475fd47b75f120774440b684ba6356b7b27e8ce88d8375789ff4070f99290aeda8a428b8edf73a9d5d8d1cd20f07 SHA512 c81c7b4e4810ac4f44f4a5170d3cde9a762f90b9f9f3731fba0cca2f2dd71d9378f765290dd9e2caa974c9cfdc912c99fe338b00e909784c5c74d5cd39f305dc
-EBUILD pypy3-7.3.3_p37_p3.ebuild 5283 BLAKE2B 58878c9e5eef642f79c1e44a4454d4ec03ced988a82df3f7ec274b63d3197570af0ce667027d971d54cefa8cc445646c62dc268f3997d80fd340d7dc51e5e28c SHA512 6383b083208685f011b7489b0aab895e16ab4ec1b4fe18285853232d7689fa35305b2ee6426edc64940e35d2fcf44bdbb7a32d59bdc8fdcfe22da5c6e75b2297
-EBUILD pypy3-7.3.4.ebuild 5271 BLAKE2B 7402f9c654b375833a9e29509427948b04ed51e9027bbfff3c8a56e4b87d29874854b8d2798928db8d6b01b6831358b8c0d56ffd9fd0d9210b642b853061758a SHA512 d4331e97b5271681c4c2cb5715ce859d4683fd8f13817dc55477941d6c59352acb19ac8c23df163bb5234854fd4fcf70b579d7944cd915bc0f560f4c22d153cd
-EBUILD pypy3-7.3.4_p1.ebuild 5276 BLAKE2B 8378fb605e382c371d2990c070804b6eb7a4ffc888850b8cdc3fc3889b10fbc2959f9e213997481f9ca43889e015d2d4ca25d512995d1fc8f5e96ddf6ccebb42 SHA512 7852c87f5e8abbbb2cb02aa568d27bdec146418d461b41673b12733144ae20da1d2e05d3cf12c16bbbb2f876c778e2c91f4757263eb24825f7594e1ef7bded75
+DIST pypy3.7-v7.3.5rc3-src.tar.bz2 25255084 BLAKE2B 10a7c6c9879b2956726e9457e6939cf7597136dcc54bd8d6c20311468ed622697c151fb6209d49fda21e0710d0c3d18f702f43b01720341b7967663b007b1f09 SHA512 6ec569cf80741a540f39687e3cc1c4bf18c4cd038ed1b0782a333ab03e5f85ca221e3af4549d2332c78fcab5a430bd59a5ab14f9fa333624f6f1b9441049b5c3
+EBUILD pypy3-7.3.4_p1.ebuild 5274 BLAKE2B 45a63059149ff71d2265bfef4def2a21d8ec28a540da920db28632f89aed621f8e08962ef42af4a2c0fa0575cae31f1e202aec38ab588bfcf035209efb6d584e SHA512 6691ef7c48642f8c08cac7d4bcf23f31231c631f9a0437131ed1e92245ef1b16885639920e3f2074c9eb52ba0e5eea681eb97c040a186fe055240c38b7db1923
+EBUILD pypy3-7.3.5_rc3.ebuild 5228 BLAKE2B d30e872fb4622052ff0b47fd776c27bd35cf591b34e6602ec8d07daa482db19b3141b2fd37a3dbdca0dd4a86cf7e99cd98d6247eaa2cde15457d30e98c58c082 SHA512 f4106c094e7a51f268d8e8b166aed79ffd1ac2c4580e8acea9f780c3713acfc47805ce8f484e7b5d0ea195a7df6939ebc3290eab84bec610fe2aa6da811a277d
 MISC metadata.xml 240 BLAKE2B 41e6a4d9da33dab2decc5ff419924f382a8f64d27a81fdb97576db8c6cf125be95911747946ec8be1b453f56617fef1084f5947f84b50a8db419d46df2ae8a0f SHA512 9c23321eaa853f851bf00195ea64ac2ba093e516f9b57855ee5aa58fbb1988130c9f0c17c2a9ce9fae4ee033e0a28a70c868e0f5acdfa1dd316ab533c5279d59
diff --git a/dev-python/pypy3/pypy3-7.3.4_p1.ebuild b/dev-python/pypy3/pypy3-7.3.4_p1.ebuild
index 7e7ed8f9cc20..0746f35cbf92 100644
--- a/dev-python/pypy3/pypy3-7.3.4_p1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.4_p1.ebuild
@@ -20,7 +20,7 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy37-pp73"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
 # pypy3.7 is in alpha state and a lot of tests are failing
 RESTRICT="test"
diff --git a/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild b/dev-python/pypy3/pypy3-7.3.5_rc3.ebuild
index 6d392c9cbdaf..d75647a2e567 100644
--- a/dev-python/pypy3/pypy3-7.3.3_p37_p1-r1.ebuild
+++ b/dev-python/pypy3/pypy3-7.3.5_rc3.ebuild
@@ -6,9 +6,9 @@ EAPI=7
 PYTHON_COMPAT=( python2_7 )
 inherit pax-utils python-any-r1 toolchain-funcs
 
-PYPY_PV=${PV%_p37*}
-MY_P=pypy3.7-v${PYPY_PV/_/}
-PATCHSET="pypy3.7-gentoo-patches-${PV/_p37}"
+PYPY_PV=${PV%_p*}
+MY_P=pypy3.7-v${PYPY_PV/_}
+PATCHSET="pypy3.7-gentoo-patches-${PV/_}"
 
 DESCRIPTION="A fast, compliant alternative implementation of the Python (3.7) language"
 HOMEPAGE="https://www.pypy.org/"
@@ -20,15 +20,15 @@ LICENSE="MIT"
 # pypy3 -c 'import sysconfig; print(sysconfig.get_config_var("SOABI"))'
 # also check pypy/interpreter/pycode.py -> pypy_incremental_magic
 SLOT="0/pypy37-pp73"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS=""
 IUSE="bzip2 gdbm +jit ncurses sqlite test tk"
 # pypy3.7 is in alpha state and a lot of tests are failing
 RESTRICT="test"
 
 RDEPEND="
 	|| (
-		>=dev-python/pypy3-exe-${PV}:${PV%_p*}[bzip2?,ncurses?]
-		>=dev-python/pypy3-exe-bin-${PV}:${PV%_p*}
+		>=dev-python/pypy3-exe-${PYPY_PV}:${PYPY_PV}[bzip2?,ncurses?]
+		>=dev-python/pypy3-exe-bin-${PYPY_PV}:${PYPY_PV}
 	)
 	dev-libs/openssl:0=
 	gdbm? ( sys-libs/gdbm:0= )
diff --git a/dev-python/pyre2/Manifest b/dev-python/pyre2/Manifest
index 3647cf166b4f..e11af30e5c06 100644
--- a/dev-python/pyre2/Manifest
+++ b/dev-python/pyre2/Manifest
@@ -1,3 +1,3 @@
 DIST pyre2-1.0.7.tar.gz 11684 BLAKE2B 748a409aa56dab0e088961bdd0b8659dfe0ed817ed1f6fe1dce15fd03e32b30472776c4e21a4f39e66aa5b3539650a657c36acf8b857332b255a139ef0f890a9 SHA512 c4579bf73af2f0a5ccbb6a28b87ce777ef08199947c1bdf740b426960f41b3530c97a7158fac7768b51c92b8a3797f8e66de61e0c942f239920bd5397d63e2c4
-EBUILD pyre2-1.0.7.ebuild 462 BLAKE2B 44dd4a86d9a609e76023ba2a750107c58fb102b00a2ea35dc59187dcb7232daf2524285d20039ca3812574bafab720c8308b319854a2c6e808ee10ffbbcc95bf SHA512 0ab7e2ff84cee4e7f7b07e45b07eaff3141a6d45f6b95cf7b0039d3b6e5fdd047fbbd2e10553bbdd13a28d81c7bf153709de55fc4e69f4a1400ed8d82c2e2811
-MISC metadata.xml 423 BLAKE2B cf8c5b6abdd8cdcde613af7a31c3e323cbf414455e1a3304936f8e31b75aa0e35ba8072a1b3966e05fb52f07893c2b0dec3bfbaa73f519eb18a346355ed11f76 SHA512 3110526b88dc1fec36078600b111f4056f3c30e05d245c43da96961ad2ab1092f2bc5533a80f17711675494ebe83a196c37310e2ffec2ae647e2aa078a1f1534
+EBUILD pyre2-1.0.7.ebuild 463 BLAKE2B 252ac08a1a92f76617ebc786d02a824b3448fac99d95fbe5ca4dc21bd9a27adbd11db5b2b140eb89e79a2cdb28fb1b18e52373b0dcc860ec053da101fe8e97b3 SHA512 f07ab845b1cbeb81060cd6de374274c9544f063791240c034c5f8fd4aa36c1d083c0d63f12e1b9079c467bdc5ff4f3f1148ad47cb7b76f8d517cf9d979fb0081
+MISC metadata.xml 477 BLAKE2B 81a188fd72216d412d27848b0a307c15c5817da6123e39d7ff055daf08d73ae13cdf919b6002e789f30b4f5def4644cf3cfbd804dbe0f13ccc76616777b6c65e SHA512 b94693a9414a5d7d0674fb6d88968072a6fa13aafcaaf5797a88227a929ca094435fad6e6a281ec1f63a057e1f982be6b72c56327defcac48a8f19ece7f23627
diff --git a/dev-python/pyre2/metadata.xml b/dev-python/pyre2/metadata.xml
index b68b40441388..d3484923682c 100644
--- a/dev-python/pyre2/metadata.xml
+++ b/dev-python/pyre2/metadata.xml
@@ -11,5 +11,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="pypi">fb-re2</remote-id>
+		<remote-id type="github">facebook/pyre2</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-python/pyre2/pyre2-1.0.7.ebuild b/dev-python/pyre2/pyre2-1.0.7.ebuild
index 86bc03915e45..e9165f56e7ea 100644
--- a/dev-python/pyre2/pyre2-1.0.7.ebuild
+++ b/dev-python/pyre2/pyre2-1.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2020 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python bindings for dev-libs/re2"
diff --git a/dev-python/pyrsistent/Manifest b/dev-python/pyrsistent/Manifest
index 6551b0e7c10c..b39c3ba0e489 100644
--- a/dev-python/pyrsistent/Manifest
+++ b/dev-python/pyrsistent/Manifest
@@ -1,3 +1,3 @@
 DIST pyrsistent-0.17.3.tar.gz 106911 BLAKE2B 90a05617ad1e32801286d3da834bf52b4ea864e7463a0789904e4a3bbfda2f7b987e13ea93e16980f2cf3b5d999e6040b7c5980a81b516999175b4e5f2ed392e SHA512 2d18e1d4cfe9a0a576fd363f466ba920094af0b1cbbb49aec11b32df6c23e59f6552235a496838dab00928cc7f6dad2a4a8aaa0b52cb6a38eba6faedd12846c8
-EBUILD pyrsistent-0.17.3.ebuild 602 BLAKE2B d528579874b940b4445ef1b3c2ae5721d34db8a320bc789c4bdba4a2a7f7a58b24f75347865163d39076a2e42fd459cdd1c39fba903f92545c8619eb219928cd SHA512 742b93932b0df919699a974ed49ac074c90352c8ae99a6f6b828f21b4284f41c9a3572931c0633c5037ba48e8b728dae33a3b0840487a00a12c0f1300cff8dab
+EBUILD pyrsistent-0.17.3.ebuild 603 BLAKE2B 176343e3253e7f347dbea0f041d2cce8fff737a077966ff35a9732ff41960af3becc8bdbe7f3ffe0576009dca09855a093ecbe1c71faca9a0df131835f819087 SHA512 4e3b82ad673aaa549926ba6816a4554f26f8cdf514987894b8f0b0aad31602870bce140c2224fd4d70ecc8dfd6812ffea377651424db349818906a1320d2987a
 MISC metadata.xml 521 BLAKE2B 45117f7fb0cdd4111f444279144a45d49984102e114ba758260dc69b313ec818a4556a57a682f6762522a71a810855ead85ee667dd7524de16d97b37b77d5cf2 SHA512 f16890488984b1d31c74bb697f38d0d880390f8633347db56ef4633e77f502bfa56d9427ac55bd0da4d3edc6e8e1897f6e76b37ba75d3b4b738217607e0883fd
diff --git a/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild b/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
index 218b0bc41d92..f8388345bff4 100644
--- a/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
+++ b/dev-python/pyrsistent/pyrsistent-0.17.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyscreenshot/Manifest b/dev-python/pyscreenshot/Manifest
index 76ef9bfd59b8..18328213d1a7 100644
--- a/dev-python/pyscreenshot/Manifest
+++ b/dev-python/pyscreenshot/Manifest
@@ -2,6 +2,6 @@ DIST pyscreenshot-2.2.tar.gz 29726 BLAKE2B d1e314be360d4716b35b4302de82010dfc9a9
 DIST pyscreenshot-2.3.tar.gz 34543 BLAKE2B a9ae6fc51ac62efabca7e9b4e08ee8ee05d778a3f8ea0bfaec5f0958bea7f6dd266e18a938350aac6fa1058fdb378cfa69cf6c5490768c39d7312be51e3d2630 SHA512 6919e4529a932b9a6e3dd28d60c628447b0e6f25df567db742b5bf14455373ad7340237bb4b77696c436be6f31211030b206d7152f4b61d16d6745f439f84425
 DIST pyscreenshot-3.0.tar.gz 32865 BLAKE2B b39d338be4f1dc23fc30fe84a6f8ee6b6346761b023222438e8ff33e01beafc347d34118332efb053057c54383f5468e73049041889a6140a70c0f928c655661 SHA512 f8070941ade2bc710157238f47c9575df1504ef63152980b2bc0edd1f69c9ca4aeec3f738929de1c81a51fed79838053674626981ec61d95dafa7b9998004606
 EBUILD pyscreenshot-2.2.ebuild 1618 BLAKE2B af871f3177aec6da987058dcee2e8cc9447d0d40c881b8035fbafaf210450047240d4e71648a6b83846f7034b8559ec2f2dad939d65c5fdcec771c6b64d07d09 SHA512 d1faac137a5b51b73a79290822900e3d941a362bfc376976aed8239d0c4130e5da53be1421732bdc9f2972053938dae5d239da8598a3889d9d7576cdaa2f4308
-EBUILD pyscreenshot-2.3.ebuild 1015 BLAKE2B 97629109072ffe03bbecb061ca41a4422322d7ba80a52036d0b9fc788df078ef8cc32a004561c6cacab2a818f70d5d14814c1c33512999a825c1cf7ce50f723e SHA512 417c76f71a3902caf5a1941b4313cda49069a46a680d2dc41ff7d237292568ee544e8afc678df23ac040635739090b00b2f6c9b2767a3a38739715f0e278969e
+EBUILD pyscreenshot-2.3.ebuild 1013 BLAKE2B 4a3a8abaf23dc546cc907bc931972c6a6e926e275e3decd3337a6ee0ed1582071f9c819ac4ea5c366bc4d362c80054e7784bf7666bc33cec4179ff4ca0d00360 SHA512 3f0b7f0c31755dda3b3475ae6ddf24a609f8a03155cde9936fd3397b2e3416e9b3ae87bb30c13f2242cc33cddcdb1f24c38e52f6c3213bc7e4646a639f86cc2c
 EBUILD pyscreenshot-3.0.ebuild 975 BLAKE2B 92bb0f42fb44a84c44de0700840452e23fe006967ccb07492c3a133cd45733729c574d4db650e4b05bea0143c57394cbcf6831c041debf1bb4f3b5b4da9d0bb2 SHA512 74ff8ebb5458c68e019350d0c17c8cfe0780ee2bb006d48e09ac637df3844e13e29971f3f7c2b628e857451cd0eae9df6e854b0271ce3c5cf558e7a4df808c6c
-MISC metadata.xml 605 BLAKE2B 3ffb205aac542daac7486142b0d6dcf6646af1cd839b325682794a4d3189a1a87c7638b6f294489c4b36403666d6de7ece8f078a8e670594cb59438525fe47f5 SHA512 ba15a98f1e2fa3dd2c7827fe158b74c7b15d4c545a2c26194e990ac8c164bce22e9c626da5249fe594a5701fc35a182c6c33fdc8d0d51f30bcb67c9c84a5a2eb
+MISC metadata.xml 458 BLAKE2B e057d5382e811b727d46b04ac0ffbbfa2e57799f2b7182e0a0b81cf891b44db37fbb201934810b2ebc353b073fcd4b632612292fc93230904669c276983b46c7 SHA512 5347be673d2628faf4660a3d25f39d340b00aae8155b4e3463a9a8a92554249be3ab5cce1af89c39e33bccac9ff5c0c72b97a5d16db01194586bd0acd75225b9
diff --git a/dev-python/pyscreenshot/metadata.xml b/dev-python/pyscreenshot/metadata.xml
index 69cee15cca18..b0acad4b0dfd 100644
--- a/dev-python/pyscreenshot/metadata.xml
+++ b/dev-python/pyscreenshot/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</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/pyscreenshot/pyscreenshot-2.3.ebuild b/dev-python/pyscreenshot/pyscreenshot-2.3.ebuild
index 806c64ba1513..1cb95e4a350b 100644
--- a/dev-python/pyscreenshot/pyscreenshot-2.3.ebuild
+++ b/dev-python/pyscreenshot/pyscreenshot-2.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/ponty/pyscreenshot/archive/${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 BDEPEND="test? (
 	dev-python/pillow[${PYTHON_USEDEP}]
diff --git a/dev-python/pyserial/Manifest b/dev-python/pyserial/Manifest
index aac91cb4cc28..5d451c803b46 100644
--- a/dev-python/pyserial/Manifest
+++ b/dev-python/pyserial/Manifest
@@ -1,3 +1,3 @@
 DIST pyserial-3.5.tar.gz 159125 BLAKE2B 6be1930afc6cfecad54cd7a116a0e93085d166907acb4c2fa5b7b9485ec28cfb6dc9e7ffc13ae5628c344ef0f78c15bdd828b8d51048a484548538cf14b9da20 SHA512 c8df5e50d952d5a6dcf1d9253a6ba953e9763c545a867da66c22c90dfa015aba0194f2a8f29a229d0a5f4dc8bfeeaaab8bcfda4066ed78a18b151bc05e6ae327
-EBUILD pyserial-3.5.ebuild 866 BLAKE2B 27f98f989c52c41875934b2361e3bd076a05bd8e41a9d420293741509729356d5ea0d517663dbc11a8f2ea3e179466b7effe3abe631c83a3b3634f17bb11020e SHA512 20d74464e822d3cbed598af045fcd63326e5e8ffeca4eecba9313428f7c420e082a03b885c3aa0ee9a50d59d014b41a2e33b9f3d025d89d8235ea5b00e4b16c9
+EBUILD pyserial-3.5.ebuild 833 BLAKE2B 4a041c5262d88f1807804edfa1205c1d7c16202ee8d7e00096888c43009e404f075104a296c0ea81d40fa2c6196d91f9728914bded1efa4667dc1a790a7a42df SHA512 c07b8cf00be8b4d084186b15fbd61d1926d1a8b75af77be3d3f88301f98c9e7d65e2225123c23b3752c257a8d8c4d53a97413c023d918c135a65173aa9d1af80
 MISC metadata.xml 445 BLAKE2B 26d6e406facd94a007c681bb0b9071d6d25356710e63f0da2669c740b0b715cf708fa74bd39a96f7ab2215398ba0573dee5cf66ee9302e32839f304402a67c9b SHA512 389db127fd40ecf72ad3e66a8d2861cd4b0ad9d9e86f7515aff087b7595a854eea6008b5425e16b328e52eb480232296a0f76ce7c07a183e2e123d06967b6451
diff --git a/dev-python/pyserial/pyserial-3.5.ebuild b/dev-python/pyserial/pyserial-3.5.ebuild
index 09d95613426c..e1edf4d0bc81 100644
--- a/dev-python/pyserial/pyserial-3.5.ebuild
+++ b/dev-python/pyserial/pyserial-3.5.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python Serial Port extension"
diff --git a/dev-python/pyside2/Manifest b/dev-python/pyside2/Manifest
index 03417e97a175..f362bf1fd3a3 100644
--- a/dev-python/pyside2/Manifest
+++ b/dev-python/pyside2/Manifest
@@ -1,3 +1,3 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
-EBUILD pyside2-5.15.1.ebuild 8509 BLAKE2B 677c5f6fe8ba542d396ee5fc0eba5f9cc9de25c5e6ab1158ec83c59f0e9e061ed299b2b6e0f376f67e9e9ba10f3c2bae59877a6d6898a8aef8231fe2a61dcf25 SHA512 a9c5e2a6a94a39c50f93ce72bcdd983961083369160942ea789882a40f8e0685600b1c94d13db2b98f834ad93366ed905195f29d328c7533ec0582b433d95dee
+EBUILD pyside2-5.15.1.ebuild 8508 BLAKE2B 17a565de5a11e456bc106fc0a6abb48b50ea47f704524f48d642a1a7a465a82e5f2679e164c48ed0fe00b161c9ed0b3326b5765b125c8d85d03c712e4fd52d74 SHA512 c45f143a3a781e18758c1e3bd12af16cf568d9126ffa6d4ec68816dfdd6f707bc22851d116ad7ab1e1006c462bc9be7918da16ac330fc5d9c57ada3653915469
 MISC metadata.xml 2100 BLAKE2B 5edbc13cb5654c4ebe787ab45bb87bccf87eda50d608560cb63e639c2ee997be8320b8c7b0f48403d86508cbf1eeb960c666978de1a6918571d0929bef640b62 SHA512 64da8de5b7b294e877d20927bbf11430b9705c0fcaa2445cfabc3f0a0b1fc4e586299b065868f09c688573c754604373cafdf1d2ba8c3d4c30ba66032b83f9e4
diff --git a/dev-python/pyside2/pyside2-5.15.1.ebuild b/dev-python/pyside2/pyside2-5.15.1.ebuild
index 0fa8713a733e..74610644ff46 100644
--- a/dev-python/pyside2/pyside2-5.15.1.ebuild
+++ b/dev-python/pyside2/pyside2-5.15.1.ebuild
@@ -33,7 +33,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/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/pysimdjson/Manifest b/dev-python/pysimdjson/Manifest
index f83df2e7ea3c..e0d1fabbd6f1 100644
--- a/dev-python/pysimdjson/Manifest
+++ b/dev-python/pysimdjson/Manifest
@@ -1,5 +1,5 @@
 DIST pysimdjson-3.1.1.tar.gz 3286141 BLAKE2B f1fc63ffcaf524f23112438a8669caf4b4ffa0190bb20e2b851f61dfae386fe02bff1746dd4e68499bdaff3420d41401424fde1332222fe49211d32e09fdcab8 SHA512 9b1080d70f06e5a6d6467769a8146f642adee2c08391a87dd86eca9b0eb7666d9fed47a83d991843b07c2b96906dbf0ccacf2425bfc3ce4cb22731e03b12122e
 DIST pysimdjson-3.2.0.tar.gz 3357720 BLAKE2B 596738da76d008563e31c6231d348fefb8f37dd4dee2490339a6233ba0a39ab24dc3facf1d02a4621f1d6e01dfb4af8673651d79095919ee7f4532a25dd1c63f SHA512 4c72d71ead5675c2d9b1551b5dacadee013fbaa74f93b2345920f0bac8eb65d79dd84ee817d07fea0bdf477c1c97ca4746048fbdd06a4bfa516e063d89724226
 EBUILD pysimdjson-3.1.1-r1.ebuild 512 BLAKE2B ab3793c04071be9c51237465b83fbabbf1593666f00931d1e80379541aea51da4b39b7f5bba340594ae3326c07fc95ebcdeb5bc62e29edd2995b63436fd7ba1d SHA512 93a8e90cdd78ceb402252604e8191047d653ea8409c90c017d11ce55fb16aab6453bf5a9dbbe17abb69f5a63d54cc78a7c058d710457346131744b7ce0ce0a95
-EBUILD pysimdjson-3.2.0.ebuild 517 BLAKE2B 4ff04eb2bca487be06fd6fd99d678b3fd6be5a9ec6a24759d9bef6264f7f6f204101b6225ee86235da20215901bb73eacf5d7266677d89545c75571243c3b59b SHA512 c0fa7a36b2c173bf3d8a28c02da0e49a63cce9715017f5ec7c1596e24f933e18dcafaf84151ee0f6410425b23716b48c5d23a15ba8a6d7cf6145877797cbb882
+EBUILD pysimdjson-3.2.0.ebuild 516 BLAKE2B 0da10517c85e0eb5ce240c67b34252b84b5cbcf563fa960f2e8ba211218b4caf65412873f6a905284f58a490edf7944a8d8e39d3f8c681f11fb46895b64d9b68 SHA512 5f93df21da251b9eff510c518976e7de6f543b0bb20f481cf51c309e77aad56fe813220dec6f15b6d834b2b096810ece317caee9fe77aabea5d5a714d85778e6
 MISC metadata.xml 322 BLAKE2B 94765d38596d2ebe4a27143373174f461b1af57ab29af679c35dbf69f45be48034ffeb424eef6ebc27e4be9e02090b587e216e7bb7f4eb6404523bd9a500435a SHA512 c88bdc79d128f98678accce553f367a1b83f7888e698a05b537387576808d9c547f52b7f963990311082ad06714e883a3da26e6f5cb93ef2b229c56a859d2fef
diff --git a/dev-python/pysimdjson/pysimdjson-3.2.0.ebuild b/dev-python/pysimdjson/pysimdjson-3.2.0.ebuild
index 5cfffa81a5a7..d3472efd5e22 100644
--- a/dev-python/pysimdjson/pysimdjson-3.2.0.ebuild
+++ b/dev-python/pysimdjson/pysimdjson-3.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/TkTech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	dev-libs/simdjson
diff --git a/dev-python/pyspelling/Manifest b/dev-python/pyspelling/Manifest
index d087e4d22015..5a3c004a82c7 100644
--- a/dev-python/pyspelling/Manifest
+++ b/dev-python/pyspelling/Manifest
@@ -2,4 +2,4 @@ DIST pyspelling-2.7.1.tar.gz 149449 BLAKE2B a5faefac163850d327d64b75776b5f360ad1
 DIST pyspelling-2.7.2.tar.gz 150911 BLAKE2B 813eca2c4bdf377fd7babec376dd2991713db59c66b509c656cb24a314776c2cc360ec9ff884baec6607f27cae3169672746580d3c58abad35dbfe9f605fc51e SHA512 2937c1985ec6f27713275d9f31d3529e35f219df211be0ac9f1ae89d5c92a1e52c51b982291be7bd25375eb6404f52ac0ad893afbe73aada1fb03923dc09f721
 EBUILD pyspelling-2.7.1.ebuild 1339 BLAKE2B 02000bbde0c75d186febae4b45309228c2c9b6430a19db3b0ce7b3d4c613452276ec0b8e2c64bd2f037e2bb1ed450c11e8a8d810d066f0a41e32a089fce7f7b0 SHA512 0eecb02ded18f6ec79f96726f17cde843160a467a6ac7f665cd266cb7bc663e0c08888fc90e17fd8f29f541d3cd403f265f81972bffe409f2718bc885474f26d
 EBUILD pyspelling-2.7.2.ebuild 1341 BLAKE2B 7de879854980c9690de5459caf5e620d06fb691a2077d2621a187964f7d8ac2201a0398f64b0da0dff9e575f857c9549b04273990957318b46657a7d634db7b9 SHA512 e8c7626558166281791fa12e17d2642fb3a3a6b154d31f265ec0084a64921595ecec32f2fe6b90713d69491537e37b69607afeb86c16b9c2bfe62ec272ddb525
-MISC metadata.xml 1936 BLAKE2B 58ee1c24137728ca0561add0b8397c766cbecc04fb97c3588f40b44488e6d95da77fb3fbc567dc34e93bb644b437de99199c72dc6ec3d3f2bf016b59629b3284 SHA512 c6932c7797e69865d65c215ac9209b29f9b9583e9646994532e59e0c2471889f637f71779dbf0839ac57d8e39622a15e2879394f1a6cc68e3f38ef6481375307
+MISC metadata.xml 1922 BLAKE2B 0c37a511b81e5cbd3c859848c6dc5d6956534534a21a680abe897692e7da6f399d0cf9c0fbfde9e2246cd20fee7c7884f26c4a3362532b6888346bd559cf11b0 SHA512 64ed2646fb3210997ba08dc3a4eb33299d30015d4060d0bc3a24221ca1067aec99c907efa870092b3eafe1d5724524022d74d8f6feafba3013b65f7cdb8b2f9c
diff --git a/dev-python/pyspelling/metadata.xml b/dev-python/pyspelling/metadata.xml
index a28ed69c911f..3cdf4cf7828c 100644
--- a/dev-python/pyspelling/metadata.xml
+++ b/dev-python/pyspelling/metadata.xml
@@ -5,8 +5,8 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
diff --git a/dev-python/pysrt/Manifest b/dev-python/pysrt/Manifest
index 4c9f08e0e73a..9bb9eaa1a6a3 100644
--- a/dev-python/pysrt/Manifest
+++ b/dev-python/pysrt/Manifest
@@ -1,4 +1,4 @@
 DIST pysrt-1.1.2.tar.gz 104371 BLAKE2B b6f8e1e6d0cc0ae7ac4a5eb1ac9c5444318fd579fd2cbd926bed932326c986743d3efc1b604353df92a3dc67ea0d47f9a77eeba28d561b3f69b4b63eff8b78ad SHA512 a3a0988068d3cc13e6d44aec548a94e79d9ed29cfcd1e8e35ff56b50f0feb32a1baac2220c5331281c98a19ad9a3e9f960832a661699921cde0d185ea21e9753
-EBUILD pysrt-1.1.2.ebuild 648 BLAKE2B ef6cf6128c1aa3ac5a2a2cb18bfe9949496155f4b7b6ff1e5c195171aaacda936e5e1db8d2a2515acf63b6debe59ffb44bea0aa76ba59b55fc3c170cfdea088c SHA512 a799d34e8c625bed564d98e2e7dde8a9eb07cba2481cda2b7f3e09464f35984dd239450529919b1eff269efcd6ed0b7b51626fd988bdab55505605d1233a30b0
-EBUILD pysrt-9999.ebuild 638 BLAKE2B 0ad3bf9639141e9d4e0f555d9d64c21c472f7f841a126a2c710f8a8a3905d159d2495a7ef036a28f56549350ee16c18c0f51ea501f4203e1d2c104a500341722 SHA512 bcc347147a53d50a65da70b032543f2eb2640be2243f18092164f11dd33cab9960403ddd8524a8c90c32d2e6c8f8f5275b26fcd2c69cdb85b34cb5a818487c41
+EBUILD pysrt-1.1.2.ebuild 614 BLAKE2B ef3a9a28a65ba9cdd2a7a29dcbfca07941eaf6c21fbbf8497e0d2eb221a8fcb276c8c786b7ce7faa490adf3196bfe488e1f7773af2708289df5426dc07d1ee53 SHA512 14abb14febc2f71181c526e42e539d04d8aa00e621ee7ee68122547b6888d9bf3fbda7d10b6b3b1e275597c8325b23b0db01fd0a775cb66456df66dc941aaa91
+EBUILD pysrt-9999.ebuild 604 BLAKE2B 1d78a42bdb4659a3a3e45adec31efc746fa3601e12acdd3ca448c73368e0eb1a8e1e07af0583353519bff188dff5ce2832fc02fb63905a8866511afac33fa223 SHA512 be4ee5ee18b977eddbd967a774c95c3e698ab26f2a705c99ee34476c2920925b7144230c0ac3c7f0093819d9bed724d8a66863cde669123ae6cc2e9fdaec0113
 MISC metadata.xml 425 BLAKE2B 1a1b0e96edd162f5349513bb5bd1a2b740a0764e4983c31ad71186227815c9767b0295d3c1b78fb019eca9fca59c6b119d5f4f571dc127b5f3589709837b8424 SHA512 a483c297944a2ec9b417a4703fd64dfbd34b8a7288f12a00e082dcf9c907c52d8c6f05eab5bbbf444eded62a42db6a9aa5799c35ae7d41d1b9e4e9b5417c2419
diff --git a/dev-python/pysrt/pysrt-1.1.2.ebuild b/dev-python/pysrt/pysrt-1.1.2.ebuild
index 42e310a76d0d..2132ab3d25dc 100644
--- a/dev-python/pysrt/pysrt-1.1.2.ebuild
+++ b/dev-python/pysrt/pysrt-1.1.2.ebuild
@@ -1,11 +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=( pypy3 python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python library used to edit or create SubRip files"
diff --git a/dev-python/pysrt/pysrt-9999.ebuild b/dev-python/pysrt/pysrt-9999.ebuild
index 8531cbd74595..89d133c23ec7 100644
--- a/dev-python/pysrt/pysrt-9999.ebuild
+++ b/dev-python/pysrt/pysrt-9999.ebuild
@@ -1,11 +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=( pypy3 python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python library used to edit or create SubRip files"
diff --git a/dev-python/pysvg/Manifest b/dev-python/pysvg/Manifest
index 2c1e5455ec9a..b6f70343fbfb 100644
--- a/dev-python/pysvg/Manifest
+++ b/dev-python/pysvg/Manifest
@@ -1,3 +1,3 @@
 DIST pysvg-py3-0.2.2.post3.tar.gz 23436 BLAKE2B a1f0ff710b73dd2e82811d322aa6365583febe8c9e7d690221690d285f94b3d0ae3f74e47b0e0ef236e389f0621ce5ad61ba00329a306c30a81cab0e77ee29db SHA512 3b0e30401ff9481df3fa5fde5b1e338bbabb86cdb846a11c08e8138563268311e20a4ce5317e5a31c337f2b8c5a3debb7abf8e0188e798e455378a363b31c95d
-EBUILD pysvg-0.2.2_p3.ebuild 457 BLAKE2B 310b2d4f32bb55c93cfce709121c1b40de7f7e993b2193ec02e035b62c8864f5cbed65d556cb7d70dbf21219c6896e7263c5735689438ccad77bb261fb46dd67 SHA512 afb3ea0a7571faf0f0347636041e513ea4aad72fffff6de603c6c57100d8e6a0eed2d06cbc6b6214ea404e6d871762ae3b684c0d669a3e49772346120aed3925
+EBUILD pysvg-0.2.2_p3.ebuild 458 BLAKE2B 1a31f6e205148674835dd862e056f1fd7830ad7f4c52beb9822b287fb1a98008c5202ff2e04df8da8d165d744d2c4cb52eae984772eeeea65399a7585ec65d46 SHA512 696f9a4054fe745ccf7517df244d5adfb4e224055e896f68b772c5a9e78b2f48631ca05d55385ed405723c6cd37cad9ed3ab1e82ef917a36dcd1b75363346d84
 MISC metadata.xml 370 BLAKE2B 385352206d620ca5bdcdf6c2e4346ba1a4303178db44954c948e4d972511a60352553aef740457e1de6224a671d373176f3ed4964ba9e1d0e152b26a4a13788e SHA512 b43c80036aa918bf157288ea0bf6477a69196b3536780097a7eeae3503103c53940213d93d19f818bf98258e87cea9bba09988824cf18e2737f1b077278d0cf1
diff --git a/dev-python/pysvg/pysvg-0.2.2_p3.ebuild b/dev-python/pysvg/pysvg-0.2.2_p3.ebuild
index 4c51f0739383..a258f0188e58 100644
--- a/dev-python/pysvg/pysvg-0.2.2_p3.ebuild
+++ b/dev-python/pysvg/pysvg-0.2.2_p3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -13,9 +13,8 @@ MY_PV="${PV/_p/.post}"
 DESCRIPTION="Python SVG document creation library"
 HOMEPAGE="https://github.com/alorence/pysvg-py3"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${MY_PV}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64"
-
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
diff --git a/dev-python/pytest-asyncio/Manifest b/dev-python/pytest-asyncio/Manifest
index 60ad7f4aa8ed..7891f1355e4c 100644
--- a/dev-python/pytest-asyncio/Manifest
+++ b/dev-python/pytest-asyncio/Manifest
@@ -1,7 +1,8 @@
+AUX pytest-asyncio-0.15.1-310-test-warnings.patch 297 BLAKE2B c8144f2ac331d5bd0bd793a1f66b6dda89e2a8c5e027c92e73806d111d144c70fce4adb044a65f7f0ec8e540e673562f608111a21ddef691a7275fdde3bb0cf3 SHA512 aca66133f76031b7ac7e6daae427184cf6e480fc8b66324751eecfd968073d8e3302cdaa978293f9459d6233c6503483e699b98d0addc53b7c1c36dd31c2e7bb
 DIST pytest-asyncio-0.14.0.tar.gz 14796 BLAKE2B 0a110dabde491293dc10452239971809ec6a4006a2036e848aac067df1af328d0d1d5c7afae8cfc1ecf5c919c0922050e2db182065500ec614a8094d3799c0cd SHA512 d1fadff152a0c94f80a8272a0dd293bd9d9300ad9e79c69556b5901c1a8ce00545f7715e503a383e3f4f35c8090d8f9ec33d16739b85378b59b1786a50441fca
 DIST pytest-asyncio-0.15.0.tar.gz 15555 BLAKE2B e9f0b732a1ff81c02cccbeddcebc593ceb982a640c5da2cf644ffc8e57548795cefdb7464bb1bb0d9a7d96a7476d30665dbea1c2b25341f8e71b16512c9402db SHA512 a936bd8f00cb470cee355b9abe6a6df5f65af5de9144bc0c128732f65fe4bc1e60b08a4e7287ae2f303e56e1764fd0bfe771102439e6d1ba7cb495d06b0677c0
 DIST pytest-asyncio-0.15.1.tar.gz 15653 BLAKE2B 8f10c46672a18d6992248482f9e3eb68ca9d3bae5163d5924e6363a15bc97dbfdc8b9dfc21a8a89ee4a6e21d76b083b1aa5a077fe581f0f2f0bd4c5a7b519cc9 SHA512 1813d49e0dd55f563d9bf058e009da61a17f61e081cc53626b5f1db623ba04905b6bea3ecba423dc931668053310176b634339d6526c7ea729d9aad87e4f044d
 EBUILD pytest-asyncio-0.14.0.ebuild 818 BLAKE2B b8ea175fe0d697c82c573a8e145d14e8ae2a3a794ee6c2fdf401eb8eebc3e28c5ad02596665486a1600dcd76473b370b9b1496f669152670aeb11b7b27b651be SHA512 037f5979820fe4c719b008f36971723f32cf404d1397ae97df1950b7e04e5cd0360c56e0c3a635ab5b78ee66d8f17390427320bf67edf19fe4721054164bf519
 EBUILD pytest-asyncio-0.15.0.ebuild 691 BLAKE2B be3e79199410efd0bf4adcf98d36d936a745efeb0d1c94e3739f716268b6452143b5093036ee57100a86bbffe8fb25e94512d648a0b94617c9ca1cca0d601c68 SHA512 93fa2d0a8fbeaf821eb5b7ef01883d1b2b3e5ed5e267ce6f08bdb999362c6f3ba610e066f18b4318baf5328f7ae3ef8e294360ccf56fa4c9815f599dfb433197
-EBUILD pytest-asyncio-0.15.1.ebuild 709 BLAKE2B c3d533dc84f0122335bf125aa00eae185918a58ed08b53ba5cc0692b945d412a43225470cf32866877a85280c9bf7f18c1cb0c2eeef9dbd92aa9a128bd6d797d SHA512 b6eb2188610f231b9763021e3ea966837ec71512d3d42cc775239927b556744efd59927aee9994cf39ec16559c6bed884d3f52b0d587d5063b15dec8100532cd
+EBUILD pytest-asyncio-0.15.1.ebuild 767 BLAKE2B 628bd66b96fe807c85953e255f843e95aeedb5ed7b7cc3a7455675c1371c32ed07e6a7dd761ec3d7341fb6ef4a5a60894ff0c3854a46831ec6172f5c6acf40e8 SHA512 68bc57fc981ed4d6fb23afaff1187d1297c654a169e5e4c73acd3df21778edca704f7892aabfb814724e0ccc2980dc694d4777c6410b3d9ac90c96239ef2d249
 MISC metadata.xml 384 BLAKE2B 72efae7dd0c314cd8f6e9e5b53fe94abab14fd591954474562ad4d6f5d485eaef9f324900cf79f3b857fb58e0b033ac496661e020ca9c88d2db0f1f8242d25af SHA512 ba2890b3bfba36b90098a578018c2fff627dd2537ac1c5dd90632c93df5a24a295050ef142caa5217d9a51da802aff686d9ea0318a1af7fcbc01e83b456848da
diff --git a/dev-python/pytest-asyncio/files/pytest-asyncio-0.15.1-310-test-warnings.patch b/dev-python/pytest-asyncio/files/pytest-asyncio-0.15.1-310-test-warnings.patch
new file mode 100644
index 000000000000..50f1c9f2d168
--- /dev/null
+++ b/dev-python/pytest-asyncio/files/pytest-asyncio-0.15.1-310-test-warnings.patch
@@ -0,0 +1,12 @@
+diff --git a/setup.cfg b/setup.cfg
+index 0161086..047501c 100644
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -8,6 +8,7 @@ show_missing = true
+ addopts = -rsx --tb=short
+ testpaths = tests
+ filterwarnings = error
++    ignore::DeprecationWarning
+ 
+ [metadata]
+ # ensure LICENSE is included in wheel metadata
diff --git a/dev-python/pytest-asyncio/pytest-asyncio-0.15.1.ebuild b/dev-python/pytest-asyncio/pytest-asyncio-0.15.1.ebuild
index 60f1a55ba4e7..eef2f9adf10d 100644
--- a/dev-python/pytest-asyncio/pytest-asyncio-0.15.1.ebuild
+++ b/dev-python/pytest-asyncio/pytest-asyncio-0.15.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -23,4 +23,8 @@ BDEPEND="
 		>=dev-python/hypothesis-3.64[${PYTHON_USEDEP}]
 	)"
 
+PATCHES=(
+	"${FILESDIR}/${P}-310-test-warnings.patch"
+)
+
 distutils_enable_tests --install pytest
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 96ae5e5d7cef..3aaf6b741dcf 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-cov-2.11.1.tar.gz 59143 BLAKE2B 21aeffbc9ccbe6a7c69a08fe3f0013204eb039c6dc9ddbb364a74ad10764e16ce7be0154e27beaab2c8f9b2a972131c4c2421c4aa4557efc18318556056a421b SHA512 19c465f5972ee0ee3b9a2f1a656fdf5457622cb449f73a6f707d377a617807dadda997a6875f0c081bc4c4f7039559c6e7ce820b818db42dfd053c016e1c3b4e
+DIST pytest-cov-2.12.0.tar.gz 59596 BLAKE2B 6eef2c062b687899009fdf7b4ef8825b3eeabc7be09fac897315cb99acb9176d11bf0d7f3704108caac1bddc32d158b88ddc69a5bd4815c1877cc238684abc3d SHA512 fc94abd8c38ff4015bad4f9f23ee4691f376d436c16f4951021afadfb94dd359a46924d3c7c43dc3193641943f88e0eab04429aa57d26a65bc95622e512639e1
 EBUILD pytest-cov-2.11.1.ebuild 1278 BLAKE2B 5caea1f7ad6d68330dc1e76a67337176b6bbc4003672cbcd31382ec5898d5f3c30793d453f97e476abf8db65c64f79689a53595d265451e3de013614280e8d8b SHA512 299fa908ca36189fa1881243c82bbba28b7de4c6146e2bbafb4c334ff4a2953cfb0f5d5a553a648d25bda6df0aaa4b92808b0bca1c60b72145746f6f2522f30f
+EBUILD pytest-cov-2.12.0.ebuild 1291 BLAKE2B d6632d8e15b6c9944238aa661d86cf3c680515ab66a3c6ce4752a192b94164c88e10bc62bf0803a127d1ddd771d80b94939a5a99a604708f391ba6a509be9a2b SHA512 ac77e919daa9d0030853606033da27f42a7fe8aca6f96b87400fb455723ec14a57975386854ec1e70f38b8c6c19032d16e7ef9807ed9a2d3f076e722e6f6221a
 MISC metadata.xml 411 BLAKE2B 5ecf37fefd3ba802d31a3f7e10a58fb7391d213164cca73117a5723b174b66e29574ef694960af9346df13667e6c203c309e8372086ddd481eca1eda7f843926 SHA512 ffb291dfaa0724a05a65152d6e1d1fcffed59bf260e07e216fb8e097fef0c3aeec320fd75a7c45ffefdd39c1c0e6a50e196a4cea99654fc3e5d768fd3a81dd99
diff --git a/dev-python/pytest-cov/pytest-cov-2.12.0.ebuild b/dev-python/pytest-cov/pytest-cov-2.12.0.ebuild
new file mode 100644
index 000000000000..8763efa3ffaa
--- /dev/null
+++ b/dev-python/pytest-cov/pytest-cov-2.12.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="py.test plugin for coverage reporting"
+HOMEPAGE="https://github.com/pytest-dev/pytest-cov https://pypi.org/project/pytest-cov/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/py-1.4.22[${PYTHON_USEDEP}]
+	>=dev-python/pytest-3.6[${PYTHON_USEDEP}]
+	>=dev-python/coverage-4.4[${PYTHON_USEDEP}]
+	dev-python/toml[${PYTHON_USEDEP}]
+"
+# TODO: figure out how to make tests work without pytest-cov installed
+# first
+BDEPEND="
+	test? (
+		${RDEPEND}
+		~dev-python/pytest-cov-${PV}[${PYTHON_USEDEP}]
+		dev-python/virtualenv[${PYTHON_USEDEP}]
+		dev-python/fields[${PYTHON_USEDEP}]
+		>=dev-python/process-tests-2.0.2[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-py3doc-enhanced-theme
+
+python_test() {
+	local deselect=(
+		# attempts to install packages via pip (network)
+		tests/test_pytest_cov.py::test_dist_missing_data
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/pytest-datadir/Manifest b/dev-python/pytest-datadir/Manifest
index 9bd250b6dd10..90b4f9d8b955 100644
--- a/dev-python/pytest-datadir/Manifest
+++ b/dev-python/pytest-datadir/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-datadir-1.3.1.tar.gz 15230 BLAKE2B 72c5daaeb93315be55ae052d39a22eee4e64a1aaafa344ae64b527eebd137dc4667cee2f60af887551f00814d7ea4e5788097d0f59f7769335545c5083aef356 SHA512 2ab035ea4e6c4eaaead746a5fd3988feed31a314f73e18270faf4ae606521aa045f3d6c5e1301adcb87f8fd5b1ba5f3f1784f212ad778707ba46ad638d594f8c
-EBUILD pytest-datadir-1.3.1.ebuild 608 BLAKE2B 93752c42ec68e91d6b931709cc90f9980244dc1d700372d01ef87d7f8b81f829ccafb532c33f00e87b8c219070a09769297e003edaad68a701c6ba863641cb12 SHA512 877a9ca6c2211675e9e854b64617d5424f7c66d06b52b7f20872ab3022f6bc0a02039eb31fa7fb335ef9a4fd039b1a779e232e348eda49786b88516e4374523b
-MISC metadata.xml 482 BLAKE2B 1f4d90482c5d81dd0e42efbe95a31cc982f490375d0819eb9bd879f760c348a8ac880dd82f88c243a741b563578731d1db1e9bd06e3c9a2e2e95f7af795557f1 SHA512 4c990149b361c88b150a9e0cf1466da9a4113fd4fbdd4c7d9c666dd72d871cde0e48c6702ea3afc9c345fbc4951d2f4cd5727b0d0320fe036d945bcb7d0b8599
+EBUILD pytest-datadir-1.3.1.ebuild 608 BLAKE2B fb061d9fa9d797efe3ca43aedebd480de6d43ff8a9b1b8e000e6ed596847422fd9fd0e7e45140b8640c349d27689700971410980898cfc0a31e7a8726fd57641 SHA512 2ab701644cdf08a687a2f7bf5610aeef0b7138bb3446eeb7b1dca4fd8138ccd7787a5fce150c21acbbc39c6b882e5f59c218b38a81e5c6679633f8e24e1af197
+MISC metadata.xml 359 BLAKE2B 41902d1f5543ce1c93f41cfa086f273b440e0f69e59601ab48ec57ef4e5371a45e2a9b3d913b406a46b16eb073b30cff8dc30c09ff66a16b9010dcb5982460b8 SHA512 b0cd9e7e16cafb7051d23fa47f7eb0e6ebffc7cd2334c539dabaa252d5d1bcd3e4db51afab71fcb3e03e933384735bd49d378cb4fe2f8558a8d3da91bc429cb5
diff --git a/dev-python/pytest-datadir/metadata.xml b/dev-python/pytest-datadir/metadata.xml
index 161817b6a08f..8baee97bcdb0 100644
--- a/dev-python/pytest-datadir/metadata.xml
+++ b/dev-python/pytest-datadir/metadata.xml
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-datadir</remote-id>
 	</upstream>
diff --git a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
index 12ceeb6ae7c8..1b2a63288973 100644
--- a/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
+++ b/dev-python/pytest-datadir/pytest-datadir-1.3.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-describe/Manifest b/dev-python/pytest-describe/Manifest
index cb815eb0faf0..c9448940e64f 100644
--- a/dev-python/pytest-describe/Manifest
+++ b/dev-python/pytest-describe/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-describe-1.0.0.tar.gz 8917 BLAKE2B 8608a00151273ebb22da6a297580295abbd64c7d9e90bfba9611eac3be64247be20ee43bb64ead1a3f74e65719112a94535506f4402cb7084802360609ab0173 SHA512 1cefa2911e598063b3b9dce381750d204c925cb0dde890b79745c8b4f1cf6d0349f85dc9eaf895000a6f15f45a84fb920f27c01b0af1959125fbe3716cbebbbc
-EBUILD pytest-describe-1.0.0.ebuild 787 BLAKE2B e83b765f0ae8562ac0d246cf294c114ae6bae6e6cd271a506c28ad1eadb9e8d4d1573c3ba69bd69ccfc6c16cac37df8c7fd4d57d2fb028f29a8b8193b708c78b SHA512 c210856b2803e1c4ab75f19073f120e658c0f4ca9f960e562a3229fc7e03c2ca84861626234e02a2e1e23684c472bd75fc30be2e5d5816c1b1ee8205a19f41e0
-MISC metadata.xml 384 BLAKE2B 12af309672ad0b05d765b0bf3c38e3eecc209aec0e83576db1f57c28b704c7b51c2144f3d697a93235c3143488265588f510fc928c884fec3e65e25d1f55e8f0 SHA512 449f84105e3c97fe1c7ff21bf4169da8ab6e2e6a0ee52d1c3cd84ff96717ad1c61316660ec361caed23cebcbdbeda9c4a7bbec11d054ac36016c1c2937906a61
+EBUILD pytest-describe-1.0.0.ebuild 704 BLAKE2B dc2f26b247a35b9e69de9eedc4f8685473ca62ffdf9211f306902a7c407ec6bc821e218163526526aa90db7c76635f8d7b67690ce125aefa3add68b33a4a51d6 SHA512 efb8f461d2005b669a8726ec09ea63f2cd12c7a1b87ddeb82f0f88b1350a239e76bfffa893dc55d500478786d240c20dd10a1a67e90121338f19b7bbcb0041fd
+MISC metadata.xml 408 BLAKE2B 10175d2eaf7075b00da421775b5160fcfcaf718630c82ce156b12003648c05e31a511e984931397eb8fc5c6408f2c519573b90395dc71a4919cf7a370a48884f SHA512 c9a79b36cc499d0e91f22d27239367b84a8a359418374104a11ab8138dcd6dc1639c70d4844f19967475024213914c4d663d79192f2421e14625a3135c41abcb
diff --git a/dev-python/pytest-describe/metadata.xml b/dev-python/pytest-describe/metadata.xml
index c9c0229c8f07..b980fa404011 100644
--- a/dev-python/pytest-describe/metadata.xml
+++ b/dev-python/pytest-describe/metadata.xml
@@ -5,6 +5,7 @@
 		<email>python@gentoo.org</email>
 		<name>Python</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-describe</remote-id>
 		<remote-id type="github">pytest-dev/pytest-describe</remote-id>
diff --git a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild b/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
index dc72c7e880f9..cce7fb4c6cfb 100644
--- a/dev-python/pytest-describe/pytest-describe-1.0.0.ebuild
+++ b/dev-python/pytest-describe/pytest-describe-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} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -15,16 +15,13 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND=">=dev-python/pytest-2.6.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( ${RDEPEND} )"
+
+distutils_enable_tests pytest
 
 python_test() {
 	# We need to disable some plugins because tests don't like unexpected
 	# output
-	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" pytest -vv ||
-		die "Tests failed under ${EPYTHON}"
+	PYTEST_ADDOPTS="-p no:flaky -p no:capturelog" epytest
 }
diff --git a/dev-python/pytest-django/Manifest b/dev-python/pytest-django/Manifest
index d142aa9a2097..aa51f4817133 100644
--- a/dev-python/pytest-django/Manifest
+++ b/dev-python/pytest-django/Manifest
@@ -1,5 +1,5 @@
-DIST pytest-django-4.1.0.gh.tar.gz 67983 BLAKE2B b7f4fe1366ce1443b19f05e8e834f0555cd8d63bf10921be1427338b7e5e737b7e04d96c9c9d2ad1b9c0f0ed6fba4ed93fb4fd9a948dc5315b4b7a35ba8adfd1 SHA512 734921f5c6f8569f6488706fbb6ca2515a5b24c6641fd260771022bd4fd72b65d062a8130f59163e8b30f4c9bceb383d154b26f8fbf46a1903339668d0a7d12b
 DIST pytest-django-4.2.0.gh.tar.gz 68370 BLAKE2B 94165a01ecd2734a4e02267ecfe8b531df33ca9237cfcd1ebad41f68289fb89590bed0027137d6dddefc4cbbd5c0f8445703e01a516d3992c2307ebe53d6572b SHA512 2dcaa80f3ebb67984d3849cea5de296388990ca65a607f995b89bd67e2d8964f944100bccb42a32bb75c7009849619e50421c2dce077037ce0440233dbdc13f1
-EBUILD pytest-django-4.1.0.ebuild 817 BLAKE2B 30eb3c9e830b6d0df6d1d8243b2e658d8a5fb02b892380f91fb50c89622204f430926eb133208d545fb568647dc039a11160aab095ad05cc53fd136aac9587be SHA512 45419bf5309f1b2d4db8f20e2b8033b75c5553dfdb6e1fc79652dcfe3832e32e6b326ae24fb205a272d1ba676f9d033e666cdd6c0376aca95f2be4521e0298ec
-EBUILD pytest-django-4.2.0.ebuild 822 BLAKE2B e9e861b673e839e5262cf9665322d9fe5cf86b67447f725e6ea2ae4c023cde24e59236b0ed4b7bffc25c15b35770bba5c8aca4812e61f9ac0db91990e89a91af SHA512 78f4fa922dc9bc5865adc46b8bfb64ee4b4b584273b8bbbbd3ba5eaffe826c547646b38948de725f28397cd6f97039629e574038f1453c774979a2a1275a3dc5
+DIST pytest-django-4.3.0.gh.tar.gz 71525 BLAKE2B 0eba9d9917759369aa2e126539f17fc36874453caf59838be2baf660fe29487aa80490f2af4ecbd72a9ba1f63a8a87202af2eff7e9d28c9c0fc686b09b07e82a SHA512 3c3ac31ed75daa29ab473ef3b87b5c66333cf7ccd8d217eb120b7899f463aafe5982b1e867e26e3b9ab51f312612fbc3d9f1ed9169815507816267fd4de76757
+EBUILD pytest-django-4.2.0.ebuild 818 BLAKE2B b27be5e4ef794426900ad4997bfeee3437f326baf706945efcec9679f1969435a96aa5c5ad58051ded1834bdcd4e20dc3e000643f20bc06c6a2ea7a935b0d089 SHA512 103a3ede84e5f4110a89abd25bbd0ed4b7d5d860399e912e7b1673e046b58a35c1ff21e4ee9e3a4647e1d4f5a01f7c75a0278f46033d1a5cdb34441e7e9051cb
+EBUILD pytest-django-4.3.0.ebuild 822 BLAKE2B e9e861b673e839e5262cf9665322d9fe5cf86b67447f725e6ea2ae4c023cde24e59236b0ed4b7bffc25c15b35770bba5c8aca4812e61f9ac0db91990e89a91af SHA512 78f4fa922dc9bc5865adc46b8bfb64ee4b4b584273b8bbbbd3ba5eaffe826c547646b38948de725f28397cd6f97039629e574038f1453c774979a2a1275a3dc5
 MISC metadata.xml 404 BLAKE2B 24556c59793b77f5c6de6f5c1210575d7bf7b5dc55aa7427d630d21311a77b31e3c846d5198ebf9b0407a0b1a36eae17bbd37a988c376eda666680871de30ea6 SHA512 33db1ea8ab6490e9b09daf334f48aa8db16db565e264b47b120797aee63c08c99aa27cae3c0a55a21c87552f99ad1ba9a13ba3b53e4562608209efb87a227268
diff --git a/dev-python/pytest-django/pytest-django-4.2.0.ebuild b/dev-python/pytest-django/pytest-django-4.2.0.ebuild
index ac4f7fbd41ae..f5c36d290b8a 100644
--- a/dev-python/pytest-django/pytest-django-4.2.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.2.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-django/pytest-django-4.1.0.ebuild b/dev-python/pytest-django/pytest-django-4.3.0.ebuild
index bee8ca09a56f..ac4f7fbd41ae 100644
--- a/dev-python/pytest-django/pytest-django-4.1.0.ebuild
+++ b/dev-python/pytest-django/pytest-django-4.3.0.ebuild
@@ -10,14 +10,14 @@ inherit distutils-r1
 DESCRIPTION="A Django plugin for py.test"
 HOMEPAGE="
 	https://pypi.org/project/pytest-django/
-	https://pytest-django.readthedocs.org
-	https://github.com/pytest-dev/pytest-django"
+	https://pytest-django.readthedocs.io/
+	https://github.com/pytest-dev/pytest-django/"
 SRC_URI="
 	https://github.com/pytest-dev/pytest-django/archive/v${PV}.tar.gz
 		-> ${P}.gh.tar.gz"
 
 LICENSE="BSD"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/pytest-env/Manifest b/dev-python/pytest-env/Manifest
index a00e720b6d65..4057f7b52968 100644
--- a/dev-python/pytest-env/Manifest
+++ b/dev-python/pytest-env/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-env-0.6.2.tar.gz 1693 BLAKE2B b303b8b2b486cd5f6c6273fefe709e3986183a56b6758b05f8bde973c561ebba9646538d38783749305740d8bd637966966a109fcd600cd6f6ee059449ffb328 SHA512 0b3bb21fc881023c102b584593c6e28840400ce8190810f33f9a421df4141e17dcfad2943c4159aaab82376b7b47b07b45f97c9cb232a7d17c4d35b55966596d
-EBUILD pytest-env-0.6.2.ebuild 438 BLAKE2B 620cf80f53ac539f991e97e6a2d77cd4eeef4b17e064dd31ecf1ae68eda98c639c70946dd2f9897d0077e7deb54eea16173d0cacb22be4f7448127f980a7c9d1 SHA512 7b3bb476ac1915b3e346af9d431f65f4bd19437576b15267d07e2ebcc5941c3429d9a164a53960ba121d8824a106a3d2db11d937224259689bc122590d96b7ab
+EBUILD pytest-env-0.6.2.ebuild 439 BLAKE2B 38fea07a4eb50113ec02eab872b6d969c1be082cd21f572e7d8496caa7d829599c74f506b6feec53c63b0905fcc9cc1e32ce1fc8004267c53c655517b8d22148 SHA512 f37714faaa419bbee0745cda9e8b22b1ad12492291edc68eb94445cb544edc9e22a3c66fcebc28ffdb4b1f42f207becabcbba1b28a132481926434e121141603
 MISC metadata.xml 382 BLAKE2B eb1fdd8ca4d109c876623b0bfc00b9689e3cbd34593ffc00e6738f143f797887f469eb3304d084e3665eb3566365eeb3dd87452c60279da2f839becd1950a990 SHA512 2262a2ea6b21b75e76f056122ff0dc21e3a5970ab982de1d5b6156105bfdf1e3a7afa2ccb2d5d9e9f57b18f74b3c0ce067d87048829cc85c917d86424e816f94
diff --git a/dev-python/pytest-env/pytest-env-0.6.2.ebuild b/dev-python/pytest-env/pytest-env-0.6.2.ebuild
index ae67df12a297..72f5a0e9e5eb 100644
--- a/dev-python/pytest-env/pytest-env-0.6.2.ebuild
+++ b/dev-python/pytest-env/pytest-env-0.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit distutils-r1
 
 DESCRIPTION="py.test plugin that allows you to add environment variables"
diff --git a/dev-python/pytest-faulthandler/Manifest b/dev-python/pytest-faulthandler/Manifest
index 112e678717cc..b07df762d321 100644
--- a/dev-python/pytest-faulthandler/Manifest
+++ b/dev-python/pytest-faulthandler/Manifest
@@ -2,4 +2,4 @@ DIST pytest-faulthandler-1.6.0.tar.gz 6656 BLAKE2B 0fe66827e09c6b566ac6a9aa3fd4d
 DIST pytest-faulthandler-2.0.1.tar.gz 3629 BLAKE2B f66b6989673b179b3ad3f583b9e7b9615b08e1e062f06969f37bd8a9a57e58bd0207544b0c11aa4a9d03f4db40a125bbbe1924160b2bdcb2c0c589de07281570 SHA512 184b4228693db0f15fdcf250f09c3ee9ef4767e744af9000ec46876f0c68e17434a6d1e25c7d59f610b2baa659d7af5a784cbf0e5e29b105f48d50d00cb1a7ca
 EBUILD pytest-faulthandler-1.6.0.ebuild 747 BLAKE2B 4b1c07cabfc292ba543dbfb3fd0ac154dcf82a15e4019a4c2ffbc951dad94ab82e9b742d7cfc6e53cc2d7e984ee926322de62080db9cef01ba995c3c51df5837 SHA512 83cb68adad83c92089f7d9b400de93c5f5d46f38435aa8ff63fe51c6476f159c3bf846ded527f7fecac30d149fc792fcef69e9d85c4851c668d4bd005e1f2203
 EBUILD pytest-faulthandler-2.0.1.ebuild 506 BLAKE2B 9e7e5f4c37aebb033b7a093fdee08a18e786dbd838182b93bd5d6ba848f307bf63bff147f644d1bd62c92b5c58686099b448b73e201e1c0388df961382b49f50 SHA512 46ab18e1c5102feca7ffe08243a18386acb6bc5cd73030109e0a90acb1fe0ffcf5a83e76577a309ea7de935fa264e00ee8f90ac2793a60dd53673e41b9428720
-MISC metadata.xml 487 BLAKE2B 3a095e6b04a7945c7b338b806bc757a0feaa2d1d151e57319f28f31b1677ef51536f6f94f3376b2103bc003400c7754f006cf9b8a991d34c65a2aafd457f682a SHA512 115f8068bdf7832334075342445002a2b55553f2a8dc05bbf29979e06cc512ca5834d7bcbc5ab68b639b7e62baf1005f30c7b149a3f9585854b228c2695f32fb
+MISC metadata.xml 340 BLAKE2B 67aad0631d9d00d8e0bd945dea4a882da0466855e89b656e55e0c937399b9d30a3d6e1a3cc798d678cd3d8bcf03eef34c8f7daa48c45ab9872ad521655d2a4ba SHA512 d49a96a88b8062191796b7fdb72db9bf3e325db21d1857937970334b5821ccff107335d5c9e3430d7983a7d95eba39b68e1c79cc59bcc1a9d15390286a399145
diff --git a/dev-python/pytest-faulthandler/metadata.xml b/dev-python/pytest-faulthandler/metadata.xml
index fabb80400e14..34606dee157c 100644
--- a/dev-python/pytest-faulthandler/metadata.xml
+++ b/dev-python/pytest-faulthandler/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-faulthandler</remote-id>
 	</upstream>
diff --git a/dev-python/pytest-httpbin/Manifest b/dev-python/pytest-httpbin/Manifest
index 30e746eedf19..3973b91ce8fd 100644
--- a/dev-python/pytest-httpbin/Manifest
+++ b/dev-python/pytest-httpbin/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-httpbin-1.0.0-pypy3-hang.patch 1099 BLAKE2B 4bb8dd686aadc35aab144a6467d52e7de675bcc7d6de8f130bc5942c17fd19c0c914d9aef81af3ed0a815ce21caf40ad8e7c8f724710fe07290dcc8fb92d6a24 SHA512 b0f417e7fdf658783e9297a895f50587d7b997de5065f5322fb46644028caa7cd10cf6130c578f6dd1f8b6aefbd281342f6aa8f5477284de3d4037b799604f72
 DIST pytest-httpbin-1.0.0.gh.tar.gz 17813 BLAKE2B b7e0ad9f131e4d236161b66b1d6d8e6087285a6d52df1accb044b30bcdac6c5f3350e9dbfe1cf33ab64b6d6aac6b463de81c31fd12dd950426b6ed8ef4eaf289 SHA512 2794134cc005cb969752e0c1119459d3f1e106f679942880a6b9ff507f2ee31c8ac4146a9c01b9a920368ea516443954b1b7044f7b1c270fe251f7d36adf7661
-EBUILD pytest-httpbin-1.0.0-r1.ebuild 823 BLAKE2B 62307e21135ee4db512d81de0dfc10349ebb5e74bc113ea0ea6d36737082954c70edc84b46d3fe2e9cc57c255870df91181ed32aab621cac5b2879832fcd0b51 SHA512 be523b2d121d49190e983a86fd84886a37a0ebad494ecdead836261b25957a6f85af8ee1986579173fc6edadbc000ab60ac404020b586d8643da459631c9033e
+EBUILD pytest-httpbin-1.0.0-r1.ebuild 823 BLAKE2B dd57355429fdea108b6ee53adad3bc979994130aabf0a596c0aa751e20b546f5bca6f5bd57fb559116b6cc7bdafbe3663e3018421f9f926e7d590e08919f5d7d SHA512 12a7f350556c6a75ce5b3de9046052e32fae6a4b7c6db87e113da6e2e9554f815cb439513264f317fc035a3fd75d227fa5f9e15be5f2b39dcfe665678cbd7dd5
 MISC metadata.xml 546 BLAKE2B 66d56799fa604da78b86048ed8f4da393024f1dc6f090695ca2de3bc3471e8af3d19a52737f7d298c8b08423f6ca36367052022a9795abe693dfdd1ad818e8df SHA512 311dc08c6c492b15163f5a9d327d129d6bd3feffcf6c467ad7c20c5d8237070f3de88e741ec92b1c6253dd9c7bba385d8da47fe0e3a1fc077f712cb636d7e0a5
diff --git a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
index 71f1892c0b3c..b4a95b64c9c1 100644
--- a/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
+++ b/dev-python/pytest-httpbin/pytest-httpbin-1.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pytest-lazy-fixture/Manifest b/dev-python/pytest-lazy-fixture/Manifest
index cccbd77a7fd4..7eb75a5a7d85 100644
--- a/dev-python/pytest-lazy-fixture/Manifest
+++ b/dev-python/pytest-lazy-fixture/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-lazy-fixture-0.6.3.tar.gz 7878 BLAKE2B f3a034678f590090a453b44b9fea938ced040c80922f139f3321ec20db856be219d039c7f4199ef67af79b5008d37425b5c08a0edaf71fdd7c8f248702acf488 SHA512 3281edc516f21f23104d7fc188b5c9aecf364f55109dab52865cbfef4a540727eb2bd42fb9806a7e8be728b249bc7a224ffdbab96473f043bef9a7aea1e4baa8
 EBUILD pytest-lazy-fixture-0.6.3.ebuild 505 BLAKE2B 5bb269b6fda705e2a373d6e04ca03700ca0e6ab89d84d71fa4759b33b7f045964a2beaaf207067287a2eee616e9dfa2f7526f6531d924d7e6d872e8f20fa1843 SHA512 bfdac9da24ff37a84473e814ab121ad52d6d9ed4eb584aff88579c480f31adf98ad653b24be8a7d12a883e267180b0f00d51f11c82e4ac2c826db1ea43d0cd6a
-MISC metadata.xml 511 BLAKE2B eab74879ee12943a5bc4ca8b3330634bdb48230809fa4d345378af127703324bcb83bb11d1b185871e28d0d6d9a6ce999474194813808661d2a1d91ba0442b23 SHA512 4b5a80ec63433e5f99c2839138003ec2dc24e265fd511aef0d526d08bf5d8c4df9088d197b003df6b9adc0f7b71ff5418661079983fd96014cbbc7d222b7eaa7
+MISC metadata.xml 364 BLAKE2B 2a36168aa5eb5248f9b6ff67fcaeba8cc40edc39db94a100c7825a7ca03fafa427c2cef34a71d7f4bfcced3da83ac2a11b68cf5bb4d3da5207774636ecebe809 SHA512 b400e7214e5740f42b6acbaadda05591bf8d5a2a562e1a19c4ceaf9c050e660fd134e4c6df93d9d5185a40bcc7661d8f91549adf2ee5114f413ed2bbb1469012
diff --git a/dev-python/pytest-lazy-fixture/metadata.xml b/dev-python/pytest-lazy-fixture/metadata.xml
index f05dc450af00..690f07df3712 100644
--- a/dev-python/pytest-lazy-fixture/metadata.xml
+++ b/dev-python/pytest-lazy-fixture/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-lazy-fixture</remote-id>
diff --git a/dev-python/pytest-ordering/Manifest b/dev-python/pytest-ordering/Manifest
index 5eae5ce103d4..21890a36d193 100644
--- a/dev-python/pytest-ordering/Manifest
+++ b/dev-python/pytest-ordering/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-ordering-0.6.tar.gz 11046 BLAKE2B 468ae5f04029b96ed3058b7f429aec0aaf96092453b229c3de5eab174702af2c1a9fe83171c68d282c4a144b3dd736daf9ed87b9e139a7bd175114f504049ebc SHA512 fd3aec83914f64d1295e1a1bf3fdc580c6824a749a1da8cebae275fef940d6ed6e5dcafad321d94f504a153e13e298b6544dc3c2db716a6b25d3148c2365fe15
 EBUILD pytest-ordering-0.6.ebuild 840 BLAKE2B acae7f5d89f699cd420a98071a53513e1e7e69d884cd28f78a7182b44339a7dace7b288f9691c11fec1b84653f7ce0b5252a7ba3fe62dab6249d184f242f4060 SHA512 784e1b00754a8ee76eb3144d5d50a315a3fdfc5f63de713163ed672bb999b3cd55e7e0f10ea53f5a8a8020782d29a265283b87de3b37e77ffe8c130e510a7599
-MISC metadata.xml 569 BLAKE2B 85881a1a559a851ce847d833bf9eaced8ef4a235ee9240e6a08a5c331efdf53b0bf368851a1eedcbe8014e98bd9560108025824d06e2c972072d10fa8b020ae5 SHA512 bee01dace6235844f05a60c9b5b31fa9b5a08ea3f9e991418600e3d32a31232bc181ecce27d1afd1fa5223b3ae8490ea40278de2bb3b806ceb941f31d278315c
+MISC metadata.xml 422 BLAKE2B 428335d7d103e4ad6722a61bd4367ee07370c3a73f628496b73ec9fe11b6e49ac973838c790237ab489c66bb4354d098aa46a456ec96dbeb42fcea0e8a7cff0f SHA512 e3195a89dbe739651d06ed2e996877469d1c39383d2377ae5d56d56d01ed0ce9edc2e1274e3711d00f7a95d3e5ffd23cb2592e462ffb9e535995b32ea14a8fba
diff --git a/dev-python/pytest-ordering/metadata.xml b/dev-python/pytest-ordering/metadata.xml
index 1c34475beb5e..1c5d7c4cd511 100644
--- a/dev-python/pytest-ordering/metadata.xml
+++ b/dev-python/pytest-ordering/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">ftobia/pytest-ordering</remote-id>
diff --git a/dev-python/pytest-pep8/Manifest b/dev-python/pytest-pep8/Manifest
deleted file mode 100644
index 12431ab6ed2a..000000000000
--- a/dev-python/pytest-pep8/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX 1.0.6-MANIFEST.patch 178 BLAKE2B 498bebd63c6be42e3a73063709dc2f315a2c8ec2234d43436ff3f076f768acf566d81a21ed76412fcf9da929290d355cef02200d91938a9c76df08a296d1baa4 SHA512 f63f80ea3ed7bf9241a029e4cfaae2e41ff9553effee7a85cd492cb3b57d9b54a17e684896be443ba5df08be1d07625c4e6769d9cab9dff952f10eedb92ca1cb
-DIST pytest-pep8-1.0.6.tar.gz 7271 BLAKE2B edfe2ac899586be9f7fd88f8bad5e5a18200da128d291735a30e374316b5ad449a08956b839605bf3f83b91931fb6890557445fd94f3a5136c7a44ee5e7f91f3 SHA512 162d9e25c264ecd82a51c6798ae75493c724a847ad8cdd953225f73e587f9a14298a6281e541695f6e7471a6121e9b0e4f694270f45ead851e392efcd7aeb758
-EBUILD pytest-pep8-1.0.6-r1.ebuild 652 BLAKE2B 9881bdee32d97a75774235b28b53b334d7eaebe3ec986139287ccbe1d16760161d5303c243153838427f13479f6408d26a6b07156a4e53c1dea85b4fec46b9eb SHA512 8516fbc735238bb9f3ee6eaaf68b1c7ab871eac42c46d1a990957c6754e408584fa33a9920ec697fbff1eaf2d8257fb297a6b51cbda095f1deb86df02ac6aea7
-MISC metadata.xml 324 BLAKE2B 3e0d5894a9d05fcf94a05abcdaba2da483d9b6db134df730bd436b85295a60504b2b30004eaf63396c31783d62ea042db28e0a28e24ff27255c40c4e4704b09d SHA512 3622d9663e7966ff8a566971b51f886be021d2e58254836d3c5dfa62e5001289d8d9beabb3f980af243a91cbfd527a076db628a1b29fb6562041a88cbc617b59
diff --git a/dev-python/pytest-pep8/files/1.0.6-MANIFEST.patch b/dev-python/pytest-pep8/files/1.0.6-MANIFEST.patch
deleted file mode 100644
index 3e9d2f20dcda..000000000000
--- a/dev-python/pytest-pep8/files/1.0.6-MANIFEST.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff --git a/MANIFEST.in b/MANIFEST.in
---- a/MANIFEST.in
-+++ b/MANIFEST.in
-@@ -4,5 +4,3 @@
- include tox.ini
- include LICENSE
- include test_pep8.py
--graft doc
--graft test_pep8.py
diff --git a/dev-python/pytest-pep8/metadata.xml b/dev-python/pytest-pep8/metadata.xml
deleted file mode 100644
index d127354cc52b..000000000000
--- a/dev-python/pytest-pep8/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>python@gentoo.org</email>
-    <name>Python</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="pypi">pytest-pep8</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild b/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
deleted file mode 100644
index 77735214b848..000000000000
--- a/dev-python/pytest-pep8/pytest-pep8-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,32 +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} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="pytest plugin to check PEP8 requirements"
-HOMEPAGE="https://pypi.org/project/pytest-pep8/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-python/pep8-1.3[${PYTHON_USEDEP}]
-	>=dev-python/pytest-2.4.2[${PYTHON_USEDEP}]
-	dev-python/pytest-cache[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/1.0.6-MANIFEST.patch
-)
-
-python_test() {
-	${EPYTHON} test_pep8.py || die
-}
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index 5ccc0004ae1f..66e73b90b741 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -2,4 +2,4 @@ AUX pytest-qt-3.3.0-fix-file-match-test.patch 646 BLAKE2B 60a34a0a5d3e7d4cedd6e0
 AUX pytest-qt-3.3.0-skip-show-window-test.patch 1318 BLAKE2B 7e1c628c13f02d6219d752e3bbd6c54d17b54d45fe84b608093a42796ed6208f12c62a6bfc7a685cf3f445f5c4f6ca9e496d9b55b088cfddc28313e02c07d45d SHA512 27f788b560e66e0de3b9f17144cdc2a31fb9a4a270efdb490dfe106109051669d55e10072c841ce8f0aa313bcfec397ff59c6c76842a6a4b58194a03c3ff07d3
 DIST pytest-qt-3.3.0.tar.gz 113439 BLAKE2B 1eb486d2d44825058577306ed3b9ade34e6cbad0d90038fe314114bb22c82ae069c9fe66c170591de6c97bad99f5f9e0021c8b3dc38c858b8293a22c448bed74 SHA512 8b3ce7b62621c55fb319966b162cb60663c5ef290f34e62e6a9329e67f530c2bde1329ae0b045b15c99ae14f5f6a5fef9ee930475fa700922c50ee725adf7983
 EBUILD pytest-qt-3.3.0.ebuild 1186 BLAKE2B 170bbde7f87dd7e77d6a07120176087550577fab22b81749db2003b889ea33edfd0947493f2c3e092b955973dea63e3ed7ad43da47ab5a97da8175536ae50d2b SHA512 f2c01fb7fd902e11f20937d0abc947f44d2da84087cd7db5ade934e0bd20168e4d94512d3156c85d9bccf2bd8df8e64d713bcf1f0128c427d238364aca8a344a
-MISC metadata.xml 537 BLAKE2B bb1fafe8cd84735962bb5dccc6c45619642a38ce17456a6a609d26e5f135c3c21ed0fc7e9651d477d7e972410a729de9b4a6d2e0eafc8c663df81b36783ec5aa SHA512 fe750266b77e746e7dc98f3d51e69217db039a510522d79bae869e2c243a86248d3ba605a97411e16dbd8d0b34e1adcca2ff73e265c531ab205e1b2c85ba552d
+MISC metadata.xml 390 BLAKE2B 57230af7617bc5ef26494e3a522ab4049c8154201f94f13d50a7331eaec5da3d5c59a3be3cf5e72efe2249dbd6b2adc99d15ed3e06b8c103ea1b1036cc26ce5b SHA512 f56e8f638d41c9b86bc7d8619f9a3601825b034f26cd2e603014820eadd863b7d93c07e4c04f5993569bc205a6b57cfab4b744f85c331d1dca26fb4006b83722
diff --git a/dev-python/pytest-qt/metadata.xml b/dev-python/pytest-qt/metadata.xml
index 9addeb33e0f5..1ce572b568b9 100644
--- a/dev-python/pytest-qt/metadata.xml
+++ b/dev-python/pytest-qt/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pytest-qt</remote-id>
 		<remote-id type="github">pytest-dev/pytest-qt</remote-id>
diff --git a/dev-python/pytest-regressions/Manifest b/dev-python/pytest-regressions/Manifest
index 9314ca304d6c..5903836a50a9 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
-MISC metadata.xml 611 BLAKE2B 542127f5b006545b2c2036c3d91adcf504aec9629e5eeedfe45b4914ac6c23caf5855da2bc2201637b5d8b4b7c61177002012834f5f4447eb101a996e0e16c77 SHA512 bd62c7af970d038b0800167000f2d6a115014e14e04ee742d65954ed082552b32a8489b7c555f8403247f149662bb0dd85dbe543d5e770e55346e8a6ebca9f8b
+MISC metadata.xml 464 BLAKE2B df781a65e58ca817930a547d83f754cd1b3ba652ad8aab397bb9a0954b5ec124fa99a9d0c804ec02de1d2ed8f9d67bab2e7655c219b8504a9a1aa0e50de5bf57 SHA512 3156101dfe3b4029b2fef4823563e267139010b0d5273a41b7ce86f739a040a2f31b60afd7d8636dacb3e20391ebbad1195d9c08209d96e0e959f7abab4549f8
diff --git a/dev-python/pytest-regressions/metadata.xml b/dev-python/pytest-regressions/metadata.xml
index e07abee2b047..d03a48323206 100644
--- a/dev-python/pytest-regressions/metadata.xml
+++ b/dev-python/pytest-regressions/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</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/pytest-subtests/Manifest b/dev-python/pytest-subtests/Manifest
index 0f673a0adcc7..934cf228628d 100644
--- a/dev-python/pytest-subtests/Manifest
+++ b/dev-python/pytest-subtests/Manifest
@@ -1,3 +1,3 @@
 DIST pytest-subtests-0.4.0.tar.gz 9673 BLAKE2B 780fbbdc6d4ac88c87002ee14323a0dd1036ab3dadc14b79ef11982459c60635add77e97575521ba0bda61317582e090353b427d945eca7198e294eb3d895240 SHA512 00302f47d1699e053314b6b4eee7c84a04fe0f51f287e338374bbd518c7d245d839ea0f1ccf50d4f35c86138cf6ea36da26e67bf41295205fb38323f2ad89f89
-EBUILD pytest-subtests-0.4.0.ebuild 907 BLAKE2B 1c2fce5eb3e152ddd4c7ad8e9e695344b276fea5de5de18e71e76591179b5a24923879c29ce09e13af770e04da0e0efaa31d401ed6960ab22b0cfde3ecc7572a SHA512 65c246dd7ed96210be01133f893f8cf2865bfa16517655ba0dae4be09d599776d38306a1c5e4d332991dfb0238dbddc19b7a055795e978ed11b3e8cb3aa14f34
+EBUILD pytest-subtests-0.4.0.ebuild 914 BLAKE2B 06a6912acb7f2e6a993211a2280c555edbe5405eaf5f28f7539366b9400702772b0f5c111c17c2b29b1be50209dd915819aa144d5c3bc212f08b199fd1d26504 SHA512 8f80ff5199e31fdbe154b5915f48d1499390eb9b2e76baa6edb47181cd364ca1006fc75d3d28c989100de587487ece5ee6114f268b2203791e5ab50cfe1cae75
 MISC metadata.xml 408 BLAKE2B 6aa0bbf41b922dcd85d121ac03cb177f2527c8bf89eebb53bbcf86bb3e551e2023c38a1356f1cb5c55010bf65c97f95ca77d9aa26db8e898ed1bb74133825a6e SHA512 5485b50b9c2f5f23209931bdb2afdea6bf77bd55d2853aea2418691fcd9fd93c47bf4ba3c5769cdfa5240e463b7926a8fe5f0a0795464fa02d46fc61e8dd59a3
diff --git a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
index 93a90ad96c3f..3151351f9e42 100644
--- a/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
+++ b/dev-python/pytest-subtests/pytest-subtests-0.4.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/pytest-5.3.0[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-timeout/Manifest b/dev-python/pytest-timeout/Manifest
index 6ea7208440ae..12c4f0bf691e 100644
--- a/dev-python/pytest-timeout/Manifest
+++ b/dev-python/pytest-timeout/Manifest
@@ -1,4 +1,4 @@
 AUX pytest-timeout-1.4.2-optional-cov.patch 839 BLAKE2B adc39941d090788666a5fa74d602fc7c2d7252622d5d213f8308728df7f198faf82edd9d56b3bb3cc277e62608cc6f59909ddce881e1a5931dde1f21f3671d32 SHA512 adb234da8272cf1b61d80db6d9c2b99cb0297044a962f3f54c7d9991ec8a142e6df3eb95fb29ee56326b3bd89e8af6d754f3c92f21a9fce934cd5d0af7fe4d05
 DIST pytest-timeout-1.4.2.tar.gz 15424 BLAKE2B b7ab91833e59af56ae50c066c14bb9b8ae9995d1586f35b29f107665d7da124828d7accc1b0149702f2973c61f18024739c68de736ae8aae6f55e8a10bf5d4ff SHA512 3446ecdb5aaad5fbca12df4e7f4f40c6c1a12895d3ed9f3a3ee24800ce36deed3cb8c09a4cc72220c962b06f821cfd55bf7eebbca23664c56abf2d0e5bc8fbea
-EBUILD pytest-timeout-1.4.2-r1.ebuild 910 BLAKE2B 28664c2a585c1ff2bd8d78e56b338f4b4b2a8e6196948f0cacf2f409492e8dcac8bc3997f939f302db3f65b2481164b4720d12320d9b79aa16d2f325104eeb0f SHA512 70dd5c6e85f895f200642119def18c6e3e266b164f8fe547afc821ae55555574d6c9488b9763b4f5415ebb2a9a7a1deb74d4375b9f23e14e3d4d4a4706bee23d
+EBUILD pytest-timeout-1.4.2-r1.ebuild 833 BLAKE2B 82bacda2efa91936f0a3fba5e25411956fbe559c7b1e3a8c145f58f53126a3d27d07939d86e791b33e3df487cbf737603e11222239d7a608b4056b70e31177fa SHA512 b4360d501bf1dad80a10199e6f4e401ff9921a38b60332c50fb6cd3029bf23f74ad41323b599bf44a369e456cb0b57e771f6ac54bd6e65abbd1e7d5019fe3d38
 MISC metadata.xml 352 BLAKE2B c3aa8ea91e07badacd5ac6d00f8580b4a2616b3909ce79f56e9760af95597289379072b6e4cfd65e9da4306ec0f1b0c4a77a920ef8cc10821b83ee5013c0e5f4 SHA512 3459606d8b5c8b639ce59bc18c85581076f10384d42cb00288a88159fdeb7c30cf51efec99e1696c69b69793da42ea25bab3674343629b1bd979f8836bc488dd
diff --git a/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild b/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
index 6502bfc16013..ab58b250128b 100644
--- a/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
+++ b/dev-python/pytest-timeout/pytest-timeout-1.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -22,17 +22,11 @@ BDEPEND="
 		dev-python/pexpect[${PYTHON_USEDEP}]
 		!hppa? ( $(python_gen_cond_dep '
 			dev-python/pytest-cov[${PYTHON_USEDEP}]
-		' -3) )
+		' python3_{7..9}) )
 	)"
 
-distutils_enable_tests pytest
+distutils_enable_tests --install pytest
 
 PATCHES=(
 	"${FILESDIR}"/pytest-timeout-1.4.2-optional-cov.patch
 )
-
-python_test() {
-	distutils_install_for_testing
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/pytest-xvfb/Manifest b/dev-python/pytest-xvfb/Manifest
index bd251aaaf839..917a3bdddc46 100644
--- a/dev-python/pytest-xvfb/Manifest
+++ b/dev-python/pytest-xvfb/Manifest
@@ -1,4 +1,3 @@
 DIST pytest-xvfb-2.0.0.tar.gz 6855 BLAKE2B 338802ccbf5fc0c9ab3fccd7c172b31867cc86869dfc50dbb30daf396ecd9865e71c6486cc96c2485e2d5b6195dc2eff83a033864f88e1b2c64a3937b6b48c84 SHA512 42c2119b2c529a45b5de9f8ac2781306cfb9f00c1d0e0e9045ed40ccb7260cb6f400683802ab845ce2481dcadfcef007c8417a481e9c04f14ee1bdc68244d391
-EBUILD pytest-xvfb-2.0.0-r1.ebuild 790 BLAKE2B 1bc599cd756084cf834f24576198d9d33befcf0cdaa499d7627edcf713c294c6c05acf46b82f2ac959a3e600ac3695aa3e459bfcf3d86cf5d8db5c6b22fefcf2 SHA512 82503d49f45e884260476b3daec2d32914c631c5142a314885bd43ff2b8a500d43e99badecbd1eab5395ea3781d93940751e0bb573985b3dce94e810b97f656c
-EBUILD pytest-xvfb-2.0.0.ebuild 765 BLAKE2B 56d9422573ae2d082f6726f9d5ee5845b2d833cf7b21731df5c16e0fcd6693e231215b55260fa7997b78e135f6b19185e1ee2d7d34730f2389db405fa6d7bd98 SHA512 e00ff840b4009968b0a9c73466eba0e7e6df57e9facf02cb294eb852db00bb89c1397e0a1ec72d9f2bc1910160e13e044d1aee43aeda63d96d48eb00f605d978
-MISC metadata.xml 503 BLAKE2B 33c6a351d0be7742f11a036b78799e31ce87bd91cbbbdc6017c272a83d8008bf4ec19df12a0152a8b9918196aa17e10a84729efa645b8a7421ae7875d7acde64 SHA512 2d87f0fdc631538f2a3f9afc933ae44c0957c03f4b7e57291f902c3deef3b7f087a2ab2651a224c9868f61e9e37a00ef267a5f2b07a43dbb253f3938a4990f30
+EBUILD pytest-xvfb-2.0.0-r1.ebuild 788 BLAKE2B 7931f964c4be6afe48cd58bccb9f074f198e228d3e47a9718d78be4135c57d9985d0ad66e1fe46d7116d1950f3a8d191a9e11f91fe87a542b4f2d6028edd3990 SHA512 62a47974f9485a32bb7e427395e6512195cd66249cd535344fa592eb00cfb6339fb9f2dbabdb84a8f671b80a796b71c64dc384a7685d9c78eb08008e9c935e2f
+MISC metadata.xml 356 BLAKE2B 8d7ef22a6e66a16b773c22eccf69db9719a9ededdb54bd994cf287704fe328714782c316c6491a2a6d7d061fcafcd48159dfb39836aea94b8e3f8c963fdd7f8f SHA512 3c87b6e1f8f9f66350928caeb73929650e25c92f9b6474c813dc44c28bf47778833dcdde112999c1993e6b6a4b3c814842f10874b5d22becee2e652347841add
diff --git a/dev-python/pytest-xvfb/metadata.xml b/dev-python/pytest-xvfb/metadata.xml
index c5489072fff3..d16e469ea454 100644
--- a/dev-python/pytest-xvfb/metadata.xml
+++ b/dev-python/pytest-xvfb/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">pytest-xvfb</remote-id>
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild
index 413aadefb50b..dd8953d8bdb8 100644
--- a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild
+++ b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/The-Compiler/pytest-xvfb/archive/v${PV}.tar.gz -> ${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0.ebuild b/dev-python/pytest-xvfb/pytest-xvfb-2.0.0.ebuild
deleted file mode 100644
index e6d752d53f87..000000000000
--- a/dev-python/pytest-xvfb/pytest-xvfb-2.0.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="A pytest plugin to run Xvfb for tests"
-HOMEPAGE="https://pypi.org/project/pytest-xvfb/"
-SRC_URI="https://github.com/The-Compiler/pytest-xvfb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=dev-python/pytest-2.8.1[${PYTHON_USEDEP}]
-	>=dev-python/pyvirtualdisplay-1.3[${PYTHON_USEDEP}]
-	x11-base/xorg-server[xvfb]
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local -x PYTHONPATH="${BUILD_DIR}/install/lib"
-	esetup.py install \
-		--root="${BUILD_DIR}/install" \
-		--install-lib=lib
-
-	pytest -vv || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/python-cstruct/Manifest b/dev-python/python-cstruct/Manifest
index 93ddbe9e8d16..ac8a4527b10e 100644
--- a/dev-python/python-cstruct/Manifest
+++ b/dev-python/python-cstruct/Manifest
@@ -1,3 +1,3 @@
 DIST python-cstruct-1.8.tar.gz 9911 BLAKE2B 88e091274495034c05d66e4ac808b3884a766017da92bb661cb6c90111cdb5e0d11f93a83e59be74acba9ba408c37b8cbaac88a1bb4fbbed120a2d0aaccd0979 SHA512 9ca9abf388965af06be6ab455652c60aaf2738a08bd7fcc32a8be57c19b2d705784618fd108bfa727a1c05c5749f761d698adc6550bffa1ebcaaedadd7d56a62
-EBUILD python-cstruct-1.8.ebuild 479 BLAKE2B 1e701e743aeeb4996c8eb0f8f5c76f761baa8a0012f372eecac3d087787a8f9295baf33bc4f4ce0151360b4f7c3cf96f85d9c6cbf19e783a759759e183c8e2da SHA512 07fd079e70a29e7480a60398a7557e5b4c46a1131ce9d54c920e368d90dd2f5590eed1de0cf600584da9b261cff0d0751620506d453eaacbc379e783a1e8b1e6
+EBUILD python-cstruct-1.8.ebuild 481 BLAKE2B f3c5d2f6265999fc2e062927c9edffae52197138df77d9182e69ae959c3d9af86bf120a074bbb8591fb1b0025a3d3bc51a86b784f071d97084b692250325d6b8 SHA512 cfc3660c03a80bf1d8e67609b31cabe74cd484d0b8fd7b7bf60fae1aba420e1a030fcb65fcc09c5a13e61cfb38f6bfc73566fbbe6366e0ea4b9da441c353547b
 MISC metadata.xml 352 BLAKE2B a2478767166958184fcd375f35b563a7a8e55de1c27068cc0959eab9fe6ace8fd1d42e3db862114e73bf7bd30181a09dd0bb3342ed48bf5db4496a882751197f SHA512 979cb550fb49246beeb8dcc2adc4119af81d80c7ccfe2ad21be0eaf2ae0042ac0c38a974366686104038ba5ba960910464a64b86782cf12156e44bf0faa6b2d2
diff --git a/dev-python/python-cstruct/python-cstruct-1.8.ebuild b/dev-python/python-cstruct/python-cstruct-1.8.ebuild
index 9b26f0bc1044..91bfd95f8251 100644
--- a/dev-python/python-cstruct/python-cstruct-1.8.ebuild
+++ b/dev-python/python-cstruct/python-cstruct-1.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="C-style structs for Python"
diff --git a/dev-python/python-debian/Manifest b/dev-python/python-debian/Manifest
index c6470900e4c7..5d15b87e8194 100644
--- a/dev-python/python-debian/Manifest
+++ b/dev-python/python-debian/Manifest
@@ -1,4 +1,4 @@
 AUX 0.1.39-disable-apt-pkg.patch 6815 BLAKE2B 443dfc1c0c60d47709f31f1d3f0196c703490a9491e8de61ea9a093a80e5d87fdf17e1b1ebd5b885a1e2c0104c243aef2dee4a8f1902b9b5f747ec1b797c93a9 SHA512 ffb0659feaaa1538bc7a40b896e6bfc53f51032aadf0c0642a3609d10a13a043c2bbea97e43fddd315fe5aa174a94c9fb3fbb9832bfebdf2acebd7a30cea3717
 DIST python-debian_0.1.39.tar.xz 319020 BLAKE2B de38ddc6e4878404f9685a264e1198e513cb57f7bfea064e4512ee00049d007b6007ee7fea42e18bd2f12dc8132582fbea2235694b5f908c9ae5cbc830cfe98a SHA512 de29ef224a17b149dde8cf6bb4b9fe77aa1fdfc040463163fb97f7e4ed283f16af43422e26c352183fd74e9e0ff6b41a91ee18c63b5534d5c9de2ef663c8f4df
-EBUILD python-debian-0.1.39.ebuild 895 BLAKE2B fb7c8ffa21edafb840b8087ccde9c91a62571ddd65aa12c13db24d26c3ed643c0365ed0fc04458ecdd2b13e2f433c7cb10387f80cde652a94410f5e16250748a SHA512 ae69f7a467682520a865e1ab67a28a7b60b3669e9ed0b67dda4e3f05f8f78f3d687fa9906b393f849fcbb0417cebab9e6e00b785358b932c716e66e47acb64d5
+EBUILD python-debian-0.1.39.ebuild 766 BLAKE2B 8c0fe936e3786037eccfcf50080d232fafb2141800ed726e05ff52f09279ed653b723702b044a57d7f1a49462c0b81e81bd0260cf7155fd18d0fbbd035a4ccd5 SHA512 b6e3e18338d5f5891cfe104654932d551aec3fd1207d776e329562d18068b3ca72f1f9c239c82efbcd0e6769f7cab8b1adf5ebf74889926835d30c4e07b17f7f
 MISC metadata.xml 447 BLAKE2B 3a50201209da0fe9153963a3c84fbfcd72eb2a9065c6ef2dc6d21436d12269d6188e7b5c3bf88688e91bdde0e8f33a1adf9d11e084cca4ef796435655ec32765 SHA512 54c833fe01cfe54156de60c39d5cab5f9324074ddb2efd0c8294cc55d3ef599c0c65e911855c93bbb4f42cdec489dc5b337b0a0a53113816110321ea291538e1
diff --git a/dev-python/python-debian/python-debian-0.1.39.ebuild b/dev-python/python-debian/python-debian-0.1.39.ebuild
index 372a80438504..63a9d4c02307 100644
--- a/dev-python/python-debian/python-debian-0.1.39.ebuild
+++ b/dev-python/python-debian/python-debian-0.1.39.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -13,19 +13,18 @@ SRC_URI="mirror://debian/pool/main/${P:0:1}/${PN}/${PN}_${PV}.tar.xz"
 LICENSE="GPL-2 GPL-3"
 SLOT="0"
 KEYWORDS="amd64 arm x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/chardet[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 "
 
-BDEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
+BDEPEND="
 	test? ( app-arch/dpkg )
 "
 
+distutils_enable_tests unittest
+
 PATCHES=( "${FILESDIR}/0.1.39-disable-apt-pkg.patch" )
 
 python_compile_all() {
@@ -33,5 +32,5 @@ python_compile_all() {
 }
 
 python_test() {
-	${EPYTHON} -m unittest discover --verbose lib || die "Testing failed with ${EPYTHON}"
+	eunittest lib
 }
diff --git a/dev-python/python-editor/Manifest b/dev-python/python-editor/Manifest
index 62b4614504ea..61b64f1365ba 100644
--- a/dev-python/python-editor/Manifest
+++ b/dev-python/python-editor/Manifest
@@ -1,3 +1,3 @@
 DIST python-editor-1.0.4.tar.gz 7132 BLAKE2B c955a2e3d2f607133781ef17146b20c13a409def6397e9698a8bc19c5a9f40af002a0f772455fb96e60088a732013ea6c471c198be0ac4c6c881724e762844c2 SHA512 c8ce2403bfe6c93935c7f4c384a8618a39cdaefe1ff5b1ff2cf4562866d8b3caa616e428c0a1634a56db934caeb474e7f84f8d5e009b9ed664189fdece8146f6
-EBUILD python-editor-1.0.4-r1.ebuild 406 BLAKE2B e2639ea123d8211a5847f4956615d72801f86d53e512e6990f9283c5bf4020d002f26930af44711539750b02353338e8a300d187bbbba42a287a2a8df519bf6e SHA512 cb95df61d14a3605d99106c88057077a4e3d59665c8eb1b0be8f8cafb798afdc21210994df2d7cad446e00539959185d04c389ea043ebb538f441fbc9d1c9c78
-MISC metadata.xml 454 BLAKE2B a005031053af09882cc6f9e0a928d371d118cb44207567094e570b65a7cbc69c210ae2cdf6487473ab7d12793126953ef9fdf1d2954d9c31b58a2e783b563378 SHA512 2a75117477ebfe097dc4791d65581ccfd010406eeb3d5145c237edcee0b3af409ccee45abd83b18798ace1196206343a94032058f53e20a708c30ddcebe6b432
+EBUILD python-editor-1.0.4-r1.ebuild 407 BLAKE2B 7c46f303638b84c1bcb50c9a087801ec4eab068b151928a64edf4a80bc446b32c3c3a42fdbe07908a856a0149b9a61082181ee82b60758620c90ed425c514004 SHA512 09410b6bb3dd3555ba76eae3cc4a671670a99ef470c27d5e14f86fa796524166dc48af16fa6fdc74b39ca6681e7d69b81220c5cd762a08058ae7b363f47249cf
+MISC metadata.xml 478 BLAKE2B 63310974574c2dbbd5cba2fe60d48d535bdc2659deda037b82b43e363de116908cb59f617c77526c9847b1fcb3e0cbb3ea5115448f6530f36ce557b903de31a5 SHA512 d178d425687a4ecee1ac55a1622ea9af89cd40f970330f73f00d5150ef7ae51243a4859bba5d5ab298fa634425c2d39df440f99cb675468b8e2b764434a8462a
diff --git a/dev-python/python-editor/metadata.xml b/dev-python/python-editor/metadata.xml
index 3c5614e4b63d..3ea1ded7173e 100644
--- a/dev-python/python-editor/metadata.xml
+++ b/dev-python/python-editor/metadata.xml
@@ -5,6 +5,7 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<bugs-to>https://github.com/fmoo/python-editor/issues</bugs-to>
 		<remote-id type="github">fmoo/python-editor</remote-id>
diff --git a/dev-python/python-editor/python-editor-1.0.4-r1.ebuild b/dev-python/python-editor/python-editor-1.0.4-r1.ebuild
index 97e21bb4bb2a..9a402c14a52a 100644
--- a/dev-python/python-editor/python-editor-1.0.4-r1.ebuild
+++ b/dev-python/python-editor/python-editor-1.0.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Programmatically open an editor, capture the result."
diff --git a/dev-python/python-email-validator/Manifest b/dev-python/python-email-validator/Manifest
index 0376f86a7965..1d1119b678ae 100644
--- a/dev-python/python-email-validator/Manifest
+++ b/dev-python/python-email-validator/Manifest
@@ -1,3 +1,3 @@
 DIST python-email-validator-1.1.2.tar.gz 19421 BLAKE2B 118165ceed5da6fed377180662496f5bc996f1d3c2201e6a014cae8f66a9ff3f447900aff07f778fdec49cd0c680ad6f9316f30f6c152b7eed4f1f57adc1ba74 SHA512 b40f8ecd65a9a5945a1a84b174398fc495afccd27ad5fcd7b4a03ecd26bcff6dd6ac3b5f75ac200cf2647b92d4defb25afe1dda28f82ed86bd8c2bd82708d0aa
 EBUILD python-email-validator-1.1.2.ebuild 819 BLAKE2B 02a620ac8f752d7f62728444f9274e6d527f0d495096607e3d6d18343ae3a3d455ff576ab31a8ca156029505ac33e20ebae096eb6b9e64d68b9794c17e040e6c SHA512 841904d5aac2ebb6aec8d40004c31b1d78a90c7a89f61fda50b88c19a10f174320ebe6ffe80f56216f9cd90ce410b55d46d68443782c3a0d063ba6e9ba3daa5f
-MISC metadata.xml 805 BLAKE2B 1fd2c12a04c3b2d824dd0a7a5d5ecc2ddbe716682aad6b24b39eeb12af9b33d3a6b10d511b2d6a98935a3ac9c3a5c11a2b9f8cb97c6ee9678ca2ed6d00483a85 SHA512 21ca57aa5220b3c3df3e0e1f532f2f377bec7b48bfb864f8aa531592cc274f8b9eb70f418b52372613f72d2064fc7f73508127c54f47dc53084d87537d173e34
+MISC metadata.xml 791 BLAKE2B 90989a47ce58b16cbf5b74e25486f412928d166b122baa95584f0b211ad19e8799c914cfde81f531915c190aa3d29ed23d38c948395ab224a64a6cd13231cbe8 SHA512 afa5676ca2931aafc9e97fec3da47cb25b6b5dc5698910f0ab428ea713cd9bdefde826d8726fad67a26875ae317f330252bf838faa2c2d0dae9acf172911e84a
diff --git a/dev-python/python-email-validator/metadata.xml b/dev-python/python-email-validator/metadata.xml
index 774e7cd21687..ebdfae47fca0 100644
--- a/dev-python/python-email-validator/metadata.xml
+++ b/dev-python/python-email-validator/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<maintainer type="person" proxied="yes">
diff --git a/dev-python/python-engineio/Manifest b/dev-python/python-engineio/Manifest
index 6daf2b4e127a..2b12287d3cbe 100644
--- a/dev-python/python-engineio/Manifest
+++ b/dev-python/python-engineio/Manifest
@@ -1,7 +1,9 @@
 DIST python-engineio-3.12.1.tar.gz 37158 BLAKE2B a3f75b0ec197248029a2a257eee7694298d916bc444705df7a941e8106d09e5bc802cd612c88e526883083730797e4835e13db93121714a701af17d894ac53cf SHA512 f81012e264025dc24845986e67c7d19d46048e072a409483a130630e07efb84e831e188d3f277dd0f7d26351015009afcef0d2058bb19dacee68d6c56837fa1d
 DIST python-engineio-4.0.1.gh.tar.gz 296000 BLAKE2B dc3b2c3f25ebbfb9d795e3c08e82b2e001fbc785dfb1666f137d8b261b65a90a15af7527917bdd9c636f076f75e01c65b498145ae5051649e1264eb9339d9f7e SHA512 83886ed1a60465127b7eb42a8437196cd68f4c538076237e4f64ff36f6fb02d1e45bd6730d4bb6209c931e05b4c2e10bae60451d1d4644071178ff44a73805e9
 DIST python-engineio-4.1.0.gh.tar.gz 296431 BLAKE2B 5ab267aba4dc6e49d26166b661da5b40961d328efb92dbcb653a405f62956f33b28dbf48cd891d0e74314da998be477f917dd6eabdf154877cd80077e4172c9f SHA512 5dea0ffc24138664216eefd6f917280d6199e4c2661a2e41622bb7f4cf03467d60d555e5c28ba23c35f59ae8b549902d235308242bbc5607ac91fd61580e0c4f
+DIST python-engineio-4.2.0.gh.tar.gz 297410 BLAKE2B 140dd21e779fd89f4d94ee3d191f0b661fa9dab2fac86c1023039afbe83d5136206add52ad412148eff69e79c84b7a8ad1744b3b2c69e02a270373c8c4a38488 SHA512 02eaa5b03045ac1ba73dbcd8c7c7853526234afb61dee6de45ee18bdf3663a2f82f9a5c969fb679e3eb8ccfe5a959434d574c59648b23d3e8e876d22f90e0591
 EBUILD python-engineio-3.12.1.ebuild 737 BLAKE2B f8ee47b26152d15b8bee1b25743ac1a4a98e725f7426124f5c7783bd3fb1a67926f099e72823a56c04b846fa994c21a0d6535e08d7a778139d725e00d8c68887 SHA512 8fb54dc01b1df87fc841245f986b8548207329c1d6cbaf74929d1417d4b21db6032d88ddbbf7b6c24c3d01feb6b3c4a8f7699510cd8dd6cc67a6814070a902a7
 EBUILD python-engineio-4.0.1.ebuild 808 BLAKE2B 9b97a4531a5bcb3308f93d6b8a165856a602c210350f6f66d7ae24278bf6e42c1f4df02a611f4f89081992952982b536f48796b7bab1aa1db609ad9848560cb4 SHA512 f57984d627b39e7e5beca8b4256df87d2e4234bff1891c2d34703c36850171de6a0c43be1461f374be0cebd6436f9cc4b3f18075299005337b5612b9d9e320c4
 EBUILD python-engineio-4.1.0.ebuild 807 BLAKE2B 691d02082918708a0ba6528a59e8bdfb568e57d63cb6ffa27258cab98c64a76f55ad1fd6aa512415465ce4c82d378e7e7bf641041c0e7bf4d7963cfcb9f62a81 SHA512 bd636c0c9495e25a2dc88ff154109c406133eca6c1adfd45878a32a821c403312f5c7a26dd26f9dff125e7ccea75476ca5edf473b4769dc44bf1c0ebda8757fc
+EBUILD python-engineio-4.2.0.ebuild 807 BLAKE2B 691d02082918708a0ba6528a59e8bdfb568e57d63cb6ffa27258cab98c64a76f55ad1fd6aa512415465ce4c82d378e7e7bf641041c0e7bf4d7963cfcb9f62a81 SHA512 bd636c0c9495e25a2dc88ff154109c406133eca6c1adfd45878a32a821c403312f5c7a26dd26f9dff125e7ccea75476ca5edf473b4769dc44bf1c0ebda8757fc
 MISC metadata.xml 517 BLAKE2B c4eef9b286bd64542def3d6155741d9763f9757c847671448f926666c65e6ce3ced2fb0a5adc75885ad2379b6cf4eabf85bb40c55de7b58e1cf51ca4500609cc SHA512 75fb14f0e068c12ca86262ecccac67ffdcb5bea5f84b6d4b6290ad25a73b7ec0289c478bc5afe4f08123aabd2fb72963e206cdae9fc980fe540dfc8d2ed28b64
diff --git a/dev-python/python-engineio/python-engineio-4.2.0.ebuild b/dev-python/python-engineio/python-engineio-4.2.0.ebuild
new file mode 100644
index 000000000000..789212fa520e
--- /dev/null
+++ b/dev-python/python-engineio/python-engineio-4.2.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the Engine.IO realtime server."
+HOMEPAGE="
+	https://python-engineio.readthedocs.io/
+	https://github.com/miguelgrinberg/python-engineio/
+	https://pypi.org/project/python-engineio/"
+SRC_URI="
+	https://github.com/miguelgrinberg/python-engineio/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/aiohttp[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/eventlet[${PYTHON_USEDEP}]
+		www-servers/tornado[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/python-jsonrpc-server/Manifest b/dev-python/python-jsonrpc-server/Manifest
index 14ac9896bf2f..46d2002f765b 100644
--- a/dev-python/python-jsonrpc-server/Manifest
+++ b/dev-python/python-jsonrpc-server/Manifest
@@ -1,4 +1,4 @@
 AUX python-jsonrpc-server-0.4.0-fix-test-with-ujson-3-and-up.patch 341 BLAKE2B 99635861a87bcc613540c0440edba10a3011c43ddfe91e675483db603308a655b8b77a832fc013016c7d3d0fe1dbe7c02f925dfc6b20cb514a37ca3d66c3dafa SHA512 3da608b3c7ed162d2b32c93f2f0733cc26e3ae218c65d3000d607a553240baef8ea47cddd8323caa58fea2fec59e8bf3f9b120a977b4522642b88ae55cf88f28
 DIST python-jsonrpc-server-0.4.0.tar.gz 26491 BLAKE2B 524dbd0692861bff538d9db06facda4bdad74c84d3c047a374db658adc31eeb799ba0c4b0219597b04c75cd6e2db3968ba0cf4084ba235509c2457c22b3e1497 SHA512 062e5b75253b95e64918a9da86ad7e29d8a29019670e451b9a28d44cde064339953004c343be0e7dd40968ec9fc2420b5722265f56c2db8057d0f1eaf088dacc
 EBUILD python-jsonrpc-server-0.4.0-r1.ebuild 821 BLAKE2B e3f5797334c29a39ccfaac7efe5ecd26901ec677f4708a82b8f1d4cae55e9fbf3b18c480cbb218006479788c39c224aefc6995227984281214b07e09f24e84cb SHA512 86e60b631f68bdc81b4ec53d0a26441d8a2369d713703808ca37f234680610a02ea5cbb7c6d026e0cb95abd58dfe4e17a09bdc005d513c2b7b754c6b4aa2cda8
-MISC metadata.xml 489 BLAKE2B bf176488a6f0304d3d9224ddaf533ab4b3df2b967799110afdfa5368000d0b5371c689b2d8437b9d13bbcd484685a596d5bd79fc8e993373feb62a354309899a SHA512 139446bcfac77f4d4b10e26089d3a9ebb130d061b1a3dc220a288422e0c02f7bb0f7532f6f741e3a78705df6e30d9256709efc797c967779bbc022b6bacf36db
+MISC metadata.xml 342 BLAKE2B 6a7a999e84da208939b06cd7b589ff536a2d8c63f5646dcc1d8d9bc474ca88a538d3184a840e47382706a7de23414da6b1913fe4854d39f10020fee6a740c8d4 SHA512 8871573f805ecac9b6a414446e375fd63bea99461b51a7855a24bf70917c880e22185c77a65abb27749a79967cfdd8435f49824cdf294f0bb95b7963d68401a5
diff --git a/dev-python/python-jsonrpc-server/metadata.xml b/dev-python/python-jsonrpc-server/metadata.xml
index 2a7e631036f8..9282bf9d7ace 100644
--- a/dev-python/python-jsonrpc-server/metadata.xml
+++ b/dev-python/python-jsonrpc-server/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">python-jsonrpc-server</remote-id>
 	</upstream>
diff --git a/dev-python/python-language-server/Manifest b/dev-python/python-language-server/Manifest
index 4ff253d44828..90011ef1965e 100644
--- a/dev-python/python-language-server/Manifest
+++ b/dev-python/python-language-server/Manifest
@@ -2,6 +2,5 @@ AUX pyls-fix-test_folding.patch 1238 BLAKE2B 1942a7d0b21a25310c2fe361e7a91cd122b
 AUX pyls-jedi-18.patch 2620 BLAKE2B acd80d45c93096f8809f901381e04ac88a869c8198ddc30991ecde98690567df0740334c07d870b8bc9ccf149fb0534f2f4d03007493189c1a6e853e5833ac96 SHA512 804308c6ce4d6189bf65f33397550d10b848e109a7f547f4bda80e9a78b68921225369667d9c72c3dbb954bda8a35af038596fac3b4ae026f952776f9bbb2c16
 AUX pyls-numpy-1.20.patch 2387 BLAKE2B 98178536140797b12e0725d407ed65df772560eed8cade7d00a8f0c7ef691e8a6cc3141babbd337da6482e959b32c7666eef6ce35de41ec1a52328aee5b8c7ae SHA512 c5708708da39ca18162a567f8006a59b5255e3a46c209b1ed7a0e309280cc5fc606c39dbbd259f7103854ccca9123fb478ebbd95bc0ca420343672b453ae7bd3
 DIST python-language-server-0.36.2.tar.gz 74499 BLAKE2B 0bf950e236f8f898c3158afc2b3355948340639b607f474654b0334d484170a210b6e81c7508f12368223ae9915ccf19f76a1bcde41503230d8c008ba0818b47 SHA512 ee909d9332ef76c616d727ebfa36e80fd03ab57df8fc57265de21f0105cc0b64a518b2a8a582f88364d03a7d2a66e1030bcf5b3452ad3a891a3141da9b338373
-EBUILD python-language-server-0.36.2-r1.ebuild 2611 BLAKE2B 6a4c314f971cb6c06a133c52a6ec6ea6eb59f1c637c0495caa58fef55e946b7ae1be6ee730cb6b1c52566ed2b8a29cc8f728443314032cbf483b0f37d7e31bde SHA512 dc21073457cca6d11a9bd64ef804cc723fd3120d30190962a2ece9bd7d9ec0e74315cb0af774401460b8ca6a0bbdd23dd94e7f5f6a32e7ef2c3fa7f1469f4319
-EBUILD python-language-server-0.36.2.ebuild 2358 BLAKE2B 5aa1d66cd29540f597c9da2f69481b3a67fa5723fbde96fe90e5e982dc3bc5e2e44469996c6849d83527453b4c4bbe382e072531bdf77bef5b99226889d40bd4 SHA512 960f91b9dba494d50551fb4849ece1d0cd331422cf082c33cc05504394a38678e820650dddb78aacdae05108a06e04df14a0d200ccdc44c40cde9b98dfaccccf
-MISC metadata.xml 514 BLAKE2B a5982be16511774dbf4bc63e33eb4370194920873e43dcda1f9914275c17bc6c4ca16acd3289cf69277091b967d0d96dbd0dfd973dc2ae14e825328d449d2173 SHA512 a9b6d7621c33dd0138890e9d8550efed80d19db3b549c677a28025c327f2c5119168aeb05eac4d1cc5098741a904a25cbda1818527f081d4bd9f44d56e561e44
+EBUILD python-language-server-0.36.2-r1.ebuild 2609 BLAKE2B 47972e2b5a39aa5f26f31e753aa9861accdf0aae48f9988d9c3172e7a59efac002ca1f139a9e9a91995cf2a887cf1781b826eeb0c01a796a6027f629758edbfe SHA512 032c5bdf6bb8f29787d75bbe4253bf0c4d72ce53f37155533c826aec8758ea91174581d72f458dfa9e86c1920ab6586a6092f47ed6a6faf26442000c8a7721f4
+MISC metadata.xml 367 BLAKE2B 5ec493b91dbf785b84d4596f7f019f3be92e239cc1effc38fa7b98e762d06ea60c6ab8203aad5bb5fa4b4fecd7fcfde5a1397469b179ecfec720ce06187dac34 SHA512 57e659d74065826e25af609c7a1c20f540b1a67fddea4697602b16901ee4905883742377284795baf4c8a2eab4716afaf209761d684207941a3406f0d55ef92d
diff --git a/dev-python/python-language-server/metadata.xml b/dev-python/python-language-server/metadata.xml
index b05ceca6d39f..46b054f2ca60 100644
--- a/dev-python/python-language-server/metadata.xml
+++ b/dev-python/python-language-server/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">python-language-server</remote-id>
diff --git a/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild b/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild
index 0b121d596271..19de44f065be 100644
--- a/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild
+++ b/dev-python/python-language-server/python-language-server-0.36.2-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 	test? (
diff --git a/dev-python/python-lsp-jsonrpc/Manifest b/dev-python/python-lsp-jsonrpc/Manifest
new file mode 100644
index 000000000000..54d1c1b4bb19
--- /dev/null
+++ b/dev-python/python-lsp-jsonrpc/Manifest
@@ -0,0 +1,4 @@
+AUX python-lsp-jsonrpc-1.0.0-fix-test-with-ujson-3-and-up.patch 342 BLAKE2B aafe30896b88531102ff79900d845a24a506ff8d0649699311e77f9ba6742f591500e2cb83a2e5aff3118a1174819b2745a8f9ca6919af8b84d379422c7e06b7 SHA512 baaa0105df9906d451a9870c7f0ca5980c6b667b7d8c4fb4f57a0fb3bfbd3f2b7502cfeea7f2abb041c2dcb344f6f5ef69822d82daed3de1ebe4564c812c7430
+DIST python-lsp-jsonrpc-1.0.0.tar.gz 10011 BLAKE2B 671490d439f10eebf2d05f221adad25be6f881f4a0f4fa975d4574937a951d4d0bc51264a9ec67d3ef5d112b6e025b551685d3e3c2b959c4a6bcef92d46c5ff3 SHA512 447835fc6c3810f486d80f85295089c021b792843bdf88d461c021b8b04407d8f7e6a99c07351a23658a5dff46eb475bc64e51bdec029787cd33330b54d4dfec
+EBUILD python-lsp-jsonrpc-1.0.0.ebuild 762 BLAKE2B 620309985c6db4abe4e06f7bce84700ca497bda184d7c7045166b69dded1e847ecab5c3e13803966c8a2adcad186af2502e4f547291425bc1cba825279cd0db7 SHA512 4b834e2273e7fa7b62b07042503779343b14f94c02d1fff98a6f04e7675767b1b425146d88dd501e3a209a2af5cf2e577e2cb138ce0ab5c3708e895d21f868e8
+MISC metadata.xml 464 BLAKE2B 604db448396e6558c6a65f823b25d5d1866b7558e72c96d4356488f002c3c27dd50c6a3a08457920a3f46805b01102e74ce6246c3c3686d686c722418e13ce14 SHA512 046b237e0b4b4cc0d19d58ebe225ded113b60704c190d5de5dc4a47cde24b7a539fe106dfc08b71fb3c96592aaffc10bc842d5f506726d65f1d024020ea14a25
diff --git a/dev-python/python-lsp-jsonrpc/files/python-lsp-jsonrpc-1.0.0-fix-test-with-ujson-3-and-up.patch b/dev-python/python-lsp-jsonrpc/files/python-lsp-jsonrpc-1.0.0-fix-test-with-ujson-3-and-up.patch
new file mode 100644
index 000000000000..c7b01903761b
--- /dev/null
+++ b/dev-python/python-lsp-jsonrpc/files/python-lsp-jsonrpc-1.0.0-fix-test-with-ujson-3-and-up.patch
@@ -0,0 +1,12 @@
+diff --git a/test/test_streams.py b/test/test_streams.py
+index bce3ffa..f93cb8d 100644
+--- a/test/test_streams.py
++++ b/test/test_streams.py
+@@ -113,6 +113,7 @@ def test_writer_bad_message(wfile, writer):
+         hour=1,
+         minute=1,
+         second=1,
++        tzinfo=datetime.timezone.utc
+     ))
+ 
+     assert wfile.getvalue() in [
diff --git a/dev-python/python-lsp-jsonrpc/metadata.xml b/dev-python/python-lsp-jsonrpc/metadata.xml
new file mode 100644
index 000000000000..61471bd8fc75
--- /dev/null
+++ b/dev-python/python-lsp-jsonrpc/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-lsp-jsonrpc</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
new file mode 100644
index 000000000000..3e5baaabbc49
--- /dev/null
+++ b/dev-python/python-lsp-jsonrpc/python-lsp-jsonrpc-1.0.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSON RPC 2.0 server library"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-jsonrpc"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pycodestyle[${PYTHON_USEDEP}]
+		dev-python/pyflakes[${PYTHON_USEDEP}]
+	)"
+
+RDEPEND=">=dev-python/ujson-3[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+PATCHES=( "${FILESDIR}/${P}-fix-test-with-ujson-3-and-up.patch" )
+
+python_prepare_all() {
+	# Remove pytest-cov dep
+	sed -i -e '0,/addopts/I!d' setup.cfg || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/python-lsp-server/Manifest b/dev-python/python-lsp-server/Manifest
new file mode 100644
index 000000000000..a34917e7a7f3
--- /dev/null
+++ b/dev-python/python-lsp-server/Manifest
@@ -0,0 +1,4 @@
+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
+EBUILD python-lsp-server-1.0.1.ebuild 2288 BLAKE2B 47f990512d9a5bb3728152f441817400b79e5f32b71cd669b66a5868c9f116776cbd4573fa2f18c8cd41950aee1a25e54179902f3180d3ecd3109c58c7ca22fb SHA512 a97b0540b36eeae3442afd47c1162bef0c8426e71f2d1ae06bedbb95f318283b4206b82280a175dc6e2a257280344cb7e777c0c76f4c589a2038e8a068853f35
+MISC metadata.xml 463 BLAKE2B 4b7c9f0dd4bf6631ed4da34e4c048a5ce16b676b6c56a7f7598074db744e1ccff4c977b5dfcf46d77221d9b1821e56df1722a626f02a6fb7f7c6ba303308c514 SHA512 f868ad2bb319f1ababb0d9a70cb368dec36935822678a6bc365eb2569cab661d300d4d347cd207f6b2f537b5ffebb84dd804fc2faa35cf85f17d437edb177eb7
diff --git a/dev-python/python-lsp-server/files/pyls-fix-test-with-pylint28.patch b/dev-python/python-lsp-server/files/pyls-fix-test-with-pylint28.patch
new file mode 100644
index 000000000000..99790b6baed9
--- /dev/null
+++ b/dev-python/python-lsp-server/files/pyls-fix-test-with-pylint28.patch
@@ -0,0 +1,237 @@
+From f6d9041b81d142657985b696d8da82cebdbe00bb Mon Sep 17 00:00:00 2001
+From: krassowski <krassowski.michal@gmail.com>
+Date: Sun, 25 Apr 2021 21:06:28 +0100
+Subject: [PATCH 1/2] Address pylint's "consider-using-with" warnings
+
+---
+ pylsp/plugins/flake8_lint.py     | 25 +++++++++++++++----------
+ pylsp/plugins/pylint_lint.py     | 28 ++++++++++++++++------------
+ test/plugins/test_flake8_lint.py |  7 +++----
+ test/plugins/test_pylint_lint.py |  7 +++----
+ 4 files changed, 37 insertions(+), 30 deletions(-)
+
+diff --git a/pylsp/plugins/flake8_lint.py b/pylsp/plugins/flake8_lint.py
+index d632395..dfee5b4 100644
+--- a/pylsp/plugins/flake8_lint.py
++++ b/pylsp/plugins/flake8_lint.py
+@@ -5,6 +5,7 @@
+ import logging
+ import os.path
+ import re
++from contextlib import ExitStack
+ from subprocess import Popen, PIPE
+ from pylsp import hookimpl, lsp
+ 
+@@ -65,16 +66,20 @@ def run_flake8(flake8_executable, args, document):
+         )
+ 
+     log.debug("Calling %s with args: '%s'", flake8_executable, args)
+-    try:
+-        cmd = [flake8_executable]
+-        cmd.extend(args)
+-        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+-    except IOError:
+-        log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
+-        cmd = ['python', '-m', 'flake8']
+-        cmd.extend(args)
+-        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+-    (stdout, stderr) = p.communicate(document.source.encode())
++    with ExitStack() as stack:
++        try:
++            cmd = [flake8_executable]
++            cmd.extend(args)
++            p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
++            stack.enter_context(p)
++        except IOError:
++            log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
++            cmd = ['python', '-m', 'flake8']
++            cmd.extend(args)
++            p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
++            stack.enter_context(p)
++        # exit stack ensures that even if an exception happens, the process `p` will be properly terminated
++        (stdout, stderr) = p.communicate(document.source.encode())
+     if stderr:
+         log.error("Error while running flake8 '%s'", stderr.decode())
+     return stdout.decode()
+diff --git a/pylsp/plugins/pylint_lint.py b/pylsp/plugins/pylint_lint.py
+index 5491787..6449cda 100644
+--- a/pylsp/plugins/pylint_lint.py
++++ b/pylsp/plugins/pylint_lint.py
+@@ -7,6 +7,7 @@
+ import logging
+ import sys
+ import re
++from contextlib import ExitStack
+ from subprocess import Popen, PIPE
+ 
+ from pylint.epylint import py_run
+@@ -232,18 +233,21 @@ def _run_pylint_stdio(pylint_executable, document, flags):
+     :rtype: string
+     """
+     log.debug("Calling %s with args: '%s'", pylint_executable, flags)
+-    try:
+-        cmd = [pylint_executable]
+-        cmd.extend(flags)
+-        cmd.extend(['--from-stdin', document.path])
+-        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+-    except IOError:
+-        log.debug("Can't execute %s. Trying with 'python -m pylint'", pylint_executable)
+-        cmd = ['python', '-m', 'pylint']
+-        cmd.extend(flags)
+-        cmd.extend(['--from-stdin', document.path])
+-        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)
+-    (stdout, stderr) = p.communicate(document.source.encode())
++    with ExitStack() as stack:
++        try:
++            cmd = [pylint_executable]
++            cmd.extend(flags)
++            cmd.extend(['--from-stdin', document.path])
++            p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
++            stack.enter_context(p)
++        except IOError:
++            log.debug("Can't execute %s. Trying with 'python -m pylint'", pylint_executable)
++            cmd = ['python', '-m', 'pylint']
++            cmd.extend(flags)
++            cmd.extend(['--from-stdin', document.path])
++            p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
++            stack.enter_context(p)
++        (stdout, stderr) = p.communicate(document.source.encode())
+     if stderr:
+         log.error("Error while running pylint '%s'", stderr.decode())
+     return stdout.decode()
+diff --git a/test/plugins/test_flake8_lint.py b/test/plugins/test_flake8_lint.py
+index eaabd40..4faf0dd 100644
+--- a/test/plugins/test_flake8_lint.py
++++ b/test/plugins/test_flake8_lint.py
+@@ -21,10 +21,9 @@ def using_const():
+ 
+ 
+ def temp_document(doc_text, workspace):
+-    temp_file = tempfile.NamedTemporaryFile(mode='w', delete=False)
+-    name = temp_file.name
+-    temp_file.write(doc_text)
+-    temp_file.close()
++    with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_file:
++        name = temp_file.name
++        temp_file.write(doc_text)
+     doc = Document(uris.from_fs_path(name), workspace)
+ 
+     return name, doc
+diff --git a/test/plugins/test_pylint_lint.py b/test/plugins/test_pylint_lint.py
+index f83e754..cf7a7e4 100644
+--- a/test/plugins/test_pylint_lint.py
++++ b/test/plugins/test_pylint_lint.py
+@@ -28,10 +28,9 @@ def hello():
+ @contextlib.contextmanager
+ def temp_document(doc_text, workspace):
+     try:
+-        temp_file = tempfile.NamedTemporaryFile(mode='w', delete=False)
+-        name = temp_file.name
+-        temp_file.write(doc_text)
+-        temp_file.close()
++        with tempfile.NamedTemporaryFile(mode='w', delete=False) as temp_file:
++            name = temp_file.name
++            temp_file.write(doc_text)
+         yield Document(uris.from_fs_path(name), workspace)
+     finally:
+         os.remove(name)
+
+From 2d980b6d99b06de827d6589a48a75c6b196b32f4 Mon Sep 17 00:00:00 2001
+From: krassowski <krassowski.michal@gmail.com>
+Date: Sun, 25 Apr 2021 22:14:53 +0100
+Subject: [PATCH 2/2] Revert the use of ExitStack, as requested
+
+---
+ pylsp/plugins/flake8_lint.py | 25 ++++++++++---------------
+ pylsp/plugins/pylint_lint.py | 28 ++++++++++++----------------
+ 2 files changed, 22 insertions(+), 31 deletions(-)
+
+diff --git a/pylsp/plugins/flake8_lint.py b/pylsp/plugins/flake8_lint.py
+index dfee5b4..03504ef 100644
+--- a/pylsp/plugins/flake8_lint.py
++++ b/pylsp/plugins/flake8_lint.py
+@@ -5,7 +5,6 @@
+ import logging
+ import os.path
+ import re
+-from contextlib import ExitStack
+ from subprocess import Popen, PIPE
+ from pylsp import hookimpl, lsp
+ 
+@@ -66,20 +65,16 @@ def run_flake8(flake8_executable, args, document):
+         )
+ 
+     log.debug("Calling %s with args: '%s'", flake8_executable, args)
+-    with ExitStack() as stack:
+-        try:
+-            cmd = [flake8_executable]
+-            cmd.extend(args)
+-            p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
+-            stack.enter_context(p)
+-        except IOError:
+-            log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
+-            cmd = ['python', '-m', 'flake8']
+-            cmd.extend(args)
+-            p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
+-            stack.enter_context(p)
+-        # exit stack ensures that even if an exception happens, the process `p` will be properly terminated
+-        (stdout, stderr) = p.communicate(document.source.encode())
++    try:
++        cmd = [flake8_executable]
++        cmd.extend(args)
++        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
++    except IOError:
++        log.debug("Can't execute %s. Trying with 'python -m flake8'", flake8_executable)
++        cmd = ['python', '-m', 'flake8']
++        cmd.extend(args)
++        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
++    (stdout, stderr) = p.communicate(document.source.encode())
+     if stderr:
+         log.error("Error while running flake8 '%s'", stderr.decode())
+     return stdout.decode()
+diff --git a/pylsp/plugins/pylint_lint.py b/pylsp/plugins/pylint_lint.py
+index 6449cda..d5ff3db 100644
+--- a/pylsp/plugins/pylint_lint.py
++++ b/pylsp/plugins/pylint_lint.py
+@@ -7,7 +7,6 @@
+ import logging
+ import sys
+ import re
+-from contextlib import ExitStack
+ from subprocess import Popen, PIPE
+ 
+ from pylint.epylint import py_run
+@@ -233,21 +232,18 @@ def _run_pylint_stdio(pylint_executable, document, flags):
+     :rtype: string
+     """
+     log.debug("Calling %s with args: '%s'", pylint_executable, flags)
+-    with ExitStack() as stack:
+-        try:
+-            cmd = [pylint_executable]
+-            cmd.extend(flags)
+-            cmd.extend(['--from-stdin', document.path])
+-            p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
+-            stack.enter_context(p)
+-        except IOError:
+-            log.debug("Can't execute %s. Trying with 'python -m pylint'", pylint_executable)
+-            cmd = ['python', '-m', 'pylint']
+-            cmd.extend(flags)
+-            cmd.extend(['--from-stdin', document.path])
+-            p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
+-            stack.enter_context(p)
+-        (stdout, stderr) = p.communicate(document.source.encode())
++    try:
++        cmd = [pylint_executable]
++        cmd.extend(flags)
++        cmd.extend(['--from-stdin', document.path])
++        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
++    except IOError:
++        log.debug("Can't execute %s. Trying with 'python -m pylint'", pylint_executable)
++        cmd = ['python', '-m', 'pylint']
++        cmd.extend(flags)
++        cmd.extend(['--from-stdin', document.path])
++        p = Popen(cmd, stdin=PIPE, stdout=PIPE, stderr=PIPE)  # pylint: disable=consider-using-with
++    (stdout, stderr) = p.communicate(document.source.encode())
+     if stderr:
+         log.error("Error while running pylint '%s'", stderr.decode())
+     return stdout.decode()
diff --git a/dev-python/python-lsp-server/metadata.xml b/dev-python/python-lsp-server/metadata.xml
new file mode 100644
index 000000000000..d18c2963a96b
--- /dev/null
+++ b/dev-python/python-lsp-server/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<upstream>
+		<remote-id type="pypi">python-lsp-server</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/python-language-server/python-language-server-0.36.2.ebuild b/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild
index ec3930243f79..ef8e5c76b266 100644
--- a/dev-python/python-language-server/python-language-server-0.36.2.ebuild
+++ b/dev-python/python-lsp-server/python-lsp-server-1.0.1.ebuild
@@ -3,20 +3,20 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 optfeature
 
-DESCRIPTION="An implementation of the Language Server Protocol for Python"
-HOMEPAGE="https://github.com/palantir/python-language-server"
+DESCRIPTION="Python Language Server for the Language Server Protocol"
+HOMEPAGE="https://github.com/python-lsp/python-lsp-server"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
-BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
+BDEPEND="
 	test? (
 		dev-python/autopep8[${PYTHON_USEDEP}]
 		dev-python/flaky[${PYTHON_USEDEP}]
@@ -24,28 +24,30 @@ BDEPEND="dev-python/versioneer[${PYTHON_USEDEP}]
 		dev-python/matplotlib[${PYTHON_USEDEP}]
 		>=dev-python/mccabe-0.6.0[${PYTHON_USEDEP}]
 		<dev-python/mccabe-0.7.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
 		dev-python/numpy[${PYTHON_USEDEP}]
 		dev-python/pandas[${PYTHON_USEDEP}]
-		>=dev-python/pycodestyle-2.6.0[${PYTHON_USEDEP}]
-		<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
 		>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-		>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-		<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		>=dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
+		<dev-python/pyflakes-2.4.0[${PYTHON_USEDEP}]
 		>=dev-python/pylint-2.5.0[${PYTHON_USEDEP}]
 		dev-python/QtPy[gui,testlib,${PYTHON_USEDEP}]
 		>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
 		dev-python/yapf[${PYTHON_USEDEP}]
-)"
+	)"
 
 RDEPEND="
 	>=dev-python/jedi-0.17.2[${PYTHON_USEDEP}]
-	<dev-python/jedi-0.18.0[${PYTHON_USEDEP}]
+	<dev-python/jedi-0.19.0[${PYTHON_USEDEP}]
+	>=dev-python/python-lsp-jsonrpc-1.0.0[${PYTHON_USEDEP}]
 	dev-python/pluggy[${PYTHON_USEDEP}]
-	>=dev-python/python-jsonrpc-server-0.4.0[${PYTHON_USEDEP}]
 	>=dev-python/ujson-3[${PYTHON_USEDEP}]
 "
 
+PATCHES=(
+	"${FILESDIR}/pyls-fix-test-with-pylint28.patch"
+)
+
 distutils_enable_tests pytest
 
 python_prepare_all() {
diff --git a/dev-python/python-mimeparse/Manifest b/dev-python/python-mimeparse/Manifest
index 5d265a9a7576..68c3aab9cfcd 100644
--- a/dev-python/python-mimeparse/Manifest
+++ b/dev-python/python-mimeparse/Manifest
@@ -1,3 +1,3 @@
 DIST python-mimeparse-1.6.0.tar.gz 6541 BLAKE2B 15de86feddf892ee4599e0fe7c113a93f343d5b8afc09725263e2fcb3869f8f152612b9f30dbf68279aa95e2ce8f6ba9d4dc6e8e2b75366a972dcdb705220742 SHA512 cc2ec8059034fc224c59bffeb77e7fd0ba86b753373c8daf3a182fd56d647f0b96d7bacb6708be285dd7e246ebc19b813e2bfb8ac79a86f6d4e702c223f5187e
-EBUILD python-mimeparse-1.6.0-r3.ebuild 586 BLAKE2B 3b1b42763038936110c4d9fbeac31832703d7fc35d9f95c934ec0c57d805ea771dbf7aae81d9929ccf14965f4b5cc9a0eb125a58f19229d72280e70dc02dec1b SHA512 8ed4ec78f6c0d77c8c2404eb13d43dd11b0b32877120c93e58e0b99f14b78f6156f27a532bfd3e15cb7901e48e769cd1243ef5a7494cc62e3481ce2d90fd322e
+EBUILD python-mimeparse-1.6.0-r3.ebuild 579 BLAKE2B cbd54f88330a87b1cd2b55701112e9fd0e85a585483101d1ff27b28bb6f0ebb0b6afd4a979716a0dcd0a5d710240046c604ff0ea7792bf4744ccd9dbc8a77d8c SHA512 9aa79502816e258c013b2657c1d716e1eb88bf96d5ae8bcd3195f6ebaebe58b1615e9a3057503a1faf07dafba51ccb6d4f47dd55c28ea7a661dcb32ee7bdaafa
 MISC metadata.xml 419 BLAKE2B 83547a7d24cf4a47a5c32e83aec0fc78f286d0f92252e637a1542d5d9a1d011c6b68c4ef4fcfae376edfbd82a3970673f4f50abe8272560fd14640f7537bcaac SHA512 9a18a36d9e0b85be5f1bc2ec6f8279089e4e5f73b5d77c634b2bc2ca0b39b29886f7e0b4665d4570772f2a1ed68a8e393de80ad0fa5d97145f2bac6366f08b0b
diff --git a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
index 282094f11695..632a14580b92 100644
--- a/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
+++ b/dev-python/python-mimeparse/python-mimeparse-1.6.0-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -14,7 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
 
 python_test() {
 	"${EPYTHON}" mimeparse_test.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/python-mpd/Manifest b/dev-python/python-mpd/Manifest
index f5dceccf7c0a..bc934e982d96 100644
--- a/dev-python/python-mpd/Manifest
+++ b/dev-python/python-mpd/Manifest
@@ -1,5 +1,3 @@
-DIST python-mpd-1.1.0.tar.gz 61104 BLAKE2B 274a829a3fc1404a4e3beb4df3eb563c1f781325590702761d3b3b5bc42e3cd9f63809aab14bb98e4879c10ccd55bb9d7306485ec22d37538cc2e36006a3039a SHA512 65b17ae34b2c731b7d45801211e49eacfc18239d5575075be0c11ace350da19b82dd151fefc42077454a988d3deb1b489471f739ddea2d915cb3c241669dbe32
 DIST python-mpd2-3.0.4.tar.gz 66173 BLAKE2B f92a97512f19ac5f71846d3997240e5a37a4fd9bc353e131c582547ddc6e9520d2d09a02b4de62168707ba4a2cbfc28a019cba7e0a113242ecc38ecdc86c19a9 SHA512 7adf0daf64c6132dcd4d347f0772e9cbef903f9f5fba5315b745708dd2179090f53c5303b7ce905c685076861d21f7a14951e598c88eb65be423dea627dbb26a
-EBUILD python-mpd-1.1.0-r1.ebuild 1018 BLAKE2B 783f979d5b5c81ec40e7640090270c20c2c13fe46df0976a1cf733aaa2242b55a6004ceb682e5dded105497392bbfe41a883c7f71b19825fd7cd1c43a094d18b SHA512 773b5221e9947275421db704478526a182089f3e430140fac7d55e425f042df8b216d419cf0ac908fb4e835114b80a4567df6fcd55a458268889ccc4c20552a1
-EBUILD python-mpd-3.0.4.ebuild 964 BLAKE2B 2be1c94bd5feb7e3cec3d8edafc8a5987a9dde43c72b2e3ba576a05cde34c7dd5fdfa267fe9526b1a741537328729316dc8acd20a3edfe699f9f533acb35c9c4 SHA512 bb7e740ec38e50938af2d4a4a41496f85d70311856a5fa97091c8b435777225413faa4c35b41d674414e21237a0748b3a3b5e3c9e71cecba3c5ab488b06ccd1a
+EBUILD python-mpd-3.0.4.ebuild 960 BLAKE2B 211e523be26b5918452ee80ceb7dff9b8fab3acead23d7d788f5445eb5cb34a90e9a73f787bc140b4056e3af23855e9ccd4eb4f46943d30923f3f34319c8594e SHA512 9cc43f289f6f88df17dd8b987af1cef59d293790e1022fff515d14fa8663f71c4894db0d5d419161ff083d76df54f5c46c84ea0a051ded8e0ea2b3e009ba4114
 MISC metadata.xml 463 BLAKE2B 9f711c66d5ac55f12770a73ec22e9f444ce861532624a17efd2ad8e31bbb77eee4d4608a8bac331eef5e9da009a840cb03c4723a5ee52c547089c6c61a248a94 SHA512 98ffedc8e05168b8a2a0e193655c20d41e40d69e652ca0d443c932f8c35630434e93aa76c2a03029c96f2c96f54c432c384ece12c6645f8cada73f8a76263710
diff --git a/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild b/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
deleted file mode 100644
index d3f32530bf27..000000000000
--- a/dev-python/python-mpd/python-mpd-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="bdepend"
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python MPD client library"
-HOMEPAGE="https://github.com/Mic92/python-mpd2"
-SRC_URI="https://github.com/Mic92/${PN}2/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-KEYWORDS="amd64 ppc ppc64 x86"
-SLOT="0"
-IUSE="examples +twisted"
-
-REQUIRED_USE="test? ( twisted )"
-
-RDEPEND="twisted? ( dev-python/twisted[${PYTHON_USEDEP}] )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/toml[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.rst doc/{changes.rst,commands_header.txt} doc/topics/. )
-
-S="${WORKDIR}/${PN}2-${PV}"
-
-distutils_enable_sphinx doc --no-autodoc
-distutils_enable_tests pytest
-
-python_test() {
-	pytest mpd/tests.py -vv || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	use examples && dodoc -r examples/.
-}
diff --git a/dev-python/python-mpd/python-mpd-3.0.4.ebuild b/dev-python/python-mpd/python-mpd-3.0.4.ebuild
index 82c66c86e910..6c748ccf6b0c 100644
--- a/dev-python/python-mpd/python-mpd-3.0.4.ebuild
+++ b/dev-python/python-mpd/python-mpd-3.0.4.ebuild
@@ -18,7 +18,7 @@ SRC_URI="
 S=${WORKDIR}/${MY_P}
 
 LICENSE="LGPL-3+"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 SLOT="0"
 IUSE="examples +twisted"
 
diff --git a/dev-python/python-mpv/Manifest b/dev-python/python-mpv/Manifest
new file mode 100644
index 000000000000..dc7e5bcbcb8a
--- /dev/null
+++ b/dev-python/python-mpv/Manifest
@@ -0,0 +1,3 @@
+DIST python-mpv-0.5.2.tar.gz 207755 BLAKE2B 3222a54db145a66ae8b992f1c4e8243c50099573586fd8be9a2d88ff360898bf9b72905c22c8d056178b7917f093a494dce9138f3f8bb5782152dc38b71b1dad SHA512 cd542b0866d6c75395f1ca00bb6df3981998dd801dcee97b15e080fe66e94270f15daa674f663aa6974dcf6aa425d6e17f8476031badeec035727b2b690816f3
+EBUILD python-mpv-0.5.2.ebuild 609 BLAKE2B 5f1a3ddcf5d4cf7029fbff2545801986e8fd44afbfc32cc743932cada21846a5392a7db3c53f0f82dc85e349c85c6948079ac74f742612a828aa68ae6caf9b03 SHA512 432fd8ff99c56b5f0f00538446e6ea50d2e82777d6efe8d095b7c95b6238b50cc639ff92cccd3c2c1e7b6cd5f17b7af513a17b905dd1af2cdb7782c810c45155
+MISC metadata.xml 277 BLAKE2B bf24e94f642972ff1dedac351b973b5f767111a2dafa2d92c1e0886f00b8fb5689251d09b990d80217d82318fcf33452984df71d3951a20e2c690b4050061103 SHA512 92647e12357f72bb72680d35af3b29ea544d84a0079704a0b47b5b8dfbf04cdccf64582a6e4a70887e94a3256c84cc399dda966058ce113dee10bd2c5ad300ff
diff --git a/dev-python/python-mpv/metadata.xml b/dev-python/python-mpv/metadata.xml
new file mode 100644
index 000000000000..651e2156c25b
--- /dev/null
+++ b/dev-python/python-mpv/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+    <maintainer type="person">
+        <email>andrewammerlaan@gentoo.org</email>
+        <name>Andrew Ammerlaan</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-mpv/python-mpv-0.5.2.ebuild b/dev-python/python-mpv/python-mpv-0.5.2.ebuild
new file mode 100644
index 000000000000..9db6369612eb
--- /dev/null
+++ b/dev-python/python-mpv/python-mpv-0.5.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="Python interface to the mpv media player"
+HOMEPAGE="https://github.com/jaseg/python-mpv"
+SRC_URI="https://github.com/jaseg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-video/mpv[libmpv]
+	dev-python/pillow[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? ( dev-python/xvfbwrapper[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+python_test() {
+	virtx pytest -vv
+}
diff --git a/dev-python/python-vlc/Manifest b/dev-python/python-vlc/Manifest
new file mode 100644
index 000000000000..7761da97ae89
--- /dev/null
+++ b/dev-python/python-vlc/Manifest
@@ -0,0 +1,3 @@
+DIST python-vlc-3.0.12118.tar.gz 148685 BLAKE2B 356963caea1a14fdc9d5ba814fc442fd8d93fe327ebea7fd51ede52d29aaf7b72af3e9d6de9a7e1372515694738fbeda49c698793fecd80a47ab5f51b01f3d08 SHA512 d84e373b77b763c169fa4c2ffcdec979fca44cc40e873865b6a55d79481f2b01711fee48f8ab7ca2506ed73a72b970b6fd410f121c24120640ddc0ef5efbd05b
+EBUILD python-vlc-3.0.12118.ebuild 447 BLAKE2B d159dcc3e3936a8f0e1a4d6ea0501c3bb9cd8392f8f7dc316dd2f47bb25bcd61ab0d6380313885649809c1888e38825c23561d73cc6b92e9b8a2590994a37190 SHA512 f37cbfb2927da7f2f6cd8a45a5fde0de05e224dcc912e5b147060eb3d32564f299d9cdb9fcc9662a6f4f1bb0e7dc613092edd75005692074f2bf2caeddb364f8
+MISC metadata.xml 277 BLAKE2B bf24e94f642972ff1dedac351b973b5f767111a2dafa2d92c1e0886f00b8fb5689251d09b990d80217d82318fcf33452984df71d3951a20e2c690b4050061103 SHA512 92647e12357f72bb72680d35af3b29ea544d84a0079704a0b47b5b8dfbf04cdccf64582a6e4a70887e94a3256c84cc399dda966058ce113dee10bd2c5ad300ff
diff --git a/dev-python/python-vlc/metadata.xml b/dev-python/python-vlc/metadata.xml
new file mode 100644
index 000000000000..651e2156c25b
--- /dev/null
+++ b/dev-python/python-vlc/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+    <maintainer type="person">
+        <email>andrewammerlaan@gentoo.org</email>
+        <name>Andrew Ammerlaan</name>
+    </maintainer>
+</pkgmetadata>
diff --git a/dev-python/python-vlc/python-vlc-3.0.12118.ebuild b/dev-python/python-vlc/python-vlc-3.0.12118.ebuild
new file mode 100644
index 000000000000..154fb58abe28
--- /dev/null
+++ b/dev-python/python-vlc/python-vlc-3.0.12118.ebuild
@@ -0,0 +1,21 @@
+# 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
+
+DESCRIPTION="Python ctypes-based bindings for libvlc"
+HOMEPAGE="https://github.com/oaubert/python-vlc
+	https://wiki.videolan.org/Python_bindings/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	media-video/vlc
+"
diff --git a/dev-python/python-xlib/Manifest b/dev-python/python-xlib/Manifest
index 466c5dd1ac5f..a96b0b6bddec 100644
--- a/dev-python/python-xlib/Manifest
+++ b/dev-python/python-xlib/Manifest
@@ -1,3 +1,5 @@
 DIST python-xlib-0.29.tar.bz2 209322 BLAKE2B 4d94d99c8094947ce1acb84f3adc28ab4b6e9d6aaf61317b625e50578ece3800f6462551f8656b194d5635e3e35a5d6fec86d4eb553d7b65684a7f74fdf0dc14 SHA512 6275deb2c1e2068d560c45803e651fef9910b5cb921e043ed8204878a1f885b92122b6af3d4ac33f220231c1933d3150524169d0078f64b74df29a8f617d953a
+DIST python-xlib-0.30.tar.bz2 211256 BLAKE2B 979a004f6ff6ac933baa41623b346c8d1fa9944bc771308e3dd527de7ae6aebb8df0c5d269f21e7aca590ad7d3981d0deeb592981b0672c54b30ce286e650236 SHA512 52ee01cce73f024d6fdc995cff38ba9ff2838888aced12186a754c1760228f89209c1d6fc9d4fe0e371a4a43743f8fdfdef6ea32ea3feda5a85055897aaf887d
 EBUILD python-xlib-0.29.ebuild 877 BLAKE2B 909e99cded605fc8e658e27e288f280428c84b1c781672393718e9be562af77713b6e2be9063f52825d56c554aec189516f154a1d9065477b796d1d5301c325f SHA512 b6b2a326932958a285c6fe81b7f8f835f2cbfc8cc5bbbd35dfed397e2bf3280555a49492b55b0d5a4010631eb957a119dccd4b4375017ef8bcdbffd1d6c57cae
+EBUILD python-xlib-0.30.ebuild 881 BLAKE2B 7324df0e26113b33a710a7caca1f70bb8fbbd7f4eab942d723ac484b0d2fd597a304a7885dd7fdc5548ab5dde3decb2fcb907042f11613afcc8c8a0aad4233e7 SHA512 d6214c6c919b65728b0675eafb0b2b98fa12b3685e57df129128a526aa8e34eefd58c1c235029701649b1c3d0635b1836279e595c154610a1a9a3e6e28cf3877
 MISC metadata.xml 433 BLAKE2B 7ed1d8e54df6935b05b4ef997ed50a0df4e5178b8bf2a48f8d67a4ac6a4323ee8646c4fa93ecc6fa70aefa14d0b5039ff99183c3710b7ce689e5b73b8a5affb5 SHA512 29095e67eed7821c4e447579662019fad67c456f6ef6cd5a00f51db7e6c4be297cd48ee7b4c2ada10e59a5d829dc33fe503e7d5daa924493d050ce4a256411db
diff --git a/dev-python/python-xlib/python-xlib-0.30.ebuild b/dev-python/python-xlib/python-xlib-0.30.ebuild
new file mode 100644
index 000000000000..d5a5b6ae79a3
--- /dev/null
+++ b/dev-python/python-xlib/python-xlib-0.30.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1 virtualx
+
+DESCRIPTION="A fully functional X client library for Python, written in Python"
+HOMEPAGE="https://github.com/python-xlib/python-xlib"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	doc? ( sys-apps/texinfo )
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+python_compile_all() {
+	use doc && emake -C doc/info
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_install_all() {
+	use doc && doinfo doc/info/*.info
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytools/Manifest b/dev-python/pytools/Manifest
index 155edef01793..e0f9b2f53917 100644
--- a/dev-python/pytools/Manifest
+++ b/dev-python/pytools/Manifest
@@ -1,4 +1,4 @@
 DIST pytools-2021.2.6.tar.gz 63630 BLAKE2B a94420134688514f5a27c85aedb3655e507ca37b30e0db81656e9c1597b2527f55e534b777d97daef889ed496766718bd42c1e6193ac62d45ec90e9305a91959 SHA512 378c58c4e321f5ca3bb8e3d36d06dfdbe20d04210ca9943cff0909b85d2fd89791c1d966992b2e6f5ccd772f68d223eb13c02b335d9f5c0ac3b17d36fe04aed0
-EBUILD pytools-2021.2.6.ebuild 550 BLAKE2B 52f30c26550ca5b697d481955b1e3b02a1c8154ff9ea26a6174104ee0edf8c4eb549e5a9ed9e01d604f5f128f52b8e5b883a459489d4841915590705879b7ee4 SHA512 229d4a7cef7a0c9922e3d0153bf736436199246ed4cc7c44eea87e93a45ee4ee9940e74b085a0522f064e3b8f64d6debd635b8e9e3759742ebef1c3201a4d567
-EBUILD pytools-9999.ebuild 659 BLAKE2B e95a3d9d028e49f5f6123a98342ac999ec1d6a3487ab7acfb2b09b4814d6b4a3af9d609ff17b9451bf93509926cb665c4568ccdf4a2dbeb93dab80ad82f976d1 SHA512 07ef3afa1568beae15a9210426a0d5b4687becf12249443e7f2d5e867b6a8632c17b01eca5dbb69ce1055eaecdda62256129783106b0bc45a88ec48e9670ed38
+EBUILD pytools-2021.2.6.ebuild 551 BLAKE2B 9464350a8af26c40562d44ff6ab247c5967aaaf0f416b33155c3dbed2e7431b49906f1ab4edd5fb5f7b5bc41f84c2eba6dbae832a8208933a90c1a3de7f58201 SHA512 fb0b667a071206237ce63ff0ca549135cf8992a15816954ca68061f7a674609d758b94ec2b4f4b56e11fa5b94706b97302b3dac0011a16799dcc033715685d98
+EBUILD pytools-9999.ebuild 660 BLAKE2B 2b4690e513d08318b43371eb3bf6ff9653dfe2c17df63938a22cdf97e14b0bf5b9dea3c69446375e98092da7bf5febc4afb1f4eab88c75c5e715bdd18931826d SHA512 ec4d6284b10b407ee0100f394f1d9df0bb10102a85ac0579bfd5c354e2f9177f6c5cc6a52585e91f6bd2c9add9f8d9d9dcf3a12443bd15238836a787ddc368de
 MISC metadata.xml 394 BLAKE2B c92c0da3fd787c1b70b8b6518448050c13a1b68b27a813506d513f54db1b47853d4d2c633b70f5bb1e604935dbdf8e1f4fc3394cadb29ba30ead7a2b718c03f5 SHA512 70139b5703a5bda95cf48fa30cc97702a149a3555da20a2e8143fad5d9174557b3508a251526af797a93811aa3964ed5b0f8e89fc2a6b3da965a72062649ec37
diff --git a/dev-python/pytools/pytools-2021.2.6.ebuild b/dev-python/pytools/pytools-2021.2.6.ebuild
index 9c2cc4d59064..f45014748290 100644
--- a/dev-python/pytools/pytools-2021.2.6.ebuild
+++ b/dev-python/pytools/pytools-2021.2.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE='sqlite'
 
 inherit distutils-r1
diff --git a/dev-python/pytools/pytools-9999.ebuild b/dev-python/pytools/pytools-9999.ebuild
index 618ec9fc5a6d..17a4d2a89990 100644
--- a/dev-python/pytools/pytools-9999.ebuild
+++ b/dev-python/pytools/pytools-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 PYTHON_REQ_USE='sqlite'
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
diff --git a/dev-python/pyu2f/Manifest b/dev-python/pyu2f/Manifest
index b211a1fb6ef7..e7d861ba3c9f 100644
--- a/dev-python/pyu2f/Manifest
+++ b/dev-python/pyu2f/Manifest
@@ -1,3 +1,3 @@
 DIST pyu2f-0.1.4.tar.gz 38797 BLAKE2B 4240083b03bd596d1f87e42047980ab7c75d0064eec0ed2050d77bb92d26fac651af515c2c9b10d338e27ecd778e80ff47b5c33a68cd86328dc913c0e70cb1da SHA512 16f948b812edd5f0e4d97350872809b7c1b52f38eea49170e4aa21e0f695935dc0d71d4fa077ee1c1a3ef2f0711d62f0cc49983a89c841aa31aadf7b76340035
-EBUILD pyu2f-0.1.4-r1.ebuild 931 BLAKE2B 2dd7f07d702d785565dbb00b9a5541e2c2444723566c67be0882c865f079d5dd44f8734f0b673a6247976d941368ce88bead5d6affc622e004a52103373357bf SHA512 7a3972e961ce39716699c292a47fe7429e3b8d8260e8e3b426453d28e8b126336edc1671c00cdf2934b71d397463445fb0fb98e552ba8171e08e4fdb492c1225
+EBUILD pyu2f-0.1.4-r1.ebuild 936 BLAKE2B 71298156888834f5aa8e3249b0b17943f53af0fe10fe6b49fde6b29cbaf0daaa8c9687f85cf47f924f6a9b601b3730d0ae49f8f09a58175fe2b835702e4e8bc4 SHA512 c72b578fc38bc9eb368c8ddcba959df77333ee87e695e8b947fe0e3820c348930b5b7e99f084d7034bcf141b6a6eabe4e9908837105f709e05c2d76ca81a3bba
 MISC metadata.xml 364 BLAKE2B f739254d4208658fd33151170987b9214670cf97ec8babc6c97ea4acdd19f3cd29f35e9d719b8462d90fbf0ff71e3bdbf30cadc2fd91ee54f2868018cddeb220 SHA512 d1f71740b09b54385ca269bedf3ce44ac424272e69881245a77796eb6c9e618e63c8837009d097b43dee477c765adf31b9e4bab7fa26606e57c3894c7bed429e
diff --git a/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild b/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
index a0dfbb4c11a8..aeb26bb83da2 100644
--- a/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
+++ b/dev-python/pyu2f/pyu2f-0.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/google/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/pyusb/Manifest b/dev-python/pyusb/Manifest
index 581094d483a3..912d0b8ec163 100644
--- a/dev-python/pyusb/Manifest
+++ b/dev-python/pyusb/Manifest
@@ -1,3 +1,3 @@
 DIST pyusb-1.1.1.tar.gz 74746 BLAKE2B 795acafae3193e1a415baeb634554c8fdec3f4baa45a61a3eac9e1af4a84634cc540d421b7d8ad20142912fbef6ba53684e2e5b008e48f3e89406a493918ab20 SHA512 19aa82dcb9421d536063a975414855d1474f44b33dc4039e9a001be795061dbd60ed576acb605ae6bab7a0fe10834e5507408757546c7edcd50b43687a65a287
-EBUILD pyusb-1.1.1.ebuild 684 BLAKE2B edeb2a5c8370e8eab98b54d03e9280cbaa3a310f833261a80e86bb1d9846f6c8b46035691b3b5fe9aa678fa3e0727d6d6a1f04610798be4fb4cd074ae8dc46f1 SHA512 d916936d150258b529292a1724153e4382631e865223746c45865fd7c296972df2a640bbdd5c5bec99a693d03bc3c80b524c1633f309b35923e72ab31831c838
+EBUILD pyusb-1.1.1.ebuild 685 BLAKE2B aa089665e9e419582529ac05ec110843b081a8250fc789843a2aa5e63cc44e8434299dde0db61aba578d26cd9767bd1faa232d0a189643d0920535a31d171030 SHA512 d617a404d667a5506726a440cc251072374ef56ea5e3e33a710e4f5e8b1d8099d0bd68a946249862700ef589d1fc10f112295926a75b6dad3c5c425eb3200597
 MISC metadata.xml 359 BLAKE2B 44a04e5fad69cdf343bb324f0367a1b52ce7443d4ef4c6bcd1e7742ac0cb9c6eeb8afc5b250d126c2bf4472c9fca2cce7f9a12a7354372bba8351d0489972e09 SHA512 ac428041984c13af0492c228514fcfabb00d98645b97ff78347c4fee2813df292f52ec9c37dd00392eff6c306a18513bec6d4c883cede2ff31f18c2973bff494
diff --git a/dev-python/pyusb/pyusb-1.1.1.ebuild b/dev-python/pyusb/pyusb-1.1.1.ebuild
index 3df409241c7c..e8bb887f1ba2 100644
--- a/dev-python/pyusb/pyusb-1.1.1.ebuild
+++ b/dev-python/pyusb/pyusb-1.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=bdepend
 
 inherit distutils-r1
diff --git a/dev-python/pyvirtualdisplay/Manifest b/dev-python/pyvirtualdisplay/Manifest
index 9c81f0f65e38..ed7dcd48a86e 100644
--- a/dev-python/pyvirtualdisplay/Manifest
+++ b/dev-python/pyvirtualdisplay/Manifest
@@ -1,7 +1,3 @@
 DIST PyVirtualDisplay-2.1.tar.gz 40798 BLAKE2B 315bb794b81948357919e98637b6276cca11739d019333c873a2b9c3d28d0bbece6996a70fe619f7acae658bcbaa2743dbbdfb23b7b8515c3a40858a83b07712 SHA512 f95a1622adfa1198d7f35757110e923e45bbfc18b31945c9efedb578e1a27fc91ffec403cc68269b2414837260b2b56ae9a58323ed5020af962757722d7a4517
-DIST pyvirtualdisplay-1.3.2.tar.gz 38532 BLAKE2B 2c0cb3af426abc58dc895667c5fecb40ee9aa870dbb08a51ac32fbd5bd3620b97498b3dfc6e7026362604c82f67b60885370f0704a1349a65668628d9a21e80c SHA512 422e1530bb740fc77cc0b7abb73cb8e7326689c80c5f49b58be70b262e8a2c28274d3b83a0ec7753adfbf78b780047f61cf7b18fb14f935d483a5e3d04953210
-DIST pyvirtualdisplay-2.0.tar.gz 40480 BLAKE2B 8243f88a3878124aebf45624ab5712052e3ee9bdae77c150bdfcf109cd7528db8b47a7328aa9a149e8fdb3d8437e84076631adb539185a16a8e64ab97265a45e SHA512 bb5c789723c96d4f2952626c063f749c9f07045231af90d21ccda41697319a4d2f27db8c0f352fd273db114c0d5e65e8c6151b7f858b8ea4e19660a1e941514f
-EBUILD pyvirtualdisplay-1.3.2.ebuild 1378 BLAKE2B 251f36c32e53a76604d98d8166e6a32e5a663994c6729cff60d0e759089d3cc52a87d459e41783c4fdcc68df2ed77d1979bf92b4c288c92ce52ed0d7a90cbaa4 SHA512 ed8dfae1439ccaf1c0b5936024f9f91ebafaa0efbf324f0d8070797a3c6c2dd2751b672cdb5b39acc56c79a4faf9de4ce6683513b1faa6de224719e2213840dd
-EBUILD pyvirtualdisplay-2.0.ebuild 1383 BLAKE2B 57eadd7da3a9c5f32936a282416785f7c3c78e3c2ad41c6307a184f742e20951351863f3b03e29cd09497c259df13d433bcb52227ebea8667c0789e0810f2ec5 SHA512 0365e68ea9ad8600139c197ca8b21539309b08c197f710e6f0db191cd404ede12dc81b43431b4fe1ec6cecf4400bd58797140ff96c8b831d7e1ad2cedbefe49e
-EBUILD pyvirtualdisplay-2.1.ebuild 1132 BLAKE2B 8614287b52fa44eebc5e416c99b33e2708d84d7a9d8d914dd1e88c85bb3c25843163803882616cfd6c23ef983710020c3cfdc50f9a615e7c0792582a255c09ee SHA512 09a658600ade0e19b4ac9d4658b9f3f0a4405c60d24ee148c4eb057ddbf9fdcab17fbebd69587dbcc3ecc92d13e7223c16b8bed53a30c50ec500b227a91fc848
-MISC metadata.xml 609 BLAKE2B 4c4ce234d946f745ecdbef02661a7bf4e644ea03482a7a643929453d1b0b62115d8e5d901de9d61d3228d45a11f53571134298e8b3670383a9f043921b04ab5d SHA512 895bbb8dbdbb90711d7857d5f85f210d20e858df9438879e9ec882ff92607dae33686d9ba39a6b8c3f14414a2c0911dc905ffc8093e3cc25e0441a4db760087d
+EBUILD pyvirtualdisplay-2.1.ebuild 1130 BLAKE2B e09b3b90e6867f9a31738696ea25bf50e341e7f076dcd045b1eb686df36e1c3b0c432636f5f56517472c28298f6b58dd5d9c2650beb66d8af2ef868a30dfa6c4 SHA512 dee845a6a462ba14b0c2091f616a3928522f58b613d86b3f254d931eba196f654d039c62888eb2a3c0263269319776450fb89309b3ae22c8b1115f032b9dcd6a
+MISC metadata.xml 462 BLAKE2B f073d91b8a3d4abe16621a1f22c7e00b650dfb74ffe5685803c2b1dd828d1f4cf7f182b008077daceb7bb43ba740901b5edfc8b2c5b8dcb6509ef6eb670348d2 SHA512 4c68e76fbddc9f6d840287dc38c5c869c6c258f160dcb684da50d0bb7749f0ed3580e638eb5b4a6c2fc38b66909afe0d502fde0a9799e0ef362016e8429a2451
diff --git a/dev-python/pyvirtualdisplay/metadata.xml b/dev-python/pyvirtualdisplay/metadata.xml
index 4c3f22067ecf..caf8a8a7b062 100644
--- a/dev-python/pyvirtualdisplay/metadata.xml
+++ b/dev-python/pyvirtualdisplay/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</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/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
deleted file mode 100644
index 293aff4cf873..000000000000
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-1.3.2.ebuild
+++ /dev/null
@@ -1,53 +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="Python wrapper for Xvfb, Xephyr and Xvnc"
-HOMEPAGE="https://github.com/ponty/PyVirtualDisplay"
-SRC_URI="https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="test? (
-	dev-python/backports-tempfile[${PYTHON_USEDEP}]
-	dev-python/entrypoint2[${PYTHON_USEDEP}]
-	dev-python/path-py[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/pyscreenshot[${PYTHON_USEDEP}]
-	~dev-python/vncdotool-0.13.0[${PYTHON_USEDEP}]
-	x11-base/xorg-server[xvfb,xephyr]
-	x11-misc/x11vnc
-)"
-
-DEPEND="dev-python/easyprocess[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/PyVirtualDisplay-${PV}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# all of this fails: AssertionError
-	rm tests/test_examples.py || die
-
-	# Assertion error No such file or directory: 'Xvnc': 'Xvnc'
-	sed -i -e 's:test_race_10_xvnc:_&:' \
-			tests/test_race.py || die
-
-	# No such file or directory: 'Xvnc': 'Xvnc'
-	sed -i -e 's:test_slowshot:_&:' \
-		-e 's:test_slowshot_with:_&:' \
-			tests/test_smart.py || die
-
-	# No such file or directory: 'Xvnc': 'Xvnc'
-	sed -i -e 's:test_double:_&:' \
-			tests/test_smart2.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.0.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.0.ebuild
deleted file mode 100644
index 132a2cde78b6..000000000000
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python wrapper for Xvfb, Xephyr and Xvnc"
-HOMEPAGE="https://github.com/ponty/PyVirtualDisplay"
-SRC_URI="https://github.com/ponty/PyVirtualDisplay/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="test? (
-	dev-python/entrypoint2[${PYTHON_USEDEP}]
-	dev-python/pillow[xcb,${PYTHON_USEDEP}]
-	dev-python/psutil[${PYTHON_USEDEP}]
-	~dev-python/vncdotool-0.13.0[${PYTHON_USEDEP}]
-	x11-base/xorg-server[xvfb,xephyr]
-	x11-misc/x11vnc
-)"
-
-DEPEND="dev-python/easyprocess[${PYTHON_USEDEP}]"
-
-S="${WORKDIR}/PyVirtualDisplay-${PV}"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# all of this fails: AssertionError
-	rm tests/test_examples.py || die
-
-	# Hangs forever
-	sed -i -e 's:test_race_100_xvfb:_&:' \
-	-e 's:test_race_100_xe:_&:' \
-			tests/test_race.py || die
-
-	# Hangs forever
-	sed -i -e 's:test_slowshot:_&:' \
-		-e 's:test_slowshot_with:_&:' \
-			tests/test_smart.py || die
-
-	# Hangs forever
-	sed -i -e 's:test_double:_&:' \
-			tests/test_smart2.py || die
-
-	# pyvirtualdisplay.smartdisplay.DisplayTimeoutError: Timeout! elapsed time:1.8 timeout:1
-	sed -i -e 's:test_smart:_&:' \
-			tests/test_smart_thread.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
index 2a90301748b0..a43d0d517c0e 100644
--- a/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
+++ b/dev-python/pyvirtualdisplay/pyvirtualdisplay-2.1.ebuild
@@ -17,7 +17,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # pyvirtualdisplay.smartdisplay.DisplayTimeoutError: Timeout! elapsed time:60.3 timeout:60
 # tests hang in xvfb
diff --git a/dev-python/pyxDamerauLevenshtein/Manifest b/dev-python/pyxDamerauLevenshtein/Manifest
index e55f3d2842a9..326806d453e2 100644
--- a/dev-python/pyxDamerauLevenshtein/Manifest
+++ b/dev-python/pyxDamerauLevenshtein/Manifest
@@ -1,3 +1,3 @@
 DIST pyxDamerauLevenshtein-1.7.0.tar.gz 41867 BLAKE2B a8fe379a10bfd37e1675dab83d83d1b53308b5539c86e31f507a0243da898d57c4d320661642e23be439c4aabf88b1aaa559bc620e193e58586568cdfd8040df SHA512 11704d3968261cd844ce248c913f1b9baf813d0f8c712971ac4ec05466f8aa5719932e282b49e378d6799ae88483804055765a881d3cef8e7adff486b450e98e
 EBUILD pyxDamerauLevenshtein-1.7.0.ebuild 535 BLAKE2B d289eb93aa5f02b2aad95aee5acae5d4fc65c29ccfa0fc482ca65b3acb490b24704270766431b122430c45ac0aaf5e9a683aa1dcec51f2c8ca988c10210061a4 SHA512 01ad67ab72074c2031030ab80eafee3ad2e954b3249d399dacf901a4359be935594a3c939530cc7bc88e11379e140b44cd0ab63b31ef91b0be5bb5af067de3b3
-MISC metadata.xml 561 BLAKE2B a1ddcac9ddbbdfbe6112a1f2dc1ab08743ddeff2be63ef9ab916cb6453378cfd4f1da6ba8981c2313296772d9510ba5f34473c6e204a8f42fde19eee558d95aa SHA512 00f898bbff420f09a7019a09ae0905ee7267cb6bdf834eac4fdca948c5cac90bb29ca7d56cd0cdd9b0e8a23065b1830828a4c3a4f3d4b96022bbbd99f3a7a4d3
+MISC metadata.xml 414 BLAKE2B 48de5d98fcef6b8c2deb0ca89662ac5d571c05d496779548b89a4c3dff03efb64deefc009736b94affb7066cfcfe46c597ded43e6bb64a01853de66769124c4d SHA512 1a022ac4c0ee8115b44bf88426eee0899e35fa563180b2add0490c4e3cb581b0618d31c54aefe09bda0ceb4a1b3c57814ce3b02abf1e23912b1da81eda24d102
diff --git a/dev-python/pyxDamerauLevenshtein/metadata.xml b/dev-python/pyxDamerauLevenshtein/metadata.xml
index 8e37617bffe0..5a2a2d0429aa 100644
--- a/dev-python/pyxDamerauLevenshtein/metadata.xml
+++ b/dev-python/pyxDamerauLevenshtein/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">pyxDamerauLevenshtein</remote-id>
 		<remote-id type="github">gfairchild/pyxDamerauLevenshtein</remote-id>
diff --git a/dev-python/pyyaml/Manifest b/dev-python/pyyaml/Manifest
index 66a18d5bc93f..39a0d9eba48b 100644
--- a/dev-python/pyyaml/Manifest
+++ b/dev-python/pyyaml/Manifest
@@ -1,6 +1,6 @@
 AUX pyyaml-5.1-cve-2017-18342.patch 1420 BLAKE2B bf053ed121355aea1e44f9bd29b22c9afbca7b99b68e59a6e213d2723531044049964dcb20dbc036ee27ae8bcc2c26e317cf080637e611fa0105a9d451496125 SHA512 8e7737761555d851b21ca61128d2ced4163d446acb87510b6962a20dc217923bcf835d70224c9e721486351e0aeb57f9f3c570b57086a0a00c3e8ac656a458c5
 DIST pyyaml-5.3.1.gh.tar.gz 168044 BLAKE2B 2acc62ecc7448925eb340c2555001c8a74bd883d720b992d6deaea890b4eac435e4ae02eb129db3a6778c0be21a231fa9d96ee8ae59a4a39bc49961e5fb0d6ab SHA512 27d97e8493c7660c7c0c471e20a8aa46c85431e4559a98bcbdafc2bd89a67fd04c6f2090e54ff6b206c868b33635ef8be68070a4c25d17a25c97fd5ad3549556
 DIST pyyaml-5.4.1.gh.tar.gz 173319 BLAKE2B b81cdec32588a419840dd536a2d8addb41eec3e20897f6c464a00a5badb4d6eed9b34b4f95146695187e7d9bcf2d03b81e884290c6dc47927be6192dfdb21eab SHA512 691e54fd9ca01fdc0dcb7de03ddd1970614d92a716c2437032999f9001f90a2ebbcc195a49bfdbe54da0f7a63178c83b02b05b18b5b1024127013f004d1f5997
-EBUILD pyyaml-5.3.1-r1.ebuild 1141 BLAKE2B 3f19b963cfbdf487607bf226a81c8f5da498397d00af61d9b6057de0e18d50becb06087311a7ecd347d3a40296c9d211efd605e1f6d0ff7230c0b9fde07fcee0 SHA512 c4ad49dc8faf61bf099c83845509778ef0e8cbd8f85fdf24c4c908ffa5a0a1f119e12b289a39e94e8f2a0f50567d7919dcd43521ef2e4a92686f10a8060972ca
-EBUILD pyyaml-5.4.1.ebuild 1153 BLAKE2B 8de7088686e4e8c157a494401883e36e74a01867ded584c5f1b61f97d3fad91b5bb886bf4075b93927dd19e54df1674f788c0d6fdc1836bea9cf087613a6a83b SHA512 0dc89fd01bb98d8ca2d7e7c41dc0f1e9121c52e478ecee2ef81b590636b62f0e071cf1cc53d37976ecb82f163a847b4011acb48bc14ba8ac1e348bd64394677c
+EBUILD pyyaml-5.3.1-r1.ebuild 1142 BLAKE2B 0fb7ffcdf9e7e7357c55bb939d866e11122931c6acc0dd22180271a0a967aa677d592de64bc154a0bfa36aed156523091f7c57345c7d1f4ab8ecac86ff9b8e96 SHA512 8bef7ced134dd3f84f069b602f33156eb6e6d61bbc5a9f99f7bacff46249951c85164605e27b34f104e5cd229d18a03ec8abe118461105340c25010fbf3a5585
+EBUILD pyyaml-5.4.1.ebuild 1125 BLAKE2B cd03ce8beb70c2e1be3bfe00bbce4387fb98d331217e988aea8678054e5c9f1c98b73563bfb53e3a93f2122da2cfdf899bc39fd0a603b56cd4ab9b535e856367 SHA512 75ed7274f0b8ea11ba1fb50ccfadba104f5fe2fad0aa45c8f8c1a30ead7868e140903b90c25f39a35af665edcad1fd9038810a4ec1cd75b40c03d31122cbf5b8
 MISC metadata.xml 520 BLAKE2B 8f0f43fa8b2f79c8970f287ab37db254adf15c48374e2edf0a707bd56e39748cb9930b011bba934eb6d5a5d56b7869430ccfd39d876b3889ea7ec48e6acc3ea8 SHA512 48a55e071474d74f27f50f2928b2f1fe3c12848ddb2c32de2339396db3355805938ae0b01487328210262f0a309996172301cdc6c80d925e33765e98240ffd7c
diff --git a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
index 386e9cc6b6ff..a3e461f6d8c3 100644
--- a/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.3.1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/pyyaml/pyyaml-5.4.1.ebuild b/dev-python/pyyaml/pyyaml-5.4.1.ebuild
index 02dca8baddc8..c702311e7455 100644
--- a/dev-python/pyyaml/pyyaml-5.4.1.ebuild
+++ b/dev-python/pyyaml/pyyaml-5.4.1.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="YAML parser and emitter for Python"
diff --git a/dev-python/qdarkstyle/Manifest b/dev-python/qdarkstyle/Manifest
index badb6f26532d..640507403474 100644
--- a/dev-python/qdarkstyle/Manifest
+++ b/dev-python/qdarkstyle/Manifest
@@ -1,5 +1,5 @@
 DIST qdarkstyle-2.8.1.tar.gz 7883937 BLAKE2B fd5a35467c6c47e9eb135d4a119b3f382bfe20b9b0ac2d407fef7113e5ce4d914f3d8e462d26a71b8f1494f42b71a4f8819b0eb2c6579d87ca9dd497d09d39d7 SHA512 10c3f834b1ea50f665c2ce3fde16533c7dfc62c2d055afcc7d2434c09d14fb9a6181b73ce12d3af72897b9d26b41db81cc76e7c7cb6112eef097cd86630b6532
 DIST qdarkstyle-3.0.2.tar.gz 8330772 BLAKE2B c64524e2ecc23b714d6f5df6cea007846c6a9b1d5805d12e23c53e27c0411900730c656583bb5446bc343018e4fb1e110994c646e277ee0f3a3a7553df77f3ca SHA512 ef4ffc82fe3b72d89deb5dc98fc7319dbd6dc0bae530bdf612477c44934f587c497f8a9ec9d060fc8fcafdc918447f4dbbab20225f1e5cbf2146bcde83d0ce20
 EBUILD qdarkstyle-2.8.1.ebuild 1441 BLAKE2B b22052ffed55f621e0485e5408ac225a30aa8512c7067c7fe7ecd51aa370f7c2aa9a3f791d6af99b3f3e3ce0d595d618ef8d3c28488cdf55c48dbcc384b3cc6e SHA512 310b02d55f42ae6c7df703636ef6eb02a874958515d5e5c341db8f9cc4f8d777b179b4e2ddaa21761938e7a6e8920ebe1075ab637188a8cb4fe18aae5ac81f70
-EBUILD qdarkstyle-3.0.2.ebuild 1125 BLAKE2B 617a5d4058b54e23ba19bba67d3f4023c9ec8e8e3c8314f2ca8efe1553d7e0468e04a3401071ff6580e19a58ff8b68c110a2d50ca5cda34b1f41b117a75cdaa0 SHA512 39c7d5e4524a22562601481ad9fa182cc992b9121b62b74c35e0c276d49115fcf40b19a7155d60ae8a25c2f79f62660eace4c694507816143ba8d86ca42de3e9
-MISC metadata.xml 502 BLAKE2B 6a64e50b6e49384668bfcb81b42828377e5040936d6f398a9074f24848baaa543acd274ad46a85ef9a09cd2bb173b0e174718e37db0cccfd6cbe972d60a61c83 SHA512 322fbcf5c9ec16f833a05158a23a41010130b8254cb2672b6d2c6c19cc3b9f400c9a4c590e394e6cda6a3150bb2710d7fdf2c3183d54972282ad88bba3c3b90e
+EBUILD qdarkstyle-3.0.2.ebuild 1123 BLAKE2B f48250cba630835a09ee6695aa3fd84f8ac952d6271a113c75c335d6859f7ce5e89cdc85f19b9da3b81ede5c56613e445a3b21fa0af7c711a8333ac6b19a1ad0 SHA512 9a7b6fb03524e3037f7407084e97a47b7451bf2ee0945932a1b6109015dce53ef043fca1ba44f2216e5dad282a763f1a6bb5c8bfff3439314ec934fdc9179469
+MISC metadata.xml 355 BLAKE2B 43e28f529763bd884024c7f67e3737c38d2a98e80056ace1a1048f41dd8036aa4409eac1de34f13fba1571564de39e7c092c3ba70ae017838161099f783060d8 SHA512 afbe12e3cbb8fee336b64be746509443d79673c10b7885d9f5f25d7f7ea203f6f7a0b9277381418e88c0188620e3f9a00c7e6b618ae887350a6d21c957c1b209
diff --git a/dev-python/qdarkstyle/metadata.xml b/dev-python/qdarkstyle/metadata.xml
index 5f2c89371607..40961b989eb0 100644
--- a/dev-python/qdarkstyle/metadata.xml
+++ b/dev-python/qdarkstyle/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">QDarkStyle</remote-id>
 	</upstream>
diff --git a/dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild b/dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild
index 6d530d329ce1..632c8dc3d7a3 100644
--- a/dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild
+++ b/dev-python/qdarkstyle/qdarkstyle-3.0.2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ColinDuquesnoy/${MY_PN}/archive/v${PV}.tar.gz -> ${P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # TODO: Figure out how to get this to work
 # Please pass a palette class in order to create its qrc file
diff --git a/dev-python/qstylizer/Manifest b/dev-python/qstylizer/Manifest
index b78ea8372f76..b6139f9aa63c 100644
--- a/dev-python/qstylizer/Manifest
+++ b/dev-python/qstylizer/Manifest
@@ -1,3 +1,3 @@
 DIST qstylizer-0.1.10.tar.gz 20683 BLAKE2B aa12addac6cbe1ebf043d70189683feda87db3a8c2aa3604a04a969f638647ba32eaf7d156559b8af151136aaca784f26025746d9f3e574ad6eb777801bcf44a SHA512 1a747c2a0d5ce0acd220f528bc54c84c723f50bf39fc8d818f6a5475105319f46700d2f00bc5c0f14de8f0caaee0ab8904a379a3e697ca68d00ef62ec3408b2b
 EBUILD qstylizer-0.1.10.ebuild 1533 BLAKE2B 19a49fb724a3db8d99b89c19c8746f661b96ca424443f11e0b32fa8832298f5b037dd2709aac75f0da11f3a398d76417d8fe1a8ecf314d9bd6bb4dfbd1deeee9 SHA512 a0df706d4da862a15cb23f5d8250464421df6e018dfc8808941f493efe5ade7ccc455e96dc033de44fecae34bb9aff7ea602a1c83936660f97105fe3b278f690
-MISC metadata.xml 501 BLAKE2B 6c537b7cb9a8447f4eff4bd559998b782969b9ecb147594f4f47c4cdd0eae7de2ae3fd195b257b4848f7c08f05cbef68832449684a409c58a6fa0ecd23a3bbec SHA512 e100e912e3ece0c01305b78fca2247e9927c5fe9d3b4d76c89eee5890ded4999894624a183e77714065f6d671a4ccbcf6fcd9fb9dd03a9e44f4125c848c300f2
+MISC metadata.xml 354 BLAKE2B ea116209c46e48581be418ec1035f3459b375c4fb4623a2af488f98dbde6ddec42eb65f11844477ebe4573366bcb66558c58bc25c50eead585ca70060c0d1195 SHA512 38ac9ffbc6a2ea404f70afd4f0fc3aa8663832116a6182cb05f48736c9f44c4b9211e77c93053e24b1310f0b621784f90ed8261982abba7c6121332593ded18d
diff --git a/dev-python/qstylizer/metadata.xml b/dev-python/qstylizer/metadata.xml
index 4db1da22a045..993f2c5f1c71 100644
--- a/dev-python/qstylizer/metadata.xml
+++ b/dev-python/qstylizer/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">qstylizer</remote-id>
diff --git a/dev-python/qtawesome/Manifest b/dev-python/qtawesome/Manifest
index 2f5e40e32811..ad76c3037b61 100644
--- a/dev-python/qtawesome/Manifest
+++ b/dev-python/qtawesome/Manifest
@@ -1,3 +1,3 @@
 DIST QtAwesome-1.0.2.tar.gz 878664 BLAKE2B 55f6d527e83165a91918ec6200a9becad99ace56b2906fa216dd8b0179c5948418954a1d0151d1524dc2d02e00c943311e4d2c28cd4d89fc7f325f0b6fb3edf5 SHA512 22bd2a96000d94d1e72259a559b21fee0a442c02751b983df29a1b64f8c5b7057905d8281108ef591cbb2ba71bd1294ad647f00468b7ea28a67466ec2fff0d4f
 EBUILD qtawesome-1.0.2.ebuild 775 BLAKE2B 3b79ad78a8b90f48784cc2f12c736bc6ec56cb9700a2e135c7253d756acbd50758ba2bd197aef7e46dd4a7c43436126fa5c28caff1c56a85ac4c6277646fcb64 SHA512 4f006e817a9aeaddabcd6fad05309a6797f34d9f7aa912cc8b90e97fe64063fd8d8e8e5e04ed01b55052f6d7822de0efa3476afd90cf10f24a3ac0c95172a7d1
-MISC metadata.xml 962 BLAKE2B 8a2a6d829c78de627696aa04712597a37cc551b86706de2a79da1ee8d9d1985c2c199cc77257170d74b1000185539f8a10d85ac59df0e46e61ae896fbcd91725 SHA512 245d6b4e1b77ad09bd00ccdbac262d5653cb909f57a4e327fee73201666ff426d1d1ecfc770661e6501fc5e8fde841367c4f49a3527e09a5fa519c3b85d97afb
+MISC metadata.xml 809 BLAKE2B a2466e110ef2e6cb3a9c668bc9d41cc1a37396ec49e8f90c75e5bb22b87c09e27f393941ac0c6d72dc73e7cfb793032815f16fc84228e7107d1a626a2f629608 SHA512 26439f8cd592cf1764e62d146f467942d1b1d4cc35b096f2a2cef43099c8d1dd41d22713ad476f34c9945444a7ac5449e1391aad815da753f9ca8f46ff340889
diff --git a/dev-python/qtawesome/metadata.xml b/dev-python/qtawesome/metadata.xml
index ab6d7816c152..5726e1719fa6 100644
--- a/dev-python/qtawesome/metadata.xml
+++ b/dev-python/qtawesome/metadata.xml
@@ -9,14 +9,10 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <maintainer type="person" proxied="yes">
-    <email>andrewammerlaan@riseup.net</email>
+  <maintainer type="person">
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <longdescription lang="en">
     QtAwesome enables iconic fonts such as Font Awesome and Elusive Icons
     in PyQt and PySide applications.
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index 381bfcec9a18..daf2f1e039ed 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,3 +1,3 @@
 DIST qtsass-0.3.0.tar.gz 27880 BLAKE2B 07f71e794392ee23db901b1ae74e4c8a8888040b3e5b0681e05e2aa22ec2bdc958e588e2ee9ca9e5fdb4d341827b7c39a4ceb589ed4c669454cae78ee9747883 SHA512 fc3e082a01b35d1e7cada22cd5bea2aed37d4d3dd5a036d3d6d7621fb64ac61fdb3f2358f377f69e2cc5678798069af1d7cce04c4bcb9edf390d5162d308389c
 EBUILD qtsass-0.3.0.ebuild 649 BLAKE2B b1242d761094f744e68966021e49d28de51506d75f8d715e4d2e7cb2cfa0ab6e5ecd1da745df69acf2984e932c45b308e2793adc260dca92cf02b61fc5133cd5 SHA512 9bd5830b61fedad4bbdf140291cbb487000040aef9fb873003189f801d7fa983a1e7c325e7708aba695412e20689332ec5c193daa10081eaaede0caff9f501f4
-MISC metadata.xml 474 BLAKE2B e8249a4fa6e7460d35ba5db5c76a81917e54a028520b03d8902a1a109dbff8dab8c31969c78edb8db4af1604565469de1bf2c3f6eb8901c9d4dcdb6902392b00 SHA512 b5a3f8293a02f9b1a22d51f843cae65d5529673f5e80c69640091609ce6bdd19751b73fb0e4edef6c6c2e5ca19ecd54383f31c14f57c6c018ba5ed679986c6e5
+MISC metadata.xml 327 BLAKE2B 900f4d682ecec0d5220124f51a071f8d959f1d2a15301a76027b6428ac1fd4a59d99eaa56a3e444d51aaada5345df7d3acf76c3f24da7fbfeeeb70cc9985631e SHA512 e38ed87ef3723cc73eaa17f079812e73e545f29455620c4d0190013f6f5b0269db10243acbccf026018ebe3e4a10e2b134cc06d2820dfcfcb9ba25a7b14425ac
diff --git a/dev-python/qtsass/metadata.xml b/dev-python/qtsass/metadata.xml
index f4b2c5f82c3d..645a3f43f1e9 100644
--- a/dev-python/qtsass/metadata.xml
+++ b/dev-python/qtsass/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">qtsass</remote-id>
 	</upstream>
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 7968738e4143..3a4626a57af9 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -1,7 +1,5 @@
 AUX reportlab-3.5.48-usr-lib-LLD.patch 1601 BLAKE2B 34ff1ce6b0cc2fa8ea3b2bec79ccab0eb7ccc28ed306b524b0fced1a37605c0c957090c39c5a0b71dd6d3c47c60cb7b714142a2f339170b7dcd965363ff2df66 SHA512 32fbd4410846ba4d0a3a8a5521f21f445f76ee75d0adde6ade210816901f1bcffc511efe3822c9b473d71b3541a716f9b2a3aa39181afb21de3aad9d13026476
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
-DIST reportlab-3.5.66.tar.gz 2911372 BLAKE2B 58bc718157066a82eece18141e08547b8360dd653d2365fdbe1708fee2f1f8dffeced60500b4e866c31947fae00b78ab9853983563fb89e5b34827173c71a534 SHA512 81fac9fd751a451bd5bf6c91efcf9e250ec1c028587c9ed76129d7fd20c4efa17ea0ae45f08dd43a33adf6f4a2c5338a557e869b85d0b6405626720b0e9221a8
 DIST reportlab-3.5.67.tar.gz 2911726 BLAKE2B 8dbd3bb54c2c651616c3b6be905ac7b43b3a8f30f630d2f9b91882416cb4513751affa507870fdd801b5aa53480498ecc9a5fe3902ab38d72288b6f48ce892e9 SHA512 5a0ec58f0ee925079f3756bac309bd5aaf159118a4ed7ec6467721ead23e5db37839014bb49f1804a0dee4532ce21f9c78adec99ec61a4aeffd957184d489a6c
-EBUILD reportlab-3.5.66.ebuild 1491 BLAKE2B d5d75b1a3ac8cd7bffb187b8c7bfb4e4c93308979110b2c4041e034e797ee7e5e1bc9005a37ec94c4e3a02e6ee61463d392008619d17bf7732b2134c5859b723 SHA512 4df916fa2db46dd58f4fc447378298fe719829dc68715b78e1bceba8378742c69bad70d5df04ed890f7eb9e53cc0e0c968ee5aa4dfab215fad84e86a9985e638
-EBUILD reportlab-3.5.67.ebuild 1498 BLAKE2B 067bba343813221022b21a79f81132a4eda9b40d962cb231baa8dc0f50c9963942a83cc05a788f8990b400815042d162bb7b4fd150271a66528fce15106541da SHA512 03aae050ba5b791514aedf2a9d9f6c877fedd500029280d530e845aa136d234312edb08bf9e61ab18afba562398e17138881e31521756d7fc446d3d87d3c2dac
+EBUILD reportlab-3.5.67.ebuild 1491 BLAKE2B d5d75b1a3ac8cd7bffb187b8c7bfb4e4c93308979110b2c4041e034e797ee7e5e1bc9005a37ec94c4e3a02e6ee61463d392008619d17bf7732b2134c5859b723 SHA512 4df916fa2db46dd58f4fc447378298fe719829dc68715b78e1bceba8378742c69bad70d5df04ed890f7eb9e53cc0e0c968ee5aa4dfab215fad84e86a9985e638
 MISC metadata.xml 1972 BLAKE2B 92f398fa2c71a354bf25e35578038cfe62fc7687dd9f378574d7221d9982fb96f668f63fe8811b8e189eecd9f02edfe44d53cd17471e226cae8e5ee742ad0872 SHA512 363607498faad8268e3e9aea57f52240d8f5e7f0f9fa48436d7383b16138ee6e2eba87bfd54077dd475a37201324dc83f05a0c53d9c8eb5941be4026f3454fbb
diff --git a/dev-python/reportlab/reportlab-3.5.66.ebuild b/dev-python/reportlab/reportlab-3.5.66.ebuild
deleted file mode 100644
index af6ca2578080..000000000000
--- a/dev-python/reportlab/reportlab-3.5.66.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Tools for generating printable PDF documents from any data source"
-HOMEPAGE="
-	https://www.reportlab.com/
-	https://pypi.org/project/reportlab/"
-SRC_URI="
-	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
-	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	media-libs/freetype
-	media-libs/libart_lgpl
-	sys-libs/zlib:="
-RDEPEND="
-	${DEPEND}
-	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]"
-BDEPEND="
-	app-arch/unzip"
-
-distutils_enable_sphinx docs/source
-distutils_enable_tests unittest
-
-PATCHES=(
-	# bug 738312, remove -L/usr/lib from link line
-	"${FILESDIR}"/${PN}-3.5.48-usr-lib-LLD.patch
-)
-
-src_unpack() {
-	unpack ${P}.tar.gz
-	cd ${P}/src/reportlab/fonts || die
-	unpack pfbfer-20070710.zip
-}
-
-python_prepare_all() {
-	# tests requiring Internet access
-	sed -i -e 's:test0:_&:' \
-		tests/test_platypus_general.py \
-		tests/test_platypus_images.py || die
-	sed -i -e 's:test9:_&:' tests/test_lib_utils.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_configure() {
-	mydistutilsargs=(
-		--no-download-t1-files
-		--use-system-libart
-	)
-}
-
-python_test() {
-	pushd tests >/dev/null || die
-	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
-	popd >/dev/null || die
-}
diff --git a/dev-python/reportlab/reportlab-3.5.67.ebuild b/dev-python/reportlab/reportlab-3.5.67.ebuild
index 71dd8dad099d..af6ca2578080 100644
--- a/dev-python/reportlab/reportlab-3.5.67.ebuild
+++ b/dev-python/reportlab/reportlab-3.5.67.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="
 	media-libs/freetype
diff --git a/dev-python/requests-cache/Manifest b/dev-python/requests-cache/Manifest
index befbb339daaf..a3dc3fd06c45 100644
--- a/dev-python/requests-cache/Manifest
+++ b/dev-python/requests-cache/Manifest
@@ -5,8 +5,8 @@ DIST requests-cache-0.6.1.gh.tar.gz 47919 BLAKE2B 022fd94a332feae043cf646cefc368
 DIST requests-cache-0.6.2.gh.tar.gz 47962 BLAKE2B f0597f3c5f4a678b94f3b15023e3aba5247de3d79043e7e1cbd4ab0f2d4457e2f5feab130665129ae87baba56576312b1420ae16c2a34b44dc780bf05351615c SHA512 c97119127b1e80e6eec02938b2e0e8de785875f46d348215e05ee2d668feb77ed40f0dad4ed4a3ae53fb8e6708c8d7b13788e54694a38cef3ce22e83f13f97e2
 DIST requests-cache-0.6.3.gh.tar.gz 50303 BLAKE2B e8507a19f3883c050e1d819bf9ce8ebf720a5c6517e4004ecf745f5a197a8feac9cbca18ffa99001be0baffbad41d2ebfba5b63d90b55eda1d754d279242bbc6 SHA512 1fa801f60623dce0a5cd834272a74acf80b6ae52a602ae81fbd7e3653467800d9a58fb8220e30d53ef1b896aa01f2017f93dcbc2dacfd685ee9ae286f47077f5
 EBUILD requests-cache-0.5.2.ebuild 2832 BLAKE2B 1bae66755831dbdf4cacd154a8e40f74106f16f7ee6fe3561dc61449ac05e2a82b484d4b17c7926eec61e5b98c6c83ee466001a1cda6ed48526fee10eedda1f8 SHA512 a37ea9debd607221555025b1c5903aea17087479fa96f864b2aefd8bcaf22cade7c7fbb9b0492f37012b2b37299fa0759da780b6b6f0e30cf2addeb43c8efefb
-EBUILD requests-cache-0.6.0.ebuild 1576 BLAKE2B c487b01fa9a3b0860ce48e86937bb6436dfa731f9c18b2bcc4756aa50f7a5dfe18e97bca9cbce5b1c96368b428732a6ae14cda59bcd10bb2bf5577cc048b2161 SHA512 38f123c0cf41875d9715c0da1c97010108f841d76e1eea46c2f20a336981b6656f74c2e1ff9228eaae909eb19a6c8d60e1603459881807e0793a556b857d037f
-EBUILD requests-cache-0.6.1.ebuild 1207 BLAKE2B e764b58783d8317ae8264304474be09676f2cc035902ebd880f0115efb9781abea921eb30c9d9df550c69d8e2589e608a077b6a31f31b3a0924e6ed606316289 SHA512 30f15bf454d2bac61f6b6524c24a5bbc7638f8718d4d8fd8ad4b8e7fce3ac7aea3311727b4099459564b6e2099237a961d0b409a469c8da060256ce5dcff9194
-EBUILD requests-cache-0.6.2.ebuild 1207 BLAKE2B e764b58783d8317ae8264304474be09676f2cc035902ebd880f0115efb9781abea921eb30c9d9df550c69d8e2589e608a077b6a31f31b3a0924e6ed606316289 SHA512 30f15bf454d2bac61f6b6524c24a5bbc7638f8718d4d8fd8ad4b8e7fce3ac7aea3311727b4099459564b6e2099237a961d0b409a469c8da060256ce5dcff9194
-EBUILD requests-cache-0.6.3.ebuild 1127 BLAKE2B d9a629f38db64f86a368f31ee94cbc3624a47aa42fc2b3cc960c9fb775540b509f0140cd74e4f21a54b2b87ebb5667087875d64c38e7195876bd6c8225de288e SHA512 39e963417bb36bf6849b0ac0e54255f42594af43510d568e15e60a46228ecdc74dad134cdc7ce1784d7d46fd06633cadd8920ec554ad8520f1e91c1cf84870a2
+EBUILD requests-cache-0.6.0.ebuild 1547 BLAKE2B d4882712310d235f1e36e36927fd604fec9d0b27da8be825886f8419163c90fb804c31a511b894a86fae8cf42a4dcf127e99ee8d524c57acdc3c1710ba66122e SHA512 001b0302241e7fd38c37fce08724a6b7a98ee2fdc17fbfce76d6bbe4cc42c732a5a44ec56b60fcde69a0e294a0665e61e8b5e89ea4180d7f277ce52d836b6f24
+EBUILD requests-cache-0.6.1.ebuild 1178 BLAKE2B 6e6a82c6692d84e823b58037b5d5cebae4502dd64a46934b1ee808410340448b43ce92cd6743df8cd0eea1081d0aa459157b981c9df4bde67ee7b832863363ee SHA512 9f96b00d591bb46d78b4c1cfa1aebfdd29ab96e14731c5b8fccba1631da554889bd2c30a47d102efc07b54f1e25ff62766e8e648285960917f368c1f63875133
+EBUILD requests-cache-0.6.2.ebuild 1178 BLAKE2B 6e6a82c6692d84e823b58037b5d5cebae4502dd64a46934b1ee808410340448b43ce92cd6743df8cd0eea1081d0aa459157b981c9df4bde67ee7b832863363ee SHA512 9f96b00d591bb46d78b4c1cfa1aebfdd29ab96e14731c5b8fccba1631da554889bd2c30a47d102efc07b54f1e25ff62766e8e648285960917f368c1f63875133
+EBUILD requests-cache-0.6.3.ebuild 1098 BLAKE2B 6130a0b601278c24f12810bce0731a88eab268c19384e4bab4743236ce1f54d6c2326717e47f8e18929d6a278486aa4e5e5251e36aab65d04cb85937f8946079 SHA512 ec05595da30540b757c9e0e6ba3a53f49ba219fb54090648ac23b164fbe7e360f99c81e2d7a5d3857c505d45184d779e5e66acdbc3ee25232d9cebca68b7764f
 MISC metadata.xml 469 BLAKE2B 7a0fbb271ec0f40665d6fbce539cb49a818f5f3876642c7d9d721566fac8fa81b0f39f4a2ce6b2b0884b6c2ea79a1bbf8c95d2f86c75372725dbc53757f0154b SHA512 6485eecd67956b0ad5eaaad22c5e68e9bc9acaf0330aca6c3c0a378b5153ecc7a086fac08e9932d03ea4ff6448c63958fc8faeabefd4c68140f44b0fda0f31f5
diff --git a/dev-python/requests-cache/requests-cache-0.6.0.ebuild b/dev-python/requests-cache/requests-cache-0.6.0.ebuild
index 28591398044e..cfb8a2d6b048 100644
--- a/dev-python/requests-cache/requests-cache-0.6.0.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.6.0.ebuild
@@ -28,7 +28,6 @@ BDEPEND="
 		')
 	)"
 
-distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
 PATCHES=(
diff --git a/dev-python/requests-cache/requests-cache-0.6.1.ebuild b/dev-python/requests-cache/requests-cache-0.6.1.ebuild
index dd9fdcadae1e..dcaf77d008de 100644
--- a/dev-python/requests-cache/requests-cache-0.6.1.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.6.1.ebuild
@@ -30,7 +30,6 @@ BDEPEND="
 		dev-python/timeout-decorator[${PYTHON_USEDEP}]
 	)"
 
-distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/requests-cache/requests-cache-0.6.2.ebuild b/dev-python/requests-cache/requests-cache-0.6.2.ebuild
index dd9fdcadae1e..dcaf77d008de 100644
--- a/dev-python/requests-cache/requests-cache-0.6.2.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.6.2.ebuild
@@ -30,7 +30,6 @@ BDEPEND="
 		dev-python/timeout-decorator[${PYTHON_USEDEP}]
 	)"
 
-distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/requests-cache/requests-cache-0.6.3.ebuild b/dev-python/requests-cache/requests-cache-0.6.3.ebuild
index a4941ae73367..56c3378e34ab 100644
--- a/dev-python/requests-cache/requests-cache-0.6.3.ebuild
+++ b/dev-python/requests-cache/requests-cache-0.6.3.ebuild
@@ -30,7 +30,6 @@ BDEPEND="
 		dev-python/timeout-decorator[${PYTHON_USEDEP}]
 	)"
 
-distutils_enable_sphinx docs
 distutils_enable_tests pytest
 
 python_test() {
diff --git a/dev-python/requests/Manifest b/dev-python/requests/Manifest
index 28ee51ef98b6..9cc7867cecac 100644
--- a/dev-python/requests/Manifest
+++ b/dev-python/requests/Manifest
@@ -1,3 +1,3 @@
 DIST requests-2.25.1.tar.gz 102161 BLAKE2B 1901ca3bb1eb7a6eb7689a81e01c1c23d3f359835507fda78de734162cbd8573b7640c9376cb50ed9397603d67d9a14624028573c2709086547f37993a959429 SHA512 ca6b0a257b448a999cade0ae173c29cddc9cfffb319d16fc3d051d3e1cd77161536e3cab279b3cba59c60d29d7864a9281c1fa1f689ce48d3bce2ca9f1cd8d45
-EBUILD requests-2.25.1-r2.ebuild 1591 BLAKE2B 60f788e60d0d94e9f407f720d3b6ad005573c68bdb8e47d8616bd9266ddc747dd50173b2637520cc824a3554b62e5e77344fb5d47ec138a7dd1d242f905634f4 SHA512 f89d96dacb29e6a79bab9f482dc9cbac2de44d95be12d57d35f87c895b5508892e056848228420ae9f1bea17df5d310889732f322fd1191d7db00aef4a9ae23e
+EBUILD requests-2.25.1-r2.ebuild 1674 BLAKE2B 6efa6716415cf24e9bfc2b001bf2aab3ef7c10032921fb5e43fde6824a6202856eb5282b6dbda13206e1b19a7ec22e542b0721abb2688671f2a475dff6d33882 SHA512 3632026495ee62d4e17596d18d8f7ab78dcf1cb21646f1c04e2baaaaafc3925515c4018581ef47b86abac87e63ab74277fa43557f15446f12f06d6c79cc988a6
 MISC metadata.xml 769 BLAKE2B 3b70fd8b559e10b971a7c72e4e134028300406af09445bf3d9c013cc15899f10452b493730b0af5f1ec958b81f719ae1af9be96cbf3fb5c0e3bf6f5bf1de7326 SHA512 12d72ea4ecc2ba0a58306917322a1687b73a3234b6dfa7f9ddbc4aa861daa4a56bcc6a8ea7e5da7cafdca2239f065c0f839a998de133958656b2c9a764fc30ae
diff --git a/dev-python/requests/requests-2.25.1-r2.ebuild b/dev-python/requests/requests-2.25.1-r2.ebuild
index d628a9ac03ed..f2de501b6bac 100644
--- a/dev-python/requests/requests-2.25.1-r2.ebuild
+++ b/dev-python/requests/requests-2.25.1-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -54,6 +54,8 @@ python_test() {
 		tests/test_requests.py::TestRequests::test_https_warnings
 		tests/test_requests.py::TestTimeout::test_connect_timeout
 		tests/test_requests.py::TestTimeout::test_total_timeout_connect
+		# TODO: openssl?
+		tests/test_requests.py::TestRequests::test_pyopenssl_redirect
 	)
 
 	epytest ${deselect[@]/#/--deselect }
diff --git a/dev-python/restructuredtext-lint/Manifest b/dev-python/restructuredtext-lint/Manifest
index 8e2cce64f24d..4b0e5ba34086 100644
--- a/dev-python/restructuredtext-lint/Manifest
+++ b/dev-python/restructuredtext-lint/Manifest
@@ -1,3 +1,3 @@
 DIST restructuredtext_lint-1.3.0.tar.gz 19008 BLAKE2B 45d4a0d02691dbd0f46e57cf637c7b61f6cd93daa5f98a6795b119555913d6dcec7035857ae6a3f73b777d02e7662c2775fa288f3ad7b7ecc3d26c961595f203 SHA512 983f38e51943cb7fd6a36181f99cd9c24c40deaf932ea8f69ae6568255a1ca8800aecd753067304ea596cd84bee4fdd5d96e935e06bf602613c57ad24113520d
-EBUILD restructuredtext-lint-1.3.0.ebuild 778 BLAKE2B 59064782eb80df00ae6b99b986028f3b8f1ae989ec65086911a594122ee83639a9828d6b062b41e55b17784576f51b7423a71fdf20083896a76b79980074f8c0 SHA512 dcfef69e53512903f82771e92b0194b6160f554ee1e60247a1dbba9c4ef23db4ce22d2f84e97512cd301ea994d4c27336316db8aec868ded3319f29b4e764a1b
+EBUILD restructuredtext-lint-1.3.0.ebuild 777 BLAKE2B 37482cd3d281e218d487cd2e2fa50bace62a74628993280b6ac7b11d729ff06d3e6f7ecbc197698c520a22f0d41046cc350a170df62667558259ec592a58ace7 SHA512 e836a5c8928a6519580f14eb34edcc8d0bc1e8c96baae42b1376bccc96017c34dc6febb9f4966f84c4701fbf226e840abf39a32393167039aa37cc8fe28834fd
 MISC metadata.xml 362 BLAKE2B 85214c8f24b266c39043bae4b132291512732e292127d9c6881e87c79f22f88b894955e75b0fd3ac29ea4aaa304581f75216ebc58f0761c040a2d3339a2ce62e SHA512 a429638f5f54808c69ec4fdd0710ba540279df44ef0de542014994e71222d1f39afad098b189b7cd01ae0ec0ac9a4a33c3425a32a5c6939f23e2008bc14f39cc
diff --git a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild b/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
index 906c45f06b5e..2773dd5e0a1c 100644
--- a/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
+++ b/dev-python/restructuredtext-lint/restructuredtext-lint-1.3.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}-${PV}"
 
 LICENSE="Unlicense"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/rfc3339-validator/Manifest b/dev-python/rfc3339-validator/Manifest
index cddbe456162d..c38892bd51a1 100644
--- a/dev-python/rfc3339-validator/Manifest
+++ b/dev-python/rfc3339-validator/Manifest
@@ -1,3 +1,5 @@
 DIST rfc3339-validator-0.1.3.tar.gz 7439 BLAKE2B 8991906720f3c7fe08edbc2994693b354338e70bb361e2ceebe168e8f8195a061c2cd716e365a7713c1a21658517e4f2028f9b619513408252a46ef589868c02 SHA512 d89679fb9fabcfa75cf3955744facb235201c0c3ccc4bcfd53b553c5403967226282b68e628d0dd74bb4abe553da6c3734912c63f3a5e16875e57a872c78231d
+DIST rfc3339-validator-0.1.4.tar.gz 7451 BLAKE2B f8216b2eb08cc7cd755a2a57dc6fa93da9aa664cc49f7e34c551d07eb61e57dc865de4a3e86ed2dfbf5a38ff99c149868762a3807e916c884b12fba7e98c3ced SHA512 ed593b31c4984cdbc313e42dc0432173eaa649712e29627ab462dfa262efb30cee97b74f589d3d211c2193623fac3baca560a52a7a3f718071a63482e06c4203
 EBUILD rfc3339-validator-0.1.3.ebuild 654 BLAKE2B 2f87b4decfec9e3468554acd85eaed5c15c0057cc1788950fa38f97e737c29f5514a957db292bc225b442961ffcf5564680f234e12b3f195b6889e9a01f45c7a SHA512 5e9416cc2570bddcd28df6837e80db67f8ddd8e784605df44274fab3e1014444f8e58fd5a9c2c8b904c2a88525bb73a52c7ff4585df4a6ed4e6d3b4b4761df88
+EBUILD rfc3339-validator-0.1.4.ebuild 661 BLAKE2B 9a7072eff55bba810babdb603b5f0f81b0d6430512541a5825ecc716c1884d53f0772af0818194c2d983416985cc020bfbbcaba47d5c7f99aa8387cdae82b310 SHA512 b35cfd3d797df26cea581c62f77d3f061cfbff909d662f890f65bcb658d2c01f3380c9a1f464177b7d9a10ea199e43d1b3a8b43b7a64a3c0f72c3c6fa44b0779
 MISC metadata.xml 410 BLAKE2B 2e5f33d43e9db653e8ea92b820fda57657072ffe43c96e1606fd4fb09e81aec31ecf7c281b3019bc945fed28cb7c0781178bc7f136df5e1c2876384296b46c56 SHA512 695a99018886fb434079006b3e0784c609654a0482c85890774f31f9f5a3bf9a4765a4105495e67ecfe872c4ed160f07dc692e1d21d1ede2ced8692e666e95ab
diff --git a/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild b/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
new file mode 100644
index 000000000000..8d19a1fdfaae
--- /dev/null
+++ b/dev-python/rfc3339-validator/rfc3339-validator-0.1.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A pure python RFC3339 validator"
+HOMEPAGE="https://github.com/naimetti/rfc3339-validator"
+SRC_URI="
+	https://github.com/naimetti/rfc3339-validator/archive/v${PV}.tar.gz
+		-> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+
+RDEPEND="dev-python/six[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index 4484155400f3..0e5f93e34d6a 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,12 +1,18 @@
 DIST rich-10.0.0.tar.gz 16217911 BLAKE2B 2604bf6a3bd57a9465fc2a001b497ff7f0afe83953d42fa8e5d9c0edfeadb0992503e2cf91cea30f177a641ebb3bb94d669945b601c88e5e796a107a08792e2f SHA512 5641df7d9ef1c1336077e357fb35c158b643afecfc3f2eb5023aa47042714d7c9fbbce7e52d0bce7c3b2c04b19e11985ca95807458dcf381fb2053becaf6ba1d
 DIST rich-10.0.1.tar.gz 16218107 BLAKE2B 3992282b72ea97a364df3ca67e10a90baadb36ff207f64edee7e11df957b078d4b2c67bf3485efb7dddd0b3e8c2d3ae87e1d9b4d063db91f30c1a9510f7da976 SHA512 14689486b8a647c17fe6cad0902f4ecbf2c09e95ad0d4ea33b88bd9f8a17164f9efed4baa09a4ad6e6a85a9ec9fdeeccacd58eaa628efccb48fef6112487926c
 DIST rich-10.1.0.tar.gz 16218332 BLAKE2B 880fe5354b41a8a2accf7dc0d2f80163b850a28d3f4bd10b9f06008f3059c6a46681b3a344289c031589eeaa6120c5cad4a03d2c25f7a440829ff21e3fe20d63 SHA512 53cf49df20887b1788edc32bb98706c9bb5facee29aac4cbde9180aba4d97433eab49a144ba9b83393e36072b5e010630b3c7d67f80e280e380559698f6254d4
+DIST rich-10.2.0.tar.gz 16231540 BLAKE2B d297678a6e90a099aa17cbac75618de500e92a07943139e3fef052a0df1edbb9c4efc22ff82d4fd3618b2b6e79bed672d3bc558fc168f5a70ed72d06a2083e7d SHA512 f1de3bdf367130efb48672a18523fba44fd209bf6b914f0fb25c140eb115e12a65182e90d988b2a56867dc1c8b83169794b852a29a28610022df004a0cfe1f74
+DIST rich-10.2.1.tar.gz 16231545 BLAKE2B d9561bc45f5d1aab04f5ed1fe86c90e0b7f07a88b99c066c6ec7b67364a8a1f9bb9275963736945bb0e6022cf10cda32036df457529c3a7ec097f4c8a3884baf SHA512 21a21b4ae479465989fc15630cdc2cf0f0fc127fe2e6b1d58714e725ac458eedca9159ec833c46b29164f5d9e7af4abbd9546ba08e6e537ed9f9c8a61995e8c9
+DIST rich-10.2.2.tar.gz 16231702 BLAKE2B 1979ee6ac7fb78ba7743f25bd34a7547f1f49c42e1f5ead958f53fe0251e73fd0122dc89c7e5fc545a5af1c6eba8ff7a3788476b63b722c6158280b85d399d99 SHA512 dd23ca63dbf3c60aec39e680c60911f1b7da76a5ffa1ba4ba61b824e583de94000bc38d819089ad6d52a15c92be030ab2ddc2186d770828553f5821d8d0410bc
 DIST rich-9.11.1.tar.gz 14050070 BLAKE2B 7dcae32743bfcbbab0af6896f72e865d2a72ab66545168544d065145cf10a2aab4785454e547f011219a85a8aa762f1ed5ebef2b9fb7f44225a2f776835b643d SHA512 2139cb6602d930e9bf1479456a8e6cee812237fb64073db3f23fd8eab64c1c2b3a83c6292f1f90652791100a93961d8ec8036e5d819f1e23159b6b9a75cd1f6c
 DIST rich-9.12.4.tar.gz 16204429 BLAKE2B b57d7dc7ad4463c85cbc43e0fd8afd9f0c5329cbe81eaac168895af3701091669e4b0b6fd0d2de2f5876405c5aae00ed77e77d1b317dbd20c7dd3e53deddf2ca SHA512 92feb4ceab4e10f33c0f4abec19a4ee5bdcf27139591b603aba98239483874089fbd33998a2f05f2b609799afa59cddbe1ee245a87c391d15f58887b21a138df
 DIST rich-9.13.0.tar.gz 16206916 BLAKE2B 27a058821f5bcdeaadf4ec9beadd0f2bb5357993a1c15cd72c6cac4def9c7c9d9d7705064853931bb868b7bf873a85469feb8a9c67daf88cdab8169f0d342b0c SHA512 bb93339f985c88b86897a9b21769877cb68f4a6f61a74b9e4a2a96aad0556502e6c848c4f769ee53c57bf03f0cfdfab97e004aa9d6572158a37037afee61f0ad
 EBUILD rich-10.0.0.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
 EBUILD rich-10.0.1.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
 EBUILD rich-10.1.0.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
+EBUILD rich-10.2.0.ebuild 823 BLAKE2B c5b2045d1e82c4055e428ce828bcc502ec3dab8949158c53d3b28936536e3a8d584cfbef6e505c9e4b983fa2ab92034000706a82dde4d159ac3f1723b4147cdc SHA512 2339494971e6241677485786d2ebf731d0d3ed3587dc4936fd882fda525feacf0e4250a57baf8adb5679848e718640e3eda3b07c97f9728280360f7f8c7f3239
+EBUILD rich-10.2.1.ebuild 823 BLAKE2B c5b2045d1e82c4055e428ce828bcc502ec3dab8949158c53d3b28936536e3a8d584cfbef6e505c9e4b983fa2ab92034000706a82dde4d159ac3f1723b4147cdc SHA512 2339494971e6241677485786d2ebf731d0d3ed3587dc4936fd882fda525feacf0e4250a57baf8adb5679848e718640e3eda3b07c97f9728280360f7f8c7f3239
+EBUILD rich-10.2.2.ebuild 823 BLAKE2B c5b2045d1e82c4055e428ce828bcc502ec3dab8949158c53d3b28936536e3a8d584cfbef6e505c9e4b983fa2ab92034000706a82dde4d159ac3f1723b4147cdc SHA512 2339494971e6241677485786d2ebf731d0d3ed3587dc4936fd882fda525feacf0e4250a57baf8adb5679848e718640e3eda3b07c97f9728280360f7f8c7f3239
 EBUILD rich-9.11.1.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
 EBUILD rich-9.12.4.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
 EBUILD rich-9.13.0.ebuild 783 BLAKE2B c487ec61fd8fc42065954d2eff2e5e38dd2faf8ce54007e8129f9e83cae675ec672b51cfb6f5fb647c33c1920b239950274f0a0ee4a23dc00e2a57f59bb74f42 SHA512 b0c2fc1d5926af38d2a1448aaf6c63f22a873430642b1e48919ca8f19d1cda60f0122b0f4346efb0e5cc3f549b536a8895a5fcdf140acc7b274ec9181c709e18
diff --git a/dev-python/rich/rich-10.2.0.ebuild b/dev-python/rich/rich-10.2.0.ebuild
new file mode 100644
index 000000000000..f9ece430bf2b
--- /dev/null
+++ b/dev-python/rich/rich-10.2.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rich/rich-10.2.1.ebuild b/dev-python/rich/rich-10.2.1.ebuild
new file mode 100644
index 000000000000..f9ece430bf2b
--- /dev/null
+++ b/dev-python/rich/rich-10.2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rich/rich-10.2.2.ebuild b/dev-python/rich/rich-10.2.2.ebuild
new file mode 100644
index 000000000000..f9ece430bf2b
--- /dev/null
+++ b/dev-python/rich/rich-10.2.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for renrering rich text, tables, etc. to the terminal"
+HOMEPAGE="https://github.com/willmcgugan/rich"
+SRC_URI="https://github.com/willmcgugan/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' python3_7)"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/rq/Manifest b/dev-python/rq/Manifest
index 64d1360383f8..d61e48d002c7 100644
--- a/dev-python/rq/Manifest
+++ b/dev-python/rq/Manifest
@@ -1,3 +1,5 @@
 DIST rq-1.8.0.tar.gz 584251 BLAKE2B 3da1d4f1604a57e16e26c39643337fb8ab804089f783d6a7c44500f577a326cf4883835c996427e819896faad512b9a380ebfdcf67e865eec475d39321ecd2f5 SHA512 e8946b4454e67bc9ce0c69c302ba3bb6403654cce384904d64996766227ba8fdcbff834a8901a8fa09dcccebe8aba769d38daf228283f4142166fa5ea0f9a107
+DIST rq-1.8.1.tar.gz 585211 BLAKE2B 17feb07cb376c5aef88a7aab6d716f58a19f62f19db6c6b0490b4f666981e40304c6a23c88669a0aef9b75a39ce8cb85a9b10a2d42e83e646cdcb6282167d8f9 SHA512 b9df7b4e894a5da693827ff720be3068336d82d2f17928faf5ae6133b042ac2f98a3d673bb2ed86c9351479669e9ef0e4fffcb1dba9b8853f6f793db4a4678f8
 EBUILD rq-1.8.0.ebuild 1399 BLAKE2B 50a75ba7eb585a6fb8f1e9b6b39b6e855457338fb764fc2a42b25419cd54f61522f353b245355ffafaa026e9bc6acdf4a17e92ed96426c5b58b7bc3e29e49d82 SHA512 7a098a65b9ccd37d1f6110a0eb06efa100885065a94c3b198b5e1fb10c33f71d9cf089fbf2c0b30fee9d9f1977b03d23cb1c207e05b4df5403a1579f8fc4c263
+EBUILD rq-1.8.1.ebuild 1369 BLAKE2B 33f3e5bf27f3eade5a1345bea070911b9965e6772e08e37f53398b7eb91b3184505c637b63dbf8d829a8ba2114b030d7354e2a223df46837838a3176a54d5b24 SHA512 33732d9e718ac32804840798ab215f1036ed16afab048866d6f8acd681a3100539a185363fa441c1c2290c4e3ff94f5e0a0cabd8356e78c402a5ce877c04a4ed
 MISC metadata.xml 561 BLAKE2B b0f95e81961b91a9ee8b6911f12a4ae0738dfb424b18f934a8a113dc509a31f87c69cbb22b8e049b82f847f34509b222baca3985b3873567cf7089238d6568ba SHA512 bf1c6bc1794ae0e20f6622c9bacc501bb6b0d9ddb4f1caa2de64e20b31f050a6329ecaa7baf26159f24f04a2b75798693fbb3071554d0fbbb9f8577ce8d91797
diff --git a/dev-python/rq/rq-1.8.1.ebuild b/dev-python/rq/rq-1.8.1.ebuild
new file mode 100644
index 000000000000..61e8398709eb
--- /dev/null
+++ b/dev-python/rq/rq-1.8.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+inherit distutils-r1
+
+DESCRIPTION="simple, lightweight library for creating and processing background jobs"
+HOMEPAGE="https://python-rq.org https://github.com/rq/rq"
+SRC_URI="https://github.com/rq/rq/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/click-5.0[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.5.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-db/redis
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/sentry-sdk[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests --install pytest
+
+src_test() {
+	local redis_pid="${T}"/redis.pid
+	local redis_port=6379
+	local redis_test_config="daemonize yes
+		pidfile ${redis_pid}
+		port ${redis_port}
+		bind 127.0.0.1
+	"
+
+	# Spawn Redis itself for testing purposes
+	# NOTE: On sam@'s machine, spawning Redis can hang in the sandbox.
+	# I'm not restricting tests yet because this doesn't happen for anyone else AFAICT.
+	elog "Spawning Redis"
+	elog "NOTE: Port ${redis_port} must be free"
+	/usr/sbin/redis-server - <<< "${redis_test_config}" || die
+
+	# Run the actual tests
+	distutils-r1_src_test
+
+	# Clean up afterwards
+	kill "$(<"${redis_pid}")" || die
+}
diff --git a/dev-python/rsa/Manifest b/dev-python/rsa/Manifest
index d9d1be695873..467df53aba24 100644
--- a/dev-python/rsa/Manifest
+++ b/dev-python/rsa/Manifest
@@ -1,3 +1,3 @@
 DIST python-rsa-version-4.7.2.gh.tar.gz 65177 BLAKE2B 513d6f346813d6bc67de23ee419d70f310155303df40174d47343786f735e00446d8874f51fdea0d7dc890bc8986bb2861746328d7200e8704197adde99d68ad SHA512 4ab64868be00b74b64931453f684bc7f68cfea92cee651e957411e4dc5084e5f8e300fda01cf5187df2f3b455ea40d233488a2e777c9d669d457f67325b420f0
-EBUILD rsa-4.7.2.ebuild 774 BLAKE2B a80b2c99b3cd93077b792a7872e459bdef913cd10c2d94634b18a90f6b8ef2311c174fdd632a3e7d19cf62308999c71a3fb5e2c4774b28919e0d0fbeacc56951 SHA512 5942870ffbc0bd0b3c63135c7b1d98e8999bb93f0ba76b6be5eabce4a690494fb0f5535f1043e12a04e28a7f239defdd490335154bbcd5e8dbeb8048580516e0
-MISC metadata.xml 341 BLAKE2B 0175c0ce5e0939f8f3645c278fe6a8b5fc9f31c68e9b2aa312792a411005cbb23e5715c6806be3345731d37c438c5ad44472647616eaaac6ec53eb84aec9f66a SHA512 2100e90d14980a2b492c3e940e2cf2298e5933be99eb2bacae8980862c0a468a006749cd69fa7597c642ee90c091dabae9752b1cea0d46cb554f4e2c6251b91d
+EBUILD rsa-4.7.2.ebuild 741 BLAKE2B 289f96ef119fda2e2aaa1d119f71132eedfe356420f8213827c2dbb63266f41aba1a6407216c1dff8b2fe1e70d1cd404b66e6f15b35a47a0b815b7ab42193054 SHA512 7a1b71506b65974b304bd78e57a977afd9743bd0cf1006efaa92a2bbb6673265f5ca5f84f64cd8d39708ead907e7ca3c59ce767222623d7ba02be124040848aa
+MISC metadata.xml 406 BLAKE2B 30817623a87ffb4c97c52dba4aa3d5e83a34698cba639b21928280e516dc4fb160c80cc95f3ec41c92fa0a2493450bf1ed99c927db5e7fce217dd0b1396ea3c4 SHA512 030a48b4bc2440d78651b39e0b3ac7de52233e9ceba854b77511b350ad5b38ea89c5b5e5473409f650f619c1111ebf95684ea35e71f206a887a9d7f0473f6655
diff --git a/dev-python/rsa/metadata.xml b/dev-python/rsa/metadata.xml
index 50c64ff8739e..603d375856d4 100644
--- a/dev-python/rsa/metadata.xml
+++ b/dev-python/rsa/metadata.xml
@@ -8,5 +8,6 @@
   <stabilize-allarches/>
   <upstream>
     <remote-id type="pypi">rsa</remote-id>
+    <remote-id type="github">sybrenstuvel/python-rsa</remote-id>
   </upstream>
 </pkgmetadata>
diff --git a/dev-python/rsa/rsa-4.7.2.ebuild b/dev-python/rsa/rsa-4.7.2.ebuild
index 3ba7e7813aef..a32e28e1e03a 100644
--- a/dev-python/rsa/rsa-4.7.2.ebuild
+++ b/dev-python/rsa/rsa-4.7.2.ebuild
@@ -3,9 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 MY_P=python-rsa-version-${PV}
diff --git a/dev-python/ruamel-std-pathlib/Manifest b/dev-python/ruamel-std-pathlib/Manifest
index e20ce13a0cdd..110e95078fc5 100644
--- a/dev-python/ruamel-std-pathlib/Manifest
+++ b/dev-python/ruamel-std-pathlib/Manifest
@@ -1,3 +1,3 @@
 DIST ruamel-std-pathlib-0.8.0.tar.xz 19068 BLAKE2B e1709bf5af17a843a7f5aec8009c4ec337cd1a4a526315e8834924909613eb5cc50c2ae1a1acc74c97a876fa347767dce627f2dba1fb874032f0989f7ee6599e SHA512 eecbb43e3867d8ccb166a0d528b3d7cfc04ed6f2df5e2048ccec4d7fd36117ac4a3984d4143025f6b7fd51867de879fe02e5dcbc4b275fd40cab1609bcf69536
-EBUILD ruamel-std-pathlib-0.8.0.ebuild 826 BLAKE2B 63ef879e67cb94f674da2504fc801f9bf382b110104b4e7573e95a024f0ff66bc33972de4fcb18ac02209450b5c3bdce71fbe56291ba30589fe0fac06dbefbb9 SHA512 df2bce4419eefca65d95265cbbe6d59cc3a9a46b898976ee589a865af8e6519c71174c48f1339a4685442621f5d76b54d81676101c40b9579c9e24dd33eaaa12
+EBUILD ruamel-std-pathlib-0.8.0.ebuild 827 BLAKE2B e64f274cce4c4a9df522fbd78d66a06668fd130aaf4d3414739e96f842f358886f97519a99420ee873c76d069966e24b54e35bd4845bf066bfde4bf28d8a4edc SHA512 1935700f250967700e7901a21c42c88cf537f118f85397b1eb670805d6c48fbf3d20c0e31f7aa3c13961b6b72745b61260a145bc379ecf006c90b50522902b8e
 MISC metadata.xml 783 BLAKE2B e18626bc4707b35464676b50433d5a3f7f187d3b37d6e73d943c7cdb92d8279d0c330c33e13f68a7de05c3b55fe0f2ba11414a2200b00b3a571f66852e223644 SHA512 7406b28da3ad6239d8eeb1b879472f1bf6af343642cc901a1e0023f94e361eef32130d54203128ec0a0ed3bd7b807e516b9e41b47fa52057e090cb29599cf9df
diff --git a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
index 6d83fbcc5d18..b33f71ae894c 100644
--- a/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
+++ b/dev-python/ruamel-std-pathlib/ruamel-std-pathlib-0.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/ruamel-yaml-clib/Manifest b/dev-python/ruamel-yaml-clib/Manifest
index b4c229da965f..3456b64a6cfa 100644
--- a/dev-python/ruamel-yaml-clib/Manifest
+++ b/dev-python/ruamel-yaml-clib/Manifest
@@ -1,3 +1,4 @@
+AUX ruamel-yaml-clib-0.2.2-python3_10.patch 1223 BLAKE2B 6d221d4ef7aab6d8f9a367fd877abe459243159d5e199fa287fa3a526d8888512ac16611cb377f50ba53fd8811a1d7193a0216ac37bb5bbcc16145e979f7b9a5 SHA512 0817dd4c459067b4545276e8cfd9e8e1ecd73bac5d9b3fd822501c80a41ecc766f0440a7b518b7554ee6cab82586920b19dc1c340f8136a0e8cf5724d5e53846
 DIST ruamel.yaml.clib-0.2.2.tar.gz 179914 BLAKE2B 90fe272c3c4f8943e944d43dcf1f61367600bd3b1fb296d7434b27183433267a510b6e41cfd50fac8e17bebcfaa51d7d1ca89d4d23da0b1107c468cafa65ac3f SHA512 5bbab2a23c65b1416480758cf0d0a75dcf8ddece0f8df603ce90f2b1c54356bb6876ac113d53e01c4869e3c9fb22b13ea29e66dc31a09144d4426c3e0f3b9399
-EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 688 BLAKE2B 0d14ca6ff3bf7d1124eca6d423e9fcfe6de03527af9c542fa94522adb971edeb1a4710a7b06f398fa30b9919eaee753d550745562e835ee145398ca636417407 SHA512 c7020ae9aef3b28ec01ceea3fc91663824daaf382b47dd6676e0054dedfd138bde2c3b11e276f3e5a01299ad939b0c8eb4ca2a6c469fbb8fcd613d7786b903c4
+EBUILD ruamel-yaml-clib-0.2.2-r1.ebuild 705 BLAKE2B f1ad1bda8a5a2a42d42070f98c0f873023ebd1d9d89e238341babc68596023b474bb602d9ccfd869c41b9885a19388a39dbccb5cd291f7b5c3e4640c482ffaf7 SHA512 df15b7e45bb98e4d97e69284be5b88c6771d9912d7c259bcbb22c0f8c13ba4e1913742b3187f68cfa18e893bb17ff0831ef9ee3cb400680505a0fceeee702692
 MISC metadata.xml 1183 BLAKE2B 5e9198838214711c9fbb5beb4179300c5465079646c3f4268145a3c893f1913ac9a14811b39afe637aadd183e4351a54c2ed160951e995bc4ce3f869b28bd6e9 SHA512 d6e5a8de5f9fe3e71a91a26be44cd87162863b1fede14301694e0a38135fc2ffb5c3ee25a4aef40d7cdb73812d0b6af72aa6b67ad782004648f54ac5e86cc662
diff --git a/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.2-python3_10.patch b/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.2-python3_10.patch
new file mode 100644
index 000000000000..6a34420de79f
--- /dev/null
+++ b/dev-python/ruamel-yaml-clib/files/ruamel-yaml-clib-0.2.2-python3_10.patch
@@ -0,0 +1,45 @@
+Since Python 3.10, Py_REFCNT() can no longer be used as an l-value. See
+
+https://docs.python.org/3.10/whatsnew/3.10.html#id2
+
+for details.
+
+--- a/_ruamel_yaml.c
++++ b/_ruamel_yaml.c
+@@ -23877,9 +23877,9 @@
+   {
+     PyObject *etype, *eval, *etb;
+     PyErr_Fetch(&etype, &eval, &etb);
+-    ++Py_REFCNT(o);
++    Py_SET_REFCNT(o, Py_REFCNT(o) + 1);
+     __pyx_pw_12_ruamel_yaml_7CParser_3__dealloc__(o);
+-    --Py_REFCNT(o);
++    Py_SET_REFCNT(o, Py_REFCNT(o) - 1);
+     PyErr_Restore(etype, eval, etb);
+   }
+   Py_CLEAR(p->stream);
+@@ -24050,9 +24050,9 @@
+   {
+     PyObject *etype, *eval, *etb;
+     PyErr_Fetch(&etype, &eval, &etb);
+-    ++Py_REFCNT(o);
++    Py_SET_REFCNT(o, Py_REFCNT(o) + 1);
+     __pyx_pw_12_ruamel_yaml_8CEmitter_3__dealloc__(o);
+-    --Py_REFCNT(o);
++    Py_SET_REFCNT(o, Py_REFCNT(o) - 1);
+     PyErr_Restore(etype, eval, etb);
+   }
+   Py_CLEAR(p->stream);
+--- a/_ruamel_yaml.h
++++ b/_ruamel_yaml.h
+@@ -12,6 +12,10 @@
+ #define PyString_GET_SIZE   PyBytes_GET_SIZE
+ #define PyString_FromStringAndSize  PyBytes_FromStringAndSize
+ 
++#if PY_VERSION_HEX < 0x030900A4
++# define Py_SET_REFCNT(obj, refcnt) ((Py_REFCNT(obj) = (refcnt)), (void)0)
++#endif
++
+ #endif
+ 
+ #ifdef _MSC_VER	/* MS Visual C++ 6.0 */
diff --git a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
index bfbba4a4408d..b8f59cea35b8 100644
--- a/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
+++ b/dev-python/ruamel-yaml-clib/ruamel-yaml-clib-0.2.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
@@ -11,14 +11,16 @@ MY_PN="${PN//-/.}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="C-based reader/scanner and emitter for dev-python/ruamel-yaml"
-HOMEPAGE="https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib"
+HOMEPAGE="https://pypi.org/project/ruamel.yaml.clib/ https://sourceforge.net/p/ruamel-yaml-clib/"
 SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
-RDEPEND="!<dev-python/ruamel-yaml-0.16.0"
+PATCHES=(
+	 "${FILESDIR}"/${PN}-0.2.2-python3_10.patch
+)
 
 S="${WORKDIR}"/${MY_P}
 
diff --git a/dev-python/ruamel-yaml/Manifest b/dev-python/ruamel-yaml/Manifest
index 241509e2c05a..30a13f579a87 100644
--- a/dev-python/ruamel-yaml/Manifest
+++ b/dev-python/ruamel-yaml/Manifest
@@ -2,5 +2,5 @@ AUX ruamel-yaml-0.16.13-pypy3_collection_deprecation.patch 647 BLAKE2B af2f03b77
 DIST ruamel-yaml-0.16.13.tar.xz 178756 BLAKE2B 19ee4713786a33853f42256e5cd3187e9e19b931ebd83a133365de3f080721c5a6f5fb41ff3079473461df47a0ab149981c5e94d08321da8b3c9eb311c226945 SHA512 1366fc0b3b5ea2699ca324636403576134ccc7c725b13c21a7752d1b16c644c93c7f7d82ddc337087d2c02947f95263d7a3fdd162f552ac3a78fa36f1f17b3f1
 DIST ruamel-yaml-0.17.4.tar.xz 178028 BLAKE2B 24c9f61cf8e158377ae839f73dcceab8fdbb8071d1a792a37bd96158993602625967805f177719bbe88e917ccaf10ba210b6c01e91bb750f4df6bcc8a4a66450 SHA512 4c3d51ff00ace64e00d5bc8314c8cb6bc193da2a90e2cc9b9ed97510a7035778917c56e10b85cafab50f296f2f46d8817ad1abfa01b0498715f4972d91545dd3
 EBUILD ruamel-yaml-0.16.13-r1.ebuild 1232 BLAKE2B 8f8eb1f7f8000aabec62f1ce4a457c2c4989ad83687baeaa0db22982b3ec45d60114661690e6d38ac6c7c2f420ce21e22c0314ef7334c532b994f3f814c03466 SHA512 e01a262271a37c1539d9d1eacb30dc327cc0610182be70b71605a9d636f807aef52e5013dbdde898deae887e28b24b252a9a2d0660c89d67b326975ba5886bc2
-EBUILD ruamel-yaml-0.17.4.ebuild 1312 BLAKE2B 994bae83c172932ed7245d2dd25cd9799e24f7caff87df92eed981b2eb50d1f71334005097a9754667825f8f18f7d3ba7750c6f95217bb92c7dbee1e201e903a SHA512 0bab55a3d56193c239d6ac09849d40ddfe21593ec0512c56bfbf9916fc5913dcec33ee32f4e40e31af5e276941315b7e9791deaffe4c2fd2b9c537ab2c579a2a
+EBUILD ruamel-yaml-0.17.4.ebuild 1306 BLAKE2B c63cd6753e7d39171aceca54e4f10b8a931b524167eb164d8d21fb786e154f48b51533b2a3f5bfb2357d2dbb5f7992459d878bd1eaf24e23c7e46c99788745c2 SHA512 71ccc3cf41573b25f0d378481c6f5e7684c2749c155520eec6afc37691d4978f9adb8f82d9dd3aeffa6839220b88ce64b3312581500f69643ef35d8bf4a45e99
 MISC metadata.xml 870 BLAKE2B 2cecd06b655552acecc4946c417b1737c120ff9ac0c84dde9ab0dd8f1e6ce7499e9568f7be4ebd9ae4835787739f9acf0e3a0a5475fdbef9327257dbb8529e8f SHA512 7162e297ad95daf7ef9345faa2e698576f440baa5dab43816be924327eadcf04925e02076735ec50f764f13dbfe054640c72d723742af76890f517de95ab3457
diff --git a/dev-python/ruamel-yaml/ruamel-yaml-0.17.4.ebuild b/dev-python/ruamel-yaml/ruamel-yaml-0.17.4.ebuild
index ca4e1f987740..d4bc00ec0843 100644
--- a/dev-python/ruamel-yaml/ruamel-yaml-0.17.4.ebuild
+++ b/dev-python/ruamel-yaml/ruamel-yaml-0.17.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
@@ -20,7 +20,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
 
 RDEPEND="
 	dev-python/namespace-ruamel[${PYTHON_USEDEP}]
diff --git a/dev-python/s3transfer/Manifest b/dev-python/s3transfer/Manifest
index e4c0b84fad64..bda275dc8fd9 100644
--- a/dev-python/s3transfer/Manifest
+++ b/dev-python/s3transfer/Manifest
@@ -1,9 +1,3 @@
-DIST s3transfer-0.3.6.tar.gz 118877 BLAKE2B 0567b69ee71bd470b3b5bccce3db3e923eee6d8744d9e0e5a1789f3ba5f419742859f530ab43295e5ccb7ffe3c04da8db7ef92c973afac97ff2580bc13c6934f SHA512 3bf97f080b63a88f2860051ef9c0ecd4f06adf1a22eb5bd57c543532f7e85c39f722f0c9cd24022ac0ed3a54ca48a089a10b86703cb866730e265e53acbe602f
-DIST s3transfer-0.3.7.tar.gz 120311 BLAKE2B a5de6ce10527495843605ea9e887ccbfead86f32d0eaa2f68dcc21dceb35c86cc21690bd82e3edd5a033699cf4257db93588cf7bbea8f75c01a80c29a17397fb SHA512 b341103e87c092b1c016dc8bfc45b4564c54f5c5a1f3549cf421802620b755d0779b80718a5b4357d3b206b71773fb2b28571730b673fd9af27fc8a3a40ce1b4
-DIST s3transfer-0.4.1.tar.gz 129580 BLAKE2B 5b700fc9b7222b32ea74fa0f2ff59754412e4a65eda028433659861538160cb016e3f97421e237b8050920eaf2609fb0756ffc568331c15b1eb313976df30aac SHA512 1de0569d99bf32b5a3a2c240755d82050f4bf72fd98449e19c2807d21180415edff77b86bfc47d0e8c4952a066c933589862cc08851a7b87b1521e4af7da27f9
 DIST s3transfer-0.4.2.tar.gz 129664 BLAKE2B fb3658efd7a6aa6ba42ca55a1f9efc19671806fa22db7f6f5a30aaf19615863e027cabd472345637fd41f2c0436ad8f6b034f6bdf75187a71d2c6eacdbdee914 SHA512 8dabdc0d233f6edcf35d9fe1a06b6fd5bb5f589f455d6d53ad989c7eb368cefab4fee90e707bb8fa09f2caac6a27e67ee7aa3ada5709be43f2b649302e412efc
-EBUILD s3transfer-0.3.6.ebuild 627 BLAKE2B 0af227d2ef3bf1ee7649d3c2728416b075bdf7389b7db9529ae1b9b2c7eb476e19723899fd6b1bf9db7fdf1754dfb32e344e738d09c1e2392edbc675dbfaefe3 SHA512 a3613f6fdaf014f10901106b3e456374df7bb6d355855f3f45439934c0d0e88b9e9f51e8b4ebecf6df3ed8cd466bedbedf9b9c13d57af882251948cb6480b34c
-EBUILD s3transfer-0.3.7.ebuild 629 BLAKE2B 3c55ebd4b1fdd64f387ba78c14b5f39b757c93e0603d7f6f8e631851fe00440fd2659db1bbe16a804dbf82bbd1784b07d2cda2e06206bc1a24272545b852666f SHA512 51a34516a4f957ef97a0c85b948b32570f330052b89836ab34a2255bbbbfc545a1c523b4c6ec57ef29b7f90ce7821e67dc0fe7374fae422eadcb672575ff2807
-EBUILD s3transfer-0.4.1.ebuild 595 BLAKE2B 7060cc40b793050bc7afa6057b08361db761de53ba5bc66dafd623a6ba218042b06c2933a58606c1aefc76a8c6a2d26175f86876fd5d6b8a01955748b4b8a45a SHA512 a9f7f36796ca1009c0d2178a0fa3e9060b28f11c57124d215c3aaf33c9812092c00eb0465d5e78b40e77f801c7258634a266ba3bba37188dab1da6c54fe406ea
-EBUILD s3transfer-0.4.2.ebuild 595 BLAKE2B 7060cc40b793050bc7afa6057b08361db761de53ba5bc66dafd623a6ba218042b06c2933a58606c1aefc76a8c6a2d26175f86876fd5d6b8a01955748b4b8a45a SHA512 a9f7f36796ca1009c0d2178a0fa3e9060b28f11c57124d215c3aaf33c9812092c00eb0465d5e78b40e77f801c7258634a266ba3bba37188dab1da6c54fe406ea
+EBUILD s3transfer-0.4.2.ebuild 612 BLAKE2B 5ebcee7751809810de963198968fe109148f82d21b23720b7ab3f86ef8526e472954d59d1a3bdef527f7341190a93c8ae0b45c90d9a3bc3adfa2ad591376de22 SHA512 d3823e0f6a842fca71c1e8b69bad5b7ae3ce679babfba8553eaee4fb018ab581a003000223e6e8f05cc589ea6762257ab0dd6d95e5b668050cceb245932c5b78
 MISC metadata.xml 502 BLAKE2B 36893006073506d27c6f9c13e6b823e251906bd046a297c36373a2132ef809ad0babc4819122f89ce5b26e7c0ef1c410924594a27ff32c911c3c519cfd722889 SHA512 855d52af629703d3f31e35c16723220b26f45f977e131e41fe4a1ae9a98fb18a60fd89315a59c3f7d436d17a469ba8101e79d859d6968e627d423ef26894ab24
diff --git a/dev-python/s3transfer/s3transfer-0.3.6.ebuild b/dev-python/s3transfer/s3transfer-0.3.6.ebuild
deleted file mode 100644
index cffe8ad9dabb..000000000000
--- a/dev-python/s3transfer/s3transfer-0.3.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests/{unit,functional}
-}
diff --git a/dev-python/s3transfer/s3transfer-0.3.7.ebuild b/dev-python/s3transfer/s3transfer-0.3.7.ebuild
deleted file mode 100644
index 48ca166b1782..000000000000
--- a/dev-python/s3transfer/s3transfer-0.3.7.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests/{unit,functional}
-}
diff --git a/dev-python/s3transfer/s3transfer-0.4.1.ebuild b/dev-python/s3transfer/s3transfer-0.4.1.ebuild
deleted file mode 100644
index f64a2ccad3b5..000000000000
--- a/dev-python/s3transfer/s3transfer-0.4.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="An Amazon S3 Transfer Manager"
-HOMEPAGE="https://github.com/boto/s3transfer"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	dev-python/botocore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	epytest tests/{unit,functional}
-}
diff --git a/dev-python/s3transfer/s3transfer-0.4.2.ebuild b/dev-python/s3transfer/s3transfer-0.4.2.ebuild
index f64a2ccad3b5..667e731d3da4 100644
--- a/dev-python/s3transfer/s3transfer-0.4.2.ebuild
+++ b/dev-python/s3transfer/s3transfer-0.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/botocore[${PYTHON_USEDEP}]
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index 5683fd6e19e3..484c18b89ae2 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,3 +1,3 @@
 DIST sabyenc-4.0.2.tar.gz 19579235 BLAKE2B 26af61a979f94b954a6fb7fa425ca07a8d757fb16c9d434e9a1e0019d84d156b527e9309cc65113fef64dd3f2afb92b46619dc9506327273f2ba7822337e9ccf SHA512 88e8b47b1438ca55b51dbf8a407c33ec335f0604abf8a3dcbc45853b6dadadf9932d97cf3f0adabd71a9405e2deaeff2777483d9ea692c9d3cbab99dfbfbc901
-EBUILD sabyenc-4.0.2.ebuild 601 BLAKE2B 5fdf140a408db9501cced444e50de5f22cc57edb2f0a3b88533bcc101b3081f34122736d3d70399f8bcbcc244d766223dc4cf86ee18b9b06630bc197718823b0 SHA512 3ae82984a58dff489e74f755e56a08a3e1883c6f2be657fe5b8e29b942314dfab4919790e2849392727f29338dc250db9c1418691d0cde05d9e9e353c39a9e8e
+EBUILD sabyenc-4.0.2.ebuild 600 BLAKE2B 163df3975de786717c2ec506a0f69092d92eb911b1bc82315caa5e16b80c793d6788d553b1cae1e9e44f5edb6613eae779b072355fcb0fdd7bde8b02f57758f0 SHA512 ce8fa14276e2bf832f487ae6945457dae370e1092ed9d9c239e4c282c015753d026bc286cec810cb5ca8b859686b5333ffeaf1ba3b0ac6b1052a757c6bb15b80
 MISC metadata.xml 321 BLAKE2B c51c541a4a9c9a0ae6598c26e7c059d6d9050de0d8c7ba68c9a35d8cb069b13d7b2e48646551d860f77972d4ac0c6dd79b00d1345b25bda8ea55de0dd3120b97 SHA512 df9b13eac881f526ac945f03e7125ffde964e9b250b1188b2cf04a58eba33a25387635542e7fdd8f6843c3e1b3c6a1eaf764a5da8850d2480320a3b16a81538c
diff --git a/dev-python/sabyenc/sabyenc-4.0.2.ebuild b/dev-python/sabyenc/sabyenc-4.0.2.ebuild
index 16767162d48f..f777975da68e 100644
--- a/dev-python/sabyenc/sabyenc-4.0.2.ebuild
+++ b/dev-python/sabyenc/sabyenc-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/sabnzbd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/scripttest/Manifest b/dev-python/scripttest/Manifest
index 5e297920a5e0..e2a38757e037 100644
--- a/dev-python/scripttest/Manifest
+++ b/dev-python/scripttest/Manifest
@@ -1,3 +1,3 @@
 DIST scripttest-1.3.0.tar.gz 14885 BLAKE2B 1984bb175b49248bd369d2d2ed6f70051113285b6870bce67e0c2203d29b4c5b2735fa96dfef7ee11aa38db74e9beb026bbc946c8549b2810f6b90e896bcae0e SHA512 038bfb1726bff85b6e3675be51db829d3519b47665266f6ae1d3c5c6f4f06e7b16742262ca1ba240544e9bd39ae96c1be0bd5e8583736f72bb04241a1bb8acf6
-EBUILD scripttest-1.3.0-r1.ebuild 557 BLAKE2B af02ace0c3ee2c841be0945d7699b154936007f25bff0a81441ba7964fdf2efdf7360c4f1cfbae2f5712dbaa389d66a9d6a3ba8ecf6d7a73253b857bb0c8845c SHA512 323e7b07bf79ebe5076f0d1be833365c3d8a9ff79131b4e426fed719d297bf8413dbc7e925dd7563cdcf5388fd7d62fa885372d5f1125f32ffa1faab86c14502
+EBUILD scripttest-1.3.0-r1.ebuild 557 BLAKE2B 8eefb1e2fc017f77157c2c791e0d35a4183f05b4bd344112b7b5365f2bedae0e7a5e943ddfee7568fe5b84ba404bd73fc5188ae896999a51adf84e0a4002fc27 SHA512 2edc7102006a4374b0bd7b3adced7a136eafe57b76fa88e124628217ff2ff499dc2e47f1524c4e3fed67d0088300c9ed4f3569a15e4bfa57d731c0d0e553f153
 MISC metadata.xml 368 BLAKE2B a456fc4f5ab5fff862ad4a9a0df4839f98e410d705d6cb13cbff433122f9d9ee574ce3b62b5e1f893041971c5e26c3a4e5c71a67e4b51091fed6d4622e8b5009 SHA512 e0145c39362c5e51095647bb3d085be3b4c9177d55e8c0c6245dd6d144cac9eaec571667300a406271bcf503c991f8e242c4ed6eb278ef1b28b7bdf08e823114
diff --git a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
index 18da79f835a6..41ea10b85749 100644
--- a/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
+++ b/dev-python/scripttest/scripttest-1.3.0-r1.ebuild
@@ -1,8 +1,8 @@
-# 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} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
diff --git a/dev-python/selenium/Manifest b/dev-python/selenium/Manifest
index 625efd4059c6..44c80a64e68d 100644
--- a/dev-python/selenium/Manifest
+++ b/dev-python/selenium/Manifest
@@ -1,4 +1,4 @@
 DIST selenium-3.141.0.gh.tar.gz 155705874 BLAKE2B f75eec80e6caa86744092020abaeef56defcfac8278dd3fd605c29d6860c1c046956c7599164ba1b4682f20dfa997f5a942d83f7ad707b052ad3ca98c0800527 SHA512 add14d426c5b929901cd71104460c7ceaacf46374b46898254dc2e2602f4a9a370199da603e3f35375c0f297d6fc2fda00c9ce2ede9d5b893b072e0487883df2
 DIST selenium-3.141.0.tar.gz 854669 BLAKE2B 621f4ab03bf85718b50099fdf10cdfadaf326bc7d9c9f1676a2a20e3ad23bede7884d8017b98bc6ebc314c6a4221c7668628d2d1888f36350c95eed1d82acee7 SHA512 3d2afbe9e96f88e9c055a89786b5090af387d3feba4598577b70fd3e0b20c2c09c4b25af920c654f52ec7e34f23181e6d278ac05f1a1f960d2d371ce7a6b82d8
-EBUILD selenium-3.141.0-r1.ebuild 1181 BLAKE2B 9e02a73c6444db65a4fe863bf24bdb745f2dab8ec3cd0b6f0ab9c24f24e09adbe7d5f275eea6699af0b5661ba44f9fdf894dd486e63215790fa36bf5eefa4565 SHA512 b3d848ce08897cec35372d21e3b241a1d2a49253064bc13d5714ff71479c6a6b24d7b8fecf9eef152c00be09a0198f77d6c66e94639996df4a71361ef4461304
+EBUILD selenium-3.141.0-r1.ebuild 1182 BLAKE2B 76c8523ce8bf9a35db18de899911649fac1b0ff72f5c1ecdcd46cc3363bd1609ea37c49eb682c9d3a29f3ae9c634bfd72629c21226e9002aa4944a2ea4aa29fd SHA512 3f4c16a4d34ef67ae0cf7b717a26e2b73d6dfc22721b294665a7e79174e3c7d73a0d98cbf7adc618c60c305bc0f1f17b21506ffa15734402562672dff72a1718
 MISC metadata.xml 407 BLAKE2B bfe4e5bb0922077a763a2227f8fcbd4465cf2dcc5c4e2acbc4c91bf0f90d8750c63691880338508b506fdd333ab9f858011a754089586606eead6c39c14c71ee SHA512 1fc7ba2ae78e2ef6f7dfc35d1c42120eb32a6ee9a8f15c698bdae133c7a242cc051df8321fc20f4f2a76abc7bc303b8439fd480e60d4264250a02a85c5c3768b
diff --git a/dev-python/selenium/selenium-3.141.0-r1.ebuild b/dev-python/selenium/selenium-3.141.0-r1.ebuild
index dc9a929bc9ea..76ca040188e8 100644
--- a/dev-python/selenium/selenium-3.141.0-r1.ebuild
+++ b/dev-python/selenium/selenium-3.141.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/semantic_version/Manifest b/dev-python/semantic_version/Manifest
index cc169ccc1d1d..548161ca79e5 100644
--- a/dev-python/semantic_version/Manifest
+++ b/dev-python/semantic_version/Manifest
@@ -1,3 +1,3 @@
 DIST semantic_version-2.8.5.tar.gz 50009 BLAKE2B 5f966ca68358d4963b3a41574c100a8f78275445285aebbfa47d1febb0b7a2eb3a638254d4d1bd8e093acbef47a101ef0a0d7a86475313aefa211d2a0a3cfc19 SHA512 2ab59024c148239d78de062ff3a357f81a33fd066b6be8b6f9ef0753841a4945829b1c11899cfbda6c3ff09e00aa3b689e1fb6f8b9a92bbb3c2a62dd713b6049
-EBUILD semantic_version-2.8.5.ebuild 620 BLAKE2B 1177679b2dffc0abfc6f905a3bff7b02f2ef58c05d93e8c95cf7d78bf45ed5c7fc7893a5645b8c1d5c8f6be1303f6c6d08887c303baf46f693cd6ea4dc4fcaf3 SHA512 cc7722b3ea65285cea5563e9788e7f0f65d875ff03379b16b3e043973f9cbcf307cd9d8f4aaa691f018779dca8cdc81866139336c38c4e927cd7664377e59ead
+EBUILD semantic_version-2.8.5.ebuild 656 BLAKE2B e5ae83f662dde112fa116112efa3b4ae361bb7e93ab1582135f0c5f98bcf3479af1c8501fca414dd1c337854dabe60c493a0def6346f66eca305017ae5a24c12 SHA512 fead3f4a09c45f74ebc00f1f69d4d8c0ca9c132c6f9a1f0a2e6f9a181486d9d31478a2a4b2e4b5ef608388f9fbf5aff86e631c0b06b82f2aab23407755c4a67c
 MISC metadata.xml 819 BLAKE2B 3b85ef79ccc81d2c8a07e28697fef8e0eac70d9711b49bb194f9708ab5d734982d09fdebfb29174d8c9b0b8fe650641a07847e844182b5f78474f94844e182e7 SHA512 214c06da33a967f4ef3f8046dd88232f3916c59f5d220458b01151fa8db83cf1af889e02b2583281ea465de756c235766153ea2d5cc3a9dc39f5ea38fc8ba4da
diff --git a/dev-python/semantic_version/semantic_version-2.8.5.ebuild b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
index fef6b2c02385..3686723332e8 100644
--- a/dev-python/semantic_version/semantic_version-2.8.5.ebuild
+++ b/dev-python/semantic_version/semantic_version-2.8.5.ebuild
@@ -3,11 +3,11 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python library providing a few tools handling SemVer in Python"
-HOMEPAGE="https://pypi.org/project/semantic_version/"
+HOMEPAGE="https://pypi.org/project/semantic-version/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 #SRC_URI="https://github.com/rbarrois/python-semanticversion/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -18,3 +18,7 @@ KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~sparc x86"
 distutils_enable_sphinx docs \
 	dev-python/sphinx_rtd_theme
 distutils_enable_tests pytest
+
+python_test() {
+	epytest -p no:django
+}
diff --git a/dev-python/service_identity/Manifest b/dev-python/service_identity/Manifest
index 639fe79a8310..e9d3a0f770ca 100644
--- a/dev-python/service_identity/Manifest
+++ b/dev-python/service_identity/Manifest
@@ -1,5 +1,5 @@
 DIST service_identity-18.1.0.gh.tar.gz 34252 BLAKE2B 18823e6b8ca9444591f063b4835362522e3ae374cd669f2da299389fa2977f42e0a1d715b35d90e9518bdd8ac8c76e0adf4e121e85e2352de78e621d5f1e6259 SHA512 6b6da48c543bfbe0d9da9f0d03dbd735ce97e64a76cbf9eae2b615ced7b91c5fcca1f25353e53858c48da9c4e0c0be4e33fa4559adb50899a79689cbb372f49b
 DIST service_identity-21.1.0.gh.tar.gz 35326 BLAKE2B c6c985db990f9a93b2954a596817b476e178fd5949a683aebe7506e56ed90a19f872f6c5caa5a7219c162cfd43924e0a3cdb36a666aca01b28736f0927ae72b2 SHA512 6375bc5e8329118b2beb163ffffecc1479839e4e98173576e4737deebcc4c057ac357315976d3f53a280defd4e2c1f6b74e9604ec1aa94144240c2fb4bf07461
 EBUILD service_identity-18.1.0-r1.ebuild 825 BLAKE2B 74491dfc2fdcd3fbede8553fb8207c77a2a0212f734b9233f22f394476859eea1ae57fc938c5e7eb1dae391d24397d486b62f6f564730a0f7bf73696238df8e5 SHA512 c17a07e522beceaeb8c77c95d5f9b027db83cb5a41b8354769a34a161888fcda4ab426e5bf86148407e0613679350a1d5dd2b4a274f38921480cb8f880723f83
-EBUILD service_identity-21.1.0.ebuild 875 BLAKE2B eab74a4392eb3c3ae1d824512c5d4272d5f38ae7ec522b8aea238e8d56c92560a6f601573b389f8713c1e30aadf9ff848a30313605937d8e7e998c2e2fff702a SHA512 8f91034f1cc7bf01b62f4d3aa3356636621689d2f3a173ac254eaa67a04c74881e9aac075f5c13c57edfeb7fa086212ec977a6a8c04dd1d3cef9324248bc237b
+EBUILD service_identity-21.1.0.ebuild 847 BLAKE2B 81253821b4cbf0f0fc3e80628c1bbba30e39d4b2c62a54b12da8a8d6dfa9bd23061445dd660ba0211e2938c1927da212f08e9044cf80af66d7fccd54052e748e SHA512 3acec85bb1a7bc518b353ba621abfc3c09d73cbdff19ff29b192717417ecc2ec7e5ed100ca568dd998439f5f7bfc0320da98fc1fa174fbd70f81bcb4b12bea7c
 MISC metadata.xml 404 BLAKE2B d45422863a9c34f5c0430c100a54dbe9f10ae3b7457851881c6b3910c96a7da95070f0140ce6c6a2bcb3da0fcf5c19b57e182744d0cf1699a9e92cf5809c418e SHA512 899b8ed9ac3c78c2aaa16afef8c795b3e561744e8bab31519a54795c9ea412ebe828f73cd0e27d32cd4f401b70464252c80d78540cc8ad2884c81b662a29a4da
diff --git a/dev-python/service_identity/service_identity-21.1.0.ebuild b/dev-python/service_identity/service_identity-21.1.0.ebuild
index 37e61b27093b..e7d0c7f9482d 100644
--- a/dev-python/service_identity/service_identity-21.1.0.ebuild
+++ b/dev-python/service_identity/service_identity-21.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -24,5 +24,4 @@ RDEPEND="
 	>=dev-python/attrs-19.1.0[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
 
-distutils_enable_sphinx docs
 distutils_enable_tests pytest
diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest
index 5bca8b937370..2b38ff33e132 100644
--- a/dev-python/setuptools/Manifest
+++ b/dev-python/setuptools/Manifest
@@ -1,11 +1,5 @@
-DIST setuptools-53.1.0.tar.gz 2051159 BLAKE2B f4148df45f5c62acd6acae833619dcae50f131da91ece1a2e1231620d4800294f14dab6c72ca5b2ffd31191c4e3306a869abdba349adcec5746600fc067b340d SHA512 0ca02e9b997623268d8f73b73ee6a4b1ad513802cbc75c74124a85bd5ca7bfaea5cf7cccb706334c0dac2c8a0674a5bc2cea10f44f99f881ad893c8337af3da2
-DIST setuptools-54.2.0.tar.gz 2054279 BLAKE2B 2a52e76808fb2bc6df4c59ac7476a9386401180ff6c0d52a5f3d87aedf976a3057cfa0a7ddf2a4497c4c1552d5ebe4810c4bbfa127e1293f950054bddbf7d835 SHA512 b18cd075cf59b8648611eef1874de41199ede6ffe6d7f5047586c6ac8783fe18b9a4f537783e590e7aec127033f612b93925e92f039bd6416a609fcfb262e354
 DIST setuptools-56.0.0.tar.gz 2054762 BLAKE2B 3fc0f47304109f765ff0f8430dae735005d508aaa79609c5ca08217eb3802014267bd0f1a4f4678b417143f0d22b4b27f166573e41685229e0d4491b1789713d SHA512 951d43a0192b9dddacd7bd7ff6b76e281c14071771096db3c413fde6ea67b0c534f17a770cb3464cd3a6a4e8145b82f4cf5c0228e76e6f2cefe88d33748816e9
-DIST setuptools-56.1.0.tar.gz 2109659 BLAKE2B 2538391c7ee135f12550da9bb7c110aedcc1480616260195f3f8fc8b8a650651f5bb1f0244832801f897381a8663fc88e2b3840101c560595844af5b192259a2 SHA512 e490c61b4453678339ed3222b4ff39f218fdf515f6de0079b7e4343bf2e1a74a0c8d2f2c9108f462986cf06bc940f260bce29c3f61cc9e0c88471914de345ef1
 DIST setuptools-56.2.0.tar.gz 2110133 BLAKE2B 90c75ba006becc9f564eecd7d46a9ce70c9ad17eacf2e17b3551116b962e08af0084919fccc18ec29a54b98e8fe2419d129554a7b38fdd1104f472fb2e6f9995 SHA512 858d46909335ff0b0441d5860788803100a8fe9f5a1d1f17353bf961bc77191c3237501c1838fdb6ec8e4b2c66874ffd4e8342b42cc2673cb866706660704ea6
-EBUILD setuptools-53.1.0.ebuild 2126 BLAKE2B ef2d14c8674ce19ca5c5ca8ddd1c2a85737ba65692d2f5f2f1a83f940580d21407bcb312e34e4f2903596b35a741b246a934be0c60d6624f9888807e9cff411f SHA512 7852690b68bc1c0a3bd0ccf31183b03a24fb701a7ddb664e9eba4bd9f8ae5a0e7707ccc938b80495dd7a42777c30cbe871ba8135ac2f69f78e32dfe1f9c18c4a
-EBUILD setuptools-54.2.0.ebuild 2234 BLAKE2B e9be044cf2882dea07a492272603aca716dc34c6220b302f12b71e434981c22ccdffb8b12a70710d40d56d81fcb280ea8df27aa0f5a7ae9866d9688929355764 SHA512 d1e99281df4184ced7f1d49e9cbbaca1c148ba8aa4b6602ca992dc49583fca67a056e7b8b1264c7ec88d3e93f355b87ce9bc6e1fbc168374553176a91e577797
-EBUILD setuptools-56.0.0.ebuild 2241 BLAKE2B 8e58e2acc3cc8d6d2b3b8fe16ee3915e5bbabbdc08f4ba23c73af7455ee18c6ad1e462191a95b48d3652554969fd21bd960ab23a4ef7e0398d7c6cfd2ca1f055 SHA512 11a118d499b3b36e503c448022cfb7e67a36b727015d060fcbfd300eb526336ee8fc13cf63150425dbd26f88b4c60bcebb3b326f7723cb3c4d09c0db94fdf06a
-EBUILD setuptools-56.1.0.ebuild 2378 BLAKE2B bcc6c25e806a7a6ee4ea027e0640da346aaa0ba471917e31947b986b521f73603c7911d9f2c71a0cd764380aa1f4948ecba9fb50401f35a6902d6526eb0aa0fe SHA512 04060ee892a68f26f6561bd88c80c815e67ac55056f20df4bc9dc1f1cfb95f5fec58b6281cf31a527af2390ddb74a0c46134311c58c3777f5f5abfbe2a14faa8
-EBUILD setuptools-56.2.0.ebuild 2378 BLAKE2B bcc6c25e806a7a6ee4ea027e0640da346aaa0ba471917e31947b986b521f73603c7911d9f2c71a0cd764380aa1f4948ecba9fb50401f35a6902d6526eb0aa0fe SHA512 04060ee892a68f26f6561bd88c80c815e67ac55056f20df4bc9dc1f1cfb95f5fec58b6281cf31a527af2390ddb74a0c46134311c58c3777f5f5abfbe2a14faa8
+EBUILD setuptools-56.0.0.ebuild 2233 BLAKE2B 0474e7ac4c8f4f74f05eb031143a29342f0cec87c89603552142ae87daa053c3f6ee6301cb4a09eed078272448c9a754e3f7ee4bd4493bfaf96b35f9c9b28262 SHA512 677933aa3cf01c60a686229349bbce6f9d1d937e2fbc25b508c78005ec335e875ce9922ead6ccb3418f30b577a6077a5bab9ea4d91bb99880f29ed4c53557101
+EBUILD setuptools-56.2.0.ebuild 2384 BLAKE2B cdb6906701bc92333c56ae2848132dd46ea276304083a7f15bcbb58731dd9f03c9952b1f80ee55bd7490ff60644c86dc9c3e23503db588b4bb3adfe936388c62 SHA512 4f17b9ef8252f8301595512a2bac69837e84fbc68895f9f22d0f859dc673b2805386e06c115e1bc7c421b72927a00a281b1293a217948fb993877b586c78a4cf
 MISC metadata.xml 468 BLAKE2B 7acca7f204485279233a4ccd34d76661954e2f995cf82bd178f1dac0d9825b073dea76e734aa7625d036813d658e1dd7a5acd408b79b6841540bde62644ddd47 SHA512 c8215fadf291dc1cf8df2f1d8931f5f70657fc6c37fd105426d03f3e4b19963fe93ec4b76107aef5c2f9bf6fe5ce123fcd48519bf942ce8cbbc0c5f2678e1de6
diff --git a/dev-python/setuptools/setuptools-53.1.0.ebuild b/dev-python/setuptools/setuptools-53.1.0.ebuild
deleted file mode 100644
index c104805cb434..000000000000
--- a/dev-python/setuptools/setuptools-53.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-python_test() {
-	distutils_install_for_testing --via-root
-	local deselect=(
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# this one's unhappy about pytest-xdist but one test is not worth
-		# losing the speed gain
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
-	)
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		setuptools || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-54.2.0.ebuild b/dev-python/setuptools/setuptools-54.2.0.ebuild
deleted file mode 100644
index 75f073153dbb..000000000000
--- a/dev-python/setuptools/setuptools-54.2.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc ~x86 ~x64-macos"
-
-BDEPEND="
-	test? (
-		dev-python/jaraco-envs[${PYTHON_USEDEP}]
-		>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-		dev-python/pip[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-		dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-		dev-python/wheel[${PYTHON_USEDEP}]
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	dev-python/setuptools_scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-python_test() {
-	distutils_install_for_testing --via-root
-	local deselect=(
-		# network
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_distutils_adoption.py
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-		# this one's unhappy about pytest-xdist but one test is not worth
-		# losing the speed gain
-		setuptools/tests/test_build_meta.py::TestBuildMetaBackend::test_build_sdist_relative_path_import
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" pytest -vv ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		setuptools || die "Tests failed under ${EPYTHON}"
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-56.0.0.ebuild b/dev-python/setuptools/setuptools-56.0.0.ebuild
index 893b46224b3f..eb7a4adbdae9 100644
--- a/dev-python/setuptools/setuptools-56.0.0.ebuild
+++ b/dev-python/setuptools/setuptools-56.0.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/setuptools/setuptools-56.1.0.ebuild b/dev-python/setuptools/setuptools-56.1.0.ebuild
deleted file mode 100644
index d47acafe9ddc..000000000000
--- a/dev-python/setuptools/setuptools-56.1.0.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-# Set to 'manual' to avoid triggering install QA check
-DISTUTILS_USE_SETUPTOOLS=manual
-PYTHON_COMPAT=( python3_{7..10} pypy3 )
-PYTHON_REQ_USE="xml(+)"
-
-inherit distutils-r1 multiprocessing
-
-DESCRIPTION="Collection of extensions to Distutils"
-HOMEPAGE="https://github.com/pypa/setuptools https://pypi.org/project/setuptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/jaraco-envs[${PYTHON_USEDEP}]
-			>=dev-python/jaraco-path-3.2.0[${PYTHON_USEDEP}]
-			dev-python/mock[${PYTHON_USEDEP}]
-			dev-python/pip[${PYTHON_USEDEP}]
-			dev-python/sphinx[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-fixture-config[${PYTHON_USEDEP}]
-			dev-python/pytest-virtualenv[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-			>=dev-python/virtualenv-20[${PYTHON_USEDEP}]
-			dev-python/wheel[${PYTHON_USEDEP}]
-		' python3_{7..9} pypy3)
-	)
-"
-PDEPEND="
-	>=dev-python/certifi-2016.9.26[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/setuptools_scm[${PYTHON_USEDEP}]
-	' python3_{7..9} pypy3)"
-
-# Force in-source build because build system modifies sources.
-DISTUTILS_IN_SOURCE_BUILD=1
-
-DOCS=( {CHANGES,README}.rst )
-
-python_test() {
-	# temporarily skipped, until we port all test deps
-	[[ ${EPYTHON} == python3.10 ]] && continue
-
-	distutils_install_for_testing --via-root
-	local deselect=(
-		# network
-		'setuptools/tests/test_virtualenv.py::test_pip_upgrade_from_source[None]'
-		setuptools/tests/test_distutils_adoption.py
-		# TODO
-		setuptools/tests/test_easy_install.py::TestSetupRequires::test_setup_requires_with_allow_hosts
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		setuptools/tests/test_develop.py::TestDevelop::test_2to3_user_mode
-	)
-
-	# test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg
-	# It tries to sandbox the test in a tempdir
-	HOME="${PWD}" epytest ${deselect[@]/#/--deselect } \
-		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		setuptools
-}
-
-python_install() {
-	export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1
-	distutils-r1_python_install
-}
diff --git a/dev-python/setuptools/setuptools-56.2.0.ebuild b/dev-python/setuptools/setuptools-56.2.0.ebuild
index d47acafe9ddc..77c8325733a5 100644
--- a/dev-python/setuptools/setuptools-56.2.0.ebuild
+++ b/dev-python/setuptools/setuptools-56.2.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/setuptools_scm/Manifest b/dev-python/setuptools_scm/Manifest
index db02a5e58f21..f5e797d933b5 100644
--- a/dev-python/setuptools_scm/Manifest
+++ b/dev-python/setuptools_scm/Manifest
@@ -1,3 +1,3 @@
 DIST setuptools_scm-6.0.1.tar.gz 51433 BLAKE2B 7045eec0c1a43d6c93c94e0b2799f0d000cda509fa0df9ee9a638b95383f07fe430b07c3bf72fdc4809563ac289521976956f728a4b2984921fa31532bb7ed8b SHA512 db27653c57f674ec62689247680adace3779216249f1b09a35e8a0233a1ec1acb9ae89b52acd439f7062da2ba1a45b8c0d6d81333ddda0764447c30698ddb314
-EBUILD setuptools_scm-6.0.1.ebuild 1059 BLAKE2B 869ecb3530c687b1cc0a37993e79e56b58e1e9b5c78be8baf94646fdc42d9c810e5f155463d587968c337d4c327d96c07ae343ac70d21ce55792d01887cd37f9 SHA512 a33883079e2d2a42fafe7e9ca2709b30344088145da9962b9867bbda5b6d86437069f64a9e5049c42ddfb5e13958517d1f4f65e13d8eefb80975294f7460f034
+EBUILD setuptools_scm-6.0.1-r1.ebuild 1067 BLAKE2B 0665dfce5bb244b6baedf1514aacff35414e754b171b5c66a28bbda754e528413ec31e3e08317be32cd6babbfff921609d1b90aea20503b521853407a17d1161 SHA512 668b85064465587e84f3b684f8ccb5ca0e54a99fc784a6bc7630c6bf17824a3d0ad870118dd7aad426d628df6fcdfc4a8ebaaa1821973081a2661fb61b071b01
 MISC metadata.xml 400 BLAKE2B c588c18ca5fef828f93a70bb799701725aeadea660b06cf1b61fc96c65e6dd25784901a36778d6f972e1aa9d6075a238fdfcdf8ec8a44b86f0e2852608c52186 SHA512 75b27d43cc0fc4dc74179f9b64c562ec80113354a59e6a8a440535e62d5119d20614c7c0e905c42966da839e149b4c7b79e894643a069dbaa45102b6ace5f07d
diff --git a/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild b/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
index 7d72f211f029..c1bd0098b538 100644
--- a/dev-python/setuptools_scm/setuptools_scm-6.0.1.ebuild
+++ b/dev-python/setuptools_scm/setuptools_scm-6.0.1-r1.ebuild
@@ -18,10 +18,10 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
+RDEPEND="dev-python/toml[${PYTHON_USEDEP}]"
 BDEPEND="
 	!!<dev-python/setuptools_scm-2
 	test? (
-		dev-python/toml[${PYTHON_USEDEP}]
 		dev-vcs/git
 		!sparc? ( dev-vcs/mercurial ) )"
 
diff --git a/dev-python/sh/Manifest b/dev-python/sh/Manifest
index 64e5174ed72c..3a31caa678cf 100644
--- a/dev-python/sh/Manifest
+++ b/dev-python/sh/Manifest
@@ -1,5 +1,7 @@
 AUX sh-1.12.14-skip-unreliable-test.patch 317 BLAKE2B 3c45673daeec13cbdf851dd97061df85c41783a1b5d760d9d45386b8b4e3f88e25e3f98cbdbce44796e5803614d5474444e554d305089d098fab2cb07075cf71 SHA512 6adc7fd1e2a9f52804272bba1d83eddd6db82b4b67569fc75d169794a19c505d51fd53c949eaabdeb775119a5e3929902c2bbf3883ed299b2de0e4faad597835
 AUX sh-1.14.0-skip-unreliable-test.patch 237 BLAKE2B 55b600d9426f127704cb698bb4df90b103b0ee08d29165f4d45e3fa56f1c0e20d3ab63b404cfa8d2bc372549a77474a2396903081c606516837ff295990eb47d SHA512 632f195df6a85cd65890d093400f4fed099c2344fe4e7f9d46f3decd817405ea587a18b271da3449088cc23519b5f16b30a2030a81d3bfcee30d4d55c591d5fe
 DIST sh-1.14.1.tar.gz 63317 BLAKE2B e4439a54d4bf2c106ae5217b55d6fa19f2bc369fb63e8515954a017fd2e98eca88fce07ea3efa70b3c427826bec657aa75c057a09c88de76c1595ef89465ee32 SHA512 9a4d9b841e81ae465b036f3fbf5e8ca277b090ffada660b17e9c2c457e09f7dbb0038b687fc0c0f4a6d575a55deb451c572a60f92f8c8d18ea65d6d902abb9b4
+DIST sh-1.14.2.tar.gz 63779 BLAKE2B adc9004334a53f3704e22c318df6b4f60fd9ca2d31f5a9601f84abfaf0fe2ded06938b165e10b1a977ed38fcad7d0fa08799f2f552fc2c6b9b4c2a6476477115 SHA512 b7917504ae85606e1986b681274077777ad3011639bfe933d4133c3ed16f930842e03b572caa396ca4d58f41fd5594bef776cc16c4b0fbd1242e57c6aad19e62
 EBUILD sh-1.14.1.ebuild 581 BLAKE2B 969a5b1c3cac88573a3173f8b0c701fa269a4377160ef84708ec87ef27706a583a2356f03fdc179fe23db4ef032981a01da254aa59254230fc7b77f2facf6c0b SHA512 8485ac067a2d5670af7da3d5a057896775462f9afc0990e9a0cf612360113f542493537561b5503bafc9d13ff00388d64e8d4573346aedbce76a2fd3ef52f98e
+EBUILD sh-1.14.2.ebuild 584 BLAKE2B c93cd7caa2f4d5aedcaa5df491b99c317257ccfac29668224ad9132d91d84350a3feda63dc34c97d3c234a893806cd49d9a4a0397243ddb8d131ae28bf214fc2 SHA512 d273225834f7fc5401bcd115c0734a8e62fb2b0531d299bbbd33c0930e3986bd4c97c522186f85eea80a410ae5d1efa304696ada1e6ab9680b0192d029ecc6f5
 MISC metadata.xml 700 BLAKE2B b28a6dcf657471c09605d90f1dd4ebe20d793939d3fe4efbec1365d8ad9deb93b93fb7d2686c77e05f03421f5914d44694f8828d54cb72d48f15f50c35b92aba SHA512 64fa8aad2743f7ebdb43475c3528a214ec2d2fc27a9147ec33fda61c97d5a08efb8d9d0786a34d16a0a5da34005654c75475dee62c46db9932b73ac4747c18cd
diff --git a/dev-python/sh/sh-1.14.2.ebuild b/dev-python/sh/sh-1.14.2.ebuild
new file mode 100644
index 000000000000..a8a1c5f8050d
--- /dev/null
+++ b/dev-python/sh/sh-1.14.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python subprocess interface"
+HOMEPAGE="https://github.com/amoffat/sh"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+PATCHES=(
+	"${FILESDIR}/sh-1.12.14-skip-unreliable-test.patch"
+	"${FILESDIR}/sh-1.14.0-skip-unreliable-test.patch"
+)
+
+python_test() {
+	"${EPYTHON}" test.py || die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/shiboken2/Manifest b/dev-python/shiboken2/Manifest
index 77af7794f71b..c5f475901c7a 100644
--- a/dev-python/shiboken2/Manifest
+++ b/dev-python/shiboken2/Manifest
@@ -1,3 +1,3 @@
 DIST pyside-setup-opensource-src-5.15.1.tar.xz 3454052 BLAKE2B c7190dff493434064976a4604fb5858d2e20c1b98098ccd6e5c4c69d0b67ae9f4bf970e2ab42b634208ea96aab31b21f3dfb5f18fddd0bdaab655bba729e4449 SHA512 f14c7037367799005fff73d9fc8e7998db1895700911adf34dfabdeb4db486c7b28ba2afb3eaee37c58f4099b00e4a86917b8f7d85f274026bddfc090658b306
-EBUILD shiboken2-5.15.1.ebuild 6590 BLAKE2B caa058237017765580880dd24db76d40b8ed13dc542cf17d898d93d3947f3f3861ddb374408e98a71dd487819fcd599521d50b652896255c10e21c0c5f974792 SHA512 de86026e324693c2ff2fb2f8ad47be115663d38531490aea0974cd73c396172c768bc4fd9d2a192fbfcea71228fd0b7ecf3cc55f19530fbeaef2195d11f9a9cd
+EBUILD shiboken2-5.15.1.ebuild 6589 BLAKE2B 160086d42bce0eb41e18d7d78266a79a0906902ade94af70ac390650cbb2b9246ec529bda412079f63b90855539b56a8dcb9535fac06f082773a6369508901c6 SHA512 1fe97a6e1ab2594fa74a56d2b3fcb56be55cde252a1244f045c5e9f300f5d7846a6c8d9127ba6a1731b3a6404a8ba7203833d7df5436e6ce356a1591acf85569
 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.ebuild
index a7bf10d4fbf2..296f05b0387e 100644
--- a/dev-python/shiboken2/shiboken2-5.15.1.ebuild
+++ b/dev-python/shiboken2/shiboken2-5.15.1.ebuild
@@ -28,7 +28,7 @@ SRC_URI="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${
 # 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}"
 
diff --git a/dev-python/smartypants/Manifest b/dev-python/smartypants/Manifest
index 4de50f648bd4..3b7ff482a580 100644
--- a/dev-python/smartypants/Manifest
+++ b/dev-python/smartypants/Manifest
@@ -1,4 +1,4 @@
 DIST smartypants-2.0.1.tar.gz 24152 BLAKE2B 258c9692eec675054dc31f760cf3a9fc3995683d7a15fc549fb390611761c0b09f73e077f5917f9f071a8fc1ae3f06e36f745fdc0e2c368f465e29f6ce51457f SHA512 d47a866a5478c3520251f87a93a468a5eea10318b24b2e8d4bc918d533b5a5789aa56d3a8d5fb8ccff9572fb63e5b6f2eafc44f93fb57a19e6621ebef5d64d9d
-EBUILD smartypants-2.0.1.ebuild 725 BLAKE2B 0e6f6b7fb3a55b1264a0d40690b16dce27a2b491ac0b2eecc86dc555bad5778c2e6d5cf7d6200ecaf97e0fbb94794edd04ad799e7843c0179b466692aecd30de SHA512 22eb2c2a18fb34719494ecd941596e317c02e648f834f6846932a5483de1b7ad566e74fb09394360ad254c35945f7c56d754434eb51d63b6be14f5c0e1a1d5ea
-EBUILD smartypants-9999.ebuild 701 BLAKE2B 7419fa0feacf804f1e5059fe0b34bb31539feb05a41a6cc95b80927ce7a92574ecd226cfae98cdaab6e5647feb1b61af296545d0125311d32f26aa1ad451366e SHA512 155996e0e7fbaf62ee3ec861f1834fb8add85a0432eeaafa96ae412e5b224db344c807b8bf8d769c98713888ffc56d3db7d887c3d7cb5e321e65d55f279fcf46
-MISC metadata.xml 577 BLAKE2B f9fe52ecf09ac488bd7e76ea4a119175283dd96853e4ede042c3a9f009ef696e79be2aeb600bec5f5e631c462ef5ce8b83f15e5fb8ba51a840aa26c8b79dc0c2 SHA512 00633c0b741819bc6d8202bc826e88182cc058b8fc043fe4b5c093b1966679188a9612526c79ccef2d253c72fa67b582c1109c123b3e62612be00788238108b8
+EBUILD smartypants-2.0.1.ebuild 757 BLAKE2B 1b3a74116cd9100cb8e238626653a98aa2de7dd1c2a2d408904e736b2650bbe2f0b70e12f9dc3c60aa5fb9e60758d5bcbee3ca981f3bd876a0d170239d50aff8 SHA512 b91692da182232108d69ce4a9b090bfb2c55ca2b397de1b2a225ace059a1c8f3098a3d06881fbd8767c2131589c8f968e585a391a717e2094da46971288ff9b7
+EBUILD smartypants-9999.ebuild 757 BLAKE2B 1b3a74116cd9100cb8e238626653a98aa2de7dd1c2a2d408904e736b2650bbe2f0b70e12f9dc3c60aa5fb9e60758d5bcbee3ca981f3bd876a0d170239d50aff8 SHA512 b91692da182232108d69ce4a9b090bfb2c55ca2b397de1b2a225ace059a1c8f3098a3d06881fbd8767c2131589c8f968e585a391a717e2094da46971288ff9b7
+MISC metadata.xml 611 BLAKE2B 7dedba0a692b077992808f9fa6fa626d43b60cb3e09ade5d86be8f808ed356099ca59e462a617567175086de3082e47a73ee7e21206ab97f8eccbab4247703bf SHA512 3ad913668e585a605d3bc4ba3bd10931c8f9fb118c970384dfc25dd779819bf20ec6e643d8c71c588cb27801978a890d2468bbf7d408c4b797dc1f78c12fff51
diff --git a/dev-python/smartypants/metadata.xml b/dev-python/smartypants/metadata.xml
index ae7568154bd8..fbbcc3e46689 100644
--- a/dev-python/smartypants/metadata.xml
+++ b/dev-python/smartypants/metadata.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>nerdboy@gentoo.org</email>
-	<name>Steve Arnold</name>
-</maintainer>
-<longdescription lang="en">
+	<maintainer type="person">
+		<email>nerdboy@gentoo.org</email>
+		<name>Steve Arnold</name>
+	</maintainer>
+	<stabilize-allarches/>
+	<longdescription lang="en">
 	smartypants does transformations of plain old ASCII straight quotes,
 	plain dashes, and plain dots, into smart quotes, em-dashes, and
 	proper ellipses.
-</longdescription>
-<upstream>
-	<remote-id type="pypi">smartypants</remote-id>
-	<remote-id type="github">leohemsted/smartypants.py</remote-id>
-</upstream>
+	</longdescription>
+	<upstream>
+		<remote-id type="pypi">smartypants</remote-id>
+		<remote-id type="github">leohemsted/smartypants.py</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-python/smartypants/smartypants-2.0.1.ebuild b/dev-python/smartypants/smartypants-2.0.1.ebuild
index 2eddcc4e2b35..418910a52b87 100644
--- a/dev-python/smartypants/smartypants-2.0.1.ebuild
+++ b/dev-python/smartypants/smartypants-2.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 MY_PN="${PN}.py"
@@ -20,12 +20,12 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/leohemsted/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
 distutils_enable_sphinx docs
+distutils_enable_tests setup.py
diff --git a/dev-python/smartypants/smartypants-9999.ebuild b/dev-python/smartypants/smartypants-9999.ebuild
index 50a025c905af..418910a52b87 100644
--- a/dev-python/smartypants/smartypants-9999.ebuild
+++ b/dev-python/smartypants/smartypants-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6..9} )
+PYTHON_COMPAT=( python3_{6..10} )
 DISTUTILS_USE_SETUPTOOLS=no
 
 MY_PN="${PN}.py"
@@ -20,12 +20,12 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/leohemsted/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE=""
 
 distutils_enable_sphinx docs
+distutils_enable_tests setup.py
diff --git a/dev-python/smmap/Manifest b/dev-python/smmap/Manifest
index 2d6fc349b819..e1531490a6ec 100644
--- a/dev-python/smmap/Manifest
+++ b/dev-python/smmap/Manifest
@@ -1,3 +1,3 @@
 DIST smmap-4.0.0.tar.gz 22524 BLAKE2B 2edd07925d9511879cb816f1e80d5fe7920ef91635f085b8d0ca81fa8d46bf0a1dfce7eab6f70250b93602a5a10e8170045f0720cf9fe3b26911d4e8b419f4cf SHA512 fae59fd4e8ccc95cbc07be3ece208e862948c2b537850376b169acc15b9f0b1d94d412fde88647c245dda117dbbdab4db6426e1d95f3f9779bdd40c2d9c7d2cd
-EBUILD smmap-4.0.0.ebuild 492 BLAKE2B 4214b2e75fac5d518c7a650a80062457b01add28474940fd045e8db2152404683f40984ce3ffb3c96411930c8f6ea298ed009597a54d3770d120fce740f90095 SHA512 5ae74ef4464819989282b31041b38cc662cc59f34b212779a65d999c187ad634a31d5789535c52f149372f0943deff1e7f942946c45f46635a3d3eedfe048b05
+EBUILD smmap-4.0.0.ebuild 493 BLAKE2B 479fd725ae5d664ebc8067df1a4ee7efef9ca498067767b34928cd3395f82b61ee7c964ab1aec55772a429168026c635d2b2b1a124863a7d2c2b3580667f09d3 SHA512 7d4a2d7efbf9ec8f029bb4ddf2b863df815c9625824e5d4ab685cde468815110e6fa2da661a25bdc8273e0ed68d362b13738a4f4bee5f014c41c7704f5dd045c
 MISC metadata.xml 411 BLAKE2B b6d13ec428eae8529a38571afc5c66e1c02f812667c0f27bc1db2d23a702d7d49ebe877087d2af0136eb4a34d6422c00cb132fe6e526c24646a742e167e16caa SHA512 8020f425757423d6be45a200bdd9ecd261a1f81fa148c16a08c343f8be83f558fb6bcd614d2579f8e82a139efaeecca568d8b65310613707fdfb3ea1367594c8
diff --git a/dev-python/smmap/smmap-4.0.0.ebuild b/dev-python/smmap/smmap-4.0.0.ebuild
index fcf2d3d3c805..4b3bf59251eb 100644
--- a/dev-python/smmap/smmap-4.0.0.ebuild
+++ b/dev-python/smmap/smmap-4.0.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/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 33eba15fd8e1..294537b2f156 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -5,6 +5,6 @@ DIST snakeoil-0.9.6.tar.gz 261998 BLAKE2B 1f81e633321b7b1988865092ec2778feb35338
 EBUILD snakeoil-0.9.2-r1.ebuild 755 BLAKE2B d721e65479ecec1750a47d35e682d68452c0582a746ae0989698c22c2b9608c6197c457a0b68db3f1f7f6cb6820a0b09f6b22f53509be99ae809a526fb5f2bd5 SHA512 f16351b364239138db61dbd850ebf74014b3e63fa8c6d0b9f3b6c121a743fb9b54bf3b909a614255b1d11c1d2f5d1a965f86364547ff11178ec8df35c4c36771
 EBUILD snakeoil-0.9.4.ebuild 753 BLAKE2B daac420726043bcd5c0c742aba5384325c5206c5b9068fdfad02bed5e625f67ef388d8e5a19a8e83625c8b520370f87966fa26285f01d1236752510b6bc8f36a SHA512 f5abe777e2ef85f45681ca1c2acbbe774b50b036d8b0717076d987f5e5c640dc3f55ac22796327509b4c106757b8db1e249929a2cead7f6fe5f545e59096fe08
 EBUILD snakeoil-0.9.5.ebuild 761 BLAKE2B 2311f5265e771ad5787a7bd533abe74198e3b5957d20b4a2792ca409f662a4b7a278777676327cc146bac885be50ca7afcc98c5702ca89bc47f7c089d2dc8f2d SHA512 50a2f53ffb4d77005ff0ac9a0e387b4eb7c8d63c129d11f75422dbc189f1773e5e2ad05e61be381d741d719ea4cb04030f47780c179eb7aca530e1c671a3c3a3
-EBUILD snakeoil-0.9.6.ebuild 804 BLAKE2B a1770eb0fccf067628da9c9f8a8e68ba742707048c1103774963616b0f52ddda915a7b7b36ac02e1fbf024287d56975ea49e13c1dff9af26b515bcc2b3e68788 SHA512 d588ed9fbeb5c925c07534fd46095f61731836d6b02e3e7e38d59693e2bba64c82f4878035514064d2e2d1746676358d951a2dfe91a99149a227ad9d7376a200
+EBUILD snakeoil-0.9.6.ebuild 810 BLAKE2B b59f58b00ae58ff8664bd74bcd8ecf7fff28af5a1733d2e3074c706d243e4da8a962b8e9ac81f574340753f694cb0959d13a4194bf91c1ca734aae9fde23a1a4 SHA512 86eb29280f8dd4064647a95f9e4c302b96c27a33b76bfd539545930ffa93f94399e44bea2245eb45ff97e23aaa2b7f091d944ff98a09bef970167f087c454f6b
 EBUILD snakeoil-9999.ebuild 805 BLAKE2B e8cbdb8ed6a3d3b4579f6269f102d3912f80471465c4c09432c78e2bf856e17c763f81dcf649838856dd1fb897060dd275d4e0e51a3b1b1279acd5faee2df227 SHA512 36a85422cab84849da2d8a3d0c3104bc0e7e3a46322ac4112dc08ddf90c1c91be2602af227690d2b2af83d438a65cbbe6bf3134ebb855d9c28572d421dda9e9b
 MISC metadata.xml 386 BLAKE2B f9bc5cb5f590209e7211fffa5ac87e106e636f871dec0b31a90c4aaed63cb9fd4bf4fe510a4f36676eb47028465a58d5088307aec6c2c5b000d370aca5437b68 SHA512 47ee140ad8c665e0541a71721eec7739913a93944a0be471287c0df7403d63757500b27d3ffb909590846991c69727ea95d960dc98e7887bea3b178bc4dd6047
diff --git a/dev-python/snakeoil/snakeoil-0.9.6.ebuild b/dev-python/snakeoil/snakeoil-0.9.6.ebuild
index d479c2dc1b49..efbafe8d35e7 100644
--- a/dev-python/snakeoil/snakeoil-0.9.6.ebuild
+++ b/dev-python/snakeoil/snakeoil-0.9.6.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/dev-python/sniffio/Manifest b/dev-python/sniffio/Manifest
index 32a01a3532fc..6676393a2766 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 662 BLAKE2B d2660de96760242d7b711fa0035fffd5c33eca14bbf7d5522b3e635e4bbe5e51b7a26212ffe0352de618f05d43aeb296dbce505d0327b990b9e5aa1fe0165cc6 SHA512 6ba9ad360cc6dc8aeb2c8c048221b4fea4cffa3e56b641145d3151bf763a493529b67968af3fd488e3bebc5b339f379f077ef407307af089f9790745c19309cc
+EBUILD sniffio-1.2.0.ebuild 693 BLAKE2B d033034b6cefdc72f1e222eafd27670e5bad1827556a4c99da8c26990ca9e83e90f63596496b8b8feee653e70a28c4a68c68d0a1a973da9af9010294a10e0fe9 SHA512 e18f07618ec114f23cb4efd0f3c8e10016de895f10710f3e29af1b1422eaa7134c797b77390a5fec7af7fcd1a669cee89cac381b81bffccf1e6a22163c4e3231
 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 ea9fbac068cb..d4705cbf156e 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 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/snowballstemmer/Manifest b/dev-python/snowballstemmer/Manifest
index 9f793a9106d5..f44e0ecc1ac3 100644
--- a/dev-python/snowballstemmer/Manifest
+++ b/dev-python/snowballstemmer/Manifest
@@ -1,3 +1,3 @@
 DIST snowballstemmer-2.1.0.tar.gz 85674 BLAKE2B 3301e3f799fa61a679b88efc87b3d019231ae7172172f136eb7e1bdfb40d054489aaa29ca1b8b2a04d8260a82ef7f4a8da75a9784f69942aac57ccfcc4983e5b SHA512 e0550d3389074d7686d26397ff2289519cd8b26cf7090fe781d6407d1c2b95f912347d70cd25e02d6016c454ad6c5cf6d648e54ef87161328ac57bc1ceaf7826
-EBUILD snowballstemmer-2.1.0.ebuild 554 BLAKE2B 88e10c1c94a3a1626b6455b20ccfb356f045e8a391c31517bf7d117b78929e1470dc6a3fc2e656adb92c88bea9b25ee0e9dcd0062a8390be27fdc2ec2706b8db SHA512 a4c42a0ba933cdf220d122f324c836632195067ec45019bf96d365b106be60aa0b772abfaef3c4d9df9901a9357caa89ea6d37b27120e18bd754434f727c5649
+EBUILD snowballstemmer-2.1.0.ebuild 555 BLAKE2B e5c99ccccdeae6ebeffa32442b3eb1289c6a83fc4a7c4e3bc836dac09a0300624db697d6cb04db2383106b303f70d114cccbbdde29703eab88110a58e7ced411 SHA512 fc2efaba90e3ce12f5b9f263248d9644699bee4956ef2d363c9e8a76639b1e880f59fb6a2eacaa3e7c2ff6d16a2a423a59711e822e6760c7418c1a7622c922cc
 MISC metadata.xml 403 BLAKE2B 2a098a90b645d8725836da0c99c4143aff56f3fde6b094f2a99968f585684801fc060e88606d7d9ad1e08f52230e8c03eedd996708aa52ad3c07c7da28a1f447 SHA512 5c2c1b79cfc92f8eb602c54f1772791f772f969ce9125e2920a0eb6f150d3de29bde1935111f820f74562389bca047f0306d60fdeec040eb586d527f62ea558c
diff --git a/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild b/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
index f937b51bf3a6..3321ff5d20eb 100644
--- a/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
+++ b/dev-python/snowballstemmer/snowballstemmer-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="Stemmer algorithms generated from Snowball algorithms"
diff --git a/dev-python/sortedcontainers/Manifest b/dev-python/sortedcontainers/Manifest
index 1c4bbe5308e8..331299b5a51e 100644
--- a/dev-python/sortedcontainers/Manifest
+++ b/dev-python/sortedcontainers/Manifest
@@ -1,3 +1,5 @@
 DIST python-sortedcontainers-2.3.0.gh.tar.gz 9228968 BLAKE2B cdff8230d4e4ac42a89ed3192666ebf22cd48a4475f1dc173cffb0339c7f27e9cdfde1fb631daadf04adf2c00bed8a924e1202712d0ebcbd591f5542de863461 SHA512 0488e2f9f07ea7e4737ade69441f02614b63cfccb32a71af4e5953001bfa840d2e113a36a0a0a6d4c1e7fdd920ac3937b0baaea522d742547a4d81a99b8d1a6c
+DIST python-sortedcontainers-2.4.0.gh.tar.gz 9229380 BLAKE2B ca9348ab7d467b2a81126217451262bb0547901b953edc3bba7c87c67b415eef5c3d454a08d227ebc8b213c1cc7db6262e864511fe67beefe865014ae5fc5977 SHA512 f80185c6f95a85cc78f88f6f6cf389eb48be22cf94d5fcd84f3592873f17de37ec7f44c1627b7f02956ac4b4f74ca4febefc47d3c6232f70ee05dbb2449ad770
 EBUILD sortedcontainers-2.3.0.ebuild 796 BLAKE2B 8fd3c6fff84e969a0caf6f526202806fef308cb2e52337a87dda69ed1d0d4a84e68ee51351969771ed08cd8b2e64aeba801b135bb5a078be24339d030c53c9cf SHA512 ab94b91691dc89a6631addc5f0c9a8f7bc3d331cee3e12da9fc146904bcb7d03d4a8995772f2a56bb047a6017e1a664eaa4f3cb571a54cbd11489fe0e01b4a46
+EBUILD sortedcontainers-2.4.0.ebuild 804 BLAKE2B 5282e650692d94284a04fe38025036a665c40061832b7eaee9d20e123ccdb7517d955eacba21dc984b6ef1019905c1381e1d3b9ebb9ae710084e6db95bd67a18 SHA512 cdb0e8b51ecedaf94c31eab75bc2bdfd1dd76fbed9b2a62e1ec326d10342e28d833c23556a63f8fa6d530ff50bb5c18af9e027cc1ac4dd55d4911031f57fe3a8
 MISC metadata.xml 417 BLAKE2B 8f56ae7ddac9a7fab6b99e9f03cf53829a7a7543be90ce3b508af2d2cc912ddc4a41f80fe9e8d395f8e0f92cf08ec4d99023cc70a3cf089e9519ee958659243b SHA512 0b286e9c409d08a4448b377f46e0d8abed4c23910a09a770cdf9c2b2797318831570b79c082fc3b9e9e15bed338b5f283e6004e63771f2e52da2be6749554c99
diff --git a/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild b/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
new file mode 100644
index 000000000000..af2cd3f803bd
--- /dev/null
+++ b/dev-python/sortedcontainers/sortedcontainers-2.4.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+MY_P=python-${P}
+DESCRIPTION="Python library to sort collections and containers"
+HOMEPAGE="http://www.grantjenks.com/docs/sortedcontainers/
+	https://pypi.org/project/sortedcontainers/
+	https://github.com/grantjenks/python-sortedcontainers/"
+SRC_URI="
+	https://github.com/grantjenks/python-sortedcontainers/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTHONPATH=.
+	epytest --ignore docs/conf.py
+}
diff --git a/dev-python/sphinx-autodoc-typehints/Manifest b/dev-python/sphinx-autodoc-typehints/Manifest
new file mode 100644
index 000000000000..7af13a89bc96
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/Manifest
@@ -0,0 +1,3 @@
+DIST sphinx-autodoc-typehints-1.12.0.tar.gz 19494 BLAKE2B beacc4f8ab453612dfd5264f1c65fd6bdd957269a28ee5b71b762d0baf5a3d4be58398b32d4263f996648281c1139f47a7564e8fc6444a94095f6a970b4cc27a SHA512 92fa340495a48111fa3d600d8c46d83214505ac2a5c71cb1303e846ac439f1e0ff14f8ce8dfd5ffdb6a62a9fa15dde8a5227f946840d9377ad5f7fde25894b75
+EBUILD sphinx-autodoc-typehints-1.12.0.ebuild 1059 BLAKE2B e5f0bfdd6407eaa0a7d75b382d8490c4d3247d6a9c462cf33b1fed561f9d71aa0f6ad63a486800ad38347c0d4daa07a04f5c39c56667a27cf72a3b631134f1cc SHA512 25def2a690338d12f83336d41bf481ae5758f6caeb110f53ff8a4a146705b4fcf7e32aed4ed9064951c4eed478e5bb8e7eb321e6b35a6ccf0fc5a2989f2b6d70
+MISC metadata.xml 701 BLAKE2B d1c41250ae7a9f233e1e208443b764522071d4d0ce3274b28ca95135c01b780d38faa88c8bba7ab7874584b420dc81c8b43e629718fd085d461bdcf755bb9e79 SHA512 952f4e2a940fe23acd47a9e0f101c6d78c6939fb9ad69920a9cf9770b44ba3dad7e65e708ca0ad54fac5ef871a18a737e9ed200a678210e93740eb065be81a0d
diff --git a/dev-python/sphinx-autodoc-typehints/metadata.xml b/dev-python/sphinx-autodoc-typehints/metadata.xml
new file mode 100644
index 000000000000..a8e231b705d7
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>andrewammerlaan@gentoo.org</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <longdescription lang="en">
+This extension allows you to use Python 3 annotations for documenting acceptable argument types and return value types of functions. This allows you to use type hints in a very natural fashion
+  </longdescription>
+  <upstream>
+    <remote-id type="github">agronholm/sphinx-autodoc-typehints</remote-id>
+    <remote-id type="pypi">sphinx-autodoc-typehints</remote-id>
+  </upstream>
+  <stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
new file mode 100644
index 000000000000..1999e89a2278
--- /dev/null
+++ b/dev-python/sphinx-autodoc-typehints/sphinx-autodoc-typehints-1.12.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Type hints support for the Sphinx autodoc extension "
+HOMEPAGE="
+	https://github.com/agronholm/sphinx-autodoc-typehints/
+	https://pypi.org/project/sphinx-autodoc-typehints/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/sphobjinv[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	)
+"
+
+# https://github.com/agronholm/sphinx-autodoc-typehints/issues/176
+RDEPEND="<dev-python/sphinx-4[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# why on earth would this have to connect to the internet
+	sed -i \
+		-e 's:test_parse_annotation:_&:' \
+		-e 's:test_format_annotation:_&:' \
+		-e 's:test_format_annotation_both_libs:_&:' \
+		tests/test_sphinx_autodoc_typehints.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/sphinx-multiversion/Manifest b/dev-python/sphinx-multiversion/Manifest
index a7d80e82cae2..3a5b303f3a3c 100644
--- a/dev-python/sphinx-multiversion/Manifest
+++ b/dev-python/sphinx-multiversion/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-multiversion-0.2.4.tar.gz 20468 BLAKE2B 9bdc59691b63c280d08c77108318b778c8bf948c502538e94e77072589c4e6565bcb7e863a8d765f55be012b21a1a0242d37077248312a7ee18dc788a7dbc633 SHA512 68441793631f59df3330ecc84c0d1aa279f0492021108121f2bdab92d5a3eb61522664f14c4ebe8709126e0088ff8eb323aeeebb5d1e7a2dcbd358eeac772d08
 EBUILD sphinx-multiversion-0.2.4.ebuild 578 BLAKE2B 61470cbdf3a1457303318b303134f87ddf59408dba82e025d6925a3b99d1e5f049c340e924a20b6a06adc023725f1f067b1a979794837c156ec700d4a713e1b4 SHA512 94ed82bcb93b4ae92babd84f521efcbc15c9706a57cdc6aa4c437bceb40a06261371b0742620ac2bf0555c5e06ded5b9ba0c1f2bd9dbabafd1d6a62980e48ad8
-MISC metadata.xml 487 BLAKE2B cd1893cf7aac66ba03474447550655309b4e0be7b46b2f96b57c053c6a8373acf8446b5200d35abb34d95d0756121b10670b6889cd52ac5498cef6869c56c98e SHA512 ad911309ac57a83d25b3a0d38150ef9175835e930fcea5d4a7340c576da101fdbd1a9a0b64e74624eb3ce68249c6cfb06b1f1665e0f3daabda5a3531c71aa906
+MISC metadata.xml 340 BLAKE2B 0fb6ae6e031c9e39a528105edd9551c6daca57eb24cf2a532adb66c3dc20cfe23a7f5b09784e1779cdcd2099f99182ec73d6b68c1ce4dc599237cc7ee264d968 SHA512 b325051a6264bde28a4eecdf68cf52875fcd2299d7e6284b8072ff6f9a905144dbd7e13b0ee5c49c3caef95b5fb21cea56a7c01d157d60d5a43904ac208da4f7
diff --git a/dev-python/sphinx-multiversion/metadata.xml b/dev-python/sphinx-multiversion/metadata.xml
index 15279e67f6c7..9bf5f36c75d8 100644
--- a/dev-python/sphinx-multiversion/metadata.xml
+++ b/dev-python/sphinx-multiversion/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">sphinx-multiversion</remote-id>
 	</upstream>
diff --git a/dev-python/sphinx-notfound-page/Manifest b/dev-python/sphinx-notfound-page/Manifest
index f6624d4e0aa3..2b6467393eb4 100644
--- a/dev-python/sphinx-notfound-page/Manifest
+++ b/dev-python/sphinx-notfound-page/Manifest
@@ -1,3 +1,5 @@
 DIST sphinx-notfound-page-0.5.tar.gz 47806 BLAKE2B 4715bed7509970f9198a0c666a568ca403157ad0704d0e1d17d222e6e8dc7adefab3922a4b79e056d20034463d5f034cba8c7b65248569a46866a964abec7e70 SHA512 a48cf4bcc755687c9e02482727ab2c28abe314118cef775e6b5625e2db67e4040745740c3c9fd88206bf050f1621ef20ffb0262ec614c11497ef030f9fb675a3
+DIST sphinx-notfound-page-0.7.1.gh.tar.gz 50670 BLAKE2B b438413585fce3623451015d873242de3e6d7c466aa06b0b6398d7e337d2a0d3c2041973b1f1c8491b1f382d8e87a2da00b6a97e3a857b60cb345e715d2aa27b SHA512 f2894b19f8ccee22ac7f6e3a34f8270923e8cc4b2182d490e6ec46477460555de9b67b0075f74cc089b0b9e7474c6db9373d107d272d161d98a3c5609edfa7a0
 EBUILD sphinx-notfound-page-0.5.ebuild 641 BLAKE2B c90920e67c3e5e20fb39bb7fcdaa5947c2cbcb17d9060f8566916cff0ed50c47965f439055b9db95505c4365288231380c96b60071d467d18f5068c35cab4ba7 SHA512 7fed433c99187579b3466f3c36efde46d175f47d9e662d89b8642716bffb8dd89285092e48a8f864163421b75a2403d55f54aa63e378f48c1d3b0ba61445e75e
+EBUILD sphinx-notfound-page-0.7.1.ebuild 650 BLAKE2B aec73a088ebd0d2c525407c27de7cca16dfacf9b184289f62a0adf8c020355743a8d45869c9746746966c2f83475ca052541859b8797425b2130c4370ffc8af7 SHA512 5020bd05900230b6c93625da65ff202bfe0bc1ce9c009cc2d33c14920c632bd4f7eb84bf23083cf9c10383bab81c140e6bdfbea3010e957b60d622ad88be1c78
 MISC metadata.xml 626 BLAKE2B a9cc30ad83ffd4e697b10525cd5d5d555ed6293ff54044a67eeb871f29d9683c5330c4c49c378c990e126db241fbca487d00510960e8154f74b1fcd50325dfe7 SHA512 3c92f220c2a0d3668c1c0d968f43cc5986494130952aec2d014900576f39fccb67953c1f8fe90e70d0591ee618e2b3b312828c436f3acf6ed75425d4f4694048
diff --git a/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
new file mode 100644
index 000000000000..200e4e029d1b
--- /dev/null
+++ b/dev-python/sphinx-notfound-page/sphinx-notfound-page-0.7.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2019-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Create a custom 404 page with absolute URLs hardcoded."
+HOMEPAGE="https://sphinx-notfound-page.readthedocs.io/"
+# PyPI tarballs lack tests
+# https://github.com/readthedocs/sphinx-notfound-page/pull/110
+SRC_URI="
+	https://github.com/readthedocs/sphinx-notfound-page/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+
+RDEPEND="dev-python/sphinx[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sphinx-panels/Manifest b/dev-python/sphinx-panels/Manifest
index 124cc7100e10..a75e5d5a796a 100644
--- a/dev-python/sphinx-panels/Manifest
+++ b/dev-python/sphinx-panels/Manifest
@@ -1,3 +1,3 @@
 DIST sphinx-panels-0.5.2.tar.gz 400415 BLAKE2B af103b3a10032590def4b41c650e9023fe94ec6e2fe764a09237cad4d928b1ff429a7a385770f2d07724897413f001ae4037c6e8638b3a9c1d63362c361fd999 SHA512 6d4eb566623543d0553790136e420e3f3a23e06f38b64642e2bb535a5401a954719135a9af89b3655190aebcd35024cecd40b887e7b2bb1394a2a575447316c0
 EBUILD sphinx-panels-0.5.2.ebuild 687 BLAKE2B 299300167bf675d0c93afd131180eb8828831f349c9dff260277108d456ce55b2d1fcea21b2a5d9883e68e4e4a53bc4d2717334d2c62aa4ca8c22d8932cdc54a SHA512 845224a377c62fef4b30a551beddfd02e0db89eb9d09c5de15f149a764d3c499b402ce01aa31bea63c42afef1c2280fd9df342ffae2f8774bb4fe527e6868ce1
-MISC metadata.xml 505 BLAKE2B e7c326c2e4cebd6cd8aff0b4dd4dfeb449b0f3ad2f08ed904e821273f378bdcf6068696a191f2aa133fbe1329bc2ef2d9c5a594db5dcb0f6c53ffb49e3800961 SHA512 2e97196e48784d3cf4fd569c635a413a344941ef3bc8ab3f199992831737f067971e47c3485b0251e450825efe8180ea62f419590ff19a0da35a1a2d8d09afc3
+MISC metadata.xml 358 BLAKE2B 0b9979bdd35a02a66c8a0ba8bb27e7170ada70a9506ad8bf320288d4a40a04a75f8481bd6d084d49569131154e689277fdf43c7120e6c0927c373b4a4c922403 SHA512 a8a585957fdf380ab763cc95cf455a927c6bb0558cce5f0429ba43da72d2655ab15cb6f06f9e5360f24f854f275e0df67ec573167c02332a7dc3912e96b31b3a
diff --git a/dev-python/sphinx-panels/metadata.xml b/dev-python/sphinx-panels/metadata.xml
index 0082b334b6a4..012cfe382db2 100644
--- a/dev-python/sphinx-panels/metadata.xml
+++ b/dev-python/sphinx-panels/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinx-panels</remote-id>
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index be08496e57d7..ea80e301dd24 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,8 +1,6 @@
 AUX sphinx-3.2.1-doc-link.patch 604 BLAKE2B f23f8f9a0a48b170e2b6daaeded1e65aebe830da463d4e30f2405b511cb72dde12767d0113b2d1efdce821c16837d700c71c60de38d20950ca5d6579f19a80ff SHA512 3088ba8768b4ba9e6a187e4c52fcc226efd5125fd01526b4a724504f4c445d69d6964fe79c1325ff7f58edcefc7f3489393ab085ea0458d94c44b186aa16e2f1
 DIST Sphinx-3.5.4.tar.gz 5911093 BLAKE2B 8740714dfaf3733bf57d0b277315b4e7b5cad86247ea30dcbc4f5dadf5f5169329050b7be43ec8625c47df9dcc19afcc6c4d782725c7007f8178b7eb7be7dc05 SHA512 853379f3b0496772846be9beb072c2c8a69ff899ffe4c6435b448ea639a32138c61403f9c14f62f4f78b2e526a2ee7c05b4196eabdeee37bcae6aa98df992125
-DIST Sphinx-4.0.0.tar.gz 6104929 BLAKE2B 1f29e9c9e12957ed9c8f058b0b8ac3aa584db3867a6e4de35e73400362c2c25afd087a1048b8b35d59730d5401c51139173bd558a8fb0178f6f0351a5284f7cd SHA512 aa70be0a1a1f136257e253819fe7075116d48f21f2db716f87ca383737ff28c1c3e6a802fbf7ab3e9624c655966b5f02f746fb54f65ee9996da4bbee22294738
-DIST Sphinx-4.0.1.tar.gz 6161183 BLAKE2B 25ddb31a6db4eb1b76054be7026c327b47e33ec3efaa3eec70e5aae747931723baafe4b7b944ec4405589294698995bf7f5988187927f64db00ba77f44dccedc SHA512 a595840af092ce0748055a3112276649f67bdbd7aae05901eb3913fd4e415612f1b8594184c9a96de4f8aac82d21b6b6fb57cacb9cb7073c3799f31dfe244274
+DIST Sphinx-4.0.2.tar.gz 6162889 BLAKE2B c0309ca6752a76c11b5071d3ee368e80499bf68ca51a7f396be10d15b9bf9b03f85de3fef2b4e3c4795de99efa78af42a5b95b00d1f737952e6775631e63128a SHA512 836727258a83d38430de4f6073f637ec3c6c813707701b96c9ec58e35648fd1eb9af1c7c5da17dd95b63914fafcb9e25668129514701c5fdd3f49f7303c3f8ec
 EBUILD sphinx-3.5.4.ebuild 4147 BLAKE2B 71424a28d134dbd1eb18babe105a5b98bb27c1dd92f64844121c3b0f465ed1c73f10b2cc8e9d49952a49eabc1d58ec748f3c207f60dce9b5ef8b1be71f9718ba SHA512 c83535c4082e426930df4bbbc4eea476ed50e109323b89f3baeaa2a27bd0aa61f48f3f09f9b2030f4335fb65b5ef7256640233d2183db36352e2cbce60044661
-EBUILD sphinx-4.0.0.ebuild 4144 BLAKE2B e48ad6e5982b5d2929673618d13d5ff07f569e04688f7c70f07228bb915254dc148b437c4fb48d21ce40f7239cd09491a6bc854c81e3d6a26c12a43753fdab29 SHA512 fecb2881bf938dab6d990d6f28cf2f7a9879b5e9f6f80d9b982b089379bad234bd28b16623559f971c3fb9079ae0a005b5388fc7d0e5ba7e26819e5a255747de
-EBUILD sphinx-4.0.1.ebuild 4144 BLAKE2B e48ad6e5982b5d2929673618d13d5ff07f569e04688f7c70f07228bb915254dc148b437c4fb48d21ce40f7239cd09491a6bc854c81e3d6a26c12a43753fdab29 SHA512 fecb2881bf938dab6d990d6f28cf2f7a9879b5e9f6f80d9b982b089379bad234bd28b16623559f971c3fb9079ae0a005b5388fc7d0e5ba7e26819e5a255747de
+EBUILD sphinx-4.0.2.ebuild 4261 BLAKE2B ac6ac86c0f87ae00bb2095eff54a3b4c9eea9f6a5fa44c5f0409008055ab558331d4e5cbd73f6964f3c5447b9323d013a6b6364a15b7a2b6b62beb01cc444f36 SHA512 fb00dd88d13acb2773b0ea11f65ebfc06d22cf6d608076c6eab6e86efe5d673df363dec00f539290265e5e8690ab2aa5dfa747672b0013a92064cef57a504e9c
 MISC metadata.xml 567 BLAKE2B e99637c5c116e3b8b17bd92341271350eaab38d3e0c5918ba2921db1fa0abb4615a1903b9916f94f3951f8b22e2939d71c5fde97b6ae467bc80570bdfee3b13e SHA512 7f9edc2ab5d01da2d23630f1cca2a25cb727b8336b600b48934b205727876361c2cc5432772940d855a00766d190b3319dc397927b9218345dac226886e9cec4
diff --git a/dev-python/sphinx/sphinx-4.0.0.ebuild b/dev-python/sphinx/sphinx-4.0.0.ebuild
deleted file mode 100644
index 8dee8dd7b8f4..000000000000
--- a/dev-python/sphinx/sphinx-4.0.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Python documentation generator"
-HOMEPAGE="https://www.sphinx-doc.org/
-	https://github.com/sphinx-doc/sphinx"
-SRC_URI="mirror://pypi/S/${PN^}/${P^}.tar.gz"
-S=${WORKDIR}/${P^}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc latex"
-
-RDEPEND="
-	<dev-python/alabaster-0.8[${PYTHON_USEDEP}]
-	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/imagesize[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.3[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.5.0[${PYTHON_USEDEP}]
-	>=dev-python/snowballstemmer-1.1[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-applehelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-devhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-jsmath[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-htmlhelp[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-serializinghtml[${PYTHON_USEDEP}]
-	dev-python/sphinxcontrib-qthelp[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/typed-ast[${PYTHON_USEDEP}]
-	' python3_7)
-	latex? (
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-BDEPEND="
-	doc? (
-		dev-python/sphinxcontrib-websupport[${PYTHON_USEDEP}]
-		media-gfx/graphviz
-	)
-	test? (
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		virtual/imagemagick-tools[jpeg,png,svg]
-		dev-texlive/texlive-fontsextra
-		dev-texlive/texlive-latexextra
-		dev-texlive/texlive-luatex
-		app-text/dvipng
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-3.2.1-doc-link.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# disable internet access
-	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
-		doc/conf.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_compile() {
-	distutils-r1_python_compile
-
-	# Generate the grammar. It will be caught by install somehow.
-	# Note that the tests usually do it for us. However, I don't want
-	# to trust USE=test really running all the tests, especially
-	# with FEATURES=test-fail-continue.
-	pushd "${BUILD_DIR}"/lib >/dev/null || die
-	"${EPYTHON}" -m sphinx.pycode.__init__ || die "Grammar generation failed."
-	popd >/dev/null || die
-}
-
-python_compile_all() {
-	if use doc; then
-		esetup.py build_sphinx
-		HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
-	fi
-}
-
-python_test() {
-	mkdir -p "${BUILD_DIR}/sphinx_tempdir" || die
-	local -x SPHINX_TEST_TEMPDIR="${BUILD_DIR}/sphinx_tempdir"
-
-	local deselect=(
-		# these tests require Internet access
-		tests/test_build_latex.py::test_latex_images
-		tests/test_build_linkcheck.py::test_defaults
-		tests/test_build_linkcheck.py::test_defaults_json
-		tests/test_build_linkcheck.py::test_anchors_ignored
-	)
-	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
-		tests/test_ext_autodoc.py::test_autodoc_inherited_members_None
-		tests/test_ext_autodoc.py::test_automethod_for_builtin
-		tests/test_ext_autodoc.py::test_partialfunction
-		tests/test_ext_autodoc.py::test_autodoc_typed_instance_variables
-		tests/test_ext_autodoc.py::test_autodoc_typed_inherited_instance_variables
-		tests/test_ext_autodoc.py::test_cython
-		tests/test_ext_autodoc_autoclass.py::test_show_inheritance_for_subclass_of_generic_type
-		tests/test_ext_autodoc_autodata.py::test_autodata_type_comment
-		tests/test_ext_autodoc_autofunction.py::test_builtin_function
-		tests/test_ext_autodoc_autofunction.py::test_methoddescriptor
-		tests/test_ext_autodoc_configs.py::test_autodoc_typehints_signature
-		tests/test_ext_autodoc_configs.py::test_autodoc_type_aliases
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module
-		tests/test_ext_autosummary.py::test_autosummary_generate_content_for_module_skipped
-		tests/test_pycode_parser.py::test_annotated_assignment
-		tests/test_build_linkcheck.py::test_connect_to_selfsigned_fails
-	)
-
-	epytest ${deselect[@]/#/--deselect }
-}
diff --git a/dev-python/sphinx/sphinx-4.0.1.ebuild b/dev-python/sphinx/sphinx-4.0.2.ebuild
index 8dee8dd7b8f4..1c6f8a61729a 100644
--- a/dev-python/sphinx/sphinx-4.0.1.ebuild
+++ b/dev-python/sphinx/sphinx-4.0.2.ebuild
@@ -69,6 +69,11 @@ python_prepare_all() {
 	sed -i -e 's:^intersphinx_mapping:disabled_&:' \
 		doc/conf.py || die
 
+	# remove unnecessary upper bounds
+	sed -e '/Jinja2/s:,<3.0::' \
+		-e '/MarkupSafe/s:<2.0::' \
+		-i setup.py || die
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-python/sphinxcontrib-autoprogram/Manifest b/dev-python/sphinxcontrib-autoprogram/Manifest
index eca694658cc0..15b12f4ddb41 100644
--- a/dev-python/sphinxcontrib-autoprogram/Manifest
+++ b/dev-python/sphinxcontrib-autoprogram/Manifest
@@ -1,3 +1,3 @@
 DIST sphinxcontrib-autoprogram-0.1.7.tar.gz 18663 BLAKE2B c1ad18df1c9ccb8fb1947ba7abbe2bc52fb531ce8142340b71bc063a6a758831d2a46913fb969f52791c3a86cb86a8eddd378c6403e1be4eb23ece2380386eea SHA512 df416759e9d6bfc69780f864bfd2c0fb847515df1d5416e4c7fb78ea0feb9cf0e360da457414a6bed5a56f69fd8ece3ccd2ed5af5fc1f56b40063765ff04f7a5
 EBUILD sphinxcontrib-autoprogram-0.1.7.ebuild 617 BLAKE2B ec74e3668f528b330f4f2c82156ec326236bbf7b62e3ccea9481a6320d668a94054b6569505aa300e7d3a16d4fbfb6e37fffdb5a80b42ab54f5f4b01c6c21f4e SHA512 90919cd3f04074906d832ab73fcdc00cd8f10f880bf227a383c6d2733fddf8e16462f5a2d468eba3c373b5c5e3e84a71390f7ed6ee21190594d23407524b2973
-MISC metadata.xml 517 BLAKE2B 30f784693dc9c70d2b64225ecfcc0921a6f9f6eb4d4f6585be086298b1192ac855b0da28eff18802f3ed7fa2365b63d4b3aa92c54892bed95e7ee775b834cfb9 SHA512 14ced1c6c870815eb3d5992743969a27bed4e31b427850366588a4818c972588cdfada0a87148b165dfb2a4fe7b70ba90af4ba7f9f38d2a4188846af82b8f7cb
+MISC metadata.xml 370 BLAKE2B 3e217f5663e7e09b655c973aa87e19bd5dabe65528dff8aee18a753e47bc38633da24d53165cefe1d5bcda7f6c03282df682badf272226fdb3d6cfb30e4c971f SHA512 0e104d16e890f79be7a791b692ca39dca50bd3b2bc482f011de9d47a387591fdc3e5f75899e8e3ffb3fc6696ea331b7439c75bce74d46dba08e26e4e7de869ea
diff --git a/dev-python/sphinxcontrib-autoprogram/metadata.xml b/dev-python/sphinxcontrib-autoprogram/metadata.xml
index 98890bad775c..acdae113d8fa 100644
--- a/dev-python/sphinxcontrib-autoprogram/metadata.xml
+++ b/dev-python/sphinxcontrib-autoprogram/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-autoprogram</remote-id>
diff --git a/dev-python/sphinxcontrib-bibtex/Manifest b/dev-python/sphinxcontrib-bibtex/Manifest
index b39eff26babd..a8ad3e4240b1 100644
--- a/dev-python/sphinxcontrib-bibtex/Manifest
+++ b/dev-python/sphinxcontrib-bibtex/Manifest
@@ -1,5 +1,7 @@
 DIST sphinxcontrib-bibtex-2.0.0.tar.gz 135555 BLAKE2B 8a542ff7895a89a8dbf6b8ed1df3ab4e928b68ce86881819c1fbfafdda626c2e1106f5513832ee09248381c89f54f06d4d1b42f005b1f775b0fbe8962a0a0ff1 SHA512 bffd4cb1ea8d88b947b89f5bd1c55bbb8bbab8679f205216f87f932cc0170d2bbabfbe4ea8d32fb7c980826d3f7c4a20cd49c2fb36f288b5cdc4500ad9ff75cd
 DIST sphinxcontrib-bibtex-2.2.0.tar.gz 96027 BLAKE2B 77ca45e36f1730fa6992cfe41763a34e2a0bcdc99c520412591be3c219dcb7a8af240cc74d08c260548475b88b6cfba24b82e7bad2ab21b24c0e9cb62590792a SHA512 fa78d35f04825f841f757e2708d0ebbd3617a7bf20a893249eaee7e435ff2880ffc8bd23608356904ce41fc11d7fd49bab20f3da501d4a217593c52d99caebaa
+DIST sphinxcontrib-bibtex-2.2.1.tar.gz 96251 BLAKE2B 3ff2ad5b7a37535177c19ba82cf53bd3a57e9f143f9157a7c5be6fd72b5c402893c172e9d902b2e12ac527833c742c3ffed81ee3407eb48fcf2937eadc3aab3b SHA512 c34199cc5180dbd8b804daf4ca1bcd830605b9620a44312c632fd9313ad87ab495b6e134f5042167daefa36c5295f61c03ee90b69396f746bc6ec7bfa182a69b
 EBUILD sphinxcontrib-bibtex-2.0.0.ebuild 717 BLAKE2B 68a5f0e8ff7ad027deab9d1c265b4368969891ff7a04f0afcb7d914d69afa6ce9cd225ab7f473cec0d054193bb30e9cb5afd5d12fce04a2bcc879166dbf90c5f SHA512 d6a3b48beac66e0d5ec41dfb7d0a84bf2117588043680785a2164ac7a4433b1a0d63c9a09a457ea7298cd0babbd050910fd2811cb4e46f5c7c1f4562ea3e8836
 EBUILD sphinxcontrib-bibtex-2.2.0.ebuild 792 BLAKE2B 0e3002f9741dfc7343d49bfe75fe2d8683ba5f1d7b3ff3a001c5fea45289c8c23f51925ab51bb6879ed88b3c6ab968ce9870168979f25336683291c6dd47a3a2 SHA512 7cd7b81c93902735eec977b1d815c9ba04f10cbb35b5ec40a9e75d5d248c9ac440700f5bd5289662cfea241a0a1aa1c272ebc2385bf41548cabc600b6e7729ae
-MISC metadata.xml 560 BLAKE2B f58275cf099cd6d49fa993bf8142870a5e41d4d6f73245b705bb66f318234d631245ec6b4d9141267fe402786ac8fafef016303dd4fa20c1d81d850844483225 SHA512 996c69a3e10055cf523dc85cbd454cc4e72a3cde94482aa9fbfdabfb718fff2709cc55c9076a6432e3029dea70c1e3faa674aead6eacb4c94264a4654104c93c
+EBUILD sphinxcontrib-bibtex-2.2.1.ebuild 718 BLAKE2B c5a00172554daf788b4913fcd11393c366c99edcf6aefa86899d9fc87f4686933831ba81ddb57a4f864010338de44126963fba9c69a14520a2e5a261ecaf1661 SHA512 78c6d4bbbb6e79add7f6c7579017a7d94564e9418e8d9357b92642d443467ef743bec3aa4304b609452f9df3d2bef50472a8eb695d9c2f7f5db7d8707d7d07d9
+MISC metadata.xml 413 BLAKE2B 51c21e67a46d2087f5750105563f034eabc1d4ea399cbf121c36618fb19bd5fabccc364cc4e641017f08f413059a61538c8dcd38dc08c9e8602bf1e74b6f5930 SHA512 ec18a4e4706ffd6d09ec02bd2dfdd55481d6a1e9e2f55113eabe7c5d59f33bf8178a366c06a41b43b276030e307c815d6294541dca279dbe41a0a9e2d5691a46
diff --git a/dev-python/sphinxcontrib-bibtex/metadata.xml b/dev-python/sphinxcontrib-bibtex/metadata.xml
index 9190fb38ebae..0b33b2fdc73d 100644
--- a/dev-python/sphinxcontrib-bibtex/metadata.xml
+++ b/dev-python/sphinxcontrib-bibtex/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">sphinxcontrib-bibtex</remote-id>
 		<remote-id type="github">mcmtroffaes/sphinxcontrib-bibtex</remote-id>
diff --git a/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.2.1.ebuild b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.2.1.ebuild
new file mode 100644
index 000000000000..4a4e2dccdd13
--- /dev/null
+++ b/dev-python/sphinxcontrib-bibtex/sphinxcontrib-bibtex-2.2.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx extensions for BibTeX style citations"
+HOMEPAGE="https://github.com/mcmtroffaes/sphinxcontrib-bibtex"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/oset[${PYTHON_USEDEP}]
+	dev-python/pybtex[${PYTHON_USEDEP}]
+	dev-python/pybtex-docutils[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
+
+python_install_all() {
+	distutils-r1_python_install_all
+	find "${D}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/sphobjinv/Manifest b/dev-python/sphobjinv/Manifest
new file mode 100644
index 000000000000..febd79645318
--- /dev/null
+++ b/dev-python/sphobjinv/Manifest
@@ -0,0 +1,3 @@
+DIST sphobjinv-2.1.tar.gz 1144017 BLAKE2B 71878e1bac5202ab74298b56cd6172236ea524050323e0d6b8bbc0c89f1937d75f10d40b4071cfbe8c9031641e9a0ecb283da908c40840a61c12a7c892438241 SHA512 cde77d73b09b72358b0ac5b0d8f1a748e78dce6664d1b849ba68f5ff70dc43cbcff4581374d0151be29c4d97efe2920c5c00ff68918371243be158031e9554fa
+EBUILD sphobjinv-2.1.ebuild 1374 BLAKE2B 2ef86380cab6b1aa011572f430793e832f20fc7e16073b1a543aa9cbc05977b8e010831f872ca58f4756804886634da6d7badb2bb7a8fecee618195850f49d46 SHA512 ba5d3edebf689ca211e39964486e0eeaccc091b7b609ba05358c32ca48c9ce3593b2ff06163b0412d2f19925807dff48229961e3942a8bd8b1e78f151b5f4b29
+MISC metadata.xml 893 BLAKE2B cf258281d276e039b3eef66ea4612b3b8df3578265939084d02f9743c5aba3a5b27cadcb406f8dab157d9c0b52bea1ed23a71b989ffd20c236d7cb93aa8c52d2 SHA512 87bf6bb4eff58e18e351fd0512c89cca99bb72dfca01dc33b892656a6ef283d3545072bb47a0f1034f27781df1647f3d046440392fd040481b687f75f589d44e
diff --git a/dev-python/sphobjinv/metadata.xml b/dev-python/sphobjinv/metadata.xml
new file mode 100644
index 000000000000..dc83e0f5d0f7
--- /dev/null
+++ b/dev-python/sphobjinv/metadata.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>andrewammerlaan@gentoo.org</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <longdescription lang="en">
+Using Sphinx?
+
+Having trouble writing cross-references?
+
+sphobjinv (short for ‘sphinx objects.inv’) can help!
+
+The syntax required for a functional Sphinx cross-reference is highly non-obvious in many cases. Sometimes Sphinx can guess correctly what you mean, but it’s pretty hit-or-miss. The best approach is to provide Sphinx with a completely specified cross-reference, and that’s where sphobjinv comes in.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">bskinn/sphobjinv</remote-id>
+    <remote-id type="pypi">sphobjinv</remote-id>
+  </upstream>
+  <stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/sphobjinv/sphobjinv-2.1.ebuild b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
new file mode 100644
index 000000000000..9afca30acd78
--- /dev/null
+++ b/dev-python/sphobjinv/sphobjinv-2.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Sphinx objects.inv Inspection/Manipulation Tool"
+HOMEPAGE="
+	https://github.com/bskinn/sphobjinv/
+	https://pypi.org/project/sphobjinv/
+"
+SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+# This requires pytest-check, but that does not work at all, even if it
+# is installed it still fails to find the check fixture
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-python/attrs-19.2[${PYTHON_USEDEP}]
+	dev-python/certifi[${PYTHON_USEDEP}]
+	>=dev-python/fuzzywuzzy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.0[${PYTHON_USEDEP}]"
+
+BDEPEND="
+	test? (
+		dev-python/dictdiffer[${PYTHON_USEDEP}]
+		dev-python/pytest-ordering[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		>=dev-python/stdio-mgr-1.0.1[${PYTHON_USEDEP}]
+		dev-python/timeout-decorator[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc/source \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-issues \
+	dev-python/sphinxcontrib-programoutput
+
+python_prepare_all() {
+	# --strict option is deprecated in pytest>6
+	sed -i -e '/addopts/d' tox.ini || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/spyder-kernels/Manifest b/dev-python/spyder-kernels/Manifest
index af49b87f3785..8d171586b685 100644
--- a/dev-python/spyder-kernels/Manifest
+++ b/dev-python/spyder-kernels/Manifest
@@ -1,7 +1,5 @@
-DIST spyder-kernels-1.10.0-gh.tar.gz 77416 BLAKE2B 0d3e3f8228d2a76174e8d7c64a55c9fda384961065673b1b6b64591f476e8932c5dc3fe253b67d94135688b8d346828f88800bdc3bb0b83450d51669218f98b3 SHA512 59a66d9f6c9b53a2cb058e1c493535ee18c3965a62d6ff728cc0f9544c35fbdf56f18024c778c242802f961259231e153cdcd98c867bec84a80ca3541dbcf455
 DIST spyder-kernels-1.10.2-gh.tar.gz 78924 BLAKE2B 47f0ec284f54590ee9c5a43caeeea61b644fccc6d6222dfbf85187beb9cc141504082dbf50d1d85f5315c8e8e46b9f810253d904b594bb4c52677271b0f7f12d SHA512 4bcbc2646493f384a3f5fad1cc2a42bbe1d06c5225362beb995a73e3c1abe482f3855d844c449b07631b4ffda99492ccbd3cbe69c515ed38d6a98913bea90e2d
-DIST spyder-kernels-2.0.1-gh.tar.gz 79786 BLAKE2B d4eeed1f2ff4e27ce4d55e3cfbd800f52553dba4c7a23978611d2a63ce43092153939cab78bd0b0025a7350d101f6399fccddfe90881aa414f321e3d1561e33a SHA512 ad08cb3e1f4dbcc8687d0142c8f07e224dac46513842d06d75b069aff1fac9cf818c7d14c753a673b2b95a08fdfba58d1133fa2896579e6b1232d87c7c359060
-EBUILD spyder-kernels-1.10.0.ebuild 1236 BLAKE2B 7c1d4a27dc1538e24f72139f4e28324c6abfc995395da615b37db9eaba7e62db6366c990fa954093213c8109460669411b9f0c0dcb29351339aa6226e1df1b3c SHA512 de0cbc3b385b2e785d9e33a835ce700008b1f61ef1373bdcca5412ccd5b9cbbb5670960b1b5c996a7019ad194a55217b4d74200e19d3eb8cf0bda24883284fb8
+DIST spyder-kernels-2.0.3-gh.tar.gz 80089 BLAKE2B c439317be60237fb1c0c110a46ca17ad6a7ec0f978e2bbc01d98a260ec2654b81a334059f8b349dec002a2f3c8d9e5279b7f208fe88ccaaaba52d171eb5ca487 SHA512 dd406640db545732e23ef5e1f0fbb6c1756dd651e49152d2d804b8e0ddcdc0f9ede04a48df861faf2153125c4971c515eb5edd327d93a19926e12b02737b9a66
 EBUILD spyder-kernels-1.10.2.ebuild 1342 BLAKE2B 0e2ad1fd6d5e3e8ff63487993ee6f49e9becef8cc688558d0b2e6fa4e408752e769b289e317f4a79ff69d282279168258fbb7ce0ed7b81f032551bde250eb8cf SHA512 2e1e25a8db0c3e3da14c684ba80d19225878c4e345be724858bac43218991f537a9515514469d975495c0e9616310081c49b510c4590cc2ce52080d9e6969c4c
-EBUILD spyder-kernels-2.0.1.ebuild 1477 BLAKE2B 851b06dc85b770a2fbdf08fce8592ab83e01756a40fb0e59cbf88a2e9f714a0dd718dc47044b07879db754c883be93de423298695854a0dac8beec1519e760c7 SHA512 3bcb12589f339f4341355508d2fb26293a34b51565e92f96bbfaa16a5d41cebd566437523932eb9780a48affae6baac685ca4716e96ff41b6d35bd3dad35590d
-MISC metadata.xml 697 BLAKE2B 292a9991c117c10175a61c481982d3b6b7a7a74e8b092b1b1dded8da87fe1974b2bb845c391947e884c9aef6d52c727070b69e0a3b145f12dd592eece341a5b2 SHA512 bdbf58aac531b961b7abc9cff798b3639a68aeb9c6a02531e76fc3dd0425ded2319b7ba5714669284fe5432a4a4a8ae144d4577bf758eb3aa57cd446c6939946
+EBUILD spyder-kernels-2.0.3.ebuild 1470 BLAKE2B 3fdeb12ae138e1762c2bec76be7e54ca7ba28e90ba78ed641a402ab72418dd197fdc4e06b0be51a6791bfb0c17041c1e1cda632d895927fd02adaf39db9c0500 SHA512 59c6bc5b956a38d31045078c9525a69daab8081ef5e72a9f77ae06eb4cf6462a84b1b2d147c7b750c40e51694e413ca788f1bc3d4f92f86ae0ea7c492b428433
+MISC metadata.xml 544 BLAKE2B 621ae952ca69bb37d3968b2c4e0eb9d613a6082467229a66f54cb62ac13f11e9a4f849ecc312d02c16d5af45921a9c1c15cc2ad552dfe3d105abfb67effcde6a SHA512 e4c77b881f16c1017fe2c3fb2f4072db36038e8a8aa57cd69233e1a807326398d80381fbcfc156ccee3294fee759df51546af36fc8273ec09955ffd7937ef72d
diff --git a/dev-python/spyder-kernels/metadata.xml b/dev-python/spyder-kernels/metadata.xml
index ca9ada26d5c7..d8d128a28300 100644
--- a/dev-python/spyder-kernels/metadata.xml
+++ b/dev-python/spyder-kernels/metadata.xml
@@ -6,14 +6,10 @@
     <remote-id type="github">spyder-ide/spyder-kernels</remote-id>
   </upstream>
   <stabilize-allarches/>
-  <maintainer type="person" proxied="yes">
-    <email>andrewammerlaan@riseup.net</email>
+  <maintainer type="person">
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</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/spyder-kernels/spyder-kernels-1.10.0.ebuild b/dev-python/spyder-kernels/spyder-kernels-1.10.0.ebuild
deleted file mode 100644
index dee8a56d5a37..000000000000
--- a/dev-python/spyder-kernels/spyder-kernels-1.10.0.ebuild
+++ /dev/null
@@ -1,45 +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="Kernels used by spyder on its ipython console"
-HOMEPAGE="https://github.com/spyder-ide/spyder-kernels/
-	https://pypi.org/project/spyder-kernels/"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}-gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-python/cloudpickle[${PYTHON_USEDEP}]
-	>=dev-python/ipykernel-5.1.3[${PYTHON_USEDEP}]
-	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
-	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/xarray[${PYTHON_USEDEP}]
-)"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# assert False
-	sed -i -e 's:test_dask_multiprocessing:_&:' \
-				spyder_kernels/console/tests/test_console_kernel.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/spyder-kernels/spyder-kernels-2.0.1.ebuild b/dev-python/spyder-kernels/spyder-kernels-2.0.3.ebuild
index 26cc27c5dd13..aecf4bff76ea 100644
--- a/dev-python/spyder-kernels/spyder-kernels-2.0.1.ebuild
+++ b/dev-python/spyder-kernels/spyder-kernels-2.0.3.ebuild
@@ -21,8 +21,8 @@ RDEPEND="
 	<dev-python/decorator-5[${PYTHON_USEDEP}]
 	>=dev-python/ipykernel-5.3.0[${PYTHON_USEDEP}]
 	>=dev-python/ipython-7.6.0[${PYTHON_USEDEP}]
+	<dev-python/ipython-7.23.0[${PYTHON_USEDEP}]
 	>=dev-python/jupyter_client-5.3.4[${PYTHON_USEDEP}]
-	<dev-python/jupyter_client-6.1.13[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	>=dev-python/wurlitzer-1.0.3[${PYTHON_USEDEP}]
 "
diff --git a/dev-python/spyder-line-profiler/Manifest b/dev-python/spyder-line-profiler/Manifest
index e8806d7ed987..edf7e2ca550d 100644
--- a/dev-python/spyder-line-profiler/Manifest
+++ b/dev-python/spyder-line-profiler/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-line-profiler-0.2.1.tar.gz 71109 BLAKE2B f16a5ac743b91a441b23b497a5aa8d1ede2f458a2de3e92d91c2f3af32621b07efa0fbf6646929a28c085117006044c8bf34f911c57bc221c12b1a71b949440e SHA512 2e6cdd8fe5387c8c229fdc503937cab3a30b72d2eb2a23a14de49584d317a1ed89eb76ebffbf03aed7a8aa5a183677c316814d50c73e79c6175da6a46e5937fb
 EBUILD spyder-line-profiler-0.2.1.ebuild 763 BLAKE2B dc937368a3009b8713da3a150a6f65177d2bff5567d68f1a462d81e2376c3dfd6724b53e9e2630cd72e25e3aa4e36e15064a7804223896be56a3f7cf8d7e6031 SHA512 c97ddd5b7229a0bb90262d39d5eb740a23b8d39d3d2b798bd3eb720690b5272159f039d29159818e11f27c0547a8184fe04b4b15e276c4ebf5ad225e3d2bf02f
-MISC metadata.xml 512 BLAKE2B b0f2d0d241a017c6678ad2ec4065fb56adf425d230cf4b9253f025fac672d50b53260b612dea988d4cd9344868c38c71f03cec6bbdf1c5ba994865b2e96bfd26 SHA512 c13d2be7e9fbdbe92ab063f5818b610c8a220700e2ef3b41d34fe05c9b236702a6e37e6752ffeed359d03f83b4dbd68f9c309e4be5d0ca157776871e77cc3d7a
+MISC metadata.xml 365 BLAKE2B e6bc87b902db4afa9456addfe7fa71c04a0efb696b6d3eb70c1cfc2f00752253ba3107fb20e59f781051fe6619ae5f97a22fc327e86ace28082d3db31ab87680 SHA512 297ad2c492be46f4615d9214f0a49054c6b437d18c20be8302f876680e8fe1fe6d0fbdd68c93a4e182ebca365716ec5b9fe86e69ea3371a0c81857298917e99d
diff --git a/dev-python/spyder-line-profiler/metadata.xml b/dev-python/spyder-line-profiler/metadata.xml
index c305fc8201a1..b30429d51415 100644
--- a/dev-python/spyder-line-profiler/metadata.xml
+++ b/dev-python/spyder-line-profiler/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">spyder-line-profiler</remote-id>
 	</upstream>
diff --git a/dev-python/spyder-memory-profiler/Manifest b/dev-python/spyder-memory-profiler/Manifest
index 5af32a2f4f72..2332367adedf 100644
--- a/dev-python/spyder-memory-profiler/Manifest
+++ b/dev-python/spyder-memory-profiler/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-memory-profiler-0.2.1.tar.gz 16802 BLAKE2B a42bddaa1a470b1e23c203033daca9870d873a5160a9600f4e2932d30e15885fa63c90e334d0e92e7ad6d2ef380f022c94753d5fb24b451259f11f44803c390d SHA512 14eb5ea0e5a87cbdce6dc4bbcdd7e3a4f3dec566955431173ade068e1b110f5282fefc960d94351bdf76be125f099414c6e3b776ac4288065139e222c43a30d9
 EBUILD spyder-memory-profiler-0.2.1.ebuild 771 BLAKE2B 0691ff8b2db6923fe401870042adc28e004b138987bf21a863a834f7fec1924bc498d961a160717bd928f4f8a56f892b0977c366d8220d54fcbc07bcbf67bbab SHA512 015c9b384182671e1b7a18b259e28297b875be6b8221fb6402fb01d4f51b2d8567c713666d0c8f8bff265133621dbabd6acfa542c46564bb78a24eac7b06ffd3
-MISC metadata.xml 514 BLAKE2B f5ef421058ca9f4b4e7393a62f72a416c592d1745c0accbba4dcfb237b3b3940c9b6091da8ceaa518c056a5499cffe85980b0eced6aadd937079b45cd104cd51 SHA512 f93256763d4d7c789204e3d58b2997ac8052130e631f2f95883e4b9c659554c3b36320de748e654de4bdffb5d3bf6b8461f3ead1093bf7015d51c3511ee1b54b
+MISC metadata.xml 367 BLAKE2B cb31c58ecdeca62c0d79b546fb55079d3ca6994a017a1c990dc58c2acc7f12784dec3616399e0c8b080994781018cb1f760b08409edfc0b76c04a98792af2631 SHA512 8e8d1bd5305ccfe2bea91bc88e66f4893de24e7a7d33714d0d8a0d4595b45f9d4a8d22127c7e41bc2dd3d7ab17caa0d37793179653c233b77101f94f1caa1897
diff --git a/dev-python/spyder-memory-profiler/metadata.xml b/dev-python/spyder-memory-profiler/metadata.xml
index 393dd96435ec..1cfd12a72a44 100644
--- a/dev-python/spyder-memory-profiler/metadata.xml
+++ b/dev-python/spyder-memory-profiler/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">spyder-memory-profiler</remote-id>
 	</upstream>
diff --git a/dev-python/spyder-notebook/Manifest b/dev-python/spyder-notebook/Manifest
index a5a1e0f46965..0a2b0a49237b 100644
--- a/dev-python/spyder-notebook/Manifest
+++ b/dev-python/spyder-notebook/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-notebook-0.3.2.tar.gz 3868854 BLAKE2B ca13e905dcc02d6767002481fb68ab8bc119d4d2511a1b881f033b9387d4237a1b2232ba75368f48b4d096998da40a14d862f125c0b01c6b2498165acebf4835 SHA512 dd3b505c8a678a9f49b1fce1d22a8a1a6cf334b65d1ab94852a7ba2120f53e2e38eb2fa0d58343588d7304511d7171d8e0040e10cda905db11ab65cae7f6ce5c
 EBUILD spyder-notebook-0.3.2.ebuild 1228 BLAKE2B 364fcc006db8d5bd53ba15a80e832f6e1171322fb94e613c150f42fc7af6592b8cabbf992648c748a48418f25a674fef36d0a52f30fd98eafd853eaa6c57fee1 SHA512 27642d8542400ad94a7f437bb046aba85dbb446eb4b0dab767e6ea9bd1298ba77e80d4115861acf7b3fb534f14815896f0a98ce526b52e818dc6f8b76c251d53
-MISC metadata.xml 507 BLAKE2B 952538bde526901549563e4f8152ce2b7bb8438d6d7ba6036ec5bd8762a6a19110a7dbf3a5205adf4474717591d0847d72dcfab2fcb50bea16a9d83aedc8af5d SHA512 3040eed21dcf551154cbf66e6b26c832fa48e616a7f087d42ac90e3190fa1bddc44daf406dc0fdbb4c0a2a7797ac8632bc17ccae3e1477c9f8b666c3b7e83265
+MISC metadata.xml 360 BLAKE2B 0c9d7f85523a02c6a4c867c2a4ae0c706d69f9bf7ffde077c28c97d9b12348ff797101cb784e702b4b6d910823efe5f0d426fdc4c7952efa02ae79c2cbf3041c SHA512 679dbf9cc9d01046262a7371dc9b523349583a6f8e2586f5ea06c1e91332f6aee004109c62d255a9d8ee61be40706097427cd1027c4a63487ad87609de9e3fae
diff --git a/dev-python/spyder-notebook/metadata.xml b/dev-python/spyder-notebook/metadata.xml
index c6b8218f432d..98fe853de34e 100644
--- a/dev-python/spyder-notebook/metadata.xml
+++ b/dev-python/spyder-notebook/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">spyder-notebook</remote-id>
 	</upstream>
diff --git a/dev-python/spyder-terminal/Manifest b/dev-python/spyder-terminal/Manifest
index bd680d8b4c37..dd78f2ff41f1 100644
--- a/dev-python/spyder-terminal/Manifest
+++ b/dev-python/spyder-terminal/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-terminal-0.5.0.tar.gz 10070777 BLAKE2B 2b556597b62e822a94102c393818c9b479292f1e9b61fb70a48f9627bc5ccd493eeb5624406cbb205970a2b1613bb47310d92a969cf190dee296e34daafb7c2e SHA512 8a73a46adbd628a80a8a7c8f9f50c8ed4a00c64adbb6f0934a32840397f9a5840f516380728abe1e31b659415e82bd38d1a5418bae43229b61e4e6340fc8c19b
 EBUILD spyder-terminal-0.5.0.ebuild 601 BLAKE2B 2075d0a23fbec1e74fa089ee902115e7f92d407321562cec87cf5b8520f8c9b3895e6427317b0a36d19e34cd71fb408b88ef3da1d8a0f5a79b185a87e220ec81 SHA512 804e0871a44ce6994e103da52f2c3cdd277ed266fb83c3b32e5ee20d18e7567d5131702ee08c1f820b58f72623b515cfd423c57d530b1814e06dc83aa9748116
-MISC metadata.xml 507 BLAKE2B 00eb8b11ad7622f66c4354294ec0b8c315c8a03bb982784c2facd321f5997e5f6ac7ca60073bfd47413d6ac497f5e0eef7b8138395ff9b48be00ce3f1130293a SHA512 773b7062aa8a108e9625ef14962b7cffee8d30d9bc30b668e5e0c8e2e26d791dcab236487a3c6173e912bd90e3f3be48015224e5daf9000f9591c9ffc53b5163
+MISC metadata.xml 360 BLAKE2B 76b0535377eaf46594ae7a7dd1fabd1d5c3a53e476e2068c66b7b50773f21e7fe1bf609b12e03763e276131d5f426aa95df7d483d993b0cdabb683fe884a2db7 SHA512 87e065d435f8fcff1c0da0e69c50904e5ce13980ae5463cec66013acdff144b5274289347bb9fa16c519cd4345a22062289b74537a5aaafc5606ac4614cdefa5
diff --git a/dev-python/spyder-terminal/metadata.xml b/dev-python/spyder-terminal/metadata.xml
index a8b9b9d83ea9..e77bde2acce4 100644
--- a/dev-python/spyder-terminal/metadata.xml
+++ b/dev-python/spyder-terminal/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">spyder-terminal</remote-id>
 	</upstream>
diff --git a/dev-python/spyder-unittest/Manifest b/dev-python/spyder-unittest/Manifest
index 1f2579a28fe3..ba34593adf70 100644
--- a/dev-python/spyder-unittest/Manifest
+++ b/dev-python/spyder-unittest/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-unittest-0.4.1.tar.gz 79158 BLAKE2B 10b7a8fde9dffdb436c44f22d305ceab84970dabd19aaeb7b5685be21f0e7bfc701a5fbbf9e393a71c9feb36dd6a2be68680e276c8d0841b2133a7171c504e3f SHA512 17e08b09accd938bf533c409f9a8011e9780f9cc4533af0ec754b6a01061490f198213cb77af9050e1e67e2b4b9c25251bbab27dce23d3f6e09f502cfbef95fc
 EBUILD spyder-unittest-0.4.1.ebuild 1087 BLAKE2B 115193cb8c05517fe0cea34a539c566af576fab8eeba8e09fa60c42976392a8bbca4b275f4679287ac8a0401cbc14ef308477884c0b8cf0a762c7d6c6dbdbc22 SHA512 3d1e2dc0ad19de63ecabc27759c1409cd79c89079aab2bcf01a496adc3e82904c1a8ea596913fe0136b5e80d4d5ce36810b773e61693677e94b49416697e63a1
-MISC metadata.xml 507 BLAKE2B 3a19d1820af5f83b3fdeab949c8a32e0a7fca246921711fb312d3c2b55bd30db355b2fe32a3f1084fd3b9f1d06409925932330977b02233975dea6915dbf6389 SHA512 a5245523d7c95ea05fd2c5c3f786f1ec91480751f44a17d7220f5bc80b9d1ef1763273b8d0f6fc331f40db723395ffe56cf7b424814ad31216f728be1e67b5db
+MISC metadata.xml 360 BLAKE2B 8157712dad4e0e35bb988afacd2c0d4a6b1e5cdfe16c64958d7aafbab827e87bcd8cbf4e7de4c04328311d3a80b609fa53123e92c53562bab77fb95c23bfdcba SHA512 522539af150d97c3ee19cb04b110584777ac903cee791a635078f4b14a1c215f43d6327f7e0e3345e217e4501676f0d91e2276ff0b824fb95ab38e73db659fe5
diff --git a/dev-python/spyder-unittest/metadata.xml b/dev-python/spyder-unittest/metadata.xml
index f67bf8d25f88..c16dbea39070 100644
--- a/dev-python/spyder-unittest/metadata.xml
+++ b/dev-python/spyder-unittest/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="pypi">spyder-unittest</remote-id>
 	</upstream>
diff --git a/dev-python/spyder-vim/Manifest b/dev-python/spyder-vim/Manifest
index d96a96c106fe..4bba940d9da5 100644
--- a/dev-python/spyder-vim/Manifest
+++ b/dev-python/spyder-vim/Manifest
@@ -1,3 +1,3 @@
 DIST spyder-vim-0_pre20201026.tar.gz 293554 BLAKE2B 1ee4122e5a149d029d67f93acabacf81af47b2a7d9902ef2c3a5bc289e5c532c8b2f15ce59cb0b8bb16eb6b3ea461c3ce44ff85f6f8d022cea5e5b482987a8fc SHA512 98b479b4ab2be5e1cbe730e1d4441c5d557d32ad7caee31ed2e6c936d97554ca50f3f0b0d2cef68be7742653946d3c87a01938479664de4066e22b13441c58fa
 EBUILD spyder-vim-0_pre20201026.ebuild 806 BLAKE2B 08fa791def71696d7e5c98bd19adf317057a174a878fbdafa045078851c6a50771ec001e6d922e27fd38e8d955ce1dc7eaa26bbdc331ca3c32f6511cb673878c SHA512 c08d96f7b6fff994f99c8dcc430aa75e0d4e35949229444429fc04c9df46f84a210621a36a347cc8385b64cf9b3747c778723f539eb904eea9c94f081c4de87c
-MISC metadata.xml 429 BLAKE2B df9915ad475e8959cf7bd42471f7c74cff92331250e382a2602d3d915aed98fcb80d9c02cf9c7c4f348e19a123a81f2367912e1c6218fed000d4ae395dd9ef77 SHA512 d67be1ea40fce1bf45ce271f90fd0ccd687d7b716eb374af5f4c7e0d3ade8f9ad336351499fa57ca0ca3a66d8c2a3ad60cd6952ec96bb7b20466f89cb977e867
+MISC metadata.xml 282 BLAKE2B 723887f64c8928a88fb027b9281cf3c37264eb14d86c5f53a2e63f7b86da612a18f9fba397e4a8b57df75ddb755e4f62a2c2759174b3fcd8c9dfb3d19a0219f2 SHA512 b7943b255eaee8517f7cc0fc5d081ead6a0f380348dcf376dff573c40163502257a1df896c9ff47c5c572f5363f4750b2147b68e11ef4351c0c5c994336f8504
diff --git a/dev-python/spyder-vim/metadata.xml b/dev-python/spyder-vim/metadata.xml
index d232c13afa50..900b4fbe1830 100644
--- a/dev-python/spyder-vim/metadata.xml
+++ b/dev-python/spyder-vim/metadata.xml
@@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-python/spyder/Manifest b/dev-python/spyder/Manifest
index 6c0a3be7ddfc..1ab194bc4abf 100644
--- a/dev-python/spyder/Manifest
+++ b/dev-python/spyder/Manifest
@@ -1,12 +1,11 @@
 AUX spyder-4.1.5-doc-theme-renamed.patch 375 BLAKE2B f4c902b331e9e6f034018d781d483380e85b3277f5e8f3f64f15ebcd4673ee1a805838a10c5606aa853c1c0779c10a439bb556dd57a7427bf96aa2fce0c7b9a9 SHA512 7671f0639c8947a0cbd4ac24c0a9731cb31a7c8f2ca49ac7a9d2dc8f4b7b08aa033448c285ba71f844fc8588167bf91b44c3cadaf3fd83883160c2eddc5b7e7b
 AUX spyder-4.2.1-build.patch 1232 BLAKE2B 54bef30dca6cc94a7a32fab200bceed1a01f730f4758f03b97688d3ecf5709e8c7b37af82746452520c2f3135722b4e387f3ef9d9219e1d159b8abe937d8165f SHA512 052f249b5f6b2195a472750f42b16721de9e8020481cb57bb5e180267507df6f6b5f1a36b8a45f28b64d098c8a02a4814c1c03f1efdcd1ffedaca77a28ad8705
 AUX spyder-5.0.0-build.patch 1147 BLAKE2B 68e62f6bd7a021d82f1da8d86c16e2289faac7f760f9bb5dc975053c7f8bb409c79b90eeaf06c5121ca5833442b61929cc640e4f25e6cc27f6118f0fa8f27b5e SHA512 e88cbbeca42ac2720f4e0888df9432d912d3907af267d3fe6a5e658d18d1242c998a70dee88fa0efe9edfcf87a46a40cf75685037d75fce1d596b708acc32096
-DIST spyder-4.2.3.tar.gz 11539371 BLAKE2B aecd2e9772c52e644e9c0503195e380fffecdfaa5aea3f00a64e98a969faf3de4e0d8eb0515cc59893f28deb7733403826e90e36006ad7f8f4d67e8ef5e64543 SHA512 9e56efab8862c21e7496d45e813d28c4e9be583275352b0a6e0a58e99f6c0234fa9862da66705839beacb971dde9b6edc253405d9d62853a3c4c9c9991844846
+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.0.tar.gz 19967667 BLAKE2B 072d65949f83e8831a6c88ef5472401f7b6ef305dd193baea34d63ce865d49a1181d0282df2e4c0025ff928e6a0a6c13312fb69f3329343a45def6ee9f30b9d3 SHA512 c76355314c7f623fbcc99540c8ecc4b57c18f9c0551688b1e4016b4510262305837d1637df38f412314fc98abd2c359d834bf380300a46b098503db561f83177
-DIST spyder-docs-5c9c8a3317045c2d301e05b751943be9b521d129.tar.gz 66692311 BLAKE2B ec741a9cd830bc8a5776be1d52dcac9649c8abf33faec0ac8741d95625d8aeda2b8c0d2bdbef02c068a22ec62a4d5281a48e996530e1bd2e6de43b86e0a14ffe SHA512 73bd05ef31f69ebd80bb488017998536c4ed0e63a331efe743d9d858b936df287253f333d09beac6d2b249a96e8f82538d321850a64b0941db3d0141122995eb
+DIST spyder-5.0.3.tar.gz 20586502 BLAKE2B b8223273b638b57827f17037c47bb7bf53f19978fe9db343e354f557f4da17cfa03a36c013cab68b8b91b66495316a12d9652d864b8b089a495668b667a26b8c SHA512 c9b7c3a6755bc14ae84d8cd2c4166620a6fd1e83c097e2766f9f5190057775e4e3e9ba192d9eeb1cc434be11ac392f767239ae2d98cf40d95ffda4cf7cbeb358
+DIST spyder-docs-588cdf55cceffea7a3f31d98c0720bfe7df34b72.tar.gz 75780347 BLAKE2B c344ee0798e5780bfac5a8483c2992dfdddba5222fdd4a7c5603514bc612cc7300ec0cb49ebdcce6633d0cca8a5a36cfb5a2105c7f91febb5982dc2ea40fb86c SHA512 72f4644e872c57e229da8958a125bf405fa073ff99071b3555d97d8f8f71dc7b9f0dffbe61adf886e6bf3191894c639dd408d8dc76d65bc170bf7578b5b05558
 DIST spyder-docs-78b25754c69a20643258821146e398ad5535c920.tar.gz 69167467 BLAKE2B d2815d552002f329b5fac59329fba3b3b0cd592bcbdacc0878966919e44dbab29548533661e60a1b9b8fd763d57d1e4c2f761782ace1b0a814a5f0cec1f66af9 SHA512 10764367fd5f830d7a3620b9d9e7ec4ab74539c1f48326c0c40f7caff74a50401addc7609fe1558c57dac4649d0a214c0d2d77cecd100bd8574151134e49634d
-EBUILD spyder-4.2.3.ebuild 9501 BLAKE2B 8b4a24ab55eaa8e8bb4fbf2ead29606fa2a8106de85a39812dda797e40dc76e8fac2fd721b07e23c34ef9af90039c8439d2e32374d705ed4d6c524305f50c308 SHA512 b65a386f5e8ea9061c2538111e009c74f8f2b422b2dab5140bfe5deff39a372ad96abe5c1c3c711f02fb32ed5b905d4092b4552baa1952ba274201c7ff10d619
-EBUILD spyder-4.2.5.ebuild 9549 BLAKE2B 3f2cba49588a07d818deac45b72a8ea8c711758fc97326d267d1a6b21ed8f2f87246f4aa74db55e903f63fba8ba27bddd3b55c9176c63a7e6dcbf79e5b8b9a60 SHA512 4f698fcab0f3396a73620f8702991f30d822830888d8c84005fe306fc6bb33d0b40dddb27f8351604d5585163141b401e8313b3add98654272e846be95a29541
-EBUILD spyder-5.0.0.ebuild 7715 BLAKE2B 8f17e97c549ff1cab6e6769c051bc03f3acceb3a5083f712671399adb9439be8d5107389b54db7403d9a69ecf0bdd1b498460e31b715d0c5c3a4791070c53f47 SHA512 a3b044e98998bd5ae4dbbb7642a8a3d8eea8ebb964605b0982e5fb350cf89d8bb0589edb757045634c6b6057f7b6dab1b06590a240a9abe97e743affe2c1a2a9
-MISC metadata.xml 1468 BLAKE2B fa0cb704afb02b7f48b183b39be4693662a340a2ca56910bc188b5e015b3cb9b42e727b8cc908a39d6d331b0b9b3f5eadb66750f62a55369033292f3ca1dc900 SHA512 60a052889be1543d2f3c451aa72e6bdf51ee6fb55163eea1a796e44d69b59625a368d48da8201a2909392ab5477c1e57d3d8904d978ff28d26609058772e12eb
+EBUILD spyder-4.2.5.ebuild 9322 BLAKE2B df0f65151072a0fafcad3392be2404e9a45e154bd2e9c8db1de6835b3057d8cb47193bf80c0999fe67cd75dd6a05470650ca23fb9a6be3ce1fe02b5e0f18879c SHA512 06c087701e4f93161f5671b5e2cf0c26a78038cb3c85ff15edc247565f47a738ba5f2eda9c17cf4269030f997e6a836953c56ca2a8e9619d36dc9862d2310013
+EBUILD spyder-5.0.3.ebuild 7087 BLAKE2B 6fd7b11ea335cd58ca1bb6878ac55f169f3e4639fad83ae8fb5accf6f8e7a7d4bd2d285a2dc46f7a23063028362e8040fe632afdd7c7c8c2844799f8c8693b20 SHA512 c68d36cd42cccfcd74714ea03a9634f0927a33523467122f44c8b3f5490ee46c4e22f2d9eece5b6c0ea1c627a0add8347ad55141ba0783d92ea8a512c4792fc6
+MISC metadata.xml 1315 BLAKE2B d6969e1a2167c283ef39b5041f58307ce0eda6a70ec0efa6aad7f0871dd9202f857af5d5a676bcc45af9f31743b856ac6c7e90e3767f82810f2c27a2b266d76a SHA512 eb59a948abca8c2920705647d09d339d09e10d27b08ed3e4ff6acdfb2cf0662fc60c3983d6bf44cfe68b11023f7c71b642b0453d0e11c1c701f281a1dfb3be08
diff --git a/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch b/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch
new file mode 100644
index 000000000000..5edf7e854d0b
--- /dev/null
+++ b/dev-python/spyder/files/spyder-5.0.1-doc-theme-renamed.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/conf.py b/doc/conf.py
+index a3dc817..f428860 100644
+--- a/docs/doc/conf.py
++++ b/docs/doc/conf.py
+@@ -143,7 +143,7 @@
+ #
+ # CI = True
+ # TRAVIS_BRANCH = 'master'
+-html_theme = "pandas_sphinx_theme"
++html_theme = "pydata_sphinx_theme"
+ html_logo = '_static/images/spyder_logo.png'
+ html_theme_options = {
+     "external_links": [
diff --git a/dev-python/spyder/metadata.xml b/dev-python/spyder/metadata.xml
index 856ece14e5e3..c54c89a66fe5 100644
--- a/dev-python/spyder/metadata.xml
+++ b/dev-python/spyder/metadata.xml
@@ -5,14 +5,10 @@
     <email>python@gentoo.org</email>
     <name>Python</name>
   </maintainer>
-  <maintainer type="person" proxied="yes">
-    <email>andrewammerlaan@riseup.net</email>
+  <maintainer type="person">
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
   <stabilize-allarches/>
   <longdescription lang="en">
     Spyder is a powerful scientific environment written in Python,
diff --git a/dev-python/spyder/spyder-4.2.3.ebuild b/dev-python/spyder/spyder-4.2.3.ebuild
deleted file mode 100644
index 5edd16889371..000000000000
--- a/dev-python/spyder/spyder-4.2.3.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-# The warning that this is wrong is a false positive
-# Spyder has setuptools in install_requires
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit optfeature xdg distutils-r1
-
-# Commit of documentation to fetch
-DOCS_PV="5c9c8a3317045c2d301e05b751943be9b521d129"
-
-DESCRIPTION="The Scientific Python Development Environment"
-HOMEPAGE="
-	https://www.spyder-ide.org/
-	https://github.com/spyder-ide/spyder/
-	https://pypi.org/project/spyder/
-"
-SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz"
-
-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.
-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}]
-	>=dev-python/cloudpickle-0.5.0[${PYTHON_USEDEP}]
-	>=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-language-server-0.36.2[${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.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-
-	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/pyls-spyder-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
-	>=dev-python/pyzmq-17.0.0[${PYTHON_USEDEP}]
-	>=dev-python/qdarkstyle-2.8[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.0.1[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
-	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-1.10.2[${PYTHON_USEDEP}]
-	<dev-python/spyder-kernels-1.11.0[${PYTHON_USEDEP}]
-	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
-	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
-	<dev-python/watchdog-2.0.0[${PYTHON_USEDEP}]
-
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
-"
-
-BDEPEND="test? (
-	dev-python/cython[${PYTHON_USEDEP}]
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	<dev-python/pytest-6.0[${PYTHON_USEDEP}]
-	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-ordering[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}]
-	dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-)"
-
-# Based on the courtesy of Arfrever
-# This patch removes a call to update-desktop-database during build
-# This fails because access is denied to this command during build
-PATCHES=(
-	"${FILESDIR}/${PN}-4.2.1-build.patch"
-	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
-)
-
-DOCS=(
-	"AUTHORS.txt"
-	"Announcements.md"
-	"CHANGELOG.md"
-	"CODE_OF_CONDUCT.md"
-	"CONTRIBUTING.md"
-	"NOTICE.txt"
-	"README.md"
-	"RELEASE.md"
-)
-
-distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc dev-python/sphinx-panels dev-python/pydata-sphinx-theme dev-python/sphinx-multiversion
-
-python_prepare_all() {
-	# move docs into workdir
-	mv ../spyder-docs-${DOCS_PV}* docs || die
-
-	# these deps are packaged separately: dev-python/spyder-kernels, dev-python/python-language-server
-	rm external-deps/* -r || die
-	# runs against things packaged in external-deps dir
-	rm conftest.py || die
-
-	# do not depend on pyqt5<13
-	sed -i -e '/pyqt5/d' \
-		-e '/pyqtwebengine/d' \
-			setup.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:_&:' \
-		spyder/tests/test_dependencies_in_sync.py || die
-
-	# can't check for update, need network
-	rm spyder/workers/tests/test_update.py || die
-
-	# skip online test
-	rm spyder/widgets/github/tests/test_github_backend.py || die
-
-	# KeyError: 'conda: base', need conda??
-	sed -i -e 's:test_status_bar_conda_interpreter_status:_&:' \
-		spyder/widgets/tests/test_status.py || die
-
-	# assert 2 == 1
-	sed -i -e 's:test_pylint_max_history_conf:_&:' \
-		spyder/plugins/pylint/tests/test_pylint.py || die
-
-	# https://bugs.gentoo.org/747211
-	sed -i -e 's:test_loaded_and_closed_signals:_&:' \
-		spyder/plugins/projects/tests/test_plugin.py || die
-
-	# AssertionError: assert '' == 'This is some test text!'
-	sed -i -e 's:test_tab_copies_find_to_replace:_&:' \
-		spyder/plugins/editor/widgets/tests/test_editor.py || die
-
-	# hangs till forever
-	sed -i -e 's:test_help_opens_when_show_tutorial_full:_&:' \
-		spyder/app/tests/test_mainwindow.py || die
-
-	# Assertion error, can't connect/remember inside ebuild environment
-	rm spyder/plugins/ipythonconsole/widgets/tests/test_kernelconnect.py || die
-
-	# AssertionError: waitUntil timed out in 20000 miliseconds
-	sed -i -e 's:test_pdb_multiline:_&:' \
-		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
-
-	# AssertionError: assert 'if True:\n    0\n    ' == 'if True:\n    0'
-	sed -i -e 's:test_undo_return:_&:' \
-		spyder/plugins/editor/widgets/tests/test_codeeditor.py || die
-
-	# assert False is True
-	sed -i -e 's:test_range_indicator_visible_on_hover_only:_&:' \
-		spyder/plugins/editor/panels/tests/test_scrollflag.py || die
-
-	# AssertionError: waitUntil timed out in 10000 miliseconds
-	sed -i -e 's:test_get_hints:_&:' \
-		spyder/plugins/editor/widgets/tests/test_hints_and_calltips.py || die
-
-	# Fatal Python error: Aborted
-	sed -i -e 's:test_module_completion:_&:' \
-		spyder/utils/introspection/tests/test_modulecompletion.py || die
-
-	# assert 0 > 0
-	sed -i -e 's:test_maininterpreter_page:_&:' \
-		spyder/preferences/tests/test_config_dialog.py || die
-
-	# This hangs forever
-	sed -i -e 's:test_load_kernel_file:_&:' \
-		-e 's:test_load_kernel_file_from_location:_&:' \
-		-e 's:test_load_kernel_file_from_id:_&:' \
-		spyder/plugins/ipythonconsole/tests/test_ipythonconsole.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-# Calling pytest directly makes the tests freeze after completing even if successful
-# Exit code is nonzero even upon success, so can't add || die here
-# test results should be checked for success manually
-python_test() {
-	${EPYTHON} runtests.py
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	optfeature "2D/3D plotting in the Python and IPython consoles" dev-python/matplotlib
-	optfeature "View and edit DataFrames and Series in the Variable Explorer" dev-python/pandas
-	optfeature "View and edit two or three dimensional arrays in the Variable Explorer" dev-python/numpy
-	optfeature "Symbolic mathematics in the IPython console" dev-python/sympy
-	optfeature "Import Matlab workspace files in the Variable Explorer" dev-python/scipy
-	optfeature "Run Cython files in the IPython console" dev-python/cython
-	optfeature "The hdf5/h5py plugin" dev-python/h5py
-	optfeature "The line profiler plugin" dev-python/spyder-line-profiler
-	optfeature "The memory profiler plugin" dev-python/spyder-memory-profiler
-	# spyder-autopep8 does not have a release (yet)
-	# and are not compatible with >=spyder-4.0.0 at the moment
-	# optfeature "The autopep8 plugin" dev-python/spyder-autopep8
-	optfeature "Vim key bindings" dev-python/spyder-vim
-	optfeature "Unittest support" dev-python/spyder-unittest
-	optfeature "Jupyter notebook support" dev-python/spyder-notebook
-	optfeature "System terminal inside spyder" dev-python/spyder-terminal
-	# spyder-reports not yet updated to >=spyder-4.0.0
-	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-	elog
-	elog "Spyder currently only works with PyQt5 as QtPy backend, PySide2 is not supported."
-	elog "Please ensure that 'eselect qtpy' is set to PyQt5."
-}
diff --git a/dev-python/spyder/spyder-4.2.5.ebuild b/dev-python/spyder/spyder-4.2.5.ebuild
index cc39e8e83c52..0fac6b43bcbe 100644
--- a/dev-python/spyder/spyder-4.2.5.ebuild
+++ b/dev-python/spyder/spyder-4.2.5.ebuild
@@ -83,7 +83,7 @@ RDEPEND="
 	<dev-python/qdarkstyle-3.0[${PYTHON_USEDEP}]
 	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
 	>=dev-python/qtconsole-5.0.3[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
 	>=dev-python/spyder-kernels-1.10.2[${PYTHON_USEDEP}]
 	<dev-python/spyder-kernels-1.11.0[${PYTHON_USEDEP}]
@@ -91,9 +91,6 @@ RDEPEND="
 	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
 	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
 	<dev-python/watchdog-2.0.0[${PYTHON_USEDEP}]
-
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
 "
 
 BDEPEND="test? (
@@ -244,7 +241,4 @@ pkg_postinst() {
 	optfeature "System terminal inside spyder" dev-python/spyder-terminal
 	# spyder-reports not yet updated to >=spyder-4.0.0
 	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-	elog
-	elog "Spyder currently only works with PyQt5 as QtPy backend, PySide2 is not supported."
-	elog "Please ensure that 'eselect qtpy' is set to PyQt5."
 }
diff --git a/dev-python/spyder/spyder-5.0.0.ebuild b/dev-python/spyder/spyder-5.0.3.ebuild
index f524585bd2e9..7684a0869cb6 100644
--- a/dev-python/spyder/spyder-5.0.0.ebuild
+++ b/dev-python/spyder/spyder-5.0.3.ebuild
@@ -3,15 +3,13 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-# The warning that this is wrong is a false positive
-# Spyder has setuptools in install_requires
+PYTHON_COMPAT=( python3_{7..9} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit optfeature xdg distutils-r1
 
 # Commit of documentation to fetch
-DOCS_PV="78b25754c69a20643258821146e398ad5535c920"
+DOCS_PV="588cdf55cceffea7a3f31d98c0720bfe7df34b72"
 
 DESCRIPTION="The Scientific Python Development Environment"
 HOMEPAGE="
@@ -21,28 +19,21 @@ HOMEPAGE="
 "
 SRC_URI="
 	https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz -> ${PN}-docs-${DOCS_PV}.tar.gz
+	https://github.com/spyder-ide/${PN}-docs/archive/${DOCS_PV}.tar.gz ->
+		${PN}-docs-${DOCS_PV}.tar.gz
 "
 
 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}]
@@ -62,66 +53,67 @@ RDEPEND="
 	>=dev-python/psutil-5.3[${PYTHON_USEDEP}]
 	>=dev-python/pygments-2.0[${PYTHON_USEDEP}]
 	>=dev-python/pylint-1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-language-server-0.36.2[${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.6.0[${PYTHON_USEDEP}]
-	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
-	<dev-python/pyflakes-2.3.0[${PYTHON_USEDEP}]
-	dev-python/pylint[${PYTHON_USEDEP}]
-	>=dev-python/rope-0.10.5[${PYTHON_USEDEP}]
-	dev-python/yapf[${PYTHON_USEDEP}]
-
-	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pyls-black-0.4.6[${PYTHON_USEDEP}]
 	>=dev-python/pyls-spyder-0.3.2[${PYTHON_USEDEP}]
+	<dev-python/pyls-spyder-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-language-server-0.36.2[${PYTHON_USEDEP}]
+	<dev-python/python-language-server-1.0.0[${PYTHON_USEDEP}]
 	>=dev-python/pyxdg-0.26[${PYTHON_USEDEP}]
 	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
 	~dev-python/qdarkstyle-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/qstylizer-0.1.10[${PYTHON_USEDEP}]
-	>=dev-python/qtawesome-0.5.7[${PYTHON_USEDEP}]
-	>=dev-python/qtconsole-5.0.3[${PYTHON_USEDEP}]
-	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},svg,webengine]
+	>=dev-python/qtawesome-1.0.2[${PYTHON_USEDEP}]
+	>=dev-python/qtconsole-5.1.0[${PYTHON_USEDEP}]
+	>=dev-python/QtPy-1.5.0[${PYTHON_USEDEP},pyqt5(+),svg,webengine]
 	>=dev-python/sphinx-0.6.6[${PYTHON_USEDEP}]
-	>=dev-python/spyder-kernels-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/spyder-kernels-2.0.3[${PYTHON_USEDEP}]
 	<dev-python/spyder-kernels-2.1.0[${PYTHON_USEDEP}]
 	>=dev-python/textdistance-4.2.0[${PYTHON_USEDEP}]
 	>=dev-python/three-merge-0.1.1[${PYTHON_USEDEP}]
 	>=dev-python/watchdog-0.10.3[${PYTHON_USEDEP}]
 	<dev-python/watchdog-2.0.0[${PYTHON_USEDEP}]
+"
 
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/PyQtWebEngine[${PYTHON_USEDEP}]
+# python-language-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.6.0[${PYTHON_USEDEP}]
+	<dev-python/pycodestyle-2.7.0[${PYTHON_USEDEP}]
+	>=dev-python/pydocstyle-2.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyflakes-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/pyflakes-2.3.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}]
-	dev-python/flaky[${PYTHON_USEDEP}]
-	dev-python/matplotlib[tk,${PYTHON_USEDEP}]
-	dev-python/pandas[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	<dev-python/pytest-6.0[${PYTHON_USEDEP}]
-	dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
-	dev-python/pytest-mock[${PYTHON_USEDEP}]
-	dev-python/pytest-ordering[${PYTHON_USEDEP}]
-	dev-python/pytest-qt[${PYTHON_USEDEP}]
-	dev-python/pytest-xvfb[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/scipy[${PYTHON_USEDEP}]
-	dev-python/sympy[${PYTHON_USEDEP}]
-)"
+BDEPEND="
+	test? (
+		dev-python/cython[${PYTHON_USEDEP}]
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/matplotlib[tk,${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		<dev-python/pytest-6.0[${PYTHON_USEDEP}]
+		dev-python/pytest-lazy-fixture[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-ordering[${PYTHON_USEDEP}]
+		dev-python/pytest-qt[${PYTHON_USEDEP}]
+		dev-python/pytest-xvfb[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		dev-python/sympy[${PYTHON_USEDEP}]
+	)"
 
 # Based on the courtesy of Arfrever
 # This patch removes a call to update-desktop-database during build
 # This fails because access is denied to this command during build
 PATCHES=(
 	"${FILESDIR}/${PN}-5.0.0-build.patch"
-	"${FILESDIR}/${PN}-4.1.5-doc-theme-renamed.patch"
+	"${FILESDIR}/${PN}-5.0.1-doc-theme-renamed.patch"
 )
 
 DOCS=(
@@ -136,13 +128,12 @@ DOCS=(
 )
 
 distutils_enable_tests pytest
-distutils_enable_sphinx docs/doc dev-python/sphinx-panels dev-python/pydata-sphinx-theme dev-python/sphinx-multiversion
+distutils_enable_sphinx docs/doc \
+	dev-python/sphinx-panels \
+	dev-python/pydata-sphinx-theme \
+	dev-python/sphinx-multiversion
 
 python_prepare_all() {
-	# Fix detection of spyder-kernels
-	sed -i -e 's/>=2.0.1,<2.1.0/>=2.0.1;<2.1.0/g' \
-		spyder/dependencies.py || die
-
 	# move docs into workdir
 	mv ../spyder-docs-${DOCS_PV}* docs || die
 
@@ -150,7 +141,7 @@ python_prepare_all() {
 	#    dev-python/spyder-kernels,
 	#    dev-python/python-language-server,
 	#    dev-python/qdarkstyle
-	rm external-deps/* -r || die
+	rm -r external-deps/* || die
 	# runs against things packaged in external-deps dir
 	rm conftest.py || die
 
@@ -173,10 +164,10 @@ python_prepare_all() {
 }
 
 # Calling pytest directly makes the tests freeze after completing even if successful
-# Exit code is nonzero even upon success, so can't add || die here
-# test results should be checked for success manually
+# Exit code is nonzero even upon success, so can't add || die here test results
+# should be checked for success manually
 python_test() {
-	${EPYTHON} runtests.py
+	"${EPYTHON}" runtests.py
 }
 
 pkg_postinst() {
@@ -200,7 +191,4 @@ pkg_postinst() {
 	optfeature "System terminal inside spyder" dev-python/spyder-terminal
 	# spyder-reports not yet updated to >=spyder-4.0.0
 	# optfeature "Markdown reports using Pweave" dev-python/spyder-reports
-	elog
-	elog "Spyder currently only works with PyQt5 as QtPy backend, PySide2 is not supported."
-	elog "Please ensure that 'eselect qtpy' is set to PyQt5."
 }
diff --git a/dev-python/stdio-mgr/Manifest b/dev-python/stdio-mgr/Manifest
new file mode 100644
index 000000000000..e6edeca5d760
--- /dev/null
+++ b/dev-python/stdio-mgr/Manifest
@@ -0,0 +1,3 @@
+DIST stdio-mgr-1.0.1.tar.gz 8447 BLAKE2B 72038ea34177829d77ac239585775557b5a0a253879c027b2aad64045ec8bafbfdc250d94fe61cde96f06616f774edf42b384bfef7fbf69af442b0a9b703cf9a SHA512 2d18e5d65faa7a73373b56fdac3893768a65a36bed17f017b647e71431a6bff44ce1d39022f1dbbd31ddc9c0e704743a164f4b7610fb62d75aa34ecb53331366
+EBUILD stdio-mgr-1.0.1.ebuild 770 BLAKE2B 750b8847d1edee2c16b70ab5b5e10674b1ca18db9ea22625e8bf90d725839b3478be6c76cfda38dc7ba846d6aea8737b9ee63a05e0829413288aeba2bebd99dc SHA512 09b20c55b358453d677edf6812de3b7e8e142b1b602e2bcc6d724b97dc4ebb877da87e03d4c5a12185c863fa99f298b663feab5040394c22624e2d29efb5a0b5
+MISC metadata.xml 913 BLAKE2B b98d63af5f5319b7e6b8fd1525a3eb761fd9882caa82e798b35c9f20e150d038c5a69ead06f7dee1b8cbab1adc539b13c025ecdbfc9476b49f74930c15b15eaf SHA512 c15ccd5cccd925c9c2a5821c66ef2babe90c3bf54e1ecd0473b6e02e869649600b503c9c32669180db74b1a4464c75ebbbf39f08d1896b5903bc3fa4d8811311
diff --git a/dev-python/stdio-mgr/metadata.xml b/dev-python/stdio-mgr/metadata.xml
new file mode 100644
index 000000000000..cfe2eacab93b
--- /dev/null
+++ b/dev-python/stdio-mgr/metadata.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="person">
+    <email>andrewammerlaan@gentoo.org</email>
+    <name>Andrew Ammerlaan</name>
+  </maintainer>
+  <longdescription lang="en">
+Have a CLI Python application?
+
+Want to automate testing of the actual console input &amp; output of your user-facing components?
+
+stdio Manager can help.
+
+While some functionality here is more or less duplicative of redirect_stdout and redirect_stderr in contextlib within the standard library, it provides (i) a much more concise way to mock both stdout and stderr at the same time, and (ii) a mechanism for mocking stdin, which is not available in contextlib.
+  </longdescription>
+  <upstream>
+    <remote-id type="github">bskinn/stdio-mgr</remote-id>
+    <remote-id type="pypi">stdio-mgr</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
new file mode 100644
index 000000000000..4c032aa553ed
--- /dev/null
+++ b/dev-python/stdio-mgr/stdio-mgr-1.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Context manager for mocking/wrapping stdin/stdout/stderr"
+HOMEPAGE="
+	https://github.com/bskinn/stdio-mgr/
+	https://pypi.org/project/stdio-mgr/
+"
+SRC_URI="https://github.com/bskinn/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND=">=dev-python/attrs-17.1[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+# doc directory is not included in the release tarball for some reason
+#distutils_enable_sphinx doc \
+#				dev-python/sphinxcontrib-programoutput \
+#				dev-python/sphinx_rtd_theme
+
+python_test() {
+	# skip the doctests
+	epytest tests
+}
diff --git a/dev-python/stomp-py/Manifest b/dev-python/stomp-py/Manifest
index ab4412e42a96..2333d766c6d9 100644
--- a/dev-python/stomp-py/Manifest
+++ b/dev-python/stomp-py/Manifest
@@ -1,3 +1,5 @@
 DIST stomp.py-6.1.0.tar.gz 34690 BLAKE2B bf7ec2899be25bdc373e7d0d73281a6c4aa8b91a05e6ede263f0f9498b2ba3b9bd2c90b0fe472664c930dadf68ccaf09c74b69e7270259c3959396edff04e07b SHA512 73284b5dac8b9ef0d1251cc1059c4b1a545018a39498303d211fd165f0fb80439f2e01f82e18644cfd5d77a4badedcbced57d184ffc7c19f57945e5262f2394a
-EBUILD stomp-py-6.1.0.ebuild 1075 BLAKE2B 4108b6e5a5eea47b52544c4e59dd1876a52773386afef700c8d76a4233e8572aedd22095a1b332119af293402a9788634fea83e6af1593061881d49cff597778 SHA512 65b3b2a294c2e864cc01dba5decb7f3f49b1f5b03782609c7b934f115cb027d3256cb1e90c62b6213bc26f665b6cc349080e47a5c2baf48bd7b3ed71bceb8105
-MISC metadata.xml 377 BLAKE2B 239bc7a6ea8a0ce5cae1bbf292e03629688cd4b89930e1da64885a3f8aeaa1bac842dc2cd5bd352cd71d4d49ba2982e156e2f1099b218b871d56c636580e2688 SHA512 5f5036635fea124c854ad05263897205110f552cbc63b5c21bd98f73fe0de42e448ed0060aa6130f74d9e4b558c1633fbcc09eec3f128b21cdd3ae3936c691f4
+DIST stomp.py-7.0.0.tar.gz 34772 BLAKE2B 838ee5ebf520bcf0c65d89b00e94c8cadb77204a4d387fa0261b8b8046d123d436fe587481c9a3db9d515b11fcdf246993c955834ff18b9161ff3355341caa3a SHA512 2cce1803125bb60c98ebf7c58c27130a13a2c42c0135e590752fae7a13a82edf3337c85f6ec2fb050e9ece0d3dc604a526610445a1a410fbe440ac8596608f34
+EBUILD stomp-py-6.1.0.ebuild 1074 BLAKE2B 255e9e9e9642db5313e8272bd746734f3fcbbd6c5a57513a3161973c41fe189204ef437ed2512348904937a1c3b59d2b01bb00fd74423e868aca5db9bcae07d7 SHA512 0a8515aaa521554bc2d330baa9e8bae6b5fc2610228fc5cc6731518d5d006fe69def92c0036e3c7ca3d18e420dda2328529d9a4ab07cabeb9fa8f8a9be54c26a
+EBUILD stomp-py-7.0.0.ebuild 1076 BLAKE2B e1101e18f7f564efe1ad1b4e2345ee843b982b2b4b90aff4165d6413fff301b8ff1a8c37ef530eeef056f46f9168074d115fdad07ea46b0cfd4ca3176e5b522d SHA512 7ae566502bdfb15faaa368f001b80adf808f5ddcf31dc0aed978e2112a960889c3f787027f56820ed3660ec221d9e4cd0ec8c71d6883e3ff22a881874f2ec639
+MISC metadata.xml 401 BLAKE2B 5389f4b1d74ff0cb071a2b8fd823902201ba27142dfe1c5506a4e66d99f382cb7439b26de51bc549c40e065067523040621a393574595c4ea8eebe9d130f0895 SHA512 559a80bd20cb399c72006260d3bcaf52fe65dac71eabe77097b772168d8ffef5a9c5619587c7f0563f0193232635c72795d4cdbb7234cd00d93054738c334351
diff --git a/dev-python/stomp-py/metadata.xml b/dev-python/stomp-py/metadata.xml
index 53838ba131f5..57331ba1ba4f 100644
--- a/dev-python/stomp-py/metadata.xml
+++ b/dev-python/stomp-py/metadata.xml
@@ -5,6 +5,7 @@
 		<email>marecki@gentoo.org</email>
 		<name>Marek Szuba</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">stomp.py</remote-id>
 		<remote-id type="github">jasonrbriggs/stomp.py</remote-id>
diff --git a/dev-python/stomp-py/stomp-py-6.1.0.ebuild b/dev-python/stomp-py/stomp-py-6.1.0.ebuild
index 43324414a605..bbf0a20a46a9 100644
--- a/dev-python/stomp-py/stomp-py-6.1.0.ebuild
+++ b/dev-python/stomp-py/stomp-py-6.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="<dev-python/docopt-0.7.0[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/stomp-py/stomp-py-7.0.0.ebuild b/dev-python/stomp-py/stomp-py-7.0.0.ebuild
new file mode 100644
index 000000000000..394f084db633
--- /dev/null
+++ b/dev-python/stomp-py/stomp-py-7.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_SETUPTOOLS="pyproject.toml"
+
+inherit distutils-r1
+
+MY_PN="${PN//-/.}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python client library for the STOMP messaging protocol"
+HOMEPAGE="https://pypi.org/project/stomp.py/ https://github.com/jasonrbriggs/stomp.py/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="<dev-python/docopt-0.7.0[${PYTHON_USEDEP}]"
+
+# stomp.py test suite requires quite a few appropriately configured
+# messaging servers (as of 7.0.0: RabbitMQ, ActiveMQ, ActiveMQ Artemis,
+# stompserver). Upstream relies on Docker to provide those servers, however
+# doing the same in src_test would require both granting the portage user
+# extra permissions and packaging the base image (trying to download it
+# on the fly would violate the network sandbox).
+# Side note: PyPI tarballs do not include tests.
+RESTRICT="test"
+
+S="${WORKDIR}"/${MY_P}
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 5bbcd3e3c876..58d3558e3ddf 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,3 +1,5 @@
 DIST stripe-2.56.0.tar.gz 216066 BLAKE2B 1473c0b5a0f53cea18120b6234ed7f310c3625592423f16e77ca3a87c8a79f61c19c0c5f09d071a2be84e4f0d8b5323cc9f1de2e24a74bd24e557c9eb48b2c38 SHA512 1f2f08b5425ad48df9afc78f574109604319ccfcdb2fba8ca574008de5dadb349eec84d0e6cf532c57218bc8624af9b256a29ef01facb950a3cfd1168d8c2660
+DIST stripe-2.57.0.tar.gz 216286 BLAKE2B 9f2c3b7d4ae3f100647a1cae32d09f258703890eb97637ab2a9d3fc1d2fc30eae7042e4245d8f62a5cb4a5226337a7b22813d992842326aaa57d7ecb3a1da200 SHA512 c63efabc8febe79a01167ad4c166d9498f8623a3b1d36c292a3554cbacfc6aada1bf5ec720723b5a9de6e5c4fb770b8f44d1c95289aff4394a70a0301df61e93
 EBUILD stripe-2.56.0.ebuild 1720 BLAKE2B a9d99433b7d151404034b4f8f8e54f4fe48bf54235a337bc2d682ee6b4f622f2765ac8caecf82c42fc185fcb16f428de12670bd8af6de839658c8a52a3158a3c SHA512 90bad27eaa41834eab73abfd0d2d8093335854df0758d7d01a52f97d1dbd03195b0ae430f60f5efa7427ce161b31a2ea10c6fcae0c521b8e735b584671219aa7
+EBUILD stripe-2.57.0.ebuild 1722 BLAKE2B c94800d5bb0cb03e31a9b897eff15cf76b2e2a922740346103e4ac62b4ceedf6b282999ca4b4a98b74b817eae9af22e07cd8790aae203941c3ac5e8dc2f99029 SHA512 efd8a8afa15e7187ddedb17c1b6e4b52f44493bf0766ccf0df2dad28ec3651b78f8475a1a39fb0af9f0c332fd971d5bf41bc2c400403cf83af9b2d2318234138
 MISC metadata.xml 347 BLAKE2B 864b8bb1a2e79187e4ad90b1377591685a989619a955f7c85eccb80d918b6a03977ecaac744abae18408b97fabf8a205035e941f967a94d6ddbd550de05484f2 SHA512 9f18753a3d3a452f3d0423af1f10fbf476a5a9ae4a70ce4131eb9beab30fc5475dcf18437532a4ad386d780411ac5a00156a1d818348ae7f4eba2fbad5d191cd
diff --git a/dev-python/stripe/stripe-2.57.0.ebuild b/dev-python/stripe/stripe-2.57.0.ebuild
new file mode 100644
index 000000000000..3895e0af78a6
--- /dev/null
+++ b/dev-python/stripe/stripe-2.57.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Stripe python bindings"
+HOMEPAGE="https://github.com/stripe/stripe-python"
+SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
+"
+DEPEND="
+	test? (
+		${RDEPEND}
+		>=dev-util/stripe-mock-0.103.0
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		net-misc/curl
+	)
+"
+
+distutils_enable_tests pytest
+
+DOCS=(LONG_DESCRIPTION.rst CHANGELOG.md README.md)
+
+src_test() {
+	local stripe_mock_port=12111
+	local stripe_mock_max_port=12121
+	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
+	# Try to start stripe-mock until we find a free port
+	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
+		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
+		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
+		local stripe_mock_pid=$!
+		sleep 2
+		# Did stripe-mock start?
+		curl --fail -u "sk_test_123:" \
+			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
+		eend $? "Port ${stripe_mock_port} unavailable"
+		if [[ $? -eq 0 ]]; then
+			einfo "stripe-mock running on port ${stripe_mock_port}"
+			break
+		fi
+		(( stripe_mock_port++ ))
+	done
+	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
+		eerror "Unable to start stripe-mock for tests"
+		die "Please see the logfile located at: ${stripe_mock_logfile}"
+	fi
+
+	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
+	distutils-r1_src_test
+
+	# Tear down stripe-mock
+	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
+}
diff --git a/dev-python/swagger-spec-validator/Manifest b/dev-python/swagger-spec-validator/Manifest
index 273df61e1b0d..a3bcf43f256d 100644
--- a/dev-python/swagger-spec-validator/Manifest
+++ b/dev-python/swagger-spec-validator/Manifest
@@ -1,3 +1,3 @@
 DIST swagger-spec-validator-2.7.3.tar.gz 21364 BLAKE2B 05e4d3281c112895eff88050f1902161ecd661c77179f9421cd1335a04e759a67480a53858977a5b8ad4b2ad749c8940e01a646960954ee1006b3e75481c5103 SHA512 182e67f6b2a83c61a2ad452614557cfdebf72e30178f3882ba27a55bcbc475c34a02db46ed037065e986ae24970ab398ba7992fbe1e07f7b45cfb5ddb0379759
 EBUILD swagger-spec-validator-2.7.3.ebuild 629 BLAKE2B 9b8f01c0567dbfdca9f19c65f6518c48e5a0383a215827831e2f3f99da73ffaa35d0f0d53ba687ca874c5a6b50bc6c52a3a4916700377a0a309ee1fa2b0be12e SHA512 b70b75812f8e928097cca4231883995022b1e5d4f65b79a48dbed5b72f2ca0bd7f46f8a308ee7c591ffcc1258acb829ac181afc4d378087b85cf04b141e39342
-MISC metadata.xml 333 BLAKE2B ea0f480b1da972e004dc52bf11be19e79b6a8897d80fc663d1bc2ae1d4fbb570a2102fe74c7d551efdc8a5e01cd47ce3278aeeea6e7f4faa17f0744aecfeeb17 SHA512 e2215c329a1e077e63bbfc60b33d9be1ae7e6fb3eac5f29ae1d72c9c99a653552bfde2f8d5c39915fef9ca2e1473ceeb5c7f96d670a9ab04df6884bf1560b701
+MISC metadata.xml 252 BLAKE2B 83c5c9f77d606437deb080ea6950eddc421d779fc3525dd10fa03906a75817c8123e7913d9b91df25b7e19118ce8d0bf3c6ddff19b7d0e506f97aed4aff53479 SHA512 9302382f49255c0998176dd9e264a1885504d8cd5f288d0977967f10fad8665032e47a5ce18808b6d60860f2091dc009ac5138a5b1760f4d762091a880e0d74b
diff --git a/dev-python/swagger-spec-validator/metadata.xml b/dev-python/swagger-spec-validator/metadata.xml
index 39003aa1d43a..6a998deea2a8 100644
--- a/dev-python/swagger-spec-validator/metadata.xml
+++ b/dev-python/swagger-spec-validator/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="person">
-		<email>williamh@gentoo.org</email>
-		<name>William Hubbs</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="pypi">swagger-spec-validator</remote-id>
 	</upstream>
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index b2809dce424d..4c6fc9798717 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,5 +1,3 @@
-DIST sympy-1.7.1.tar.gz 6974183 BLAKE2B 4bd8c9d60c46b05a7fc6c622667858fe17d25798756dbe967ce19abc8047263fe540f332e39418e877852c0565270377bd01fea7e65aa35ed4e03079bc130805 SHA512 eb9387bb9c632203af650279f896427556725b7496c00d8dfe97b7476beedbbee5714659f7fb44b4fa986c9567cdcaefcc19401d63e1ca0e9a6c7317855440ea
 DIST sympy-1.8.tar.gz 7167842 BLAKE2B 878c6daf0584c9da54f82b9c68c62715792db428ab4ebfb355f0368c52edb254947d1ce1919e651279b767295ecb00a76b8cbbaa1fbe9c97915221c7403c3ded SHA512 61141e1d0a6105e725fb415edbdf981b3aa95debcfe73f9da5ca36afc7a70e91b5c28ed45454054c1b9a8d45e42bfe724e5b20da717746c301fd095da17f4db7
-EBUILD sympy-1.7.1-r1.ebuild 1847 BLAKE2B 6de0bc9fd9c65680f2f1208eafd20a3d94d8ca9658b1508efefaa834ec60bdd829ddbb4cb7af36d59958e39c54dedc58aff6d58e7f4101f1c7ea4a7ece39b5f0 SHA512 ede543165181565b24379c9a060293f4ed4282ec2f734587d1be857c0ddb81b5fc9aa3ca9961843bdf0da215aece84949eea1f07ddc46b1027a67f3db3194ee9
 EBUILD sympy-1.8.ebuild 1622 BLAKE2B 2961f3a8a7f7581ea7ffd541a6adbfd86be33960f0e4a70b33d7af10babb3dae78de1d716cb051b1b1654c1f2c743b7a6d74a80c6896c79b1c19c506ad82c349 SHA512 178dc6d257b6bbe346cd7591a75e80db443cd25c06e93af087719c7a54de8389aa5c9dc51cc167c97030c0646403cf7e9d41aec65e4577f630d76bf82ee359f1
 MISC metadata.xml 1714 BLAKE2B c3f014cb556c1bc6de0d2d153d3bcd768f7529bd84a78560943118007faa6cba2aaef0543d4eafd9089789f9c0ca25a4cb4cd77f475799fc3726104e73e560bf SHA512 e46a7c8c36e0fdad39bd458f21a0b9ecc5bab84fb54931914ee131ac869b11069fa2692bf7eeae4edc4d0b42e0537cc53088c78f4ab286773b1fb896a5293cce
diff --git a/dev-python/sympy/sympy-1.7.1-r1.ebuild b/dev-python/sympy/sympy-1.7.1-r1.ebuild
deleted file mode 100644
index bb21c2569356..000000000000
--- a/dev-python/sympy/sympy-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://www.sympy.org/"
-SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs theano"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-BDEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="dev-python/mpmath[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-	theano? ( || ( dev-python/theano-pymc[${PYTHON_USEDEP}] dev-python/theano[${PYTHON_USEDEP}] ) )
-"
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" setup.py test || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.md )
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/tekore/Manifest b/dev-python/tekore/Manifest
new file mode 100644
index 000000000000..c17b2037011d
--- /dev/null
+++ b/dev-python/tekore/Manifest
@@ -0,0 +1,3 @@
+DIST tekore-3.7.1.tar.gz 258235 BLAKE2B e04edfab294ac3dac1fb086f296bf3fcc463cdad981d435fdd19ec812f1bb2ff79cacaa94d5105dc1070dd56602cc9a502537c68020cb27b2eb5b3c93788f193 SHA512 ed315a0b5b071265d2ba12d996bedafdea87286fd1beecc14d247176f2bdd2245e0220fb186ce4bd6eec2bc13a764f74b067ce1e546d8c30e618a4bdc3bf02e0
+EBUILD tekore-3.7.1.ebuild 958 BLAKE2B ee010f3200e8a1c61a1c23c3a3b675f50fab8de8c6c9e97daba0074ac23dc36543b8cc94b322ac033dae4a878aa1661bcf0a6360c88d35d1435b8f7f997528d9 SHA512 8ac1081cea163c94a0c55e8b8e77c7354ddcd471d58cfed3ece83fcb002e7f4f0f244eb28a9d52c2b21d0fd95ce5dff07b88c3be1cd74833c1e4679b05df0c1e
+MISC metadata.xml 411 BLAKE2B 948c30b3dcb538e9e4aa7216ab09898248abd74ff706d7a4f603affa1d97680764a2006e9f5c12e64f27f368cee028eddc3e3336a0ff34af99b0e23f0c9e6001 SHA512 95f11eb525271e57dd65b2bc960b46f2bc1c78bc5507ca60da13d477ed86c29f2d3204e8fa64e899614046ce8a057b83a8a67193482a09f245d21301da45daab
diff --git a/dev-python/tekore/metadata.xml b/dev-python/tekore/metadata.xml
new file mode 100644
index 000000000000..7908fd78d76a
--- /dev/null
+++ b/dev-python/tekore/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">felix-hilden/tekore</remote-id>
+		<remote-id type="pypi">tekore</remote-id>
+	</upstream>
+	<stabilize-allarches/>
+</pkgmetadata>
diff --git a/dev-python/tekore/tekore-3.7.1.ebuild b/dev-python/tekore/tekore-3.7.1.ebuild
new file mode 100644
index 000000000000..128ffe74a887
--- /dev/null
+++ b/dev-python/tekore/tekore-3.7.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Spotify Web API client"
+HOMEPAGE="
+	https://tekore.readthedocs.io
+	https://github.com/felix-hilden/tekore
+"
+SRC_URI="https://github.com/felix-hilden/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"
+
+RDEPEND="
+	>=dev-python/httpx-0.11[${PYTHON_USEDEP}]
+	<dev-python/httpx-0.18[${PYTHON_USEDEP}]
+"
+
+BDEPEND="test? (
+	>=dev-python/pytest-asyncio-0.11[${PYTHON_USEDEP}]
+	<dev-python/pytest-asyncio-0.15[${PYTHON_USEDEP}]
+)"
+
+DOCS="readme.rst"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs/src \
+	dev-python/sphinx_rtd_theme \
+	dev-python/sphinx-autodoc-typehints
+
+python_prepare_all() {
+	# requires network
+	sed -i -e 's:test_bad_arguments_raises_error:_&:' \
+			tests/auth/expiring.py || die
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/terminado/Manifest b/dev-python/terminado/Manifest
index 75ceac759206..5949818d465e 100644
--- a/dev-python/terminado/Manifest
+++ b/dev-python/terminado/Manifest
@@ -1,3 +1,5 @@
+DIST terminado-0.10.0.tar.gz 14059 BLAKE2B 9fedf12900275154068f5bac97a7038bbd9f655b30a1f3f50f5a66f581b7ed7599116be8eb59d1a82234455574b3a85f239f25af81b03967e986da01b5cee87b SHA512 a0fdbe904e617659a96a594430da3bc00a8addf93b111557355cca48f7d7e39ea1f388d6cb4179de1c10a35c0bec0c69e97c38e1ce77823b5c938c04fa1a632a
 DIST terminado-0.9.4.tar.gz 13934 BLAKE2B 8544d70a7c561005370bbb2b16db593ac9e4453b729b58d641b99066dc1255e294b712958d54a35a92d85e30b918a1122d24e97400b967858b542498d76305b5 SHA512 ab297e60c1adb25b5fbfcd0246db12f5df3acceeac3357af310602da3915345cb2d4fb460cc303cc4b5b5df237e750ce123ac0ed98a9bf7c6e8493783398cbc9
+EBUILD terminado-0.10.0.ebuild 803 BLAKE2B b8181832241ec69788aebbe64a6fc1109d6212ffef44f9120185855e543904c03e26d21e4f21fab2cac199295b336d27c6e07dc95165863527825630178d2b70 SHA512 49a6be7dca9d0af8078ba7e4dbd255ab31b1496720c57f211566cb1a7a0a16f76777f73592b1a1ff86569a4c17d84b49d4c7b7a4cbea2d56d9a89540aa3316e1
 EBUILD terminado-0.9.4.ebuild 801 BLAKE2B 0151f449932bf36a7e0da4faba3bbba4ab785c03e899994f55eee66526470deb3b288a251af7b35101e20471fd192ba57e203fa071dbe346b336c68876fce2b3 SHA512 7e2cbdc88d7b0ff8197a8967787991ab0322b89441836e3bfcfc86639e167f417aa498c77361053c03d2fc2d290bb4d89652c9afe7e1938705af36043360276a
 MISC metadata.xml 406 BLAKE2B dec60c3428988bbfd3007f2b26d8ecab06a95cbe5c4394e19f063e9dcab48a31d20c6e07d1600ee2249b72fd95d48fc80e9c9c32e44a74f2b2adc9d3fef84742 SHA512 7dc32ac28a0fc70ec0616c821723e1ed3a754da904963eba60e1cd634e955994fbcff05ab7bbc05df2b0beff74aec441349ba0b9566294e9ea387e6928c8d6dc
diff --git a/dev-python/terminado/terminado-0.10.0.ebuild b/dev-python/terminado/terminado-0.10.0.ebuild
new file mode 100644
index 000000000000..45482f499c02
--- /dev/null
+++ b/dev-python/terminado/terminado-0.10.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Terminals served to term.js using Tornado websockets"
+HOMEPAGE="https://pypi.org/project/terminado/ https://github.com/jupyter/terminado"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/ptyprocess[${PYTHON_USEDEP}]
+	www-servers/tornado[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
diff --git a/dev-python/testpath/Manifest b/dev-python/testpath/Manifest
index 8e10f3ffddc1..75de819e5043 100644
--- a/dev-python/testpath/Manifest
+++ b/dev-python/testpath/Manifest
@@ -1,3 +1,5 @@
 DIST testpath-0.4.4.tar.gz 92101 BLAKE2B e607fbccf66570ebe29779701bac11048751e9ee8381cd7841ba5dc55e02ee2edc32e8fd8a4a869fdd786f0c4bacdb5e7efc644e0111c24a786631257a08c9cb SHA512 4435c99325d535c713e88b59ce16704e10947232e4eccfe0e792ff9288b65e677417881ce8bbb69577aebb4b9ef793621d8e54898ecb158d07fc22e8445950e2
+DIST testpath-0.5.0.tar.gz 93168 BLAKE2B 864ac80e027192fb1a83f1a15db55fe72729154c7236f2054abfe161be36741614732efbea2a6b4eeb1fb59befa36002d767b4113fab98202ff22330ad15e21d SHA512 d960da04b490b355c5ca9d8e348d81a0d528f13dc7a2b5d6d3c09327a603c1582bce76f7de6d1666b490112306a10d6a19c7979c1119fb726c08c712a08bbcb0
 EBUILD testpath-0.4.4-r1.ebuild 722 BLAKE2B 502726ac5906bed17a14903d206235d0d0b3ed9f39ffaa8eba88433cd19f67b2682d97200358f2819948f9066895b4a25628f4bb547fd925c7b16612ea8f3ebc SHA512 bb11c35555a6694564774daf6ea6bf0bc772e4e646b2bca1068c3a6615a8b4d3faeffb127825c4b006245a3295c0138254e09494979cc39e3fcdae1722c87e0b
+EBUILD testpath-0.5.0.ebuild 766 BLAKE2B 2cd2aabc9f6408f712ba7541df3026626ed0d826d0b0d27792d396b3aac8d69c76f64a9808f932ec34a5c73bcfe630245ee887dadd5c577a5e933548786fb778 SHA512 f4dd5038626c2cb01f5146996bb972c6db1c83bf0e0d15509392f5d1b144e8f05c7de811f04d965ddc48dc1925c8900c0e25abc16a0e3c8dcdd5e243b591a689
 MISC metadata.xml 764 BLAKE2B 66ca0cbf31a2ae4f9e59e232c029f530b9b6fb5d6d53c9a3a4fd69293a987f3a46c6530e20a9c4cca4056a91b546062b9aa2135d537de276255ae6188633257d SHA512 7787d485d68e575b8a0e01dd20bffaa317c8168a1dfb38cab9c6bdbe80778131e9ac1bb8dee91bcf6ee91de5ec466027f7b1fdcd65d5fbd81dc8433804e3f3d1
diff --git a/dev-python/testpath/testpath-0.5.0.ebuild b/dev-python/testpath/testpath-0.5.0.ebuild
new file mode 100644
index 000000000000..44cf89905b50
--- /dev/null
+++ b/dev-python/testpath/testpath-0.5.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Test utilities for code working with files and commands"
+HOMEPAGE="https://github.com/jupyter/testpath https://testpath.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/jupyter/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-macos"
+
+BDEPEND="
+	>=dev-python/pyproject2setuppy-15
+	test? (
+		dev-python/pathlib2[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx doc
diff --git a/dev-python/textdistance/Manifest b/dev-python/textdistance/Manifest
index e8b37435b270..bf6f845c4570 100644
--- a/dev-python/textdistance/Manifest
+++ b/dev-python/textdistance/Manifest
@@ -1,4 +1,4 @@
 DIST textdistance-4.2.1.tar.gz 45095 BLAKE2B c0b7fec8adb3a90fc2f3c939a39492887a4989e16d6bd9c548fceb1d5020323d2782dabdb69ae17dc4c3cd795425b3fbdf9bb6041b1ef7df840c2b3a9e2a7e05 SHA512 daff22077800e42ae266edd8614a1300f3f2d080868dbd38e14d035f19853e555485d27ab0392401318e0c4ddc81fbf1b537dd3aa1ba25d7a89e5f0edde8ce46
 EBUILD textdistance-4.2.1-r1.ebuild 1074 BLAKE2B af7b120b00b9256ea3f7f2c39f6177a4fc004336f1ef342fbd47aae44f6a80ca636bf1848a9421f37dd8ca5b8785bb492b736aae25b4223d0199343626440b0c SHA512 8a688c15def007024bbc777890b7dedbc6dc04c3a8ad7415528df46025ad852cccbfdcf9a1dabb55c0080d7204cc4adb69683c4e0cc22679dcdf40742df8a8b8
 EBUILD textdistance-4.2.1.ebuild 1070 BLAKE2B ea01755ffc5dc171ad3c0a192e2f09183835853bc6ca5f79b38bb8da53d1f7afb967e31753262e917efc1ff5c3bdd26d0a524aae345df28dd24be7d9378e7b8e SHA512 98b95403d09f2b70e7061c10239fd704e923181d330e28d22efdff7f1402e851cf01b7556a697823dcda5bfbebf57122b3be75f9547354b763982ce75fc049ae
-MISC metadata.xml 562 BLAKE2B 7b2da3e27c8f8870d80a59189ce1025d26f28002882f9e0df47a549c406ae1b074e83196e382d1f1bff17491052e7d2244ab1ae6e022e7159bbab4c63821ff4f SHA512 f3a6544d16475049f713b68196684ab5ecc5e66380460d5dbe7bc0b2ff16fae9f9bc82c1ac6fd215c2d21efb7d89a5d0509a037637ca0ba18c38519d8e8ab0e7
+MISC metadata.xml 415 BLAKE2B a8a3649de603eea73f305f59cbcb73e50a6774579d1431cb92d2597d9704d3839d27b4bcc6d40ff2b6d7212a0946f664d1b9520d35bd14289e2a3e5603c289fe SHA512 2a46c37d723adaa0ee69c5f22d0267f8f3e89f59cce17c2aa9d0a5333f3737ee4db2adc535b6b561c027a12ac5c99ce8d595dc3ec7e4e2e1a79b1a86fc4cb1df
diff --git a/dev-python/textdistance/metadata.xml b/dev-python/textdistance/metadata.xml
index 5b3c0dc6221c..b78634726053 100644
--- a/dev-python/textdistance/metadata.xml
+++ b/dev-python/textdistance/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">textdistance</remote-id>
diff --git a/dev-python/three-merge/Manifest b/dev-python/three-merge/Manifest
index 711c8fac37e1..db592f2f870f 100644
--- a/dev-python/three-merge/Manifest
+++ b/dev-python/three-merge/Manifest
@@ -1,3 +1,3 @@
 DIST three-merge-0.1.1-gh.tar.gz 7312 BLAKE2B 06aa9e88b258bdd418276b418da338625e60cc95872db0147fc4a1ede7d7b9c1a716d3c0662236d289a0bd583d405c33259ba6e26af0033be499f68e1298a38b SHA512 3219e7b5813942fac5317673fcb6b051cdf0efbbe6cb2ee7d0ce6eabeeddb9a2dc7c88677f732833192c6a864d2191bd21afb06b3e110ded8712a03bf6bfcdcc
 EBUILD three-merge-0.1.1.ebuild 660 BLAKE2B 25f2171f6f80354c16dab87bb230a3eb9765be8871cacb3a3c4712e83c763024ec0e40cf8f193382041670365693d39198f5624821c48ae3eb3fa596188c4c3b SHA512 f7f6e6a1c5d43cc8cf005efd2e63cf20a078f1a8438bee9ef0be62be77aac993e5fa8eddc26d032ec34077edc67ed2cd216cc8ebe10e4d5d203313214a13e298
-MISC metadata.xml 559 BLAKE2B 3d63834a9b324cb620b7054f52c7e43df06c74905a343832b1ca52eaf4b20094cdc37ee13a33bf3745cc1581adc84346087d88007859f6e878035eda7e51fd03 SHA512 ffba596825067ed3c12bfe8e41fba37dfcb27949bddbec28d21b805fb3edab996f1d00421fd027d8a182afd6c3b7fce4b87afc1127b98f430573a4008e860728
+MISC metadata.xml 406 BLAKE2B 1c2571f132c1dc990e2a4bf387dcb55d7f4a3ca9f3d8f4b38e2838d37a4069bb15637831587acdf05f20212dc8ee8fe54de97b7de597a94a25a2fa49d959879c SHA512 d30016f81a55fb25dbf7b5d43d62a7447068a3a8b9f08a3bad3d42adff101a99aa995f3977cd645d344eb3b931318454ccde11fcb34f91c6d51b8af8c3684099
diff --git a/dev-python/three-merge/metadata.xml b/dev-python/three-merge/metadata.xml
index 469357ce4cb7..3fbc59f479cf 100644
--- a/dev-python/three-merge/metadata.xml
+++ b/dev-python/three-merge/metadata.xml
@@ -5,12 +5,8 @@
     <remote-id type="pypi">three-merge</remote-id>
     <remote-id type="github">spyder-ide/three-merge</remote-id>
   </upstream>
-  <maintainer type="person" proxied="yes">
-    <email>andrewammerlaan@riseup.net</email>
+  <maintainer type="person">
+    <email>andrewammerlaan@gentoo.org</email>
     <name>Andrew Ammerlaan</name>
   </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
 </pkgmetadata>
diff --git a/dev-python/tikzplotlib/Manifest b/dev-python/tikzplotlib/Manifest
index f9b1ca18a646..1e06336f2656 100644
--- a/dev-python/tikzplotlib/Manifest
+++ b/dev-python/tikzplotlib/Manifest
@@ -1,3 +1,3 @@
 DIST tikzplotlib-0.9.8.tar.gz 589858 BLAKE2B 81bb2ece7d3f5976d928095caa3d8d51b619c97a4b36eea14f4b4477d31e78a978c2eeab81e9829bb9113e70f0035a572a82a229fea61ee08530d57334fda986 SHA512 a2b25d9820fd8185d4e7a03fb0669fa4c9b35aac9b371b0a873174d615bd40615f1fafa4208d2019af0b7ffe80a8eec6b56ad6075104f6c3a4f8f237ad5b4466
 EBUILD tikzplotlib-0.9.8.ebuild 1012 BLAKE2B b01ce8208ee5d2e59cd07c6af272e358164919c4aaeaa3fa9286962dcfcd201d1b7c947a54dd8db8d89856866dcba31422b03a8a09afa4b2233a1e0659aedb11 SHA512 83cb654f079e8f847bbf9d725b49e133a2eb845ca1644b2a4de3c7ba806901279db7a741050499d0073ca0601f35c22a05edfe3da094b0cd3e92ff195b3d0752
-MISC metadata.xml 1094 BLAKE2B 28719520b74f1095a2e42b38bffcf42fd95d53bfb25f18834c173a5081296a7e6925e0a1d1ff1c86bfc3e01527514196bee12b7e9aad23b8f08ebb869c129ed6 SHA512 e72aaeccc8755ae04cd2f83bd82d34da5288d78fa16ff6d63a7e1e385563446aa0f04d9afe7b1a294d4a21fcc2c74c1730db34cd0b8e141893b881ff3900e831
+MISC metadata.xml 947 BLAKE2B 493be705a384af6dcb85d97f6bc4ecd7dfd6f38745fd13522398ef7749eb71f3e7fd36ccf1bd61d2418291eae09fdca3a399f24f3a2e5e2410965fa64373f170 SHA512 25cebda08907be5ffff861f2556d709f99bc68c068e214b9ffc4e68b7d6189710d9a194bac787feed7274c5352d2dba1b3b4a712bab01ddee71151de2d1f1f44
diff --git a/dev-python/tikzplotlib/metadata.xml b/dev-python/tikzplotlib/metadata.xml
index 660770e53447..c418000c564f 100644
--- a/dev-python/tikzplotlib/metadata.xml
+++ b/dev-python/tikzplotlib/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</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/typed-ast/Manifest b/dev-python/typed-ast/Manifest
index 57a3f58452fc..4108cbb344e7 100644
--- a/dev-python/typed-ast/Manifest
+++ b/dev-python/typed-ast/Manifest
@@ -1,5 +1,3 @@
-DIST typed_ast-1.4.2.tar.gz 208583 BLAKE2B fb94967409c073b3390a133232259605aab0ee893fe53deb0e97a07c814b1c2021815beab4fa680653f75a44b53eb3f02d7c9e330cf51195c2dd668762c9e0be SHA512 9a46f2a4c48bd267445a773463771824be958dfdd1a2df21356d0a763ee2029b51d5b0fddeb16df202f89ba86019640ab45ba520fdad5c550250fe2a135605fe
 DIST typed_ast-1.4.3.tar.gz 210893 BLAKE2B 9e0bbaac73d97c13303c783d4e91b015570d9b9ad74361e1bcfe67259982459003ea6c24602ce004fe1447c4375090d5fa58006e18af28da256f6b25d9aa20b1 SHA512 7ac06e277c883afd1a7161601ffca0114aa63db257695a4bf4c64d819a7192fe52167edb57991aefc7accc6a9902b5faf2ba9e4032c4b9be31f1db7a091607c9
-EBUILD typed-ast-1.4.2.ebuild 586 BLAKE2B a41f92c8ead6ae02c072a03df1150e08f711cf5c781c2c5cb88aeb9bee8fcd32e2bb5e5f8840adc19e4928848bd8b195a4f6e31ba154eb8d792151716c50578f SHA512 ce1c9be302de219b26d48c5a1437c19ff2512957d4d3abfba23410f95d6db67a1a91408d3b6cbccb667f38f24420f50be8165bd1f97dea20c550928aa2fdb8e5
-EBUILD typed-ast-1.4.3.ebuild 595 BLAKE2B 7b7c6254e7b56714e005c4d316eaa42aa6664097e8308093fcc75bf124de5c923506ab6b83d4cd04ed6cb3dc0b9753a265b759be95d5fde469907b79e8670c4a SHA512 1fc7de4db254384d1621c6be4e7b3157b60277c28fd1f79fe2f8b703cd434c0d4386dbd9e76fa96e034c70269a6baa442a1dd94be6ca3a36fa1fb346daa3cdfb
+EBUILD typed-ast-1.4.3.ebuild 587 BLAKE2B 03f1c0f0d4df770c80c34ebaa1cac6e35afa55d562c0d9c27547c57dd2813b6c2ba14d85818be4b915217e4fdcffd7e871b184800830d878dbb272caedbbc563 SHA512 99ca17b7525f72b80157fc50cb944c56e0b82f705676a0e6105630ad0f623aa834456a357326d64e5cc23ba7b3064b63d56c55a191c496a9d2e06702001b2103
 MISC metadata.xml 368 BLAKE2B 857d763576c4a8d9d13016cdb5c18b5bf343012143e58356e823dbd40e0899e2b31cabdbadedd7958b45f7fd6c2cfe47995b2f8262bcc596047f15375e3807aa SHA512 e72d87878400135962ad878c3bb8f44b267eb0c733c88a1f53f3459744a173a8b7fab2be08a3eb33867dbb2dbabcbb023e9293bf00aa2ac8beb2951a1e334009
diff --git a/dev-python/typed-ast/typed-ast-1.4.2.ebuild b/dev-python/typed-ast/typed-ast-1.4.2.ebuild
deleted file mode 100644
index b4dc7f7e211a..000000000000
--- a/dev-python/typed-ast/typed-ast-1.4.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit distutils-r1
-
-DESCRIPTION="Python typed-ast backported"
-HOMEPAGE="https://pypi.org/project/typed-ast/ https://github.com/python/typed_ast"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN/-/_}/${P/-/_}.tar.gz"
-S="${WORKDIR}/${P/-/_}"
-
-LICENSE="Apache-2.0 MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
-
-distutils_enable_tests pytest
-
-python_test() {
-	cd "${BUILD_DIR}" || die
-	epytest
-}
diff --git a/dev-python/typed-ast/typed-ast-1.4.3.ebuild b/dev-python/typed-ast/typed-ast-1.4.3.ebuild
index ffedda8be831..7dd5e281797a 100644
--- a/dev-python/typed-ast/typed-ast-1.4.3.ebuild
+++ b/dev-python/typed-ast/typed-ast-1.4.3.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P/-/_}"
 
 LICENSE="Apache-2.0 MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/typogrify/Manifest b/dev-python/typogrify/Manifest
index 1c56a9c828ef..a5e123288a65 100644
--- a/dev-python/typogrify/Manifest
+++ b/dev-python/typogrify/Manifest
@@ -1,3 +1,3 @@
 DIST typogrify-2.0.7.tar.gz 12903 BLAKE2B e08b27a531f21e99d5a35c47c1deb94bc7f67e31a47789ba4750520c893633966b1319a731c81ab2435e7024aea1e8fd0b46a52bbb73a050cdf83a1588644d18 SHA512 6212024a88372f1b14e5932c0541ec4d5a2ada7514c1327dc8f3775cd7adf3372cae0037c4310ed4a03fd0657a91eb4c0d114b74172190f7f84d82908441ddd0
-EBUILD typogrify-2.0.7.ebuild 697 BLAKE2B 9fd4b9553c88050f3115b5ca17646417db8b4753714040919381fda3f6b863d67c097d625bf33c97eb35fcf9a68c2c7453a054cfdc10f65bea8dab1edae1aa71 SHA512 1c37b9415a511bc7b898e38b4b38fbe125082a994875d77f666ebc9ebe261133207d1ae6924436a8d2e66303a82156c867dd574d25df3b591adda9d2d5da8af8
+EBUILD typogrify-2.0.7.ebuild 670 BLAKE2B 21334ecd523097804cc991f7b03cf2a8dff7f99b44946b72cee3efba872e54f5088758cdeddf2b83f2c2861e31f4a649473b0da51a6431fdc4e88af0200aaa27 SHA512 b33d5fa72dce8e393af5683153c5f040544de24cd032c40f12a5820fe33fda0840e4fc1e83da6687384b17c1a101c36d1e3ceba3060aef80f1e780e5ec8d991c
 MISC metadata.xml 463 BLAKE2B feb4586174307a87c89200cd8cf12b597cda32c73b9ce945075d68d7e69c37ed06404316a7473f91d278d3b7649d3e1dce347e550be1b19f81c7d06a36111924 SHA512 7d629d2bf2c3d34cc4922be9b27ee09edbce594f52806511b82dcd8bb270572dadd25513cb00d021975c3978f0a9d1dffe79b0874f61179ae970c54d6f2f3029
diff --git a/dev-python/typogrify/typogrify-2.0.7.ebuild b/dev-python/typogrify/typogrify-2.0.7.ebuild
index 70198f78b6ed..cbf65c1436fc 100644
--- a/dev-python/typogrify/typogrify-2.0.7.ebuild
+++ b/dev-python/typogrify/typogrify-2.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Filters for web typography, supporting Django & Jinja templates"
@@ -12,13 +12,11 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-DEPEND="
-	${PYTHON_DEPS}
+RDEPEND="
 	>=dev-python/smartypants-1.8.3[${PYTHON_USEDEP}]
 "
-RDEPEND="${DEPEND}"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/unicodecsv/Manifest b/dev-python/unicodecsv/Manifest
index b2db7460e181..bd2b7b65248c 100644
--- a/dev-python/unicodecsv/Manifest
+++ b/dev-python/unicodecsv/Manifest
@@ -1,3 +1,3 @@
 DIST unicodecsv-0.14.1.tar.gz 10267 BLAKE2B 06a8dcd8de319422fe85b10e87fe759ae23f0f375bef3c03fd7b2bd37c25a8e2b46d632e1a4849f0799a9702fd8f1d2d0ddb8eb9e8f41d7b3113e92bec11828f SHA512 fdd7696c4ccfd478dbf1ff846714b7bab4711ca294fb212ae173b66becd2f9220cbcf69afb8e00162312373d9e59a6336bd7be2f5c270ac0dee359a830290bd9
-EBUILD unicodecsv-0.14.1-r1.ebuild 644 BLAKE2B d27a096687d8d9ada56986c5e73b7172133822190ccfaabb941499f124c24a2cc4f4feadc1d50746a8540b93e2fecefebcbd91ae19ff60d9886c3f6e995b70c3 SHA512 3c173719dfb3cbaf62d5feaec35d7b301b964c07974b02a40bd109608d2124497be0bb5bba5b152b8699f23916c62e7d20c403172e464b6f0668d2f47bb4eca5
+EBUILD unicodecsv-0.14.1-r1.ebuild 645 BLAKE2B f3a39a0bbdb49ef5cc28054871cd434f9670ebeeebcbfd130a3d28207b7c1374bc4f165b37bd0c9a4086aee88ca13d6de002d6793a25349c26bb86dc684d00be SHA512 0fdbc2c172f6068e18f9b5bd326c22765b1f1fc014370062664811931312636e901e5e758e173d8eb47499ae7da3545b06b59c3efce1b54c9a97e17eadd93afe
 MISC metadata.xml 401 BLAKE2B 3780bd09f7854a00d0273bad436367a685bb6c6711b78397f1ecbb58482975ba003faef1adc427eb406507b9a404e4ae0db27b97d5a34dbca52e1434e7caaef3 SHA512 4c1c5dc2ce0d1a546980202d0cefdb3f4a8c70780eed3fff94862ca361df47f2d6258d1ac206e83db8c7750bcd9632705c144f98b9f8358832f7427df772f834
diff --git a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
index e8446087c465..41975d674716 100644
--- a/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
+++ b/dev-python/unicodecsv/unicodecsv-0.14.1-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/unidiff/Manifest b/dev-python/unidiff/Manifest
index 9737037c59a2..5fa93c24e4fc 100644
--- a/dev-python/unidiff/Manifest
+++ b/dev-python/unidiff/Manifest
@@ -1,3 +1,3 @@
 DIST unidiff-0.6.0.tar.gz 17734 BLAKE2B 4268553c31209ac1e125aee1db3808250cf9a605d7e0a0a6db257588e3c2dada3044a800a2fa0cb590ff6d388881babd3a3a34c637a4360f54b22f26ed9f5563 SHA512 2e4d30221a3f3230c3559936e7423bdb32d36127eac5c1c7b3c3dc9946ea7276c5074d7fb962e80117052830f98b4dfa1af9bfdea8369293ba77ccef86303f87
-EBUILD unidiff-0.6.0.ebuild 520 BLAKE2B 28f152d57f12c1b4e7c0aefd55aca515090460c4624cb0f4677bb8a2854e2a17825b1da36a4314027cb549202d07ab8624d4599560e5450b385ccfc565a3533f SHA512 86aa820c098ac31997698c81842266967c6116d2b30441df5071bff6a16f6b5fc4e1ccc66a13aa87e6a20329acd47610083190fd54e01c0ea47b85f58505154e
-MISC metadata.xml 476 BLAKE2B c33a1fa441f88d9867e61deeea5226edfa55d96a4de7e2e71e26c9a6d2ee9812eb2f41057b49cfc9d553552b4e3fbcc03e2853bf2dffea61a5371bc52831c4cd SHA512 24c28689f410b6da29e66bf83a7ac4055445909875f2aec69070caf9ce5bdb92c9caeb4305e236cdaa4327244234dbb24f39cc2bd8e68f435450b352faf3d474
+EBUILD unidiff-0.6.0.ebuild 448 BLAKE2B 0ab99570e05e091d65732a602b43d5afb6994c9b30dc8fced23ab389d7860cf8a97c14bce194c5f5d4e7b2bdda650eb3dd8eaa2770e188ecff76a49623bc26cd SHA512 73a02a9f6ded7792a4bf0d19977e6c555d4608c411ae1670a1c68968d2a3347560d5220773e8066ab4dd8e4187fcd644ce3a0a874d61f99e8f03173497f80792
+MISC metadata.xml 500 BLAKE2B fe544c9de3ef50ae426adad4b560c61d67067b002448fb2736f950384b9cd58577b9701b75c868bdd194653390203cc5d61c82c7a2401741ad400735522f29a4 SHA512 502df9b5aca34099945dc3ae5422f848c34b2ca8d04f1ddb7545a2c32e36ebf58a8ee2cfe2cdc044352f9e75937452344a2001fbc1f0bbd95de10ce755b5e04e
diff --git a/dev-python/unidiff/metadata.xml b/dev-python/unidiff/metadata.xml
index 7308e5a3d3f8..86cc9a6b4d32 100644
--- a/dev-python/unidiff/metadata.xml
+++ b/dev-python/unidiff/metadata.xml
@@ -5,6 +5,7 @@
 		<email>dolsen@gentoo.org</email>
 		<name>Brian Dolbec</name>
 	</maintainer>
+	<stabilize-allarches/>
 	<upstream>
 		<maintainer>
 			<email>mbordese@gmail.com</email>
diff --git a/dev-python/unidiff/unidiff-0.6.0.ebuild b/dev-python/unidiff/unidiff-0.6.0.ebuild
index 9827339cdb5e..7eebb102d50a 100644
--- a/dev-python/unidiff/unidiff-0.6.0.ebuild
+++ b/dev-python/unidiff/unidiff-0.6.0.ebuild
@@ -3,8 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Unified diff parsing/metadata extraction library"
@@ -14,7 +13,5 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64"
-IUSE="test"
-RESTRICT="!test? ( test )"
 
 distutils_enable_tests unittest
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 10f61d2ce105..503a292529cf 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1,3 +1,4 @@
+AUX urllib3-1.26.4-test-ssltransport.patch 1267 BLAKE2B e82ae435cfa8a2821f3f61d91a2e4f9011c5f68d37fddd1a40ae4658566db45717379c48d11299eb260c2f8816f416ac69b0379b3c7f925075ee9c1051aab1bd SHA512 bf5d2bb2b48444724ee1cfb87f4a84b3a63cd6ca598ba4d92a44bde71c66a35b815905de51fe027abb2eea63ae353dc0df2338ddd4f819f678f8a39b5c6d685b
 DIST urllib3-1.26.4.tar.gz 293008 BLAKE2B 6ca88861baa87814d3856cd0f1fa0a6cb9e11ee745c782b598c4f5fe74b195ba47e8430b993ed8a5fb269153d700e4a803cd2ebc177e20e3186b3b26612262c7 SHA512 daf2ba432f2e4edaa6aa8c6bdaaea21fcb77cc5fdfd991f89b1f753b4f9901faab04120841e9fa8d93e2bd3d72cbdb647f1492d882266b4e0281c725e8d55a7a
-EBUILD urllib3-1.26.4.ebuild 1922 BLAKE2B f421d6ecd0571dfcca1a015d8e47462e70c58869b2704bc3283d10986f694e5fb98688b0e319a4be891bd7ec879bd56aa7fa16250679f04c09f83fa7763076f0 SHA512 03490b5a1949961c680681ed5324ba731907d2cef155a9e57ed87da6f2ef03995133c203395639f3439e53878c41d472a2c6b7623ea7d57f097459a29522edfa
+EBUILD urllib3-1.26.4.ebuild 4265 BLAKE2B 17f981911cc9adf17b7fa989833a47554127d9bdc7c1f49605c0c949c0c82ca24e48e5e1bea38f8f549c5eb00e047cfddf03a967a0ea7bf1e83afa9901044f7f SHA512 f9d2190c141b4c4daa2d9e3d4fe577acb3d0787c8591ca46bce3ccf5e22872349fa459e63cd5cb96710f25a5910a2ce600d0003b7e72e5f9c4e0797c459d07f2
 MISC metadata.xml 530 BLAKE2B 148b6a1936566b905f38f00ec231a832e827bbdd4f6c2ceabe521779b08c1dbf60bdfa182234e8e67b6708efadd09d29e93c151f7c3d1d4fcd5ece3e3d9c0839 SHA512 9ab9fa9ecb34855be0f6e7914f70eadca67854fde865765b1257feec6c841bccd8276ad81f8d9bbfb544ca753c3d27681d6cc841cee008efca5ba72f5a236f3e
diff --git a/dev-python/urllib3/files/urllib3-1.26.4-test-ssltransport.patch b/dev-python/urllib3/files/urllib3-1.26.4-test-ssltransport.patch
new file mode 100644
index 000000000000..346574fec91f
--- /dev/null
+++ b/dev-python/urllib3/files/urllib3-1.26.4-test-ssltransport.patch
@@ -0,0 +1,31 @@
+diff --git a/test/test_ssltransport.py b/test/test_ssltransport.py
+index 72b06b006..98682bd43 100644
+--- a/test/test_ssltransport.py
++++ b/test/test_ssltransport.py
+@@ -246,6 +246,7 @@ def proxy_handler(listener):
+                 )
+                 self._read_write_loop(client_sock, upstream_sock)
+                 upstream_sock.close()
++                client_sock.close()
+ 
+         self._start_server(proxy_handler)
+ 
+@@ -274,6 +275,10 @@ def _read_write_loop(self, client_sock, server_sock, chunks=65536):
+                 if write_socket in writable:
+                     try:
+                         b = read_socket.recv(chunks)
++                        if len(b) == 0:
++                            # One of the sockets has EOFed, we return to close
++                            # both.
++                            return
+                         write_socket.send(b)
+                     except ssl.SSLEOFError:
+                         # It's possible, depending on shutdown order, that we'll
+@@ -322,6 +327,7 @@ def socket_handler(listener):
+                 request = consume_socket(ssock)
+                 validate_request(request)
+                 ssock.send(sample_response())
++            sock.close()
+ 
+         cls._start_server(socket_handler)
+ 
diff --git a/dev-python/urllib3/urllib3-1.26.4.ebuild b/dev-python/urllib3/urllib3-1.26.4.ebuild
index c23d80a6edef..e0026885ab4d 100644
--- a/dev-python/urllib3/urllib3-1.26.4.ebuild
+++ b/dev-python/urllib3/urllib3-1.26.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 PYTHON_REQ_USE="ssl(+)"
 
 inherit distutils-r1
@@ -40,6 +40,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-test-ssltransport.patch"
+)
+
 python_prepare_all() {
 	# tests failing if 'localhost.' cannot be resolved
 	sed -e 's:test_dotted_fqdn:_&:' \
@@ -54,11 +58,40 @@ python_test() {
 	local -x CI=1
 	# FIXME: get tornado ported
 	[[ ${EPYTHON} == python3* ]] || continue
+	# tests skipped for now
+	[[ ${EPYTHON} == python3.10 ]] && continue
 
 	local deselect=(
 		# TODO?
 		test/with_dummyserver/test_socketlevel.py::TestSocketClosing::test_timeout_errors_cause_retries
 	)
+	[[ "${EPYTHON}" == python3.10 ]] && deselect+=(
+		# Fail because they rely on warnings and there are new deprecation warnings in 3.10
+		test/with_dummyserver/test_https.py::TestHTTPS::test_verified
+		test/with_dummyserver/test_https.py::TestHTTPS::test_verified_with_context
+		test/with_dummyserver/test_https.py::TestHTTPS::test_context_combines_with_ca_certs
+		test/with_dummyserver/test_https.py::TestHTTPS::test_ca_dir_verified
+		test/with_dummyserver/test_https.py::TestHTTPS::test_ssl_correct_system_time
+		test/with_dummyserver/test_https.py::TestHTTPS::test_ssl_wrong_system_time
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_verified
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_verified_with_context
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_context_combines_with_ca_certs
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_ca_dir_verified
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_ssl_correct_system_time
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_ssl_wrong_system_time
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_default_tls_version_deprecations
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_no_tls_version_deprecation_with_ssl_version
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_2::test_no_tls_version_deprecation_with_ssl_context
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_verified
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_verified_with_context
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_context_combines_with_ca_certs
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_ca_dir_verified
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_ssl_correct_system_time
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_ssl_wrong_system_time
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_default_tls_version_deprecations
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_no_tls_version_deprecation_with_ssl_version
+		test/with_dummyserver/test_https.py::TestHTTPS_TLSv1_3::test_no_tls_version_deprecation_with_ssl_context
+	)
 
 	epytest ${deselect[@]/#/--deselect }
 }
diff --git a/dev-python/uvicorn/Manifest b/dev-python/uvicorn/Manifest
index c9966105e8f1..3a84128c45d0 100644
--- a/dev-python/uvicorn/Manifest
+++ b/dev-python/uvicorn/Manifest
@@ -1,4 +1,4 @@
 AUX uvicorn-0.13.4-fix-wsproto-1.0.patch 1122 BLAKE2B 4190a5e61af991e77271aef8bea17f137258944ff0c9a1384255a11c1f5ceb879746b47331247a6a24a5a45706c22fc70e19e2d5d1b8ea9cce6cc2e483df6150 SHA512 909ef4494cf395adbaedbaa7e6fa0561f44392126f19e08192842eb3148f0c19639007b3e54014758e1f00e6b8ba8fa5a06d9dc14f87e63face47e0759ac2bb1
 DIST uvicorn-0.13.4.tar.gz 505858 BLAKE2B 486436c0b4c717741c11b7da6a979dc9fe977baa2dbc3e2538ce28551d2dee593076b670b16c099056165624c149f96974f64d2847e38234122ec93b65b31cda SHA512 5332494e0b43b4e87f9d6742be679527b1ec2bc4d2e061768594d44b1fd1d6961a2bd1fa23469fca6c530ef36d6123e453306c2bb664cb27b0cd6145b9a70fd7
-EBUILD uvicorn-0.13.4.ebuild 1266 BLAKE2B 899d41ee58589f4a67fd64f31c71faf614a02e01bec0a1e375ab791cc508057a682849fb3794dd64c0b124daa465ffcbee7dc044b9eb5ee25f7d7a7dcc7f73a1 SHA512 ec1e66c572e349451ede00e67d3ccb05d73013a3cf99d350e4dbc39accf0006a28e7dd12306aa40246febcf56429da2bafc817ba80a25ff2b121f2ca73597754
+EBUILD uvicorn-0.13.4.ebuild 1297 BLAKE2B e2e429e266084c92acf6965e86220494101135001bf656ce9ed1ee08b8ea07b61a8cb844bd416ddfa77ae9c8dd0d3618a8438b3dd1b08d12857efce9e6fbcbbc SHA512 3fd28de46cea2f2b8a2a7aa688155127d1a6d8e7f79137443606019e05825a1f4ab1c1ecd1dd8f4a04c8dc8e6851b59136fdcc68d5d4344be98fe70f97714dc0
 MISC metadata.xml 450 BLAKE2B e6413874e7247880323b72113f002ade2edff362d7464ebbd5890ec95946b97bc37d74c2d6e9ff7a6a416a45f32bbab1b6eca70db8964adc6be287793c0fb4b4 SHA512 a1138016ec2d87c77f82333a0d41a68113d87c74d50e1bd6ccef0e0300f53663ecb907959be2547b42cc5cd007f47626e98b8c8cdc7e3557d2dfd0a369447268
diff --git a/dev-python/uvicorn/uvicorn-0.13.4.ebuild b/dev-python/uvicorn/uvicorn-0.13.4.ebuild
index afae4f633023..76720a26ef6b 100644
--- a/dev-python/uvicorn/uvicorn-0.13.4.ebuild
+++ b/dev-python/uvicorn/uvicorn-0.13.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/encode/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 RDEPEND="
 	=dev-python/click-7*[${PYTHON_USEDEP}]
diff --git a/dev-python/validators/Manifest b/dev-python/validators/Manifest
index 8c5df05ec3a7..5b307b5894e3 100644
--- a/dev-python/validators/Manifest
+++ b/dev-python/validators/Manifest
@@ -1,3 +1,3 @@
 DIST validators-0.18.2.tar.gz 30299 BLAKE2B 96be7c0bed74e32143d2ea9de7b595599d567b6a8c81b85d92ba7be035e7fe26361240896ada08b2b5f30ce5519a6828dc4350b6ce7ecdb27525e40934a10d31 SHA512 8213736508e56b5d4ddaa9c8e707a7ceb398c8b2c41b938d626459d8bf134aa113116f49cef0cd317033a683d18493448ac4107a5f50151899946bbd48197411
-EBUILD validators-0.18.2.ebuild 501 BLAKE2B df7be285fde7ffc9716707e9f8ef991b4a6d72edea4adc8150f67a4ee83b4bc743d6cf9bd10fef3230347d9c5edca8e18b151a63a929c7c3504be48a6c4b17a2 SHA512 7f28e2b2f6ecc1352d8b6023563715c46ed5138c1e1f1b6e4a8ae0b11c3996b082bfb8f8069ce285d13411c541446a432e39eee737ab24853e90971ea48bf4d5
+EBUILD validators-0.18.2.ebuild 502 BLAKE2B 1b85433796983bd3d64947f7c0c14aebde337f6b5010b0607bb278abed2443ce271f9c565a6c75ed3b39fc4a36a722a61199dc51005a822ea62a5933d085f983 SHA512 3ec5b333581b53cd35f5d16602ff6b4792da22867216501658d895e5c79d05cf52665b17d0e7fa175d331db27e8fc890511375e3dea033df1f299965506e556b
 MISC metadata.xml 485 BLAKE2B 2be2c10516359966a495d3467c99b699b95b2e381ae60d57b0a01f0d1d307d0672711c123def24250dd4eddc6a7ca27807d77f0f1222e4bb9c2a8cac053ec434 SHA512 e18e049c9c0f0a93d48fb65c8e1edcff9a93fa8bf681cb53fb3eb9e1ed9415feff613c4f4c12fe161d75ae2aaff35a34280ff41355275ab70eef0c2454c644c0
diff --git a/dev-python/validators/validators-0.18.2.ebuild b/dev-python/validators/validators-0.18.2.ebuild
index ad196eb79f7f..a8c4d1504694 100644
--- a/dev-python/validators/validators-0.18.2.ebuild
+++ b/dev-python/validators/validators-0.18.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 inherit distutils-r1
 
 DESCRIPTION="Python Data Validation for Humans"
diff --git a/dev-python/vdf/Manifest b/dev-python/vdf/Manifest
index 7ea435f95ad1..81ad57a963c4 100644
--- a/dev-python/vdf/Manifest
+++ b/dev-python/vdf/Manifest
@@ -1,4 +1,5 @@
 AUX vdf-3.2-mock_from_stdlib.patch 144 BLAKE2B 8a32644d40f90620c050b64cd80aec42d564e0b5f032b0972d2c4219b0b21630b861163bfa716e9d826451b7050cfbae74c2930417f4b0fbbedb9beb1cdfd246 SHA512 aa9226aae713472d10eabdc113e37ae80989c7b4e0b03922a4ce49d5f228ce012c05ee29353caf5a930f5b948b138b5f9ff1fe100f39f839d5638e25f0a51dd6
+AUX vdf-3.3-collections_abc.patch 297 BLAKE2B 0dec9027cfe3a39d06807604a896a8ebccf9acc244eb53e8fac3fc4b01b0c6f2e99f495edc01593b35cdfce1ef3080135eab62a72bc276a6b6a6e2065c3d6310 SHA512 3bdd6ebc8a282edbc79908e6e308982d6afbc93a42c9edf9672ca330bf1f63d3ff89634c736b7af2ec64801f66c4bfcebe777b98359a7b5f5c694723b53ca634
 DIST vdf-3.3.tar.gz 15799 BLAKE2B 48e12d6456f776ae7bf3a3dfec3bbe49f6089ce57720f4ab7beec7502604da290018c7af75f7bb58b1d8a25dc44daea7e028f70d75f7eecdaa9277e9f75a6fd0 SHA512 10b944ff88313001cdfd416b04f13daa7350aad75d3f790b6562cd3953fb5adebf7a0b54be24d853d68eb7ef2b8b469569ed37b3aafb0a2f4d0c6caa6816335f
-EBUILD vdf-3.3.ebuild 531 BLAKE2B 55c1929927ee501bf664133807c70a29eb9c8255f208cc84e0e7e1054b05996047b5d7ef2ff5eaaa2b0371203fc0c63546429f0700cb4fd5816842b4e66d5390 SHA512 9e2971e9df2736e9372466b812c42d2510402e6dc0ccd898a4d50aecc30474f2b2072d951663e3c20df4115c3262ffab09aa598541591bbaab4d0a6511c5c72b
+EBUILD vdf-3.3.ebuild 579 BLAKE2B d585b8267baee46f72d63e898c4b5541d23041fd99ad668112d476bc6c95553f5729b6a3cc3f49986efd174f42fa70938a7301e0fbae62bf47cc34fde7879169 SHA512 101c87d0699365d26d91de7f85de10aee59e905f7360035526480422dea07353b6da75e5fde76b62837a9c8a1709fadf34d6c2016cf1fa4d5599ae0b80f42758
 MISC metadata.xml 390 BLAKE2B 1bec2f25b9826fb0d9236302938ef8ddaa4e29c815f63a900fdc6a25a8749f9d96aa5ec682b006e6b25ef0f8684491f08539b76ebc9ebdda43b9ca9a1f8126eb SHA512 6470d901496b951b03663055ebac69e588d8d40f0aaa7bef670f6a07654644d55781274e41ea82af094caa86313c60cfa0827d89da76aacd42bcc52d6b675098
diff --git a/dev-python/vdf/files/vdf-3.3-collections_abc.patch b/dev-python/vdf/files/vdf-3.3-collections_abc.patch
new file mode 100644
index 000000000000..22c647601688
--- /dev/null
+++ b/dev-python/vdf/files/vdf-3.3-collections_abc.patch
@@ -0,0 +1,11 @@
+--- a/vdf/vdict.py
++++ b/vdf/vdict.py
+@@ -5,7 +5,7 @@
+     _iter_values = 'values'
+     _range = range
+     _string_type = str
+-    import collections as _c
++    import collections.abc as _c
+     class _kView(_c.KeysView):
+         def __iter__(self):
+             return self._mapping.iterkeys()
diff --git a/dev-python/vdf/vdf-3.3.ebuild b/dev-python/vdf/vdf-3.3.ebuild
index b0147e4aab7a..d4f3fdcce980 100644
--- a/dev-python/vdf/vdf-3.3.ebuild
+++ b/dev-python/vdf/vdf-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -17,6 +17,7 @@ KEYWORDS="amd64"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2-mock_from_stdlib.patch
+	"${FILESDIR}"/${PN}-3.3-collections_abc.patch
 )
 
 distutils_enable_tests pytest
diff --git a/dev-python/visitor/Manifest b/dev-python/visitor/Manifest
index 214f8930bedf..9fdfdad70dc1 100644
--- a/dev-python/visitor/Manifest
+++ b/dev-python/visitor/Manifest
@@ -1,3 +1,3 @@
 DIST visitor-0.1.3.tar.gz 2985 BLAKE2B d645e3524ee5d072320e6feca39faef72b880ec7341053d078778765d9b279bd2ee3f892c0fcd5f21633e7851acd49ac23aef769eaf190147803ce711b717da6 SHA512 414c77df8efcc22df5ee8073e02b8c5c28563954ef9b9a869c4ea3f7f1268a97929c1fe29142ba41e3a5acafea52599f6bf073aacd654643d7d8380cd4f41fbc
-EBUILD visitor-0.1.3-r1.ebuild 500 BLAKE2B e47441c1c4915f50a5f6506ae3f6876d7d750e467e8ac88b8f24d9ce487d59645b2ffe8dd7934576a363a0b60bf9560f88b0831ac1b63529cb7ed7ce2148b66b SHA512 3232b8b4bb87503bd7ae935f2e3b0b208cd51d4128c97c3ed22b29dcec306131367b82ea286d7f62facfb9181a73bec7c0a8980c408f98898fd3b1f4b165ef09
+EBUILD visitor-0.1.3-r1.ebuild 500 BLAKE2B ea3729d1ebd0259aeaca491045ab849a5d6f64516c8980b9d6a7141fc951ab085381b5f68fd5f00c171edbf5feecda6a7ecf4e20b42684d112596028590180b4 SHA512 d4f30e3576aca0915bb640eff58921daa4a4cc2ef3fb8a8242c36a7f2a8e470b024ea687edb79ad341c0e332f0c44200df644fabe6f3a9834cb2b55955eb51d9
 MISC metadata.xml 425 BLAKE2B cc0a5e61430649338d19a17059161dceb4e843aad01757da22faf77c327750b901abc8bbcfe0879909febb0f94d764c77494aed2ab9eb4b7b241412a9a993a79 SHA512 21c655b1feebe9dd77a24e8af3fed6c8f40a79c6696940b455da05ad61c0cada17dc99f8c34f3b05309fcaaa1f96261d6546dfa3e8ca21d26323985f713d6bfa
diff --git a/dev-python/visitor/visitor-0.1.3-r1.ebuild b/dev-python/visitor/visitor-0.1.3-r1.ebuild
index 0dae1af04f46..7deb9bd59a3b 100644
--- a/dev-python/visitor/visitor-0.1.3-r1.ebuild
+++ b/dev-python/visitor/visitor-0.1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( pypy3 python3_{7,8,9} )
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
 
 inherit distutils-r1
 
diff --git a/dev-python/vncdotool/Manifest b/dev-python/vncdotool/Manifest
index 1ad2f9795dbb..9d6cf93125d3 100644
--- a/dev-python/vncdotool/Manifest
+++ b/dev-python/vncdotool/Manifest
@@ -2,4 +2,4 @@ DIST vncdotool-0.13.0.tar.gz 72780 BLAKE2B 6a27565c5410148f569bd5a8e212327d734f9
 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
-MISC metadata.xml 501 BLAKE2B f6420cd1de6a67bf49f89fc7de036dd478ca89bb8c8e6721ac5a69cc23506e4485c6093e91de5d144eef0335c77c09fbd322c2f52a3d9a9d0a842f4c012b1b02 SHA512 66a2a8c0985eb92a46697204453bfaacfeee2ddf1033ff8ccc7994265594523908a6fbaf7fce0d8b8da617ea228e343db7cdd63f46b735049996c4b9a7c33955
+MISC metadata.xml 354 BLAKE2B 1fc59ea9b7a2940509e9a396bba1612ff4dfe96107cb1c62393eb82911bd11a0f23a796b79087c843dc5b8f17d6e3d0a002a3a4258c1a4f13cc6548356cd59a7 SHA512 f2055d919bdffd5c458676de58cbfe8406e897e26452312b0f7402b5bea17a137d340bc5aed5bfeb0121f178df5c7c5f048c0b6461eab210b1127651c2a35a25
diff --git a/dev-python/vncdotool/metadata.xml b/dev-python/vncdotool/metadata.xml
index 2b47efc97038..bf17504df13a 100644
--- a/dev-python/vncdotool/metadata.xml
+++ b/dev-python/vncdotool/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">vncdotool</remote-id>
diff --git a/dev-python/watchdog/Manifest b/dev-python/watchdog/Manifest
index c89961a651bd..02d21ed8951f 100644
--- a/dev-python/watchdog/Manifest
+++ b/dev-python/watchdog/Manifest
@@ -3,9 +3,11 @@ DIST watchdog-2.0.2.tar.gz 95452 BLAKE2B e3a071cdf1c47698cd54bbaf925c4eb7e2af739
 DIST watchdog-2.0.3.tar.gz 95524 BLAKE2B 568e9d66efbfa98c19dab704681dbc48f869b59d51d7c7ff7ce1fd7465efcc6233f871e7f9276f2732692645491f2fd197a639b17e9a3d8abb76d0148a934796 SHA512 e1c506e4ead8c3ee8d19e456b67623f3a1823007be6c1fad0d76c697205696183e7bd15e46c21bf61abce6dd16d267e55da8986633eeee337d10c609318fb958
 DIST watchdog-2.1.0.tar.gz 95833 BLAKE2B f11eb7961885fd0fbf8e6f888a069d77d9ff26b245bd3583e9060044c43a3356d56a334108c8c1a11735fffa779cc750bc390dd1510cf2c549ec9fe064899540 SHA512 65cc291927a61506fd2c26e05b85112e1cc0f26ca851138c62dfa34fae7958ee2b3946ffe586a9d2b7a48d59a6b5ce11c8dac276a3d78dcbeca8da011a880668
 DIST watchdog-2.1.1.tar.gz 96703 BLAKE2B cbcaff41de6111a3c9c2ff00b7c0a9ce1a769bb2b0f8e2af841a0783dd7f3a55f46003863b05eb983531211743fd112a6e63944193e10e8dd296523a1da27d59 SHA512 5b9eb75bc7b8642a8246f426a992265bbe2e5d82a3fcdd543289db7734701bdca1a868b02edfdc26ea239a89d80dd5322e410b949e419c66bdcc0645241d826b
+DIST watchdog-2.1.2.tar.gz 97407 BLAKE2B a847089409537391287a146670864c7721344ba8a6378c89483e9e08abe3f61690bfca48016f628ab0e6b0ff317679db3c72e27594e049ea03334dd20c305008 SHA512 2a127faffebb35f0b14d578570a4c5a7c27d6bd38042e34ea50f4b654be1ca07b193dfa72dfe25442d3e6da746f1cfbdda71c38be1386cc5a3e69204843c16f1
 EBUILD watchdog-1.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
 EBUILD watchdog-2.0.2.ebuild 979 BLAKE2B 9644f761602ba4b77cab83bb25a4311e2f4f4df89b18bcad79fc8677deb6e3e454b6df08b792eaeadecb69dea49195e91cb5a9fa8a7f9a6ca365b09ac3bf3c32 SHA512 6d707cbc51c160024449d2638289d6e369951f16b576ff822dbf4f40e7e6a5da5b03e33a98d6cbbefae27ee872166b8a9e86fce7f3f89b095bf595eb91c1f9c7
 EBUILD watchdog-2.0.3.ebuild 895 BLAKE2B b4438d2916609a2605ce3e9df17e6416166ea3afbac1a8e7b2f6fa20458462ced6a3280d6f1fcefc2b76bfb3c3605318f576540287bc17e58d0a3c7dcd082531 SHA512 eb2f0ba137f64555763997894e4e1b26d39502ad2c34a55e87d06482ffa57703417f11abb38cf5809b56be9a4581040364e9d480a7d52dd7a45e9a120f0e52da
 EBUILD watchdog-2.1.0.ebuild 861 BLAKE2B e92a1567235d7b2aa1df0c4f586b539622787060a6e48e9fe0476dd8b2c672410c0f97f03903ad6d770bc45339693d63c79bc26e3b7b716d0cf6993c90589e9d SHA512 5e745931a1edc77df6685ea10c27e042027221c155eef1e4cdffedcf8c67d9ef172fec39613fd32f0d4f56223672f50b8879610cda635faa097d4fabd05a0c49
-EBUILD watchdog-2.1.1.ebuild 861 BLAKE2B e92a1567235d7b2aa1df0c4f586b539622787060a6e48e9fe0476dd8b2c672410c0f97f03903ad6d770bc45339693d63c79bc26e3b7b716d0cf6993c90589e9d SHA512 5e745931a1edc77df6685ea10c27e042027221c155eef1e4cdffedcf8c67d9ef172fec39613fd32f0d4f56223672f50b8879610cda635faa097d4fabd05a0c49
+EBUILD watchdog-2.1.1.ebuild 1039 BLAKE2B a98977e3101c049dfec77c6c91f7f813ce7a715adccb2c294c88030d0414989d28b58e3a2f7fe963984b227c4398ac2175ace5d8ef41f9c8ca620c906eb3e834 SHA512 a8d0636fed98cfb94c3bab2a07d76ea0eb4df2988c807f91ccab08bc31981d8bae41d4d182838fc53d342dd7de8a352ad6c12f45b126bf866f81c5d3972a72d9
+EBUILD watchdog-2.1.2.ebuild 1039 BLAKE2B a98977e3101c049dfec77c6c91f7f813ce7a715adccb2c294c88030d0414989d28b58e3a2f7fe963984b227c4398ac2175ace5d8ef41f9c8ca620c906eb3e834 SHA512 a8d0636fed98cfb94c3bab2a07d76ea0eb4df2988c807f91ccab08bc31981d8bae41d4d182838fc53d342dd7de8a352ad6c12f45b126bf866f81c5d3972a72d9
 MISC metadata.xml 409 BLAKE2B 066a5f62332bfdbd1ee84be547214935022d96e8f51d270302fb891d8c9e438141bc4d42cda84cdf02ec65e80c5ad5dbdc8aaeffbf777bb7ee9b153c95cfdfa7 SHA512 dc751fd76505ab72f2e58c28fef326745ee464749e3640510679e852af6752906312f3d8c82b3b0220a120e0112c96e83d62738321a3bc7b71fd6aee803fea9a
diff --git a/dev-python/watchdog/watchdog-2.1.1.ebuild b/dev-python/watchdog/watchdog-2.1.1.ebuild
index 0b8865d4eefb..ab944b67adbb 100644
--- a/dev-python/watchdog/watchdog-2.1.1.ebuild
+++ b/dev-python/watchdog/watchdog-2.1.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1 optfeature
 
 DESCRIPTION="Python API and shell utilities to monitor file system events"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
 RDEPEND="${CDEPEND}
@@ -30,7 +30,12 @@ src_prepare() {
 }
 
 python_test() {
-	epytest -p no:django
+	local deselect=()
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_inotify_buffer.py::test_move_internal_batch
+	)
+
+	epytest -p no:django ${deselect[@]/#/--deselect }
 }
 
 pkg_postinst() {
diff --git a/dev-python/watchdog/watchdog-2.1.2.ebuild b/dev-python/watchdog/watchdog-2.1.2.ebuild
new file mode 100644
index 000000000000..ab944b67adbb
--- /dev/null
+++ b/dev-python/watchdog/watchdog-2.1.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python API and shell utilities to monitor file system events"
+HOMEPAGE="https://github.com/gorakhargosh/watchdog"
+SRC_URI="https://github.com/gorakhargosh/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+CDEPEND="dev-python/pyyaml[${PYTHON_USEDEP}]"
+RDEPEND="${CDEPEND}
+	dev-python/argh[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}
+	test? (
+		>=dev-python/pytest-timeout-0.3[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/--cov/d' setup.cfg || die
+	default
+}
+
+python_test() {
+	local deselect=()
+	[[ ${EPYTHON} == pypy3 ]] && deselect+=(
+		tests/test_inotify_buffer.py::test_move_internal_batch
+	)
+
+	epytest -p no:django ${deselect[@]/#/--deselect }
+}
+
+pkg_postinst() {
+	optfeature "Bash completion" dev-python/argcomplete
+}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 14092db05d3f..2e99fad848d4 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1,3 +1,3 @@
 DIST wcmatch-8.1.2.tar.gz 112726 BLAKE2B 4d91425f30e81f1ff3449b364b74f242b7393b7a4a162538e57406f9d5cc05d24277d6c0119c40266d4474c9c99919ade8d0450b1999abb39077ffc64f495719 SHA512 f96fc646db334407229ee9885b308eb2b27967d9b4e4245df33641605af678f3edfb54f53c5c8722b946029d39779fcd775299963530036c723cfa860dcfff38
 EBUILD wcmatch-8.1.2.ebuild 1443 BLAKE2B 8bfaf6f2402343b2adb91680c5b23d369326b62f88b27ddf0c289599bca11fd53f8bf6b2bd14ec75b192f0df4cb086d4d35e90e621b34f870644258d88055b49 SHA512 28ec3d2cd6093d6433faa32fefa1e3a0f549df3e1b28098a6dcaf90b6a7df2cbabb26f99459c95de4781cf04d08725afad1d950c39f08ee26516a6e37a0deb4c
-MISC metadata.xml 3054 BLAKE2B 1bf6616d3bece8ce2c1509bf9fab839757815a157feba7f96edb6012ad96ce7985de7e82f6d5448aaeafce5c323d216ecf856aaacf20f549687778bc7f204574 SHA512 3a934efa28323c04f175c5ba54b400ef5894fec706de3f93efb029ef01e976ef4c96354f66b8a1c43a177502b8002bc4d605107b5543625bdb44f45b81aff076
+MISC metadata.xml 3040 BLAKE2B 9bb56694fe8fe1d9621e6eafe58c90242238fee0ffddb4f56fa2677bcd996ec94174998bee45164aaf797ed33c3e55f15c60b5b1dcf00dc10ddf35fb9ff33b31 SHA512 59cd3bdbc4859fe572e043e13efcb813b020be80ee1d6a7ef1b7d1020bbfa25cfc457b923e53ac0a4c4d0c33636d43f57a3cef73e9f3204d9f86851019ae0302
diff --git a/dev-python/wcmatch/metadata.xml b/dev-python/wcmatch/metadata.xml
index 5320e20ee0f2..1890dab7aa7c 100644
--- a/dev-python/wcmatch/metadata.xml
+++ b/dev-python/wcmatch/metadata.xml
@@ -5,8 +5,8 @@
 		<email>lssndrbarbieri@gmail.com</email>
 		<name>Alessandro Barbieri</name>
 	</maintainer>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
 	<maintainer type="project" proxied="proxy">
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index b8174fdaf542..240b1d22b16e 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1,7 @@
 DIST websocket-client-0.59.0.tar.gz 57897 BLAKE2B 9f15c563491bd105a1987281cc20c0ab80ed1625036eeaa674fd28334b8226b5f9660b150743649f6bc7717d4306cbb1778222f9caeeff29507ab364572ce2b5 SHA512 c7f4a0336093de86fd00828049a836477a3c859cc4bddebd9e7d31eb746dab4de8fa11205a5fb182e5df3590964aa73f279310575dfabc4abc32157e80df42b1
+DIST websocket-client-1.0.0.tar.gz 58557 BLAKE2B 8234fb246d38673d06c9e16257e00589fe27d1354feba2e1521a41e15c089e899023248dff61346cafbbffe8a423f1b1618a546ead2fee4db67a6c2441581f77 SHA512 6c62ea2f12be0e6409409e832e4654338f6b6cb7838b0765e836c575bd883545c885985e9a05a04cd4ce5fbd537bc97d8c6fc4efb82779c2ec3006580ca19c3e
 DIST websocket_client-0.58.0.tar.gz 48216 BLAKE2B 5e559852385d95caffa73fdb4bfcddd3e00f7bdc9d23d07e7bd6b9e8de599742e153d31bb3a57bdf1aef02361f5dc0b13a443c21872c27576e068f246102d655 SHA512 c587945831427a9bddef96be53d20fec7f55ffd7efe2b676dac96b8078ba446ecda85379a4edfc49c36de936516d3994cbd0515decb9b615cd969bde1117167a
 EBUILD websocket-client-0.58.0-r1.ebuild 824 BLAKE2B 3502b651e758f1ed8fb62ee84b988e49748c6ee99ed76ff93b1ea447ff8b77ef68d7680d23aed8d06d4f0fc7e76b5aa08237b973607031b2030e289feca09d6d SHA512 b8db735fcef22e1a983a245b29e637968ddc7710799bc18856a967aaa24ad9b671961f6a25e02de3953218053d1e6cbce255f27a62ee9d8b316ea156822dcbf4
 EBUILD websocket-client-0.59.0.ebuild 869 BLAKE2B e3b886958cf82f1d6d86b53a50e8841d25d4866bc4ba5663e624b48a484433e0675dc373dcab11b99018fd3a232f1ae150352cf2708bc69f872639d43641146f SHA512 96836b0874714f135fe571abc3411d6b1aaadec62fd4ce2978b7fe3d25316053090ec8c36d00304ea2877fe0078ffacdfb33ca3f69de332902beaedb8324f899
+EBUILD websocket-client-1.0.0.ebuild 764 BLAKE2B 89ed43844172266435fa74b16ab4dea7ce26ce48d1712611cb9f5d14058fa5ac7ecbab8b9dcebca13714ecd9635f875f4d6935d760f33288a989eda590b11c2d SHA512 b5a50cf6905e0abaa0fbb2de460f58fd1bc125c3239202ff33c4073aaf0d6f20c5eb10581f84e02aeb85c8db6ecb737242596167cf2433c4ddcc594a47b2fdc6
 MISC metadata.xml 497 BLAKE2B 1a68fcd42a257afae80db03043a732a321079f146c252a89d1c5399bc5800a5475fd36f31cef381544c9592e39a86c14eb5334ab1800a5191b0f7ec9e0806f19 SHA512 ce4184c2e87f87cd787cacf1c7b566df2fbf7dda97a6b6639e02c003ede6ac5b90494eb9b3b509c303a56fc4e829acc05ec9d3d01846e85b233a561d1cdbd5b4
diff --git a/dev-python/websocket-client/websocket-client-1.0.0.ebuild b/dev-python/websocket-client/websocket-client-1.0.0.ebuild
new file mode 100644
index 000000000000..dfdf4b220036
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="https://github.com/websocket-client/websocket-client"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos"
+IUSE="examples"
+
+distutils_enable_tests setup.py
+
+src_prepare() {
+	# Internet
+	sed -i -e 's:testConnect:_&:' websocket/tests/test_http.py || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/websockets/Manifest b/dev-python/websockets/Manifest
index 0c4ae093f00a..69de1ee11b4a 100644
--- a/dev-python/websockets/Manifest
+++ b/dev-python/websockets/Manifest
@@ -1,7 +1,9 @@
 DIST websockets-8.1-src.tar.gz 156472 BLAKE2B 6cb5eec8276f7ef7172048eba6157560f42cec28acacc1a0a2f426ea1cab9a04029ebb1f8285b1aa2862c30aac8f2af81ef85d4dba8e53e267b665b718e01d5a SHA512 d245702574cf513da54bfc0ca10768558cd4e5017ecf8cb647f4b9176561192a3ace64edfc5c6f735664bf1b6136aa0bb9828114478f92d2c051e3109a218c12
 DIST websockets-9.0-src.tar.gz 192076 BLAKE2B f5d2fe0e947b4833a11c013ce64640369794e1c5e4db5dcee7a630d8edd46ba72afd4bc42cd8adb392c09e2758d907a0029e09d61465215b3fbaa2430582cf2f SHA512 446d9734e2767a19a5c84de2676cf3730dc717d94e14443ded01727d47b02fca67546bcebe37d177088baaee61c8a7a90f7e15df1ee5bd0ed0a96bb4e46ad1d8
 DIST websockets-9.0.1-src.tar.gz 191411 BLAKE2B 9e45836334f55c18391fc853c81fe7d2b3929fc3fe19d216498a8f39891c82efaa83608ed6732375e1d6fa2a9c84aad77c99aa3e6f57a9a328ff9168a1e58c77 SHA512 554dc5f272f4f849982a2e2a3d391bc6dfc36dc247aa0e2854913d18772749762db424da38f135f8cf4a2a5f67a379f774faba76eb3113bafe509ac62753bed1
+DIST websockets-9.0.2-src.tar.gz 191752 BLAKE2B fde055626e067c482e81a80e0bfe32be81451b99c77c66a4d99b9375a93e46ee627668323599cd7444c834a13cefefadcc9acfa3f8ed00fc8a2a69d743a7fe69 SHA512 ddbd98c70734ff387b96396e5233286154a1f5f92db945f723012e7199f71db31e514d407f065c9d027358dfac0bd1ad59396bc7560b15749e9828af827a23cc
 EBUILD websockets-8.1.ebuild 469 BLAKE2B f726a691f5a392ddb087850b3476a5ae9d6495c182b670aa6287198abe06ecb6b82c57540ae58194252ffb89c90639a8e2e6c0f6bb15606667e2a0df0272ca1e SHA512 f23db3bee0f46176302d491c91d9b27c7e65f9f0e0ea855078fe358a0d36d73be836c8452b8df074733f5e09145ad38e91ab43f837baf38cd0f63b084c0d31f9
 EBUILD websockets-9.0.1.ebuild 472 BLAKE2B 341463699e5b24a0d9113b2395cfa6b24c73f357775d6dc288b8e07c37789c202ba9258adc391f0a1e00781592786341fea9eb96fb4b1effdf87ef0db102c0c5 SHA512 95d72ccfce9f61145656b4040195e191923e4c5ae9db450c3ff11f3920dfeb617b133ad949216d211eca43600b593c82e0db0b3671263ba18f566ce8472c95ec
+EBUILD websockets-9.0.2.ebuild 486 BLAKE2B a5fe7829469847c9b46c5a7615118f0f1bbd627d43313cf01fd292fa83bd765b4e321219ca705c27c0edc16d22719f72319061758f5595823a3ef8223045ebed SHA512 616ee8c8262a6b5a92b3a2c222225152d5e4178dcde185303fb8a241398b663e4ca4ce8ddd134f698cbab515cf2384f3c6dbdab6fc2a1dda5ef8d1d106f4a5a2
 EBUILD websockets-9.0.ebuild 472 BLAKE2B 341463699e5b24a0d9113b2395cfa6b24c73f357775d6dc288b8e07c37789c202ba9258adc391f0a1e00781592786341fea9eb96fb4b1effdf87ef0db102c0c5 SHA512 95d72ccfce9f61145656b4040195e191923e4c5ae9db450c3ff11f3920dfeb617b133ad949216d211eca43600b593c82e0db0b3671263ba18f566ce8472c95ec
 MISC metadata.xml 487 BLAKE2B 7d67f4b4e650d1cc83e80eb7ad5020ef997f92997d94f19274b7e0c794f9efdb3d085faa8582321f0732cf489a5358310368a2e22b8e471d815bc9b09a16f47e SHA512 6b88582ba918dd95faa5b7e3d4aeb59f7ff455a509c018c61f61a1d2e9f69734c9d02c9d666447ea787f771fd13b44f7a54b0e6147703187a7a9fe9fccf186e2
diff --git a/dev-python/websockets/websockets-9.0.2.ebuild b/dev-python/websockets/websockets-9.0.2.ebuild
new file mode 100644
index 000000000000..ab6d5c255eef
--- /dev/null
+++ b/dev-python/websockets/websockets-9.0.2.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for building WebSocket servers and clients in Python"
+HOMEPAGE="https://websockets.readthedocs.io/"
+SRC_URI="https://github.com/aaugustin/${PN}/archive/${PV}.tar.gz -> ${P}-src.tar.gz"
+LICENSE="BSD"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+
+distutils_enable_tests unittest
diff --git a/dev-python/werkzeug/Manifest b/dev-python/werkzeug/Manifest
index 8aa96ef6357d..ceaa310ed4cb 100644
--- a/dev-python/werkzeug/Manifest
+++ b/dev-python/werkzeug/Manifest
@@ -1,3 +1,9 @@
+AUX werkzeug-2.0.1-py310.patch 2951 BLAKE2B d820edb9a7e8d94e1783b3a5e2dcb1a12993b00bba92593257447063073a8f9ae0787241ffd2c80776906bb28089c463b32996b7602aa9ba4a15234eec8986a0 SHA512 5f0692374be1af49dd14c8793ee827fe584e5f3d81845f7b57050c3c2ddfd7bd61812ce5d5be527c26562cbfa2c1dd0cf3932fe8e8019f8cd4e48d1d2c8c1e15
 DIST werkzeug-1.0.1.gh.tar.gz 907482 BLAKE2B d2dcdce8b1bcbb177b52b0915f2c0ac17d235dee3c77b23e81e4b35412d1f53a194d3c7c7f2a5c065ade99797effe72cc464cf6980b12c761a8a919338021660 SHA512 ba82120fb3e96e3a1334c6452d5ba1950fc016d2d147d643bbc2168ccec496f1dea799982ae8c578167155082c0bdbda5d56a23f64b4b6865f97e90e22df022e
+DIST werkzeug-2.0.0.gh.tar.gz 894475 BLAKE2B 608de444944fa0bd35c0244a30967446abb8f0d05a8cd49f09707c368b6f9649b299f427fa7bc2e54628cf3eb688c399e420ecd54f12d7eab9cb063c7c740b07 SHA512 8c8e36a58fe53ac4ad3152a34145c726a9145782262b9d47be7bfe9a8e127666b0d0c0c50d305277a153298644732efe37e3785ceaa5b11394adfeb70d86e70d
+DIST werkzeug-2.0.1.gh.tar.gz 894795 BLAKE2B cef0c6d704604d8b63d9e9d1ef8f232f97cae6654a4284b66ba7cd97f850df725d644ea11ed898a53f69668247545de86a9c44bc381606c700f4e2611fea7699 SHA512 721a6c3cf8f803c80873f68d94b273da2ddda79b5e83d9283b9af3d3c971bb8c7ac7828c7a60c33b9bded7b05f063810df12fc266ee7d264dc6261100fc97708
 EBUILD werkzeug-1.0.1-r1.ebuild 1352 BLAKE2B 8e8cc3e15bb6f78ff783fcb03ddc54bae9abed4b25012e71766902b9d2bdb3699c53a71608b95b58a625ce6091d61d2745524a38a6f44dcb77490c5d720f2261 SHA512 329fa7ed8319d7eec1321369ad4e19cc345d21a5ab3f5d954bf2bc17a0c1b6336baaa52081086cb08e0dfe9ce032c44e207d25c0de868d8a2b24e88afbd8e3d2
+EBUILD werkzeug-2.0.0.ebuild 1015 BLAKE2B dbbafdea67df22156976230b705228f23f5fde4d3f8e98c932b032f7ae498e8b41dbac7e70d67b98eb3886c0739ba79309ef41d1d24207e9d3014c37a715d585 SHA512 66002c896e3c4b0c204a7e7d9c5cc5686165c8343d3c92cb8350064504dd6528b6739dd77a3e806c4e5a7e336b8e87f5648d29b19d3d16442dba4977ed45d434
+EBUILD werkzeug-2.0.1-r1.ebuild 1392 BLAKE2B 9dce5ec69493d6723b92b6fd416d125b5a087c9db283be6d2844f655a467aef79a3afa16f74540775a56f56e85943e121131247a9e7bd044092e789f04c373bb SHA512 fadf31d89ebd82cb1e5636f308086bcafd1055c03573ac0cd944f86e5f45e36ee85a5bf31e058092c13f10844474b09d4cf94d87bd4220e42a1acdd0586e0020
+EBUILD werkzeug-2.0.1.ebuild 1015 BLAKE2B dbbafdea67df22156976230b705228f23f5fde4d3f8e98c932b032f7ae498e8b41dbac7e70d67b98eb3886c0739ba79309ef41d1d24207e9d3014c37a715d585 SHA512 66002c896e3c4b0c204a7e7d9c5cc5686165c8343d3c92cb8350064504dd6528b6739dd77a3e806c4e5a7e336b8e87f5648d29b19d3d16442dba4977ed45d434
 MISC metadata.xml 367 BLAKE2B 3a7fccc21ad8c434460cebeee5354dcc6fa0f667ae12b551fe8b4776c3a0d1bfbf3a92e5481eba85c1937bc1c9b4a7e17c21d70428ffc44f08f83b35f7037e42 SHA512 e0a3c3dce6af15bd50e7ac7e56afa18e9baab0f95c719c54b643fb906ac837f0e29e8cfaaf38f4e1ddb4a6434b6866c721d010604e3daa075d5a554183b494e6
diff --git a/dev-python/werkzeug/files/werkzeug-2.0.1-py310.patch b/dev-python/werkzeug/files/werkzeug-2.0.1-py310.patch
new file mode 100644
index 000000000000..56a0166d334d
--- /dev/null
+++ b/dev-python/werkzeug/files/werkzeug-2.0.1-py310.patch
@@ -0,0 +1,103 @@
+From 584f3cff7d5cb8a588189ae1137b814cf5c47e05 Mon Sep 17 00:00:00 2001
+From: David Lord <davidism@gmail.com>
+Date: Wed, 19 May 2021 20:01:58 -0700
+Subject: [PATCH] address deprecation warnings from Python 3.10b1
+
+---
+ tests/conftest.py   |  5 ++++-
+ tests/test_local.py | 34 +++++++++++++++++++++++++---------
+ 2 files changed, 29 insertions(+), 10 deletions(-)
+
+diff --git a/tests/conftest.py b/tests/conftest.py
+index 3b5cbd71c..4ad1ff23e 100644
+--- a/tests/conftest.py
++++ b/tests/conftest.py
+@@ -66,7 +66,10 @@ def connect(self, **kwargs):
+ 
+         if protocol == "https":
+             if "context" not in kwargs:
+-                kwargs["context"] = ssl.SSLContext()
++                context = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
++                context.check_hostname = False
++                context.verify_mode = ssl.CERT_NONE
++                kwargs["context"] = context
+ 
+             return http.client.HTTPSConnection(self.addr, **kwargs)
+ 
+diff --git a/tests/test_local.py b/tests/test_local.py
+index 537fc32fb..b5c392890 100644
+--- a/tests/test_local.py
++++ b/tests/test_local.py
+@@ -12,6 +12,18 @@
+ from werkzeug import local
+ 
+ 
++if sys.version_info < (3, 7):
++
++    def run_async(coro):
++        return asyncio.get_event_loop().run_until_complete(coro)
++
++
++else:
++
++    def run_async(coro):
++        return asyncio.run(coro)
++
++
+ def test_basic_local():
+     ns = local.Local()
+     ns.foo = 0
+@@ -55,9 +67,11 @@ async def value_setter(idx):
+         await asyncio.sleep(0.02)
+         values.append(ns.foo)
+ 
+-    loop = asyncio.get_event_loop()
+-    futures = [asyncio.ensure_future(value_setter(idx)) for idx in [1, 2, 3]]
+-    loop.run_until_complete(asyncio.gather(*futures))
++    async def main():
++        futures = [asyncio.ensure_future(value_setter(i)) for i in [1, 2, 3]]
++        await asyncio.gather(*futures)
++
++    run_async(main())
+     assert sorted(values) == [1, 2, 3]
+ 
+     def delfoo():
+@@ -118,9 +132,11 @@ async def task():
+         ls.push(1)
+         assert len(ls._local.stack) == 2
+ 
+-    loop = asyncio.get_event_loop()
+-    futures = [asyncio.ensure_future(task()) for _ in range(3)]
+-    loop.run_until_complete(asyncio.gather(*futures))
++    async def main():
++        futures = [asyncio.ensure_future(task()) for _ in range(3)]
++        await asyncio.gather(*futures)
++
++    run_async(main())
+ 
+ 
+ @pytest.mark.skipif(
+@@ -571,7 +587,7 @@ async def get():
+     async def main():
+         return await p
+ 
+-    out = asyncio.get_event_loop().run_until_complete(main())
++    out = run_async(main())
+     assert out == 1
+ 
+ 
+@@ -599,7 +615,7 @@ async def main():
+ 
+         return out
+ 
+-    out = asyncio.get_event_loop().run_until_complete(main())
++    out = run_async(main())
+     assert out == [2, 1, 0]
+ 
+ 
+@@ -623,4 +639,4 @@ async def main():
+         assert p.value == 2
+         return True
+ 
+-    assert asyncio.get_event_loop().run_until_complete(main())
++    assert run_async(main())
diff --git a/dev-python/werkzeug/werkzeug-2.0.0.ebuild b/dev-python/werkzeug/werkzeug-2.0.0.ebuild
new file mode 100644
index 000000000000..1605d4dbfa38
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-2.0.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="
+	https://werkzeug.palletsprojects.com/
+	https://pypi.org/project/Werkzeug/
+	https://github.com/pallets/werkzeug"
+SRC_URI="
+	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		!hppa? ( !ia64? (
+			$(python_gen_cond_dep '
+				dev-python/greenlet[${PYTHON_USEDEP}]
+			' 'python*')
+		) )
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/watchdog[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# the default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR=/tmp
+	epytest -p no:httpbin tests
+}
diff --git a/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild b/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..76e9a1859dab
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-2.0.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="
+	https://werkzeug.palletsprojects.com/
+	https://pypi.org/project/Werkzeug/
+	https://github.com/pallets/werkzeug/"
+SRC_URI="
+	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		!hppa? ( !ia64? (
+			$(python_gen_cond_dep '
+				dev-python/greenlet[${PYTHON_USEDEP}]
+			' 'python*')
+		) )
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/watchdog[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${FILESDIR}"/${P}-py310.patch
+)
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# prevent esetup.py install from zipping the egg
+	sed -i -e '/\[options\]/azip_safe = False' setup.cfg || die
+}
+
+python_test() {
+	"${EPYTHON}" -m venv --system-site-packages --without-pip \
+		"${BUILD_DIR}"/venv || die
+	local -x PATH=${BUILD_DIR}/venv/bin:${PATH}
+	unset PYTHONPATH
+	esetup.py install
+
+	# the default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR=/tmp
+	epytest -p no:httpbin tests
+}
diff --git a/dev-python/werkzeug/werkzeug-2.0.1.ebuild b/dev-python/werkzeug/werkzeug-2.0.1.ebuild
new file mode 100644
index 000000000000..1605d4dbfa38
--- /dev/null
+++ b/dev-python/werkzeug/werkzeug-2.0.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Collection of various utilities for WSGI applications"
+HOMEPAGE="
+	https://werkzeug.palletsprojects.com/
+	https://pypi.org/project/Werkzeug/
+	https://github.com/pallets/werkzeug"
+SRC_URI="
+	https://github.com/pallets/werkzeug/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		!hppa? ( !ia64? (
+			$(python_gen_cond_dep '
+				dev-python/greenlet[${PYTHON_USEDEP}]
+			' 'python*')
+		) )
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/pytest-xprocess[${PYTHON_USEDEP}]
+		dev-python/watchdog[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# the default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR=/tmp
+	epytest -p no:httpbin tests
+}
diff --git a/dev-python/wsproto/Manifest b/dev-python/wsproto/Manifest
index fdbefd23b637..d8d31a146ce9 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 514 BLAKE2B 845bf77e713b04b67f9d91381759bf98fa9daef06f2dcf93767793c5f1e6c3bf831a98176681887466d4d9ea9a7c6706e9e711db77e7cdc2d2b65cb2d38e5063 SHA512 37fde19ac1bf9c1ff72f0a3559429f6aac98bd97d8b6fae824a4791aa575f10d3a44cfedcc445d6ba2a944ee3ffb04e349bbdb166652d53828aec23c22fbb38f
+EBUILD wsproto-1.0.0.ebuild 538 BLAKE2B bffa2df73963871b797b01f8c5a8a11909064ccb29e44637ccb90c1c4c210898b2f8ef820b15380031693fa24ec8feca3a93e011b26fae38fd006b4e470c0395 SHA512 cade3ee47cd309fd4c43108f603cf8d3241861114770d5966fe24fec924279aba0a27237193983957e517632826dff7b353c1b6e59c26b57516216300a257936
 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 096ee40c39ab..9a22037eb094 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 ~arm64 ~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 50695e7e95a4..a1010c7445a2 100644
--- a/dev-python/wurlitzer/Manifest
+++ b/dev-python/wurlitzer/Manifest
@@ -1,3 +1,3 @@
 DIST wurlitzer-2.1.0.tar.gz 8788 BLAKE2B 9a9e9696446fe31f0ff392eee011f341ee24c102e4e6bac195586b764386d1a835567560306cd3cb6e942b539a57ffa15aa9b3a20fac9224311ed7301130c84d SHA512 cc7291786b0505627129619094218f51c0679c0c3550645af3b94bdd3f10afd5fc8402d89dcb599d874a5c9e4f4966dc49a6f98a1ab0e2bb9adbc3f95d4fcc6a
 EBUILD wurlitzer-2.1.0.ebuild 611 BLAKE2B 99e65a65cde9d9f26afdaa36690dcf7895ded9391b962c9c03a78c0ac19417816cc40a28de31ed83ab6efbf4edbba77389dbdae43b76eb6227c3b9dd575941d4 SHA512 8af6ed6f1b10126e9b0fc851c452aa1dccd34d343017885405b65c0413b95598ec1978c93b90d3a32db11c78f7c690dd41e22986de70c61893142bfd293c4ffe
-MISC metadata.xml 556 BLAKE2B dca40a4c01d7007f94d4f095c053d66a3638fab0a0d94a5f882f83c112c5e5b3d2d633ed8c9a90abd43c499fdf492a9f959a6dc15b8c5ea753170721a6cc0d5e SHA512 5abefb57058b2b948994c37c6f89a939ab7035542c3807b9f4b2424933bf5787deb7815bd46a0bac000f7b3c3e2ab01662570b7b602c7174b20597904880c421
+MISC metadata.xml 409 BLAKE2B f8a031f6909bc9a775230c8d4680f97d340eb8826b0076cd0e0b2045e14f48b0f0bce1d6404f98c591ac3a74bfc8bf50385ab9f6bb09ecdc79a37a61a097df3c SHA512 281d6539c4fb171a63d7ac0f815aed31212c66d14a1d29abeb08bb64a804a72bb7b27dfce608fcd5ec664772cc169dee61b79f26e1081c58a36ccbe5e7818ffe
diff --git a/dev-python/wurlitzer/metadata.xml b/dev-python/wurlitzer/metadata.xml
index bbe06706f735..c9f06eef4117 100644
--- a/dev-python/wurlitzer/metadata.xml
+++ b/dev-python/wurlitzer/metadata.xml
@@ -1,14 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>andrewammerlaan@riseup.net</email>
+	<maintainer type="person">
+		<email>andrewammerlaan@gentoo.org</email>
 		<name>Andrew Ammerlaan</name>
 	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="pypi">wurlitzer</remote-id>
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 4be4ac472b30..e8e3de7ef9cb 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,3 +1,7 @@
 DIST xarray-0.17.0.tar.gz 2055584 BLAKE2B afbd28032069e4b498c87abd34661dc96525cb581a08fcf68eeaca08468afb9b452650bce4d21cada0eb1cb75ad11b0565a6b965b11120d4bef4d4cd612fa91d SHA512 726d548519614936f4b6c6ded0375a35362b195a2c6b55a282d198cbb8a70fa7439377a88f253cf4f16c86582fc22c8a4700b9645516decf7edd3e980d9dda34
+DIST xarray-0.18.1.tar.gz 2849935 BLAKE2B f4d510a049e67431737ba7f6a66fdd83061e6e5728ac6bfd3b9f104b24cc619cb1d0f05bbe6911e952c312ef229dbf1a68842b75dbb0ecf811fcc7d6e78569b0 SHA512 e1842d7bf06ee23716038fd58e7ae3a2014012cbc49394c9000272cb0498c1d333cbf3133b1d8fcdbddd524d44f6fa5fcc117c992d0ab1d3d0b9c4ddfc317847
+DIST xarray-0.18.2.tar.gz 2850065 BLAKE2B 16d8f5e10a7c9cb4247a3bc8f496f249d66235673e79d0707077e20b54a7d94a7b754fb00f44b876fa21273521f9e2e7d52183798ca33b8e62b30fbc57621c5a SHA512 3cfd6a3b77c48a73eb72e6c39db33aba266925df7ce9b8270231dd14032a717094073a2c3686b09fcff25313b548a452f9ed902211e254254389d15f025d8d0d
 EBUILD xarray-0.17.0.ebuild 1090 BLAKE2B 95aa23f92a87a18dfbb8eafb225bb00ad0d8803d153bf6dbc7c14d2098bd396f2a423642c7f0dd55b0ae3a4a0f9d0c91c4e07470e2c35b9a6d7860cf3e437a43 SHA512 7b1774d9f94f1510d3e470e4a887a8bdb9986a4a4825d42737adb45492b5701f678da43ad8f4466d52ee28a1847f7470653fe042185be7bdb950319512f36fb9
+EBUILD xarray-0.18.1.ebuild 1092 BLAKE2B eeaa65c52f8cb7d9c8abce710e7402fc3647484cf288189dd3561c5f6e7e865a2b01c75525943dc18696877b7c164205b091d08d8e2e24f77b037b024d322f72 SHA512 6d4fc469c4878ebc65a4b1681e402f0e6363b524b1fdd59fdf36a449e22f5c8c54d0847d38a1d557f0f79a23b532b2bef68c7ae5a799a598162c774dff9086e9
+EBUILD xarray-0.18.2.ebuild 1092 BLAKE2B eeaa65c52f8cb7d9c8abce710e7402fc3647484cf288189dd3561c5f6e7e865a2b01c75525943dc18696877b7c164205b091d08d8e2e24f77b037b024d322f72 SHA512 6d4fc469c4878ebc65a4b1681e402f0e6363b524b1fdd59fdf36a449e22f5c8c54d0847d38a1d557f0f79a23b532b2bef68c7ae5a799a598162c774dff9086e9
 MISC metadata.xml 508 BLAKE2B 173d15b73f7a3566c657ebf266b60c4c5b8b92e120fe5eac24bc7fc56faaf9378812386506914372aa9b65e49decd11e1f0e55b33ae41b1c51cda2a20f1bd23c SHA512 988742c143bbcd35de2bd649c72eb8db09f3310014b9a93033e383e1c8c6e799492616216b8389f272e46aa2afe925279550094049b9df2850f1fa78b6071966
diff --git a/dev-python/xarray/xarray-0.18.1.ebuild b/dev-python/xarray/xarray-0.18.1.ebuild
new file mode 100644
index 000000000000..f797bf1c514c
--- /dev/null
+++ b/dev-python/xarray/xarray-0.18.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pkg_resources use in code
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="https://xarray.pydata.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.0[${PYTHON_USEDEP}]"
+# note: most of test dependencies are optional
+BDEPEND="
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# warning-targeted tests are fragile and not important to end users
+		xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/xarray/xarray-0.18.2.ebuild b/dev-python/xarray/xarray-0.18.2.ebuild
new file mode 100644
index 000000000000..f797bf1c514c
--- /dev/null
+++ b/dev-python/xarray/xarray-0.18.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# pkg_resources use in code
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit distutils-r1
+
+DESCRIPTION="N-D labeled arrays and datasets in Python"
+HOMEPAGE="https://xarray.pydata.org/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/numpy-1.17[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.0[${PYTHON_USEDEP}]"
+# note: most of test dependencies are optional
+BDEPEND="
+	test? (
+		dev-python/bottleneck[${PYTHON_USEDEP}]
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/toolz[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.4[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local deselect=(
+		# warning-targeted tests are fragile and not important to end users
+		xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
+	)
+
+	epytest ${deselect[@]/#/--deselect }
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 5a40a96ccce3..7410efc96cc2 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,5 +1,7 @@
 DIST XlsxWriter-RELEASE_1.3.9.tar.gz 32931982 BLAKE2B 3cf4d6497e615b8404da6bcfb610f1a728d6a47a5c70feee82098bf30be46a2b0fcbfaa5ba5fb88544a96bf9bd4c0187721b2db27484e1e293fa3fc45c0ebeef SHA512 1227788c98381fbbfee02c31d846d54ab769bdb8feeb179fa8462278614d8c75d71ee6d2fc4204e8677ebe949add14b1a5448c36bf0e8721eec5b8789da0b676
 DIST XlsxWriter-RELEASE_1.4.2.tar.gz 33854120 BLAKE2B b3d21fad8c81f2ca7179f0a9af3f1177baa9c104d78594ca2731dae8ece8f7704ea7a2e4d8f938e6fa9fd703068dc2de56fc7588fe9b6213e794bf72008895f0 SHA512 b31886c991f5df537a5bbca09ba545019e65f949e157b5a4dff4b68bc944b8397f25d297bb64847249f748cd31e7a9cba2ae02d08f96e970b5840cd9eb33e5ca
+DIST XlsxWriter-RELEASE_1.4.3.tar.gz 34122578 BLAKE2B 7f9a9f2f9c7eb6f425192e30961d455dc348b51cec72ce4602b975c41cdfcbfc4e8d49efe62877d8f96dc6ce02320f64fa2ff55586a17d29cf2a950c9eaa9593 SHA512 38b12e3c6bd14122ea9bf652ef33078cf4aedc2be7ce8c3151960331827642713d25f3f9bff9ad7d375d251086e1cc58b09e4d77141dd2973c21a1d24c0b0dd0
 EBUILD xlsxwriter-1.3.9.ebuild 552 BLAKE2B f663daaa9727cf395c829f180a8477f460491a1bf6a6323f5c6ac48b12f5dec01699a1d425818a03440e27eb42c0bb8944ac36d7f4f467b91792610f3844bcf8 SHA512 498e21a01c08f0fabab4a676c42b03db6cd6a9686ffe03e1a94ef34540dc47a883094af349ec8db731161378cce61d3315cc604cfed0226e24074fba164cd6f5
 EBUILD xlsxwriter-1.4.2.ebuild 555 BLAKE2B 1b11ecad7416841131563a8158c2358530923d8613ae76f74b4eca5060b923806e32d801538e9f354e707adc54e49fef17673091974d00afe56f22a8c1490b86 SHA512 1c16fcc4fd5f7696b9dd2f112e10441d7c10cdea6e61282748aa1fad23abb922c9b191e608fc29452d4b1111f86fb5228b04928bb29cc294341fd92df532f8aa
+EBUILD xlsxwriter-1.4.3.ebuild 555 BLAKE2B 1b11ecad7416841131563a8158c2358530923d8613ae76f74b4eca5060b923806e32d801538e9f354e707adc54e49fef17673091974d00afe56f22a8c1490b86 SHA512 1c16fcc4fd5f7696b9dd2f112e10441d7c10cdea6e61282748aa1fad23abb922c9b191e608fc29452d4b1111f86fb5228b04928bb29cc294341fd92df532f8aa
 MISC metadata.xml 410 BLAKE2B d1fab95b5fac3e69c5303298385f65062b28934f22fe8db02db02753b5cae36137a3e02e1d38e3762933dc9297045e1efaee8d17c714ca7b22459f342f23f928 SHA512 4f3d74f5afdec59b8575446b444f1af36f71137c980f7790e952860afa98b2d128ddf8477b135715de2852b940926108dafbff3cb60f2f1a8825a02c415810e9
diff --git a/dev-python/xlsxwriter/xlsxwriter-1.4.3.ebuild b/dev-python/xlsxwriter/xlsxwriter-1.4.3.ebuild
new file mode 100644
index 000000000000..f2f028969d3c
--- /dev/null
+++ b/dev-python/xlsxwriter/xlsxwriter-1.4.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
+
+inherit distutils-r1
+
+TAG=RELEASE_${PV}
+MY_P=XlsxWriter-${TAG}
+DESCRIPTION="Python module for creating Excel XLSX files"
+HOMEPAGE="https://github.com/jmcnamara/XlsxWriter"
+SRC_URI="
+	https://github.com/jmcnamara/XlsxWriter/archive/${TAG}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
diff --git a/dev-python/xmlschema/Manifest b/dev-python/xmlschema/Manifest
index 5c72ae6a4ec4..d9a3b7a95c6e 100644
--- a/dev-python/xmlschema/Manifest
+++ b/dev-python/xmlschema/Manifest
@@ -1,9 +1,3 @@
-DIST xmlschema-1.5.3.tar.gz 350684 BLAKE2B 5dfcd2e00339caa834195729cce1604d17e5aa4705150649e22bebe3dc7b3ac6ace5dccbc7b6313c5cadb5ca29992853191afff2f76f05d18c10294131a904cf SHA512 3d86dc407d3181bf5c34b2d6aead9995eca1b7210b39ce3cb95c5655fa0cac0bbcc9f15c6ac016aca69a23f19befbe0525d6f13644b68fde348dcd0fd03bfa73
-DIST xmlschema-1.6.0.tar.gz 362175 BLAKE2B a9ff2807e3371ca81af3f0febf555c3fb5cea0b3623925e5b9c5f7b48df8e7c7118f3654930dd13b785ab1f1816d43df08316ddaeca2df983dc3f611ebacad10 SHA512 d72c85307b2b22bb59ed3331a1fbb8fd4ce58e69fed1762e37b89fba6c2f704753123ae34bb6155bc60d287461e426eff48b2b6a04899f067f0f235129320099
-DIST xmlschema-1.6.1.tar.gz 365094 BLAKE2B f39992b61b6ebdc6f9e9a8a83d004bbed0d74bafead7f61e20ff4adb9c135e8e50fa8f7bb20d6ccbfd95894dd62c8cf265d40caae29a8020b73eabbd2366c282 SHA512 be766649f43c297a3ae593bb59244199c52f87bf5f85eb54f5ee8e7cc7a8312aa74ed45198df63a43045840231339203180b7175ac71b850640c44aeb67b5ff5
 DIST xmlschema-1.6.2.tar.gz 367141 BLAKE2B 32a1e4924765badc268d2d68458c4d6d0409c5f3b4e0109487cc538aec300817cf0649a43f77990e82b2c54252b2ab3e0593a503c217893661480f1632491f41 SHA512 5aaf022451fa069b2361af542d4d864995e8dae7d50f5e66a5d5567b4d8511bb46b5dcec68a780e89025ff02f5bbb6311c4fcd4fb17f6c24c0c02b00c6b4a341
-EBUILD xmlschema-1.5.3.ebuild 809 BLAKE2B 6b29d4d472ca9956ed9120a9e0fb827dcf1f0e85580356655a6a91e14e30d74748eda7360b04a5abf8b0816f8b6b396189cf8759ebaffbcdf439982e2850dc42 SHA512 abea1108261b85c6259d9a409e78b5a7526ea3a41eec59ba046378d16550927778571605a40ea1035630af7d954ab7e98c2d2f84ff8d1e8a610a17b2a9344d50
-EBUILD xmlschema-1.6.0.ebuild 817 BLAKE2B ff80a957b8e070b29c040a507074b7a976d8a98763685389bbc9f214f594297b7dc6b91e399ea5348ee4a0e37e06d5a74075621b1a13c1dd928e2c228bc52a11 SHA512 8e4e78713a553a45ab106797a1c0b44a8a9b4165b59feac81a730ff2108d7c6649ccebbd604d862495793b61478d8b61f26ae8cfad6757db53dfa123f8b67b55
-EBUILD xmlschema-1.6.1.ebuild 817 BLAKE2B ff80a957b8e070b29c040a507074b7a976d8a98763685389bbc9f214f594297b7dc6b91e399ea5348ee4a0e37e06d5a74075621b1a13c1dd928e2c228bc52a11 SHA512 8e4e78713a553a45ab106797a1c0b44a8a9b4165b59feac81a730ff2108d7c6649ccebbd604d862495793b61478d8b61f26ae8cfad6757db53dfa123f8b67b55
-EBUILD xmlschema-1.6.2.ebuild 783 BLAKE2B aba25e63519c924d5ab4947270fbee192a1d8472ec8ab7abef3c647ca87cdbba7f214c23c2b9e0a6168cdf76bbfca66b49defc9aeac555f73eecd6bf84480725 SHA512 b2c6f64e7ea3e3d5cff5713d80bb2f9ba4cc821e4f1d6f7ee7acbf8c1e73f994a596eca1f90b31db65092a340e8fe23c1bf831de28bfff991c9cfae7a3a76722
+EBUILD xmlschema-1.6.2.ebuild 776 BLAKE2B 0b817a920dd8e9c0225e4422555f3dab1fc85e5339fed940e0dcb90d7d05f0c06bdfd0e52a8d7ada5a021e4910c81c9e7cc802acedd9ecce76aee65fa145d02b SHA512 7687a1b298d768a761cb14503fc9ec4894132c549933137add5a833397dbc696372e4ebf30f30a04dc49629a9462d9525d141e8e9b9e8594e09bfc58d2c4a6b6
 MISC metadata.xml 375 BLAKE2B 16a422a1beab981008ef66eccca94cace74cb244fb6123d2495e13045b4c786bf00f2807d3ac73e98f1c962fc0ccb7f7aa84f565dff54e2ef2077776a85bd479 SHA512 db2b030851d7357aea0b41066bcfa36b9ae81c745f413a3cdc1a528a38f2ea1a8c7876abff7f139801185f075be9e841d637f238b9d3bc37fa212f13c06ec411
diff --git a/dev-python/xmlschema/xmlschema-1.5.3.ebuild b/dev-python/xmlschema/xmlschema-1.5.3.ebuild
deleted file mode 100644
index 74b889d26665..000000000000
--- a/dev-python/xmlschema/xmlschema-1.5.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.1.2[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.6.0.ebuild b/dev-python/xmlschema/xmlschema-1.6.0.ebuild
deleted file mode 100644
index 5bb53aff4381..000000000000
--- a/dev-python/xmlschema/xmlschema-1.6.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.2.1[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.6.1.ebuild b/dev-python/xmlschema/xmlschema-1.6.1.ebuild
deleted file mode 100644
index 5bb53aff4381..000000000000
--- a/dev-python/xmlschema/xmlschema-1.6.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="An XML Schema validator and decoder"
-HOMEPAGE="https://github.com/sissaschool/xmlschema https://pypi.org/project/xmlschema/"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-python/elementpath-2.2.1[${PYTHON_USEDEP}]"
-BDEPEND="${RDEPEND}
-	test? (
-		dev-python/jinja[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)"
-
-python_test() {
-	"${EPYTHON}" tests/test_all.py -v ||
-		die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/xmlschema/xmlschema-1.6.2.ebuild b/dev-python/xmlschema/xmlschema-1.6.2.ebuild
index db475aba195e..f53fafca8870 100644
--- a/dev-python/xmlschema/xmlschema-1.6.2.ebuild
+++ b/dev-python/xmlschema/xmlschema-1.6.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 inherit distutils-r1
 
 DESCRIPTION="An XML Schema validator and decoder"
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/xvfbwrapper/Manifest b/dev-python/xvfbwrapper/Manifest
index d3866ed50700..cd35269d92b2 100644
--- a/dev-python/xvfbwrapper/Manifest
+++ b/dev-python/xvfbwrapper/Manifest
@@ -1,3 +1,3 @@
 DIST xvfbwrapper-0.2.9.tar.gz 5575 BLAKE2B a973e6ca6dd85713e7b350397113d63c15fd284c07d3a0d5c0b8b8dceed65c3a17a3e8222b79ec88fb124175259d51fcd31d09a95183f1cbd091ba11d9bbec3b SHA512 800f3489b2e1bbc884d7651e344ed73783d6c00856f3ab7ccfa6b9058dd6d3bb98d38f11172ba89dff5773d6c5b773bc000786c1f6c6aae5a27179b37017851e
-EBUILD xvfbwrapper-0.2.9.ebuild 565 BLAKE2B bbca803c7527a1496be0ba9b73fbe04a13fb6b5e7b70d2cbb33fa70baedee0f05a525485dddd32a73e6bc7924cc7da881d67e260d704e978bcc736a9c430a107 SHA512 263efb24c3649e4bf852d1b847a4b102559a10133e73bb092b8e7ea4ce5b621431334db3315c0f0c13d87941a0c81be260f5ca50c4a3954b3f054bf04eb3e7bf
+EBUILD xvfbwrapper-0.2.9.ebuild 508 BLAKE2B 3115adb93d87ad33bda74a5c476a537230538d67d0bbd66df6482b4fa4509f3c7191cb1c7e7859901628dd46884472832fc28029b000149987890279aafa9f9e SHA512 9d5b6814de999d392688d8b143ae0001c3bb53f27f540fb06a46505ac081112b6e3c4df8f428bb20c8db4a525d71081266dc5141b81ba800dc66c312299bac7a
 MISC metadata.xml 387 BLAKE2B 1371ad91acdddb84e00b9d88497327d9f969686caeb599467b702da40bc0bb59f324d143cbc285e2739c2afb49bf7984eca78ad9e02a89b8c5697ed21d33b3fb SHA512 d9e8ace17387367e585434a5b178a7a1715973828d6cf762ad82f2c4020413239e87b26dbcb9a8db1122ac57e2b09fe01f0f7fec1b48723cde989c0205b84885
diff --git a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
index 3caf52145138..c49d2aeb70a1 100644
--- a/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
+++ b/dev-python/xvfbwrapper/xvfbwrapper-0.2.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit distutils-r1
 
@@ -17,6 +17,4 @@ KEYWORDS="amd64 x86"
 
 RDEPEND="x11-base/xorg-server[xvfb]"
 
-python_test() {
-	"${PYTHON}" -m unittest discover || die "Tests failed with ${EPYTHON}"
-}
+distutils_enable_tests unittest
diff --git a/dev-python/zconfig/Manifest b/dev-python/zconfig/Manifest
index 8427c7e921ec..c7336d06bd31 100644
--- a/dev-python/zconfig/Manifest
+++ b/dev-python/zconfig/Manifest
@@ -1,4 +1,6 @@
 AUX zconfig-3.5.0-py38.patch 4463 BLAKE2B 05d79cd68ba04ca55fb03f49ce5f2342e4806d921ea8e8a516a4d5ea841187be90a1a5a1a5ac4c14ed940f8c58773260a27d6617cb3e2c60b61f7764d1357ac7 SHA512 5ba6f4d6742d926bea2c19afa3ac130f6f6fd2527f3689b793a498e1a98e1f735216102ee49a5e4246af7f86b671b031a7b3b026001f4965f321f774a9590363
 DIST ZConfig-3.5.0.tar.gz 127317 BLAKE2B 735d554072d4be4ee0552151a6bd0401e66bc0a7a091d97656a2c95efb13580d264a39e28c11e096ee77f57bc96d684720c22c981f5dbd82ce012d40c94d33ea SHA512 14af4de2adcb7e5404a4fd8e1a1903758c584898fda7c4d2a660616c37023f0e0b5d4acac789a930c2900eb501528899d51c4ea4c4050535cfbaa629e9159558
+DIST ZConfig-3.6.0.tar.gz 134559 BLAKE2B cf24d055a88c552311e5837b0caba143a9d4122caa0319ad31de89177d521ecb3f8fb7f463618f35410cc25169865103ff5957e9484e347ebd7e1b7cacb20b35 SHA512 a5cca99f324007a14f4738be1c9f7424538d8a13f7171fbfa979ce9273b29679eb18b0e905afc96d38abcf042af222e3e86acad6912b9eb8b71b6c8122c47031
 EBUILD zconfig-3.5.0.ebuild 923 BLAKE2B cbd0d03bf0fac44fc514f12aa80447fa9cd583e203fae09785f4cf4330e8a7b92214e93fb8fea1f448dfd321279bc58dadb72bce6c726e8f7faee884d03fc89b SHA512 6954cfbf485c7acf8e076f8cbde95e1d8302dd9d19ae3dd4aa1ffb415b3ea102edd8b9169778c6de84d8dcc269e7e090abb9f122cdad903a194cf2c5b3ce77c9
-MISC metadata.xml 1547 BLAKE2B 3a8a54bed981e280caa705613b73307be8f9224cd2e441d79277117977e0d73b067f98d6a7404e2e0ba0b89f5313bf126343e0db4ba0c1c6e2d074e0d61b0a28 SHA512 2d943495357baba2834bce89510210154341838a7c6c8af64cf3593ff65bdee850737a4b3fa5bf3b887849115d38144057c813d34aa577d5fbc0cb1292420d2c
+EBUILD zconfig-3.6.0.ebuild 851 BLAKE2B 04bb0733c82ba9178eb8fe1e827a8a59fcbfd7441645206011158e32316ee93a1c453b4fb8ffd3f1152bfd7da41f7b23362a248132babeb6ffe811fe6389f9f4 SHA512 780f3da53ee91dec54b2c2884a0eedbe31bd4f09c92abb24bc9f41cd9401b001085d2d4abb8378a65a9eae2d7f1515af68832beb2264f3928a5a8142ae67aa61
+MISC metadata.xml 1648 BLAKE2B 00ad863301fa15e19b1aaa2ae7ba01803d05a27936913065b52c01399302ecce5e85cdfc78401483ce1390c0d565a2e91a6915885e8f3c9c1d95afee373e9e93 SHA512 f4efa38ac148ec944b28e1bd658fee6a95542fc2639d640e26380910487a4d07525434b32f77cd5a22ccc5aef904a1008a8642ad050ceb68578c3c5235ecd6ed
diff --git a/dev-python/zconfig/metadata.xml b/dev-python/zconfig/metadata.xml
index 6220f67c54ba..5c85d8aae51a 100644
--- a/dev-python/zconfig/metadata.xml
+++ b/dev-python/zconfig/metadata.xml
@@ -9,6 +9,10 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="github">zopefoundation/ZConfig</remote-id>
diff --git a/dev-python/zconfig/zconfig-3.6.0.ebuild b/dev-python/zconfig/zconfig-3.6.0.ebuild
new file mode 100644
index 000000000000..b7ca1e463e11
--- /dev/null
+++ b/dev-python/zconfig/zconfig-3.6.0.ebuild
@@ -0,0 +1,33 @@
+# 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="ZConfig"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A configuration library supporting a hierarchical schema-driven configuration model"
+HOMEPAGE="https://pypi.org/project/ZConfig/"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	test? (
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/manuel[${PYTHON_USEDEP}]
+		dev-python/zope-exceptions[${PYTHON_USEDEP}]
+		dev-python/zope-interface[${PYTHON_USEDEP}]
+		dev-python/zope-testrunner[${PYTHON_USEDEP}]
+	)"
+
+DOCS=( CHANGES.rst README.rst )
+
+distutils_enable_tests unittest
+distutils_enable_sphinx doc dev-python/sphinxcontrib-programoutput
diff --git a/dev-python/zstandard/Manifest b/dev-python/zstandard/Manifest
index f06d587d9a04..16b75e5f89a4 100644
--- a/dev-python/zstandard/Manifest
+++ b/dev-python/zstandard/Manifest
@@ -1,9 +1,3 @@
-DIST zstandard-0.14.0.tar.gz 676761 BLAKE2B f90fcee6571f89eb5964ba50c722be8f3b846a0aaa6f79bd41389131ce332a4c6f7ec3d2eabd16268a42d211c7c02c2f7379019ef44272eb23cc74a20e5e9b3d SHA512 57c62eb7dedde2a2178f79a5658b87b5c5f176b282311273953003824272afa03e126a79b57fc8b75e9e15585d44d6b9931318a8ea5e7c75ec0feebbd7eb6cf0
-DIST zstandard-0.14.1.tar.gz 676849 BLAKE2B ad2a89371301e64428de90adf8770ebb7b43b06d720f5e0e9b490dc8771c55a974625105128c3a8052d68230d2670a802adfbf64708729440fdf624ca8d4fccb SHA512 e49f294816f0c7da35914363dbbdfcc4d432f7fa8367192e07a5d0c093ec8af76966fd0a95b4e8316091f056a8027c383ca73cc9ed506b29e2f9a31bc9ad3379
-DIST zstandard-0.15.0.tar.gz 990208 BLAKE2B d31a4c3cec60b642ec8c3a85b9038d6b0153e2be25696591db1a8e8f45b44018e370eb10bc4a902df3da03048a26ad55b2358d3b9912b1802c61bb63ce920523 SHA512 2de5a2047b1a9a146160bfa1cc50adb0ae1ddf23ae346b22d49b04e38987f90dcbb1f15d75c486fb37bf7084de66ebe19d917a37515dedac462102543533c407
 DIST zstandard-0.15.2.tar.gz 1012864 BLAKE2B 3239a7003d8869182becbaf952b43da8923518e4b5202b115d59fc1492d26bf9703c1ea2dcf525459da023470c134c70525bd040a2d728d24861f7bc1e3a8948 SHA512 0102f3522145c80ec096e9dfac34a5bdd2a98b43b50b8c1e99bcfb0057904c551ababeeb82ced5f8b65945d42b39479cbc29472058679af1f8f91b68ae79f70f
-EBUILD zstandard-0.14.0-r1.ebuild 777 BLAKE2B aa61d4659110f07d40acfdd5e3c31e8557138ed9266323337d957dd588a838e8bd5eccab02d6aac549f014d7819fe5b50f90f782c02b51b806dd28b39e65bb91 SHA512 3e4cba50c243d2604b53eb5b284343427aaf1912c4cf1362ae8cdc19d3475c6e293ccb383ca64c7a95763606739ea4b7628c0e698cc4b95330de16ac27673f45
-EBUILD zstandard-0.14.1.ebuild 779 BLAKE2B fc38dda68bc290c1dfe450b3733eee2eb241ef7e213efe3e8cb60f5a47de6034f11b0822e04e61774bea2a17562d0d1332f393352913d77bc800d33cc4fc625f SHA512 ad392c8eaba60a3fc905840b17e50876ca98bdbb109998095eff564eec8cb2e39d742fd314f3786a5afe924e369703f7b160abf630a0cd2dfb664f343c940705
-EBUILD zstandard-0.15.0.ebuild 780 BLAKE2B b9918626f05487806c337a5829a0fd7a9f086b419bc4e9dcaaa83c38b4c17622141aeeec92f0da93ffcb160e39a4e93fa6a6e721a6d92e4cad4e7d3d4b30fd07 SHA512 eb7c3a0d07377e9aeb19c9bf0aa5f506f36dd4681ededd70a41a0b4d6a796c970f4c3b9d46cf7555f8c509278aa1c56f8917340f08338ea6a31427e5a7b867b2
-EBUILD zstandard-0.15.2-r1.ebuild 1173 BLAKE2B eb95e2e7daae74535f44da3ec8ff6abfd949ce49d8f6aa3cf23f503c47d82c165b235ba259778589bce54f8b7490b753b2feb0a78685a1420a44aa118d67c6f4 SHA512 3499e4d43c651f0635628b5f0bc77b1c27df9069c64d21da6ec5ee93c68ce1997a707abc53d4d3f0859e9fa3ddce7fc02a1993d5f35e5857f97d450367388d42
+EBUILD zstandard-0.15.2-r1.ebuild 1172 BLAKE2B 8bfe479c085338b30f479b4ab6c3cc0aca769ee0c661fe28668eb10a128792518f713e3d3d9fb54619c3f15280f07fd75e128e6acb23dec4fbc0599c300b1d90 SHA512 f9ec4d26fc656ecee8062681789d971064dfc4f3c5cdc6e10188f1a820f4b355eeb6f98a1d80eccb00b84ca12d802fef710eab9187300da87791714429f7fba5
 MISC metadata.xml 377 BLAKE2B c14803b618b3badd945f8b01ca90ed6f809d9d2648ccb59554f947fbf5910e613f741f83cc020b70831ebf70b579a0e1ed33d3f5f72b858ff280082938516196 SHA512 fec606ee1d05384ce4433e90433e54925443afae244ced5276787a6f416a96017dbfd03dd9ec15c2526a943ff6348827e13719152478fb2cf609017cf8359a45
diff --git a/dev-python/zstandard/zstandard-0.14.0-r1.ebuild b/dev-python/zstandard/zstandard-0.14.0-r1.ebuild
deleted file mode 100644
index 5e58bf8587cf..000000000000
--- a/dev-python/zstandard/zstandard-0.14.0-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-python_compile() {
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/zstandard/zstandard-0.14.1.ebuild b/dev-python/zstandard/zstandard-0.14.1.ebuild
deleted file mode 100644
index d77c31203b62..000000000000
--- a/dev-python/zstandard/zstandard-0.14.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-python_compile() {
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/zstandard/zstandard-0.15.0.ebuild b/dev-python/zstandard/zstandard-0.15.0.ebuild
deleted file mode 100644
index 8127da56e94c..000000000000
--- a/dev-python/zstandard/zstandard-0.15.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit distutils-r1
-
-DESCRIPTION="Zstandard Bindings for Python"
-HOMEPAGE="https://pypi.org/project/zstandard/ https://github.com/indygreg/python-zstandard"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-python/cffi-1.14.0-r2:=[${PYTHON_USEDEP}]"
-BDEPEND="
-	test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-distutils_enable_tests setup.py
-
-python_compile() {
-	local MAKEOPTS=-j1
-	distutils-r1_python_compile
-}
diff --git a/dev-python/zstandard/zstandard-0.15.2-r1.ebuild b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
index 9fe9f82f6489..c30c623ecd98 100644
--- a/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
+++ b/dev-python/zstandard/zstandard-0.15.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} pypy3 )
+PYTHON_COMPAT=( python3_{7..10} pypy3 )
 
 inherit distutils-r1
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	app-arch/zstd:="
diff --git a/dev-python/zstd/Manifest b/dev-python/zstd/Manifest
index e7c9d94a547b..dfb584dae902 100644
--- a/dev-python/zstd/Manifest
+++ b/dev-python/zstd/Manifest
@@ -1,5 +1,5 @@
-DIST zstd-1.4.5.1.tar.gz 483105 BLAKE2B 5edd7d2c7cb26817d2a7f30536373d19a6939140dea3fb93589ff45495d51afbd1e98c4f73145869dd8a72a35c0e7543a7a21d688771746485b4dd275933dff8 SHA512 f27e255bc66798b2227d39eaa7648803e7753556b522d3dc37e82413f01dcff44b05f652c210e9832077876bd954a3abdad5ed1823f5f50217b83159bbaf896d
 DIST zstd-1.4.9.1.tar.gz 516353 BLAKE2B ec318c1b6e3d44a8959dae61c2ba3f2210c0cb9daf88519b07b1df8801b8345a2b9c18fddab497a478a1c6e03118f42f9526019a624f86f347691b7daea17bb0 SHA512 53816d252611ce3a1aa0dfa7b568ce8ffba07dd8ca6009ab3406680e674f5040633718cc65e1d5a0cfea1e1f5dd746a8f3e91b313b2be39b0ed4c6f9d887b24e
-EBUILD zstd-1.4.5.1.ebuild 502 BLAKE2B 330d0c05f2c35eb7422d4b92be2d0e920d6e1704a8e26057393ab2fad569b53cc4cf01244f9c0c9b96c2721ee3d831d3c262e31a14380114bb2a45bda9b85720 SHA512 65847d6a6201316302caed5e58ba775919e043a284809d1a4425c6930548272c8e060eb5f4de44b29147be66314513017ee8eed0a5fd0dcc419af337ffa3ac6a
-EBUILD zstd-1.4.9.1.ebuild 504 BLAKE2B ea3411bd41c881df70fb24e912d4fa9313046127cf0011bde629e1cc960e87a88892100827f8ddcd458c5ce0945aed3ca60d045799e728cd562eecfbbacbf049 SHA512 6b6544a8ea7c99b44c5adf29e24fcf22139c046c3146449b5c14f59a00eae310e6c978f508730cb7cb64eed7e86090db092e00380c7eee1c78a92009e8e944cf
+DIST zstd-1.5.0.2.tar.gz 528892 BLAKE2B 9aaa0beba1a6703d881daf5c5e10d93a8c67923d07773bce5eda3eba652f50c4cb4aa18d2ea9bea304a8742a7e8501568679837aa8bb1e71fe6eff5a5d08d193 SHA512 a7a6033e743c5bc0fa5256dfd256c2a9417c200cda5d5c02c6c7a5d5553d188637e21908658a4a948e565b16bb03f85f57c74d51c63a3ae7eb160f8b3bdbd3c3
+EBUILD zstd-1.4.9.1.ebuild 502 BLAKE2B 30f02ccaab6b6d25e4e7c76d1394a95cfcda584857ef9d79dbb57417ab6b5bf645f175870bbafd76e9caac94b07688d145ec5277a10f2b1605b274d78d770d1b SHA512 38c91b5e5d7eaf53152a55e993c85fe35d482f2f39c2dbdff2c5362049743e7d1aa9a7847271f6a818110ed7b2845d4687dbde45dd83b4a2e784f80d73a9cff1
+EBUILD zstd-1.5.0.2.ebuild 694 BLAKE2B ac78d2f66b1acccd3bd89aeb036109ad8f74a8783351a9524c984dad4e93b34cf71dce4bf09c065dab98c4387f329050a7d124b10fa28eb2924dd058fc849ec5 SHA512 1e6b4dd35296bb7ae030c45bcf9eb96b6481eaad8e39ea538341f7de3233010d2405bd7b0c75f5bb4e5a22b7d3d792ad9f7ef6084ea653eb1a0aef63c8c982f0
 MISC metadata.xml 471 BLAKE2B f0cd6f693de2e397210dad0fe868504d4c294e927a00298a647610cf7eb187572c0075db9bfe75de62e3ed6f94d044d17289de9fa88e9638fbb53fcc3050e662 SHA512 dec7b96d32fa16496415df81c5242ab338f4b09371c3206b315792b75bec1c1e823919de9290ef198e117fa7433ea90d6e6c2a2c3a5ffcd7bf1c1638d4f72194
diff --git a/dev-python/zstd/zstd-1.4.5.1.ebuild b/dev-python/zstd/zstd-1.4.5.1.ebuild
deleted file mode 100644
index e06587558dad..000000000000
--- a/dev-python/zstd/zstd-1.4.5.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 python3_8 )
-inherit distutils-r1
-
-DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library."
-HOMEPAGE="https://github.com/sergey-dryabzhinsky/python-zstd"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-
-DEPEND="
-	app-arch/zstd
-	!dev-python/zstandard[${PYTHON_USEDEP}]
-"
-RDEPEND="${DEPEND}"
diff --git a/dev-python/zstd/zstd-1.4.9.1.ebuild b/dev-python/zstd/zstd-1.4.9.1.ebuild
index c7b83b1cea02..9b33537a65be 100644
--- a/dev-python/zstd/zstd-1.4.9.1.ebuild
+++ b/dev-python/zstd/zstd-1.4.9.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 RDEPEND="
 	app-arch/zstd:=
diff --git a/dev-python/zstd/zstd-1.5.0.2.ebuild b/dev-python/zstd/zstd-1.5.0.2.ebuild
new file mode 100644
index 000000000000..04aba4d235e8
--- /dev/null
+++ b/dev-python/zstd/zstd-1.5.0.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit distutils-r1
+
+DESCRIPTION="Simple python bindings to Yann Collet ZSTD compression library"
+HOMEPAGE="https://github.com/sergey-dryabzhinsky/python-zstd"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	app-arch/zstd:=
+	!dev-python/zstandard[${PYTHON_USEDEP}]
+"
+DEPEND=${RDEPEND}
+
+distutils_enable_tests unittest
+
+src_configure() {
+	mydistutilsargs=( --external )
+
+	# for tests
+	export ZSTD_EXTERNAL=1
+	export VERSION=${PV}
+	export PKG_VERSION=${PV}
+	export LEGACY=0
+}